Changeset 4270

Timestamp:

03/04/09 22:12:47 (4 years ago)

Author:

gpolo

Message:

Fixed ticket #125: Update the recent scans listing without needing to restart Umit.

Files:

• trunk/umit/gui/MainWindow.py (modified) (7 diffs)

trunk/umit/gui/MainWindow.py

@@ -363 +363 @@
 
         # This is the default, minimal UI
+
         self.default_ui = """<menubar>
             <menu action='Scan'>
@@ -369 +370 @@
             <menuitem action='Save Scan'/>
             <menuitem action='Open Scan'/>
-            %(recentscans)s
+            <placeholder name='RecentScans'>
+            </placeholder>
             <menuitem action='Quit'/>
             </menu>
@@ -421 +423 @@
             """
 
-        self.get_recent_scans()
-
         self.main_action_group.add_actions(self.main_actions)
 
@@ -431 +431 @@
         self.ui_manager.insert_action_group(self.main_action_group, 0)
         self.ui_manager.add_ui_from_string(self.default_ui)
- 
+
+        self._rscans_actiongroup = gtk.ActionGroup('UIRecentScans')
+        self.ui_manager.insert_action_group(self._rscans_actiongroup, 1)
+        self._rscans_merge_id = 0
+        self.update_recent_scans()
+
         self.schedctrl.ui_action = self.main_action_group.get_action(
                 'Sched Control')
@@ -699 +704 @@
                 raise
 
-
-    def get_recent_scans(self):
-        """Shows the most recent saved scans."""
+    def update_recent_scans(self):
+        """Shows the most recent saved scans in the 'Scan' menu."""
+        # clean previous recent scans listing, if any
+        if self._rscans_merge_id:
+            for action in self._rscans_actiongroup.list_actions():
+                self._rscans_actiongroup.remove_action(action)
+            self.ui_manager.remove_ui(self._rscans_merge_id)
+            # ensure_update is used here so we can be sure that the
+            # UIManager updates our UI. Not doing so will cause
+            # new items in the recent scans listing to appear at the
+            # end of the current listing.
+            self.ui_manager.ensure_update()
+
         r_scans = recent_scans.get_recent_scans_list()
+        rscans_ui = """
+        <menubar>
+            <menu action='Scan'>
+                <placeholder name='RecentScans'>
+                %s
+                </placeholder>
+            </menu>
+        </menubar>"""
         new_rscan_xml = ''
+
+        actions = []
 
         # Add the seven most recent saved scans to the menu.
@@ -718 +743 @@
                 new_rscan_xml += "<menuitem action='%s'/>\n" % \
                               xml.sax.saxutils.escape(scan)
-
-                self.main_actions.append(new_rscan)
-        else:
-            new_rscan_xml += "<separator />\n"
-
-        self.default_ui %= {'recentscans': new_rscan_xml}
+                actions.append(new_rscan)
+        new_rscan_xml += "<separator />\n"
+
+        self._rscans_actiongroup.add_actions(actions)
+        self._rscans_merge_id = self.ui_manager.add_ui_from_string(
+                rscans_ui % new_rscan_xml)
 
     def _create_menubar(self):
@@ -1091 +1116 @@
                 recent_scans.add_recent_scan(saved_filename)
                 recent_scans.save()
+                self.update_recent_scans()
 
         else: