revise CSS and allow modular icons

app/core.cpp

@@ -33,7 +33,6 @@
 #include "project/item/footage/footage.h"
 #include "task/import/import.h"
 #include "task/taskmanager.h"
-#include "ui/icons/icons.h"
 #include "ui/style/style.h"
 #include "undo/undostack.h"
 #include "widget/menu/menushared.h"
@@ -217,9 +216,6 @@ void Core::DeclareTypesForQt()
 
 void Core::StartGUI(bool full_screen)
 {
-  // Load all icons
-  olive::icon::LoadAll();
-
   // Set UI style
   olive::style::AppSetDefault();
 

app/ui/icons/CMakeLists.txt

@@ -23,6 +23,7 @@ set(OLIVE_SOURCES
 
 set(OLIVE_RESOURCES
   ${OLIVE_RESOURCES}
-  ui/icons/icons.qrc
+  ui/icons/olive-dark/olive-dark.qrc
+  ui/icons/olive-light/olive-light.qrc
   PARENT_SCOPE
 )

app/ui/icons/generate-icons.sh

@@ -29,35 +29,53 @@
 
 OUTPUT_SIZES=( 16 32 64 128 )
 
-if [ $# -ne 2 ]
+if [ $# -lt 1 ]
 then
-  echo Usage: $0 path-to-svgs qrc-file
+  echo "Usage: $0 icon-pack-name [options]"
+  echo
+  echo "Example: $0 olive-dark"
+  echo
+  echo "Options:"
+  echo "    -n    Only generate QRC file"
   echo
-  echo Example: $0 svg icons.qrc
   exit 1
 fi
 
-SVGDIR=$1
-QRCFILE=$2
+PACKNAME=$1
+SVGDIR=$1/svg
+PNGDIR=$1
+QRCFILE=$1/$1.qrc
+
+ONLYQRC=0
+
+if [ "$2" == "-n" ]
+then
+  ONLYQRC=1
+fi
 
 truncate -s 0 $QRCFILE
 
 echo "<RCC>" >> $QRCFILE
-echo "  <qresource prefix=\"/icons\">" >> $QRCFILE
+echo "  <qresource prefix=\"/icons/$PACKNAME\">" >> $QRCFILE
 
-for f in $1/*.svg
+OutputPng() {
+  echo Creating $2...
+
+  echo "    <file>$(basename $2)</file>" >> $QRCFILE
+
+  if [ $ONLYQRC -eq 0 ]
+  then
+    inkscape -z -e $(pwd)/$2 -w $s -h $s $1
+  fi
+}
+
+for f in $SVGDIR/*.svg
 do
   FNBASE=$(basename -s .svg $f)
 
   for s in "${OUTPUT_SIZES[@]}"
   do
-    OUTPUTFN=$FNBASE.$s.png
-
-    echo Creating $OUTPUTFN...
-
-    echo "    <file>$OUTPUTFN</file>" >> $QRCFILE
-    
-    inkscape -z -e $(pwd)/$OUTPUTFN -w $s -h $s $f
+    OutputPng $f $PNGDIR/$FNBASE.$s.png
   done
 done
 

app/ui/icons/icons.cpp

@@ -66,55 +66,55 @@ QIcon olive::icon::Add;
 QIcon olive::icon::Error;
 QIcon olive::icon::DirUp;
 
-void olive::icon::LoadAll()
+void olive::icon::LoadAll(const QString& theme)
 {
-  GoToStart = Create("prev");
-  PrevFrame = Create("rew");
-  Play = Create("play");
-  Pause = Create("pause");
-  NextFrame = Create("ff");
-  GoToEnd = Create("next");
+  GoToStart = Create(theme, "prev");
+  PrevFrame = Create(theme, "rew");
+  Play = Create(theme, "play");
+  Pause = Create(theme, "pause");
+  NextFrame = Create(theme, "ff");
+  GoToEnd = Create(theme, "next");
 
-  New = Create("new");
-  Open = Create("open");
-  Save = Create("save");
-  Undo = Create("undo");
-  Redo = Create("redo");
-  TreeView = Create("treeview");
-  ListView = Create("listview");
-  IconView = Create("iconview");
+  New = Create(theme, "new");
+  Open = Create(theme, "open");
+  Save = Create(theme, "save");
+  Undo = Create(theme, "undo");
+  Redo = Create(theme, "redo");
+  TreeView = Create(theme, "treeview");
+  ListView = Create(theme, "listview");
+  IconView = Create(theme, "iconview");
 
-  ToolPointer = Create("arrow");
-  ToolEdit = Create("beam");
-  ToolRipple = Create("ripple");
-  ToolRolling = Create("rolling");
-  ToolRazor = Create("razor");
-  ToolSlip = Create("slip");
-  ToolSlide = Create("slide");
-  ToolHand = Create("hand");
-  ToolTransition = Create("transition-tool");
+  ToolPointer = Create(theme, "arrow");
+  ToolEdit = Create(theme, "beam");
+  ToolRipple = Create(theme, "ripple");
+  ToolRolling = Create(theme, "rolling");
+  ToolRazor = Create(theme, "razor");
+  ToolSlip = Create(theme, "slip");
+  ToolSlide = Create(theme, "slide");
+  ToolHand = Create(theme, "hand");
+  ToolTransition = Create(theme, "transition-tool");
 
-  Folder = Create("folder");
-  Sequence = Create("sequence");
-  Video = Create("videosource");
-  Audio = Create("audiosource");
-  Image = Create("imagesource");
+  Folder = Create(theme, "folder");
+  Sequence = Create(theme, "sequence");
+  Video = Create(theme, "videosource");
+  Audio = Create(theme, "audiosource");
+  Image = Create(theme, "imagesource");
 
-  Snapping = Create("magnet");
-  ZoomIn = Create("zoomin");
-  ZoomOut = Create("zoomout");
-  Record = Create("record");
-  Add = Create("add-button");
-  Error = Create("error");
-  DirUp = Create("dirup");
+  Snapping = Create(theme, "magnet");
+  ZoomIn = Create(theme, "zoomin");
+  ZoomOut = Create(theme, "zoomout");
+  Record = Create(theme, "record");
+  Add = Create(theme, "add-button");
+  Error = Create(theme, "error");
+  DirUp = Create(theme, "dirup");
 }
 
-QIcon olive::icon::Create(const QString &name)
+QIcon olive::icon::Create(const QString& theme, const QString &name)
 {
   QIcon icon;
 
   for (int i=0;i<ICON_SIZE_COUNT;i++) {
-    icon.addFile(QString(":/icons/%1.%2.png").arg(name, QString::number(ICON_SIZES[i])),
+    icon.addFile(QString(":/icons/%1/%2.%3.png").arg(theme, name, QString::number(ICON_SIZES[i])),
                  QSize(ICON_SIZES[i], ICON_SIZES[i]));
   }
 

app/ui/icons/icons.h

@@ -88,6 +88,10 @@ extern QIcon DirUp;
  * There is not much reason to call this outside of LoadAll() (which stores icons globally in memory so they don't
  * have to be reloaded each time a new object needs an icon).
  *
+ * @param theme
+ *
+ * Name of the theme (used in the URL as the folder to load PNGs from)
+ *
  * @param name
  *
  * Name of the icon (will correspond to the original SVG's filename with no path or extension)
@@ -96,7 +100,7 @@ extern QIcon DirUp;
  *
  * A QIcon object containing the various icon sizes loaded from resource
  */
-QIcon Create(const QString& name);
+QIcon Create(const QString &theme, const QString& name);
 
 /**
  * @brief Methodically load all Olive icons into global variables that can be accessed throughout the application
@@ -104,7 +108,7 @@ QIcon Create(const QString& name);
  * It's recommended to load any UI icons here so they're ready at startup and don't need to be re-loaded upon each
  * use.
  */
-void LoadAll();
+void LoadAll(const QString &theme);
 
 }
 }