Changeset 75247 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 5, 2018 9:53:07 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Manage escape shortcut in file manager dialog

Location:

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

Files:

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

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

@@ -194 +194 @@
 
     /* Configure layout: */
-    m_pMainLayout->setSpacing(0);
     m_pMainLayout->setContentsMargins(0, 0, 0, 0);
+#ifdef VBOX_WS_MAC
+    m_pMainLayout->setSpacing(10);
+#else
+    m_pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+#endif
 
     if (m_fShowToolbar)
@@ -210 +214 @@
 
     QHBoxLayout *pFileTableContainerLayout = new QHBoxLayout;
-    pFileTableContainerLayout->setSpacing(0);
     pFileTableContainerLayout->setContentsMargins(0, 0, 0, 0);
+#ifdef VBOX_WS_MAC
+    pFileTableContainerLayout->setSpacing(10);
+#else
+    pFileTableContainerLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+#endif
 
     QWidget *pTopWidget = new QWidget;

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

@@ -100 +100 @@
         //setWidgetToolbar(pWidget->toolbar());
 #endif
-        // connect(pWidget, &UIGuestControlWidget::sigSetCloseButtonShortCut,
-        //         this, &UIGuestControlWidget::sltSetCloseButtonShortCut);
+        connect(pWidget, &UIGuestControlFileManager::sigSetCloseButtonShortCut,
+                this, &UIGuestControlFileManagerDialog::sltSetCloseButtonShortCut);
 
         /* Add into layout: */