Revision: 5255 http://geany.svn.sourceforge.net/geany/?rev=5255&view=rev Author: ntrel Date: 2010-09-23 14:32:32 +0000 (Thu, 23 Sep 2010)
Log Message: ----------- Move 'Edit->Commands->Insert Alternative White Space' to editor popup Insert menu.
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c trunk/src/keybindings.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-09-23 14:20:29 UTC (rev 5254) +++ trunk/ChangeLog 2010-09-23 14:32:32 UTC (rev 5255) @@ -9,6 +9,9 @@ Add docs for Find Selection commands. * src/document.c: Fix segfault on idle callback when quitting. + * src/interface.c, src/keybindings.c, geany.glade: + Move 'Edit->Commands->Insert Alternative White Space' to editor popup + Insert menu.
2010-09-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2010-09-23 14:20:29 UTC (rev 5254) +++ trunk/geany.glade 2010-09-23 14:32:32 UTC (rev 5255) @@ -510,21 +510,6 @@ </child>
<child> - <widget class="GtkSeparatorMenuItem" id="separator50"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="insert_alternative_white_space1"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Insert Alternative White Space</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_insert_alternative_white_space1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> - </widget> - </child> - - <child> <widget class="GtkSeparatorMenuItem" id="separator52"> <property name="visible">True</property> </widget> @@ -2756,6 +2741,21 @@ </child> </widget> </child> + + <child> + <widget class="GtkSeparatorMenuItem" id="separator50"> + <property name="visible">True</property> + </widget> + </child> + + <child> + <widget class="GtkMenuItem" id="insert_alternative_white_space1"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Insert Alternative White Space</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_insert_alternative_white_space1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> + </widget> + </child> </widget> </child> </widget>
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2010-09-23 14:20:29 UTC (rev 5254) +++ trunk/src/interface.c 2010-09-23 14:32:32 UTC (rev 5255) @@ -90,8 +90,6 @@ GtkWidget *separator49; GtkWidget *select_current_line_s_1; GtkWidget *select_current_paragraph1; - GtkWidget *separator50; - GtkWidget *insert_alternative_white_space1; GtkWidget *separator52; GtkWidget *send_selection_to_vte1; GtkWidget *menu_format1; @@ -543,15 +541,6 @@ gtk_widget_show (select_current_paragraph1); gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_paragraph1);
- separator50 = gtk_separator_menu_item_new (); - gtk_widget_show (separator50); - gtk_container_add (GTK_CONTAINER (commands2_menu), separator50); - gtk_widget_set_sensitive (separator50, FALSE); - - insert_alternative_white_space1 = gtk_menu_item_new_with_mnemonic (_("_Insert Alternative White Space")); - gtk_widget_show (insert_alternative_white_space1); - gtk_container_add (GTK_CONTAINER (commands2_menu), insert_alternative_white_space1); - separator52 = gtk_separator_menu_item_new (); gtk_widget_show (separator52); gtk_container_add (GTK_CONTAINER (commands2_menu), separator52); @@ -1495,9 +1484,6 @@ g_signal_connect ((gpointer) select_current_paragraph1, "activate", G_CALLBACK (on_select_current_paragraph1_activate), NULL); - g_signal_connect ((gpointer) insert_alternative_white_space1, "activate", - G_CALLBACK (on_insert_alternative_white_space1_activate), - NULL); g_signal_connect ((gpointer) send_selection_to_vte1, "activate", G_CALLBACK (on_send_selection_to_vte1_activate), NULL); @@ -1843,8 +1829,6 @@ GLADE_HOOKUP_OBJECT (window1, separator49, "separator49"); GLADE_HOOKUP_OBJECT (window1, select_current_line_s_1, "select_current_line_s_1"); GLADE_HOOKUP_OBJECT (window1, select_current_paragraph1, "select_current_paragraph1"); - GLADE_HOOKUP_OBJECT (window1, separator50, "separator50"); - GLADE_HOOKUP_OBJECT (window1, insert_alternative_white_space1, "insert_alternative_white_space1"); GLADE_HOOKUP_OBJECT (window1, separator52, "separator52"); GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1"); GLADE_HOOKUP_OBJECT (window1, menu_format1, "menu_format1"); @@ -2134,6 +2118,8 @@ GtkWidget *image3734; GtkWidget *insert_include1_menu; GtkWidget *invisible3; + GtkWidget *separator50; + GtkWidget *insert_alternative_white_space1; GtkWidget *search2; GtkWidget *separator7; GtkWidget *menu_open_selected_file2; @@ -2260,6 +2246,15 @@ invisible3 = gtk_menu_item_new_with_mnemonic (_("invisible")); gtk_container_add (GTK_CONTAINER (insert_include1_menu), invisible3);
+ separator50 = gtk_separator_menu_item_new (); + gtk_widget_show (separator50); + gtk_container_add (GTK_CONTAINER (insert1_menu), separator50); + gtk_widget_set_sensitive (separator50, FALSE); + + insert_alternative_white_space1 = gtk_menu_item_new_with_mnemonic (_("_Insert Alternative White Space")); + gtk_widget_show (insert_alternative_white_space1); + gtk_container_add (GTK_CONTAINER (insert1_menu), insert_alternative_white_space1); + search2 = gtk_menu_item_new_with_mnemonic (_("_Search")); gtk_widget_show (search2); gtk_container_add (GTK_CONTAINER (edit_menu1), search2); @@ -2327,6 +2322,9 @@ g_signal_connect ((gpointer) insert_multiline_comment1, "activate", G_CALLBACK (on_comments_multiline_activate), NULL); + g_signal_connect ((gpointer) insert_alternative_white_space1, "activate", + G_CALLBACK (on_insert_alternative_white_space1_activate), + NULL); g_signal_connect ((gpointer) menu_open_selected_file2, "activate", G_CALLBACK (on_menu_open_selected_file1_activate), NULL); @@ -2370,6 +2368,8 @@ GLADE_HOOKUP_OBJECT (edit_menu1, image3734, "image3734"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); + GLADE_HOOKUP_OBJECT (edit_menu1, separator50, "separator50"); + GLADE_HOOKUP_OBJECT (edit_menu1, insert_alternative_white_space1, "insert_alternative_white_space1"); GLADE_HOOKUP_OBJECT (edit_menu1, search2, "search2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_open_selected_file2, "menu_open_selected_file2");
Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2010-09-23 14:20:29 UTC (rev 5254) +++ trunk/src/keybindings.c 2010-09-23 14:32:32 UTC (rev 5255) @@ -371,8 +371,7 @@ GDK_d, GDK_SHIFT_MASK | GDK_MOD1_MASK, "menu_insert_date", _("Insert date"), LW(insert_date_custom1)); keybindings_set_item(group, GEANY_KEYS_INSERT_ALTWHITESPACE, NULL, - 0, 0, "edit_insertwhitespace", _("_Insert Alternative White Space"), - LW(insert_alternative_white_space1)); + 0, 0, "edit_insertwhitespace", _("_Insert Alternative White Space"), NULL);
group = ADD_KB_GROUP(SETTINGS, _("Settings"), NULL);
@@ -721,6 +720,7 @@
group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_INSERT); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_INSERT_DATE, insert_date_custom2); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_INSERT_ALTWHITESPACE, insert_alternative_white_space1);
group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_FILE); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_FILE_OPENSELECTED, menu_open_selected_file2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.