Changeset 1452

Timestamp:

07/03/08 16:02:17 (5 months ago)

Author:

rob

Message:

Fixed #476 and #477: Added user directory for saved themes
* changed the Fonts class to use a style directory rather than the single styles.ess file
* changed editra.util.GetResourceFiles? to look at peppy font directory
* changed stcmixin.GetStyleSheet? to find user styles
* added additional dialog after the style editor to save the file to a (possibly) new name
* moved the global_style_set hack into Fundamental, which seems to solve the background color problems
* synced with Editra svn 54481

Location:

trunk/peppy

Files:

• configprefs.py (modified) (1 diff)
• editra/ed_style.py (modified) (6 diffs)
• editra/profiler.py (modified) (2 diffs)
• editra/stcmixin.py (modified) (4 diffs)
• editra/style_editor.py (modified) (1 diff)
• editra/util.py (modified) (3 diffs)
• fundamental.py (modified) (2 diffs)
• main.py (modified) (4 diffs)
• plugins/editra_styleeditor.py (modified) (1 diff)

trunk/peppy/configprefs.py

@@ -65 +65 @@
             d = self.dir
         return os.path.exists(d)
+    
+    def contents(self, subdir):
+        path = self.fullpath(subdir)
+        if os.path.exists(path):
+            return path, os.listdir(path)
+        return None, []
 
     def open(self, name, mode='r'):

trunk/peppy/editra/ed_style.py

@@ -21 +21 @@
 
 __author__ = "Cody Precord <cprecord@editra.org>"
-__svnid__ = "$Id: ed_style.py 54467 2008-07-02 19:51:00Z CJP $"
-__revision__ = "$Revision: 54467 $"
+__svnid__ = "$Id: ed_style.py 54472 2008-07-03 03:28:11Z CJP $"
+__revision__ = "$Revision: 54472 $"
 
 #--------------------------------------------------------------------------#
@@ -341 +341 @@
         """
         sty_dict = dict()
-        for key in self.GetStyleSet().keys():
+        for key in DefaultStyleDictionary().keys():
             if key in ('select_style', 'whitespace_style'):
                 sty_dict[key] = NullStyleItem()
@@ -424 +424 @@
         return fore
 
+    def GetCurrentStyleSetName(self):
+        """Get the name of the currently set style
+        @return: string
+
+        """
+        return self.style_set
+
     def GetDefaultBackColour(self, as_hex=False):
         """Gets the background color of the default style and returns
@@ -527 +534 @@
         elif not StyleMgr.STYLES.has_key(style_sheet):
             self.LOG("[ed_style][warn] Style sheet %s does not exists" % style_sheet)
+            # Reset to default style
+            Profile_Set('SYNTHEME', 'default')
             self.SetStyles('default', DefaultStyleDictionary())
             return False
@@ -699 +708 @@
 
         # For any undefined tags load them as empty items
-        for key in DefaultStyleDictionary().keys():
-            if key not in style_dict:
-                style_dict[key] = StyleItem()
+#        for key in DefaultStyleDictionary().keys():
+#            if key not in style_dict:
+#                style_dict[key] = StyleItem()
 
         return style_dict
@@ -766 +775 @@
 
             self.style_set = name
+            defaultd = DefaultStyleDictionary()
+            dstyle = style_dict.get('default_style', None)
+            if dstyle is None:
+                style_dict['default_style'] = defaultd['default_style']
+
             # Set any undefined styles to match the default_style
-            for tag, item in DefaultStyleDictionary().iteritems():
+            for tag, item in defaultd.iteritems():
                 if tag not in style_dict:
                     if tag in ['select_style', 'whitespace_style']:
                         style_dict[tag] = NullStyleItem()
-                    elif tag in ['foldmargin_style']:
+                    else:
                         style_dict[tag] = style_dict['default_style']
-                    else:
-                        style_dict[tag] = item
 
             StyleMgr.STYLES[name] = self.PackStyleSet(style_dict)

trunk/peppy/editra/profiler.py

@@ -14 +14 @@
             return font
         elif index == 'SYNTHEME':
-            theme = 'Default'
+            theme = app.fonts.classprefs.editra_style_theme
             return theme
     except:
@@ -21 +21 @@
     return None
 
-def Profile_Set(index, val, fmt):
+def Profile_Set(index, val, fmt=None):
+    app = wx.GetApp()
+    if index == 'SYNTHEME':
+        app.fonts.classprefs.editra_style_theme = val
     return None

