X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-interface.c;h=f6022eaccc314bd395d5963f5251500597dac383;hb=b471a5e1ffc9ad87400f079679fdf261875d513e;hp=31ceb885605fa745ebfc0dcd468c962e4ab5f97c;hpb=e648cece76b671b5b0e165acc6d14178e8de1000;p=xournal.git diff --git a/src/xo-interface.c b/src/xo-interface.c index 31ceb88..f6022ea 100644 --- a/src/xo-interface.c +++ b/src/xo-interface.c @@ -206,7 +206,6 @@ create_winMain (void) GtkWidget *menuOptions; GtkWidget *menuOptions_menu; GtkWidget *optionsUseXInput; - GtkWidget *optionsDiscardCoreEvents; GtkWidget *optionsButtonMappings; GtkWidget *optionsPressureSensitive; GtkWidget *button2_mapping; @@ -241,10 +240,11 @@ create_winMain (void) GtkWidget *button3LinkBrush; GtkWidget *button3CopyBrush; GtkWidget *button3NABrush; + GtkWidget *optionsButtonSwitchMapping; GtkWidget *separator18; - GtkWidget *optionsAntialiasBG; GtkWidget *optionsProgressiveBG; GtkWidget *optionsPrintRuling; + GtkWidget *optionsAutoloadPdfXoj; GtkWidget *optionsLeftHanded; GtkWidget *optionsShortenMenus; GtkWidget *separator21; @@ -323,6 +323,8 @@ create_winMain (void) GtkWidget *buttonYellow; GtkWidget *buttonWhite; GtkWidget *buttonColorOther; + GtkWidget *toolitem22; + GtkWidget *buttonColorChooser; GtkWidget *toolitem21; GtkWidget *vseparator10; GtkWidget *toolitem20; @@ -752,11 +754,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)); @@ -1022,11 +1022,9 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorWhite); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorWhite), TRUE); - colorOther = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("other...")); - colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorOther)); + colorOther = gtk_menu_item_new_with_mnemonic (_("other...")); gtk_widget_show (colorOther); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorOther); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorOther), TRUE); colorNA = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, _("NA")); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorNA)); @@ -1190,10 +1188,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); @@ -1354,15 +1348,15 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3NABrush); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3NABrush), TRUE); + optionsButtonSwitchMapping = gtk_check_menu_item_new_with_mnemonic (_("Buttons Switch Mappings")); + gtk_widget_show (optionsButtonSwitchMapping); + gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsButtonSwitchMapping); + separator18 = gtk_separator_menu_item_new (); gtk_widget_show (separator18); gtk_container_add (GTK_CONTAINER (menuOptions_menu), separator18); gtk_widget_set_sensitive (separator18, FALSE); - optionsAntialiasBG = gtk_check_menu_item_new_with_mnemonic (_("_Antialiased Bitmaps")); - gtk_widget_show (optionsAntialiasBG); - gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsAntialiasBG); - optionsProgressiveBG = gtk_check_menu_item_new_with_mnemonic (_("_Progressive Backgrounds")); gtk_widget_show (optionsProgressiveBG); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsProgressiveBG); @@ -1371,6 +1365,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); @@ -1881,6 +1879,17 @@ create_winMain (void) gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonColorOther), buttonBlack_group); buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonColorOther)); + toolitem22 = (GtkWidget*) gtk_tool_item_new (); + gtk_widget_show (toolitem22); + gtk_container_add (GTK_CONTAINER (toolbarPen), toolitem22); + + buttonColorChooser = gtk_color_button_new (); + gtk_widget_show (buttonColorChooser); + gtk_container_add (GTK_CONTAINER (toolitem22), buttonColorChooser); + gtk_widget_set_size_request (buttonColorChooser, 34, 32); + gtk_container_set_border_width (GTK_CONTAINER (buttonColorChooser), 2); + GTK_WIDGET_UNSET_FLAGS (buttonColorChooser, GTK_CAN_FOCUS); + toolitem21 = (GtkWidget*) gtk_tool_item_new (); gtk_widget_show (toolitem21); gtk_container_add (GTK_CONTAINER (toolbarPen), toolitem21); @@ -2096,7 +2105,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", @@ -2189,7 +2198,7 @@ create_winMain (void) g_signal_connect ((gpointer) colorWhite, "toggled", G_CALLBACK (on_colorWhite_activate), NULL); - g_signal_connect ((gpointer) colorOther, "toggled", + g_signal_connect ((gpointer) colorOther, "activate", G_CALLBACK (on_colorOther_activate), NULL); g_signal_connect ((gpointer) penthicknessVeryFine, "toggled", @@ -2255,9 +2264,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); @@ -2324,8 +2330,8 @@ create_winMain (void) g_signal_connect ((gpointer) button3CopyBrush, "activate", G_CALLBACK (on_button3CopyBrush_activate), NULL); - g_signal_connect ((gpointer) optionsAntialiasBG, "activate", - G_CALLBACK (on_optionsAntialiasBG_activate), + g_signal_connect ((gpointer) optionsButtonSwitchMapping, "toggled", + G_CALLBACK (on_optionsButtonsSwitchMappings_activate), NULL); g_signal_connect ((gpointer) optionsProgressiveBG, "activate", G_CALLBACK (on_optionsProgressiveBG_activate), @@ -2333,6 +2339,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); @@ -2483,6 +2492,9 @@ create_winMain (void) g_signal_connect ((gpointer) buttonWhite, "toggled", G_CALLBACK (on_colorWhite_activate), NULL); + g_signal_connect ((gpointer) buttonColorChooser, "color_set", + G_CALLBACK (on_buttonColorChooser_set), + NULL); g_signal_connect ((gpointer) fontButton, "font_set", G_CALLBACK (on_fontButton_font_set), NULL); @@ -2662,7 +2674,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"); @@ -2693,10 +2704,11 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, button3LinkBrush, "button3LinkBrush"); GLADE_HOOKUP_OBJECT (winMain, button3CopyBrush, "button3CopyBrush"); GLADE_HOOKUP_OBJECT (winMain, button3NABrush, "button3NABrush"); + GLADE_HOOKUP_OBJECT (winMain, optionsButtonSwitchMapping, "optionsButtonSwitchMapping"); GLADE_HOOKUP_OBJECT (winMain, separator18, "separator18"); - GLADE_HOOKUP_OBJECT (winMain, optionsAntialiasBG, "optionsAntialiasBG"); 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"); @@ -2770,6 +2782,8 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, buttonYellow, "buttonYellow"); GLADE_HOOKUP_OBJECT (winMain, buttonWhite, "buttonWhite"); GLADE_HOOKUP_OBJECT (winMain, buttonColorOther, "buttonColorOther"); + GLADE_HOOKUP_OBJECT (winMain, toolitem22, "toolitem22"); + GLADE_HOOKUP_OBJECT (winMain, buttonColorChooser, "buttonColorChooser"); GLADE_HOOKUP_OBJECT (winMain, toolitem21, "toolitem21"); GLADE_HOOKUP_OBJECT (winMain, vseparator10, "vseparator10"); GLADE_HOOKUP_OBJECT (winMain, toolitem20, "toolitem20"); @@ -2939,7 +2953,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);