Changeset 103552 in vbox
- Timestamp:
- Feb 23, 2024 4:31:29 PM (7 months ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src
- Files:
-
- 8 edited
-
globals/UIActionPool.cpp (modified) (44 diffs)
-
globals/UIActionPool.h (modified) (9 diffs)
-
globals/UIActionPoolManager.cpp (modified) (49 diffs)
-
globals/UIActionPoolRuntime.cpp (modified) (18 diffs)
-
manager/UIVirtualBoxManager.cpp (modified) (1 diff)
-
runtime/UIMachine.cpp (modified) (1 diff)
-
settings/editors/UIShortcutConfigurationEditor.cpp (modified) (8 diffs)
-
settings/machine/UIMachineSettingsInterface.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
r103541 r103552 174 174 { 175 175 /* Only for manager's action-pool: */ 176 if (m_enmActionPoolType == UI ActionPoolType_Manager)176 if (m_enmActionPoolType == UIType_ManagerUI) 177 177 { 178 178 /* If primary shortcut should be visible: */ … … 207 207 { 208 208 /* Unchanged name for Manager UI: */ 209 case UI ActionPoolType_Manager: return name();209 case UIType_ManagerUI: return name(); 210 210 /* Filtered name for Runtime UI: */ 211 case UI ActionPoolType_Runtime: return UITranslator::removeAccelMark(name());211 case UIType_RuntimeUI: return UITranslator::removeAccelMark(name()); 212 212 } 213 213 /* Nothing by default: */ … … 237 237 { 238 238 /* The same as menu name for Manager UI: */ 239 case UI ActionPoolType_Manager:239 case UIType_ManagerUI: 240 240 { 241 241 setText(nameInMenu()); … … 243 243 } 244 244 /* With shortcut appended for Runtime UI: */ 245 case UI ActionPoolType_Runtime:245 case UIType_RuntimeUI: 246 246 { 247 247 if (m_fMachineMenuAction) … … 519 519 520 520 /** Returns default shortcut. */ 521 virtual QKeySequence defaultShortcut(UI ActionPoolType actionPoolType) const RT_OVERRIDE522 { 523 switch ( actionPoolType)521 virtual QKeySequence defaultShortcut(UIType enmActionPoolType) const RT_OVERRIDE 522 { 523 switch (enmActionPoolType) 524 524 { 525 case UI ActionPoolType_Manager: break;526 case UI ActionPoolType_Runtime: return QKeySequence("Q");525 case UIType_ManagerUI: break; 526 case UIType_RuntimeUI: return QKeySequence("Q"); 527 527 } 528 528 return QKeySequence(); … … 698 698 699 699 /** Returns default shortcut. */ 700 virtual QKeySequence defaultShortcut(UI ActionPoolType actionPoolType) const RT_OVERRIDE701 { 702 switch ( actionPoolType)700 virtual QKeySequence defaultShortcut(UIType enmActionPoolType) const RT_OVERRIDE 701 { 702 switch (enmActionPoolType) 703 703 { 704 case UI ActionPoolType_Manager: return QKeySequence(QKeySequence::HelpContents);705 case UI ActionPoolType_Runtime: break;704 case UIType_ManagerUI: return QKeySequence(QKeySequence::HelpContents); 705 case UIType_RuntimeUI: break; 706 706 } 707 707 return QKeySequence(); … … 1144 1144 1145 1145 /** Returns default shortcut. */ 1146 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1147 { 1148 switch ( actionPool()->type())1146 virtual QKeySequence defaultShortcut(UIType enmActionPoolType) const RT_OVERRIDE 1147 { 1148 switch (enmActionPoolType) 1149 1149 { 1150 case UI ActionPoolType_Manager: return QKeySequence("Ctrl+G");1151 case UI ActionPoolType_Runtime: break;1150 case UIType_ManagerUI: return QKeySequence("Ctrl+G"); 1151 case UIType_RuntimeUI: break; 1152 1152 } 1153 1153 return QKeySequence(); … … 1216 1216 1217 1217 /** Returns default shortcut. */ 1218 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1218 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1219 1219 { 1220 1220 return QKeySequence("Ctrl+Shift+F"); … … 1257 1257 1258 1258 /** Returns default shortcut. */ 1259 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1259 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1260 1260 { 1261 1261 return QKeySequence("Ctrl+Shift+T"); … … 1298 1298 1299 1299 /** Returns default shortcut. */ 1300 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1300 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1301 1301 { 1302 1302 return QKeySequence("Ctrl+Shift+D"); … … 1339 1339 1340 1340 /** Returns default shortcut. */ 1341 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1341 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1342 1342 { 1343 1343 return QKeySequence("Ctrl+Shift+P"); … … 1380 1380 1381 1381 /** Returns default shortcut. */ 1382 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1382 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1383 1383 { 1384 1384 return QKeySequence("Ctrl+Shift+R"); … … 1386 1386 1387 1387 /** Returns standard shortcut. */ 1388 virtual QKeySequence standardShortcut(UI ActionPoolType) const RT_OVERRIDE1388 virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE 1389 1389 { 1390 1390 return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Refresh); … … 1427 1427 1428 1428 /** Returns default shortcut. */ 1429 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1429 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1430 1430 { 1431 1431 return QKeySequence(); … … 1433 1433 1434 1434 /** Returns standard shortcut. */ 1435 virtual QKeySequence standardShortcut(UI ActionPoolType) const RT_OVERRIDE1435 virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE 1436 1436 { 1437 1437 return QKeySequence(); … … 1474 1474 1475 1475 /** Returns default shortcut. */ 1476 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1476 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1477 1477 { 1478 1478 return QKeySequence("Ctrl+Shift+S"); … … 1591 1591 1592 1592 /** Returns default shortcut. */ 1593 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1593 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1594 1594 { 1595 1595 return QKeySequence(); … … 1629 1629 1630 1630 /** Returns default shortcut. */ 1631 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1631 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1632 1632 { 1633 1633 return QKeySequence(); … … 1670 1670 1671 1671 /** Returns default shortcut. */ 1672 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1672 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1673 1673 { 1674 1674 return QKeySequence(); … … 1711 1711 1712 1712 /** Returns default shortcut. */ 1713 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1713 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1714 1714 { 1715 1715 return QKeySequence(); … … 1752 1752 1753 1753 /** Returns default shortcut. */ 1754 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1754 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1755 1755 { 1756 1756 return QKeySequence(); … … 1793 1793 1794 1794 /** Returns default shortcut. */ 1795 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1795 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1796 1796 { 1797 1797 return QKeySequence(); … … 1832 1832 1833 1833 /** Returns default shortcut. */ 1834 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1834 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1835 1835 { 1836 1836 return QKeySequence(); … … 1871 1871 1872 1872 /** Returns default shortcut. */ 1873 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1873 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1874 1874 { 1875 1875 return QKeySequence(); … … 1910 1910 1911 1911 /** Returns default shortcut. */ 1912 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1912 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1913 1913 { 1914 1914 return QKeySequence(); … … 1949 1949 1950 1950 /** Returns default shortcut. */ 1951 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1951 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1952 1952 { 1953 1953 return QKeySequence(); … … 1988 1988 1989 1989 /** Returns default shortcut. */ 1990 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1990 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1991 1991 { 1992 1992 return QKeySequence(); … … 2027 2027 2028 2028 /** Returns default shortcut. */ 2029 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2029 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2030 2030 { 2031 2031 return QKeySequence(); … … 2065 2065 2066 2066 /** Returns default shortcut. */ 2067 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2067 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2068 2068 { 2069 2069 return QKeySequence(); … … 2103 2103 2104 2104 /** Returns default shortcut. */ 2105 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2105 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2106 2106 { 2107 2107 return QKeySequence(); … … 2141 2141 2142 2142 /** Returns default shortcut. */ 2143 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2143 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2144 2144 { 2145 2145 return QKeySequence(); … … 2179 2179 2180 2180 /** Returns default shortcut. */ 2181 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2181 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2182 2182 { 2183 2183 return QKeySequence(); … … 2217 2217 2218 2218 /** Returns default shortcut. */ 2219 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2219 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2220 2220 { 2221 2221 return QKeySequence(); … … 2255 2255 2256 2256 /** Returns default shortcut. */ 2257 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2257 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2258 2258 { 2259 2259 return QKeySequence(); … … 2293 2293 2294 2294 /** Returns default shortcut. */ 2295 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2295 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2296 2296 { 2297 2297 return QKeySequence(); … … 2331 2331 2332 2332 /** Returns default shortcut. */ 2333 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2333 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2334 2334 { 2335 2335 return QKeySequence(); … … 2401 2401 2402 2402 /** Returns default shortcut. */ 2403 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2403 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2404 2404 { 2405 2405 return QKeySequence(); … … 2776 2776 2777 2777 /** Returns default shortcut. */ 2778 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2778 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2779 2779 { 2780 2780 return QKeySequence(); … … 2815 2815 2816 2816 /** Returns default shortcut. */ 2817 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2817 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2818 2818 { 2819 2819 return QKeySequence(); … … 2854 2854 2855 2855 /** Returns default shortcut. */ 2856 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2856 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2857 2857 { 2858 2858 return QKeySequence(); … … 2893 2893 2894 2894 /** Returns default shortcut. */ 2895 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2895 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2896 2896 { 2897 2897 return QKeySequence(); … … 3277 3277 3278 3278 /* static */ 3279 UIActionPool *UIActionPool::create(UI ActionPoolType enmType)3279 UIActionPool *UIActionPool::create(UIType enmType) 3280 3280 { 3281 3281 UIActionPool *pActionPool = 0; 3282 3282 switch (enmType) 3283 3283 { 3284 case UI ActionPoolType_Manager: pActionPool = new UIActionPoolManager; break;3285 case UI ActionPoolType_Runtime: pActionPool = new UIActionPoolRuntime; break;3284 case UIType_ManagerUI: pActionPool = new UIActionPoolManager; break; 3285 case UIType_RuntimeUI: pActionPool = new UIActionPoolRuntime; break; 3286 3286 default: AssertFailedReturn(0); 3287 3287 } … … 3300 3300 3301 3301 /* static */ 3302 void UIActionPool::createTemporary(UI ActionPoolType enmType)3302 void UIActionPool::createTemporary(UIType enmType) 3303 3303 { 3304 3304 UIActionPool *pActionPool = 0; 3305 3305 switch (enmType) 3306 3306 { 3307 case UI ActionPoolType_Manager: pActionPool = new UIActionPoolManager(true); break;3308 case UI ActionPoolType_Runtime: pActionPool = new UIActionPoolRuntime(true); break;3307 case UIType_ManagerUI: pActionPool = new UIActionPoolManager(true); break; 3308 case UIType_RuntimeUI: pActionPool = new UIActionPoolRuntime(true); break; 3309 3309 default: AssertFailedReturnVoid(); 3310 3310 } … … 3465 3465 #endif /* VBOX_WS_MAC */ 3466 3466 3467 UIActionPool::UIActionPool(UI ActionPoolType enmType, bool fTemporary /* = false */)3467 UIActionPool::UIActionPool(UIType enmType, bool fTemporary /* = false */) 3468 3468 : m_enmType(enmType) 3469 3469 , m_fTemporary(fTemporary) -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
r103058 r103552 39 39 /* GUI includes: */ 40 40 #include "QIWithRetranslateUI.h" 41 #include "UIDefs.h" 41 42 #include "UIExtraDataDefs.h" 42 43 #include "UILibraryDefs.h" … … 49 50 class UIActionPoolManager; 50 51 51 52 /** Action-pool types. */53 enum UIActionPoolType54 {55 UIActionPoolType_Manager,56 UIActionPoolType_Runtime57 };58 52 59 53 /** Action types. */ … … 300 294 virtual QString shortcutExtraDataID() const { return QString(); } 301 295 /** Returns default keyboard shortcut for this action. */ 302 virtual QKeySequence defaultShortcut(UI ActionPoolType) const { return QKeySequence(); }296 virtual QKeySequence defaultShortcut(UIType) const { return QKeySequence(); } 303 297 /** Returns standard keyboard shortcut for this action. */ 304 virtual QKeySequence standardShortcut(UI ActionPoolType) const { return QKeySequence(); }298 virtual QKeySequence standardShortcut(UIType) const { return QKeySequence(); } 305 299 306 300 /** Retranslates action. */ … … 325 319 326 320 /** Holds the reference to the action-pool this action belongs to. */ 327 UIActionPool *m_pActionPool;321 UIActionPool *m_pActionPool; 328 322 /** Holds the type of the action-pool this action belongs to. */ 329 const UI ActionPoolType m_enmActionPoolType;323 const UIType m_enmActionPoolType; 330 324 331 325 /** Holds the action type. */ … … 516 510 517 511 /** Creates singleton instance. */ 518 static UIActionPool *create(UI ActionPoolType enmType);512 static UIActionPool *create(UIType enmType); 519 513 /** Destroys singleton instance. */ 520 514 static void destroy(UIActionPool *pActionPool); … … 522 516 /** Creates temporary singleton instance, 523 517 * used to initialize shortcuts-pool from action-pool of passed @a enmType. */ 524 static void createTemporary(UI ActionPoolType enmType);518 static void createTemporary(UIType enmType); 525 519 526 520 /** Cast action-pool to Manager one. */ … … 530 524 531 525 /** Returns action-pool type. */ 532 UI ActionPoolType type() const { return m_enmType; }526 UIType type() const { return m_enmType; } 533 527 /** Returns whether this action-pool is temporary. */ 534 528 bool isTemporary() const { return m_fTemporary; } … … 594 588 595 589 /** Constructs probably @a fTemporary action-pool of passed @a enmType. */ 596 UIActionPool(UI ActionPoolType enmType, bool fTemporary = false);590 UIActionPool(UIType enmType, bool fTemporary = false); 597 591 598 592 /** Prepares pool. */ … … 680 674 681 675 /** Holds the action-pool type. */ 682 const UI ActionPoolType m_enmType;676 const UIType m_enmType; 683 677 /** Holds whether this action-pool is temporary. */ 684 const bool m_fTemporary;678 const bool m_fTemporary; 685 679 }; 686 680 -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp
r102575 r103552 98 98 99 99 /** Returns default shortcut. */ 100 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE100 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 101 101 { 102 102 return QKeySequence("Ctrl+I"); … … 136 136 137 137 /** Returns default shortcut. */ 138 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE138 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 139 139 { 140 140 return QKeySequence("Ctrl+E"); … … 237 237 238 238 /** Returns default shortcut. */ 239 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE239 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 240 240 { 241 241 return QKeySequence("Ctrl+T"); … … 276 276 277 277 /** Returns default shortcut. */ 278 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE278 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 279 279 { 280 280 return QKeySequence("Ctrl+D"); … … 315 315 316 316 /** Returns default shortcut. */ 317 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE317 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 318 318 { 319 319 return QKeySequence("Ctrl+H"); … … 354 354 355 355 /** Returns default shortcut. */ 356 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE356 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 357 357 { 358 358 return QKeySequence("Ctrl+P"); … … 422 422 423 423 /** Returns default shortcut. */ 424 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE424 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 425 425 { 426 426 return QKeySequence("Ctrl+X"); … … 459 459 460 460 /** Returns default shortcut. */ 461 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE461 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 462 462 { 463 463 return QKeySequence("Ctrl+Q"); … … 517 517 518 518 /** Returns default shortcut. */ 519 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE519 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 520 520 { 521 521 return QKeySequence("Ctrl+N"); … … 556 556 557 557 /** Returns default shortcut. */ 558 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE558 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 559 559 { 560 560 return QKeySequence("Ctrl+A"); … … 701 701 702 702 /** Returns default shortcut. */ 703 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE703 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 704 704 { 705 705 return QKeySequence("Ctrl+N"); … … 738 738 739 739 /** Returns default shortcut. */ 740 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE740 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 741 741 { 742 742 return QKeySequence("Ctrl+A"); … … 803 803 804 804 /** Returns default shortcut. */ 805 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE805 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 806 806 { 807 807 return QKeySequence("Ctrl+S"); … … 838 838 839 839 /** Returns default shortcut. */ 840 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE840 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 841 841 { 842 842 return QKeySequence("Ctrl+O"); … … 1397 1397 1398 1398 /** Returns default shortcut. */ 1399 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1399 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1400 1400 { 1401 1401 return QKeySequence("Ctrl+F"); … … 1870 1870 1871 1871 /** Returns default shortcut. */ 1872 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1872 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1873 1873 { 1874 1874 return QKeySequence("Ctrl+L"); … … 2002 2002 2003 2003 /** Returns default shortcut. */ 2004 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2004 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2005 2005 { 2006 2006 return QKeySequence("Ctrl+Shift+T"); … … 2043 2043 2044 2044 /** Returns default shortcut. */ 2045 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2045 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2046 2046 { 2047 2047 return QKeySequence("Ctrl+Shift+D"); … … 2084 2084 2085 2085 /** Returns default shortcut. */ 2086 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2086 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2087 2087 { 2088 2088 return QKeySequence("Ctrl+Shift+R"); … … 2126 2126 2127 2127 /** Returns default shortcut. */ 2128 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2128 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2129 2129 { 2130 2130 return QKeySequence("Ctrl+Shift+P"); … … 2167 2167 2168 2168 /** Returns default shortcut. */ 2169 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2169 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2170 2170 { 2171 2171 return QKeySequence("Ctrl+Shift+C"); … … 2236 2236 2237 2237 /** Returns default shortcut. */ 2238 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2238 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2239 2239 { 2240 2240 return QKeySequence("Ctrl+Shift+I"); … … 2277 2277 2278 2278 /** Returns default shortcut. */ 2279 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2279 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2280 2280 { 2281 2281 return QKeySequence("Ctrl+Shift+U"); … … 2350 2350 2351 2351 /** Returns default shortcut. */ 2352 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2352 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2353 2353 { 2354 2354 return QKeySequence("Ctrl+Shift+A"); … … 2395 2395 2396 2396 /** Returns default shortcut. */ 2397 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2397 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2398 2398 { 2399 2399 return QKeySequence(""); … … 2440 2440 2441 2441 /** Returns default shortcut. */ 2442 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2442 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2443 2443 { 2444 2444 return QKeySequence("Ctrl+Shift+C"); … … 2485 2485 2486 2486 /** Returns default shortcut. */ 2487 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2487 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2488 2488 { 2489 2489 return QKeySequence("Ctrl+Shift+M"); … … 2530 2530 2531 2531 /** Returns default shortcut. */ 2532 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2532 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2533 2533 { 2534 2534 return QKeySequence("Ctrl+Shift+R"); … … 2575 2575 2576 2576 /** Returns default shortcut. */ 2577 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2577 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2578 2578 { 2579 2579 return QKeySequence("Ctrl+Shift+L"); … … 2621 2621 2622 2622 /** Returns default shortcut. */ 2623 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2623 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2624 2624 { 2625 2625 return QKeySequence("Ctrl+Shift+P"); … … 2667 2667 2668 2668 /** Returns standard shortcut. */ 2669 virtual QKeySequence standardShortcut(UI ActionPoolType) const RT_OVERRIDE2669 virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE 2670 2670 { 2671 2671 return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Find); … … 2708 2708 2709 2709 /** Returns default shortcut. */ 2710 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2710 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2711 2711 { 2712 2712 return QKeySequence("Ctrl+Shift+F"); … … 2714 2714 2715 2715 /** Returns standard shortcut. */ 2716 virtual QKeySequence standardShortcut(UI ActionPoolType) const RT_OVERRIDE2716 virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE 2717 2717 { 2718 2718 return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Refresh); … … 2757 2757 2758 2758 /** Returns default shortcut. */ 2759 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2759 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2760 2760 { 2761 2761 return QKeySequence(); … … 2825 2825 2826 2826 /** Returns default shortcut. */ 2827 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2827 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2828 2828 { 2829 2829 return QKeySequence("Ctrl+Shift+C"); … … 2866 2866 2867 2867 /** Returns default shortcut. */ 2868 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2868 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2869 2869 { 2870 2870 return QKeySequence("Ctrl+Shift+R"); … … 2908 2908 2909 2909 /** Returns default shortcut. */ 2910 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2910 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2911 2911 { 2912 2912 return QKeySequence("Ctrl+Shift+P"); … … 2949 2949 2950 2950 /** Returns default shortcut. */ 2951 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE2951 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 2952 2952 { 2953 2953 return QKeySequence("Ctrl+Shift+F"); … … 2955 2955 2956 2956 /** Returns standard shortcut. */ 2957 virtual QKeySequence standardShortcut(UI ActionPoolType) const RT_OVERRIDE2957 virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE 2958 2958 { 2959 2959 return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Refresh); … … 3024 3024 3025 3025 /** Returns default shortcut. */ 3026 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE3026 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 3027 3027 { 3028 3028 return QKeySequence("Ctrl+Shift+A"); … … 3066 3066 3067 3067 /** Returns default shortcut. */ 3068 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE3068 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 3069 3069 { 3070 3070 return QKeySequence("Ctrl+Shift+I"); … … 3108 3108 3109 3109 /** Returns default shortcut. */ 3110 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE3110 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 3111 3111 { 3112 3112 return QKeySequence("Ctrl+Shift+R"); … … 3151 3151 3152 3152 /** Returns default shortcut. */ 3153 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE3153 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 3154 3154 { 3155 3155 return QKeySequence("Ctrl+Shift+P"); … … 3193 3193 3194 3194 /** Returns default shortcut. */ 3195 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE3195 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 3196 3196 { 3197 3197 return QKeySequence("Ctrl+Shift+T"); … … 3235 3235 3236 3236 /** Returns default shortcut. */ 3237 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE3237 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 3238 3238 { 3239 3239 return QKeySequence("Ctrl+Shift+H"); … … 3241 3241 3242 3242 /** Returns standard shortcut. */ 3243 virtual QKeySequence standardShortcut(UI ActionPoolType) const RT_OVERRIDE3243 virtual QKeySequence standardShortcut(UIType) const RT_OVERRIDE 3244 3244 { 3245 3245 return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::HelpContents); … … 3452 3452 3453 3453 /** Returns default shortcut. */ 3454 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE3454 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 3455 3455 { 3456 3456 return QKeySequence("Ctrl+Shift+P"); … … 3573 3573 3574 3574 UIActionPoolManager::UIActionPoolManager(bool fTemporary /* = false */) 3575 : UIActionPool(UI ActionPoolType_Manager, fTemporary)3575 : UIActionPool(UIType_ManagerUI, fTemporary) 3576 3576 { 3577 3577 } … … 4011 4011 /* Create temporary Runtime UI pool to do the same: */ 4012 4012 if (!isTemporary()) 4013 UIActionPool::createTemporary(UI ActionPoolType_Runtime);4013 UIActionPool::createTemporary(UIType_RuntimeUI); 4014 4014 } 4015 4015 -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp
r100634 r103552 124 124 125 125 /** Returns default shortcut. */ 126 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE126 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 127 127 { 128 128 return QKeySequence("S"); … … 174 174 175 175 /** Returns default shortcut. */ 176 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE176 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 177 177 { 178 178 return QKeySequence("T"); … … 224 224 225 225 /** Returns default shortcut. */ 226 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE226 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 227 227 { 228 228 return QKeySequence("N"); … … 274 274 275 275 /** Returns default shortcut. */ 276 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE276 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 277 277 { 278 278 return QKeySequence(); … … 327 327 328 328 /** Returns default shortcut. */ 329 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE329 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 330 330 { 331 331 return QKeySequence("P"); … … 377 377 378 378 /** Returns default shortcut. */ 379 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE379 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 380 380 { 381 381 return QKeySequence("R"); … … 515 515 516 516 /** Returns default shortcut. */ 517 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE517 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 518 518 { 519 519 #ifdef VBOX_WS_MAC … … 731 731 732 732 /** Returns default shortcut. */ 733 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE733 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 734 734 { 735 735 return QKeySequence("F"); … … 784 784 785 785 /** Returns default shortcut. */ 786 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE786 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 787 787 { 788 788 return QKeySequence("L"); … … 837 837 838 838 /** Returns default shortcut. */ 839 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE839 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 840 840 { 841 841 return QKeySequence("C"); … … 888 888 889 889 /** Returns default shortcut. */ 890 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE890 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 891 891 { 892 892 return QKeySequence("M"); … … 939 939 940 940 /** Returns default shortcut. */ 941 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE941 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 942 942 { 943 943 return QKeySequence("A"); … … 1036 1036 1037 1037 /** Returns default shortcut. */ 1038 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1038 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1039 1039 { 1040 1040 return QKeySequence("E"); … … 1681 1681 1682 1682 /** Returns default shortcut. */ 1683 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1683 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1684 1684 { 1685 1685 return QKeySequence("Del"); … … 1732 1732 1733 1733 /** Returns default shortcut. */ 1734 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1734 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1735 1735 { 1736 1736 return QKeySequence("Backspace"); … … 1959 1959 1960 1960 /** Returns default shortcut. */ 1961 virtual QKeySequence defaultShortcut(UI ActionPoolType) const RT_OVERRIDE1961 virtual QKeySequence defaultShortcut(UIType) const RT_OVERRIDE 1962 1962 { 1963 1963 #ifdef VBOX_WS_MAC … … 3175 3175 3176 3176 UIActionPoolRuntime::UIActionPoolRuntime(bool fTemporary /* = false */) 3177 : UIActionPool(UI ActionPoolType_Runtime, fTemporary)3177 : UIActionPool(UIType_RuntimeUI, fTemporary) 3178 3178 , m_cHostScreens(0) 3179 3179 , m_cGuestScreens(0) … … 3601 3601 /* Create temporary Manager UI pool to do the same: */ 3602 3602 if (!isTemporary()) 3603 UIActionPool::createTemporary(UI ActionPoolType_Manager);3603 UIActionPool::createTemporary(UIType_ManagerUI); 3604 3604 } 3605 3605 -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
r103549 r103552 2444 2444 2445 2445 /* Create action-pool: */ 2446 m_pActionPool = UIActionPool::create(UI ActionPoolType_Manager);2446 m_pActionPool = UIActionPool::create(UIType_ManagerUI); 2447 2447 2448 2448 /* Prepare menu update-handlers: */ -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp
r103538 r103552 1598 1598 { 1599 1599 /* Create action-pool: */ 1600 m_pActionPool = UIActionPool::create(UI ActionPoolType_Runtime);1600 m_pActionPool = UIActionPool::create(UIType_RuntimeUI); 1601 1601 if (actionPool()) 1602 1602 { -
trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.cpp
r103551 r103552 243 243 /** Constructs model passing @a pParent to the base-class. 244 244 * @param enmType Brings the action-pool type this model is related to. */ 245 UIShortcutConfigurationModel(QObject *pParent, UI ActionPoolType enmType);245 UIShortcutConfigurationModel(QObject *pParent, UIType enmType); 246 246 247 247 /** Defines the parent @a pTable reference. */ … … 291 291 292 292 /** Holds the action-pool type this model is related to. */ 293 UI ActionPoolType m_enmType;293 UIType m_enmType; 294 294 295 295 /** Holds the parent table reference. */ … … 351 351 *********************************************************************************************************************************/ 352 352 353 UIShortcutConfigurationModel::UIShortcutConfigurationModel(QObject *pParent, UI ActionPoolType enmType)353 UIShortcutConfigurationModel::UIShortcutConfigurationModel(QObject *pParent, UIType enmType) 354 354 : QAbstractTableModel(pParent) 355 355 , m_enmType(enmType) … … 383 383 { 384 384 /* Filter out unnecessary items: */ 385 if ( (m_enmType == UI ActionPoolType_Manager&& item.key().startsWith(GUI_Input_MachineShortcuts))386 || (m_enmType == UI ActionPoolType_Runtime&& item.key().startsWith(GUI_Input_SelectorShortcuts)))385 if ( (m_enmType == UIType_ManagerUI && item.key().startsWith(GUI_Input_MachineShortcuts)) 386 || (m_enmType == UIType_RuntimeUI && item.key().startsWith(GUI_Input_SelectorShortcuts))) 387 387 continue; 388 388 /* Add suitable item to the model as a new shortcut: */ … … 538 538 QString strHotCombo = m_filteredShortcuts[iIndex].currentSequence(); 539 539 /* But if that is machine table and hot-combo is not empty: */ 540 if (m_enmType == UI ActionPoolType_Runtime&& !strHotCombo.isEmpty())540 if (m_enmType == UIType_RuntimeUI && !strHotCombo.isEmpty()) 541 541 /* We should prepend it with Host+ prefix: */ 542 542 strHotCombo.prepend(UIHostCombo::hostComboModifierName()); … … 557 557 return m_filteredShortcuts[iIndex].key() == UIHostCombo::hostComboCacheKey() 558 558 ? QVariant::fromValue(UIHostComboWrapper(m_filteredShortcuts[iIndex].currentSequence())) 559 : QVariant::fromValue(UIHotKey( m_enmType == UI ActionPoolType_Runtime559 : QVariant::fromValue(UIHotKey( m_enmType == UIType_RuntimeUI 560 560 ? UIHotKeyType_Simple 561 561 : UIHotKeyType_WithModifiers, … … 927 927 928 928 /* Prepare Manager UI model: */ 929 m_pModelManager = new UIShortcutConfigurationModel(this, UI ActionPoolType_Manager);929 m_pModelManager = new UIShortcutConfigurationModel(this, UIType_ManagerUI); 930 930 931 931 /* Prepare Manager UI table: */ … … 964 964 965 965 /* Prepare Runtime UI model: */ 966 m_pModelRuntime = new UIShortcutConfigurationModel(this, UI ActionPoolType_Runtime);966 m_pModelRuntime = new UIShortcutConfigurationModel(this, UIType_RuntimeUI); 967 967 968 968 /* Create Runtime UI table: */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp
r101717 r103552 358 358 { 359 359 /* Prepare action-pool: */ 360 m_pActionPool = UIActionPool::create(UI ActionPoolType_Runtime);360 m_pActionPool = UIActionPool::create(UIType_RuntimeUI); 361 361 362 362 /* Prepare cache: */
Note:
See TracChangeset
for help on using the changeset viewer.

