moved the font dialog to a separate plugin

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@1113 bbaffbd6-741e-11dd-a85d-61de82d9cad9

share/ui/models.ui

@@ -5,7 +5,7 @@
   <object class="GtkListStore" id="ModelList">
     <columns>
       <!-- column-name id -->
-      <column type="gint"/>
+      <column type="gulong"/>
       <!-- column-name name -->
       <column type="gchararray"/>
       <!-- column-name state -->

src/pycam/Gui/Settings.py

@@ -94,9 +94,14 @@ class Settings(object):
 
     def get(self, key, default=None):
         if self.items.has_key(key):
-            return self.items[key][self.GET_INDEX]()
+            try:
+                result = self.items[key][self.GET_INDEX]()
+            except TypeError, err_msg:
+                log.info("Failed to retrieve setting '%s': %s" % (key, err_msg))
+                result = None
         else:
-            return default
+            result = default
+        return result
 
     def set(self, key, value):
         if not self.items.has_key(key):

src/pycam/Plugins/Models.py

@@ -35,6 +35,7 @@ class Models(pycam.Plugins.ListPluginBase):
     ATTRIBUTE_MAP = {"name": COLUMN_NAME, "visible": COLUMN_VISIBLE,
             "color": COLUMN_COLOR, "alpha": COLUMN_ALPHA}
     ICONS = {"visible": "visible.svg", "hidden": "visible_off.svg"}
+    # TODO: move this to the preferences dialog
     DEFAULT_COLOR = (0.5, 0.5, 1.0, 1.0)
 
     def setup(self):

src/pycam/Plugins/Toolpaths.py

@@ -26,7 +26,7 @@ import pycam.Plugins
 class Toolpaths(pycam.Plugins.ListPluginBase):
 
     def setup(self):
-        self.core.add_item("toolpaths", self)
+        self.core.add_item("toolpaths", lambda: self)
         return True
 
     def teardown(self):

src/pycam/Utils/FontCache.py

@@ -99,11 +99,13 @@ class FontCache(object):
         if self.core:
             progress = self.core.get("progress")
             progress.set_multiple(len(self._unused_font_files), "Loading font")
+        else:
+            progress = None
         while not self.is_loading_complete():
-            if self.core:
-                progress.update_multiple()
             self._load_next_file(progress=progress)
-        if self.core:
+            if progress:
+                progress.update_multiple()
+        if progress:
             progress.finish()
 
     def _load_next_file(self, progress=None):
@@ -112,11 +114,11 @@ class FontCache(object):
         filename = self._unused_font_files.pop(0)
         if progress:
             callback = progress.update
+            progress.update(text="Loading font file %s" % \
+                    os.path.basename(filename))
         else:
             callback = None
         charset = pycam.Importers.CXFImporter.import_font(filename, callback=callback)
-        if progress:
-            progress.finish()
         if not charset is None:
             for name in charset.get_names():
                 self.fonts[name] = charset