Skip to content

Commit

Permalink
Update icons
Browse files Browse the repository at this point in the history
  • Loading branch information
rodlie committed Aug 4, 2024
1 parent d3fa096 commit 99a4cdf
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 23 deletions.
39 changes: 20 additions & 19 deletions src/app/GUI/effectactions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,44 +30,46 @@

void MainWindow::setupMenuEffects()
{
const QIcon eIcon = QIcon::fromTheme("effect");
{ // path
const auto menu1 = mEffectsMenu->addMenu(QIcon::fromTheme("preferences"), tr("Path Effects"));
const auto menu2 = mEffectsMenu->addMenu(QIcon::fromTheme("preferences"), tr("Fill Effects"));
const auto menu3 = mEffectsMenu->addMenu(QIcon::fromTheme("preferences"), tr("Outline Base Effects"));
const auto menu4 = mEffectsMenu->addMenu(QIcon::fromTheme("preferences"), tr("Outline Effects"));
const auto menu1 = mEffectsMenu->addMenu(eIcon, tr("Path Effects"));
const auto menu2 = mEffectsMenu->addMenu(eIcon, tr("Fill Effects"));
const auto menu3 = mEffectsMenu->addMenu(eIcon, tr("Outline Base Effects"));
const auto menu4 = mEffectsMenu->addMenu(eIcon, tr("Outline Effects"));
const auto adder = [this,
menu1,
menu2,
menu3,
menu4](const QString& name,
menu4,
eIcon](const QString& name,
const PathEffectMenuCreator::EffectCreator& creator) {
if (name.isEmpty()) { return; }
{
const auto act = menu1->addAction(QIcon::fromTheme("preferences"), name);
const auto act = menu1->addAction(eIcon, name);
act->setData(QString(name).prepend(tr("Add ")).append(tr(" (Path Effect)")));
cmdAddAction(act);
connect(act, &QAction::triggered, this, [this, creator]() {
addPathEffect(creator());
});
}
{
const auto act = menu2->addAction(QIcon::fromTheme("preferences"), name);
const auto act = menu2->addAction(eIcon, name);
act->setData(QString(name).prepend(tr("Add ")).append(tr(" (Fill Effect)")));
cmdAddAction(act);
connect(act, &QAction::triggered, this, [this, creator]() {
addFillPathEffect(creator());
});
}
{
const auto act = menu3->addAction(QIcon::fromTheme("preferences"), name);
const auto act = menu3->addAction(eIcon, name);
act->setData(QString(name).prepend(tr("Add ")).append(tr(" (Outline Base Effect)")));
cmdAddAction(act);
connect(act, &QAction::triggered, this, [this, creator]() {
addOutlineBasePathEffect(creator());
});
}
{
const auto act = menu4->addAction(QIcon::fromTheme("preferences"), name);
const auto act = menu4->addAction(eIcon, name);
act->setData(QString(name).prepend(tr("Add ")).append(tr(" (Outline Effect)")));
cmdAddAction(act);
connect(act, &QAction::triggered, this, [this, creator]() {
Expand All @@ -78,11 +80,11 @@ void MainWindow::setupMenuEffects()
PathEffectMenuCreator::forEveryEffect(adder);
}
{ // transform
const auto menu = mEffectsMenu->addMenu(QIcon::fromTheme("preferences"), tr("Transform Effects"));
const auto adder = [this, menu](const QString& name,
const auto menu = mEffectsMenu->addMenu(eIcon, tr("Transform Effects"));
const auto adder = [this, menu, eIcon](const QString& name,
const TransformEffectMenuCreator::EffectCreator& creator) {
if (name.isEmpty()) { return; }
const auto act = menu->addAction(QIcon::fromTheme("preferences"), name);
const auto act = menu->addAction(eIcon, name);
act->setData(QString(name).prepend(tr("Add ")).append(tr(" (Transform Effect)")));
cmdAddAction(act);
connect(act, &QAction::triggered, this, [this, creator]() {
Expand All @@ -92,11 +94,11 @@ void MainWindow::setupMenuEffects()
TransformEffectMenuCreator::forEveryEffect(adder);
}
{ // blend
const auto menu = mEffectsMenu->addMenu(QIcon::fromTheme("preferences"), tr("Blend Effects"));
const auto adder = [this, menu](const QString& name,
const auto menu = mEffectsMenu->addMenu(eIcon, tr("Blend Effects"));
const auto adder = [this, menu, eIcon](const QString& name,
const BlendEffectMenuCreator::EffectCreator& creator) {
if (name.isEmpty()) { return; }
const auto act = menu->addAction(QIcon::fromTheme("preferences"), name);
const auto act = menu->addAction(eIcon, name);
act->setData(QString(name).prepend(tr("Add ")).append(tr(" (Blend Effect)")));
cmdAddAction(act);
connect(act, &QAction::triggered, this, [this, creator]() {
Expand All @@ -106,13 +108,13 @@ void MainWindow::setupMenuEffects()
BlendEffectMenuCreator::forEveryEffect(adder);
}
{ // raster
const auto menu = mEffectsMenu->addMenu(QIcon::fromTheme("preferences"), tr("Raster Effects"));
const auto adder = [this, menu](const QString& name, const QString& path,
const auto menu = mEffectsMenu->addMenu(eIcon, tr("Raster Effects"));
const auto adder = [this, menu, eIcon](const QString& name, const QString& path,
const RasterEffectMenuCreator::EffectCreator& creator) {
if (name.isEmpty()) { return; }
QString title = name;
if (!path.isEmpty()) { title.append(QString(" (%1)").arg(path));}
const auto act = menu->addAction(QIcon::fromTheme("preferences"), title);
const auto act = menu->addAction(eIcon, title);
act->setData(QString(name).prepend(tr("Add ")).append(tr(" (Raster Effect)")));
cmdAddAction(act);
connect(act, &QAction::triggered, this, [this, creator]() {
Expand All @@ -123,7 +125,6 @@ void MainWindow::setupMenuEffects()
menu->addSeparator();
RasterEffectMenuCreator::forEveryEffectCustom(adder);
RasterEffectMenuCreator::forEveryEffectShader(adder);
//RasterEffectMenuCreator::forEveryEffect(adder);
}
}

Expand Down
6 changes: 4 additions & 2 deletions src/app/GUI/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,8 @@ void MainWindow::setupMenuBar()

mEditMenu->addSeparator();

const auto addKeyAct = mEditMenu->addAction(tr("Add Key(s)"), [this]() {
const auto addKeyAct = mEditMenu->addAction(QIcon::fromTheme("plus"),
tr("Add Key(s)"), [this]() {
const auto scene = *mDocument.fActiveScene;
if (!scene) { return; }
scene->addKeySelectedProperties();
Expand Down Expand Up @@ -1244,7 +1245,8 @@ void MainWindow::setupMenuBar()
QMessageBox::aboutQt(this, tr("About Qt"));
});

help->addAction(tr("Command Palette"), this, [this]() {
help->addAction(QIcon::fromTheme("cmd"),
tr("Command Palette"), this, [this]() {
CommandPalette dialog(mDocument, this);
dialog.exec();
}, QKeySequence(AppSupport::getSettings("shortcuts",
Expand Down
2 changes: 1 addition & 1 deletion src/app/GUI/timelinedockwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ TimelineDockWidget::TimelineDockWidget(Document& document,
connect(mStopButton, &QAction::triggered,
this, &TimelineDockWidget::interruptPreview);

mLoopButton = new QAction(QIcon::fromTheme("loop"),
mLoopButton = new QAction(QIcon::fromTheme("loop2"),
tr("Loop Preview"),
this);
mLoopButton->setCheckable(true);
Expand Down
2 changes: 1 addition & 1 deletion src/app/icons
Submodule icons updated 76 files
+42 −0 hicolor.qrc
+ hicolor/128x128/legacy/cmd.png
+ hicolor/128x128/legacy/effect.png
+ hicolor/128x128/legacy/loop2.png
+ hicolor/128x128/legacy/play.png
+ hicolor/128x128/legacy/preview.png
+ hicolor/16x16/legacy/cmd.png
+ hicolor/16x16/legacy/effect.png
+ hicolor/16x16/legacy/loop2.png
+ hicolor/16x16/legacy/play.png
+ hicolor/16x16/legacy/preview.png
+ hicolor/17x17/legacy/cmd.png
+ hicolor/17x17/legacy/effect.png
+ hicolor/17x17/legacy/loop2.png
+ hicolor/17x17/legacy/play.png
+ hicolor/17x17/legacy/preview.png
+ hicolor/192x192/legacy/cmd.png
+ hicolor/192x192/legacy/effect.png
+ hicolor/192x192/legacy/loop2.png
+ hicolor/192x192/legacy/play.png
+ hicolor/192x192/legacy/preview.png
+ hicolor/20x20/legacy/cmd.png
+ hicolor/20x20/legacy/effect.png
+ hicolor/20x20/legacy/loop2.png
+ hicolor/20x20/legacy/play.png
+ hicolor/20x20/legacy/preview.png
+ hicolor/22x22/legacy/cmd.png
+ hicolor/22x22/legacy/effect.png
+ hicolor/22x22/legacy/loop2.png
+ hicolor/22x22/legacy/play.png
+ hicolor/22x22/legacy/preview.png
+ hicolor/24x24/legacy/cmd.png
+ hicolor/24x24/legacy/effect.png
+ hicolor/24x24/legacy/loop2.png
+ hicolor/24x24/legacy/play.png
+ hicolor/24x24/legacy/preview.png
+ hicolor/256x256/legacy/cmd.png
+ hicolor/256x256/legacy/effect.png
+ hicolor/256x256/legacy/loop2.png
+ hicolor/256x256/legacy/play.png
+ hicolor/256x256/legacy/preview.png
+ hicolor/26x26/legacy/cmd.png
+ hicolor/26x26/legacy/effect.png
+ hicolor/26x26/legacy/loop2.png
+ hicolor/26x26/legacy/play.png
+ hicolor/26x26/legacy/preview.png
+ hicolor/28x28/legacy/cmd.png
+ hicolor/28x28/legacy/effect.png
+ hicolor/28x28/legacy/loop2.png
+ hicolor/28x28/legacy/play.png
+ hicolor/28x28/legacy/preview.png
+ hicolor/32x32/legacy/cmd.png
+ hicolor/32x32/legacy/effect.png
+ hicolor/32x32/legacy/loop2.png
+ hicolor/32x32/legacy/play.png
+ hicolor/32x32/legacy/preview.png
+ hicolor/48x48/legacy/cmd.png
+ hicolor/48x48/legacy/effect.png
+ hicolor/48x48/legacy/loop2.png
+ hicolor/48x48/legacy/play.png
+ hicolor/48x48/legacy/preview.png
+ hicolor/64x64/legacy/cmd.png
+ hicolor/64x64/legacy/effect.png
+ hicolor/64x64/legacy/loop2.png
+ hicolor/64x64/legacy/play.png
+ hicolor/64x64/legacy/preview.png
+ hicolor/96x96/legacy/cmd.png
+ hicolor/96x96/legacy/effect.png
+ hicolor/96x96/legacy/loop2.png
+ hicolor/96x96/legacy/play.png
+ hicolor/96x96/legacy/preview.png
+60 −0 hicolor/scalable/legacy/cmd.svg
+51 −0 hicolor/scalable/legacy/effect.svg
+47 −0 hicolor/scalable/legacy/loop2.svg
+38 −60 hicolor/scalable/legacy/play.svg
+38 −58 hicolor/scalable/legacy/preview.svg

0 comments on commit 99a4cdf

Please sign in to comment.