reimgconvert: dynamic layout, icons, menu

diff --git a/appl/reimgconvert/converter.cpp b/appl/reimgconvert/converter.cpp
index 380f84cc8aada30edffcd675f0e94360b839d53e..a871bafb25eb4a96099a11623fd0378948be5fda 100644 (file)
--- a/appl/reimgconvert/converter.cpp
+++ b/appl/reimgconvert/converter.cpp
@@ -262,6 +262,19 @@ void Converter::run()
     changeState(Converter::STATE_READY, msg);
 }
 
+/**
+ * Reads the image properties from an image file.
+ *
+ * @param name      filename with path
+ * @param width     OUT: the width of the image
+ * @param height    OUT: the height of the image
+ * @param info      OUT: information of the image
+ */
+void Converter::readProperties(const QString& name, int& width, int& height, QString& info)
+{
+
+}
+
 /**
  * @brief Search for the Perl script which make the conversion itself.
  *

diff --git a/appl/reimgconvert/converter.hpp b/appl/reimgconvert/converter.hpp
index a2f874f54df70c7b51e96530b80744acd40d8d01..e4e71405493ee51e9e6bbed2269b28623b659695 100644 (file)
--- a/appl/reimgconvert/converter.hpp
+++ b/appl/reimgconvert/converter.hpp
@@ -59,6 +59,7 @@ public:
         m_shouldStop = true;
     }
 protected:
+    void readProperties(const QString& name, int &width, int &height, QString &info);
     void convertOneFile(const QString& name, qint64 size);
     bool buildArgs();
     void changeState(State state, const QString& info);

diff --git a/appl/reimgconvert/icons/action_go.png b/appl/reimgconvert/icons/action_go.png
new file mode 100755 (executable)
index 0000000..ef5bfc3
Binary files /dev/null and b/appl/reimgconvert/icons/action_go.png differ

diff --git a/appl/reimgconvert/icons/cancel.png b/appl/reimgconvert/icons/cancel.png
new file mode 100644 (file)
index 0000000..c149c2b
Binary files /dev/null and b/appl/reimgconvert/icons/cancel.png differ

diff --git a/appl/reimgconvert/icons/cog_edit.png b/appl/reimgconvert/icons/cog_edit.png
new file mode 100644 (file)
index 0000000..47b75a4
Binary files /dev/null and b/appl/reimgconvert/icons/cog_edit.png differ

diff --git a/appl/reimgconvert/icons/disk.png b/appl/reimgconvert/icons/disk.png
new file mode 100644 (file)
index 0000000..99d532e
Binary files /dev/null and b/appl/reimgconvert/icons/disk.png differ

diff --git a/appl/reimgconvert/icons/door_in.png b/appl/reimgconvert/icons/door_in.png
new file mode 100644 (file)
index 0000000..41676a0
Binary files /dev/null and b/appl/reimgconvert/icons/door_in.png differ

diff --git a/appl/reimgconvert/icons/folder_find.png b/appl/reimgconvert/icons/folder_find.png
new file mode 100644 (file)
index 0000000..c64e2ee
Binary files /dev/null and b/appl/reimgconvert/icons/folder_find.png differ

diff --git a/appl/reimgconvert/icons/folder_go.png b/appl/reimgconvert/icons/folder_go.png
new file mode 100644 (file)
index 0000000..34a736f
Binary files /dev/null and b/appl/reimgconvert/icons/folder_go.png differ

diff --git a/appl/reimgconvert/icons/help.png b/appl/reimgconvert/icons/help.png
new file mode 100644 (file)
index 0000000..5c87017
Binary files /dev/null and b/appl/reimgconvert/icons/help.png differ

diff --git a/appl/reimgconvert/icons/wrench.png b/appl/reimgconvert/icons/wrench.png
new file mode 100644 (file)
index 0000000..5c8213f
Binary files /dev/null and b/appl/reimgconvert/icons/wrench.png differ

diff --git a/appl/reimgconvert/mainwindow.ui b/appl/reimgconvert/mainwindow.ui
index 6bc19ad3b6cad64f3c0cb908566bc2650bc26069..ccfc44ee690dcc63ac7526fac6ee8fa7cfbf2f09 100644 (file)
--- a/appl/reimgconvert/mainwindow.ui
+++ b/appl/reimgconvert/mainwindow.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>620</width>
-    <height>620</height>
+    <width>735</width>
+    <height>532</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>620</width>
-    <height>620</height>
+    <width>735</width>
+    <height>500</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -23,321 +23,645 @@
    <layout class="QVBoxLayout" name="verticalLayout_4">
     <item>
      <widget class="QWidget" name="widget" native="true">
-      <widget class="QSplitter" name="splitter">
-       <property name="geometry">
-        <rect>
-         <x>10</x>
-         <y>10</y>
-         <width>591</width>
-         <height>541</height>
-        </rect>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-         <horstretch>1</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <widget class="QWidget" name="">
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="0" column="0">
-          <widget class="QGroupBox" name="groupBox">
-           <property name="title">
-            <string>Hochformat</string>
-           </property>
-           <widget class="QWidget" name="layoutWidget">
-            <property name="geometry">
-             <rect>
-              <x>20</x>
-              <y>40</y>
-              <width>227</width>
-              <height>61</height>
-             </rect>
-            </property>
-            <layout class="QFormLayout" name="formLayout">
-             <item row="0" column="0">
-              <widget class="QLabel" name="label">
-               <property name="text">
-                <string>Max. Breite</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_2">
-               <property name="text">
-                <string>Max. Höhe</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QComboBox" name="comboPortraitX">
-               <property name="editable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QComboBox" name="comboPortraitY">
-               <property name="editable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QGroupBox" name="groupBox_2">
-           <property name="title">
-            <string>Breitformat</string>
-           </property>
-           <widget class="QWidget" name="layoutWidget_2">
-            <property name="geometry">
-             <rect>
-              <x>20</x>
-              <y>40</y>
-              <width>228</width>
-              <height>61</height>
-             </rect>
-            </property>
-            <layout class="QFormLayout" name="formLayout_2">
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_3">
-               <property name="text">
-                <string>Max. Breite</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_4">
-               <property name="text">
-                <string>Max. Höhe</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QComboBox" name="comboLandscapeX">
-               <property name="editable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QComboBox" name="comboLandscapeY">
-               <property name="editable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QGroupBox" name="groupBox_3">
-           <property name="title">
-            <string>Quadrat</string>
-           </property>
-           <widget class="QWidget" name="layoutWidget_3">
-            <property name="geometry">
-             <rect>
-              <x>20</x>
-              <y>30</y>
-              <width>237</width>
-              <height>28</height>
-             </rect>
-            </property>
-            <layout class="QFormLayout" name="formLayout_3">
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_5">
-               <property name="text">
-                <string>Max. Breite/Höhe</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QComboBox" name="comboSquareX">
-               <property name="editable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QGroupBox" name="groupBox_4">
-           <property name="title">
-            <string>Sonstiges</string>
-           </property>
-           <widget class="QWidget" name="layoutWidget_4">
-            <property name="geometry">
-             <rect>
-              <x>20</x>
-              <y>30</y>
-              <width>231</width>
-              <height>61</height>
-             </rect>
-            </property>
-            <layout class="QFormLayout" name="formLayout_4">
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_6">
-               <property name="text">
-                <string>Qualität (%)</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QComboBox" name="comboQuality">
-               <property name="editable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_7">
-               <property name="text">
-                <string>Zielverz.</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QComboBox" name="comboTarget">
-               <property name="editable">
-                <bool>true</bool>
-               </property>
-               <property name="currentText">
-                <string/>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QWidget" name="">
-        <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,5">
-         <property name="spacing">
-          <number>10</number>
-         </property>
-         <property name="leftMargin">
-          <number>10</number>
-         </property>
-         <property name="topMargin">
-          <number>10</number>
-         </property>
-         <property name="rightMargin">
-          <number>10</number>
-         </property>
-         <property name="bottomMargin">
-          <number>10</number>
-         </property>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_5">
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0,0">
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
            <item>
-            <layout class="QVBoxLayout" name="verticalLayout_2">
-             <item>
-              <widget class="QLabel" name="label_8">
-               <property name="text">
-                <string>Verzeichnis mit den Bildern (Quellen)</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <layout class="QHBoxLayout" name="horizontalLayout">
-               <item>
-                <widget class="QComboBox" name="comboSourceDir">
+            <widget class="QGroupBox" name="groupBox">
+             <property name="minimumSize">
+              <size>
+               <width>230</width>
+               <height>100</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>230</width>
+               <height>100</height>
+              </size>
+             </property>
+             <property name="title">
+              <string>Portrait:</string>
+             </property>
+             <widget class="QWidget" name="layoutWidget1">
+              <property name="geometry">
+               <rect>
+                <x>2</x>
+                <y>30</y>
+                <width>221</width>
+                <height>61</height>
+               </rect>
+              </property>
+              <layout class="QFormLayout" name="formLayout">
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_9">
+                 <property name="minimumSize">
+                  <size>
+                   <width>100</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>100</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="text">
+                  <string>Max. Width:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QComboBox" name="comboPortraitX">
+                 <property name="minimumSize">
+                  <size>
+                   <width>100</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>100</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
                  <property name="editable">
                   <bool>true</bool>
                  </property>
-                 <property name="currentText">
-                  <string>/tmp/img</string>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="label">
+                 <property name="minimumSize">
+                  <size>
+                   <width>100</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>100</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="text">
+                  <string>Max. Height:</string>
                  </property>
                 </widget>
                </item>
-               <item>
-                <widget class="QPushButton" name="buttonFileSelect">
+               <item row="1" column="1">
+                <widget class="QComboBox" name="comboPortraitY">
+                 <property name="minimumSize">
+                  <size>
+                   <width>100</width>
+                   <height>0</height>
+                  </size>
+                 </property>
                  <property name="maximumSize">
                   <size>
-                   <width>30</width>
+                   <width>100</width>
                    <height>16777215</height>
                   </size>
                  </property>
-                 <property name="toolTip">
-                  <string>Auswahldialog</string>
+                 <property name="editable">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_2">
+             <property name="minimumSize">
+              <size>
+               <width>230</width>
+               <height>100</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>230</width>
+               <height>100</height>
+              </size>
+             </property>
+             <property name="title">
+              <string>Landscape:</string>
+             </property>
+             <widget class="QWidget" name="layoutWidget2">
+              <property name="geometry">
+               <rect>
+                <x>3</x>
+                <y>31</y>
+                <width>221</width>
+                <height>61</height>
+               </rect>
+              </property>
+              <layout class="QFormLayout" name="formLayout_2">
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_3">
+                 <property name="minimumSize">
+                  <size>
+                   <width>100</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>100</width>
+                   <height>16777215</height>
+                  </size>
                  </property>
                  <property name="text">
-                  <string>...</string>
+                  <string>Max. Width:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QComboBox" name="comboLandscapeX">
+                 <property name="minimumSize">
+                  <size>
+                   <width>100</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>100</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="editable">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_4">
+                 <property name="minimumSize">
+                  <size>
+                   <width>100</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>100</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="text">
+                  <string>Max. Height:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QComboBox" name="comboLandscapeY">
+                 <property name="minimumSize">
+                  <size>
+                   <width>100</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>100</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="editable">
+                  <bool>true</bool>
                  </property>
                 </widget>
                </item>
               </layout>
-             </item>
-            </layout>
+             </widget>
+            </widget>
            </item>
            <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
+            <widget class="QGroupBox" name="groupBox_3">
+             <property name="minimumSize">
+              <size>
+               <width>150</width>
+               <height>100</height>
+              </size>
              </property>
-             <property name="sizeHint" stdset="0">
+             <property name="maximumSize">
               <size>
-               <width>40</width>
-               <height>20</height>
+               <width>150</width>
+               <height>100</height>
               </size>
              </property>
-            </spacer>
+             <property name="title">
+              <string>Square:</string>
+             </property>
+             <widget class="QComboBox" name="comboSquareX">
+              <property name="geometry">
+               <rect>
+                <x>0</x>
+                <y>60</y>
+                <width>100</width>
+                <height>26</height>
+               </rect>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>100</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>100</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="editable">
+               <bool>true</bool>
+              </property>
+             </widget>
+             <widget class="QLabel" name="label_5">
+              <property name="geometry">
+               <rect>
+                <x>0</x>
+                <y>40</y>
+                <width>141</width>
+                <height>18</height>
+               </rect>
+              </property>
+              <property name="text">
+               <string>Max. Width/Height:</string>
+              </property>
+             </widget>
+            </widget>
            </item>
+          </layout>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>150</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>999999</height>
+          </size>
+         </property>
+         <property name="title">
+          <string>Others:</string>
+         </property>
+         <widget class="QPushButton" name="pushButtonSelectDest">
+          <property name="geometry">
+           <rect>
+            <x>640</x>
+            <y>70</y>
+            <width>51</width>
+            <height>27</height>
+           </rect>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+         <widget class="QWidget" name="layoutWidget3">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>30</y>
+            <width>221</width>
+            <height>28</height>
+           </rect>
+          </property>
+          <layout class="QFormLayout" name="formLayout_3">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_6">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>100</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Quality (%)</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="comboQuality">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>100</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="editable">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="layoutWidget4">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>70</y>
+            <width>631</width>
+            <height>28</height>
+           </rect>
+          </property>
+          <layout class="QFormLayout" name="formLayout_4">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_7">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>100</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Destination: </string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="comboTarget">
+             <property name="editable">
+              <bool>true</bool>
+             </property>
+             <property name="currentText">
+              <string/>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="layoutWidget5">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>110</y>
+            <width>631</width>
+            <height>28</height>
+           </rect>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
            <item>
-            <layout class="QVBoxLayout" name="verticalLayout">
+            <widget class="QLabel" name="label_2">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>100</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Template:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="comboBox">
              <item>
-              <widget class="QPushButton" name="buttonConvert">
-               <property name="minimumSize">
-                <size>
-                 <width>150</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>150</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-               <property name="toolTip">
-                <string>Alle Bilder aus dem Quellverzeichnis konvertieren und im Zielverzeichnis ablegen</string>
+              <property name="text">
+               <string>Website: 1024x768</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Website II: 800x600</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Photo: 2048x1536</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Photo II: 3072x2304</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Midi: 600x400</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Mini: 150x100</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="layoutWidget6">
+          <property name="geometry">
+           <rect>
+            <x>240</x>
+            <y>30</y>
+            <width>209</width>
+            <height>28</height>
+           </rect>
+          </property>
+          <layout class="QFormLayout" name="formLayout_5">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_10">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>100</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Source Type:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="comboBoxSourceType">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>100</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="editable">
+              <bool>true</bool>
+             </property>
+             <item>
+              <property name="text">
+               <string notr="true">jpg</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string notr="true">png</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>gif</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="layoutWidget7">
+          <property name="geometry">
+           <rect>
+            <x>480</x>
+            <y>30</y>
+            <width>211</width>
+            <height>28</height>
+           </rect>
+          </property>
+          <layout class="QFormLayout" name="formLayout_6">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_11">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>100</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Dest. Type:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="comboBoxDestType">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>100</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <item>
+              <property name="text">
+               <string notr="true">jpg</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string notr="true">png</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0,0">
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout_2">
+           <item>
+            <widget class="QLabel" name="label_8">
+             <property name="text">
+              <string>Source Directory (Images):</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout">
+             <item>
+              <widget class="QComboBox" name="comboSourceDir">
+               <property name="editable">
+                <bool>true</bool>
                </property>
-               <property name="text">
-                <string>Konvertieren</string>
+               <property name="currentText">
+                <string>/tmp/img</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QPushButton" name="buttonStop">
-               <property name="minimumSize">
-                <size>
-                 <width>150</width>
-                 <height>0</height>
-                </size>
-               </property>
+              <widget class="QPushButton" name="buttonFileSelect">
                <property name="maximumSize">
                 <size>
-                 <width>150</width>
+                 <width>30</width>
                  <height>16777215</height>
                 </size>
                </property>
                <property name="toolTip">
-                <string>Alle Bilder aus dem Quellverzeichnis konvertieren und im Zielverzeichnis ablegen</string>
+                <string>Auswahldialog</string>
                </property>
                <property name="text">
-                <string>Beenden</string>
+                <string>...</string>
                </property>
               </widget>
              </item>
@@ -346,11 +670,82 @@
           </layout>
          </item>
          <item>
-          <widget class="QListWidget" name="listWidget"/>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <widget class="QPushButton" name="buttonConvert">
+             <property name="minimumSize">
+              <size>
+               <width>150</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>150</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>Alle Bilder aus dem Quellverzeichnis konvertieren und im Zielverzeichnis ablegen</string>
+             </property>
+             <property name="text">
+              <string>&amp;Convert</string>
+             </property>
+             <property name="icon">
+              <iconset resource="reimgconvert.qrc">
+               <normaloff>:/main/icons/action_go.png</normaloff>:/main/icons/action_go.png</iconset>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="buttonStop">
+             <property name="minimumSize">
+              <size>
+               <width>150</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>150</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>Alle Bilder aus dem Quellverzeichnis konvertieren und im Zielverzeichnis ablegen</string>
+             </property>
+             <property name="text">
+              <string>&amp;Stop</string>
+             </property>
+             <property name="icon">
+              <iconset resource="reimgconvert.qrc">
+               <normaloff>:/main/icons/cancel.png</normaloff>:/main/icons/cancel.png</iconset>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
         </layout>
-       </widget>
-      </widget>
+       </item>
+       <item>
+        <widget class="QListWidget" name="listWidget"/>
+       </item>
+      </layout>
+      <zorder>listWidget</zorder>
+      <zorder>groupBox_4</zorder>
      </widget>
     </item>
    </layout>
@@ -360,10 +755,31 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>620</width>
+     <width>735</width>
      <height>23</height>
     </rect>
    </property>
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="actionConvert"/>
+    <addaction name="actionStop"/>
+    <addaction name="separator"/>
+    <addaction name="actionSelectSource"/>
+    <addaction name="actionSelectDestination"/>
+    <addaction name="separator"/>
+    <addaction name="action_Exit"/>
+    <addaction name="separator"/>
+   </widget>
+   <widget class="QMenu" name="menu_Help">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="actionAbout"/>
+   </widget>
+   <addaction name="menu_File"/>
+   <addaction name="menu_Help"/>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
    <attribute name="toolBarArea">
@@ -372,21 +788,138 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
+   <addaction name="actionConvert"/>
+   <addaction name="actionStop"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionSelectSource"/>
+   <addaction name="actionSelectDestination"/>
+   <addaction name="separator"/>
+   <addaction name="actionAbout"/>
+   <addaction name="separator"/>
+   <addaction name="action_Exit"/>
+  </widget>
   <action name="actionConvert">
+   <property name="icon">
+    <iconset resource="reimgconvert.qrc">
+     <normaloff>:/main/icons/action_go.png</normaloff>:/main/icons/action_go.png</iconset>
+   </property>
+   <property name="text">
+    <string>Convert</string>
+   </property>
+   <property name="toolTip">
+    <string>Converts all images from the source directory into the target directory</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+R</string>
+   </property>
+  </action>
+  <action name="actionSelectSource">
+   <property name="icon">
+    <iconset resource="reimgconvert.qrc">
+     <normaloff>:/main/icons/folder_find.png</normaloff>:/main/icons/folder_find.png</iconset>
+   </property>
+   <property name="text">
+    <string>SelectSource</string>
+   </property>
+   <property name="toolTip">
+    <string>Select the source directory</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
+  </action>
+  <action name="actionSelectDestination">
+   <property name="icon">
+    <iconset resource="reimgconvert.qrc">
+     <normaloff>:/main/icons/folder_go.png</normaloff>:/main/icons/folder_go.png</iconset>
+   </property>
+   <property name="text">
+    <string>Select Destination</string>
+   </property>
+   <property name="toolTip">
+    <string>Select the destination directory</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
+  </action>
+  <action name="actionStop">
+   <property name="icon">
+    <iconset resource="reimgconvert.qrc">
+     <normaloff>:/main/icons/cancel.png</normaloff>:/main/icons/cancel.png</iconset>
+   </property>
+   <property name="text">
+    <string>Sto&amp;p</string>
+   </property>
+   <property name="toolTip">
+    <string>Stopps the conversion</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+X</string>
+   </property>
+  </action>
+  <action name="action_Exit">
+   <property name="icon">
+    <iconset resource="reimgconvert.qrc">
+     <normaloff>:/main/icons/door_in.png</normaloff>:/main/icons/door_in.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Exit</string>
+   </property>
+   <property name="toolTip">
+    <string>Terminates the program</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+E</string>
+   </property>
+  </action>
+  <action name="actionAbout">
+   <property name="icon">
+    <iconset resource="reimgconvert.qrc">
+     <normaloff>:/main/icons/help.png</normaloff>:/main/icons/help.png</iconset>
+   </property>
    <property name="text">
-    <string>Konvertieren</string>
+    <string>&amp;About</string>
    </property>
    <property name="toolTip">
-    <string>Alle Bilder in dem Verzeichnis gemäß den Vorgaben konvertieren. Ergebis im Unterverzeichnis &quot;mini&quot;</string>
+    <string>Info about the program</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+K</string>
+    <string>Ctrl+Shift+A</string>
    </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
+ <resources>
+  <include location="reimgconvert.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>action_Exit</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>367</x>
+     <y>265</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>367</x>
+     <y>265</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

diff --git a/appl/reimgconvert/reimgconvert.pro b/appl/reimgconvert/reimgconvert.pro
index 70457ce6c0e5e72887cdd0b00fceaeb40bac4172..03d68734ebd1add0fa4a2af97cf28f0af2349890 100644 (file)
--- a/appl/reimgconvert/reimgconvert.pro
+++ b/appl/reimgconvert/reimgconvert.pro
@@ -20,3 +20,8 @@ HEADERS  += mainwindow.hpp \
         converter.hpp
 
 FORMS    += mainwindow.ui
+
+RESOURCES += \
+    reimgconvert.qrc
+
+OTHER_FILES +=

diff --git a/appl/reimgconvert/reimgconvert.qrc b/appl/reimgconvert/reimgconvert.qrc
new file mode 100644 (file)
index 0000000..6cacef5
--- /dev/null
+++ b/appl/reimgconvert/reimgconvert.qrc
@@ -0,0 +1,13 @@
+<RCC>
+    <qresource prefix="/main">
+        <file>icons/action_go.png</file>
+        <file>icons/disk.png</file>
+        <file>icons/door_in.png</file>
+        <file>icons/cancel.png</file>
+        <file>icons/cog_edit.png</file>
+        <file>icons/folder_find.png</file>
+        <file>icons/wrench.png</file>
+        <file>icons/folder_go.png</file>
+        <file>icons/help.png</file>
+    </qresource>
+</RCC>