1
0
Fork 0

GUI: some minor enhancements with icons and fixed a duplicate shortcut

This commit is contained in:
mrexodia 2016-02-27 02:16:23 +01:00
parent 4a1122d412
commit cfd1bc127f
8 changed files with 13 additions and 6 deletions

View File

@ -207,7 +207,7 @@ void CPUDisassembly::setupRightClickContextMenu()
copyMenu->addAction(makeAction("Disassembly", SLOT(copyDisassemblySlot())));
mMenuBuilder->addMenu(makeMenu(QIcon(":/icons/images/copy.png"), "&Copy"), copyMenu);
mMenuBuilder->addAction(makeShortcutAction("&Restore selection", SLOT(undoSelectionSlot()), "ActionUndoSelection"), [this](QMenu*)
mMenuBuilder->addAction(makeShortcutAction(QIcon(":/icons/images/eraser.png"), "&Restore selection", SLOT(undoSelectionSlot()), "ActionUndoSelection"), [this](QMenu*)
{
dsint start = rvaToVa(getSelectionStart());
dsint end = rvaToVa(getSelectionEnd());
@ -388,7 +388,7 @@ void CPUDisassembly::setupRightClickContextMenu()
mSearchRegionMenu->addAction(makeShortcutAction("&Pattern", SLOT(findPatternSlot()), "ActionFindPattern"));
// Search in Current Module menu
mFindCommandModule = makeShortcutAction("C&ommand", SLOT(findCommandSlot()), "ActionFind");
mFindCommandModule = makeAction("C&ommand", SLOT(findCommandSlot()));
mFindConstantModule = makeAction("&Constant", SLOT(findConstantSlot()));
mFindStringsModule = makeAction("&String references", SLOT(findStringsSlot()));
mFindCallsModule = makeAction("&Intermodular calls", SLOT(findCallsSlot()));
@ -399,7 +399,7 @@ void CPUDisassembly::setupRightClickContextMenu()
// Search in All Modules menu
mFindCommandAll = makeShortcutAction("C&ommand", SLOT(findCommandSlot()), "ActionFind");
mFindCommandAll = makeAction("C&ommand", SLOT(findCommandSlot()));
mFindConstantAll = makeAction("&Constant", SLOT(findConstantSlot()));
mFindStringsAll = makeAction("&String references", SLOT(findStringsSlot()));
mFindCallsAll = makeAction("&Intermodular calls", SLOT(findCallsSlot()));

View File

@ -119,7 +119,12 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
// CPU view
mCpuWidget = new CPUWidget();
mCpuWidget->setWindowTitle("CPU");
mCpuWidget->setWindowIcon(QIcon(":/icons/images/processor-cpu.png"));
#ifdef _WIN64
mCpuWidget->setWindowIcon(QIcon(":/icons/images/processor64.png"));
#else
mCpuWidget->setWindowIcon(QIcon(":/icons/images/processor32.png"));
ui->actionCpu->setIcon(QIcon(":/icons/images/processor32.png"));
#endif //_WIN64
// Reference manager
mReferenceManager = new ReferenceManager(this);

View File

@ -403,7 +403,7 @@
<action name="actionCpu">
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icons/images/processor-cpu.png</normaloff>:/icons/images/processor-cpu.png</iconset>
<normaloff>:/icons/images/processor64.png</normaloff>:/icons/images/processor64.png</iconset>
</property>
<property name="text">
<string>&amp;CPU</string>

BIN
src/gui/images/eraser.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 680 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 622 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 664 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

View File

@ -12,7 +12,6 @@
<file>images/control-stop.png</file>
<file>images/terminal-command.png</file>
<file>images/memory-map.png</file>
<file>images/processor-cpu.png</file>
<file>images/ui-combo-box-edit.png</file>
<file>images/scylla.png</file>
<file>images/compile-error.png</file>
@ -71,5 +70,8 @@
<file>images/neworigin.png</file>
<file>images/find.png</file>
<file>images/recentfiles.png</file>
<file>images/eraser.png</file>
<file>images/processor32.png</file>
<file>images/processor64.png</file>
</qresource>
</RCC>