Changeset 75193 in vbox

Timestamp:

Oct 30, 2018 5:51:47 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Add a clear action to file manager log viewer

Location:

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

Files:

• UIGuestControlFileManager.cpp (modified) (3 diffs)
• UIGuestFileTable.cpp (modified) (1 diff)

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

@@ -58 +58 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-UIGuestControlFileManagerSettings *UIGuestControlFileManagerSettings::m_pInstance = 0;
-
-UIGuestControlFileManagerSettings* UIGuestControlFileManagerSettings::instance()
-{
-    return m_pInstance;
-}
-
-void UIGuestControlFileManagerSettings::create()
-{
-    if (m_pInstance)
-        return;
-    m_pInstance = new UIGuestControlFileManagerSettings;
-}
-
-void UIGuestControlFileManagerSettings::destroy()
-{
-    delete m_pInstance;
-    m_pInstance = 0;
-}
-
- UIGuestControlFileManagerSettings::~UIGuestControlFileManagerSettings()
-{
-
-}
-
-UIGuestControlFileManagerSettings::UIGuestControlFileManagerSettings()
-    : bListDirectoriesOnTop(true)
-    , bAskDeleteConfirmation(false)
-{
-}
+/*********************************************************************************************************************************
+*   UIFileManagerLogViewer definition.                                                                                   *
+*********************************************************************************************************************************/
+
+class UIFileManagerLogViewer : public QTextEdit
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIFileManagerLogViewer(QWidget *pParent = 0);
+
+protected:
+
+    virtual void contextMenuEvent(QContextMenuEvent * event) /* override */;
+
+private slots:
+
+    void sltClear();
+};
 
 /*********************************************************************************************************************************
@@ -142 +133 @@
 
 };
+
+/*********************************************************************************************************************************
+*   UIFileManagerLogViewer implementation.                                                                                   *
+*********************************************************************************************************************************/
+
+UIFileManagerLogViewer::UIFileManagerLogViewer(QWidget *pParent /* = 0 */)
+    :QTextEdit(pParent)
+{
+}
+
+void UIFileManagerLogViewer::contextMenuEvent(QContextMenuEvent *event)
+{
+    QMenu *menu = createStandardContextMenu();
+    void sltClear();
+
+    QAction *pClearAction = menu->addAction(tr("Clear"));
+    connect(pClearAction, &QAction::triggered, this, &UIFileManagerLogViewer::sltClear);
+    menu->exec(event->globalPos());
+    delete menu;
+}
+
+void UIFileManagerLogViewer::sltClear()
+{
+    clear();
+}
+
+
+/*********************************************************************************************************************************
+*   UIGuestControlFileManagerSettings implementation.                                                                            *
+*********************************************************************************************************************************/
+
+UIGuestControlFileManagerSettings *UIGuestControlFileManagerSettings::m_pInstance = 0;
+
+UIGuestControlFileManagerSettings* UIGuestControlFileManagerSettings::instance()
+{
+    return m_pInstance;
+}
+
+void UIGuestControlFileManagerSettings::create()
+{
+    if (m_pInstance)
+        return;
+    m_pInstance = new UIGuestControlFileManagerSettings;
+}
+
+void UIGuestControlFileManagerSettings::destroy()
+{
+    delete m_pInstance;
+    m_pInstance = 0;
+}
+
+ UIGuestControlFileManagerSettings::~UIGuestControlFileManagerSettings()
+{
+
+}
+
+UIGuestControlFileManagerSettings::UIGuestControlFileManagerSettings()
+    : bListDirectoriesOnTop(true)
+    , bAskDeleteConfirmation(false)
+{
+}
 
 /*********************************************************************************************************************************
@@ -436 +488 @@
     }
 
-    m_pLogOutput = new QTextEdit;
+    m_pLogOutput = new UIFileManagerLogViewer;
     if (m_pLogOutput)
     {

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

@@ -336 +336 @@
 void UIGuestFileTable::copyGuestToHost(const QString& hostDestinationPath)
 {
-    QVector<QString> sourcePaths;// = selectedItemPathList().toVector();
+    QVector<QString> sourcePaths = selectedItemPathList().toVector();
     QVector<QString>  aFilters;
     QVector<QString>  aFlags;
-    sourcePaths.append("opt/VBoxGuestAdditions-5.2.97/bin/");
+
     CProgress progress = m_comGuestSession.CopyFromGuest(sourcePaths, aFilters, aFlags, hostDestinationPath);
     if (!m_comGuestSession.isOk())