X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-interface.c;h=b4d71e8fa9fa36c0371cdec6697b4c926ef58037;hb=b5de327d9fdee841ff674dd5174365467e7fe67e;hp=df236d8bb8e63325ad3eecc370cee6d17395c899;hpb=34dbe92edd95fbf7082c3e54f438c76355254fe5;p=xournal.git diff --git a/src/xo-interface.c b/src/xo-interface.c index df236d8..b4d71e8 100644 --- a/src/xo-interface.c +++ b/src/xo-interface.c @@ -143,6 +143,7 @@ create_winMain (void) GtkWidget *toolsEraser; GtkWidget *toolsHighlighter; GtkWidget *toolsText; + GtkWidget *toolsImage; GtkWidget *separator15; GtkWidget *toolsReco; GtkWidget *toolsRuler; @@ -206,7 +207,6 @@ create_winMain (void) GtkWidget *menuOptions; GtkWidget *menuOptions_menu; GtkWidget *optionsUseXInput; - GtkWidget *optionsDiscardCoreEvents; GtkWidget *optionsButtonMappings; GtkWidget *optionsPressureSensitive; GtkWidget *button2_mapping; @@ -216,6 +216,7 @@ create_winMain (void) GtkWidget *button2Eraser; GtkWidget *button2Highlighter; GtkWidget *button2Text; + GtkWidget *button2Image; GtkWidget *button2SelectRegion; GtkWidget *button2SelectRectangle; GtkWidget *button2VerticalSpace; @@ -232,6 +233,7 @@ create_winMain (void) GtkWidget *button3Eraser; GtkWidget *button3Highlighter; GtkWidget *button3Text; + GtkWidget *button3Image; GtkWidget *button3SelectRegion; GtkWidget *button3SelectRectangle; GtkWidget *button3VerticalSpace; @@ -245,6 +247,7 @@ create_winMain (void) GtkWidget *separator18; GtkWidget *optionsProgressiveBG; GtkWidget *optionsPrintRuling; + GtkWidget *optionsAutoloadPdfXoj; GtkWidget *optionsLeftHanded; GtkWidget *optionsShortenMenus; GtkWidget *separator21; @@ -289,6 +292,7 @@ create_winMain (void) GtkWidget *buttonEraser; GtkWidget *buttonHighlighter; GtkWidget *buttonText; + GtkWidget *buttonImage; GtkWidget *buttonReco; GtkWidget *buttonRuler; GtkWidget *toolitem15; @@ -662,7 +666,7 @@ create_winMain (void) gtk_widget_show (image631); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewHideLayer), image631); - menuJournal = gtk_menu_item_new_with_mnemonic (_("_Journal")); + menuJournal = gtk_menu_item_new_with_mnemonic (_("_Page")); gtk_widget_show (menuJournal); gtk_container_add (GTK_CONTAINER (menubar), menuJournal); @@ -754,11 +758,9 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorGreen); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorGreen), TRUE); - papercolorOther = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("other...")); - papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorOther)); + papercolorOther = gtk_menu_item_new_with_mnemonic (_("other...")); gtk_widget_show (papercolorOther); gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorOther); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorOther), TRUE); papercolorNA = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("NA")); papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorNA)); @@ -878,6 +880,15 @@ create_winMain (void) GTK_ACCEL_VISIBLE); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsText), TRUE); + toolsImage = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, _("_Image")); + toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsImage)); + gtk_widget_show (toolsImage); + gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsImage); + gtk_widget_add_accelerator (toolsImage, "activate", accel_group, + GDK_I, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsImage), TRUE); + separator15 = gtk_separator_menu_item_new (); gtk_widget_show (separator15); gtk_container_add (GTK_CONTAINER (menuTools_menu), separator15); @@ -1190,10 +1201,6 @@ create_winMain (void) gtk_widget_show (optionsUseXInput); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsUseXInput); - optionsDiscardCoreEvents = gtk_check_menu_item_new_with_mnemonic (_("Discard _Core Events")); - gtk_widget_show (optionsDiscardCoreEvents); - gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsDiscardCoreEvents); - optionsButtonMappings = gtk_check_menu_item_new_with_mnemonic (_("_Eraser Tip")); gtk_widget_show (optionsButtonMappings); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsButtonMappings); @@ -1233,6 +1240,12 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Text); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2Text), TRUE); + button2Image = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, _("_Image")); + button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Image)); + gtk_widget_show (button2Image); + gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Image); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2Image), TRUE); + button2SelectRegion = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, _("Select Re_gion")); button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2SelectRegion)); gtk_widget_show (button2SelectRegion); @@ -1309,6 +1322,12 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Text); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3Text), TRUE); + button3Image = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, _("_Image")); + button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Image)); + gtk_widget_show (button3Image); + gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Image); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3Image), TRUE); + button3SelectRegion = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, _("Select Re_gion")); button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3SelectRegion)); gtk_widget_show (button3SelectRegion); @@ -1371,6 +1390,10 @@ create_winMain (void) gtk_widget_show (optionsPrintRuling); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsPrintRuling); + optionsAutoloadPdfXoj = gtk_check_menu_item_new_with_mnemonic (_("Autoload pdf.xoj")); + gtk_widget_show (optionsAutoloadPdfXoj); + gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsAutoloadPdfXoj); + optionsLeftHanded = gtk_check_menu_item_new_with_mnemonic (_("Left-Handed Scrollbar")); gtk_widget_show (optionsLeftHanded); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsLeftHanded); @@ -1590,6 +1613,17 @@ create_winMain (void) gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonText), buttonPen_group); buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonText)); + buttonImage = (GtkWidget*) gtk_radio_tool_button_new (NULL); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonImage), _("Image")); + tmp_image = gtk_image_new_from_stock ("gtk-orientation-portrait", tmp_toolbar_icon_size); + gtk_widget_show (tmp_image); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonImage), tmp_image); + gtk_widget_show (buttonImage); + gtk_container_add (GTK_CONTAINER (toolbarPen), buttonImage); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonImage), tooltips, _("Image"), NULL); + gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonImage), buttonPen_group); + buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonImage)); + buttonReco = (GtkWidget*) gtk_toggle_tool_button_new (); gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonReco), _("Shape Recognizer")); tmp_image = create_pixmap (winMain, "shapes.png"); @@ -2107,7 +2141,7 @@ create_winMain (void) g_signal_connect ((gpointer) papercolorGreen, "toggled", G_CALLBACK (on_papercolorGreen_activate), NULL); - g_signal_connect ((gpointer) papercolorOther, "toggled", + g_signal_connect ((gpointer) papercolorOther, "activate", G_CALLBACK (on_papercolorOther_activate), NULL); g_signal_connect ((gpointer) paperstylePlain, "toggled", @@ -2149,6 +2183,9 @@ create_winMain (void) g_signal_connect ((gpointer) toolsText, "toggled", G_CALLBACK (on_toolsText_activate), NULL); + g_signal_connect ((gpointer) toolsImage, "toggled", + G_CALLBACK (on_toolsImage_activate), + NULL); g_signal_connect ((gpointer) toolsReco, "toggled", G_CALLBACK (on_toolsReco_activate), NULL); @@ -2266,9 +2303,6 @@ create_winMain (void) g_signal_connect ((gpointer) optionsUseXInput, "toggled", G_CALLBACK (on_optionsUseXInput_activate), NULL); - g_signal_connect ((gpointer) optionsDiscardCoreEvents, "toggled", - G_CALLBACK (on_optionsDiscardCore_activate), - NULL); g_signal_connect ((gpointer) optionsButtonMappings, "activate", G_CALLBACK (on_optionsButtonMappings_activate), NULL); @@ -2287,6 +2321,9 @@ create_winMain (void) g_signal_connect ((gpointer) button2Text, "activate", G_CALLBACK (on_button2Text_activate), NULL); + g_signal_connect ((gpointer) button2Image, "activate", + G_CALLBACK (on_button2Image_activate), + NULL); g_signal_connect ((gpointer) button2SelectRegion, "activate", G_CALLBACK (on_button2SelectRegion_activate), NULL); @@ -2317,6 +2354,9 @@ create_winMain (void) g_signal_connect ((gpointer) button3Text, "activate", G_CALLBACK (on_button3Text_activate), NULL); + g_signal_connect ((gpointer) button3Image, "activate", + G_CALLBACK (on_button3Image_activate), + NULL); g_signal_connect ((gpointer) button3SelectRegion, "activate", G_CALLBACK (on_button3SelectRegion_activate), NULL); @@ -2344,6 +2384,9 @@ create_winMain (void) g_signal_connect ((gpointer) optionsPrintRuling, "activate", G_CALLBACK (on_optionsPrintRuling_activate), NULL); + g_signal_connect ((gpointer) optionsAutoloadPdfXoj, "activate", + G_CALLBACK (on_optionsAutoloadPdfXoj_activate), + NULL); g_signal_connect ((gpointer) optionsLeftHanded, "toggled", G_CALLBACK (on_optionsLeftHanded_activate), NULL); @@ -2428,6 +2471,9 @@ create_winMain (void) g_signal_connect ((gpointer) buttonText, "toggled", G_CALLBACK (on_toolsText_activate), NULL); + g_signal_connect ((gpointer) buttonImage, "toggled", + G_CALLBACK (on_toolsImage_activate), + NULL); g_signal_connect ((gpointer) buttonReco, "toggled", G_CALLBACK (on_toolsReco_activate), NULL); @@ -2618,6 +2664,7 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, toolsEraser, "toolsEraser"); GLADE_HOOKUP_OBJECT (winMain, toolsHighlighter, "toolsHighlighter"); GLADE_HOOKUP_OBJECT (winMain, toolsText, "toolsText"); + GLADE_HOOKUP_OBJECT (winMain, toolsImage, "toolsImage"); GLADE_HOOKUP_OBJECT (winMain, separator15, "separator15"); GLADE_HOOKUP_OBJECT (winMain, toolsReco, "toolsReco"); GLADE_HOOKUP_OBJECT (winMain, toolsRuler, "toolsRuler"); @@ -2676,7 +2723,6 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, menuOptions, "menuOptions"); GLADE_HOOKUP_OBJECT (winMain, menuOptions_menu, "menuOptions_menu"); GLADE_HOOKUP_OBJECT (winMain, optionsUseXInput, "optionsUseXInput"); - GLADE_HOOKUP_OBJECT (winMain, optionsDiscardCoreEvents, "optionsDiscardCoreEvents"); GLADE_HOOKUP_OBJECT (winMain, optionsButtonMappings, "optionsButtonMappings"); GLADE_HOOKUP_OBJECT (winMain, optionsPressureSensitive, "optionsPressureSensitive"); GLADE_HOOKUP_OBJECT (winMain, button2_mapping, "button2_mapping"); @@ -2685,6 +2731,7 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, button2Eraser, "button2Eraser"); GLADE_HOOKUP_OBJECT (winMain, button2Highlighter, "button2Highlighter"); GLADE_HOOKUP_OBJECT (winMain, button2Text, "button2Text"); + GLADE_HOOKUP_OBJECT (winMain, button2Image, "button2Image"); GLADE_HOOKUP_OBJECT (winMain, button2SelectRegion, "button2SelectRegion"); GLADE_HOOKUP_OBJECT (winMain, button2SelectRectangle, "button2SelectRectangle"); GLADE_HOOKUP_OBJECT (winMain, button2VerticalSpace, "button2VerticalSpace"); @@ -2699,6 +2746,7 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, button3Eraser, "button3Eraser"); GLADE_HOOKUP_OBJECT (winMain, button3Highlighter, "button3Highlighter"); GLADE_HOOKUP_OBJECT (winMain, button3Text, "button3Text"); + GLADE_HOOKUP_OBJECT (winMain, button3Image, "button3Image"); GLADE_HOOKUP_OBJECT (winMain, button3SelectRegion, "button3SelectRegion"); GLADE_HOOKUP_OBJECT (winMain, button3SelectRectangle, "button3SelectRectangle"); GLADE_HOOKUP_OBJECT (winMain, button3VerticalSpace, "button3VerticalSpace"); @@ -2711,6 +2759,7 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, separator18, "separator18"); GLADE_HOOKUP_OBJECT (winMain, optionsProgressiveBG, "optionsProgressiveBG"); GLADE_HOOKUP_OBJECT (winMain, optionsPrintRuling, "optionsPrintRuling"); + GLADE_HOOKUP_OBJECT (winMain, optionsAutoloadPdfXoj, "optionsAutoloadPdfXoj"); GLADE_HOOKUP_OBJECT (winMain, optionsLeftHanded, "optionsLeftHanded"); GLADE_HOOKUP_OBJECT (winMain, optionsShortenMenus, "optionsShortenMenus"); GLADE_HOOKUP_OBJECT (winMain, separator21, "separator21"); @@ -2752,6 +2801,7 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, buttonEraser, "buttonEraser"); GLADE_HOOKUP_OBJECT (winMain, buttonHighlighter, "buttonHighlighter"); GLADE_HOOKUP_OBJECT (winMain, buttonText, "buttonText"); + GLADE_HOOKUP_OBJECT (winMain, buttonImage, "buttonImage"); GLADE_HOOKUP_OBJECT (winMain, buttonReco, "buttonReco"); GLADE_HOOKUP_OBJECT (winMain, buttonRuler, "buttonRuler"); GLADE_HOOKUP_OBJECT (winMain, toolitem15, "toolitem15"); @@ -2955,7 +3005,7 @@ create_aboutDialog (void) gtk_box_pack_start (GTK_BOX (dialog_vbox2), labelTitle, FALSE, FALSE, 3); gtk_label_set_justify (GTK_LABEL (labelTitle), GTK_JUSTIFY_CENTER); - labelInfo = gtk_label_new (_("Written by Denis Auroux\n http://xournal.sourceforge.net/ ")); + labelInfo = gtk_label_new (_("Written by Denis Auroux\nand other contributors\n http://xournal.sourceforge.net/ ")); gtk_widget_show (labelInfo); gtk_box_pack_start (GTK_BOX (dialog_vbox2), labelInfo, FALSE, FALSE, 0); gtk_label_set_justify (GTK_LABEL (labelInfo), GTK_JUSTIFY_CENTER);