Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 75294) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 75295) @@ -845,4 +845,5 @@ src/guestctrl/UIGuestControlFileManagerSessionPanel.h \ src/guestctrl/UIGuestControlFileManagerLogPanel.h \ + src/guestctrl/UIGuestControlFileManagerOperationsPanel.h \ src/guestctrl/UIGuestControlFileManagerSettingsPanel.h \ src/guestctrl/UIGuestControlFileModel.h \ @@ -1000,4 +1001,5 @@ src/guestctrl/UIGuestControlFileManagerSessionPanel.h \ src/guestctrl/UIGuestControlFileManagerLogPanel.h \ + src/guestctrl/UIGuestControlFileManagerOperationsPanel.h \ src/guestctrl/UIGuestControlFileManagerSettingsPanel.h \ src/guestctrl/UIGuestControlFileModel.h \ @@ -1225,6 +1227,6 @@ src/runtime/UIIndicatorsPool.cpp \ src/guestctrl/UIGuestControlFileManager.cpp \ - src/guestctrl/UIGuestControlFileManagerAccounPanel.cpp \ src/guestctrl/UIGuestControlFileManagerLogPanel.cpp \ + src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp \ src/guestctrl/UIGuestControlFileTable.cpp \ src/guestctrl/UIGuestFileTable.cpp \ @@ -1279,4 +1281,5 @@ src/guestctrl/UIGuestControlFileManagerSessionPanel.cpp \ src/guestctrl/UIGuestControlFileManagerLogPanel.cpp \ + src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp \ src/guestctrl/UIGuestControlFileTable.cpp \ src/guestctrl/UIGuestFileTable.cpp \ @@ -1558,4 +1561,5 @@ src/guestctrl/UIGuestControlFileManagerSessionPanel.cpp \ src/guestctrl/UIGuestControlFileManagerLogPanel.cpp \ + src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp \ src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp \ src/guestctrl/UIGuestControlFileModel.cpp \ @@ -1736,4 +1740,5 @@ src/guestctrl/UIGuestControlFileManagerSessionPanel.cpp \ src/guestctrl/UIGuestControlFileManagerLogPanel.cpp \ + src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp \ src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp \ src/guestctrl/UIGuestControlFileModel.cpp \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75294) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75295) @@ -25,8 +25,8 @@ # include # include -# include # include # include -# include +# include +# include /* GUI includes: */ @@ -45,4 +45,5 @@ # include "UIGuestControlFileManagerSettingsPanel.h" # include "UIGuestControlFileManagerLogPanel.h" +# include "UIGuestControlFileManagerOperationsPanel.h" # include "UIGuestFileTable.h" # include "UIGuestControlInterface.h" @@ -144,4 +145,5 @@ , m_pLogPanel(0) , m_pSessionPanel(0) + , m_pOperationsPanel(0) { prepareGuestListener(); @@ -277,4 +279,14 @@ pTopLayout->addWidget(m_pSettingsPanel); } + + m_pOperationsPanel = + new UIGuestControlFileManagerOperationsPanel(this /* manager dialog */, 0 /*parent */); + if (m_pOperationsPanel) + { + m_pOperationsPanel->hide(); + m_panelActionMap.insert(m_pOperationsPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_FileOperations)); + pTopLayout->addWidget(m_pOperationsPanel); + } + m_pVerticalSplitter->addWidget(pTopWidget); @@ -360,4 +372,6 @@ this, &UIGuestControlFileManager::sltPanelActionToggled); connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Session), &QAction::toggled, + this, &UIGuestControlFileManager::sltPanelActionToggled); + connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_FileOperations), &QAction::toggled, this, &UIGuestControlFileManager::sltPanelActionToggled); Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h (revision 75294) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h (revision 75295) @@ -38,4 +38,5 @@ class QHBoxLayout; class QSplitter; +class QTableWidget; class QTextEdit; class QVBoxLayout; @@ -48,4 +49,5 @@ class UIGuestControlFileManagerPanel; class UIGuestControlFileManagerLogPanel; +class UIGuestControlFileManagerOperationsPanel; class UIGuestControlFileManagerSessionPanel; class UIGuestControlFileManagerSettingsPanel; @@ -152,5 +154,5 @@ UIToolBar *m_pToolBar; - //UIFileOperationsList *m_pFileOperationsList; + //QTableView *m_pFileOperationsTable; UIGuestControlConsole *m_pConsole; UIGuestControlInterface *m_pControlInterface; @@ -170,4 +172,5 @@ UIGuestControlFileManagerLogPanel *m_pLogPanel; UIGuestControlFileManagerSessionPanel *m_pSessionPanel; + UIGuestControlFileManagerOperationsPanel *m_pOperationsPanel; friend class UIGuestControlFileManagerSettingsPanel; friend class UIGuestControlFileManagerPanel; Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.h (revision 75294) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.h (revision 75295) @@ -38,12 +38,4 @@ virtual QString panelName() const /* override */; -signals: - - void sigShowLineNumbers(bool show); - void sigWrapLines(bool show); - void sigChangeFontSizeInPoints(int size); - void sigChangeFont(QFont font); - void sigResetToDefaults(); - protected: Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp (revision 75295) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp (revision 75295) @@ -0,0 +1,97 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - UIVMLogViewer class implementation. + */ + +/* + * Copyright (C) 2010-2017 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +#ifdef VBOX_WITH_PRECOMPILED_HEADERS +# include +#else /* !VBOX_WITH_PRECOMPILED_HEADERS */ + +/* Qt includes: */ +# include +# include + +/* GUI includes: */ +# include "UIGuestControlFileManager.h" +# include "UIGuestControlFileManagerOperationsPanel.h" + +#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */ + + +/********************************************************************************************************************************* +* UIFileOperationProgressWidget definition. * +*********************************************************************************************************************************/ + +class UIFileOperationProgressWidget : public QWidget +{ + + Q_OBJECT; + +public: + + UIFileOperationProgressWidget(QWidget *pParent = 0); + +}; + + +/********************************************************************************************************************************* +* UIFileOperationProgressWidget implementation. * +*********************************************************************************************************************************/ + +UIFileOperationProgressWidget::UIFileOperationProgressWidget(QWidget *pParent /* = 0 */) + :QWidget(pParent) +{ +} + + +/********************************************************************************************************************************* +* UIGuestControlFileManagerOperationsPanel implementation. * +*********************************************************************************************************************************/ + +UIGuestControlFileManagerOperationsPanel::UIGuestControlFileManagerOperationsPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent) + : UIGuestControlFileManagerPanel(pManagerWidget, pParent) + , m_pTableWidget(0) +{ + prepare(); +} + + +QString UIGuestControlFileManagerOperationsPanel::panelName() const +{ + return "OperationsPanel"; +} + +void UIGuestControlFileManagerOperationsPanel::prepareWidgets() +{ + if (!mainLayout()) + return; + m_pTableWidget = new QTableWidget; + if (m_pTableWidget) + { + mainLayout()->addWidget(m_pTableWidget); + } +} + +void UIGuestControlFileManagerOperationsPanel::prepareConnections() +{ +} + +void UIGuestControlFileManagerOperationsPanel::retranslateUi() +{ + UIGuestControlFileManagerPanel::retranslateUi(); + +} + +#include "UIGuestControlFileManagerOperationsPanel.moc" Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.h (revision 75295) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.h (revision 75295) @@ -0,0 +1,57 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - UIVMLogViewer class declaration. + */ + +/* + * Copyright (C) 2010-2017 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +#ifndef ___UIGuestControlFileManagerOperationsPanel_h___ +#define ___UIGuestControlFileManagerOperationsPanel_h___ + +/* GUI includes: */ +#include "UIGuestControlDefs.h" +#include "UIGuestControlFileManagerPanel.h" + +/* Forward declarations: */ +class QTableWidget; +class UIGuestControlFileManager; + +/** UIVMLogViewerPanel extension providing GUI to manage logviewer settings. */ +class UIGuestControlFileManagerOperationsPanel : public UIGuestControlFileManagerPanel +{ + Q_OBJECT; + +public: + + UIGuestControlFileManagerOperationsPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent); + virtual QString panelName() const /* override */; + +signals: + +protected: + + virtual void prepareWidgets() /* override */; + virtual void prepareConnections() /* override */; + + /** Handles the translation event. */ + void retranslateUi(); + +private slots: + + +private: + QTableWidget *m_pTableWidget; + +}; + +#endif /* !___UIGuestControlFileManagerOperationsPanel_h___ */