trunk/peppy/editra/stcmixin.py

@@ -288 +288 @@
         self.LOG(syn_lst)
         valid_settings = list()
-        
-        # Here's the global hack to fix the problem the first time styles are
-        # modified by the style dialog.
-        if self.global_style_set:
-            self.style_set = self.global_style_set
-        self.dprint(self.style_set)
         
         for syn in syn_lst:
@@ -369 +363 @@
 
         """
+        self.dprint("current=%s" % self.style_set)
         self.StyleDefault()
         self.SetMargins(0, 0)
@@ -396 +391 @@
 
         """
+        self.dprint("requested=%s current=%s" % (spec_style, self.style_set))
         if spec_style != self.style_set:
             self.LoadStyleSheet(self.GetStyleSheet(spec_style), force=True)
@@ -463 +459 @@
                 style = sheet
                 break
-        dprint(style)
+        user = wx.GetApp().fonts.getStylePath(style)
+        if os.path.exists(user):
+            self.dprint("found user style %s at %s" % (style, user))
+            return user
         sysp = os.path.join(util.GetResourceDir('styles'), style)
         if os.path.exists(sysp):
+            self.dprint("found system style %s at %s" % (style, sysp))
             return sysp
+        self.dprint("didn't find %s" % style)
 #        user = os.path.join(ed_glob.CONFIG['STYLES_DIR'], style)
 #        sysp = os.path.join(ed_glob.CONFIG['SYS_STYLES_DIR'], style)

trunk/peppy/editra/style_editor.py

@@ -379 +379 @@
                 self.styles_new = DuplicateStyleDict(self.styles_orig)
                 self.preview.SetStyles('preview', self.styles_new, nomerge=True)
-                self.preview.UpdateBaseStyles()
+                self.preview.UpdateAllStyles('preview')
 
                 # For some reason this causes the text display to refresh

trunk/peppy/editra/util.py

@@ -23 +23 @@
     return rec_dir
 
-def GetResourceFiles(resource, trim=True, get_all=False, title=True):
+def GetResourceFiles(resource, trim=True, get_all=False, title=False):
     """Gets a list of resource files from a directory and trims the
     file extentions from the names if trim is set to True (default).
@@ -39 +39 @@
     rec_dir = GetResourceDir(resource)
     rec_list = list()
-    if not os.path.exists(rec_dir):
-        return -1
-    else:
+    if get_all:
+        user_dir, user_files = wx.GetApp().config.contents(resource)
+        #dprint("path=%s contents=%s" % (user_dir, user_files))
+        for rec in user_files:
+            if os.path.isfile(os.path.join(user_dir, rec)):
+                if trim:
+                    rec = rec.split(u".")[0]
+                if title:
+                    rec = rec.title()
+                rec_list.append(rec)
+    if os.path.exists(rec_dir):
         recs = os.listdir(rec_dir)
         #dprint(recs)
@@ -51 +59 @@
                     rec = rec.title()
                 rec_list.append(rec)
-        rec_list.sort()
-        return list(set(rec_list))
+    return list(set(rec_list))
     
 def GetExtension(file_str):

trunk/peppy/fundamental.py

@@ -137 +137 @@
     #: Default class preferences that relate to all instances of this major mode
     default_classprefs = (
-        StrParam('editra_style_sheet', '', 'Mode specific filename in the config directory containing Editra style sheet information.  Used to override default styles with custom styles for this mode.'),
         BoolParam('use_tab_characters', False,
                   'True: insert tab characters when tab is pressed.  False: insert the equivalent number of spaces instead.', local=True),
@@ -326 +325 @@
         self.SetStyleFont(wx.GetApp().fonts.classprefs.secondary_editing_font, False)
         self.dprint("font styling done in %0.5fs" % (time.time() - start))
+
+        # Here's the global hack to fix the problem the first time styles are
+        # modified by the style dialog.
+        if self.global_style_set and self.global_style_set != self.style_set:
+            self.style_set = self.global_style_set
+            self.dprint("Changing style to global style %s" % self.style_set)
         self.ConfigureLexer(self.editra_lang)
-        self.dprint("styleSTC (if True) done in %0.5fs" % (time.time() - start))
+        self.dprint("ConfigureLexer done in %0.5fs" % (time.time() - start))
         self.has_stc_styling = True
         self.setEmacsAndVIM()

trunk/peppy/main.py

@@ -5 +5 @@
 """
 
