Icon tweaks and cleanup

- Color-unranked icons tweaked for lighter themes, closes #4704 - Star-unranked icons smaller to increase contrast, #4469 - Deleted old icons which snuck back in with the ICC geneartor merge.
Beep6581 · Jul 29, 2018 · 6599012 · 6599012
1 parent 9dc7710
commit 6599012
Show file tree

Hide file tree

Showing 17 changed files with 238 additions and 670 deletions.
diff --git a/rtdata/images/Dark/actions/gamut-plus.png b/rtdata/images/Dark/actions/gamut-plus.png
diff --git a/rtdata/images/Light/actions/gamut-plus.png b/rtdata/images/Light/actions/gamut-plus.png
diff --git a/rtdata/images/themed/png/dark/circle-darkgray-small.png b/rtdata/images/themed/png/dark/circle-darkgray-small.png
diff --git a/rtdata/images/themed/png/dark/circle-gray-small.png b/rtdata/images/themed/png/dark/circle-gray-small.png
diff --git a/rtdata/images/themed/png/dark/star-small.png b/rtdata/images/themed/png/dark/star-small.png
diff --git a/rtdata/images/themed/png/light/circle-darkgray-small.png b/rtdata/images/themed/png/light/circle-darkgray-small.png
diff --git a/rtdata/images/themed/png/light/circle-gray-small.png b/rtdata/images/themed/png/light/circle-gray-small.png
diff --git a/rtdata/images/themed/png/light/star-small.png b/rtdata/images/themed/png/light/star-small.png
diff --git a/rtdata/images/themed/svg/circle-darkgray-small.svg b/rtdata/images/themed/svg/circle-darkgray-small.svg
diff --git a/rtdata/images/themed/svg/circle-gray-small.svg b/rtdata/images/themed/svg/circle-gray-small.svg
diff --git a/rtdata/images/themed/svg/gamut-plus.svg b/rtdata/images/themed/svg/gamut-plus.svg
diff --git a/rtdata/images/themed/svg/star-small.svg b/rtdata/images/themed/svg/star-small.svg
diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc
@@ -202,7 +202,8 @@ FileBrowser::FileBrowser () :
      * color labels
      ***********************/
 
-    // Same image arrays in filecatalog.cc
+    // Thumbnail context menu
+    // Similar image arrays in filecatalog.cc
     std::array<std::string, 6> clabelActiveIcons = {"circle-empty-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"};
     std::array<std::string, 6> clabelInactiveIcons = {"circle-empty-darkgray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"};
 

diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
@@ -193,9 +193,10 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
         bRank[i]->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event), false);
     }
 
-    // Same image arrays in filebrowser.cc
-    std::array<std::string, 6> clabelActiveIcons = {"circle-empty-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"};
-    std::array<std::string, 6> clabelInactiveIcons = {"circle-empty-darkgray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"};
+    // Toolbar
+    // Similar image arrays in filebrowser.cc
+    std::array<std::string, 6> clabelActiveIcons = {"circle-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"};
+    std::array<std::string, 6> clabelInactiveIcons = {"circle-empty-gray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"};
 
     iUnCLabeled = new RTImage(clabelActiveIcons[0]);
     igUnCLabeled = new RTImage(clabelInactiveIcons[0]);

diff --git a/rtgui/filethumbnailbuttonset.cc b/rtgui/filethumbnailbuttonset.cc
@@ -49,7 +49,7 @@ FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry)
         unTrashIcon = RTImage::createFromPng ("trash-remove-small.png");
         processIcon = RTImage::createFromPng ("gears-small.png");
 
-        colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray-small.png"); //("nocolorlabel.png");
+        colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray-small.png");
         colorLabelIcon_1 = RTImage::createFromPng ("circle-red-small.png");
         colorLabelIcon_2 = RTImage::createFromPng ("circle-yellow-small.png");
         colorLabelIcon_3 = RTImage::createFromPng ("circle-green-small.png");

diff --git a/tools/source_icons/scalable/gamut-plus.file b/tools/source_icons/scalable/gamut-plus.file