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