Changeset 75835 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 30, 2018 10:34:56 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

127038

Message:

FE/Qt: bugref:6699. Correct some toolbar issues.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIGuestControlFileManager.cpp (modified) (6 diffs)
• UIGuestControlFileManager.h (modified) (2 diffs)
• UIGuestControlFileManagerDialog.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp

@@ -137 +137 @@
     , m_pVerticalSplitter(0)
     , m_pToolBar(0)
+    , m_pVerticalToolBar(0)
     , m_pGuestFileTable(0)
     , m_pHostFileTable(0)
@@ -317 +318 @@
 void UIGuestControlFileManager::prepareVerticalToolBar(QHBoxLayout *layout)
 {
-    m_pToolBar = new UIToolBar;
-    if (!m_pToolBar)
-        return;
-
-    m_pToolBar->setOrientation(Qt::Vertical);
-    m_pToolBar->setEnabled(false);
+    m_pVerticalToolBar = new UIToolBar;
+    if (!m_pVerticalToolBar)
+        return;
+
+    m_pVerticalToolBar->setOrientation(Qt::Vertical);
+    m_pVerticalToolBar->setEnabled(false);
 
     /* Add to dummy QWidget to toolbar to center the action icons vertically: */
@@ -332 +333 @@
     bottomSpacerWidget->setVisible(true);
 
-    m_pToolBar->addWidget(topSpacerWidget);
-    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToHost));
-    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToGuest));
-    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToHost));
-    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToGuest));
-    m_pToolBar->addWidget(bottomSpacerWidget);
+    m_pVerticalToolBar->addWidget(topSpacerWidget);
+    m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToHost));
+    m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToGuest));
+    m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToHost));
+    m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToGuest));
+    m_pVerticalToolBar->addWidget(bottomSpacerWidget);
 
     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToHost), &QAction::triggered,
@@ -349 +350 @@
              this, &UIGuestControlFileManager::sltMoveHostToGuest);
 
-    layout ->addWidget(m_pToolBar);
+    layout ->addWidget(m_pVerticalToolBar);
 }
 
@@ -594 +595 @@
     if (m_pGuestFileTable)
         m_pGuestFileTable->setEnabled(true);
-    if (m_pToolBar)
-        m_pToolBar->setEnabled(true);
+    if (m_pVerticalToolBar)
+        m_pVerticalToolBar->setEnabled(true);
 }
 
@@ -604 +605 @@
     if (m_pGuestFileTable)
         m_pGuestFileTable->setEnabled(false);
-    if (m_pToolBar)
-        m_pToolBar->setEnabled(false);
+    if (m_pVerticalToolBar)
+        m_pVerticalToolBar->setEnabled(false);
 
 }

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h

@@ -93 +93 @@
     QMenu *menu() const;
 
+#ifdef VBOX_WS_MAC
+    /** Returns the toolbar. */
+    UIToolBar *toolbar() const { return m_pToolBar; }
+#endif
+
 signals:
 
@@ -171 +176 @@
     QSplitter                *m_pVerticalSplitter;
     UIToolBar                *m_pToolBar;
+    UIToolBar                *m_pVerticalToolBar;
 
     UIGuestControlConsole    *m_pConsole;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.cpp

@@ -98 +98 @@
         setWidgetMenu(pWidget->menu());
 #ifdef VBOX_WS_MAC
-        //setWidgetToolbar(pWidget->toolbar());
+        setWidgetToolbar(pWidget->toolbar());
 #endif
         connect(pWidget, &UIGuestControlFileManager::sigSetCloseButtonShortCut,