SF.net SVN: geany:[5498] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Fri Dec 24 13:31:39 UTC 2010
Revision: 5498
http://geany.svn.sourceforge.net/geany/?rev=5498&view=rev
Author: ntrel
Date: 2010-12-24 13:31:39 +0000 (Fri, 24 Dec 2010)
Log Message:
-----------
Add Edit->Insert Alternative White Space menu item (was previously
removed from Edit->Commands submenu).
Modified Paths:
--------------
trunk/ChangeLog
trunk/geany.glade
trunk/src/interface.c
trunk/src/keybindings.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-12-22 16:59:38 UTC (rev 5497)
+++ trunk/ChangeLog 2010-12-24 13:31:39 UTC (rev 5498)
@@ -1,3 +1,10 @@
+2010-12-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/interface.c, src/keybindings.c, geany.glade:
+ Add Edit->Insert Alternative White Space menu item (was previously
+ removed from Edit->Commands submenu).
+
+
2010-12-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/interface.c, geany.glade:
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2010-12-22 16:59:38 UTC (rev 5497)
+++ trunk/geany.glade 2010-12-24 13:31:39 UTC (rev 5498)
@@ -840,6 +840,15 @@
</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="separator9">
<property name="visible">True</property>
</widget>
@@ -2654,11 +2663,23 @@
</child>
<child>
- <widget class="GtkMenuItem" id="insert1">
+ <widget class="GtkImageMenuItem" id="insert1">
<property name="visible">True</property>
<property name="label" translatable="yes">I_nsert</property>
<property name="use_underline">True</property>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image4055">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+
<child>
<widget class="GtkMenu" id="insert1_menu">
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c 2010-12-22 16:59:38 UTC (rev 5497)
+++ trunk/src/interface.c 2010-12-24 13:31:39 UTC (rev 5498)
@@ -130,6 +130,7 @@
GtkWidget *image4023;
GtkWidget *insert_include2_menu;
GtkWidget *invisible4;
+ GtkWidget *insert_alternative_white_space1;
GtkWidget *separator9;
GtkWidget *preferences1;
GtkWidget *image4024;
@@ -707,6 +708,10 @@
invisible4 = gtk_menu_item_new_with_mnemonic (_("invisible"));
gtk_container_add (GTK_CONTAINER (insert_include2_menu), invisible4);
+ 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 (edit1_menu), insert_alternative_white_space1);
+
separator9 = gtk_separator_menu_item_new ();
gtk_widget_show (separator9);
gtk_container_add (GTK_CONTAINER (edit1_menu), separator9);
@@ -1564,6 +1569,9 @@
g_signal_connect ((gpointer) insert_bsd_license_notice2, "activate",
G_CALLBACK (on_menu_comments_bsd_activate),
NULL);
+ g_signal_connect ((gpointer) insert_alternative_white_space1, "activate",
+ G_CALLBACK (on_insert_alternative_white_space1_activate),
+ NULL);
g_signal_connect ((gpointer) preferences1, "activate",
G_CALLBACK (on_preferences1_activate),
NULL);
@@ -1907,6 +1915,7 @@
GLADE_HOOKUP_OBJECT (window1, image4023, "image4023");
GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu");
GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4");
+ GLADE_HOOKUP_OBJECT (window1, insert_alternative_white_space1, "insert_alternative_white_space1");
GLADE_HOOKUP_OBJECT (window1, separator9, "separator9");
GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1");
GLADE_HOOKUP_OBJECT (window1, image4024, "image4024");
@@ -2147,6 +2156,7 @@
GtkWidget *commands1;
GtkWidget *menu_format2;
GtkWidget *insert1;
+ GtkWidget *image4055;
GtkWidget *insert1_menu;
GtkWidget *add_changelog_entry2;
GtkWidget *insert_function_description1;
@@ -2236,10 +2246,14 @@
gtk_widget_show (menu_format2);
gtk_container_add (GTK_CONTAINER (edit_menu1), menu_format2);
- insert1 = gtk_menu_item_new_with_mnemonic (_("I_nsert"));
+ insert1 = gtk_image_menu_item_new_with_mnemonic (_("I_nsert"));
gtk_widget_show (insert1);
gtk_container_add (GTK_CONTAINER (edit_menu1), insert1);
+ image4055 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image4055);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert1), image4055);
+
insert1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert1), insert1_menu);
@@ -2438,6 +2452,7 @@
GLADE_HOOKUP_OBJECT (edit_menu1, commands1, "commands1");
GLADE_HOOKUP_OBJECT (edit_menu1, menu_format2, "menu_format2");
GLADE_HOOKUP_OBJECT (edit_menu1, insert1, "insert1");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image4055, "image4055");
GLADE_HOOKUP_OBJECT (edit_menu1, insert1_menu, "insert1_menu");
GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2");
GLADE_HOOKUP_OBJECT (edit_menu1, insert_function_description1, "insert_function_description1");
Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c 2010-12-22 16:59:38 UTC (rev 5497)
+++ trunk/src/keybindings.c 2010-12-24 13:31:39 UTC (rev 5498)
@@ -371,7 +371,8 @@
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"), NULL);
+ 0, 0, "edit_insertwhitespace", _("_Insert Alternative White Space"),
+ LW(insert_alternative_white_space1));
keybindings_set_item(group, GEANY_KEYS_INSERT_LINEBEFORE, NULL,
0, 0, "edit_insertlinebefore", _("Insert New Line Before Current"), NULL);
keybindings_set_item(group, GEANY_KEYS_INSERT_LINEAFTER, NULL,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list