Merge lp:~alphapapa/pithos/904589-fixed into lp:~kevin-mehall/pithos/trunk

[Adam Porter]

Added Quit menu item using JC Hulce's patch. #904589

Unmerged revisions

183. By Adam Porter on 2011-12-17

Fixed quit and about menu items.

182. By JC Hulce on 2011-12-15

* Add a quit item to the menu lp:904589

=== modified file 'data/ui/PithosWindow.ui'
--- data/ui/PithosWindow.ui	2011-11-09 15:44:39 +0000
+++ data/ui/PithosWindow.ui	2011-12-17 04:11:23 +0000
@@ -410,11 +410,21 @@
       <object class="GtkImageMenuItem" id="menuitem_about">
         <property name="label">gtk-about</property>
         <property name="visible">True</property>
-        <property name="use_underline">True</property>
+        <property name="image">image14</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="about"/>
       </object>
     </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem_quit">
+        <property name="label">_Quit</property>
+        <property name="visible">True</property>
+         <property name="image">image15</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="quit"/>
+      </object>
+    </child>
   </object>
   <object class="GtkImage" id="image6">
     <property name="visible">True</property>
@@ -468,6 +478,14 @@
     <property name="visible">True</property>
     <property name="stock">gtk-cancel</property>
   </object>
+  <object class="GtkImage" id="image14">
+    <property name="visible">True</property>
+    <property name="stock">gtk-about</property>
+  </object>
+  <object class="GtkImage" id="image15">
+    <property name="visible">True</property>
+    <property name="stock">gtk-quit</property>
+  </object>
   <object class="GtkMessageDialog" id="messagedialog1">
     <property name="border_width">5</property>
     <property name="type_hint">normal</property>