Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Tue Apr 01 19:43:36 2014 +0200
+++ b/APIs/Python3/eric5.api	Wed Apr 02 18:58:09 2014 +0200
@@ -7091,6 +7091,7 @@
 eric5.QScintilla.Lexers.Lexer.Lexer.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.Lexer.Lexer.isStringStyle?4(style)
 eric5.QScintilla.Lexers.Lexer.Lexer.keywords?4(kwSet)
+eric5.QScintilla.Lexers.Lexer.Lexer.lexerName?4()
 eric5.QScintilla.Lexers.Lexer.Lexer.smartIndentLine?4(editor)
 eric5.QScintilla.Lexers.Lexer.Lexer.smartIndentSelection?4(editor)
 eric5.QScintilla.Lexers.Lexer.Lexer.streamCommentStr?4()
@@ -7291,6 +7292,7 @@
 eric5.QScintilla.Lexers.LexerQSS.LexerQSS.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerQSS.LexerQSS.isStringStyle?4(style)
 eric5.QScintilla.Lexers.LexerQSS.LexerQSS.language?4()
+eric5.QScintilla.Lexers.LexerQSS.LexerQSS.lexerName?4()
 eric5.QScintilla.Lexers.LexerQSS.LexerQSS?1(parent=None)
 eric5.QScintilla.Lexers.LexerRegistry?7
 eric5.QScintilla.Lexers.LexerRuby.LexerRuby.autoCompletionWordSeparators?4()

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/APIs/QSS/qss.api	Wed Apr 02 18:58:09 2014 +0200
@@ -0,0 +1,95 @@
+QAbstractScrollArea
+QCheckBox
+QColumnView
+QComboBox
+QDateEdit
+QDateTimeEdit
+QDialog
+QDialogButtonBox
+QDockWidget
+QDoubleSpinBox
+QFrame
+QGroupBox
+QHeaderView
+QLabel
+QLineEdit
+QListView
+QListWidget
+QMainWindow
+QMenu
+QMenuBar
+QMessageBox
+QProgressBar
+QPushButton
+QRadioButton
+QScrollBar
+QSizeGrip
+QSlider
+QSpinBox
+QSplitter
+QStatusBar
+QTabBar
+QTabWidget
+QTableView
+QTableWidget
+QTextEdit
+QTimeEdit
+QToolBar
+QToolButton
+QToolBox
+QToolTip
+QTreeView
+QTreeWidget
+QWidget
+top
+bottom
+left
+right
+center
+scroll
+fixed
+none
+stretch
+repeat
+dashed
+dot-dash
+dot-dot-dash
+dotted
+double
+inset
+outset
+ridge
+solid
+none
+normal
+italic
+oblique
+bold
+qlineargradient
+qradialgradient
+qconicalgradient
+margin
+border
+padding
+content
+alternate-base
+base
+bright-text
+button
+button-text
+dark
+highlight
+highlighted-text
+light
+link
+link-visited
+mid
+midlight
+shadow
+text
+window
+window-text
+repeat
+repeat-x
+repeat-y
+no-repeat

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Tue Apr 01 19:43:36 2014 +0200
+++ b/Documentation/Help/source.qhp	Wed Apr 02 18:58:09 2014 +0200
@@ -7444,6 +7444,7 @@
       <keyword name="Lexer.isCommentStyle" id="Lexer.isCommentStyle" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.isCommentStyle" />
       <keyword name="Lexer.isStringStyle" id="Lexer.isStringStyle" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.isStringStyle" />
       <keyword name="Lexer.keywords" id="Lexer.keywords" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.keywords" />
+      <keyword name="Lexer.lexerName" id="Lexer.lexerName" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.lexerName" />
       <keyword name="Lexer.smartIndentLine" id="Lexer.smartIndentLine" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.smartIndentLine" />
       <keyword name="Lexer.smartIndentSelection" id="Lexer.smartIndentSelection" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.smartIndentSelection" />
       <keyword name="Lexer.streamCommentStr" id="Lexer.streamCommentStr" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.streamCommentStr" />
@@ -7663,6 +7664,7 @@
       <keyword name="LexerQSS.isCommentStyle" id="LexerQSS.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerQSS.html#LexerQSS.isCommentStyle" />
       <keyword name="LexerQSS.isStringStyle" id="LexerQSS.isStringStyle" ref="eric5.QScintilla.Lexers.LexerQSS.html#LexerQSS.isStringStyle" />
       <keyword name="LexerQSS.language" id="LexerQSS.language" ref="eric5.QScintilla.Lexers.LexerQSS.html#LexerQSS.language" />
+      <keyword name="LexerQSS.lexerName" id="LexerQSS.lexerName" ref="eric5.QScintilla.Lexers.LexerQSS.html#LexerQSS.lexerName" />
       <keyword name="LexerRuby" id="LexerRuby" ref="eric5.QScintilla.Lexers.LexerRuby.html#LexerRuby" />
       <keyword name="LexerRuby (Constructor)" id="LexerRuby (Constructor)" ref="eric5.QScintilla.Lexers.LexerRuby.html#LexerRuby.__init__" />
       <keyword name="LexerRuby (Module)" id="LexerRuby (Module)" ref="eric5.QScintilla.Lexers.LexerRuby.html" />

--- a/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Tue Apr 01 19:43:36 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Wed Apr 02 18:58:09 2014 +0200
@@ -96,6 +96,9 @@
 <td><a href="#Lexer.keywords">keywords</a></td>
 <td>Public method to get the keywords.</td>
 </tr><tr>
