Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

core/rc.qrc

@@ -31,5 +31,14 @@
         <file>icons/print_24x24.png</file>
         <file>icons/remove_24x24.png</file>
         <file>icons/ok_24x24.png</file>
+        <file>icons/close_24x24.png</file>
+        <file>icons/fitHorizontal_24x24.png</file>
+        <file>icons/fitVertical_24x24.png</file>
+        <file>icons/pageDown_24x24.png</file>
+        <file>icons/pageUp_24x24.png</file>
+        <file>icons/pdf_24x24.png</file>
+        <file>icons/report_24x24.png</file>
+        <file>icons/zoomIn_24x24.png</file>
+        <file>icons/zoomOut_24x24.png</file>
     </qresource>
 </RCC>

core/reporting/reportdialog.ui

@@ -153,7 +153,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/report.svg</normaloff>:/icons/report.svg</iconset>
+          <normaloff>:/icons/report_24x24.png</normaloff>:/icons/report_24x24.png</iconset>
         </property>
        </widget>
       </item>
@@ -167,7 +167,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/print.svg</normaloff>:/icons/print.svg</iconset>
+          <normaloff>:/icons/print_24x24.png</normaloff>:/icons/print_24x24.png</iconset>
         </property>
        </widget>
       </item>
@@ -178,7 +178,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/close.svg</normaloff>:/icons/close.svg</iconset>
+          <normaloff>:/icons/close_24x24.png</normaloff>:/icons/close_24x24.png</iconset>
         </property>
        </widget>
       </item>

core/reporting/reportviewer.ui

@@ -27,7 +27,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/close.svg</normaloff>:/icons/close.svg</iconset>
+          <normaloff>:/icons/close_24x24.png</normaloff>:/icons/close_24x24.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -50,7 +50,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/print.svg</normaloff>:/icons/print.svg</iconset>
+          <normaloff>:/icons/print_24x24.png</normaloff>:/icons/print_24x24.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -73,7 +73,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/pdf.svg</normaloff>:/icons/pdf.svg</iconset>
+          <normaloff>:/icons/pdf_24x24.png</normaloff>:/icons/pdf_24x24.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -96,7 +96,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/edit.svg</normaloff>:/icons/edit.svg</iconset>
+          <normaloff>:/icons/edit_24x24.png</normaloff>:/icons/edit_24x24.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -119,7 +119,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/pageUp.svg</normaloff>:/icons/pageUp.svg</iconset>
+          <normaloff>:/icons/pageUp_24x24.png</normaloff>:/icons/pageUp_24x24.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -152,7 +152,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/pageDown.svg</normaloff>:/icons/pageDown.svg</iconset>
+          <normaloff>:/icons/pageDown_24x24.png</normaloff>:/icons/pageDown_24x24.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -175,7 +175,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/zoomOut.svg</normaloff>:/icons/zoomOut.svg</iconset>
+          <normaloff>:/icons/zoomOut_24x24.png</normaloff>:/icons/zoomOut_24x24.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -198,7 +198,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/zoomIn.svg</normaloff>:/icons/zoomIn.svg</iconset>
+          <normaloff>:/icons/zoomIn_24x24.png</normaloff>:/icons/zoomIn_24x24.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -221,7 +221,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/fitHorizontal.svg</normaloff>:/icons/fitHorizontal.svg</iconset>
+          <normaloff>:/icons/fitHorizontal_24x24.png</normaloff>:/icons/fitHorizontal_24x24.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -244,7 +244,7 @@
         </property>
         <property name="icon">
          <iconset resource="../rc.qrc">
-          <normaloff>:/icons/fitVertical.svg</normaloff>:/icons/fitVertical.svg</iconset>
+          <normaloff>:/icons/fitVertical_24x24.png</normaloff>:/icons/fitVertical_24x24.png</iconset>
         </property>
         <property name="iconSize">
          <size>