Changeset 42949 in vbox
- Timestamp:
- Aug 23, 2012 12:51:31 PM (13 years ago)
- svn:sync-xref-src-repo-rev:
- 80274
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/runtime
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
r42526 r42949 509 509 { 510 510 menu()->setTitle(menuText(QApplication::translate("UIActionPool", "&USB Devices"))); 511 } 512 }; 513 514 class MenuSharedClipboardAction : public UIActionMenu 515 { 516 Q_OBJECT; 517 518 public: 519 520 MenuSharedClipboardAction(QObject *pParent) 521 : UIActionMenu(pParent, ":/vm_open_filemanager_16px.png", ":/vm_open_filemanager_disabled_16px.png") 522 { 523 retranslateUi(); 524 } 525 526 protected: 527 528 void retranslateUi() 529 { 530 menu()->setTitle(menuText(QApplication::translate("UIActionPool", "Shared &Clipboard"))); 511 531 } 512 532 }; … … 907 927 delete m_pool[UIActionIndexRuntime_Menu_USBDevices]; 908 928 m_pool[UIActionIndexRuntime_Menu_USBDevices] = new MenuUSBDevicesAction(this); 929 if (m_pool[UIActionIndexRuntime_Menu_SharedClipboard]) 930 delete m_pool[UIActionIndexRuntime_Menu_SharedClipboard]; 931 m_pool[UIActionIndexRuntime_Menu_SharedClipboard] = new MenuSharedClipboardAction(this); 909 932 if (m_pool[UIActionIndexRuntime_Menu_NetworkAdapters]) 910 933 delete m_pool[UIActionIndexRuntime_Menu_NetworkAdapters]; -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h
r38477 r42949 56 56 UIActionIndexRuntime_Menu_FloppyDevices, 57 57 UIActionIndexRuntime_Menu_USBDevices, 58 UIActionIndexRuntime_Menu_SharedClipboard, 58 59 UIActionIndexRuntime_Menu_NetworkAdapters, 59 60 UIActionIndexRuntime_Simple_NetworkAdaptersDialog, -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
r42748 r42949 444 444 , m_pRunningActions(0) 445 445 , m_pRunningOrPausedActions(0) 446 , m_pSharedClipboardActions(0) 446 447 , m_fIsWindowsCreated(false) 447 448 , m_fIsPreventAutoClose(false) … … 597 598 m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices)); 598 599 m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)); 600 m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard)); 599 601 m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_NetworkAdapters)); 600 602 m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog)); … … 646 648 connect(gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->menu(), SIGNAL(aboutToShow()), 647 649 this, SLOT(sltPrepareUSBMenu())); 650 connect(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard)->menu(), SIGNAL(aboutToShow()), 651 this, SLOT(sltPrepareSharedClipboardMenu())); 648 652 connect(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog), SIGNAL(triggered()), 649 653 this, SLOT(sltOpenNetworkAdaptersDialog())); … … 1570 1574 } 1571 1575 1576 void UIMachineLogic::sltPrepareSharedClipboardMenu() 1577 { 1578 /* Get and check the sender menu object: */ 1579 QMenu *pMenu = qobject_cast<QMenu*>(sender()); 1580 QMenu *pSharedClipboardMenu = gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard)->menu(); 1581 AssertMsg(pMenu == pSharedClipboardMenu, ("This slot should only be called on hovering Shared Clipboard menu!\n")); 1582 Q_UNUSED(pSharedClipboardMenu); 1583 1584 /* First run: */ 1585 if (!m_pSharedClipboardActions) 1586 { 1587 m_pSharedClipboardActions = new QActionGroup(this); 1588 for (int i = KClipboardMode_Disabled; i < KClipboardMode_Max; ++i) 1589 { 1590 KClipboardMode mode = (KClipboardMode)i; 1591 QAction *pAction = pMenu->addAction(gpConverter->toString(mode)); 1592 pAction->setData(QVariant::fromValue(mode)); 1593 pAction->setCheckable(true); 1594 pAction->setChecked(session().GetMachine().GetClipboardMode() == mode); 1595 m_pSharedClipboardActions->addAction(pAction); 1596 } 1597 connect(m_pSharedClipboardActions, SIGNAL(triggered(QAction*)), 1598 this, SLOT(sltChangeSharedClipboardType(QAction*))); 1599 } 1600 /* Subsequent runs: */ 1601 else 1602 foreach (QAction *pAction, m_pSharedClipboardActions->actions()) 1603 if (pAction->data().value<KClipboardMode>() == session().GetMachine().GetClipboardMode()) 1604 pAction->setChecked(true); 1605 } 1606 1607 void UIMachineLogic::sltChangeSharedClipboardType(QAction *pAction) 1608 { 1609 /* Assign new mode (without save): */ 1610 KClipboardMode mode = pAction->data().value<KClipboardMode>(); 1611 session().GetMachine().SetClipboardMode(mode); 1612 } 1613 1572 1614 void UIMachineLogic::sltSwitchVrde(bool fOn) 1573 1615 { -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h
r41587 r42949 170 170 void sltPrepareUSBMenu(); 171 171 void sltAttachUSBDevice(); 172 void sltPrepareSharedClipboardMenu(); 173 void sltChangeSharedClipboardType(QAction *pAction); 172 174 void sltSwitchVrde(bool fOn); 173 175 void sltInstallGuestAdditions(); … … 203 205 QActionGroup *m_pRunningActions; 204 206 QActionGroup *m_pRunningOrPausedActions; 207 QActionGroup *m_pSharedClipboardActions; 205 208 206 209 bool m_fIsWindowsCreated : 1; -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp
r42526 r42949 240 240 pMenu->addMenu(gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices)->menu()); 241 241 pMenu->addMenu(gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->menu()); 242 pMenu->addMenu(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard)->menu()); 242 243 pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog)); 243 244 pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
Note:
See TracChangeset
for help on using the changeset viewer.