Changeset 3134

Timestamp:

07/11/08 01:17:35 (5 years ago)

Author:

nopper

Message:

restart umit warning fixes

Location:

branch/UmitPlugins

Files:

• higwidgets/higrichlists.py (modified) (2 diffs)
• umitPlugin/PathPage.py (modified) (1 diff)
• umitPlugin/PluginPage.py (modified) (4 diffs)

branch/UmitPlugins/higwidgets/higrichlists.py

@@ -333 +333 @@
     def set_activatable(self, value):
         self._activatable = value
-    
+        self.__on_activate(self)
+
     def get_saturate(self):
         return self._saturate
@@ -412 +413 @@
 
         self.vbox.foreach(remove, self.vbox)
+    
+    def get_rows(self):
+        return len(self.vbox)
 
     def foreach(self, callback, userdata):

branch/UmitPlugins/umitPlugin/PathPage.py

@@ -196 +196 @@
         self.p_window.engine.plugins.save_changes()
 
-        # Warn the user
-        self.p_window.animated_bar.label = \
-            _('Remember that you have to restart umit to changes makes effect')
-        self.p_window.animated_bar.start_animation(True)
-
         PluginEngine().recache()
-        self.p_window.plug_page.clear(False)
+
+        if self.p_window.plug_page.clear(False) > 0:
+            # Warn the user
+            self.p_window.animated_bar.label = _("Remember that you have to "
+                                                 "restart umit to changes makes"
+                                                 ". Plugins disable pending.")
+            self.p_window.animated_bar.start_animation(True)
+
+            def block_row(row, blah):
+                row.activatable = False
+                row.message = _("Need umit restart to disable.")
+
+            self.p_window.plug_page.richlist.foreach(block_row, None)
+
         self.p_window.plug_page.populate()

branch/UmitPlugins/umitPlugin/PluginPage.py

@@ -91 +91 @@
 
         self.richlist.foreach(remove, self.richlist)
+        return self.richlist.get_rows()
 
     def populate(self):
         "Populate the richlist using avaiable_plugins field"
 
+        # We need a list of present plugin row to check for dup
+        presents = []
+
+        def add_to_list(row, list):
+            list.append(row)
+
+        self.richlist.foreach(add_to_list, presents)
+
+        warn_reboot = False
+
         # We have to load avaiable_plugins from engine
         for reader in self.p_window.engine.avaiable_plugins:
+
+            # Check if it's already present then remove the original
+            # and add the new in case something is getting update.
             row = PluginRow(self.richlist, reader)
+
+            for old in presents:
+                # FIXME? we need to check also for version equality
+                # and if are different just ignore the addition and
+                # continue with the loop
+                if old.reader.get_path() == row.reader.get_path():
+                    self.richlist.remove_row(old)
+                    row.enabled = True
+                    warn_reboot = True
 
             # Connect the various buttons
@@ -108 +131 @@
 
             self.richlist.append_row(row)
-    
+
+        if warn_reboot:
+            # Warn the user
+            self.p_window.animated_bar.label = \
+                _('Remember that you have to restart umit to make new version' \
+                  ' of plugins to be loaded correctly.')
+            self.p_window.animated_bar.start_animation(True)
+
     def __on_restart(self, widget):
         "Called when the user click on the restart button"
@@ -241 +271 @@
 
             self.p_window.update_eng.updating = False
+            self.find_updates_btn.set_sensitive(True)
+            self.menu_enabled = True
+
+            self.populate()
             return
 
@@ -337 +371 @@
         "Popup menu"
 
-        if not self.menu_enabled:
+        if not self.menu_enabled or not row.activatable:
             return