further revised icon system

- Move QRC generation to CMake so they can be generated automatically rather than with generate-style.sh
- Removed QRC generation from generate-style.sh
- Added extra "disabled icon" generation in generate-style.sh
- Added disabled icon loading to main code

app/ui/icons/icons.cpp

@@ -139,7 +139,9 @@ QIcon icon::Create(const QString& theme, const QString &name)
 
   for (int i=0;i<ICON_SIZE_COUNT;i++) {
     icon.addFile(QStringLiteral("%1/png/%2.%3.png").arg(theme, name, QString::number(ICON_SIZES[i])),
-                 QSize(ICON_SIZES[i], ICON_SIZES[i]));
+                 QSize(ICON_SIZES[i], ICON_SIZES[i]), QIcon::Normal);
+    icon.addFile(QStringLiteral("%1/png/%2.%3.disabled.png").arg(theme, name, QString::number(ICON_SIZES[i])),
+                 QSize(ICON_SIZES[i], ICON_SIZES[i]), QIcon::Disabled);
   }
 
   return icon;

app/ui/style/CMakeLists.txt

@@ -14,10 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+add_subdirectory(olive-dark)
+add_subdirectory(olive-light)
+
 set(OLIVE_RESOURCES
   ${OLIVE_RESOURCES}
-  ui/style/olive-light/olive-light.qrc
-  ui/style/olive-dark/olive-dark.qrc
   PARENT_SCOPE
 )
 

app/ui/style/generate-style.sh

@@ -31,46 +31,23 @@ OUTPUT_SIZES=( 16 32 64 128 )
 
 if [ $# -lt 1 ]
 then
-  echo "Usage: $0 icon-pack-name [options]"
+  echo "Generates sized PNG icons from SVG files"
+  echo "Usage: $0 icon-pack-name"
   echo
   echo "Example: $0 olive-dark"
   echo
-  echo "Options:"
-  echo "    -n    Only generate QRC file"
-  echo
   exit 1
 fi
 
 PACKNAME=$1
 SVGDIR=$1/svg
 PNGDIR=$1/png
-QRCFILE=$1/$1.qrc
 
 mkdir -p $PNGDIR
 
-ONLYQRC=0
-
-if [ "$2" == "-n" ]
-then
-  ONLYQRC=1
-fi
-
-truncate -s 0 $QRCFILE
-
-echo "<RCC>" >> $QRCFILE
-echo "  <qresource prefix=\"/style/$PACKNAME\">" >> $QRCFILE
-echo "    <file>style.css</file>" >> $QRCFILE
-echo "    <file>palette.ini</file>" >> $QRCFILE
-
 OutputPng() {
-  echo Creating $2...
-
-  echo "    <file>png/$(basename $2)</file>" >> $QRCFILE
-
-  if [ $ONLYQRC -eq 0 ]
-  then
-    inkscape -z -e $(pwd)/$2 -w $s -h $s $1
-  fi
+  inkscape --export-filename $2.png --export-width $s --export-height $s $1
+  convert $2.png -alpha set -background none -channel A -evaluate multiply 0.25 +channel $2.disabled.png
 }
 
 for f in $SVGDIR/*.svg
@@ -79,9 +56,6 @@ do
 
   for s in "${OUTPUT_SIZES[@]}"
   do
-    OutputPng $f $PNGDIR/$FNBASE.$s.png
+    OutputPng $f $PNGDIR/$FNBASE.$s
   done
 done
-
-echo "  </qresource>" >> $QRCFILE
-echo "</RCC>" >> $QRCFILE

app/ui/style/olive-dark/CMakeLists.txt

@@ -0,0 +1,32 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2021 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+file(GLOB_RECURSE STYLE_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/png *.png)
+set(QRC_BODY "")
+list(TRANSFORM STYLE_RESOURCES PREPEND "png/")
+list(APPEND STYLE_RESOURCES "palette.ini")
+list(APPEND STYLE_RESOURCES "style.css")
+foreach(ICON_FILE ${STYLE_RESOURCES})
+  string(APPEND QRC_BODY "<file>${ICON_FILE}</file>\n")
+  configure_file("${ICON_FILE}" "${ICON_FILE}" COPYONLY)
+endforeach()
+configure_file(res.qrc.in res.qrc @ONLY)
+
+set(OLIVE_RESOURCES
+  ${OLIVE_RESOURCES}
+  ${CMAKE_CURRENT_BINARY_DIR}/res.qrc
+  PARENT_SCOPE
+)