diff --git a/src/MainWindow.ui b/src/MainWindow.ui index 4cb136fd..9773adb4 100644 --- a/src/MainWindow.ui +++ b/src/MainWindow.ui @@ -19,10 +19,6 @@ Cutter - - - :/img/logo-small.png:/img/logo-small.png - QHeaderView::section { padding: 3px; @@ -174,7 +170,7 @@ border-top: 0px; 0 0 1013 - 20 + 22 @@ -188,8 +184,8 @@ border-top: 0px; 419 265 - 148 - 190 + 173 + 206 diff --git a/src/cutter.desktop b/src/cutter.desktop index 07160530..5f818c54 100644 --- a/src/cutter.desktop +++ b/src/cutter.desktop @@ -2,5 +2,5 @@ Type=Application Name=Cutter Exec=cutter -Icon=cutter-small +Icon=cutter Categories=Development; diff --git a/src/cutter.pro b/src/cutter.pro index 37382962..effeab43 100644 --- a/src/cutter.pro +++ b/src/cutter.pro @@ -5,7 +5,7 @@ TARGET = cutter # The application version VERSION = 1.0 -ICON = img/Enso.icns +ICON = img/cutter.icns QT += core gui widgets QT_CONFIG -= no-pkg-config @@ -196,10 +196,10 @@ unix { !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-small.png $$OUT_PWD/cutter-small.png) + system(cp img/cutter.svg $$OUT_PWD/cutter.svg) appimage_root.path = / - appimage_root.files = $$OUT_PWD/cutter.png $$desktop_file + appimage_root.files = $$OUT_PWD/cutter.svg $$desktop_file INSTALLS += appimage_root } diff --git a/src/dialogs/AboutDialog.ui b/src/dialogs/AboutDialog.ui index 7ffd5b8b..370e0dbd 100644 --- a/src/dialogs/AboutDialog.ui +++ b/src/dialogs/AboutDialog.ui @@ -37,25 +37,37 @@ - + 0 0 - - background-color: rgb(255, 255, 255); + + + 96 + 96 + + + + + 96 + 96 + - :/img/logo-small.png + :/img/cutter.svg + + + true Qt::AlignCenter - 5 + 8 @@ -68,7 +80,7 @@ - background-color: rgb(255, 255, 255); + s <html><head/><body><p><br/></p></body></html> diff --git a/src/dialogs/CreateNewDialog.ui b/src/dialogs/CreateNewDialog.ui index 695f3aad..337d5a78 100644 --- a/src/dialogs/CreateNewDialog.ui +++ b/src/dialogs/CreateNewDialog.ui @@ -36,17 +36,41 @@ 5 - + + + + 0 + 0 + + + + + 96 + 96 + + + + + 96 + 96 + + - :/img/logo-small.png + :/img/cutter.svg + + + true Qt::AlignCenter + + 8 + @@ -451,6 +475,8 @@ - + + + diff --git a/src/dialogs/NewfileDialog.ui b/src/dialogs/NewfileDialog.ui index 679df1ce..9efd2e3e 100644 --- a/src/dialogs/NewfileDialog.ui +++ b/src/dialogs/NewfileDialog.ui @@ -6,17 +6,13 @@ 0 0 - 452 - 532 + 451 + 599 Open File - - - :/img/logo-small.png:/img/logo-small.png - 5 @@ -33,23 +29,41 @@ 5 - + - - + + + 0 + 0 + + + + + 96 + 96 + + + + + 96 + 96 + - :/img/logo-small.png + :/img/cutter.svg - false + true Qt::AlignCenter + + 8 + diff --git a/src/dialogs/OptionsDialog.ui b/src/dialogs/OptionsDialog.ui index 6961d582..ef428dc8 100644 --- a/src/dialogs/OptionsDialog.ui +++ b/src/dialogs/OptionsDialog.ui @@ -25,10 +25,6 @@ Load Options - - - :/img/logo-small.png:/img/logo-small.png - false @@ -70,35 +66,41 @@ 0 - + - + 0 0 - 400 - 0 + 96 + 96 - 400 - 16777215 + 96 + 96 - :/img/logo-small.png + :/img/cutter.svg + + + true Qt::AlignCenter + + 8 + @@ -927,6 +929,8 @@ - + + + diff --git a/src/img/Enso copy.icns b/src/img/Enso copy.icns deleted file mode 100644 index 54dc72d3..00000000 Binary files a/src/img/Enso copy.icns and /dev/null differ diff --git a/src/img/Enso.icns b/src/img/Enso.icns deleted file mode 100644 index fac9957b..00000000 Binary files a/src/img/Enso.icns and /dev/null differ diff --git a/src/img/Enso.svg b/src/img/Enso.svg deleted file mode 100644 index 18cdf1df..00000000 --- a/src/img/Enso.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/img/Logo simple white.xcf b/src/img/Logo simple white.xcf deleted file mode 100644 index fe10c212..00000000 Binary files a/src/img/Logo simple white.xcf and /dev/null differ diff --git a/src/img/Logo simple.xcf b/src/img/Logo simple.xcf deleted file mode 100644 index be0121d7..00000000 Binary files a/src/img/Logo simple.xcf and /dev/null differ diff --git a/src/img/Logo.png b/src/img/Logo.png deleted file mode 100644 index 7b0d3948..00000000 Binary files a/src/img/Logo.png and /dev/null differ diff --git a/src/img/Logo.xcf b/src/img/Logo.xcf deleted file mode 100644 index 4f4a6890..00000000 Binary files a/src/img/Logo.xcf and /dev/null differ diff --git a/src/img/cutter-small.png b/src/img/cutter-small.png deleted file mode 100644 index 678d52b9..00000000 Binary files a/src/img/cutter-small.png and /dev/null differ diff --git a/src/img/cutter.icns b/src/img/cutter.icns new file mode 100644 index 00000000..555ae061 Binary files /dev/null and b/src/img/cutter.icns differ diff --git a/src/img/cutter.svg b/src/img/cutter.svg new file mode 100644 index 00000000..e30c4ade --- /dev/null +++ b/src/img/cutter.svg @@ -0,0 +1,64 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/img/cutter_white.svg b/src/img/cutter_white.svg new file mode 100644 index 00000000..28731dba --- /dev/null +++ b/src/img/cutter_white.svg @@ -0,0 +1,64 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/img/logo-small-white.png b/src/img/logo-small-white.png deleted file mode 100644 index 43242dc8..00000000 Binary files a/src/img/logo-small-white.png and /dev/null differ diff --git a/src/img/logo2.png b/src/img/logo2.png deleted file mode 100644 index e8abd5a3..00000000 Binary files a/src/img/logo2.png and /dev/null differ diff --git a/src/main.cpp b/src/main.cpp index b72c02c1..54f40da6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -37,6 +37,7 @@ int main(int argc, char *argv[]) a.setOrganizationName("cutter"); a.setApplicationName("cutter"); a.setApplicationVersion(APP_VERSION); + a.setWindowIcon(QIcon(":/img/cutter_white.svg")); // Set QString codec to UTF-8 QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); @@ -67,7 +68,6 @@ int main(int argc, char *argv[]) { QMessageBox msg; msg.setIcon(QMessageBox::Critical); - msg.setWindowIcon(QIcon(":/img/logo-small.png")); msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msg.setWindowTitle(QObject::tr("Version mismatch!")); msg.setText(QString(QObject::tr("The version used to compile cutter (%1) does not match the binary version of radare2 (%2). This could result in unexpected behaviour. Are you sure you want to continue?")).arg(localVersion, r2version)); diff --git a/src/resources.qrc b/src/resources.qrc index 11800221..40906375 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -54,11 +54,10 @@ img/icons/transfer.svg img/icons/transfer_white.svg img/icons/spin_light.svg - img/logo2.png - img/cutter-small.png - img/logo-small-white.png img/icons/import_light.svg fonts/Anonymous Pro.ttf fonts/Inconsolata-Regular.ttf + img/cutter.svg + img/cutter_white.svg