Skip to content

Commit

Permalink
FIX(ui): Update menu items to comform to design standards
Browse files Browse the repository at this point in the history
This commit changes the menu items and some buttons to
conform to universal [1] standards. This means that:

* Labels are using title case (e.g. "Listen to channel" -> "Listen To Channel")
* Menu items are generally not including the menu title in
the action label (e.g. "Join Channel" -> "Join")
* ALL menu items have non-overlapping access keys (ALT + <access key>, denoted by underline)
* Ellipses ("...") are only used for actions that require further user input,
simply opening another window is not a reason for using an ellipsis.

[1] State of the art as documented by major vendors in the consumer
software industry. For example:
https://learn.microsoft.com/en-us/windows/win32/uxguide/cmd-menus
https://developer.apple.com/design/human-interface-guidelines/menus
https://develop.kde.org/hig/components/navigation/menubar/
  • Loading branch information
Hartmnt committed Jan 19, 2024
1 parent 6dfbdbf commit 30e9787
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 41 deletions.
2 changes: 0 additions & 2 deletions src/mumble/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2240,8 +2240,6 @@ void MainWindow::qmChannel_aboutToShow() {

if (c && c->iId != ClientUser::get(Global::get().uiSession)->cChannel->iId) {
qmChannel->addAction(qaChannelJoin);

qmChannel->addSeparator();
}

if (c && Global::get().sh && Global::get().sh->m_version >= Version::fromComponents(1, 4, 0)) {
Expand Down
72 changes: 36 additions & 36 deletions src/mumble/MainWindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Ban list...</string>
<string>&amp;Ban List</string>
</property>
<property name="toolTip">
<string>Edit ban list on server</string>
Expand All @@ -323,7 +323,7 @@
<normaloff>skin:Information_icon.svg</normaloff>skin:Information_icon.svg</iconset>
</property>
<property name="text">
<string>&amp;Information...</string>
<string>&amp;Information</string>
</property>
<property name="toolTip">
<string>Show information about the server connection</string>
Expand Down Expand Up @@ -390,7 +390,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Ignore Messages</string>
<string>Ig&amp;nore Messages</string>
</property>
<property name="toolTip">
<string>Locally ignore user's text chat messages.</string>
Expand All @@ -415,7 +415,7 @@
</action>
<action name="qaUserTextMessage">
<property name="text">
<string>Send &amp;Message...</string>
<string>&amp;Send Message...</string>
</property>
<property name="toolTip">
<string>Send a Text Message</string>
Expand All @@ -426,7 +426,7 @@
</action>
<action name="qaUserLocalNickname">
<property name="text">
<string>&amp;Set Nickname...</string>
<string>Set Ni&amp;ckname...</string>
</property>
<property name="toolTip">
<string>Set a local nickname</string>
Expand Down Expand Up @@ -470,7 +470,7 @@
</action>
<action name="qaChannelLink">
<property name="text">
<string>&amp;Link</string>
<string>L&amp;ink</string>
</property>
<property name="toolTip">
<string>Link your channel to another channel</string>
Expand All @@ -492,7 +492,7 @@
</action>
<action name="qaChannelUnlinkAll">
<property name="text">
<string>&amp;Unlink All</string>
<string>U&amp;nlink All</string>
</property>
<property name="toolTip">
<string>Unlinks your channel from all linked channels.</string>
Expand Down Expand Up @@ -523,7 +523,7 @@
<activeon>skin:actions/audio-input-microphone-muted.svg</activeon>skin:actions/audio-input-microphone.svg</iconset>
</property>
<property name="text">
<string>&amp;Mute Self</string>
<string>M&amp;ute Self</string>
</property>
<property name="whatsThis">
<string>Mute or unmute yourself. When muted, you will not send any data to the server. Unmuting while deafened will also undeafen.</string>
Expand All @@ -543,7 +543,7 @@
<activeon>skin:deafened_self.svg</activeon>skin:self_undeafened.svg</iconset>
</property>
<property name="text">
<string>&amp;Deafen Self</string>
<string>D&amp;eafen Self</string>
</property>
<property name="whatsThis">
<string>Deafen or undeafen yourself. When deafened, you will not hear anything. Deafening yourself will also mute.</string>
Expand All @@ -568,7 +568,7 @@
</action>
<action name="qaAudioStats">
<property name="text">
<string>Audio S&amp;tatistics...</string>
<string>Audio &amp;Statistics</string>
</property>
<property name="toolTip">
<string>Display audio statistics</string>
Expand All @@ -594,7 +594,7 @@
<normaloff>skin:config_basic.png</normaloff>skin:config_basic.png</iconset>
</property>
<property name="text">
<string>&amp;Settings...</string>
<string>&amp;Settings</string>
</property>
<property name="toolTip">
<string>Configure Mumble</string>
Expand Down Expand Up @@ -651,7 +651,7 @@ the channel's context menu.</string>
</action>
<action name="qaDeveloperConsole">
<property name="text">
<string>Developer &amp;Console...</string>
<string>Debug &amp;Console</string>
</property>
<property name="toolTip">
<string>Show the Developer Console</string>
Expand All @@ -662,7 +662,7 @@ the channel's context menu.</string>
</action>
<action name="qaPositionalAudioViewer">
<property name="text">
<string>Positional &amp;Audio Viewer...</string>
<string>Positional &amp;Audio Viewer</string>
</property>
<property name="toolTip">
<string>Show the Positional Audio Viewer</string>
Expand All @@ -684,7 +684,7 @@ the channel's context menu.</string>
</action>
<action name="qaHelpAbout">
<property name="text">
<string>&amp;About...</string>
<string>&amp;About</string>
</property>
<property name="toolTip">
<string>Information about Mumble</string>
Expand Down Expand Up @@ -712,7 +712,7 @@ the channel's context menu.</string>
</action>
<action name="qaHelpAboutQt">
<property name="text">
<string>About &amp;Qt...</string>
<string>About &amp;Qt</string>
</property>
<property name="toolTip">
<string>Information about Qt</string>
Expand All @@ -737,7 +737,7 @@ the channel's context menu.</string>
</action>
<action name="qaChannelSendMessage">
<property name="text">
<string>Send &amp;Message...</string>
<string>&amp;Send Message...</string>
</property>
<property name="toolTip">
<string>Send a Text Message</string>
Expand Down Expand Up @@ -798,7 +798,7 @@ the channel's context menu.</string>
</action>
<action name="qaUserRegister">
<property name="text">
<string>&amp;Register...</string>
<string>Re&amp;gister...</string>
</property>
<property name="toolTip">
<string>Register user on server</string>
Expand Down Expand Up @@ -849,7 +849,7 @@ the channel's context menu.</string>
</action>
<action name="qaServerUserList">
<property name="text">
<string>Registered &amp;Users...</string>
<string>Registered &amp;Users</string>
</property>
<property name="toolTip">
<string>Edit registered users list</string>
Expand All @@ -868,60 +868,60 @@ the channel's context menu.</string>
</action>
<action name="qaServerTokens">
<property name="text">
<string>&amp;Access Tokens...</string>
<string>&amp;Access Tokens</string>
</property>
<property name="toolTip">
<string>Add or remove text-based access tokens</string>
</property>
</action>
<action name="qaServerTextureRemove">
<property name="text">
<string>&amp;Remove Avatar</string>
<string>Remo&amp;ve Avatar</string>
</property>
<property name="toolTip">
<string>Remove currently defined avatar image.</string>
</property>
</action>
<action name="qaUserCommentReset">
<property name="text">
<string>Reset &amp;Comment...</string>
<string>Reset Commen&amp;t...</string>
</property>
<property name="toolTip">
<string>Reset the comment of the selected user.</string>
</property>
</action>
<action name="qaUserTextureReset">
<property name="text">
<string>Reset &amp;Avatar...</string>
<string>Remo&amp;ve Avatar...</string>
</property>
<property name="toolTip">
<string>Reset the avatar of the selected user.</string>
<string>Remove the avatar of the selected user.</string>
</property>
</action>
<action name="qaChannelJoin">
<property name="text">
<string>&amp;Join Channel</string>
<string>&amp;Join</string>
</property>
</action>
<action name="qaChannelHide">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Hide Channel when Filtering</string>
<string>&amp;Hide When Filtering</string>
</property>
</action>
<action name="qaChannelPin">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Pin Channel when Filtering</string>
<string>&amp;Pin When Filtering</string>
</property>
</action>
<action name="qaUserCommentView">
<property name="text">
<string>View Comment...</string>
<string>Vie&amp;w Comment</string>
</property>
<property name="toolTip">
<string>View comment in editor</string>
Expand All @@ -933,7 +933,7 @@ the channel's context menu.</string>
<normaloff>skin:Information_icon.svg</normaloff>skin:Information_icon.svg</iconset>
</property>
<property name="text">
<string>&amp;Information...</string>
<string>&amp;Information</string>
</property>
<property name="toolTip">
<string>Query server for connection information for user</string>
Expand All @@ -959,7 +959,7 @@ the channel's context menu.</string>
</action>
<action name="qaSelfRegister">
<property name="text">
<string>R&amp;egister...</string>
<string>Re&amp;gister...</string>
</property>
<property name="toolTip">
<string>Register yourself on the server</string>
Expand All @@ -970,15 +970,15 @@ the channel's context menu.</string>
<bool>true</bool>
</property>
<property name="text">
<string>Priority Speaker</string>
<string>&amp;Priority Speaker</string>
</property>
</action>
<action name="qaSelfPrioritySpeaker">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Priority Speaker</string>
<string>&amp;Priority Speaker</string>
</property>
</action>
<action name="qaRecording">
Expand All @@ -990,7 +990,7 @@ the channel's context menu.</string>
<normaloff>skin:actions/media-record.svg</normaloff>skin:actions/media-record.svg</iconset>
</property>
<property name="text">
<string>Recording</string>
<string>&amp;Record...</string>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
Expand All @@ -1009,7 +1009,7 @@ the channel's context menu.</string>
<bool>true</bool>
</property>
<property name="text">
<string>Listen to channel</string>
<string>&amp;Listen To Channel</string>
</property>
<property name="toolTip">
<string>Listen to this channel without joining it</string>
Expand All @@ -1020,15 +1020,15 @@ the channel's context menu.</string>
<bool>true</bool>
</property>
<property name="text">
<string>Talking UI</string>
<string>Talking &amp;UI</string>
</property>
<property name="toolTip">
<string>Toggles the visibility of the TalkingUI.</string>
</property>
</action>
<action name="qaUserJoin">
<property name="text">
<string>Join user's channel</string>
<string>&amp;Join User's Channel</string>
</property>
<property name="toolTip">
<string>Joins the channel of this user.</string>
Expand All @@ -1054,7 +1054,7 @@ the channel's context menu.</string>
<normaloff>skin:magnifier.svg</normaloff>skin:magnifier.svg</iconset>
</property>
<property name="text">
<string>Search</string>
<string>&amp;Search...</string>
</property>
<property name="toolTip">
<string>Search for a user or channel (Ctrl+F)</string>
Expand Down
4 changes: 2 additions & 2 deletions src/mumble/ServerInformation.ui
Original file line number Diff line number Diff line change
Expand Up @@ -645,14 +645,14 @@
<item>
<widget class="QPushButton" name="viewCertButton">
<property name="text">
<string>&amp;View certificate</string>
<string>&amp;View Certificate</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="okButton">
<property name="text">
<string>&amp;Ok</string>
<string>&amp;OK</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/mumble/UserInformation.ui
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
</size>
</property>
<property name="text">
<string>Details...</string>
<string>Details</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit 30e9787

Please sign in to comment.