X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-interface.c;h=f10b134ab8180946d306a064421f12fb8a65fdd4;hb=dcbb0ab8521a5e166f257d86884407eb98ef63f0;hp=b84a09a33309d36bc9a3258bf46700e9833a7ee4;hpb=17d6f9eb93490bfb119da88e3cebb5eacce14bc9;p=xournal.git diff --git a/src/xo-interface.c b/src/xo-interface.c index b84a09a..f10b134 100644 --- a/src/xo-interface.c +++ b/src/xo-interface.c @@ -143,6 +143,9 @@ create_winMain (void) GtkWidget *toolsEraser; GtkWidget *toolsHighlighter; GtkWidget *toolsText; + GtkWidget *separator15; + GtkWidget *toolsReco; + GtkWidget *toolsRuler; GtkWidget *separator9; GtkWidget *toolsSelectRegion; GtkWidget *toolsSelectRectangle; @@ -200,13 +203,12 @@ create_winMain (void) GtkWidget *toolsDefaultHighlighter; GtkWidget *toolsDefaultText; GtkWidget *toolsSetAsDefault; - GtkWidget *separator15; - GtkWidget *toolsRuler; GtkWidget *menuOptions; GtkWidget *menuOptions_menu; GtkWidget *optionsUseXInput; GtkWidget *optionsDiscardCoreEvents; GtkWidget *optionsButtonMappings; + GtkWidget *optionsPressureSensitive; GtkWidget *button2_mapping; GtkWidget *button2_mapping_menu; GSList *button2Pen_group = NULL; @@ -287,6 +289,7 @@ create_winMain (void) GtkWidget *buttonEraser; GtkWidget *buttonHighlighter; GtkWidget *buttonText; + GtkWidget *buttonReco; GtkWidget *buttonRuler; GtkWidget *toolitem15; GtkWidget *vseparator5; @@ -873,6 +876,25 @@ create_winMain (void) GTK_ACCEL_VISIBLE); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsText), TRUE); + separator15 = gtk_separator_menu_item_new (); + gtk_widget_show (separator15); + gtk_container_add (GTK_CONTAINER (menuTools_menu), separator15); + gtk_widget_set_sensitive (separator15, FALSE); + + toolsReco = gtk_check_menu_item_new_with_mnemonic ("_Shape Recognizer"); + gtk_widget_show (toolsReco); + gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsReco); + gtk_widget_add_accelerator (toolsReco, "activate", accel_group, + GDK_S, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + + toolsRuler = gtk_check_menu_item_new_with_mnemonic ("Ru_ler"); + gtk_widget_show (toolsRuler); + gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsRuler); + gtk_widget_add_accelerator (toolsRuler, "activate", accel_group, + GDK_L, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + separator9 = gtk_separator_menu_item_new (); gtk_widget_show (separator9); gtk_container_add (GTK_CONTAINER (menuTools_menu), separator9); @@ -1153,22 +1175,10 @@ create_winMain (void) gtk_widget_show (toolsDefaultText); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsDefaultText); - toolsSetAsDefault = gtk_menu_item_new_with_mnemonic ("_Set As Default"); + toolsSetAsDefault = gtk_menu_item_new_with_mnemonic ("Set As Default"); gtk_widget_show (toolsSetAsDefault); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsSetAsDefault); - separator15 = gtk_separator_menu_item_new (); - gtk_widget_show (separator15); - gtk_container_add (GTK_CONTAINER (menuTools_menu), separator15); - gtk_widget_set_sensitive (separator15, FALSE); - - toolsRuler = gtk_check_menu_item_new_with_mnemonic ("Ru_ler"); - gtk_widget_show (toolsRuler); - gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsRuler); - gtk_widget_add_accelerator (toolsRuler, "activate", accel_group, - GDK_L, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, - GTK_ACCEL_VISIBLE); - menuOptions = gtk_menu_item_new_with_mnemonic ("_Options"); gtk_widget_show (menuOptions); gtk_container_add (GTK_CONTAINER (menubar), menuOptions); @@ -1188,6 +1198,10 @@ create_winMain (void) gtk_widget_show (optionsButtonMappings); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsButtonMappings); + optionsPressureSensitive = gtk_check_menu_item_new_with_mnemonic ("_Pressure sensitivity"); + gtk_widget_show (optionsPressureSensitive); + gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsPressureSensitive); + button2_mapping = gtk_menu_item_new_with_mnemonic ("Button _2 Mapping"); gtk_widget_show (button2_mapping); gtk_container_add (GTK_CONTAINER (menuOptions_menu), button2_mapping); @@ -1576,6 +1590,15 @@ 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)); + 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"); + gtk_widget_show (tmp_image); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonReco), tmp_image); + gtk_widget_show (buttonReco); + gtk_container_add (GTK_CONTAINER (toolbarPen), buttonReco); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonReco), tooltips, "Shape Recognizer", NULL); + buttonRuler = (GtkWidget*) gtk_toggle_tool_button_new (); gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonRuler), "Ruler"); tmp_image = create_pixmap (winMain, "ruler.png"); @@ -2115,6 +2138,12 @@ create_winMain (void) g_signal_connect ((gpointer) toolsText, "toggled", G_CALLBACK (on_toolsText_activate), NULL); + g_signal_connect ((gpointer) toolsReco, "toggled", + G_CALLBACK (on_toolsReco_activate), + NULL); + g_signal_connect ((gpointer) toolsRuler, "toggled", + G_CALLBACK (on_toolsRuler_activate), + NULL); g_signal_connect ((gpointer) toolsSelectRegion, "toggled", G_CALLBACK (on_toolsSelectRegion_activate), NULL); @@ -2223,9 +2252,6 @@ create_winMain (void) g_signal_connect ((gpointer) toolsSetAsDefault, "activate", G_CALLBACK (on_toolsSetAsDefault_activate), NULL); - g_signal_connect ((gpointer) toolsRuler, "toggled", - G_CALLBACK (on_toolsRuler_activate), - NULL); g_signal_connect ((gpointer) optionsUseXInput, "toggled", G_CALLBACK (on_optionsUseXInput_activate), NULL); @@ -2235,6 +2261,9 @@ create_winMain (void) g_signal_connect ((gpointer) optionsButtonMappings, "activate", G_CALLBACK (on_optionsButtonMappings_activate), NULL); + g_signal_connect ((gpointer) optionsPressureSensitive, "activate", + G_CALLBACK (on_optionsPressureSensitive_activate), + NULL); g_signal_connect ((gpointer) button2Pen, "activate", G_CALLBACK (on_button2Pen_activate), NULL); @@ -2388,6 +2417,9 @@ create_winMain (void) g_signal_connect ((gpointer) buttonText, "toggled", G_CALLBACK (on_toolsText_activate), NULL); + g_signal_connect ((gpointer) buttonReco, "toggled", + G_CALLBACK (on_toolsReco_activate), + NULL); g_signal_connect ((gpointer) buttonRuler, "toggled", G_CALLBACK (on_toolsRuler_activate), NULL); @@ -2572,6 +2604,9 @@ 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, separator15, "separator15"); + GLADE_HOOKUP_OBJECT (winMain, toolsReco, "toolsReco"); + GLADE_HOOKUP_OBJECT (winMain, toolsRuler, "toolsRuler"); GLADE_HOOKUP_OBJECT (winMain, separator9, "separator9"); GLADE_HOOKUP_OBJECT (winMain, toolsSelectRegion, "toolsSelectRegion"); GLADE_HOOKUP_OBJECT (winMain, toolsSelectRectangle, "toolsSelectRectangle"); @@ -2624,13 +2659,12 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, toolsDefaultHighlighter, "toolsDefaultHighlighter"); GLADE_HOOKUP_OBJECT (winMain, toolsDefaultText, "toolsDefaultText"); GLADE_HOOKUP_OBJECT (winMain, toolsSetAsDefault, "toolsSetAsDefault"); - GLADE_HOOKUP_OBJECT (winMain, separator15, "separator15"); - GLADE_HOOKUP_OBJECT (winMain, toolsRuler, "toolsRuler"); 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"); GLADE_HOOKUP_OBJECT (winMain, button2_mapping_menu, "button2_mapping_menu"); GLADE_HOOKUP_OBJECT (winMain, button2Pen, "button2Pen"); @@ -2704,6 +2738,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, buttonReco, "buttonReco"); GLADE_HOOKUP_OBJECT (winMain, buttonRuler, "buttonRuler"); GLADE_HOOKUP_OBJECT (winMain, toolitem15, "toolitem15"); GLADE_HOOKUP_OBJECT (winMain, vseparator5, "vseparator5");