Mercurial Repositories > Selection Encloser Tool / changeset

--- a/ChangeLog	Mon Apr 21 18:46:07 2014 +0200
+++ b/ChangeLog	Tue Apr 22 18:40:09 2014 +0200
@@ -1,4 +1,8 @@
 ChangeLog
 ---------
+Version 0.2.0:
+- added capability to insert a separator
+- added Spanish translations
+
 Version 0.1.0:
 - first development release

--- a/PKGLIST	Mon Apr 21 18:46:07 2014 +0200
+++ b/PKGLIST	Tue Apr 22 18:40:09 2014 +0200
@@ -8,6 +8,7 @@
 SelectionEncloser/__init__.py
 SelectionEncloser/i18n/selectionencloser_de.qm
 SelectionEncloser/i18n/selectionencloser_en.qm
+SelectionEncloser/i18n/selectionencloser_es.qm
 SelectionEncloser/icons/edit.png
 SelectionEncloser/icons/selectionEncloser.png
 SelectionEncloser/icons/topAdd.png

--- a/PluginSelectionEncloser.py	Mon Apr 21 18:46:07 2014 +0200
+++ b/PluginSelectionEncloser.py	Tue Apr 22 18:40:09 2014 +0200
@@ -24,7 +24,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "0.1.0"
+version = "0.2.0"
 className = "SelectionEncloserPlugin"
 packageName = "SelectionEncloser"
 shortDescription = "Enclose the selection with a string."
@@ -112,6 +112,7 @@
                 ['<h1>', '<h1>{0}</h1>'],
                 ['<h2>', '<h2>{0}</h2>'],
                 ['<h3>', '<h3>{0}</h3>'],
+                ['--Separator--', ''],
                 ['<p>', '<p>{0}</p>'],
                 ['<div>', '<div>{0}</div>'],
                 ['<span>', '<span>{0}</span>'],
@@ -296,11 +297,17 @@
         self.__menu.clear()
         hierarchy = self.getPreferences("MenuHierarchy")
         for menuTitle, entries in hierarchy:
