Modified menuitem icons

diff --git a/gwit.glade b/gwit.glade
index 79189f8..b3cfb24 100644 (file)
--- a/gwit.glade
+++ b/gwit.glade
@@ -263,21 +263,21 @@
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="menuitem_reteet_with_comment">
-        <property name="label" translatable="yes">Retweet with comment</property>
+      <object class="GtkImageMenuItem" id="menuitem_retweet">
+        <property name="label" translatable="yes">Retweet</property>
         <property name="visible">True</property>
-        <property name="image">image5</property>
+        <property name="image">image2</property>
         <property name="use_stock">False</property>
-        <signal name="activate" handler="on_menuitem_reteet_with_comment_activate"/>
+        <signal name="activate" handler="on_menuitem_retweet_activate"/>
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="menuitem_retweet">
-        <property name="label" translatable="yes">Retweet</property>
+      <object class="GtkImageMenuItem" id="menuitem_reteet_with_comment">
+        <property name="label" translatable="yes">Retweet with comment</property>
         <property name="visible">True</property>
-        <property name="image">image2</property>
+        <property name="image">image5</property>
         <property name="use_stock">False</property>
-        <signal name="activate" handler="on_menuitem_retweet_activate"/>
+        <signal name="activate" handler="on_menuitem_reteet_with_comment_activate"/>
       </object>
     </child>
     <child>
@@ -291,7 +291,7 @@
     </child>
     <child>
       <object class="GtkImageMenuItem" id="Delete">
-        <property name="label" translatable="yes">Delete</property>
+        <property name="label" translatable="yes">Destroy</property>
         <property name="visible">True</property>
         <property name="image">image8</property>
         <property name="use_stock">False</property>
@@ -305,7 +305,7 @@
     </child>
     <child>
       <object class="GtkImageMenuItem" id="menuitem_usertl">
-        <property name="label" translatable="yes">Show User Timeline</property>
+        <property name="label" translatable="yes">User Timeline</property>
         <property name="visible">True</property>
         <property name="image">image4</property>
         <property name="use_stock">False</property>
@@ -313,18 +313,18 @@
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="URLs">
-        <property name="label" translatable="yes">URL</property>
+      <object class="GtkImageMenuItem" id="mentioned_user">
+        <property name="label" translatable="yes">Mentioned users</property>
         <property name="visible">True</property>
-        <property name="image">image6</property>
+        <property name="image">image7</property>
         <property name="use_stock">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="mentioned_user">
-        <property name="label" translatable="yes">Mentioned users</property>
+      <object class="GtkImageMenuItem" id="URLs">
+        <property name="label" translatable="yes">URL</property>
         <property name="visible">True</property>
-        <property name="image">image7</property>
+        <property name="image">image6</property>
         <property name="use_stock">False</property>
       </object>
     </child>
@@ -343,23 +343,23 @@
   </object>
   <object class="GtkImage" id="image4">
     <property name="visible">True</property>
-    <property name="stock">gtk-new</property>
+    <property name="stock">gtk-add</property>
   </object>
   <object class="GtkImage" id="image5">
     <property name="visible">True</property>
     <property name="yalign">0.47999998927116394</property>
-    <property name="stock">gtk-missing-image</property>
+    <property name="stock">gtk-refresh</property>
   </object>
   <object class="GtkImage" id="image6">
     <property name="visible">True</property>
     <property name="stock">gtk-home</property>
   </object>
-  <object class="GtkImage" id="image7">
+  <object class="GtkImage" id="image8">
     <property name="visible">True</property>
-    <property name="stock">gtk-find</property>
+    <property name="stock">gtk-delete</property>
   </object>
-  <object class="GtkImage" id="image8">
+  <object class="GtkImage" id="image7">
     <property name="visible">True</property>
-    <property name="stock">gtk-missing-image</property>
+    <property name="stock">gtk-find</property>
   </object>
 </interface>

diff --git a/timeline.py b/timeline.py
index e5347ad..7360a6d 100644 (file)
--- a/timeline.py
+++ b/timeline.py
@@ -278,7 +278,8 @@ class timeline:
                     label = "%s..." % i[:47] if len(i) > 50 else i
                     
                     # Menuitem create
-                    item = gtk.MenuItem(label)
+                    item = gtk.ImageMenuItem(label)
+                    item.set_image(gtk.image_new_from_stock("gtk-new", gtk.ICON_SIZE_MENU))
                     # Connect click event (open browser)
                     item.connect("activate",
                                  self._menuitem_url_clicked, i)
@@ -290,14 +291,15 @@ class timeline:
                 item.set_sensitive(False)
                 m.append(item)            
             # urls submenu append
-            self.pmenu.get_children()[-2].set_submenu(m)
+            self.pmenu.get_children()[-1].set_submenu(m)
             
             # Mentioned User Menu
             mm = gtk.Menu()
             if users:
                 for i in users:
                     # Menuitem create
-                    item = gtk.MenuItem("@%s" % i.replace("_", "__"))
+                    item = gtk.ImageMenuItem("@%s" % i.replace("_", "__"))
+                    item.set_image(gtk.image_new_from_stock("gtk-add", gtk.ICON_SIZE_MENU))
                     # Connect click event (add tab)
                     item.connect("activate",
                                  self._menuitem_user_clicked, i)
@@ -308,7 +310,7 @@ class timeline:
                 item = gtk.MenuItem("None")
                 item.set_sensitive(False)
                 mm.append(item)
-            self.pmenu.get_children()[-1].set_submenu(mm)
+            self.pmenu.get_children()[-2].set_submenu(mm)
             
             # Show popup menu
             m.show_all()