Mercurial Repositories > Kivy Project / changeset

diff -r a861fb8e019a -r 254bfe16b90d .hgignore
--- a/.hgignore	Sat Apr 26 16:49:05 2014 +0200
+++ b/.hgignore	Sun Jul 06 17:56:05 2014 +0200
@@ -1,18 +1,20 @@
-glob:.eric5project
-glob:_eric5project
-glob:.eric4project
-glob:_eric4project
-glob:.ropeproject
-glob:_ropeproject
-glob:.directory
-glob:**.pyc
-glob:**.pyo
-glob:**.orig
-glob:**.bak
-glob:**.rej
-glob:**~
-glob:cur
-glob:tmp
-glob:__pycache__
-glob:**.DS_Store
-glob:**Ui_*.py
+glob:.eric6project
+glob:_eric6project
+glob:.eric5project
+glob:_eric5project
+glob:.eric4project
+glob:_eric4project
+glob:.ropeproject
+glob:_ropeproject
+glob:.directory
+glob:**.pyc
+glob:**.pyo
+glob:**.orig
+glob:**.bak
+glob:**.rej
+glob:**~
+glob:cur
+glob:tmp
+glob:__pycache__
+glob:**.DS_Store
+glob:**Ui_*.py

diff -r a861fb8e019a -r 254bfe16b90d ChangeLog
--- a/ChangeLog	Sat Apr 26 16:49:05 2014 +0200
+++ b/ChangeLog	Sun Jul 06 17:56:05 2014 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 2.0.0:
+- ported for eric6 using PyQt5
+
 Version 1.2.0
 - added the Python2 compatibility flag
 

diff -r a861fb8e019a -r 254bfe16b90d PluginKivy.e4p
--- a/PluginKivy.e4p	Sat Apr 26 16:49:05 2014 +0200
+++ b/PluginKivy.e4p	Sun Jul 06 17:56:05 2014 +0200
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
-<!-- eric5 project file for project PluginKivy -->
+<!-- eric6 project file for project PluginKivy -->
+<!-- Copyright (C) 2014 Detlev Offenbach, detlev@die-offenbachs.de -->
 <Project version="5.1">
   <Language>en_US</Language>
   <Hash>edc66a361a68c8b839b94476f35c5809077c7a5d</Hash>
   <ProgLanguage mixed="0">Python3</ProgLanguage>
-  <ProjectType>E4Plugin</ProjectType>
+  <ProjectType>E6Plugin</ProjectType>
   <Description>A plug-in providing the 'Kivy' project type, syntax highlighter for Kivy files and  Kivy APIs.</Description>
-  <Version>1.1.x</Version>
+  <Version>2.0.x</Version>
   <Author>Detlev Offenbach</Author>
   <Email>detlev@die-offenbachs.de</Email>
   <TranslationPattern>ProjectKivy/i18n/kivy_%language%.ts</TranslationPattern>
@@ -172,7 +173,7 @@
               <string>cssFile</string>
             </key>
             <value>
-              <string>%PYTHON%/eric5/CSSs/default.css</string>
+              <string>%PYTHON%/eric6/CSSs/default.css</string>
             </value>
             <key>
               <string>ignoreDirectories</string>
@@ -183,6 +184,8 @@
                 <string>.ropeproject</string>
                 <string>_eric5project</string>
                 <string>_ropeproject</string>
+                <string>.eric6project</string>
+                <string>_eric6project</string>
               </list>
             </value>
             <key>

diff -r a861fb8e019a -r 254bfe16b90d PluginProjectKivy.py
--- a/PluginProjectKivy.py	Sat Apr 26 16:49:05 2014 +0200
+++ b/PluginProjectKivy.py	Sun Jul 06 17:56:05 2014 +0200
@@ -13,7 +13,7 @@
 import glob
 import fnmatch
 
-from PyQt4.QtCore import QObject, QTranslator
+from PyQt5.QtCore import QObject, QTranslator
 
 from E5Gui.E5Application import e5App
 
@@ -26,7 +26,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "1.2.0"
+version = "2.0.0"
 className = "ProjectKivyPlugin"
 packageName = "ProjectKivy"
 shortDescription = "Project support for Kivy projects."
