[gnome-mud] Menu cleanup patch
- From: Daniel Patton <seven-nation army com>
- To: gnome-mud-list gnome org
- Subject: [gnome-mud] Menu cleanup patch
- Date: Fri, 06 Jan 2006 15:20:29 +1100
More patches! When will it end?!
This one cleans up the menus a bit, hopefully it's a bit more readable
now.
--
Daniel Patton <seven-nation army com>
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-mud/ChangeLog,v
retrieving revision 1.366
diff -u -r1.366 ChangeLog
--- ChangeLog 6 Jan 2006 02:54:26 -0000 1.366
+++ ChangeLog 6 Jan 2006 04:12:51 -0000
@@ -1,3 +1,8 @@
+2006-01-06 Daniel Patton <seven-nation army com>
+
+ * ui/main.glade, src/mud-window.c:
+ Menu fixup.
+
2006-01-06 Jordi Mallach <jordi sindominio net>
* src/Makefile.am, src/data.c, src/directions.c, src/directions.h,
Index: src/mud-window.c
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/mud-window.c,v
retrieving revision 1.14
diff -u -r1.14 mud-window.c
--- src/mud-window.c 5 Jan 2006 19:42:09 -0000 1.14
+++ src/mud-window.c 6 Jan 2006 04:12:52 -0000
@@ -463,9 +463,6 @@
const GList *profiles;
GList *entry;
GtkWidget *profile;
- GtkWidget *sep;
- GtkWidget *manage;
- GtkWidget *icon;
window->priv->profileMenuList = NULL;
@@ -484,18 +481,6 @@
g_signal_connect(G_OBJECT(profile), "activate", G_CALLBACK(mud_window_select_profile), window);
}
-
- sep = gtk_separator_menu_item_new();
- gtk_widget_show(sep);
- gtk_menu_shell_append(GTK_MENU_SHELL(window->priv->mi_profiles), sep);
-
- icon = gtk_image_new_from_stock("gtk-edit", GTK_ICON_SIZE_MENU);
-
- manage = gtk_image_menu_item_new_with_mnemonic(_("_Manage Profiles..."));
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(manage), icon);
- gtk_widget_show(manage);
- gtk_menu_shell_append(GTK_MENU_SHELL(window->priv->mi_profiles), manage);
- g_signal_connect(manage, "activate", G_CALLBACK(mud_window_profiles_cb), window);
}
static void
@@ -573,6 +558,8 @@
window->priv->image = glade_xml_get_widget(glade, "image");
g_signal_connect(glade_xml_get_widget(glade, "toggle_input"), "clicked", G_CALLBACK(mud_window_inputtoggle_cb), window);
+
+ g_signal_connect(glade_xml_get_widget(glade, "manage_profiles1"), "activate", G_CALLBACK(mud_window_profiles_cb), window);
g_signal_connect(glade_xml_get_widget(glade, "plugin_list"), "activate", G_CALLBACK(do_plugin_information), NULL);
Index: ui/main.glade
===================================================================
RCS file: /cvs/gnome/gnome-mud/ui/main.glade,v
retrieving revision 1.14
diff -u -r1.14 main.glade
--- ui/main.glade 4 Jan 2006 13:10:32 -0000 1.14
+++ ui/main.glade 6 Jan 2006 04:12:52 -0000
@@ -45,13 +45,13 @@
<child>
<widget class="GtkImageMenuItem" id="main_connect">
<property name="visible">True</property>
- <property name="label" translatable="yes">C_onnection...</property>
+ <property name="label" translatable="yes">Quick c_onnect...</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_connection_wizard1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image165">
+ <widget class="GtkImage" id="image214">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -72,7 +72,7 @@
<signal name="activate" handler="on_mudlist_listing1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image166">
+ <widget class="GtkImage" id="image215">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -94,12 +94,12 @@
<child>
<widget class="GtkImageMenuItem" id="menu_connect">
<property name="visible">True</property>
- <property name="label" translatable="yes">Q_uick Connect...</property>
+ <property name="label" translatable="yes">Co_nnect...</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_connect1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image167">
+ <widget class="GtkImage" id="image216">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -120,7 +120,7 @@
<signal name="activate" handler="on_disconnect1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image168">
+ <widget class="GtkImage" id="image217">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -141,7 +141,7 @@
<signal name="activate" handler="on_reconnect1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image169">
+ <widget class="GtkImage" id="image218">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -161,16 +161,46 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="start_logging1">
+ <widget class="GtkMenuItem" id="menu_closewindow">
<property name="visible">True</property>
- <property name="label" translatable="yes">Start _Logging...</property>
+ <property name="label" translatable="yes">Close _Window</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_start_logging1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
+ <signal name="activate" handler="on_close_window1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="menu_quit">
+ <property name="visible">True</property>
+ <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
+ <signal name="activate" handler="mud_window_close" last_modification_time="Mon, 16 Feb 2004 12:35:53 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="buffer1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Buffer</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="buffer1_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="save_buffer1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Save..</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_save_buffer1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image170">
+ <widget class="GtkImage" id="image219">
<property name="visible">True</property>
- <property name="stock">gtk-new</property>
+ <property name="stock">gtk-save</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -182,16 +212,16 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="stop_logging1">
+ <widget class="GtkImageMenuItem" id="start_logging1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Stop Lo_gging</property>
+ <property name="label" translatable="yes">Start _Logging...</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_stop_logging1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
+ <signal name="activate" handler="on_start_logging1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image171">
+ <widget class="GtkImage" id="image220">
<property name="visible">True</property>
- <property name="stock">gtk-close</property>
+ <property name="stock">gtk-new</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -203,16 +233,16 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="save_buffer1">
+ <widget class="GtkImageMenuItem" id="stop_logging1">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Save Buffer...</property>
+ <property name="label" translatable="yes">Stop Lo_gging</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_save_buffer1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
+ <signal name="activate" handler="on_stop_logging1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image172">
+ <widget class="GtkImage" id="image221">
<property name="visible">True</property>
- <property name="stock">gtk-save</property>
+ <property name="stock">gtk-close</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -222,35 +252,6 @@
</child>
</widget>
</child>
-
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator6">
- <property name="visible">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="menu_closewindow">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Close _Window</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_close_window1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator7">
- <property name="visible">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="menu_quit">
- <property name="visible">True</property>
- <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
- <signal name="activate" handler="mud_window_close" last_modification_time="Mon, 16 Feb 2004 12:35:53 GMT"/>
- </widget>
- </child>
</widget>
</child>
</widget>
@@ -267,7 +268,7 @@
<child>
<widget class="GtkMenuItem" id="mi_profiles">
<property name="visible">True</property>
- <property name="label" translatable="yes">P_rofiles</property>
+ <property name="label" translatable="yes">Switch _Profile</property>
<property name="use_underline">True</property>
<child>
@@ -284,46 +285,48 @@
</child>
<child>
+ <widget class="GtkImageMenuItem" id="manage_profiles1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Manage Profiles</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="mud_window_profiles_cb" last_modification_time="Fri, 06 Jan 2006 03:58:26 GMT"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image222">
+ <property name="visible">True</property>
+ <property name="stock">gtk-edit</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>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkSeparatorMenuItem" id="separator10">
<property name="visible">True</property>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="plugin_menu">
+ <widget class="GtkImageMenuItem" id="plugin_list">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Plugins</property>
+ <property name="label" translatable="yes">M_angage plugins...</property>
<property name="use_underline">True</property>
+ <signal name="activate" handler="on_plugin_list_activate" last_modification_time="Mon, 02 Jan 2006 00:45:48 GMT"/>
- <child>
- <widget class="GtkMenu" id="plugin_menu_menu">
-
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator9">
- <property name="visible">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="plugin_list">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Plugin _Information...</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_plugin_list_activate" last_modification_time="Mon, 02 Jan 2006 00:45:48 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image173">
- <property name="visible">True</property>
- <property name="stock">gtk-info</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>
- </widget>
- </child>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image223">
+ <property name="visible">True</property>
+ <property name="stock">gtk-info</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>
</widget>
[
Date Prev][Date Next] [
Thread Prev][Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
