From: K.Ohta Date: Wed, 9 Mar 2016 09:42:26 +0000 (+0900) Subject: [UI][Qt] Add icons to some menu entries. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=08288b31d3d4671aa40ba8eae8f8be69b03d5cfd;p=csp-qt%2Fcommon_source_project-fm7.git [UI][Qt] Add icons to some menu entries. --- diff --git a/source/src/qt/common/CMakeLists.txt b/source/src/qt/common/CMakeLists.txt index 609349cd6..a61572c6b 100644 --- a/source/src/qt/common/CMakeLists.txt +++ b/source/src/qt/common/CMakeLists.txt @@ -36,11 +36,13 @@ set(QT_COMMON_BASE emuevents_control.cpp if(USE_QT_5) QT5_ADD_RESOURCES(s_qt_common_RCC ${RESOURCE} ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/commontexts.qrc - ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/shaders.qrc) + ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/shaders.qrc + ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/icons.qrc) else() QT4_ADD_RESOURCES(s_qt_common_RCC ${RESOURCE} ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/commontexts.qrc - ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/shaders.qrc) + ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/shaders.qrc + ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/icons.qrc) endif() add_executable(${EXEC_TARGET} diff --git a/source/src/qt/gui/mainwidget.h b/source/src/qt/gui/mainwidget.h index 1a8d963d0..e43edf422 100644 --- a/source/src/qt/gui/mainwidget.h +++ b/source/src/qt/gui/mainwidget.h @@ -80,6 +80,12 @@ class Ui_MainWindow : public QMainWindow QTimer *ledUpdateTimer; #endif QIcon WindowIcon; + QIcon InsertIcon; + QIcon EjectIcon; + QIcon StopIcon; + QIcon RecordSoundIcon; + QIcon ResetIcon; + QIcon ExitIcon; int screen_mode_count; // Some Functions diff --git a/source/src/qt/gui/mainwindow_utils.cpp b/source/src/qt/gui/mainwindow_utils.cpp index bf5dd968f..1ac39b0e4 100644 --- a/source/src/qt/gui/mainwindow_utils.cpp +++ b/source/src/qt/gui/mainwindow_utils.cpp @@ -50,9 +50,11 @@ void Ui_MainWindow::start_record_sound(bool start) { if(start) { actionStart_Record->setText(QApplication::translate("MainWindow", "Stop Recorded Sound", 0)); + actionStart_Record->setIcon(StopIcon); emit sig_emu_start_rec_sound(); } else { actionStart_Record->setText(QApplication::translate("MainWindow", "Start Recording Sound", 0)); + actionStart_Record->setIcon(RecordSoundIcon); emit sig_emu_stop_rec_sound(); } } diff --git a/source/src/qt/gui/menu_cmt.cpp b/source/src/qt/gui/menu_cmt.cpp index 27092b998..dc9a631aa 100644 --- a/source/src/qt/gui/menu_cmt.cpp +++ b/source/src/qt/gui/menu_cmt.cpp @@ -20,6 +20,15 @@ Menu_CMTClass::Menu_CMTClass(EMU *ep, QMenuBar *root_entry, QString desc, QWidge use_d88_menus = false; ext_rec_filter.clear(); + + icon_cmt = QIcon(":/icon_cmt.png"); + icon_play_start = QIcon(":/icon_play_start.png"); + icon_play_stop = QIcon(":/icon_play_stop.png"); + icon_ff = QIcon(":/icon_tape_forward.png"); + icon_rew = QIcon(":/icon_tape_backward.png"); + icon_apss_forward = QIcon(":/icon_apss_forward.png"); + icon_apss_backward = QIcon(":/icon_apss_backward.png"); + icon_record_to_wav = QIcon(":/icon_record_to_tape.png");; } Menu_CMTClass::~Menu_CMTClass() @@ -203,8 +212,16 @@ void Menu_CMTClass::retranslate_pulldown_menu_device_sub(void) action_direct_load_mzt->setText(QApplication::translate("MainWindow", "Direct load from MZT", 0)); this->setTitle(QApplication::translate("MainWindow", "Cassette Tape" , 0)); + action_insert->setIcon(icon_cmt); #ifdef USE_TAPE_BUTTON + action_play_start->setIcon(icon_play_start); + action_play_stop->setIcon(icon_play_stop); + action_fast_forward->setIcon(icon_ff); + action_fast_rewind->setIcon(icon_rew); + action_apss_forward->setIcon(icon_apss_forward); + action_apss_rewind->setIcon(icon_apss_backward); + action_play_stop->setText(QApplication::translate("MainWindow", "Play Stop", 0)); action_play_start->setText(QApplication::translate("MainWindow", "Play Start", 0)); action_fast_forward->setText(QApplication::translate("MainWindow", "Fast Forward", 0)); @@ -212,6 +229,7 @@ void Menu_CMTClass::retranslate_pulldown_menu_device_sub(void) action_apss_forward->setText(QApplication::translate("MainWindow", "APSS Forward", 0)); action_apss_rewind->setText(QApplication::translate("MainWindow", "APSS Rewind", 0)); #endif + action_recording->setIcon(icon_record_to_wav); action_recording->setText(QApplication::translate("MainWindow", "Record to a WAV File", 0)); #endif } diff --git a/source/src/qt/gui/menu_cmt.h b/source/src/qt/gui/menu_cmt.h index 0057e9c87..2d357dee8 100644 --- a/source/src/qt/gui/menu_cmt.h +++ b/source/src/qt/gui/menu_cmt.h @@ -30,6 +30,14 @@ protected: class Action_Control *action_wave_shaper; class Action_Control *action_direct_load_mzt; + QIcon icon_cmt; + QIcon icon_play_start; + QIcon icon_play_stop; + QIcon icon_ff; + QIcon icon_rew; + QIcon icon_apss_forward; + QIcon icon_apss_backward; + QIcon icon_record_to_wav; public: Menu_CMTClass(EMU *ep, QMenuBar *root_entry, QString desc, QWidget *parent = 0, int drv = 0); diff --git a/source/src/qt/gui/menu_control.cpp b/source/src/qt/gui/menu_control.cpp index 302079be8..e2b7867b9 100644 --- a/source/src/qt/gui/menu_control.cpp +++ b/source/src/qt/gui/menu_control.cpp @@ -300,10 +300,12 @@ void Ui_MainWindow::createContextMenu(void) void Ui_MainWindow::retranslateControlMenu(const char *SpecialResetTitle, bool WithSpecialReset) { actionReset->setText(QApplication::translate("MainWindow", "Reset", 0)); + actionReset->setIcon(ResetIcon); #ifdef USE_SPECIAL_RESET actionSpecial_Reset->setText(QApplication::translate("MainWindow", SpecialResetTitle, 0)); #endif actionExit_Emulator->setText(QApplication::translate("MainWindow", "Exit Emulator", 0)); + actionExit_Emulator->setIcon(ExitIcon); actionSpeed_x1->setText(QApplication::translate("MainWindow", "Speed x1", 0)); actionSpeed_x2->setText(QApplication::translate("MainWindow", "Speed x2", 0)); diff --git a/source/src/qt/gui/menu_disk.cpp b/source/src/qt/gui/menu_disk.cpp index 93420aa6f..04f2c6db1 100644 --- a/source/src/qt/gui/menu_disk.cpp +++ b/source/src/qt/gui/menu_disk.cpp @@ -17,6 +17,7 @@ Menu_FDClass::Menu_FDClass(EMU *ep, QMenuBar *root_entry, QString desc, QWidget { use_write_protect = true; use_d88_menus = true; + icon_floppy = QIcon(":/icon_floppy.png"); } Menu_FDClass::~Menu_FDClass() @@ -60,6 +61,7 @@ void Menu_FDClass::connect_menu_device_sub(void) void Menu_FDClass::retranslate_pulldown_menu_device_sub(void) { + action_insert->setIcon(icon_floppy); action_ignore_crc_error->setText(QApplication::translate("MainWindow", "Ignore CRC error", 0)); action_correct_timing->setText(QApplication::translate("MainWindow", "Correct transfer timing", 0)); } diff --git a/source/src/qt/gui/menu_disk.h b/source/src/qt/gui/menu_disk.h index ecafc7d04..992997a12 100644 --- a/source/src/qt/gui/menu_disk.h +++ b/source/src/qt/gui/menu_disk.h @@ -18,7 +18,7 @@ class Menu_FDClass: public Menu_MetaClass { protected: class Action_Control *action_ignore_crc_error; class Action_Control *action_correct_timing; - + QIcon icon_floppy; public: Menu_FDClass(EMU *ep, QMenuBar *root_entry, QString desc, QWidget *parent = 0, int drv = 0); ~Menu_FDClass(); diff --git a/source/src/qt/gui/menu_main.cpp b/source/src/qt/gui/menu_main.cpp index 5af676a70..6486de3f8 100644 --- a/source/src/qt/gui/menu_main.cpp +++ b/source/src/qt/gui/menu_main.cpp @@ -471,6 +471,14 @@ void Ui_MainWindow::setupUi(void) QImageReader reader(":/default.ico"); QImage result = reader.read(); + +// QIcon WindowIcon; + InsertIcon = QIcon(":/icon_open.png"); + EjectIcon = QIcon(":/icon_eject.png"); + StopIcon = QIcon(":/icon_process_stop.png"); + RecordSoundIcon = QIcon(":/icon_record_to_wav.png"); + ResetIcon = QIcon(":/icon_reset.png"); + ExitIcon = QIcon(":/icon_exit.png"); MainWindow->setWindowIcon(QPixmap::fromImage(result)); MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0)); diff --git a/source/src/qt/gui/menu_metaclass.cpp b/source/src/qt/gui/menu_metaclass.cpp index 5a999352f..1f5568557 100644 --- a/source/src/qt/gui/menu_metaclass.cpp +++ b/source/src/qt/gui/menu_metaclass.cpp @@ -41,6 +41,9 @@ Menu_MetaClass::Menu_MetaClass(EMU *ep, QMenuBar *root_entry, QString desc, QWid history.clear(); inner_media_list.clear(); window_title = QString::fromUtf8(""); + + icon_insert = QIcon(":/icon_open.png"); + icon_eject = QIcon(":/icon_eject.png"); } Menu_MetaClass::~Menu_MetaClass() @@ -243,11 +246,13 @@ void Menu_MetaClass::create_pulldown_menu_sub(void) action_insert->setObjectName(QString::fromUtf8("action_insert_") + object_desc); action_insert->binds->setDrive(media_drive); connect(action_insert, SIGNAL(triggered()), this, SLOT(do_open_dialog())); + action_insert->setIcon(icon_insert); action_eject = new Action_Control(p_wid); action_eject->setObjectName(QString::fromUtf8("action_eject_") + object_desc); action_eject->binds->setDrive(media_drive); connect(action_eject, SIGNAL(triggered()), this, SLOT(do_eject_media())); + action_eject->setIcon(icon_eject); { diff --git a/source/src/qt/gui/menu_metaclass.h b/source/src/qt/gui/menu_metaclass.h index d83232bd1..09a86c8dc 100644 --- a/source/src/qt/gui/menu_metaclass.h +++ b/source/src/qt/gui/menu_metaclass.h @@ -37,6 +37,9 @@ protected: QMenu *menu_history; QMenu *menu_write_protect; + QIcon icon_insert; + QIcon icon_eject; + class Action_Control *action_insert; class Action_Control *action_eject; class Action_Control *action_recent; diff --git a/source/src/qt/gui/menu_sound.cpp b/source/src/qt/gui/menu_sound.cpp index cff58a12a..d073e5198 100644 --- a/source/src/qt/gui/menu_sound.cpp +++ b/source/src/qt/gui/menu_sound.cpp @@ -166,6 +166,7 @@ void Ui_MainWindow::retranslateSoundMenu(void) tmps = tmps + QApplication::translate("MainWindow", "mSec", 0); action_Latency[i]->setText(tmps); } + actionStart_Record->setIcon(RecordSoundIcon); actionStart_Record->setText(QApplication::translate("MainWindow", "Start Recording Sound", 0)); #ifdef DATAREC_SOUND actionSoundCMT->setText(QApplication::translate("MainWindow", "Sound CMT", 0)); diff --git a/source/src/qt/icons/extras/deadbeef/pixmaps/play_24.png b/source/src/qt/icons/extras/deadbeef/pixmaps/play_24.png deleted file mode 100644 index a5689c43f..000000000 Binary files a/source/src/qt/icons/extras/deadbeef/pixmaps/play_24.png and /dev/null differ diff --git a/source/src/qt/icons/extras/keepassx/icons/keepassx.png b/source/src/qt/icons/extras/keepassx/icons/keepassx.png deleted file mode 100644 index dbff35d52..000000000 Binary files a/source/src/qt/icons/extras/keepassx/icons/keepassx.png and /dev/null differ diff --git a/source/src/qt/icons/extras/lastfm/icons/user_black22.png b/source/src/qt/icons/extras/lastfm/icons/user_black22.png deleted file mode 100644 index 652fa7a0b..000000000 Binary files a/source/src/qt/icons/extras/lastfm/icons/user_black22.png and /dev/null differ diff --git a/source/src/qt/icons/extras/lastfm/icons/user_blue22.png b/source/src/qt/icons/extras/lastfm/icons/user_blue22.png deleted file mode 100644 index 652fa7a0b..000000000 Binary files a/source/src/qt/icons/extras/lastfm/icons/user_blue22.png and /dev/null differ diff --git a/source/src/qt/icons/extras/lastfm/icons/user_green22.png b/source/src/qt/icons/extras/lastfm/icons/user_green22.png deleted file mode 100644 index 652fa7a0b..000000000 Binary files a/source/src/qt/icons/extras/lastfm/icons/user_green22.png and /dev/null differ diff --git a/source/src/qt/icons/extras/lastfm/icons/user_orange22.png b/source/src/qt/icons/extras/lastfm/icons/user_orange22.png deleted file mode 100644 index 652fa7a0b..000000000 Binary files a/source/src/qt/icons/extras/lastfm/icons/user_orange22.png and /dev/null differ diff --git a/source/src/qt/icons/extras/lastfm/icons/user_red22.png b/source/src/qt/icons/extras/lastfm/icons/user_red22.png deleted file mode 100644 index 652fa7a0b..000000000 Binary files a/source/src/qt/icons/extras/lastfm/icons/user_red22.png and /dev/null differ diff --git a/source/src/qt/icons/extras/liferea/pixmaps/available.png b/source/src/qt/icons/extras/liferea/pixmaps/available.png deleted file mode 100644 index e2c4d977c..000000000 Binary files a/source/src/qt/icons/extras/liferea/pixmaps/available.png and /dev/null differ diff --git a/source/src/qt/icons/extras/liferea/pixmaps/available_offline.png b/source/src/qt/icons/extras/liferea/pixmaps/available_offline.png deleted file mode 100644 index 582e712c3..000000000 Binary files a/source/src/qt/icons/extras/liferea/pixmaps/available_offline.png and /dev/null differ diff --git a/source/src/qt/icons/extras/liferea/pixmaps/empty.png b/source/src/qt/icons/extras/liferea/pixmaps/empty.png deleted file mode 100644 index da01a163a..000000000 Binary files a/source/src/qt/icons/extras/liferea/pixmaps/empty.png and /dev/null differ diff --git a/source/src/qt/icons/extras/liferea/pixmaps/empty_offline.png b/source/src/qt/icons/extras/liferea/pixmaps/empty_offline.png deleted file mode 100644 index 0355ec95a..000000000 Binary files a/source/src/qt/icons/extras/liferea/pixmaps/empty_offline.png and /dev/null differ diff --git a/source/src/qt/icons/extras/nyan/mayancat-santa.png b/source/src/qt/icons/extras/nyan/mayancat-santa.png deleted file mode 100644 index 983a4f339..000000000 Binary files a/source/src/qt/icons/extras/nyan/mayancat-santa.png and /dev/null differ diff --git a/source/src/qt/icons/extras/nyan/mayancat.gif b/source/src/qt/icons/extras/nyan/mayancat.gif deleted file mode 100644 index fee6781bd..000000000 Binary files a/source/src/qt/icons/extras/nyan/mayancat.gif and /dev/null differ diff --git a/source/src/qt/icons/extras/pixmaps/guake/guake-tray.png b/source/src/qt/icons/extras/pixmaps/guake/guake-tray.png deleted file mode 100644 index 3238ad0da..000000000 Binary files a/source/src/qt/icons/extras/pixmaps/guake/guake-tray.png and /dev/null differ diff --git a/source/src/qt/icons/extras/radiotray/images/radiotray_connecting.png b/source/src/qt/icons/extras/radiotray/images/radiotray_connecting.png deleted file mode 100644 index f7814fcf9..000000000 Binary files a/source/src/qt/icons/extras/radiotray/images/radiotray_connecting.png and /dev/null differ diff --git a/source/src/qt/icons/extras/radiotray/images/radiotray_off.png b/source/src/qt/icons/extras/radiotray/images/radiotray_off.png deleted file mode 100644 index 10d9827e6..000000000 Binary files a/source/src/qt/icons/extras/radiotray/images/radiotray_off.png and /dev/null differ diff --git a/source/src/qt/icons/extras/radiotray/images/radiotray_on.png b/source/src/qt/icons/extras/radiotray/images/radiotray_on.png deleted file mode 100644 index a905cb3b0..000000000 Binary files a/source/src/qt/icons/extras/radiotray/images/radiotray_on.png and /dev/null differ diff --git a/source/src/qt/icons/stock/48/avatar-default.png b/source/src/qt/icons/stock/48/avatar-default.png deleted file mode 100644 index 63e9bf7e7..000000000 Binary files a/source/src/qt/icons/stock/48/avatar-default.png and /dev/null differ diff --git a/source/src/qt/icons/stock/48/stock_new-meeting.png b/source/src/qt/icons/stock/48/stock_new-meeting.png deleted file mode 120000 index 4d1e65571..000000000 --- a/source/src/qt/icons/stock/48/stock_new-meeting.png +++ /dev/null @@ -1 +0,0 @@ -./stock_people.png \ No newline at end of file diff --git a/source/src/qt/icons/stock/48/stock_people.png b/source/src/qt/icons/stock/48/stock_people.png deleted file mode 100644 index 395135b95..000000000 Binary files a/source/src/qt/icons/stock/48/stock_people.png and /dev/null differ diff --git a/source/src/qt/icons/stock/48/stock_person-panel.png b/source/src/qt/icons/stock/48/stock_person-panel.png deleted file mode 120000 index 9cb09b45f..000000000 --- a/source/src/qt/icons/stock/48/stock_person-panel.png +++ /dev/null @@ -1 +0,0 @@ -./stock_person.png \ No newline at end of file diff --git a/source/src/qt/icons/stock/48/stock_person.png b/source/src/qt/icons/stock/48/stock_person.png deleted file mode 100644 index 8f3a7cd6b..000000000 Binary files a/source/src/qt/icons/stock/48/stock_person.png and /dev/null differ