Added new 32x32 icons.

glabels/Icons.h

@@ -423,7 +423,7 @@ namespace glabels
 		public:
 			FilePrint()
 			{
-				addFile( ":icons/32x32/actions/file-print.png" );
+				addPixmap( QPixmap( ":icons/32x32/actions/print.svg" ) );
 			}
 		};
 

glabels/icons.qrc

@@ -92,10 +92,10 @@
 	<file>icons/24x24/actions/glabels-valign-text-top.svg</file>
 	<file>icons/24x24/apps/glabels.png</file>
 
-	<file>icons/32x32/actions/file-print.png</file>
+	<file>icons/32x32/actions/label-orientation-horiz.svg</file>
-	<file>icons/32x32/actions/horizontal-orientation.png</file>
+	<file>icons/32x32/actions/label-orientation-vert.svg</file>
-	<file>icons/32x32/actions/select-product.png</file>
+	<file>icons/32x32/actions/print.svg</file>
-	<file>icons/32x32/actions/vertical-orientation.png</file>
+	<file>icons/32x32/actions/select-product.svg</file>
 	<file>icons/32x32/apps/glabels.png</file>
 
 	<file>icons/48x48/apps/glabels.png</file>

glabels/icons/32x32/actions/label-orientation-horiz.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32" >
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="15" width="27" x="2.5" y="8.5" rx="2" ry="2" />
+
+</svg>

glabels/icons/32x32/actions/label-orientation-vert.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32" >
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="27" width="15" x="8.5" y="2.5" rx="2" ry="2" />
+
+</svg>

glabels/icons/32x32/actions/print.svg

@@ -0,0 +1,31 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32" >
+
+  <rect
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     height="13" width="26" x="3" y="12" rx="3" ry="3" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="2" width="2" x="23" y="15" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="2" width="2" x="20" y="15" />
+
+  <rect
+     style="fill:#fafafa;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="8" width="16" x="7.5" y="4.5" />
+
+  <rect
+     style="fill:#fafafa;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="5" width="16" x="7.5" y="22.5" />
+
+  <line
+     style="stroke:#999999;stroke-width:1;stroke-opacity:1"
+     x1="10" y1="7.5" x2="21" y2="7.5"/>
+
+  <line
+     style="stroke:#999999;stroke-width:1;stroke-opacity:1"
+     x1="10" y1="9.5" x2="21" y2="9.5"/>
+
+</svg>

glabels/icons/32x32/actions/select-product.svg

@@ -0,0 +1,51 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32" >
+
+  <rect
+     style="fill:#f8f8f8;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="18" width="14" x="4.5" y="2.5" />
+
+  <rect
+     style="fill:#fafafa;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="18" width="14" x="13.5" y="6.5" />
+
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     d="M 9.5,11.5 9.5,29.5 23.5,29.5 23.5,16.5 18.5,11.5 Z" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="11" y="13" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="11" y="17" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="11" y="21" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="11" y="25" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="3" x="17" y="13" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="17" y="17" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="17" y="21" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="17" y="25" />
+
+  <path
+     style="fill:#fcfcfc;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1;stroke-linejoin:bevel"
+     d="M 23.5,16.5 18.5,11.5 18.5,16.5 Z" />
+
+</svg>

glabels/ui/PrintView.ui

@@ -109,16 +109,7 @@
      <property name="sizeConstraint">
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
-     <property name="leftMargin">
+     <property name="margin">
-      <number>12</number>
-     </property>
-     <property name="topMargin">
-      <number>12</number>
-     </property>
-     <property name="rightMargin">
-      <number>12</number>
-     </property>
-     <property name="bottomMargin">
       <number>12</number>
      </property>
      <item>
@@ -286,22 +277,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="printButton">
+      <widget class="QPushButton" name="printButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>300</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::LeftToRight</enum>
-       </property>
        <property name="styleSheet">
         <string notr="true">text-align:left; padding:3px;</string>
        </property>
@@ -310,7 +286,7 @@
        </property>
        <property name="icon">
         <iconset resource="../icons.qrc">
