Update icons #91

friction2d · May 11, 2024 · 57f99fa · 57f99fa
1 parent a66bc1d
commit 57f99fa
Show file tree

Hide file tree

Showing 203 changed files with 1,665 additions and 22 deletions.
diff --git a/src/app/GUI/BoxesList/boxsinglewidget.cpp b/src/app/GUI/BoxesList/boxsinglewidget.cpp
@@ -575,22 +575,22 @@ void BoxSingleWidget::loadStaticPixmaps()
 
     VISIBLE_ICON = new QIcon(QIcon::fromTheme("visible"));
     INVISIBLE_ICON = new QIcon(QIcon::fromTheme("hidden"));
-    BOX_CHILDREN_VISIBLE_ICON = new QIcon(":/icons/childrenVisible_v2.svg");
-    BOX_CHILDREN_HIDDEN_ICON = new QIcon(":/icons/childrenHidden_v2.svg");
-    ANIMATOR_CHILDREN_VISIBLE_ICON = new QIcon(":/icons/childrenVisibleSmall_v2.svg");
-    ANIMATOR_CHILDREN_HIDDEN_ICON = new QIcon(":/icons/childrenHiddenSmall_v2.svg");
+    BOX_CHILDREN_VISIBLE_ICON = new QIcon(QIcon::fromTheme("visible-child"));
+    BOX_CHILDREN_HIDDEN_ICON = new QIcon(QIcon::fromTheme("hidden-child"));
+    ANIMATOR_CHILDREN_VISIBLE_ICON = new QIcon(QIcon::fromTheme("visible-child-small"));
+    ANIMATOR_CHILDREN_HIDDEN_ICON = new QIcon(QIcon::fromTheme("hidden-child-small"));
     LOCKED_ICON = new QIcon(QIcon::fromTheme("locked"));
     UNLOCKED_ICON = new QIcon(QIcon::fromTheme("unlocked"));
-    MUTED_ICON = new QIcon(":/icons/muted.svg");
-    UNMUTED_ICON = new QIcon(":/icons/unmuted.svg");
-    ANIMATOR_RECORDING_ICON = new QIcon(":/icons/recording.svg");
-    ANIMATOR_NOT_RECORDING_ICON = new QIcon(":/icons/notRecording.svg");
-    ANIMATOR_DESCENDANT_RECORDING_ICON = new QIcon(":/icons/childRecording.svg");
-    C_ICON = new QIcon(":/icons/c.svg");
-    G_ICON = new QIcon(":/icons/g.svg");
-    CG_ICON = new QIcon(":/icons/cg.svg");
-    GRAPH_PROPERTY_ICON = new QIcon(":/icons/noInterpolation/graphProperty.png"); // TODO svg
-    PROMOTE_TO_LAYER_ICON = new QIcon(":/icons/promoteToLayer_v2.svg");
+    MUTED_ICON = new QIcon(QIcon::fromTheme("muted"));
+    UNMUTED_ICON = new QIcon(QIcon::fromTheme("unmuted"));
+    ANIMATOR_RECORDING_ICON = new QIcon(QIcon::fromTheme("record"));
+    ANIMATOR_NOT_RECORDING_ICON = new QIcon(QIcon::fromTheme("norecord"));
+    ANIMATOR_DESCENDANT_RECORDING_ICON = new QIcon(QIcon::fromTheme("record-child"));
+    C_ICON = new QIcon(QIcon::fromTheme("cpu-active"));
+    G_ICON = new QIcon(QIcon::fromTheme("gpu-active"));
+    CG_ICON = new QIcon(QIcon::fromTheme("cpu-gpu"));
+    GRAPH_PROPERTY_ICON = new QIcon(":/icons/noInterpolation/graphProperty.png"); // TODO
+    PROMOTE_TO_LAYER_ICON = new QIcon(QIcon::fromTheme("layer"));
 
     sStaticPixmapsLoaded = true;
 }

diff --git a/src/app/GUI/fillstrokesettings.cpp b/src/app/GUI/fillstrokesettings.cpp
@@ -74,8 +74,8 @@ FillStrokeSettingsWidget::FillStrokeSettingsWidget(Document &document,
                                         tr("Fill"), this); // TODO: svg
     mStrokeTargetButton = new QPushButton(QIcon(":/icons/noInterpolation/properties_stroke_paint.png"),
                                           tr("Stroke"), this); // TODO svg
-    mFillNoneButton = new QPushButton(QIcon(":/icons/fill_none.svg").pixmap(10, 10),
-                                      tr("None"), this); // use 10x10 workaround until everything is svg
+    mFillNoneButton = new QPushButton(QIcon::fromTheme("fill_none").pixmap(10, 10),
+                                      tr("None"), this);
     mFillFlatButton = new QPushButton(QIcon(":/icons/noInterpolation/fill_flat.png"),
                                       tr("Flat"), this); // TODO: svg
     mFillGradientButton = new QPushButton(QIcon(":/icons/noInterpolation/fill_gradient.png"),
@@ -153,11 +153,11 @@ FillStrokeSettingsWidget::FillStrokeSettingsWidget(Document &document,
     mJoinStyleWidget->setContentsMargins(0, 0, 0, 0);
     mJoinStyleLayout->setMargin(0);
 
-    mBevelJoinStyleButton = new QPushButton(QIcon(":/icons/joinBevel.svg"),
+    mBevelJoinStyleButton = new QPushButton(QIcon::fromTheme("joinBevel"),
                                             QString(), this);
-    mMiterJointStyleButton = new QPushButton(QIcon(":/icons/joinMiter.svg"),
+    mMiterJointStyleButton = new QPushButton(QIcon::fromTheme("joinMiter"),
                                              QString(), this);
-    mRoundJoinStyleButton = new QPushButton(QIcon(":/icons/joinRound.svg"),
+    mRoundJoinStyleButton = new QPushButton(QIcon::fromTheme("joinRound"),
                                             QString(), this);
 
     mBevelJoinStyleButton->setToolTip(tr("Bevel"));
@@ -192,11 +192,11 @@ FillStrokeSettingsWidget::FillStrokeSettingsWidget(Document &document,
     mCapStyleWidget->setContentsMargins(0, 0, 0, 0);
     mCapStyleLayout->setMargin(0);
 
-    mFlatCapStyleButton = new QPushButton(QIcon(":/icons/capFlat.svg"),
+    mFlatCapStyleButton = new QPushButton(QIcon::fromTheme("capFlat"),
                                           QString(), this);
-    mSquareCapStyleButton = new QPushButton(QIcon(":/icons/capSquare.svg"),
+    mSquareCapStyleButton = new QPushButton(QIcon::fromTheme("capSquare"),
                                             QString(), this);
-    mRoundCapStyleButton = new QPushButton(QIcon(":/icons/capRound.svg"),
+    mRoundCapStyleButton = new QPushButton(QIcon::fromTheme("capRound"),
                                            QString(), this);
 
     mFlatCapStyleButton->setToolTip(tr("Flat"));