Mercurial Repositories > Django Project / changeset

--- a/ChangeLog	Wed Dec 21 12:21:28 2016 +0100
+++ b/ChangeLog	Wed Dec 21 19:56:31 2016 +0100
@@ -1,5 +1,10 @@
 ChangeLog
 ---------
+Version 5.0.1:
+- bug fixes
+- some more eye-candy
+- added some more console commands to select
+
 Version 5.0.0:
 - bug fixes
 - adjustments for Django >= 1.9.0

--- a/PluginProjectDjango.py	Wed Dec 21 12:21:28 2016 +0100
+++ b/PluginProjectDjango.py	Wed Dec 21 19:56:31 2016 +0100
@@ -28,7 +28,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "5.0.0"
+version = "5.0.1"
 className = "ProjectDjangoPlugin"
 packageName = "ProjectDjango"
 shortDescription = "Project support for Django projects."

--- a/ProjectDjango/ConfigurationPage/DjangoPage.py	Wed Dec 21 12:21:28 2016 +0100
+++ b/ProjectDjango/ConfigurationPage/DjangoPage.py	Wed Dec 21 19:56:31 2016 +0100
@@ -12,6 +12,7 @@
 from PyQt5.QtCore import pyqtSlot
 
 from E5Gui import E5FileDialog
+from E5Gui.E5Completers import E5DirCompleter, E5FileCompleter
 
 from Preferences.ConfigurationPages.ConfigurationPageBase import \
     ConfigurationPageBase
@@ -20,6 +21,7 @@
 from Globals import isWindowsPlatform, isMacPlatform
 
 import Utilities
+import UI.PixmapCache
 
 
 class DjangoPage(ConfigurationPageBase, Ui_DjangoPage):
@@ -36,6 +38,14 @@
         self.setupUi(self)
         self.setObjectName("DjangoPage")
         
+        self.virtualEnvPy3Button.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.virtualEnvPy2Button.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.translationsButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+        
+        self.__virtualEnvPy3Completer = E5DirCompleter(self.virtualEnvPy3Edit)
+        self.__virtualEnvPy2Completer = E5DirCompleter(self.virtualEnvPy2Edit)
+        self.__translationsCompleter = E5FileCompleter(self.translationsEdit)
+        
         self.__plugin = plugin
         
         consoleList = []
@@ -46,8 +56,9 @@
             consoleList.append("/opt/X11/bin/xterm -e")
         else:
             consoleList.append("@konsole --workdir . -e")
-            # KDE4 konsole spawns
+            # KDE4/5 konsole spawns
             consoleList.append("gnome-terminal -e")
+            consoleList.append("mate-terminal -e")
             consoleList.append("xfce4-terminal -e")
             consoleList.append("xterm -e")
         
@@ -59,8 +70,9 @@
             consoleNoCloseList.append("/opt/X11/bin/xterm -hold -e")
         else:
             consoleNoCloseList.append("@konsole --noclose --workdir . -e")
-            # KDE4 konsole spawns
-            consoleNoCloseList.append("gnome-terminal -e")
+            # KDE4/5 konsole spawns
+            consoleNoCloseList.append("gnome-terminal --profile=<noclose> -e")
+            consoleNoCloseList.append("mate-terminal --profile=<noclose> -e")
             consoleNoCloseList.append("xfce4-terminal --hold -e")
             consoleNoCloseList.append("xterm -hold -e")
         

--- a/ProjectDjango/ConfigurationPage/DjangoPage.ui	Wed Dec 21 12:21:28 2016 +0100
+++ b/ProjectDjango/ConfigurationPage/DjangoPage.ui	Wed Dec 21 19:56:31 2016 +0100
@@ -244,13 +244,10 @@
           <widget class="QLineEdit" name="virtualEnvPy3Edit"/>
          </item>
          <item row="1" column="1">
-          <widget class="QPushButton" name="virtualEnvPy3Button">
+          <widget class="QToolButton" name="virtualEnvPy3Button">
            <property name="toolTip">
             <string>Select the virtual environment directory via a selection dialog</string>
            </property>
-           <property name="text">
-            <string>...</string>
-           </property>
           </widget>
          </item>
         </layout>
@@ -325,13 +322,10 @@
           <widget class="QLineEdit" name="virtualEnvPy2Edit"/>
          </item>
          <item row="1" column="1">
-          <widget class="QPushButton" name="virtualEnvPy2Button">
+          <widget class="QToolButton" name="virtualEnvPy2Button">
            <property name="toolTip">
             <string>Select the virtual environment directory via a selection dialog</string>
            </property>
-           <property name="text">
-            <string>...</string>
-           </property>
           </widget>
          </item>
         </layout>
@@ -400,13 +394,10 @@
        <widget class="QLineEdit" name="translationsEdit"/>
       </item>
       <item row="1" column="1">
-       <widget class="QPushButton" name="translationsButton">
+       <widget class="QToolButton" name="translationsButton">
         <property name="toolTip">
          <string>Select the translations editor via a file selection dialog</string>
         </property>
-        <property name="text">
-         <string>...</string>
-        </property>
        </widget>
       </item>
      </layout>

--- a/ProjectDjango/Project.py	Wed Dec 21 12:21:28 2016 +0100
+++ b/ProjectDjango/Project.py	Wed Dec 21 19:56:31 2016 +0100
@@ -56,7 +56,8 @@
         @keyparam args list of parameters (list of strings)
         @keyparam mode access mode (QIODevice.OpenMode)
         """
-        if cmd.endswith(('gnome-terminal', 'konsole')):
+        if cmd.endswith(('gnome-terminal', 'konsole', 'xfce4-terminal',
+                         'mate-terminal')):
             if '-e' in args:
                 index = args.index('-e') + 1
                 cargs = ' '.join(args[index:])
@@ -75,7 +76,8 @@
         @keyparam path new working directory (string)
         @return tuple of successful start and process id (boolean, integer)
         """
-        if cmd.endswith(('gnome-terminal', 'konsole')):
+        if cmd.endswith(('gnome-terminal', 'konsole', 'xfce4-terminal',
+                         'mate-terminal')):
             if '-e' in args:
                 index = args.index('-e') + 1
                 cargs = ' '.join(args[index:])