| 1 | # HG changeset patch
|
|---|
| 2 | # Parent 6f5f6e78675e0aecf3ed72b0aa2f937da9a5adff
|
|---|
| 3 | # User timeless@mozdev.org
|
|---|
| 4 | VirtualBox Ticket 7647 Unify checkable menuitems
|
|---|
| 5 |
|
|---|
| 6 | diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp
|
|---|
| 7 | --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp
|
|---|
| 8 | +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp
|
|---|
| 9 | @@ -239,14 +239,13 @@ protected:
|
|---|
| 10 |
|
|---|
| 11 | void retranslateUi()
|
|---|
| 12 | {
|
|---|
| 13 | + setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Use &Fullscreen"), "F"));
|
|---|
| 14 | if (!isChecked())
|
|---|
| 15 | {
|
|---|
| 16 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Enter &Fullscreen Mode"), "F"));
|
|---|
| 17 | setStatusTip(QApplication::translate("UIActionsPool", "Switch to fullscreen mode"));
|
|---|
| 18 | }
|
|---|
| 19 | else
|
|---|
| 20 | {
|
|---|
| 21 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Exit &Fullscreen Mode"), "F"));
|
|---|
| 22 | setStatusTip(QApplication::translate("UIActionsPool", "Switch to normal mode"));
|
|---|
| 23 | }
|
|---|
| 24 | }
|
|---|
| 25 | @@ -270,14 +269,13 @@ protected:
|
|---|
| 26 |
|
|---|
| 27 | void retranslateUi()
|
|---|
| 28 | {
|
|---|
| 29 | + setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Use Seam&less Mode"), "L"));
|
|---|
| 30 | if (!isChecked())
|
|---|
| 31 | {
|
|---|
| 32 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Enter Seam&less Mode"), "L"));
|
|---|
| 33 | setStatusTip(QApplication::translate("UIActionsPool", "Switch to seamless desktop integration mode"));
|
|---|
| 34 | }
|
|---|
| 35 | else
|
|---|
| 36 | {
|
|---|
| 37 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Exit Seam&less Mode"), "L"));
|
|---|
| 38 | setStatusTip(QApplication::translate("UIActionsPool", "Switch to normal mode"));
|
|---|
| 39 | }
|
|---|
| 40 | }
|
|---|
| 41 | @@ -301,14 +299,13 @@ protected:
|
|---|
| 42 |
|
|---|
| 43 | void retranslateUi()
|
|---|
| 44 | {
|
|---|
| 45 | + setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "&Scale Screen"), "C"));
|
|---|
| 46 | if (!isChecked())
|
|---|
| 47 | {
|
|---|
| 48 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Enter &Scale Mode"), "C"));
|
|---|
| 49 | setStatusTip(QApplication::translate("UIActionsPool", "Switch to scale mode"));
|
|---|
| 50 | }
|
|---|
| 51 | else
|
|---|
| 52 | {
|
|---|
| 53 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Exit &Scale Mode"), "C"));
|
|---|
| 54 | setStatusTip(QApplication::translate("UIActionsPool", "Switch to normal mode"));
|
|---|
| 55 | }
|
|---|
| 56 | }
|
|---|
| 57 | @@ -332,14 +329,13 @@ protected:
|
|---|
| 58 |
|
|---|
| 59 | void retranslateUi()
|
|---|
| 60 | {
|
|---|
| 61 | + setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Auto-resize &Guest Display"), "G"));
|
|---|
| 62 | if (!isChecked())
|
|---|
| 63 | {
|
|---|
| 64 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Enable &Guest Display Auto-resize"), "G"));
|
|---|
| 65 | setStatusTip(QApplication::translate("UIActionsPool", "Automatically resize the guest display when the window is resized (requires Guest Additions)"));
|
|---|
| 66 | }
|
|---|
| 67 | else
|
|---|
| 68 | {
|
|---|
| 69 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Disable &Guest Display Auto-resize"), "G"));
|
|---|
| 70 | setStatusTip(QApplication::translate("UIActionsPool", "Disable automatic resize of the guest display when the window is resized"));
|
|---|
| 71 | }
|
|---|
| 72 | }
|
|---|
| 73 | @@ -404,14 +400,13 @@ protected:
|
|---|
| 74 |
|
|---|
| 75 | void retranslateUi()
|
|---|
| 76 | {
|
|---|
| 77 | + setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Use &Mouse Integration"), "I"));
|
|---|
| 78 | if (!isChecked())
|
|---|
| 79 | {
|
|---|
| 80 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Disable &Mouse Integration"), "I"));
|
|---|
| 81 | setStatusTip(QApplication::translate("UIActionsPool", "Temporarily disable host mouse pointer integration"));
|
|---|
| 82 | }
|
|---|
| 83 | else
|
|---|
| 84 | {
|
|---|
| 85 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Enable &Mouse Integration"), "I"));
|
|---|
| 86 | setStatusTip(QApplication::translate("UIActionsPool", "Enable temporarily disabled host mouse pointer integration"));
|
|---|
| 87 | }
|
|---|
| 88 | }
|
|---|
| 89 | @@ -502,7 +497,7 @@ protected:
|
|---|
| 90 |
|
|---|
| 91 | void retranslateUi()
|
|---|
| 92 | {
|
|---|
| 93 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Session I&nformation Dialog"), "N"));
|
|---|
| 94 | + setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "Session I&nformation"), "N"));
|
|---|
| 95 | setStatusTip(QApplication::translate("UIActionsPool", "Show Session Information Dialog"));
|
|---|
| 96 | }
|
|---|
| 97 | };
|
|---|
| 98 | @@ -524,14 +519,13 @@ protected:
|
|---|
| 99 |
|
|---|
| 100 | void retranslateUi()
|
|---|
| 101 | {
|
|---|
| 102 | + setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "&Pause"), "P"));
|
|---|
| 103 | if (!isChecked())
|
|---|
| 104 | {
|
|---|
| 105 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "&Pause"), "P"));
|
|---|
| 106 | setStatusTip(QApplication::translate("UIActionsPool", "Suspend the execution of the virtual machine"));
|
|---|
| 107 | }
|
|---|
| 108 | else
|
|---|
| 109 | {
|
|---|
| 110 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "R&esume"), "P"));
|
|---|
| 111 | setStatusTip(QApplication::translate("UIActionsPool", "Resume the execution of the virtual machine"));
|
|---|
| 112 | }
|
|---|
| 113 | }
|
|---|
| 114 | @@ -576,12 +570,12 @@ protected:
|
|---|
| 115 |
|
|---|
| 116 | void retranslateUi()
|
|---|
| 117 | {
|
|---|
| 118 | -#ifdef Q_WS_MAC
|
|---|
| 119 | + /* There's no reason not to be consistent across platforms.
|
|---|
| 120 | + * There's also no reason to make it easy to kill a computer,
|
|---|
| 121 | + * so this shouldn't have an access key at *all*.
|
|---|
| 122 | + */
|
|---|
| 123 | /* Host+H is Hide on the mac */
|
|---|
| 124 | setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "ACPI Sh&utdown"), "U"));
|
|---|
| 125 | -#else /* Q_WS_MAC */
|
|---|
| 126 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "ACPI S&hutdown"), "H"));
|
|---|
| 127 | -#endif /* !Q_WS_MAC */
|
|---|
| 128 | setStatusTip(QApplication::translate("UIActionsPool", "Send the ACPI Power Button press event to the virtual machine"));
|
|---|
| 129 | }
|
|---|
| 130 | };
|
|---|
| 131 | @@ -604,7 +598,7 @@ protected:
|
|---|
| 132 |
|
|---|
| 133 | void retranslateUi()
|
|---|
| 134 | {
|
|---|
| 135 | - setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "&Close..." ), "Q"));
|
|---|
| 136 | + setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("UIActionsPool", "&Close..."), "Q"));
|
|---|
| 137 | setStatusTip(QApplication::translate("UIActionsPool", "Close the virtual machine"));
|
|---|
| 138 | }
|
|---|
| 139 | };
|
|---|
| 140 | @@ -813,14 +807,13 @@ protected:
|
|---|
| 141 |
|
|---|
| 142 | void retranslateUi()
|
|---|
| 143 | {
|
|---|
| 144 | + setText(QApplication::translate("UIActionsPool", "Allow R&emote Display"));
|
|---|
| 145 | if (!isChecked())
|
|---|
| 146 | {
|
|---|
| 147 | - setText(QApplication::translate("UIActionsPool", "&Enable Remote Display"));
|
|---|
| 148 | setStatusTip(QApplication::translate("UIActionsPool", "Enable remote desktop (RDP) connections to this machine"));
|
|---|
| 149 | }
|
|---|
| 150 | else
|
|---|
| 151 | {
|
|---|
| 152 | - setText(QApplication::translate("UIActionsPool", "&Disable Remote Display"));
|
|---|
| 153 | setStatusTip(QApplication::translate("UIActionsPool", "Disable remote desktop (RDP) connections to this machine"));
|
|---|
| 154 | }
|
|---|
| 155 | }
|
|---|
| 156 | @@ -925,10 +918,7 @@ protected:
|
|---|
| 157 |
|
|---|
| 158 | void retranslateUi()
|
|---|
| 159 | {
|
|---|
| 160 | - if (!isChecked())
|
|---|
| 161 | - setText(QApplication::translate("UIActionsPool", "Enable &Logging...", "debug action"));
|
|---|
| 162 | - else
|
|---|
| 163 | - setText(QApplication::translate("UIActionsPool", "Disable &Logging...", "debug action"));
|
|---|
| 164 | + setText(QApplication::translate("UIActionsPool", "Perform &Logging...", "debug action"));
|
|---|
| 165 | }
|
|---|
| 166 | };
|
|---|
| 167 | #endif
|
|---|