-         <normaloff>:/icons/32x32/actions/file-print.png</normaloff>:/icons/32x32/actions/file-print.png</iconset>
+         <normaloff>:/icons/32x32/actions/print.svg</normaloff>:/icons/32x32/actions/print.svg</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -318,9 +294,6 @@
          <height>32</height>
         </size>
        </property>
-       <property name="toolButtonStyle">
-        <enum>Qt::ToolButtonTextBesideIcon</enum>
-       </property>
       </widget>
      </item>
      <item>
@@ -359,22 +332,6 @@
   <include location="../icons.qrc"/>
  </resources>
  <connections>
-  <connection>
-   <sender>printButton</sender>
-   <signal>clicked()</signal>
-   <receiver>PrintView</receiver>
-   <slot>onPrintButtonClicked()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>45</x>
-     <y>56</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>4</x>
-     <y>50</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>copiesStartSpin</sender>
    <signal>valueChanged(int)</signal>
@@ -382,8 +339,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>170</x>
+     <x>221</x>
-     <y>317</y>
+     <y>124</y>
     </hint>
     <hint type="destinationlabel">
      <x>4</x>
@@ -398,8 +355,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>126</x>
+     <x>161</x>
-     <y>347</y>
+     <y>84</y>
     </hint>
     <hint type="destinationlabel">
      <x>2</x>
@@ -414,8 +371,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>87</x>
+     <x>114</x>
-     <y>407</y>
+     <y>220</y>
     </hint>
     <hint type="destinationlabel">
      <x>2</x>
@@ -430,8 +387,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>57</x>
+     <x>84</x>
-     <y>436</y>
+     <y>248</y>
     </hint>
     <hint type="destinationlabel">
      <x>6</x>
@@ -446,8 +403,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>61</x>
+     <x>88</x>
-     <y>466</y>
+     <y>276</y>
     </hint>
     <hint type="destinationlabel">
      <x>6</x>
@@ -462,8 +419,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>569</x>
+     <x>645</x>
-     <y>536</y>
+     <y>745</y>
     </hint>
     <hint type="destinationlabel">
      <x>1</x>
@@ -471,6 +428,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>printButton</sender>
+   <signal>clicked()</signal>
+   <receiver>PrintView</receiver>
+   <slot>onPrintButtonClicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>249</x>
+     <y>325</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>5</x>
+     <y>277</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>onPrintButtonClicked()</slot>

glabels/ui/PropertiesView.ui

@@ -42,16 +42,7 @@
    </item>
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="leftMargin">
+     <property name="margin">
-      <number>12</number>
-     </property>
-     <property name="topMargin">
-      <number>12</number>
-     </property>
-     <property name="rightMargin">
-      <number>12</number>
-     </property>
-     <property name="bottomMargin">
       <number>12</number>
      </property>
      <item>
@@ -245,7 +236,7 @@
           </property>
           <property name="icon">
            <iconset resource="../icons.qrc">
-            <normaloff>:/icons/32x32/actions/select-product.png</normaloff>:/icons/32x32/actions/select-product.png</iconset>
+            <normaloff>:/icons/32x32/actions/select-product.svg</normaloff>:/icons/32x32/actions/select-product.svg</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -295,7 +286,7 @@
              </property>
              <property name="icon">
               <iconset resource="../icons.qrc">
-               <normaloff>:/icons/32x32/actions/horizontal-orientation.png</normaloff>:/icons/32x32/actions/horizontal-orientation.png</iconset>
+               <normaloff>:/icons/32x32/actions/label-orientation-horiz.svg</normaloff>:/icons/32x32/actions/label-orientation-horiz.svg</iconset>
              </property>
             </item>
             <item>
@@ -304,7 +295,7 @@
              </property>
              <property name="icon">
               <iconset resource="../icons.qrc">
-               <normaloff>:/icons/32x32/actions/vertical-orientation.png</normaloff>:/icons/32x32/actions/vertical-orientation.png</iconset>
+               <normaloff>:/icons/32x32/actions/label-orientation-vert.svg</normaloff>:/icons/32x32/actions/label-orientation-vert.svg</iconset>
              </property>
             </item>
            </widget>