-            submenu = QMenu(menuTitle, self.__menu)
-            for title, encString in entries:
-                act = submenu.addAction(title, self.__encloseSelection)
-                act.setData(encString)
-            self.__menu.addMenu(submenu)
+            if menuTitle == '--Separator--':
+                self.__menu.addSeparator()
+            else:
+                submenu = QMenu(menuTitle, self.__menu)
+                for title, encString in entries:
+                    if title == '--Separator--':
+                        submenu.addSeparator()
+                    else:
+                        act = submenu.addAction(title, self.__encloseSelection)
+                        act.setData(encString)
+                self.__menu.addMenu(submenu)
     
     def __encloseSelection(self):
         """

Binary file PluginSelectionEncloser.zip has changed

--- a/SelectionEncloser.e4p	Mon Apr 21 18:46:07 2014 +0200
+++ b/SelectionEncloser.e4p	Tue Apr 22 18:40:09 2014 +0200
@@ -31,6 +31,7 @@
     <Translation>SelectionEncloser/i18n/selectionencloser_de.ts</Translation>
     <Translation>SelectionEncloser/i18n/selectionencloser_en.qm</Translation>
     <Translation>SelectionEncloser/i18n/selectionencloser_de.qm</Translation>
+    <Translation>SelectionEncloser/i18n/selectionencloser_es.qm</Translation>
   </Translations>
   <Resources/>
   <Interfaces/>
@@ -45,6 +46,7 @@
     <Other>SelectionEncloser/Documentation/source</Other>
     <Other>PKGLIST</Other>
     <Other>PluginSelectionEncloser.zip</Other>
+    <Other>SelectionEncloser/icons/separatorAdd.png</Other>
   </Others>
   <MainScript>PluginSelectionEncloser.py</MainScript>
   <Vcs>

--- a/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py	Mon Apr 21 18:46:07 2014 +0200
+++ b/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py	Tue Apr 22 18:40:09 2014 +0200
@@ -43,9 +43,12 @@
         self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
         self.addMenuButton.setIcon(UI.PixmapCache.getIcon(
             os.path.join("SelectionEncloser", "icons", "topAdd.png")))
+        self.addSeparatorButton.setIcon(UI.PixmapCache.getIcon(
+            os.path.join("SelectionEncloser", "icons", "separatorAdd.png")))
         
         self.editButton.setEnabled(False)
         self.addButton.setEnabled(False)
+        self.addSeparatorButton.setEnabled(False)
         self.deleteButton.setEnabled(False)
         self.upButton.setEnabled(False)
         self.downButton.setEnabled(False)
@@ -55,8 +58,12 @@
         # set initial values
         hierarchy = self.__plugin.getPreferences("MenuHierarchy")
         for menuTitle, entries in hierarchy:
+            if menuTitle == '--Separator--':
+                menuTitle = self.tr('--Separator--')
             top = QTreeWidgetItem(self.menuTree, [menuTitle])
             for title, encString in entries:
+                if title == '--Separator--':
+                    title = self.tr('--Separator--')
                 itm = QTreeWidgetItem(top, [title])
                 itm.setData(0, Qt.UserRole, encString)
             top.setExpanded(True)
@@ -68,10 +75,16 @@
         hierarchy = []
         for topIndex in range(self.menuTree.topLevelItemCount()):
             topItem = self.menuTree.topLevelItem(topIndex)
-            topEntry = [topItem.text(0), []]
+            menuTitle = topItem.text(0)
+            if menuTitle == self.tr('--Separator--'):
+                menuTitle = '--Separator--'
+            topEntry = [menuTitle, []]
             for index in range(topItem.childCount()):
                 itm = topItem.child(index)
-                topEntry[1].append([itm.text(0), itm.data(0, Qt.UserRole)])
+                title = itm.text(0)
+                if title == self.tr('--Separator--'):
+                    title = '--Separator--'
+                topEntry[1].append([title, itm.data(0, Qt.UserRole)])
             hierarchy.append(topEntry)
         self.__plugin.setPreferences("MenuHierarchy", hierarchy)
     
@@ -102,6 +115,23 @@
             itm.setData(0, Qt.UserRole, encString)
     
     @pyqtSlot()
+    def on_addSeparatorButton_clicked(self):
+        """
+        Private slot to add a separator entry below the selected entry.
+        """
+        selItm = self.menuTree.selectedItems()[0]
+        parent = selItm.parent()
+        itm = QTreeWidgetItem([self.tr('--Separator--')])
+        if parent is None:
+            # top level item
+            index = self.menuTree.indexOfTopLevelItem(selItm) + 1
+            self.menuTree.insertTopLevelItem(index, itm)
+        else:
+            # sub item
+            index = parent.indexOfChild(selItm) + 1
+            parent.insertChild(index, itm)
+    
+    @pyqtSlot()
     def on_deleteButton_clicked(self):
         """
         Private slot to delete the selected entry.