@@ -101,13 +101,13 @@
         """
         try:
             self.__e5project.registerProjectType(
-                "Kivy", self.trUtf8("Kivy"), self.fileTypesCallback,
+                "Kivy", self.tr("Kivy"), self.fileTypesCallback,
                 lexerAssociationCallback=self.lexerAssociationCallback,
                 progLanguages=["Python2"])
         except TypeError:
             # for backward compatibility
             self.__e5project.registerProjectType(
-                "Kivy", self.trUtf8("Kivy"), self.fileTypesCallback,
+                "Kivy", self.tr("Kivy"), self.fileTypesCallback,
                 lexerAssociationCallback=self.lexerAssociationCallback)
         
         from Project.ProjectBrowser import SourcesBrowserFlag, \
@@ -125,22 +125,22 @@
         if self.__ui.versionIsNewer('5.3.5', '20130611'):
             QScintilla.Lexers.registerLexer(
                 "Pygments|Kivy",
-                self.trUtf8("Kivy"),
+                self.tr("Kivy"),
                 "dummy.kv",
                 self.getLexer,
-                [self.trUtf8('Kivy Files (*.kv *.kivy)')],
-                [self.trUtf8('Kivy Files (*.kv)')],
+                [self.tr('Kivy Files (*.kv *.kivy)')],
+                [self.tr('Kivy Files (*.kv)')],
                 ['*.kv', '*.kivy']
             )
         else:
             # work around a bug in older versions
             QScintilla.Lexers.registerLexer(
                 "Pygments|Kivy",
-                self.trUtf8("Kivy"),
+                self.tr("Kivy"),
                 "dummy.kv",
                 self.getLexer,
-                self.trUtf8('Kivy Files (*.kv *.kivy)'),
-                self.trUtf8('Kivy Files (*.kv)'),
+                self.tr('Kivy Files (*.kv *.kivy)'),
+                self.tr('Kivy Files (*.kv)'),
                 ['*.kv', '*.kivy']
             )
         

diff -r a861fb8e019a -r 254bfe16b90d PluginProjectKivy.zip
Binary file PluginProjectKivy.zip has changed

diff -r a861fb8e019a -r 254bfe16b90d ProjectKivy/Documentation/source/index-Plugin_Project_Kivy.ProjectKivy.html
--- a/ProjectKivy/Documentation/source/index-Plugin_Project_Kivy.ProjectKivy.html	Sat Apr 26 16:49:05 2014 +0200
+++ b/ProjectKivy/Documentation/source/index-Plugin_Project_Kivy.ProjectKivy.html	Sun Jul 06 17:56:05 2014 +0200
@@ -21,7 +21,7 @@
 <body>
 <h1>Plugin_Project_Kivy.ProjectKivy</h1>
 <p>
-Package implementing project support for eric5 Kivy projects.
+Package implementing project support for eric6 Kivy projects.
 </p>
 
 

diff -r a861fb8e019a -r 254bfe16b90d ProjectKivy/Documentation/source/index-Plugin_Project_Kivy.html
--- a/ProjectKivy/Documentation/source/index-Plugin_Project_Kivy.html	Sat Apr 26 16:49:05 2014 +0200
+++ b/ProjectKivy/Documentation/source/index-Plugin_Project_Kivy.html	Sun Jul 06 17:56:05 2014 +0200
@@ -28,7 +28,7 @@
 <table>
 <tr>
 <td><a href="index-Plugin_Project_Kivy.ProjectKivy.html">ProjectKivy</a></td>
-<td>Package implementing project support for eric5 Kivy projects.</td>
+<td>Package implementing project support for eric6 Kivy projects.</td>
 </tr>
 </table>
 

diff -r a861fb8e019a -r 254bfe16b90d ProjectKivy/__init__.py
--- a/ProjectKivy/__init__.py	Sat Apr 26 16:49:05 2014 +0200
+++ b/ProjectKivy/__init__.py	Sun Jul 06 17:56:05 2014 +0200
@@ -1,8 +1,8 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2013 - 2014 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-"""
-Package implementing project support for eric5 Kivy projects.
-"""
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2013 - 2014 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Package implementing project support for eric6 Kivy projects.
+"""