diff --git a/src/cutter.pro b/src/cutter.pro index 2b0139a0..11be9e4d 100644 --- a/src/cutter.pro +++ b/src/cutter.pro @@ -179,7 +179,7 @@ unix { PREFIX = /usr/local } - icon_file = img/cutter-small.png + icon_file = img/cutter.svg share_pixmaps.path = $$PREFIX/share/pixmaps share_pixmaps.files = $$icon_file @@ -197,12 +197,8 @@ unix { # Triggered for example by 'qmake APPIMAGE=1' !isEmpty(APPIMAGE){ - # UGLY work around for the logo name in cutter.desktop - # Would be better to have a file called cutter.png in the first place - system(cp img/cutter_appicon.svg $$OUT_PWD/cutter.svg) - appimage_root.path = / - appimage_root.files = $$OUT_PWD/cutter.svg $$desktop_file + appimage_root.files = $$icon_file $$desktop_file INSTALLS += appimage_root } diff --git a/src/dialogs/AboutDialog.cpp b/src/dialogs/AboutDialog.cpp index ff588f65..256d6b6c 100644 --- a/src/dialogs/AboutDialog.cpp +++ b/src/dialogs/AboutDialog.cpp @@ -10,7 +10,7 @@ AboutDialog::AboutDialog(QWidget *parent) : ui->setupUi(this); setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); - QString logoFile = (palette().window().color().value() < 127) ? ":/img/cutter_white.svg" : ":/img/cutter.svg"; + QString logoFile = (palette().window().color().value() < 127) ? ":/img/cutter_white_plain.svg" : ":/img/cutter_plain.svg"; ui->logoSvgWidget->load(logoFile); ui->label->setText(tr("

Cutter

" diff --git a/src/dialogs/CreateNewDialog.ui b/src/dialogs/CreateNewDialog.ui index 337d5a78..e8366fdc 100644 --- a/src/dialogs/CreateNewDialog.ui +++ b/src/dialogs/CreateNewDialog.ui @@ -60,7 +60,7 @@ - :/img/cutter.svg + :/img/cutter_plain.svg true diff --git a/src/dialogs/NewFileDialog.cpp b/src/dialogs/NewFileDialog.cpp index 8277aaeb..6025c432 100644 --- a/src/dialogs/NewFileDialog.cpp +++ b/src/dialogs/NewFileDialog.cpp @@ -69,7 +69,7 @@ NewFileDialog::NewFileDialog(QWidget *parent) : ui->recentsListWidget->addAction(ui->actionRemove_item); ui->recentsListWidget->addAction(ui->actionClear_all); - QString logoFile = (palette().window().color().value() < 127) ? ":/img/cutter_white.svg" : ":/img/cutter.svg"; + QString logoFile = (palette().window().color().value() < 127) ? ":/img/cutter_white_plain.svg" : ":/img/cutter_plain.svg"; ui->logoSvgWidget->load(logoFile); fillRecentFilesList(); diff --git a/src/dialogs/OptionsDialog.cpp b/src/dialogs/OptionsDialog.cpp index e75fa7e1..52ace6fb 100644 --- a/src/dialogs/OptionsDialog.cpp +++ b/src/dialogs/OptionsDialog.cpp @@ -25,7 +25,7 @@ OptionsDialog::OptionsDialog(MainWindow *main): ui->progressBar->setVisible(0); ui->statusLabel->setVisible(0); - QString logoFile = (palette().window().color().value() < 127) ? ":/img/cutter_white.svg" : ":/img/cutter.svg"; + QString logoFile = (palette().window().color().value() < 127) ? ":/img/cutter_white_plain.svg" : ":/img/cutter_plain.svg"; ui->logoSvgWidget->load(logoFile); ui->analSlider->setValue(defaultAnalLevel); diff --git a/src/img/cutter.svg b/src/img/cutter.svg index e30c4ade..7f2513e0 100644 --- a/src/img/cutter.svg +++ b/src/img/cutter.svg @@ -14,8 +14,8 @@ viewBox="0 0 512.00001 512.00001" id="svg4254" version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="cutter.svg"> + inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + sodipodi:docname="cutter_appicon.svg"> + inkscape:window-y="22" + inkscape:window-maximized="0" /> @@ -46,7 +46,7 @@ image/svg+xml - + @@ -55,10 +55,20 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-540.36216)"> - + + + + diff --git a/src/img/cutter_appicon.svg b/src/img/cutter_appicon.svg deleted file mode 100644 index 7f2513e0..00000000 --- a/src/img/cutter_appicon.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/src/img/cutter_plain.svg b/src/img/cutter_plain.svg new file mode 100644 index 00000000..e30c4ade --- /dev/null +++ b/src/img/cutter_plain.svg @@ -0,0 +1,64 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/img/cutter_white.svg b/src/img/cutter_white_plain.svg similarity index 100% rename from src/img/cutter_white.svg rename to src/img/cutter_white_plain.svg diff --git a/src/main.cpp b/src/main.cpp index 89e75d91..e767906f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) a.setOrganizationName("cutter"); a.setApplicationName("cutter"); a.setApplicationVersion(APP_VERSION); - a.setWindowIcon(QIcon(":/img/cutter_appicon.svg")); + a.setWindowIcon(QIcon(":/img/cutter.svg")); // Set QString codec to UTF-8 QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); diff --git a/src/resources.qrc b/src/resources.qrc index 42be45f6..3b99ac5d 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -57,8 +57,8 @@ img/icons/import_light.svg fonts/Anonymous Pro.ttf fonts/Inconsolata-Regular.ttf + img/cutter_plain.svg + img/cutter_white_plain.svg img/cutter.svg - img/cutter_white.svg - img/cutter_appicon.svg