New icons for breadcrumbs and checkboxes

Breadcrumbs layout also fixed.

Change-Id: I837cf203b448b80989dd33aa32a7276974b4dddd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

15 files changed, 15 insertions, 7 deletions

diff --git a/src/Authoring/Studio/Controls/BreadCrumbControl.cpp b/src/Authoring/Studio/Controls/BreadCrumbControl.cpp
index 5ccae438..adf4a366 100644
--- a/src/Authoring/Studio/Controls/BreadCrumbControl.cpp
+++ b/src/Authoring/Studio/Controls/BreadCrumbControl.cpp
@@ -96,9 +96,10 @@ static inline CBreadCrumbControl::TSeparatorButtonType *CreateSeparatorButton(co
         new CBreadCrumbControl::TSeparatorButtonType;
     theButton->SetAutoSize(true);
     theButton->SetUpImage(inImage);
-    theButton->SetSize(CPt(12, 21));
-    theButton->SetMinimumSize(CPt(12, 21));
-    theButton->SetMaximumSize(CPt(12, 21));
+    theButton->SetSize(CPt(12, 24));
+    theButton->SetMinimumSize(CPt(12, 24));
+    theButton->SetMaximumSize(CPt(12, 24));
+    theButton->SetCenterImage(true, false);
     return theButton;
 }
 
@@ -121,8 +122,9 @@ static inline CBreadCrumbControl::TButtonType *CreateButton(const QPixmap &inIma
     theButton->SetFillColorUp(CStudioPreferences::GetBaseColor());
     theButton->SetFillColorDown(CStudioPreferences::GetBaseColor());
     theButton->SetFillColorOver(CStudioPreferences::GetMouseOverHighlightColor());
-    theButton->SetMinimumSize(CPt(16, 21));
-    theButton->SetMaximumSize(CPt(125, 21));
+    theButton->SetMinimumSize(CPt(16, 24));
+    theButton->SetMaximumSize(CPt(125, 24));
+    theButton->SetCenterImage(true, false);
     return theButton;
 }
 
diff --git a/src/Authoring/Studio/Controls/TextButton.h b/src/Authoring/Studio/Controls/TextButton.h
index 2593a1d1..8ca4178d 100644
--- a/src/Authoring/Studio/Controls/TextButton.h
+++ b/src/Authoring/Studio/Controls/TextButton.h
@@ -46,8 +46,8 @@
 
 #include <QSize>
 
-const long MARGIN_X = 12;
-const long MARGIN_Y = 6;
+const long MARGIN_X = 2;
+const long MARGIN_Y = 0;
 
 //=============================================================================
 /**
diff --git a/src/Authoring/Studio/images.qrc b/src/Authoring/Studio/images.qrc
index 19cabdc1..81147548 100644
--- a/src/Authoring/Studio/images.qrc
+++ b/src/Authoring/Studio/images.qrc
@@ -175,5 +175,11 @@
         <file>images/Objects-Text-Disabled@2x.png</file>
         <file>images/Slide-Master-Active@2x.png</file>
         <file>images/Slide-Normal@2x.png</file>
+        <file>images/breadcrumb_component_button@2x.png</file>
+        <file>images/breadcrumb_component_colon_button@2x.png</file>
+        <file>images/breadcrumb_component_grey_button@2x.png</file>
+        <file>images/breadcrumb_component_scene@2x.png</file>
+        <file>images/checkbox-checked@2x.png</file>
+        <file>images/checkbox-unchecked@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/Authoring/Studio/images/breadcrumb_component_button.png b/src/Authoring/Studio/images/breadcrumb_component_button.png
index 4f0cd4b5..7b4e4e4c 100644
--- a/src/Authoring/Studio/images/breadcrumb_component_button.png
+++ b/src/Authoring/Studio/images/breadcrumb_component_button.png
diff --git a/src/Authoring/Studio/images/breadcrumb_component_button@2x.png b/src/Authoring/Studio/images/breadcrumb_component_button@2x.png
new file mode 100644
index 00000000..abdba2d0
--- /dev/null
+++ b/src/Authoring/Studio/images/breadcrumb_component_button@2x.png
diff --git a/src/Authoring/Studio/images/breadcrumb_component_colon_button.png b/src/Authoring/Studio/images/breadcrumb_component_colon_button.png
index ff80c8b7..bf360165 100644
--- a/src/Authoring/Studio/images/breadcrumb_component_colon_button.png
+++ b/src/Authoring/Studio/images/breadcrumb_component_colon_button.png
diff --git a/src/Authoring/Studio/images/breadcrumb_component_colon_button@2x.png b/src/Authoring/Studio/images/breadcrumb_component_colon_button@2x.png
new file mode 100644
index 00000000..cc253edd
--- /dev/null
+++ b/src/Authoring/Studio/images/breadcrumb_component_colon_button@2x.png
diff --git a/src/Authoring/Studio/images/breadcrumb_component_grey_button.png b/src/Authoring/Studio/images/breadcrumb_component_grey_button.png
index 0db36558..abd7e146 100644
--- a/src/Authoring/Studio/images/breadcrumb_component_grey_button.png
+++ b/src/Authoring/Studio/images/breadcrumb_component_grey_button.png
diff --git a/src/Authoring/Studio/images/breadcrumb_component_grey_button@2x.png b/src/Authoring/Studio/images/breadcrumb_component_grey_button@2x.png
new file mode 100644
index 00000000..7d33555c
--- /dev/null
+++ b/src/Authoring/Studio/images/breadcrumb_component_grey_button@2x.png
diff --git a/src/Authoring/Studio/images/breadcrumb_component_scene.png b/src/Authoring/Studio/images/breadcrumb_component_scene.png
index f1c68fe6..4645f6da 100644
--- a/src/Authoring/Studio/images/breadcrumb_component_scene.png
+++ b/src/Authoring/Studio/images/breadcrumb_component_scene.png
diff --git a/src/Authoring/Studio/images/breadcrumb_component_scene@2x.png b/src/Authoring/Studio/images/breadcrumb_component_scene@2x.png
new file mode 100644
index 00000000..8a2d2c04
--- /dev/null
+++ b/src/Authoring/Studio/images/breadcrumb_component_scene@2x.png
diff --git a/src/Authoring/Studio/images/checkbox-checked.png b/src/Authoring/Studio/images/checkbox-checked.png
index f13b9aa5..5acdf1b1 100644
--- a/src/Authoring/Studio/images/checkbox-checked.png
+++ b/src/Authoring/Studio/images/checkbox-checked.png
diff --git a/src/Authoring/Studio/images/checkbox-checked@2x.png b/src/Authoring/Studio/images/checkbox-checked@2x.png
new file mode 100644
index 00000000..a5b97c8e
--- /dev/null
+++ b/src/Authoring/Studio/images/checkbox-checked@2x.png
diff --git a/src/Authoring/Studio/images/checkbox-unchecked.png b/src/Authoring/Studio/images/checkbox-unchecked.png
index 7482c028..9c2bcd6b 100644
--- a/src/Authoring/Studio/images/checkbox-unchecked.png
+++ b/src/Authoring/Studio/images/checkbox-unchecked.png
diff --git a/src/Authoring/Studio/images/checkbox-unchecked@2x.png b/src/Authoring/Studio/images/checkbox-unchecked@2x.png
new file mode 100644
index 00000000..8d244d79
--- /dev/null
+++ b/src/Authoring/Studio/images/checkbox-unchecked@2x.png