Selaa lähdekoodia

Added zoom icons #9

Nicolas Winkler 4 vuotta sitten
vanhempi
commit
da8deac30b
5 muutettua tiedostoa jossa 143 lisäystä ja 14 poistoa
  1. 2 0
      resources/Almond.qrc
  2. 49 0
      resources/icons/zoom_in.svg
  3. 45 0
      resources/icons/zoom_out.svg
  4. 0 1
      src/FractalWidget.cpp
  5. 47 13
      ui/Almond.ui

+ 2 - 0
resources/Almond.qrc

@@ -2,6 +2,8 @@
     <qresource prefix="/icons">
         <file alias="icon">Almond.png</file>
         <file alias="icon@2x">Almond.png</file>
+        <file alias="zoom_in">icons/zoom_in.svg</file>
+        <file alias="zoom_out">icons/zoom_out.svg</file>
     </qresource>
     <qresource prefix="/gradients">
         <file alias="default">gradients/default.xml</file>

+ 49 - 0
resources/icons/zoom_in.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 210 297"
+   height="297mm"
+   width="210mm">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <ellipse
+       ry="58.99258"
+       rx="58.992577"
+       cy="112.36012"
+       cx="69.093491"
+       id="path4526"
+       style="fill:none;stroke:#000000;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+    <path
+       id="path4584"
+       d="m 111.18412,154.81261 72.69731,76.97362"
+       style="fill:none;stroke:#000000;stroke-width:16.00000045;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers" />
+    <path
+       id="path816"
+       d="M 69.093491,80.283767 V 144.43648"
+       style="fill:none;stroke:#000000;stroke-width:16;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path816-4"
+       d="M 101.16985,112.36012 H 37.017135"
+       style="fill:none;stroke:#000000;stroke-width:16;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>

+ 45 - 0
resources/icons/zoom_out.svg

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 210 297"
+   height="297mm"
+   width="210mm">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <ellipse
+       ry="58.99258"
+       rx="58.992577"
+       cy="112.36012"
+       cx="69.093491"
+       id="path4526"
+       style="fill:none;stroke:#000000;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+    <path
+       id="path4584"
+       d="m 111.18412,154.81261 72.69731,76.97362"
+       style="fill:none;stroke:#000000;stroke-width:16.00000045;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers" />
+    <path
+       id="path816-4"
+       d="M 101.16985,112.36012 H 37.017135"
+       style="fill:none;stroke:#000000;stroke-width:16;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>

+ 0 - 1
src/FractalWidget.cpp

@@ -6,7 +6,6 @@
 
 
 
-
 FractalWidget::FractalWidget(QWidget* parent) :
     FractalZoomWidget{ parent }
 {

+ 47 - 13
ui/Almond.ui

@@ -62,22 +62,48 @@
           <string>Zoom</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
-          <item row="1" column="0">
+          <item row="1" column="1">
            <widget class="QPushButton" name="zoom_in">
             <property name="text">
-             <string>Zoom In</string>
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset resource="../resources/Almond.qrc">
+              <normaloff>:/icons/zoom_in</normaloff>:/icons/zoom_in</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="1" column="2">
            <widget class="QPushButton" name="zoom_out">
             <property name="text">
-             <string>Zoom Out</string>
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset resource="../resources/Almond.qrc">
+              <normaloff>:/icons/zoom_out</normaloff>:/icons/zoom_out</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
             </property>
            </widget>
           </item>
-          <item row="0" column="0" colspan="2">
+          <item row="1" column="0">
            <widget class="QPushButton" name="resetZoom">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="text">
              <string>Reset Zoom</string>
             </property>
@@ -113,13 +139,6 @@
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <layout class="QFormLayout" name="formLayout">
-            <item row="0" column="0" colspan="2">
-             <widget class="QPushButton" name="chooseGradient">
-              <property name="text">
-               <string>Choose Gradient</string>
-              </property>
-             </widget>
-            </item>
             <item row="1" column="0">
              <widget class="QLabel" name="label">
               <property name="text">
@@ -161,6 +180,19 @@
               </property>
              </widget>
             </item>
+            <item row="0" column="0" colspan="2">
+             <widget class="QPushButton" name="chooseGradient">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Choose Gradient</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
          </layout>
@@ -313,6 +345,8 @@
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="../resources/Almond.qrc"/>
+ </resources>
  <connections/>
 </ui>