Browse Source

Change style of control icons

Martijn Braam 1 tháng trước cách đây
mục cha
commit
003c4d04e8

+ 6 - 0
data/camera.css

@@ -15,3 +15,9 @@
 .flash {
     background-color: #ffffff;
 }
+
+.control {
+    margin: 0;
+    padding: 0;
+    -gtk-icon-size: 36px;
+}

+ 8 - 5
data/camera.ui

@@ -50,18 +50,20 @@
                         <child>
                           <object class="GtkButton" id="iso-controls-button">
                             <property name="valign">start</property>
-                            <property name="label">ISO</property>
+                            <property name="icon-name">iso-man-symbolic</property>
                             <style>
-                              <class name="circular"/>
+                              <class name="flat"/>
+                              <class name="control"/>
                             </style>
                           </object>
                         </child>
                         <child>
                           <object class="GtkButton" id="shutter-controls-button">
                             <property name="valign">start</property>
-                            <property name="icon-name">shutter-symbolic</property>
+                            <property name="icon-name">shutter-auto-symbolic</property>
                             <style>
-                              <class name="circular"/>
+                              <class name="flat"/>
+                              <class name="control"/>
                             </style>
                           </object>
                         </child>
@@ -70,7 +72,8 @@
                             <property name="valign">start</property>
                             <property name="icon-name">flash-disabled-symbolic</property>
                             <style>
-                              <class name="circular"/>
+                              <class name="flat"/>
+                              <class name="control"/>
                             </style>
                           </object>
                         </child>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 2 - 31
data/flash-disabled-symbolic.svg


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 2 - 30
data/flash-enabled-symbolic.svg


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 2 - 0
data/iso-auto-symbolic.svg


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 2 - 0
data/iso-man-symbolic.svg


+ 116 - 0
data/iso-symbolic.svg

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="64"
+   height="64"
+   viewBox="0 0 16.933333 16.933333"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   sodipodi:docname="iso-symbolic.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showguides="true"
+     inkscape:zoom="7.805889"
+     inkscape:cx="1.7294635"
+     inkscape:cy="34.397107"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <sodipodi:guide
+       position="-7.0783634,8.4666665"
+       orientation="0,1"
+       id="guide1"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,134,229)" />
+    <sodipodi:guide
+       position="8.4666665,-0.49408784"
+       orientation="-1,0"
+       id="guide2"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,134,229)" />
+    <sodipodi:guide
+       position="1.0583333,18.933333"
+       orientation="-1,0"
+       id="guide3"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,134,229)" />
+    <sodipodi:guide
+       position="15.875,-1.6656792"
+       orientation="-1,0"
+       id="guide4"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,134,229)" />
+    <sodipodi:guide
+       position="-1.5133055,13.229166"
+       orientation="0,1"
+       id="guide5"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,134,229)" />
+    <sodipodi:guide
+       position="-4.002937,3.7041666"
+       orientation="0,1"
+       id="guide6"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,134,229)" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#000000;stroke-width:0.264822;fill-opacity:1"
+       id="rect6"
+       width="14.816667"
+       height="9.5249996"
+       x="1.0583333"
+       y="3.7041667"
+       ry="1.2023072" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:4.23333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#99cc33;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="4.2972941"
+       y="7.7337008"
+       id="text6"><tspan
+         sodipodi:role="line"
+         id="tspan6"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.23333px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';fill:#99cc33;stroke-width:0.264583"
+         x="4.2972941"
+         y="7.7337008">ISO</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#99cc33;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="1.829512"
+       y="12.062634"
+       id="text6-6"><tspan
+         sodipodi:role="line"
+         id="tspan6-1"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';fill:#99cc33;stroke-width:0.264583"
+         x="1.829512"
+         y="12.062634">manual</tspan></text>
+  </g>
+</svg>

+ 5 - 0
data/me.gapixels.Megapixels.gresource.xml

@@ -19,5 +19,10 @@
     <file>debayer.frag</file>
     <file>yuv.vert</file>
     <file>yuv.frag</file>
+
+    <file preprocess="xml-stripblanks">iso-man-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">iso-auto-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">shutter-man-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">shutter-auto-symbolic.svg</file>
   </gresource>
 </gresources>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 2 - 0
data/shutter-auto-symbolic.svg


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 2 - 0
data/shutter-man-symbolic.svg


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác