From 143f9a7ba3e9bb9e2e512eb6b77e729939e3de3c Mon Sep 17 00:00:00 2001
From: Balkron <balkron.painter@gmail.com>
Date: Wed, 18 Nov 2020 00:25:56 +0500
Subject: [PATCH] asset browser: overlay ui update

---
 resources/noggit_font.ttf                     | Bin 21344 -> 24648 bytes
 .../AssetBrowser/Ui/AssetBrowserOverlay.ui    |  77 +++++++++++++++++-
 src/noggit/ui/font_noggit.hpp                 |  16 +++-
 3 files changed, 88 insertions(+), 5 deletions(-)

diff --git a/resources/noggit_font.ttf b/resources/noggit_font.ttf
index 98af643b36a575a2f64ec02dd41565b3c1fb1e33..c63c669cf97fe90eb63a0c2b8ba2f4d64f8a5af1 100644
GIT binary patch
delta 3711
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

delta 388
zcmX?cfbqdH#(D-u1_lORh6V;^h5$FW5Z_4(lZ6-<f?a^3GVU&}ZVZ|Xi9o&zkT2&S
ztZ(Eln)Qu=fiVKePe{&9EO;RLr<Z|&Spg^(l%7~z@c%#1B!*xapgc!<PGy=<gzh^A
z238#g1~;FK)Wj5twHK;^a(95(EF&YeK9TtllN3<12v9&JBe$etO^Q?`kiP?nGjj5i
z6PE^Ub7Ej%DFMpw$W5#$U|7NM2q<R(<SXPQ=B93X^bu&GcLh)lcR_w}$+IJoPZ${d
zTY!$50rniwgB;3b&hh*<Um3WWfZ7-sZXb6CIvPYXx%W<Dw3Ux$xX-{15@7%-U<B)P
z0C9nUnepf37)E=>U7P1HwlYq(W!3{SbC~ZiZcbtKb=!P3T!)1*dNNbYw#`>!4lsc{
f&Ik+yCa@ViK%N*7gLupgQIi!CWVzvXyY~VBWt3ch

diff --git a/src/noggit/Red/AssetBrowser/Ui/AssetBrowserOverlay.ui b/src/noggit/Red/AssetBrowser/Ui/AssetBrowserOverlay.ui
index 69a88395..40f8c9f1 100644
--- a/src/noggit/Red/AssetBrowser/Ui/AssetBrowserOverlay.ui
+++ b/src/noggit/Red/AssetBrowser/Ui/AssetBrowserOverlay.ui
@@ -31,12 +31,12 @@
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_2">
        <property name="spacing">
-        <number>-1</number>
+        <number>6</number>
        </property>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_8">
          <property name="spacing">
-          <number>-1</number>
+          <number>6</number>
          </property>
          <property name="sizeConstraint">
           <enum>QLayout::SetDefaultConstraint</enum>
@@ -67,6 +67,12 @@
            <property name="text">
             <string/>
            </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
@@ -101,6 +107,12 @@
            <property name="text">
             <string/>
            </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
@@ -135,6 +147,12 @@
            <property name="text">
             <string/>
            </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
@@ -169,6 +187,12 @@
            <property name="text">
             <string/>
            </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
@@ -203,6 +227,12 @@
            <property name="text">
             <string/>
            </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
@@ -234,6 +264,12 @@
            <property name="text">
             <string/>
            </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
@@ -330,7 +366,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="pushButton">
+          <widget class="QPushButton" name="cameraResetButton">
            <property name="text">
             <string>Reset</string>
            </property>
@@ -353,13 +389,19 @@
        </item>
        <item>
         <widget class="QLabel" name="label_3">
+         <property name="accessibleName">
+          <string>overlay_label</string>
+         </property>
+         <property name="autoFillBackground">
+          <bool>true</bool>
+         </property>
          <property name="text">
           <string>Doodadset:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QComboBox" name="comboBox"/>
+        <widget class="QComboBox" name="doodadSetSelector"/>
        </item>
        <item>
         <spacer name="horizontalSpacer_4">
@@ -376,6 +418,9 @@
        </item>
        <item>
         <widget class="QLabel" name="label_2">
+         <property name="accessibleName">
+          <string>overlay_label</string>
+         </property>
          <property name="text">
           <string>Move sensitivity:</string>
          </property>
@@ -383,6 +428,12 @@
        </item>
        <item>
         <widget class="QSlider" name="moveSensitivitySlider">
+         <property name="accessibleName">
+          <string>overlay_slider_horizontal</string>
+         </property>
+         <property name="autoFillBackground">
+          <bool>false</bool>
+         </property>
          <property name="minimum">
           <number>1</number>
          </property>
@@ -424,6 +475,12 @@
      </item>
      <item>
       <widget class="QLabel" name="label">
+       <property name="accessibleName">
+        <string>overlay_label</string>
+       </property>
+       <property name="autoFillBackground">
+        <bool>true</bool>
+       </property>
        <property name="text">
         <string>Light direction:</string>
        </property>
@@ -454,6 +511,9 @@
            <height>100</height>
           </size>
          </property>
+         <property name="autoFillBackground">
+          <bool>true</bool>
+         </property>
          <property name="minimum">
           <number>-180</number>
          </property>
@@ -491,6 +551,9 @@
            <height>100</height>
           </size>
          </property>
+         <property name="accessibleName">
+          <string>overlay_slider_vertical</string>
+         </property>
          <property name="minimum">
           <number>-180</number>
          </property>
@@ -503,6 +566,12 @@
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
+         <property name="invertedAppearance">
+          <bool>false</bool>
+         </property>
+         <property name="invertedControls">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
diff --git a/src/noggit/ui/font_noggit.hpp b/src/noggit/ui/font_noggit.hpp
index 3f951b6e..1abcb9db 100644
--- a/src/noggit/ui/font_noggit.hpp
+++ b/src/noggit/ui/font_noggit.hpp
@@ -101,7 +101,21 @@ namespace noggit
         VISIBILITY_HOLE_LINES = 0xf8b7,
         VISIBILITY_ANIMATION = 0xf8b8,
         VISIBILITY_ANIMATION_2 = 0xf8b8,
-        VISIBILITY_LIGHT = 0xf8ba
+        VISIBILITY_LIGHT = 0xf8ba,
+        INFO = 0xf8bb,
+        VISIBILITY_PARTICLES = 0xf8bc,
+        TIME_NORMAL = 0xf8bd,
+        TIME_PAUSE = 0xf8be,
+        TIME_SPEED = 0xf8bf,
+        CAMERA_TURN = 0xf8c0,
+        CAMERA_SPEED_SLOWER = 0xf8c1,
+        CAMERA_SPEED_FASTER = 0xf8c2,
+        TEXTURE_PALETTE = 0xf8c3,
+        TEXTURE_PALETTE_FAVORITE = 0xf8c4,
+        MOUSE_INVERT = 0xf8c5,
+        UI_TOGGLE = 0xf8c6,
+        VIEW_MODE_2D = 0xf8c7,
+        VIEW_AXIS = 0xf8c8
       };
     };