Update of /cvsroot/player/mid/src
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv12421

Modified Files:
	constant.py toolbar_view.py top_menu.py 
Log Message:
fixed bug #8076

Index: constant.py
===================================================================
RCS file: /cvsroot/player/mid/src/constant.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- constant.py	5 Jun 2008 15:48:16 -0000	1.13
+++ constant.py	5 Sep 2008 18:45:30 -0000	1.14
@@ -230,6 +230,7 @@
 MENU_ROTATE_CLOCKWISE = _("Rotate clockwise")
 MENU_ROTATE_COUNTERCLOCKWISE = _("Rotate counter-clockwise")
 MENU_NAME = _("Name")
+MENU_DATE = _("Date")
 MENU_SIZE = _("Size")
 
 THUMB_SORT_FILENAME = 0

Index: toolbar_view.py
===================================================================
RCS file: /cvsroot/player/mid/src/toolbar_view.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- toolbar_view.py	2 Jul 2008 20:32:09 -0000	1.15
+++ toolbar_view.py	5 Sep 2008 18:45:30 -0000	1.16
@@ -299,13 +299,13 @@
             sorttype = self.app.view[mode].get_photo_thumbnail().get_sort_type()
             if visible:
                 if sorttype == 0:
+                    # Sorted by name, so show Sort by Date btn
+                    self.ph_sort_name_btn.hide()
+                    self.ph_sort_date_btn.show()
+                else:
                     # Sorted by date, so show Sort by Name btn
                     self.ph_sort_name_btn.show()
                     self.ph_sort_date_btn.hide()
-                else:
-                    # Sort by name, so show Sort by Date btn
-                    self.ph_sort_name_btn.hide()
-                    self.ph_sort_date_btn.show()
             else:
                 self.ph_sort_name_btn.hide()
                 self.ph_sort_date_btn.hide()
@@ -313,13 +313,13 @@
             sorttype = self.app.view[mode].get_video_thumbnail().get_sort_type()
             if visible:
                 if sorttype == 0:
-                    # Sorted by date, so show Sort by Name btn                    
-                    self.vd_sort_name_btn.show()
-                    self.vd_sort_date_btn.hide()
-                else:
-                    # Sort by name, so show Sort by Date btn
+                    # Sorted by name, so show Sort by Dame btn           
                     self.vd_sort_name_btn.hide()
                     self.vd_sort_date_btn.show()
+                else:
+                    # Sorted by date, so show Sort by Name btn
+                    self.vd_sort_name_btn.show()
+                    self.vd_sort_date_btn.hide()
             else:
                 self.vd_sort_name_btn.hide()
                 self.vd_sort_date_btn.hide()
@@ -887,6 +887,9 @@
             elif mode == 'video':
                 self.vd_sort_date_btn.hide()
                 self.vd_sort_name_btn.show()
+
+            # set "sort by date" in top menu being selected
+            self.app.TopMenu.item_date.set_active(True)
         elif value == 'name':
             if mode == 'photo':
                 self.ph_sort_name_btn.hide()
@@ -895,6 +898,9 @@
                 self.vd_sort_name_btn.hide()
                 self.vd_sort_date_btn.show()
 
+            # set "sort by name" in top menu being selected
+            self.app.TopMenu.item_name.set_active(True)
+
     def set_photo_autoplay_image_change(self):
         self.pm_autoplay_button.hide()
         self.pm_pause_button.show()

Index: top_menu.py
===================================================================
RCS file: /cvsroot/player/mid/src/top_menu.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- top_menu.py	4 Sep 2008 23:11:58 -0000	1.9
+++ top_menu.py	5 Sep 2008 18:45:30 -0000	1.10
@@ -121,13 +121,16 @@
 
     def create_sort_sub_menu(self):
         menu_sort = gtk.Menu()
-        self.item_name = gtk.MenuItem(_(constant.MENU_NAME))
-        self.item_name.connect('activate',self.on_sort_name)
-        menu_sort.append(self.item_name)
         
-        self.item_size = gtk.MenuItem(_(constant.MENU_SIZE))
-        self.item_size.connect('activate',self.on_sort_size)
-        menu_sort.append(self.item_size)        
+        self.item_name = gtk.RadioMenuItem(None, constant.MENU_NAME, True)
+        self.item_name.set_active(True)
+        self.item_name.connect('activate', self.on_sort_name)
+        menu_sort.append(self.item_name)
+
+        self.item_date = gtk.RadioMenuItem(self.item_name, constant.MENU_DATE, True)
+        self.item_date.connect('activate', self.on_sort_date)
+        menu_sort.append(self.item_date)
+
         return menu_sort
 
     def update_menu(self, item_is_selected):
@@ -302,25 +305,22 @@
     def on_active_item_view(self,wiget,event):
         self.update_show_hide_labels_menu()
 
-    def on_sort_name(self,widget):
-        hint_window.HintWindow().show_hint(constant.MSG_PHOTO_SORT_BY_NAME)
+    def __on_sort(self,widget,hint,type):
+        hint_window.HintWindow().show_hint(hint)
 
         thumbnail = self.app.get_current_thumb()
         if (thumbnail == None):
             return
-        thumbnail.set_sort_type(constant.THUMB_SORT_FILENAME)
+        thumbnail.set_sort_type(type)
         cur_mode = self.app.get_thumb_current_mode()
         mode = cur_mode + '-thumb'
         self.app.view['toolbar'].change_mode(mode,cur_mode)
 
-    def on_sort_size(self,widget):
-        hint_window.HintWindow().show_hint(constant.MSG_PHOTO_SORT_BY_SIZE)
-
-        thumbnail = self.app.get_current_thumb()
-        if (thumbnail == None):
-            return
-        thumbnail.set_sort_type(constant.THUMB_SORT_SIZE)
+    def on_sort_name(self,widget):
+        self.__on_sort(widget,constant.MSG_PHOTO_SORT_BY_NAME,constant.THUMB_SORT_FILENAME)
 
+    def on_sort_date(self,widget):
+        self.__on_sort(widget,constant.MSG_PHOTO_SORT_BY_DATE,constant.THUMB_SORT_DATE)
 
     ##for Mode menu handler
     def on_mode_normal(self,widget):