+<td><a href="#Lexer.lexerName">lexerName</a></td>
+<td>Public method to return the lexer name.</td>
+</tr><tr>
 <td><a href="#Lexer.smartIndentLine">smartIndentLine</a></td>
 <td>Public method to handle smart indentation for a line.</td>
 </tr><tr>
@@ -249,6 +252,16 @@
 <dd>
 string giving the keywords (string) or None
 </dd>
+</dl><a NAME="Lexer.lexerName" ID="Lexer.lexerName"></a>
+<h4>Lexer.lexerName</h4>
+<b>lexerName</b>(<i></i>)
+<p>
+        Public method to return the lexer name.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+lexer name (string)
+</dd>
 </dl><a NAME="Lexer.smartIndentLine" ID="Lexer.smartIndentLine"></a>
 <h4>Lexer.smartIndentLine</h4>
 <b>smartIndentLine</b>(<i>editor</i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerQSS.html	Tue Apr 01 19:43:36 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerQSS.html	Wed Apr 02 18:58:09 2014 +0200
@@ -74,6 +74,9 @@
 </tr><tr>
 <td><a href="#LexerQSS.language">language</a></td>
 <td>Public method to return the lexer language.</td>
+</tr><tr>
+<td><a href="#LexerQSS.lexerName">lexerName</a></td>
+<td>Public method to return the lexer name.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -150,6 +153,16 @@
 <dd>
 lexer language (string)
 </dd>
+</dl><a NAME="LexerQSS.lexerName" ID="LexerQSS.lexerName"></a>
+<h4>LexerQSS.lexerName</h4>
+<b>lexerName</b>(<i></i>)
+<p>
+        Public method to return the lexer name.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+lexer name (string)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/QScintilla/APIsManager.py	Tue Apr 01 19:43:36 2014 +0200
+++ b/QScintilla/APIsManager.py	Wed Apr 02 18:58:09 2014 +0200
@@ -183,9 +183,9 @@
                     Globals.getPyQt4ModulesDirectory(), "qsci")
                 if os.path.exists(qsciPath):
                     # it's the installer
-                    if self.__lexer.lexer() is not None:
+                    if self.__lexer.lexerName() is not None:
                         apidir = os.path.join(qsciPath, "api",
-                                              self.__lexer.lexer())
+                                              self.__lexer.lexerName())
                         fnames = []
                         filist = QDir(apidir).entryInfoList(
                             ["*.api"], QDir.Files, QDir.IgnoreCase)

--- a/QScintilla/Lexers/Lexer.py	Tue Apr 01 19:43:36 2014 +0200
+++ b/QScintilla/Lexers/Lexer.py	Wed Apr 02 18:58:09 2014 +0200
@@ -223,3 +223,11 @@
                 return kw
         else:
             return self.defaultKeywords(kwSet)
+    
+    def lexerName(self):
+        """
+        Public method to return the lexer name.
+        
+        @return lexer name (string)
+        """
+        return self.lexer()

--- a/QScintilla/Lexers/LexerQSS.py	Tue Apr 01 19:43:36 2014 +0200
+++ b/QScintilla/Lexers/LexerQSS.py	Wed Apr 02 18:58:09 2014 +0200
@@ -31,10 +31,6 @@
             'start': '/* ',
             'end': ' */'
         }
-        
-        # TODO: add QSS API generation
-        
-        # TODO: fix styling, it uses CSS styles
     
     def initProperties(self):
         """
@@ -152,3 +148,11 @@
         @return lexer language (string)
         """
         return "QSS"
+    
+    def lexerName(self):
+        """
+        Public method to return the lexer name.
+        
+        @return lexer name (string)
+        """
+        return "QSS"

--- a/changelog	Tue Apr 01 19:43:36 2014 +0200
+++ b/changelog	Wed Apr 02 18:58:09 2014 +0200
@@ -12,6 +12,9 @@
 - Editor
   -- added a scrolling map like display showing all markers
   -- added a context menu entry to reload a file with a given encoding
+  -- added a lexer for Qt style sheet files (when upgrading from older
+     eric versions a change of the lexer association for *.qss files needs
+     to be done via the configuration dialog)
 - Multi Project
   -- added support for the categorisation of projects and changed the
      multi project file format

--- a/eric5.e4p	Tue Apr 01 19:43:36 2014 +0200
+++ b/eric5.e4p	Wed Apr 02 18:58:09 2014 +0200
@@ -1606,6 +1606,7 @@
     <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Wikia.xml</Other>
     <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Wikipedia.xml</Other>
     <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Wiktionary.xml</Other>
+    <Other>APIs/QSS/qss.api</Other>
   </Others>
   <MainScript>eric5.py</MainScript>
   <Vcs>

--- a/install.py	Tue Apr 01 19:43:36 2014 +0200
+++ b/install.py	Wed Apr 02 18:58:09 2014 +0200
@@ -30,7 +30,7 @@
 doCleanup = True
 doCompile = True
 cfg = {}
-progLanguages = ["Python", "Ruby"]
+progLanguages = ["Python", "Ruby", "QSS"]
 sourceDir = "eric"
 configName = 'eric5config.py'
 defaultMacAppBundleName = "eric5.app"

--- a/uninstall.py	Tue Apr 01 19:43:36 2014 +0200
+++ b/uninstall.py	Wed Apr 02 18:58:09 2014 +0200
@@ -23,7 +23,7 @@
 # Define the globals.
 progName = None
 pyModDir = None
-progLanguages = ["Python", "Ruby"]
+progLanguages = ["Python", "Ruby", "QSS"]
 
 
 def exit(rcode=0):