[qet] qet/qet: [5114] icon theme: add new icons for titleblock placement ( bottom or right)

[subversion@xxxxxxxxxxxxx]

Revision: 5114
Author:   nuri
Date:     2017-11-26 09:03:26 +0100 (Sun, 26 Nov 2017)
Log Message:
-----------
icon theme: add new icons for titleblock placement (bottom or right)

Modified Paths:
--------------
    trunk/ico/copyright
    trunk/qelectrotech.qrc
    trunk/sources/qeticons.cpp
    trunk/sources/qeticons.h
    trunk/sources/ui/titleblockpropertieswidget.ui

Added Paths:
-----------
    trunk/ico/22x22/titleblock-bottom.png
    trunk/ico/22x22/titleblock-right.png

Added: trunk/ico/22x22/titleblock-bottom.png
===================================================================
(Binary files differ)

Index: trunk/ico/22x22/titleblock-bottom.png
===================================================================
--- trunk/ico/22x22/titleblock-bottom.png	2017-11-26 07:13:14 UTC (rev 5113)
+++ trunk/ico/22x22/titleblock-bottom.png	2017-11-26 08:03:26 UTC (rev 5114)

Property changes on: trunk/ico/22x22/titleblock-bottom.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/ico/22x22/titleblock-right.png
===================================================================
(Binary files differ)

Index: trunk/ico/22x22/titleblock-right.png
===================================================================
--- trunk/ico/22x22/titleblock-right.png	2017-11-26 07:13:14 UTC (rev 5113)
+++ trunk/ico/22x22/titleblock-right.png	2017-11-26 08:03:26 UTC (rev 5114)

Property changes on: trunk/ico/22x22/titleblock-right.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/ico/copyright
===================================================================
--- trunk/ico/copyright	2017-11-26 07:13:14 UTC (rev 5113)
+++ trunk/ico/copyright	2017-11-26 08:03:26 UTC (rev 5114)
@@ -198,6 +198,8 @@
     ico/22x22/single_page.png by Nuri from the QElectroTech team (License CC BY-ND 3.0)
     ico/22x22/terminal.png by Nuri from the QElectroTech team (License CC BY-ND 3.0)
     ico/22x22/terminalstrip.png by Nuri from the QElectroTech team (License CC BY-ND 3.0)
+    ico/22x22/titleblock-bottom.png by Nuri from the QElectroTech team (License CC BY-ND 3.0)
+    ico/22x22/titleblock-right.png by Nuri from the QElectroTech team (License CC BY-ND 3.0)
     ico/22x22/two_pages.png by Nuri from the QElectroTech team (License CC BY-ND 3.0)
     ico/32x32/qt.png from http://brand.qt.io/downloads/
     ico/32x32/simplifyrichtext.png by Nuri from the QElectroTech team (License CC BY-ND 3.0)

Modified: trunk/qelectrotech.qrc
===================================================================
--- trunk/qelectrotech.qrc	2017-11-26 07:13:14 UTC (rev 5113)
+++ trunk/qelectrotech.qrc	2017-11-26 08:03:26 UTC (rev 5114)
@@ -563,5 +563,7 @@
         <file>ico/16x16/select.png</file>
         <file>ico/16x16/grid.png</file>
         <file>ico/16x16/move.png</file>
+        <file>ico/22x22/titleblock-bottom.png</file>
+        <file>ico/22x22/titleblock-right.png</file>
     </qresource>
 </RCC>

Modified: trunk/sources/qeticons.cpp
===================================================================
--- trunk/sources/qeticons.cpp	2017-11-26 07:13:14 UTC (rev 5113)
+++ trunk/sources/qeticons.cpp	2017-11-26 08:03:26 UTC (rev 5114)
@@ -152,6 +152,8 @@
         QIcon TableOfContent;
         QIcon Terminal;
 		QIcon TitleBlock;
+        QIcon TitleBlockBottom;
+        QIcon TitleBlockRight;
 		QIcon UserInformations;
 		QIcon ViewFitWidth;
 		QIcon ViewFitWindow;
@@ -426,6 +428,8 @@
     TerminalStrip       .addFile(":/ico/22x22/terminalstrip.png");
     TitleBlock          .addFile(":/ico/16x16/label.png");
 	TitleBlock          .addFile(":/ico/22x22/label.png");
+    TitleBlockBottom    .addFile(":/ico/22x22/titleblock-bottom.png");
+    TitleBlockRight     .addFile(":/ico/22x22/titleblock-right.png");
 	UserInformations    .addFile(":/ico/16x16/preferences-desktop-user.png");
 	UserInformations    .addFile(":/ico/22x22/preferences-desktop-user.png");
 	ViewFitWidth        .addFile(":/ico/22x22/view_fit_width.png");

Modified: trunk/sources/qeticons.h
===================================================================
--- trunk/sources/qeticons.h	2017-11-26 07:13:14 UTC (rev 5113)
+++ trunk/sources/qeticons.h	2017-11-26 08:03:26 UTC (rev 5114)
@@ -161,6 +161,8 @@
         extern QIcon TableOfContent;
         extern QIcon Terminal;
 		extern QIcon TitleBlock;
+        extern QIcon TitleBlockBottom;
+        extern QIcon TitleBlockRight;
 		extern QIcon UserInformations;
 		extern QIcon ViewFitWidth;
 		extern QIcon ViewFitWindow;

Modified: trunk/sources/ui/titleblockpropertieswidget.ui
===================================================================
--- trunk/sources/ui/titleblockpropertieswidget.ui	2017-11-26 07:13:14 UTC (rev 5113)
+++ trunk/sources/ui/titleblockpropertieswidget.ui	2017-11-26 08:03:26 UTC (rev 5114)
@@ -55,30 +55,74 @@
         </item>
         <item>
          <widget class="QComboBox" name="m_display_at_cb">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>40</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>16777215</height>
+           </size>
+          </property>
           <property name="toolTip">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Affiche le cartouche en bas (horizontalement) ou à droite (verticalement) du folio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
+          <property name="iconSize">
+           <size>
+            <width>22</width>
+            <height>22</height>
+           </size>
+          </property>
           <item>
            <property name="text">
-            <string>en bas</string>
+            <string notr="true"> </string>
            </property>
+           <property name="icon">
+            <iconset resource="../../qelectrotech.qrc">
+             <normaloff>:/ico/22x22/titleblock-bottom.png</normaloff>:/ico/22x22/titleblock-bottom.png</iconset>
+           </property>
           </item>
           <item>
            <property name="text">
-            <string>à droite </string>
+            <string notr="true"> </string>
            </property>
+           <property name="icon">
+            <iconset resource="../../qelectrotech.qrc">
+             <normaloff>:/ico/22x22/titleblock-right.png</normaloff>:/ico/22x22/titleblock-right.png</iconset>
+           </property>
           </item>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="m_tbt_pb">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string/>
           </property>
           <property name="icon">
            <iconset resource="../../qelectrotech.qrc">
-            <normaloff>:/ico/16x16/label.png</normaloff>:/ico/16x16/label.png</iconset>
+            <normaloff>:/ico/22x22/edit-rename.png</normaloff>:/ico/22x22/edit-rename.png</iconset>
           </property>
+          <property name="iconSize">
+           <size>
+            <width>22</width>
+            <height>22</height>
+           </size>
+          </property>
           <property name="flat">
            <bool>false</bool>
           </property>