- Timestamp:
- Jun 28, 2021 4:08:43 PM (4 years ago)
- svn:sync-xref-src-repo-rev:
- 145391
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src
- Files:
-
- 6 edited
-
extensions/QIMessageBox.cpp (modified) (2 diffs)
-
extensions/QIMessageBox.h (modified) (2 diffs)
-
extradata/UIExtraDataManager.cpp (modified) (3 diffs)
-
globals/UIMessageCenter.cpp (modified) (79 diffs)
-
globals/UIMessageCenter.h (modified) (19 diffs)
-
softkeyboard/UISoftKeyboard.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp
r89928 r89933 37 37 38 38 39 QIMessageBox::QIMessageBox(const QString &strTitle, const QString &strMessage, AlertIconType iconType,39 QIMessageBox::QIMessageBox(const QString &strTitle, const QString &strMessage, const QString &strHelpKeyword, AlertIconType iconType, 40 40 int iButton1 /* = 0*/, int iButton2 /* = 0*/, int iButton3 /* = 0*/, QWidget *pParent /* = 0*/) 41 41 : QIDialog(pParent) … … 45 45 , m_strMessage(strMessage) 46 46 , m_pLabelText(0) 47 , m_strHelpKeyword(strHelpKeyword) 47 48 , m_pFlagCheckBox(0) 48 49 , m_pDetailsContainer(0) -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.h
r89928 r89933 91 91 * @param strTitle Brings the title. 92 92 * @param strMessage Brings the message. 93 * @param strMessage Brings the help keyword for context sensitive help 93 94 * @param iconType Brings the icon-type. 94 95 * @param iButton1 Brings the integer-code for the 1st button. 95 96 * @param iButton2 Brings the integer-code for the 2nd button. 96 97 * @param iButton3 Brings the integer-code for the 3rd button. */ 97 QIMessageBox(const QString &strTitle, const QString &strMessage, AlertIconType iconType,98 QIMessageBox(const QString &strTitle, const QString &strMessage, const QString &strHelpKeyword, AlertIconType iconType, 98 99 int iButton1 = 0, int iButton2 = 0, int iButton3 = 0, QWidget *pParent = 0); 99 100 … … 171 172 /** Holds the message-label instance. */ 172 173 QIRichTextLabel *m_pLabelText; 174 175 /** Holds the help keyword. */ 176 QString m_strHelpKeyword; 173 177 174 178 /** Holds the flag check-box instance. */ -
trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
r89740 r89933 916 916 if (!msgCenter().questionBinary(this, MessageType_Question, 917 917 QString("Overwriting already existing key, Continue?"), 918 QString() /* help keyword */, 918 919 0 /* auto-confirm id */, 919 920 QString("Overwrite") /* ok button text */, … … 1106 1107 if (!msgCenter().questionBinary(this, MessageType_Question, 1107 1108 QString("Overwriting already existing key, Continue?"), 1109 QString() /* help keyword */, 1108 1110 0 /* auto-confirm id */, 1109 1111 QString("Overwrite") /* ok button text */, … … 1151 1153 QString("<p>Do you really wish to " 1152 1154 "remove chosen records?</p>"), 1153 strDetails)) 1155 strDetails, 1156 QString() /* help keyword */)) 1154 1157 return; 1155 1158 -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
r89928 r89933 156 156 const QString &strMessage, 157 157 const QString &strDetails, 158 const QString &strHelpKeyword, 158 159 const char *pcszAutoConfirmId /* = 0*/, 159 160 int iButton1 /* = 0*/, … … 170 171 * to show a message-box in the GUI thread: */ 171 172 emit sigToShowMessageBox(pParent, enmType, 172 strMessage, strDetails, 173 strMessage, strDetails, strHelpKeyword, 173 174 iButton1, iButton2, iButton3, 174 175 strButtonText1, strButtonText2, strButtonText3, … … 179 180 /* In usual case we can chow a message-box directly: */ 180 181 return showMessageBox(pParent, enmType, 181 strMessage, strDetails, 182 strMessage, strDetails, strHelpKeyword, 182 183 iButton1, iButton2, iButton3, 183 184 strButtonText1, strButtonText2, strButtonText3, … … 188 189 const QString &strMessage, 189 190 const QString &strDetails, 191 const QString &strHelpKeyword /* = QString() */, 190 192 const char *pcszAutoConfirmId /* = 0*/) const 191 193 { 192 message(pParent, enmType, strMessage, strDetails, pcszAutoConfirmId,194 message(pParent, enmType, strMessage, strDetails, strHelpKeyword, pcszAutoConfirmId, 193 195 AlertButton_Ok | AlertButtonOption_Default | AlertButtonOption_Escape); 194 196 } … … 197 199 const QString &strMessage, 198 200 const QString &strDetails, 201 const QString &strHelpKeyword, 199 202 const char *pcszAutoConfirmId /* = 0*/, 200 203 const QString &strOkButtonText /* = QString()*/, 201 204 const QString &strCancelButtonText /* = QString()*/) const 202 205 { 203 return (message(pParent, enmType, strMessage, strDetails, pcszAutoConfirmId,206 return (message(pParent, enmType, strMessage, strDetails, strHelpKeyword, pcszAutoConfirmId, 204 207 AlertButton_Ok | AlertButtonOption_Default, 205 208 AlertButton_Cancel | AlertButtonOption_Escape, … … 220 223 int UIMessageCenter::question(QWidget *pParent, MessageType enmType, 221 224 const QString &strMessage, 225 const QString &strHelpKeyword, 222 226 const char *pcszAutoConfirmId/* = 0*/, 223 227 int iButton1 /* = 0*/, … … 228 232 const QString &strButtonText3 /* = QString()*/) const 229 233 { 230 return message(pParent, enmType, strMessage, QString() , pcszAutoConfirmId,234 return message(pParent, enmType, strMessage, QString() /* details */, strHelpKeyword, pcszAutoConfirmId, 231 235 iButton1, iButton2, iButton3, strButtonText1, strButtonText2, strButtonText3); 232 236 } … … 234 238 bool UIMessageCenter::questionBinary(QWidget *pParent, MessageType enmType, 235 239 const QString &strMessage, 240 const QString &strHelpKeyword /* = QString() */, 236 241 const char *pcszAutoConfirmId /* = 0*/, 237 242 const QString &strOkButtonText /* = QString()*/, … … 240 245 { 241 246 return fDefaultFocusForOk ? 242 ((question(pParent, enmType, strMessage, pcszAutoConfirmId,247 ((question(pParent, enmType, strMessage, strHelpKeyword, pcszAutoConfirmId, 243 248 AlertButton_Ok | AlertButtonOption_Default, 244 249 AlertButton_Cancel | AlertButtonOption_Escape, … … 248 253 QString() /* third button */) & 249 254 AlertButtonMask) == AlertButton_Ok) : 250 ((question(pParent, enmType, strMessage, pcszAutoConfirmId,255 ((question(pParent, enmType, strMessage, strHelpKeyword, pcszAutoConfirmId, 251 256 AlertButton_Ok, 252 257 AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape, … … 260 265 int UIMessageCenter::questionTrinary(QWidget *pParent, MessageType enmType, 261 266 const QString &strMessage, 267 const QString &strHelpKeyword /* = QString() */, 262 268 const char *pcszAutoConfirmId /* = 0*/, 263 269 const QString &strChoice1ButtonText /* = QString()*/, … … 265 271 const QString &strCancelButtonText /* = QString()*/) const 266 272 { 267 return question(pParent, enmType, strMessage, pcszAutoConfirmId,273 return question(pParent, enmType, strMessage, strHelpKeyword, pcszAutoConfirmId, 268 274 AlertButton_Choice1, 269 275 AlertButton_Choice2 | AlertButtonOption_Default, … … 277 283 const QString &strMessage, 278 284 const QString &strOptionText, 285 const QString &strHelpKeyword, 279 286 bool fDefaultOptionValue /* = true */, 280 287 int iButton1 /* = 0*/, … … 323 330 /* Create message-box: */ 324 331 QWidget *pBoxParent = windowManager().realParentWindow(pParent ? pParent : windowManager().mainWindowShown()); 325 QPointer<QIMessageBox> pBox = new QIMessageBox(strTitle, strMessage, icon,332 QPointer<QIMessageBox> pBox = new QIMessageBox(strTitle, strMessage, strHelpKeyword, icon, 326 333 iButton1, iButton2, iButton3, pBoxParent); 327 334 windowManager().registerNewParent(pBox, pBoxParent); … … 664 671 "<p>Would you like to automatically rename it?</p>") 665 672 .arg(strName, strGroupName), 673 QString() /* = QString() */, 666 674 0 /* auto-confirm id */, 667 675 tr("Rename")); … … 687 695 "<p><b>%1</b></p><p>Do you wish to proceed?</p>") 688 696 .arg(names.join(", ")), 697 QString() /* help keyword */, 689 698 0 /* auto-confirm id */, 690 699 tr("Remove") /* ok button text */, … … 758 767 return cInacessibleMachineCount == machines.size() ? 759 768 message(0, MessageType_Question, 760 strText, QString(), 769 strText, QString(), QString() /* help keyword */, 761 770 0 /* auto-confirm id */, 762 771 AlertButton_Ok, … … 765 774 tr("Remove")) : 766 775 message(0, MessageType_Question, 767 strText, QString(), 776 strText, QString(), QString() /* help keyword */, 768 777 0 /* auto-confirm id */, 769 778 AlertButton_Choice1, … … 793 802 /* Prepare message itself: */ 794 803 return message(0, MessageType_Question, 795 strText, QString(), 804 strText, QString(), QString() /* help keyword */, 796 805 0 /* auto-confirm id */, 797 806 AlertButton_Choice1, … … 843 852 "see which files are inaccessible, or press <b>Ignore</b> to " 844 853 "ignore this message.</p>"), 854 QString() /* help keyword */, 845 855 "warnAboutInaccessibleMedia", 846 856 tr("Check", "inaccessible media message box"), tr("Ignore")); … … 855 865 "the machine without doing a proper shutdown of the guest OS.</p>") 856 866 .arg(strNames), 867 QString() /* help keyword */, 857 868 0 /* auto-confirm id */, 858 869 tr("Discard", "saved state")); … … 865 876 "of the following virtual machines?</p><p><b>%1</b></p>") 866 877 .arg(strNames), 878 QString() /* help keyword */, 867 879 0 /* auto-confirm id */, 868 880 tr("Terminate", "cloud instance")); … … 876 888 "in applications running inside it to be lost.</p>") 877 889 .arg(strNames), 890 QString() /* help keyword */, 878 891 "confirmResetMachine" /* auto-confirm id */, 879 892 tr("Reset", "machine")); … … 886 899 "to the following virtual machines?</p><p><b>%1</b></p>") 887 900 .arg(strNames), 901 QString() /* help keyword */, 888 902 "confirmACPIShutdownMachine" /* auto-confirm id */, 889 903 tr("ACPI Shutdown", "machine")); … … 897 911 "running inside it to be lost.</p>") 898 912 .arg(strNames), 913 QString() /* help keyword */, 899 914 "confirmPowerOffMachine" /* auto-confirm id */, 900 915 tr("Power Off", "machine")); … … 1123 1138 .arg(strSnapshotName), 1124 1139 tr("Create a snapshot of the current machine state"), 1140 QString() /* Help keyword */, 1125 1141 !gEDataManager->messagesWithInvertedOption().contains("confirmSnapshotRestoring"), 1126 1142 AlertButton_Ok, … … 1132 1148 .arg(strSnapshotName), 1133 1149 QString() /* details */, 1150 QString() /* help keyword */, 1134 1151 0 /* auto-confirm id */, 1135 1152 AlertButton_Ok, … … 1147 1164 "</p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p>") 1148 1165 .arg(strSnapshotName), 1166 QString() /* help keyword */, 1149 1167 0 /* auto-confirm id */, 1150 1168 tr("Delete") /* ok button text */, … … 1164 1182 "the snapshot at your own risk.</p>") 1165 1183 .arg(strSnapshotName, strTargetImageName, strTargetImageMaxSize, strTargetFileSystemFree), 1184 QString() /* help keyword */, 1166 1185 0 /* auto-confirm id */, 1167 1186 tr("Delete") /* ok button text */, … … 1273 1292 "type.</p>") 1274 1293 .arg(strName), 1294 QString() /* help keyword */, 1275 1295 0 /* auto-confirm id */, 1276 1296 tr("Remove") /* ok button text */, … … 1321 1341 "You currently have unsaved setting changes.</p>" 1322 1342 "<p>Would you like to reload the changed settings or to keep your own changes?</p>"), 1343 QString() /* help keyword */, 1323 1344 0 /* auto-confirm id */, 1324 1345 tr("Reload settings"), tr("Keep changes")); … … 1331 1352 "<p>You will not be able to insert any optical disks or ISO images " 1332 1353 "or install the Guest Additions without it!</p>"), 1354 QString() /* help keyword */, 1333 1355 0 /* auto-confirm id */, 1334 1356 tr("&Remove", "medium") /* ok button text */, … … 1430 1452 tr("<p>There are unsaved changes in the port forwarding configuration.</p>" 1431 1453 "<p>If you proceed your changes will be discarded.</p>"), 1454 QString() /* help keyword */, 1432 1455 0 /* auto-confirm id */, 1433 1456 QString() /* ok button text */, … … 1537 1560 "<p>This will detach it from the following virtual machine(s): <b>%2</b>.</p>") 1538 1561 .arg(medium.location(), usage.join(", ")), 1562 QString() /* help keyword */, 1539 1563 0 /* auto-confirm id */, 1540 1564 tr("Release", "detach medium")) … … 1545 1569 "<p>This will detach it from the following virtual machine(s): <b>%2</b>.</p>") 1546 1570 .arg(medium.location(), usage.join(", ")), 1571 QString() /* help keyword */, 1547 1572 0 /* auto-confirm id */, 1548 1573 tr("Release", "detach medium")); … … 1596 1621 return questionBinary(pParent, MessageType_Question, 1597 1622 strMessage.arg(medium.location()), 1623 QString() /* help keyword */, 1598 1624 0 /* auto-confirm id */, 1599 1625 tr("Remove", "medium") /* ok button text */, … … 1615 1641 "disk to the list later again.</p>") 1616 1642 .arg(strLocation), 1643 QString() /* help keyword */, 1617 1644 0 /* auto-confirm id */, 1618 1645 tr("Delete", "hard disk storage"), … … 1729 1756 strMessage.arg(medium.isHostDrive() ? medium.name() : medium.location(), CMachine(machine).GetName()), 1730 1757 UIErrorString::formatErrorInfo(machine), 1758 QString() /* help keyword */, 1731 1759 0 /* Auto Confirm ID */, 1732 1760 tr("Force Unmount")); … … 1784 1812 "name or a different adapter attachment type.</p>") 1785 1813 .arg(strName), 1814 QString() /* help keyword */, 1786 1815 0 /* auto-confirm id */, 1787 1816 tr("Remove") /* ok button text */, … … 2154 2183 tr("<p>Do you want to remove the cloud profile <nobr><b>%1</b>?</nobr></p>") 2155 2184 .arg(strName), 2185 QString() /* help keyword */, 2156 2186 0 /* auto-confirm id */, 2157 2187 tr("Remove") /* ok button text */, … … 2165 2195 tr("<p>Do you want to import cloud profiles from external files?</p>" 2166 2196 "<p>VirtualBox cloud profiles will be overwritten and their data will be lost.</p>"), 2197 QString() /* help keyword */, 2167 2198 0 /* auto-confirm id */, 2168 2199 tr("Import") /* ok button text */, … … 2213 2244 "You can choose to <b>Accept</b> or <b>Reject</b> them automatically " 2214 2245 "or cancel to keep the dialog opened.</p>"), 2246 QString() /* help keyword */, 2215 2247 0 /* auto-confirm id */, 2216 2248 AlertButton_Choice1, … … 2226 2258 tr("<p>Do you want to remove the cloud console application <nobr><b>%1</b>?</nobr></p>") 2227 2259 .arg(strName), 2260 QString() /* help keyword */, 2228 2261 0 /* auto-confirm id */, 2229 2262 tr("Remove") /* ok button text */, … … 2237 2270 tr("<p>Do you want to remove the cloud console profile <nobr><b>%1</b>?</nobr></p>") 2238 2271 .arg(strName), 2272 QString() /* help keyword */, 2239 2273 0 /* auto-confirm id */, 2240 2274 tr("Remove") /* ok button text */, … … 2250 2284 "until you add one. In the mean time you will only be able to start the " 2251 2285 "machine using a virtual optical disk or from the network."), 2286 QString() /* help keyword */, 2252 2287 0 /* auto-confirm id */, 2253 2288 tr("Continue", "no hard disk attached"), … … 2484 2519 "how many machines are in the list and doesn't need to be told).", machineNames.size()) 2485 2520 .arg(machineNames.join(", ")), 2521 QString() /* help keyword */, 2486 2522 0 /* auto-confirm id */, 2487 2523 tr("Continue")); … … 2650 2686 "so it is recommended to press <b>OK</b> now.</p>") 2651 2687 .arg(strLogFolder), 2688 QString() /* help keyword */, 2652 2689 0 /* auto-confirm id */, 2653 2690 QIMessageBox::tr("OK"), … … 2682 2719 "Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</p>" 2683 2720 "<p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p>"), 2721 QString() /* help keyword */, 2684 2722 0 /* auto-confirm id */, 2685 2723 tr("Close VM"), tr("Continue")); … … 2688 2726 tr("<p>VT-x/AMD-V hardware acceleration is not available on your system. " 2689 2727 "Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot."), 2728 QString() /* help keyword */, 2690 2729 0 /* auto-confirm id */, 2691 2730 tr("Close VM"), tr("Continue")); … … 2699 2738 "Certain guests (e.g. OS/2 and QNX) require this feature.</p>" 2700 2739 "<p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p>"), 2740 QString() /* help keyword */, 2701 2741 0 /* auto-confirm id */, 2702 2742 tr("Close VM"), tr("Continue")); … … 2705 2745 tr("<p>VT-x/AMD-V hardware acceleration is not available on your system. " 2706 2746 "Certain guests (e.g. OS/2 and QNX) require this feature and will fail to boot without it.</p>"), 2747 QString() /* help keyword */, 2707 2748 0 /* auto-confirm id */, 2708 2749 tr("Close VM"), tr("Continue")); … … 2716 2757 "<p>You can either change the machine's network settings or stop the machine.</p>") 2717 2758 .arg(strMachineName, strIfNames), 2759 QString() /* help keyword */, 2718 2760 0 /* auto-confirm id */, 2719 2761 tr("Change Network Settings"), tr("Close VM")); … … 2750 2792 tr("<p>The host key is currently defined as <b>%1</b>.</p>", "additional message box paragraph") 2751 2793 .arg(UIHostCombo::toReadableString(gEDataManager->hostKeyCombination())), 2794 QString() /* help keyword */, 2752 2795 "confirmInputCapture", 2753 2796 AlertButton_Ok | AlertButtonOption_Default, … … 2770 2813 "You can access it by pressing <b>Host+Home</b>.</p>") 2771 2814 .arg(strHotKey, UIHostCombo::toReadableString(gEDataManager->hostKeyCombination())), 2815 QString() /* help keyword */, 2772 2816 "confirmGoingFullscreen", 2773 2817 tr("Switch")); … … 2783 2827 "You can access it by pressing <b>Host+Home</b>.</p>") 2784 2828 .arg(strHotKey, UIHostCombo::toReadableString(gEDataManager->hostKeyCombination())), 2829 QString() /* help keyword */, 2785 2830 "confirmGoingSeamless", 2786 2831 tr("Switch")); … … 2796 2841 "You can access it by pressing <b>Host+Home</b>.</p>") 2797 2842 .arg(strHotKey, UIHostCombo::toReadableString(gEDataManager->hostKeyCombination())), 2843 QString() /* help keyword */, 2798 2844 "confirmGoingScale", 2799 2845 tr("Switch")); … … 2807 2853 "<p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p>") 2808 2854 .arg(UICommon::formatSize(uMinVRAM)), 2855 QString() /* help keyword */, 2809 2856 0 /* auto-confirm id */, 2810 2857 tr("Ignore")); … … 2828 2875 "<p>Press <b>Ignore</b> to switch the screen anyway or press <b>Cancel</b> to cancel the operation.</p>") 2829 2876 .arg(UICommon::formatSize(uMinVRAM)), 2877 QString() /* help keyword */, 2830 2878 0 /* auto-confirm id */, 2831 2879 tr("Ignore")); … … 2892 2940 tr("<p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p>" 2893 2941 "<p>Do you wish to download this disk image file from the Internet?</p>"), 2942 QString() /* help keyword */, 2894 2943 0 /* auto-confirm id */, 2895 2944 tr("Download")); … … 2902 2951 "from <nobr><a href=\"%1\">%1</a></nobr> (size %2 bytes)?</p>") 2903 2952 .arg(strUrl, QLocale(UICommon::languageId()).toString(uSize)), 2953 QString() /* help keyword */, 2904 2954 0 /* auto-confirm id */, 2905 2955 tr("Download")); … … 2924 2974 "<p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p>") 2925 2975 .arg(strUrl, strSrc), 2976 QString() /* help keyword */, 2926 2977 0 /* auto-confirm id */, 2927 2978 tr("Insert", "additions")); … … 2953 3004 "<p>Do you wish to download this file from the Internet?</p>") 2954 3005 .arg(strMissedLocation), 3006 QString() /* help keyword */, 2955 3007 0 /* auto-confirm id */, 2956 3008 tr("Download")); … … 2963 3015 "from <nobr><a href=\"%1\">%1</a></nobr> (size %2 bytes)?</p>") 2964 3016 .arg(strURL, QLocale(UICommon::languageId()).toString(uSize)), 3017 QString() /* help keyword */, 2965 3018 0 /* auto-confirm id */, 2966 3019 tr("Download")); … … 2992 3045 "<p>Do you wish to download latest one from the Internet?</p>") 2993 3046 .arg(strExtPackVersion).arg(strExtPackName), 3047 QString() /* help keyword */, 2994 3048 0 /* auto-confirm id */, 2995 3049 tr("Download")); … … 3002 3056 "from <nobr><a href=\"%2\">%2</a></nobr> (size %3 bytes)?</p>") 3003 3057 .arg(strExtPackName, strURL, QLocale(UICommon::languageId()).toString(uSize)), 3058 QString() /* help keyword */, 3004 3059 0 /* auto-confirm id */, 3005 3060 tr("Download")); … … 3024 3079 "<p>Do you wish to install this extension pack?</p>") 3025 3080 .arg(strExtPackName, strFrom, strTo), 3081 QString() /* help keyword */, 3026 3082 0 /* auto-confirm id */, 3027 3083 tr("Install", "extension pack")); … … 3044 3100 tr("Do you want to delete the downloaded file <nobr><b>%1</b></nobr>?") 3045 3101 .arg(strTo), 3102 QString() /* help keyword */, 3046 3103 0 /* auto-confirm id */, 3047 3104 tr("Delete", "extension pack")); … … 3053 3110 tr("Do you want to delete following list of files <nobr><b>%1</b></nobr>?") 3054 3111 .arg(strFiles.join(",")), 3112 QString() /* help keyword */, 3055 3113 0 /* auto-confirm id */, 3056 3114 tr("Delete", "extension pack")); … … 3072 3130 "</table></p>") 3073 3131 .arg(strPackName).arg(strPackVersion).arg(strPackDescription), 3132 QString() /* help keyword */, 3074 3133 0 /* auto-confirm id */, 3075 3134 tr("Install", "extension pack")); … … 3104 3163 "</table></p>") 3105 3164 .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), 3165 QString() /* help keyword */, 3106 3166 0 /* auto-confirm id */, 3107 3167 tr("&Upgrade")); … … 3117 3177 "</table></p>") 3118 3178 .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), 3179 QString() /* help keyword */, 3119 3180 0 /* auto-confirm id */, 3120 3181 tr("&Downgrade")); … … 3129 3190 "</table></p>") 3130 3191 .arg(strBelehrung).arg(strPackName).arg(strPackVersionOld).arg(strPackDescription), 3192 QString() /* help keyword */, 3131 3193 0 /* auto-confirm id */, 3132 3194 tr("&Reinstall")); … … 3140 3202 "<p>Are you sure you want to proceed?</p>") 3141 3203 .arg(strPackName), 3204 QString() /* help keyword */, 3142 3205 0 /* auto-confirm id */, 3143 3206 tr("&Remove") /* ok button text */, … … 3272 3335 "Replacing it will overwrite its contents.") 3273 3336 .arg(strPath), 3337 QString() /* help keyword */, 3274 3338 0 /* auto-confirm id */, 3275 3339 QString() /* ok button text */, … … 3289 3353 "Replacing them will overwrite their contents.") 3290 3354 .arg(QStringList(strPaths.toList()).join("<br />")), 3355 QString() /* help keyword */, 3291 3356 0 /* auto-confirm id */, 3292 3357 QString() /* ok button text */, … … 3434 3499 3435 3500 void UIMessageCenter::sltShowMessageBox(QWidget *pParent, MessageType enmType, 3436 const QString &strMessage, const QString &strDetails, 3501 const QString &strMessage, const QString &strDetails, const QString &strHelpKeyword, 3437 3502 int iButton1, int iButton2, int iButton3, 3438 3503 const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3, … … 3441 3506 /* Now we can show a message-box directly: */ 3442 3507 showMessageBox(pParent, enmType, 3443 strMessage, strDetails, 3508 strMessage, strDetails, strHelpKeyword, 3444 3509 iButton1, iButton2, iButton3, 3445 3510 strButtonText1, strButtonText2, strButtonText3, … … 3503 3568 3504 3569 int UIMessageCenter::showMessageBox(QWidget *pParent, MessageType enmType, 3505 const QString &strMessage, const QString &strDetails, 3570 const QString &strMessage, const QString &strDetails, const QString &strHelpKeyword, 3506 3571 int iButton1, int iButton2, int iButton3, 3507 3572 const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3, … … 3569 3634 /* Create message-box: */ 3570 3635 QWidget *pMessageBoxParent = windowManager().realParentWindow(pParent ? pParent : windowManager().mainWindowShown()); 3571 QPointer<QIMessageBox> pMessageBox = new QIMessageBox(title, strMessage, icon,3636 QPointer<QIMessageBox> pMessageBox = new QIMessageBox(title, strMessage, strHelpKeyword, icon, 3572 3637 iButton1, iButton2, iButton3, 3573 3638 pMessageBoxParent); -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h
r89928 r89933 68 68 * @param strMessage Brings the message. 69 69 * @param strDetails Brings the details. 70 * @param strHelpKeyword Brings the help keyword. 70 71 * @param iButton1 Brings the button 1 type. 71 72 * @param iButton2 Brings the button 2 type. … … 76 77 * @param strAutoConfirmId Brings whether this message can be auto-confirmed. */ 77 78 void sigToShowMessageBox(QWidget *pParent, MessageType enmType, 78 const QString &strMessage, const QString &strDetails, 79 const QString &strMessage, const QString &strDetails, const QString &strHelpKeyword, 79 80 int iButton1, int iButton2, int iButton3, 80 81 const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3, … … 98 99 * @param strMessage Brings the message. 99 100 * @param strDetails Brings the details. 101 * @param strHelpKeyword Brings the help keyword 100 102 * @param pcszAutoConfirmId Brings the auto-confirm ID. 101 103 * @param iButton1 Brings the button 1 type. … … 106 108 * @param strButtonText3 Brings the button 3 text. */ 107 109 int message(QWidget *pParent, MessageType enmType, 108 const QString &strMessage, const QString &strDetails, 110 const QString &strMessage, const QString &strDetails, const QString &strHelpKeyword, 109 111 const char *pcszAutoConfirmId = 0, 110 112 int iButton1 = 0, int iButton2 = 0, int iButton3 = 0, … … 119 121 * @param strMessage Brings the message. 120 122 * @param strDetails Brings the details. 123 * @param strHelpKeyword Brings the help keyword 121 124 * @param pcszAutoConfirmId Brings the auto-confirm ID. */ 122 125 void error(QWidget *pParent, MessageType enmType, 123 126 const QString &strMessage, 124 127 const QString &strDetails, 128 const QString &strHelpKeyword = QString(), 125 129 const char *pcszAutoConfirmId = 0) const; 126 130 … … 131 135 * @param strMessage Brings the message. 132 136 * @param strDetails Brings the details. 137 * @param strHelpKeyword Brings the help keyword 133 138 * @param pcszAutoConfirmId Brings the auto-confirm ID. 134 139 * @param strOkButtonText Brings the Ok button text. … … 137 142 const QString &strMessage, 138 143 const QString &strDetails, 144 const QString &strHelpKeyword, 139 145 const char *pcszAutoConfirmId = 0, 140 146 const QString &strOkButtonText = QString(), … … 156 162 * @param enmType Brings the message-box type. 157 163 * @param strMessage Brings the message. 164 * @param strHelpKeyword Brings the help keyword. 158 165 * @param pcszAutoConfirmId Brings the auto-confirm ID. 159 166 * @param iButton1 Brings the button 1 type. … … 165 172 int question(QWidget *pParent, MessageType enmType, 166 173 const QString &strMessage, 174 const QString &strHelpKeyword, 167 175 const char *pcszAutoConfirmId = 0, 168 176 int iButton1 = 0, int iButton2 = 0, int iButton3 = 0, … … 176 184 * @param enmType Brings the message-box type. 177 185 * @param strMessage Brings the message. 186 * @param strHelpKeyword Brings the help keyword. 178 187 * @param pcszAutoConfirmId Brings the auto-confirm ID. 179 188 * @param strOkButtonText Brings the button 1 text. … … 182 191 bool questionBinary(QWidget *pParent, MessageType enmType, 183 192 const QString &strMessage, 193 const QString &strHelpKeyword = QString(), 184 194 const char *pcszAutoConfirmId = 0, 185 195 const QString &strOkButtonText = QString(), … … 192 202 * @param enmType Brings the message-box type. 193 203 * @param strMessage Brings the message. 204 * @param strHelpKeyword Brings the help keyword. 194 205 * @param pcszAutoConfirmId Brings the auto-confirm ID. 195 206 * @param strChoice1ButtonText Brings the button 1 text. … … 198 209 int questionTrinary(QWidget *pParent, MessageType enmType, 199 210 const QString &strMessage, 211 const QString &strHelpKeyword = QString(), 200 212 const char *pcszAutoConfirmId = 0, 201 213 const QString &strChoice1ButtonText = QString(), … … 208 220 * @param strMessage Brings the message. 209 221 * @param strOptionText Brings the option text. 222 * @param strHelpKeyword Brings the help keyword which is used in context sensitive help. 210 223 * @param fDefaultOptionValue Brings the default option value. 211 224 * @param iButton1 Brings the button 1 type. … … 218 231 const QString &strMessage, 219 232 const QString &strOptionText, 233 const QString &strHelpKeyword, 220 234 bool fDefaultOptionValue = true, 221 235 int iButton1 = 0, int iButton2 = 0, int iButton3 = 0, … … 587 601 * @param enmType Brings the message-box type. 588 602 * @param strMessage Brings the message. 603 * @param strMessage Brings the help keyword. 589 604 * @param strDetails Brings the details. 590 605 * @param iButton1 Brings the button 1 type. … … 596 611 * @param strAutoConfirmId Brings whether this message can be auto-confirmed. */ 597 612 void sltShowMessageBox(QWidget *pParent, MessageType enmType, 598 const QString &strMessage, const QString &strDetails, 613 const QString &strMessage, const QString &strDetails, const QString &strHelpKeyword, 599 614 int iButton1, int iButton2, int iButton3, 600 615 const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3, … … 618 633 * @param strMessage Brings the message. 619 634 * @param strDetails Brings the details. 635 * @param strHelpKeyword Brings the help keyword 620 636 * @param iButton1 Brings the button 1 type. 621 637 * @param iButton2 Brings the button 2 type. … … 626 642 * @param strAutoConfirmId Brings whether this message can be auto-confirmed. */ 627 643 int showMessageBox(QWidget *pParent, MessageType type, 628 const QString &strMessage, const QString &strDetails, 644 const QString &strMessage, const QString &strDetails, const QString &strHelpKeyword, 629 645 int iButton1, int iButton2, int iButton3, 630 646 const QString &strButtonText1, const QString &strButtonText2, const QString &strButtonText3, -
trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp
r89568 r89933 2715 2715 if (!msgCenter().questionBinary(this, MessageType_Question, 2716 2716 QString(UISoftKeyboard::tr("This will delete the keyboard layout file as well. Proceed?")), 2717 QString() /* help keyword */, 2717 2718 0 /* auto-confirm id */, 2718 2719 QString("Delete") /* ok button text */,
Note:
See TracChangeset
for help on using the changeset viewer.
