X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fmain.c;h=1c8acbfca25e16a89d2b5072c69f3a22d60f82fd;hb=881e9a45693f4d724512fdc5297ba312d447851b;hp=f22125e51b49103536be8f65f7575b2ecb6e4253;hpb=dcbb0ab8521a5e166f257d86884407eb98ef63f0;p=xournal.git diff --git a/src/main.c b/src/main.c index f22125e..1c8acbf 100644 --- a/src/main.c +++ b/src/main.c @@ -62,8 +62,8 @@ void init_stuff (int argc, char *argv[]) ui.layerbox_length = 0; if (argc > 2 || (argc == 2 && argv[1][0] == '-')) { - printf("Invalid command line parameters.\n" - "Usage: %s [filename.xoj]\n", argv[0]); + printf(_("Invalid command line parameters.\n" + "Usage: %s [filename.xoj]\n"), argv[0]); gtk_exit(0); } @@ -89,9 +89,11 @@ void init_stuff (int argc, char *argv[]) for (i=0; i < NUM_STROKE_TOOLS; i++) { b = &(ui.brushes[j][i]); b->tool_type = i; - b->color_rgba = predef_colors_rgba[b->color_no]; - if (i == TOOL_HIGHLIGHTER) { - b->color_rgba &= ui.hiliter_alpha_mask; + if (b->color_no>=0) { + b->color_rgba = predef_colors_rgba[b->color_no]; + if (i == TOOL_HIGHLIGHTER) { + b->color_rgba &= ui.hiliter_alpha_mask; + } } b->thickness = predef_thickness[i][b->thickness_no]; } @@ -99,6 +101,7 @@ void init_stuff (int argc, char *argv[]) g_memmove(ui.default_brushes+i, &(ui.brushes[0][i]), sizeof(struct Brush)); ui.cur_mapping = 0; + ui.which_unswitch_button = 0; reset_recognizer(); @@ -118,10 +121,20 @@ void init_stuff (int argc, char *argv[]) GTK_TOGGLE_TOOL_BUTTON(GET_COMPONENT("buttonFullscreen")), TRUE); gtk_window_fullscreen(GTK_WINDOW(winMain)); } + gtk_button_set_relief(GTK_BUTTON(GET_COMPONENT("buttonColorChooser")), GTK_RELIEF_NONE); allow_all_accels(); add_scroll_bindings(); + // prevent interface items from stealing focus + // glade doesn't properly handle can_focus, so manually set it + gtk_combo_box_set_focus_on_click(GTK_COMBO_BOX(GET_COMPONENT("comboLayer")), FALSE); + g_signal_connect(GET_COMPONENT("spinPageNo"), "activate", + G_CALLBACK(handle_activate_signal), NULL); + gtk_container_foreach(GTK_CONTAINER(winMain), unset_flags, (gpointer)GTK_CAN_FOCUS); + GTK_WIDGET_SET_FLAGS(GTK_WIDGET(canvas), GTK_CAN_FOCUS); + GTK_WIDGET_SET_FLAGS(GTK_WIDGET(GET_COMPONENT("spinPageNo")), GTK_CAN_FOCUS); + // set up and initialize the canvas gtk_widget_show (GTK_WIDGET (canvas)); @@ -146,6 +159,9 @@ void init_stuff (int argc, char *argv[]) g_signal_connect ((gpointer) canvas, "enter_notify_event", G_CALLBACK (on_canvas_enter_notify_event), NULL); + g_signal_connect ((gpointer) canvas, "leave_notify_event", + G_CALLBACK (on_canvas_leave_notify_event), + NULL); g_signal_connect ((gpointer) canvas, "expose_event", G_CALLBACK (on_canvas_expose_event), NULL); @@ -175,6 +191,8 @@ void init_stuff (int argc, char *argv[]) gdk_device_set_axis_use(device, 1, GDK_AXIS_IGNORE); #endif gdk_device_set_mode(device, GDK_MODE_SCREEN); + if (g_str_has_suffix(device->name, "eraser")) + gdk_device_set_source(device, GDK_SOURCE_ERASER); can_xinput = TRUE; } dev_list = dev_list->next; @@ -183,9 +201,8 @@ void init_stuff (int argc, char *argv[]) gtk_widget_set_sensitive(GET_COMPONENT("optionsUseXInput"), FALSE); ui.use_xinput = ui.allow_xinput && can_xinput; + ui.need_emergency_disable_xinput = FALSE; - gtk_check_menu_item_set_active( - GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsAntialiasBG")), ui.antialias_bg); gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsProgressiveBG")), ui.progressive_bg); gtk_check_menu_item_set_active( @@ -196,6 +213,8 @@ void init_stuff (int argc, char *argv[]) GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsShortenMenus")), ui.shorten_menus); gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsAutoSavePrefs")), ui.auto_save_prefs); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsButtonSwitchMapping")), ui.button_switch_mapping); hide_unimplemented(); @@ -214,6 +233,42 @@ void init_stuff (int argc, char *argv[]) gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsUseXInput")), ui.use_xinput); + /* fix a bug in GTK+ 2.16 and 2.17: scrollbars shouldn't get extended + input events from pointer motion when cursor moves into main window */ + + if (!gtk_check_version(2, 16, 0)) { + g_signal_connect ( + GET_COMPONENT("menubar"), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + GET_COMPONENT("toolbarMain"), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + GET_COMPONENT("toolbarPen"), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + GET_COMPONENT("statusbar"), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + (gpointer)(gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(w))), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + (gpointer)(gtk_scrolled_window_get_hscrollbar(GTK_SCROLLED_WINDOW(w))), + "event", G_CALLBACK (filter_extended_events), + NULL); + } + if (!gtk_check_version(2, 17, 0)) { + g_signal_connect ( + GET_COMPONENT("comboLayer"), + "notify::popup-shown", G_CALLBACK (combobox_popup_disable_xinput), + NULL); + } + // load the MRU init_mru(); @@ -235,7 +290,7 @@ void init_stuff (int argc, char *argv[]) set_cursor_busy(FALSE); if (!success) { w = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", argv[1]); + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), argv[1]); gtk_dialog_run(GTK_DIALOG(w)); gtk_widget_destroy(w); } @@ -247,6 +302,12 @@ main (int argc, char *argv[]) { gchar *path, *path1, *path2; +#ifdef ENABLE_NLS + bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); +#endif + gtk_set_locale (); gtk_init (&argc, &argv); @@ -274,7 +335,6 @@ main (int argc, char *argv[]) gtk_main (); if (bgpdf.status != STATUS_NOT_INIT) shutdown_bgpdf(); - if (bgpdf.status != STATUS_NOT_INIT) end_bgpdf_shutdown(); save_mru_list(); if (ui.auto_save_prefs) save_config_to_file();