blam r562 - trunk/src

[cmartin svn gnome org]

Author: cmartin
Date: Thu Apr 24 14:46:46 2008
New Revision: 562
URL: http://svn.gnome.org/viewvc/blam?rev=562&view=rev

Log:
Make some items use GTK+ definitions.

This includes the list-channel popup menu and the menubar.


Modified:
   trunk/src/ChannelList.cs
   trunk/src/blam.glade

Modified: trunk/src/ChannelList.cs
==============================================================================
--- trunk/src/ChannelList.cs	(original)
+++ trunk/src/ChannelList.cs	Thu Apr 24 14:46:46 2008
@@ -364,7 +364,9 @@
             GtkUtil.AppendMenuSeparator (popup_menu);
             GtkUtil.AppendMenuItem (popup_menu,
                                     Catalog.GetString ("_Edit"),
-                                    new EventHandler (EmitEditCb));
+                                    "gtk-edit",
+                                    new EventHandler (EmitEditCb),
+                                    true);
             GtkUtil.AppendMenuItem (popup_menu,
                                     Catalog.GetString ("Remo_ve"),
                                     "gtk-remove",

Modified: trunk/src/blam.glade
==============================================================================
--- trunk/src/blam.glade	(original)
+++ trunk/src/blam.glade	Thu Apr 24 14:46:46 2008
@@ -99,17 +99,11 @@
                     <child>
                       <widget class="GtkImageMenuItem" id="new_channel2">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Add</property>
+                        <property name="label">gtk-add</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                         <signal name="activate" handler="AddChannelActivated"/>
                         <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image231">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-add</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
                       </widget>
                     </child>
                     <child>
@@ -120,17 +114,11 @@
                     <child>
                       <widget class="GtkImageMenuItem" id="refreshChannelMenuItem">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Refresh</property>
+                        <property name="label">gtk-refresh</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                         <signal name="activate" handler="RefreshChannelActivated"/>
                         <accelerator key="R" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image232">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-refresh</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
                       </widget>
                     </child>
                     <child>
@@ -143,26 +131,21 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkMenuItem" id="editChannelMenuItem">
+                      <widget class="GtkImageMenuItem" id="editChannelMenuItem">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Edit</property>
+                        <property name="label">gtk-edit</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                         <signal name="activate" handler="EditChannelActivated"/>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="removeChannelMenuItem">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Remo_ve</property>
+                        <property name="label">gtk-remove</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                         <signal name="activate" handler="RemoveChannelActivated"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image233">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-remove</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
                       </widget>
                     </child>
                     <child>