-import os, sys, imp, platform, random, string
+import os, sys, imp, platform, random, string, time
 import __builtin__
 
@@ -78 +78 @@
         FontParam('primary_editing_font', None, 'Font name of the primary editing font', fullwidth=True),
         FontParam('secondary_editing_font', None, 'Font name of the secondary scintilla font', fullwidth=True),
-        StrParam('editra_style_sheet', 'styles.ess', 'Filename in the config directory containing Editra style sheet information'),
+        StrParam('editra_style_theme', 'Default', 'Current Editra style theme'),
     )
     if wx.Platform == "__WXMAC__":
@@ -84 +84 @@
     else:
         default_fontsize = 10
+    
+    first_time = True
 
     def __init__(self):
@@ -93 +95 @@
             self.classprefs.secondary_editing_font = wx.Font(self.default_fontsize, wx.FONTFAMILY_SWISS, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL)
 
+    def getStylePath(self, name=None):
+        c = wx.GetApp().config
+        path = c.fullpath('styles')
+        if not os.path.exists(path):
+            c.create('styles')
+            #dprint("created %s" % path)
+            
+            # Handle conversion from old-style 'styles.ess' to new style
+            # directory of style files
+            if self.__class__.first_time:
+                source = c.fullpath('styles.ess')
+                #dprint("Looking for %s to rename" % source)
+                if os.path.exists(source):
+                    dest = os.path.join(path, '%s.ess' % time.strftime("%Y%m%d", time.localtime(time.time())))
+                    os.rename(source, dest)
+                self.__class__.first_time = False
+        if name:
+            if not name.endswith(".ess"):
+                name += ".ess"
+            path = os.path.join(path, name)
+        return path
+
     def getStyleFile(self, mode=None):
-        if mode:
-            # Find style sheet override if the mode specifies it
-            filename = mode.classprefs.editra_style_sheet
-        else:
-            filename = ''
-        if not filename:
-            filename = self.classprefs.editra_style_sheet
-        pathname = wx.GetApp().getConfigFilePath(filename)
+        pathname = self.getStylePath(self.classprefs.editra_style_theme)
         #dprint(pathname)
         return pathname

trunk/peppy/plugins/editra_styleeditor.py

@@ -38 +38 @@
         retval = dlg.ShowModal()
         if retval == wx.ID_OK:
-            styles = ed_style.MergeStyles(dlg.preview.BlankStyleDictionary(), dlg.styles_new)
-            dlg.preview.SetStyles(stylesheet, styles, True)
-            EditraSTCMixin.global_style_set = stylesheet
-            sheet = dlg.GenerateStyleSheet()
-            dprint(sheet)
-            fh = wx.GetApp().config.open(stylesheet, 'wb')
-            fh.write(sheet)
-            Publisher().sendMessage('peppy.preferences.changed')
+            # Find style name from controls within the dialog
+            ctrl = dlg.FindWindowById(style_editor.ed_glob.ID_PREF_SYNTHEME)
+            tag = ctrl.GetStringSelection()
+            ctrl = dlg.FindWindowById(wx.ID_NEW)
+            if ctrl.GetValue():
+                tag = "untitled"
+            dlg2 = wx.TextEntryDialog(
+                self.frame, message="Save Style Sheet", defaultValue=tag,
+                style=wx.OK|wx.CANCEL)
+            retval = dlg2.ShowModal()
+            tag = dlg2.GetValue()
+            if not tag:
+                tag = "untitled"
+            dlg2.Destroy()
+            
+            if retval == wx.ID_OK:
+                #dprint("Saving style to %s" % tag)
+                filename = wx.GetApp().fonts.getStylePath(tag)
+
+                styles = ed_style.MergeStyles(dlg.preview.BlankStyleDictionary(), dlg.styles_new)
+                dlg.preview.SetStyles(filename, styles, True)
+                EditraSTCMixin.global_style_set = filename
+                sheet = dlg.GenerateStyleSheet()
+                #dprint(sheet)
+                fh = open(filename, 'wb')
+                fh.write(sheet)
+                wx.GetApp().fonts.classprefs.editra_style_theme = tag
+                Publisher().sendMessage('peppy.preferences.changed')
         elif retval == wx.ID_SAVE:
             dprint("Save!")