Changed menu letter-casing to 'sentence-style' capitalization

This commit is contained in:
Arman 2024-10-03 22:03:52 -04:00
parent e7806bcef4
commit 167689d562
4 changed files with 59 additions and 58 deletions

View File

@ -51,10 +51,10 @@
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>2024</x> <x>339</x>
<y>127</y> <y>101</y>
<width>151</width> <width>187</width>
<height>312</height> <height>399</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
@ -201,7 +201,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum> <enum>Qt::ContextMenuPolicy::DefaultContextMenu</enum>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string notr="true">Main toolbar</string> <string notr="true">Main toolbar</string>
@ -216,7 +216,7 @@
</size> </size>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonIconOnly</enum> <enum>Qt::ToolButtonStyle::ToolButtonIconOnly</enum>
</property> </property>
<attribute name="toolBarArea"> <attribute name="toolBarArea">
<enum>TopToolBarArea</enum> <enum>TopToolBarArea</enum>
@ -257,7 +257,7 @@
</action> </action>
<action name="actionNew"> <action name="actionNew">
<property name="text"> <property name="text">
<string>New Window</string> <string>New window</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+N</string> <string>Ctrl+N</string>
@ -283,7 +283,7 @@
</action> </action>
<action name="actionMap"> <action name="actionMap">
<property name="text"> <property name="text">
<string>Map File</string> <string>Map file</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+M</string> <string>Ctrl+M</string>
@ -291,7 +291,7 @@
</action> </action>
<action name="actionSave"> <action name="actionSave">
<property name="text"> <property name="text">
<string>Save Project</string> <string>Save project</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+S</string> <string>Ctrl+S</string>
@ -348,11 +348,11 @@
</action> </action>
<action name="actionBackward"> <action name="actionBackward">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../resources.qrc">
<normaloff>:/img/icons/arrow_left.svg</normaloff>:/img/icons/arrow_left.svg</iconset> <normaloff>:/img/icons/arrow_left.svg</normaloff>:/img/icons/arrow_left.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Undo Seek</string> <string>Undo seek</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Go back</string> <string>Go back</string>
@ -360,11 +360,11 @@
</action> </action>
<action name="actionForward"> <action name="actionForward">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../resources.qrc">
<normaloff>:/img/icons/arrow_right.svg</normaloff>:/img/icons/arrow_right.svg</iconset> <normaloff>:/img/icons/arrow_right.svg</normaloff>:/img/icons/arrow_right.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Redo Seek</string> <string>Redo seek</string>
</property> </property>
</action> </action>
<action name="actionUnlock"> <action name="actionUnlock">
@ -374,16 +374,17 @@
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/lock</normaloff>
<normalon>:/unlock</normalon>:/lock</iconset>
</property>
<property name="text"> <property name="text">
<string>Unlock Panels</string> <string>Unlock panels</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Toggle panel locks</string> <string>Toggle panel locks</string>
</property> </property>
<property name="icon">
<iconset>
<normaloff>:/lock</normaloff><normalon>:/unlock</normalon>:/unlock</iconset>
</property>
<property name="iconVisibleInMenu"> <property name="iconVisibleInMenu">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -393,7 +394,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../resources.qrc">
<normaloff>:/img/icons/themes.svg</normaloff>:/img/icons/themes.svg</iconset> <normaloff>:/img/icons/themes.svg</normaloff>:/img/icons/themes.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -403,12 +404,12 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::PreferencesRole</enum> <enum>QAction::MenuRole::PreferencesRole</enum>
</property> </property>
</action> </action>
<action name="actionTabs"> <action name="actionTabs">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../resources.qrc">
<normaloff>:/img/icons/tabs.svg</normaloff>:/img/icons/tabs.svg</iconset> <normaloff>:/img/icons/tabs.svg</normaloff>:/img/icons/tabs.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -420,7 +421,7 @@
</action> </action>
<action name="actionRefresh_Panels"> <action name="actionRefresh_Panels">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../resources.qrc">
<normaloff>:/img/icons/spin.svg</normaloff>:/img/icons/spin.svg</iconset> <normaloff>:/img/icons/spin.svg</normaloff>:/img/icons/spin.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -432,7 +433,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Show Tabs at the Top</string> <string>Show tabs at the top</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Toggle tab position</string> <string>Toggle tab position</string>
@ -565,7 +566,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../resources.qrc">
<normaloff>:/img/icons/cloud.svg</normaloff>:/img/icons/cloud.svg</iconset> <normaloff>:/img/icons/cloud.svg</normaloff>:/img/icons/cloud.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -645,7 +646,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../resources.qrc">
<normaloff>:/img/icons/down.svg</normaloff>:/img/icons/down.svg</iconset> <normaloff>:/img/icons/down.svg</normaloff>:/img/icons/down.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -662,7 +663,7 @@
</action> </action>
<action name="actionReset_settings"> <action name="actionReset_settings">
<property name="text"> <property name="text">
<string>Reset Settings</string> <string>Reset settings</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Reset settings</string> <string>Reset settings</string>
@ -689,7 +690,7 @@
</action> </action>
<action name="actionRefresh_contents"> <action name="actionRefresh_contents">
<property name="text"> <property name="text">
<string>Refresh Contents</string> <string>Refresh contents</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Refresh contents</string> <string>Refresh contents</string>
@ -729,7 +730,7 @@
</action> </action>
<action name="actionSaveAs"> <action name="actionSaveAs">
<property name="text"> <property name="text">
<string>Save Project As...</string> <string>Save project as...</string>
</property> </property>
</action> </action>
<action name="actionGraph"> <action name="actionGraph">
@ -747,7 +748,7 @@
</action> </action>
<action name="actionAnalyze"> <action name="actionAnalyze">
<property name="text"> <property name="text">
<string>Analyze Program</string> <string>Analyze program</string>
</property> </property>
</action> </action>
<action name="actionExport_as_code"> <action name="actionExport_as_code">
@ -757,32 +758,32 @@
</action> </action>
<action name="actionApplySigFromFile"> <action name="actionApplySigFromFile">
<property name="text"> <property name="text">
<string>Apply Signature From File</string> <string>Apply signature from file</string>
</property> </property>
</action> </action>
<action name="actionCreateNewSig"> <action name="actionCreateNewSig">
<property name="text"> <property name="text">
<string>Create New Signature File</string> <string>Create new signature file</string>
</property> </property>
</action> </action>
<action name="actionExtraHexdump"> <action name="actionExtraHexdump">
<property name="text"> <property name="text">
<string>Add Hexdump</string> <string>Add hexdump</string>
</property> </property>
</action> </action>
<action name="actionExtraDecompiler"> <action name="actionExtraDecompiler">
<property name="text"> <property name="text">
<string>Add Decompiler</string> <string>Add decompiler</string>
</property> </property>
</action> </action>
<action name="actionExtraDisassembly"> <action name="actionExtraDisassembly">
<property name="text"> <property name="text">
<string>Add Disassembly</string> <string>Add disassembly</string>
</property> </property>
</action> </action>
<action name="actionExtraGraph"> <action name="actionExtraGraph">
<property name="text"> <property name="text">
<string>Add Graph</string> <string>Add graph</string>
</property> </property>
</action> </action>
<action name="actionGrouped_dock_dragging"> <action name="actionGrouped_dock_dragging">
@ -798,24 +799,24 @@
</action> </action>
<action name="actionZoomIn"> <action name="actionZoomIn">
<property name="text"> <property name="text">
<string>Zoom In</string> <string>Zoom in</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl++</string> <string>Ctrl++</string>
</property> </property>
<property name="shortcutContext"> <property name="shortcutContext">
<enum>Qt::ApplicationShortcut</enum> <enum>Qt::ShortcutContext::ApplicationShortcut</enum>
</property> </property>
</action> </action>
<action name="actionZoomOut"> <action name="actionZoomOut">
<property name="text"> <property name="text">
<string>Zoom Out</string> <string>Zoom out</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+-</string> <string>Ctrl+-</string>
</property> </property>
<property name="shortcutContext"> <property name="shortcutContext">
<enum>Qt::ApplicationShortcut</enum> <enum>Qt::ShortcutContext::ApplicationShortcut</enum>
</property> </property>
</action> </action>
<action name="actionZoomReset"> <action name="actionZoomReset">
@ -826,7 +827,7 @@
<string>Ctrl+=</string> <string>Ctrl+=</string>
</property> </property>
<property name="shortcutContext"> <property name="shortcutContext">
<enum>Qt::ApplicationShortcut</enum> <enum>Qt::ShortcutContext::ApplicationShortcut</enum>
</property> </property>
</action> </action>
<action name="actionCommitChanges"> <action name="actionCommitChanges">
@ -880,7 +881,7 @@
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<resources> <resources>
<include location="resources.qrc"/> <include location="../resources.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -27,7 +27,7 @@ DecompilerContextMenu::DecompilerContextMenu(QWidget *parent, MainWindow *mainWi
actionCopyInstructionAddress(tr("Copy instruction address (<address>)"), this), actionCopyInstructionAddress(tr("Copy instruction address (<address>)"), this),
actionCopyReferenceAddress(tr("Copy address of [flag] (<address>)"), this), actionCopyReferenceAddress(tr("Copy address of [flag] (<address>)"), this),
actionShowInSubmenu(tr("Show in"), this), actionShowInSubmenu(tr("Show in"), this),
actionAddComment(tr("Add Comment"), this), actionAddComment(tr("Add comment"), this),
actionDeleteComment(tr("Delete comment"), this), actionDeleteComment(tr("Delete comment"), this),
actionRenameThingHere(tr("Rename function at cursor"), this), actionRenameThingHere(tr("Rename function at cursor"), this),
actionDeleteName(tr("Delete <name>"), this), actionDeleteName(tr("Delete <name>"), this),
@ -163,10 +163,10 @@ void DecompilerContextMenu::aboutToShowSlot()
actionAddComment.setVisible(true); actionAddComment.setVisible(true);
if (comment.isEmpty()) { if (comment.isEmpty()) {
actionDeleteComment.setVisible(false); actionDeleteComment.setVisible(false);
actionAddComment.setText(tr("Add Comment")); actionAddComment.setText(tr("Add comment"));
} else { } else {
actionDeleteComment.setVisible(true); actionDeleteComment.setVisible(true);
actionAddComment.setText(tr("Edit Comment")); actionAddComment.setText(tr("Edit comment"));
} }
} else { } else {
actionShowInSubmenu.setVisible(false); actionShowInSubmenu.setVisible(false);

View File

@ -86,11 +86,11 @@ DisassemblyContextMenu::DisassemblyContextMenu(QWidget *parent, MainWindow *main
copySeparator = addSeparator(); copySeparator = addSeparator();
initAction(&actionAddComment, tr("Add Comment"), SLOT(on_actionAddComment_triggered()), initAction(&actionAddComment, tr("Add comment"), SLOT(on_actionAddComment_triggered()),
getCommentSequence()); getCommentSequence());
addAction(&actionAddComment); addAction(&actionAddComment);
initAction(&actionSetFunctionVarTypes, tr("Re-type Local Variables"), initAction(&actionSetFunctionVarTypes, tr("Re-type local variables"),
SLOT(on_actionSetFunctionVarTypes_triggered()), getRetypeSequence()); SLOT(on_actionSetFunctionVarTypes_triggered()), getRetypeSequence());
addAction(&actionSetFunctionVarTypes); addAction(&actionSetFunctionVarTypes);
@ -137,7 +137,7 @@ DisassemblyContextMenu::DisassemblyContextMenu(QWidget *parent, MainWindow *main
SLOT(on_actionXRefsForVariables_triggered()), QKeySequence(Qt::SHIFT | Qt::Key_X)); SLOT(on_actionXRefsForVariables_triggered()), QKeySequence(Qt::SHIFT | Qt::Key_X));
addAction(&actionXRefsForVariables); addAction(&actionXRefsForVariables);
initAction(&actionDisplayOptions, tr("Show Options"), SLOT(on_actionDisplayOptions_triggered()), initAction(&actionDisplayOptions, tr("Show options"), SLOT(on_actionDisplayOptions_triggered()),
getDisplayOptionsSequence()); getDisplayOptionsSequence());
addSeparator(); addSeparator();
@ -204,11 +204,11 @@ void DisassemblyContextMenu::addSetBaseMenu()
setBaseMenu->addAction(&actionSetBaseHexadecimal); setBaseMenu->addAction(&actionSetBaseHexadecimal);
connect(&actionSetBaseHexadecimal, &QAction::triggered, this, [this] { setBase("h"); }); connect(&actionSetBaseHexadecimal, &QAction::triggered, this, [this] { setBase("h"); });
initAction(&actionSetBasePort, tr("Network Port")); initAction(&actionSetBasePort, tr("Network port"));
setBaseMenu->addAction(&actionSetBasePort); setBaseMenu->addAction(&actionSetBasePort);
connect(&actionSetBasePort, &QAction::triggered, this, [this] { setBase("p"); }); connect(&actionSetBasePort, &QAction::triggered, this, [this] { setBase("p"); });
initAction(&actionSetBaseIPAddr, tr("IP Address")); initAction(&actionSetBaseIPAddr, tr("IP address"));
setBaseMenu->addAction(&actionSetBaseIPAddr); setBaseMenu->addAction(&actionSetBaseIPAddr);
connect(&actionSetBaseIPAddr, &QAction::triggered, this, [this] { setBase("i"); }); connect(&actionSetBaseIPAddr, &QAction::triggered, this, [this] { setBase("i"); });
@ -287,7 +287,7 @@ void DisassemblyContextMenu::addSetToDataMenu()
setToDataMenu->addAction(&actionSetToDataEx); setToDataMenu->addAction(&actionSetToDataEx);
auto switchAction = new QAction(this); auto switchAction = new QAction(this);
initAction(switchAction, "Switch Data", SLOT(on_actionSetToData_triggered()), initAction(switchAction, "Switch data", SLOT(on_actionSetToData_triggered()),
getSetToDataSequence()); getSetToDataSequence());
} }
@ -299,14 +299,14 @@ void DisassemblyContextMenu::addEditMenu()
SLOT(on_actionEditInstruction_triggered())); SLOT(on_actionEditInstruction_triggered()));
editMenu->addAction(&actionEditInstruction); editMenu->addAction(&actionEditInstruction);
initAction(&actionNopInstruction, tr("Nop Instruction"), initAction(&actionNopInstruction, tr("Nop instruction"),
SLOT(on_actionNopInstruction_triggered())); SLOT(on_actionNopInstruction_triggered()));
editMenu->addAction(&actionNopInstruction); editMenu->addAction(&actionNopInstruction);
initAction(&actionEditBytes, tr("Bytes"), SLOT(on_actionEditBytes_triggered())); initAction(&actionEditBytes, tr("Bytes"), SLOT(on_actionEditBytes_triggered()));
editMenu->addAction(&actionEditBytes); editMenu->addAction(&actionEditBytes);
initAction(&actionJmpReverse, tr("Reverse Jump"), SLOT(on_actionJmpReverse_triggered())); initAction(&actionJmpReverse, tr("Reverse jump"), SLOT(on_actionJmpReverse_triggered()));
editMenu->addAction(&actionJmpReverse); editMenu->addAction(&actionJmpReverse);
} }
@ -572,10 +572,10 @@ void DisassemblyContextMenu::aboutToShowSlot()
if (comment.isNull() || comment.isEmpty()) { if (comment.isNull() || comment.isEmpty()) {
actionDeleteComment.setVisible(false); actionDeleteComment.setVisible(false);
actionAddComment.setText(tr("Add Comment")); actionAddComment.setText(tr("Add comment"));
} else { } else {
actionDeleteComment.setVisible(true); actionDeleteComment.setVisible(true);
actionAddComment.setText(tr("Edit Comment")); actionAddComment.setText(tr("Edit comment"));
} }
actionCopy.setVisible(canCopy); actionCopy.setVisible(canCopy);
@ -729,7 +729,7 @@ void DisassemblyContextMenu::on_actionEditInstruction_triggered()
return; return;
} }
EditInstructionDialog e(EDIT_TEXT, parentForDialog()); EditInstructionDialog e(EDIT_TEXT, parentForDialog());
e.setWindowTitle(tr("Edit Instruction at %1").arg(RzAddressString(offset))); e.setWindowTitle(tr("Edit instruction at %1").arg(RzAddressString(offset)));
QString oldInstructionOpcode = Core()->getInstructionOpcode(offset); QString oldInstructionOpcode = Core()->getInstructionOpcode(offset);
QString oldInstructionBytes = Core()->getInstructionBytes(offset); QString oldInstructionBytes = Core()->getInstructionBytes(offset);
@ -779,7 +779,7 @@ void DisassemblyContextMenu::on_actionEditBytes_triggered()
return; return;
} }
EditInstructionDialog e(EDIT_BYTES, parentForDialog()); EditInstructionDialog e(EDIT_BYTES, parentForDialog());
e.setWindowTitle(tr("Edit Bytes at %1").arg(RzAddressString(offset))); e.setWindowTitle(tr("Edit bytes at %1").arg(RzAddressString(offset)));
QString oldBytes = Core()->getInstructionBytes(offset); QString oldBytes = Core()->getInstructionBytes(offset);
e.setInstruction(oldBytes); e.setInstruction(oldBytes);

View File

@ -11,8 +11,8 @@
FlirtContextMenu::FlirtContextMenu(QWidget *parent, MainWindow *mainWindow) FlirtContextMenu::FlirtContextMenu(QWidget *parent, MainWindow *mainWindow)
: QMenu(parent), mainWindow(mainWindow) : QMenu(parent), mainWindow(mainWindow)
{ {
actionCopyLine = new QAction(tr("Copy Line"), this); actionCopyLine = new QAction(tr("Copy line"), this);
actionApplySignature = new QAction(tr("Apply Signature File"), this); actionApplySignature = new QAction(tr("Apply signature file"), this);
connect(actionCopyLine, &QAction::triggered, this, &FlirtContextMenu::onActionCopyLine); connect(actionCopyLine, &QAction::triggered, this, &FlirtContextMenu::onActionCopyLine);
connect(actionApplySignature, &QAction::triggered, this, connect(actionApplySignature, &QAction::triggered, this,