diff --git a/about.ui b/about.ui index 6e534cb6..627aaa66 100644 --- a/about.ui +++ b/about.ui @@ -23,13 +23,28 @@ - + + + + 80 + 80 + + + + + 80 + 80 + + :/icons/programicon.png + + true + Qt::AlignCenter diff --git a/goldendict.rc b/goldendict.rc index 7b787995..01fd5663 100644 --- a/goldendict.rc +++ b/goldendict.rc @@ -1,6 +1,7 @@ #include "winuser.h" IDI_ICON1 ICON DISCARDABLE "icons/programicon.ico" +IDI_ICON2 ICON DISCARDABLE "icons/programicon_old.ico" #define GOLDENDICT_VER 1,5,0,0 #define GOLDENDICT_VER_STR "1.5.0" diff --git a/icons/goldendict-book.png b/icons/goldendict-book.png deleted file mode 100644 index 50c1804c..00000000 Binary files a/icons/goldendict-book.png and /dev/null differ diff --git a/icons/macicon.icns b/icons/macicon.icns index 8d5d8e0a..206276ee 100644 Binary files a/icons/macicon.icns and b/icons/macicon.icns differ diff --git a/icons/programicon.ico b/icons/programicon.ico index e25aa4c7..25f4ce7e 100644 Binary files a/icons/programicon.ico and b/icons/programicon.ico differ diff --git a/icons/programicon.png b/icons/programicon.png index 774be223..50c1804c 100644 Binary files a/icons/programicon.png and b/icons/programicon.png differ diff --git a/icons/programicon_old.ico b/icons/programicon_old.ico new file mode 100644 index 00000000..e25aa4c7 Binary files /dev/null and b/icons/programicon_old.ico differ diff --git a/icons/programicon_old.png b/icons/programicon_old.png new file mode 100644 index 00000000..774be223 Binary files /dev/null and b/icons/programicon_old.png differ diff --git a/mainwindow.cc b/mainwindow.cc index e1692e01..d6fa6b79 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -515,7 +515,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ): if ( cfg.preferences.enableTrayIcon ) { - trayIcon = new QSystemTrayIcon( QIcon( ":/icons/programicon.png" ), this ); + trayIcon = new QSystemTrayIcon( QIcon( ":/icons/programicon_old.png" ), this ); trayIcon->setToolTip( tr( "Loading..." ) ); trayIcon->show(); } @@ -965,7 +965,7 @@ void MainWindow::updateTrayIcon() if ( !trayIcon && cfg.preferences.enableTrayIcon ) { // Need to show it - trayIcon = new QSystemTrayIcon( QIcon( ":/icons/programicon.png" ), this ); + trayIcon = new QSystemTrayIcon( QIcon( ":/icons/programicon_old.png" ), this ); trayIcon->setContextMenu( &trayIconMenu ); trayIcon->show(); @@ -986,7 +986,7 @@ void MainWindow::updateTrayIcon() trayIcon->setIcon( QIcon( enableScanPopup->isChecked() ? ":/icons/programicon_scan.png" : - ":/icons/programicon.png" ) ); + ":/icons/programicon_old.png" ) ); trayIcon->setToolTip( "GoldenDict" ); } diff --git a/preferences.cc b/preferences.cc index b416636b..8a1b6545 100644 --- a/preferences.cc +++ b/preferences.cc @@ -77,7 +77,7 @@ Preferences::Preferences( QWidget * parent, Config::Preferences const & p ): break; } - ui.displayStyle->addItem( QIcon( ":/icons/programicon.png" ), tr( "Default" ), QString() ); + ui.displayStyle->addItem( QIcon( ":/icons/programicon_old.png" ), tr( "Default" ), QString() ); ui.displayStyle->addItem( QIcon( ":/icons/programicon.png" ), tr( "Modern" ), QString( "modern" ) ); ui.displayStyle->addItem( QIcon( ":/icons/icon32_dsl.png" ), tr( "Lingvo" ), QString( "lingvo" ) ); ui.displayStyle->addItem( QIcon( ":/icons/icon32_bgl.png" ), tr( "Babylon" ), QString( "babylon" ) ); diff --git a/resources.qrc b/resources.qrc index b121f7b4..7a400a78 100644 --- a/resources.qrc +++ b/resources.qrc @@ -72,5 +72,6 @@ icons/collapse_article_hovered.png icons/collapse_article.png icons/video.png + icons/programicon_old.png