@@ -186,6 +216,7 @@
         """
         if len(self.menuTree.selectedItems()) == 0:
             self.addButton.setEnabled(False)
+            self.addSeparatorButton.setEnabled(False)
             self.deleteButton.setEnabled(False)
             self.upButton.setEnabled(False)
             self.downButton.setEnabled(False)
@@ -212,6 +243,7 @@
                     downEnable = False
                 addEnable = False
             self.addButton.setEnabled(addEnable)
+            self.addSeparatorButton.setEnabled(True)
             self.deleteButton.setEnabled(True)
             self.upButton.setEnabled(upEnable)
             self.downButton.setEnabled(downEnable)

--- a/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui	Mon Apr 21 18:46:07 2014 +0200
+++ b/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui	Tue Apr 22 18:40:09 2014 +0200
@@ -40,7 +40,7 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0" rowspan="7">
+     <item row="0" column="0" rowspan="8">
       <widget class="QTreeWidget" name="menuTree">
        <property name="alternatingRowColors">
         <bool>true</bool>
@@ -77,27 +77,34 @@
       </widget>
      </item>
      <item row="3" column="1">
+      <widget class="QToolButton" name="addSeparatorButton">
+       <property name="toolTip">
+        <string>Press to add a separator entry below the selected entry</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
       <widget class="QToolButton" name="deleteButton">
        <property name="toolTip">
         <string>Press to delete the selected item</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
+     <item row="5" column="1">
       <widget class="QToolButton" name="upButton">
        <property name="toolTip">
         <string>Press to move the selected entry up</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
+     <item row="6" column="1">
       <widget class="QToolButton" name="downButton">
        <property name="toolTip">
         <string>Press to move the selected entry down</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="1">
+     <item row="7" column="1">
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
@@ -119,6 +126,7 @@
   <tabstop>editButton</tabstop>
   <tabstop>addMenuButton</tabstop>
   <tabstop>addButton</tabstop>
+  <tabstop>addSeparatorButton</tabstop>
   <tabstop>deleteButton</tabstop>
   <tabstop>upButton</tabstop>
   <tabstop>downButton</tabstop>

--- a/SelectionEncloser/Documentation/source/Plugin_Tools_Selection_Encloser.SelectionEncloser.ConfigurationPage.SelectionEncloserPage.html	Mon Apr 21 18:46:07 2014 +0200
+++ b/SelectionEncloser/Documentation/source/Plugin_Tools_Selection_Encloser.SelectionEncloser.ConfigurationPage.SelectionEncloserPage.html	Tue Apr 22 18:40:09 2014 +0200
@@ -69,6 +69,9 @@
 <td><a href="#SelectionEncloserPage.on_addMenuButton_clicked">on_addMenuButton_clicked</a></td>
 <td>Private slot to add a top level menu item.</td>
 </tr><tr>
+<td><a href="#SelectionEncloserPage.on_addSeparatorButton_clicked">on_addSeparatorButton_clicked</a></td>
+<td>Private slot to add a separator entry below the selected entry.</td>
+</tr><tr>
 <td><a href="#SelectionEncloserPage.on_deleteButton_clicked">on_deleteButton_clicked</a></td>
 <td>Private slot to delete the selected entry.</td>
 </tr><tr>
@@ -117,6 +120,11 @@
 <b>on_addMenuButton_clicked</b>(<i></i>)
 <p>
         Private slot to add a top level menu item.
+</p><a NAME="SelectionEncloserPage.on_addSeparatorButton_clicked" ID="SelectionEncloserPage.on_addSeparatorButton_clicked"></a>
+<h4>SelectionEncloserPage.on_addSeparatorButton_clicked</h4>
+<b>on_addSeparatorButton_clicked</b>(<i></i>)
+<p>
+        Private slot to add a separator entry below the selected entry.
 </p><a NAME="SelectionEncloserPage.on_deleteButton_clicked" ID="SelectionEncloserPage.on_deleteButton_clicked"></a>
 <h4>SelectionEncloserPage.on_deleteButton_clicked</h4>
 <b>on_deleteButton_clicked</b>(<i></i>)

Binary file SelectionEncloser/i18n/selectionencloser_de.qm has changed

--- a/SelectionEncloser/i18n/selectionencloser_de.ts	Mon Apr 21 18:46:07 2014 +0200
+++ b/SelectionEncloser/i18n/selectionencloser_de.ts	Tue Apr 22 18:40:09 2014 +0200
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
+<!DOCTYPE TS><TS version="2.0" language="de_DE" sourcelanguage="">
 <context>
     <name>SelectionEncloserEditDialog</name>
     <message>
@@ -62,40 +61,50 @@
         <translation>Drücken, um einen neuen Menüeintrag zu erstellen</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="82"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="89"/>
         <source>Press to delete the selected item</source>
         <translation>Drücken, um den ausgewählten Eintrag zu löschen</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="89"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="96"/>
         <source>Press to move the selected entry up</source>
         <translation>Drücken, um den ausgewählten Eintrag nach oben zu verschieben</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="96"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="103"/>
         <source>Press to move the selected entry down</source>
         <translation>Drücken, um den ausgewählten Eintrag nach unten zu verschieben</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="83"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="96"/>
         <source>Menu Title</source>
         <translation>Menutitel</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="83"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="96"/>
         <source>Enter menu title:</source>
         <translation>Gib den Menütitel ein:</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="164"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/>
         <source>Menu Entry</source>
         <translation>Menüeintrag</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="164"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/>
         <source>Enter menu entry text:</source>
         <translation>Gib den Menüeintrag ein:</translation>
     </message>
+    <message>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="82"/>
+        <source>Press to add a separator entry below the selected entry</source>
+        <translation>Drücken, um eine Trennlinie nach dem ausgewählten Eintrag einzufügen</translation>
+    </message>
+    <message>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="124"/>
+        <source>--Separator--</source>
+        <translation>--Trennlinie--</translation>
+    </message>
 </context>
 <context>
     <name>SelectionEncloserPlugin</name>

--- a/SelectionEncloser/i18n/selectionencloser_en.ts	Mon Apr 21 18:46:07 2014 +0200
+++ b/SelectionEncloser/i18n/selectionencloser_en.ts	Tue Apr 22 18:40:09 2014 +0200
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
+<!DOCTYPE TS><TS version="2.0" language="en_US" sourcelanguage="">
 <context>
     <name>SelectionEncloserEditDialog</name>
     <message>
@@ -62,40 +61,50 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="82"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="89"/>
         <source>Press to delete the selected item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="89"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="96"/>
         <source>Press to move the selected entry up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="96"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="103"/>
         <source>Press to move the selected entry down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="83"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="96"/>
         <source>Menu Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="83"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="96"/>
         <source>Enter menu title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="164"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/>
         <source>Menu Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="164"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/>
         <source>Enter menu entry text:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="82"/>
+        <source>Press to add a separator entry below the selected entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="124"/>
+        <source>--Separator--</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectionEncloserPlugin</name>

Binary file SelectionEncloser/i18n/selectionencloser_es.qm has changed

--- a/SelectionEncloser/i18n/selectionencloser_es.ts	Mon Apr 21 18:46:07 2014 +0200
+++ b/SelectionEncloser/i18n/selectionencloser_es.ts	Tue Apr 22 18:40:09 2014 +0200
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<!DOCTYPE TS><TS version="2.0" language="es_ES" sourcelanguage="">
 <context>
     <name>SelectionEncloserEditDialog</name>
     <message>
@@ -62,40 +61,50 @@
         <translation>Pulsar para añadir un nuevo elemento de menú</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="82"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="89"/>
         <source>Press to delete the selected item</source>
         <translation>Pulsar para borrar el elemento seleccinado</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="89"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="96"/>
         <source>Press to move the selected entry up</source>
         <translation>Pulsar para mover la entrada seleccionada hacia arriba</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="96"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="103"/>
         <source>Press to move the selected entry down</source>
         <translation>Pulsar para mover la entrada seleccionada hacia abajo</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="83"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="96"/>
         <source>Menu Title</source>
         <translation>Título de Menú</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="83"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="96"/>
         <source>Enter menu title:</source>
         <translation>Introducir el título del menú:</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="164"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/>
         <source>Menu Entry</source>
         <translation>Entrada de Menú</translation>
     </message>
     <message>
-        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="164"/>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/>
         <source>Enter menu entry text:</source>
         <translation>Introducir el texto de la entrada de menú:</translation>
     </message>
+    <message>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui" line="82"/>
+        <source>Press to add a separator entry below the selected entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="124"/>
+        <source>--Separator--</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectionEncloserPlugin</name>

Binary file SelectionEncloser/icons/separatorAdd.png has changed