new icons

2018-09-21 19:18:19 +02:00
parent e42d3c698c
commit 7dd16a7f9e
18 changed files with 2976 additions and 38 deletions
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -774,7 +774,7 @@
        </node>
      </border>
      <!-- toolbar -->
-      <border id="toolbar" height="50" width="100%" pad="5" dir="row" color=".2 .2 .2 .6">
+      <border id="toolbar" height="60" width="100%" pad="5" dir="row" color=".2 .2 .2 .6">
        <!--
        <button id="btn-open" width="50" height="100%" margin="0 5 0 0" text="Open"/>
        <button id="btn-save" width="50" height="100%" margin="0 5 0 0" text="Save"/>
@@ -802,26 +802,44 @@
        <button id="btn-anim" width="70" height="100%" margin="1 0 0 10" text="Animate"/>
        -->
        <node dir="row" justify="center" grow="1">
-          <button id="btn-pen" width="50" height="100%" margin="0 0 0 0" text="Pen"/>
-          <button id="btn-pick" width="50" height="100%" margin="0 0 0 0" text="Pick"/>
-          <button id="btn-touchlock" width="50" height="100%" margin="0 0 0 0" text="Lock"/>
+          <button-custom id="btn-pen" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+            <image path="data/ui/pen.png" width="100%" height="100%" align="center" justify="flex-end"/>
+          </button-custom>
+          <button-custom id="btn-pick" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+            <image path="data/ui/picker.png" width="100%" height="100%" align="center" justify="flex-end"/>
+          </button-custom>
+
+          <button-custom id="btn-erase" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+            <image path="data/ui/eraser.png" width="100%" height="100%" align="center" justify="flex-end"/>
+          </button-custom>

-          <button id="btn-erase" width="60" height="100%" margin="0 0 0 5" text="Eraser"/>
-          
          <button id="btn-cam" width="70" height="100%" margin="0 0 0 5" text="Parallax"/>
          
-          <button id="btn-line" width="50" height="100%" margin="0 0 0 5" text="Line"/>
-          <button id="btn-grid" width="50" height="100%" margin="0 0 0 0" text="Grid"/>
+          <button-custom id="btn-line" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+            <image path="data/ui/line.png" width="100%" height="100%" align="center" justify="flex-end"/>
+          </button-custom>
+          <button id="btn-grid" width="50" height="100%" margin="0 0 0 5" text="Grid"/>
          <!-- <button id="btn-fill" width="50" height="100%" margin="0 0 0 0" text="Fill"/> -->
-          <button id="btn-mask-free" width="50" height="100%" margin="0 0 0 0" text="FMask"/>
-          <button id="btn-mask-line" width="50" height="100%" margin="0 0 0 0" text="LMask"/>
-          
+          <button-custom id="btn-mask-free" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+            <image path="data/ui/sel-free.png" width="100%" height="100%" align="center" justify="flex-end"/>
+          </button-custom>
+          <button-custom id="btn-mask-line" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+            <image path="data/ui/sel-poly.png" width="100%" height="100%" align="center" justify="flex-end"/>
+          </button-custom>
+
          <button-custom id="btn-bucket" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
            <image path="data/ui/bucket.png" width="100%" height="100%" align="center" justify="flex-end"/>
          </button-custom>
+          <button-custom id="btn-touchlock" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+            <image path="data/ui/notouch.png" width="100%" height="100%" align="center" justify="flex-end"/>
+          </button-custom>
        </node>
-        <button id="btn-undo" width="50" height="100%" margin="0 5 0 0" text="Undo"/>
-        <button id="btn-redo" width="50" height="100%" margin="0 5 0 0" text="Redo"/>
+        <button-custom id="btn-undo" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+          <image path="data/ui/undo.png" width="100%" height="100%" align="center" justify="flex-end"/>
+        </button-custom>
+        <button-custom id="btn-redo" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+          <image path="data/ui/redo.png" width="100%" height="100%" align="center" justify="flex-end"/>
+        </button-custom>
        <!--
        <button-custom id="btn-layer" width="50" height="100%" margin="0 5 0 0" thickness="1" border-color="0 0 0 1" pad="6" align="center" justify="center">
          <icon width="100%" height="100%" icon="disk"/>
--- a/data/ui/brushes.png
+++ b/data/ui/brushes.png
--- a/data/ui/bucket.png
+++ b/data/ui/bucket.png
--- a/data/ui/eraser.png
+++ b/data/ui/eraser.png
--- a/data/ui/layers.png
+++ b/data/ui/layers.png
--- a/data/ui/line.png
+++ b/data/ui/line.png
--- a/data/ui/notouch.png
+++ b/data/ui/notouch.png
--- a/data/ui/palette.png
+++ b/data/ui/palette.png
--- a/data/ui/pen.png
+++ b/data/ui/pen.png
--- a/data/ui/picker.png
+++ b/data/ui/picker.png
--- a/data/ui/redo.png
+++ b/data/ui/redo.png
--- a/data/ui/sel-free.png
+++ b/data/ui/sel-free.png
--- a/data/ui/sel-poly.png
+++ b/data/ui/sel-poly.png
--- a/data/ui/stroke.png
+++ b/data/ui/stroke.png
--- a/data/ui/undo.png
+++ b/data/ui/undo.png