Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 75283) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 75284) @@ -840,4 +840,5 @@ src/runtime/information/UIVMInformationDialog.h \ src/guestctrl/UIGuestControlConsole.h \ + src/guestctrl/UIGuestControlDefs.h \ src/guestctrl/UIGuestControlFileManager.h \ src/guestctrl/UIGuestControlFileManagerDialog.h \ @@ -995,4 +996,5 @@ src/runtime/information/UIVMInformationDialog.h \ src/guestctrl/UIGuestControlConsole.h \ + src/guestctrl/UIGuestControlDefs.h \ src/guestctrl/UIGuestControlFileManager.h \ src/guestctrl/UIGuestControlFileManagerDialog.h \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlDefs.h (revision 75284) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlDefs.h (revision 75284) @@ -0,0 +1,28 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - Header with definitions and functions related to settings configuration. + */ + +/* + * Copyright (C) 2011-2018 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 ___UIGuestControlDefs_h___ +#define ___UIGuestControlDefs_h___ + +enum FileManagerLogType +{ + FileManagerLogType_Info, + FileManagerLogType_Error, + FileManagerLogType_Max +}; + +#endif /* !___UIGuestControlDefs_h___ */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75283) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75284) @@ -289,4 +289,6 @@ m_pVerticalSplitter->setCollapsible(m_pVerticalSplitter->indexOf(pTopWidget), false); m_pVerticalSplitter->setCollapsible(m_pVerticalSplitter->indexOf(m_pLogPanel), false); + m_pVerticalSplitter->setStretchFactor(0, 3); + m_pVerticalSplitter->setStretchFactor(1, 1); } @@ -390,5 +392,5 @@ if (!UIGuestControlInterface::isGuestAdditionsAvailable(m_comGuest)) { - appendLog("Could not find Guest Additions"); + appendLog("Could not find Guest Additions", FileManagerLogType_Error); postSessionClosed(); return; @@ -396,5 +398,5 @@ if (strUserName.isEmpty()) { - appendLog("No user name is given"); + appendLog("No user name is given", FileManagerLogType_Error); return; } @@ -406,5 +408,5 @@ if (!m_comGuestSession.isOk()) { - appendLog("Guest session is not valid"); + appendLog("Guest session is not valid", FileManagerLogType_Error); postSessionClosed(); return; @@ -417,5 +419,5 @@ m_comGuestSession.Close(); - appendLog("Guest session is closed"); + appendLog("Guest session is closed", FileManagerLogType_Info); postSessionClosed(); } @@ -427,5 +429,5 @@ CVirtualBoxErrorInfo cErrorInfo = cEvent.GetError(); if (cErrorInfo.isOk()) - appendLog(cErrorInfo.GetText()); + appendLog(cErrorInfo.GetText(), FileManagerLogType_Error); } if (m_comGuestSession.GetStatus() == KGuestSessionStatus_Started) @@ -436,11 +438,11 @@ else { - appendLog("Session status has changed"); - } -} - -void UIGuestControlFileManager::sltReceieveLogOutput(QString strOutput) -{ - appendLog(strOutput); + appendLog("Session status has changed", FileManagerLogType_Info); + } +} + +void UIGuestControlFileManager::sltReceieveLogOutput(QString strOutput, FileManagerLogType eLogType) +{ + appendLog(strOutput, eLogType); } @@ -533,8 +535,8 @@ if (!m_comGuestSession.isOk()) { - appendLog(UIErrorString::formatErrorInfo(m_comGuestSession)); + appendLog(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error); return false; } - appendLog("Guest session has been created"); + appendLog("Guest session has been created", FileManagerLogType_Info); if (m_pSessionPanel) m_pSessionPanel->switchSessionCloseMode(); @@ -555,10 +557,10 @@ /* Wait session to start. For some reason we cannot get GuestSessionStatusChanged event consistently. So we wait: */ - appendLog("Waiting the session to start"); + appendLog("Waiting the session to start", FileManagerLogType_Info); const ULONG waitTimeout = 2000; KGuestSessionWaitResult waitResult = m_comGuestSession.WaitFor(KGuestSessionWaitForFlag_Start, waitTimeout); if (waitResult != KGuestSessionWaitResult_Start) { - appendLog("The session did not start"); + appendLog("The session did not start", FileManagerLogType_Error); sltCloseSession(); return false; @@ -696,9 +698,9 @@ } -void UIGuestControlFileManager::appendLog(const QString &strLog) +void UIGuestControlFileManager::appendLog(const QString &strLog, FileManagerLogType eLogType) { if (!m_pLogPanel) return; - m_pLogPanel->appendLog(strLog); + m_pLogPanel->appendLog(strLog, eLogType); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h (revision 75283) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h (revision 75284) @@ -32,4 +32,5 @@ #include "QIManagerDialog.h" #include "QIWithRetranslateUI.h" +#include "UIGuestControlDefs.h" #include "UIMainEventListener.h" @@ -46,6 +47,6 @@ class UIGuestControlInterface; class UIGuestControlFileManagerPanel; +class UIGuestControlFileManagerLogPanel; class UIGuestControlFileManagerSessionPanel; -class UIGuestControlFileManagerLogPanel; class UIGuestControlFileManagerSettingsPanel; class UIGuestFileTable; @@ -103,5 +104,5 @@ void sltCloseSession(); void sltGuestSessionStateChanged(const CGuestSessionStateChangedEvent &cEvent); - void sltReceieveLogOutput(QString strOutput); + void sltReceieveLogOutput(QString strOutput, FileManagerLogType eLogType); void sltCopyGuestToHost(); void sltCopyHostToGuest(); @@ -142,18 +143,18 @@ template - QStringList getFsObjInfoStringList(const T &fsObjectInfo) const; - void appendLog(const QString &strLog); - const int m_iMaxRecursionDepth; - CGuest m_comGuest; - CGuestSession m_comGuestSession; - QVBoxLayout *m_pMainLayout; - QSplitter *m_pVerticalSplitter; - UIToolBar *m_pToolBar; + QStringList getFsObjInfoStringList(const T &fsObjectInfo) const; + void appendLog(const QString &strLog, FileManagerLogType eLogType); + const int m_iMaxRecursionDepth; + CGuest m_comGuest; + CGuestSession m_comGuestSession; + QVBoxLayout *m_pMainLayout; + QSplitter *m_pVerticalSplitter; + UIToolBar *m_pToolBar; //UIFileOperationsList *m_pFileOperationsList; - UIGuestControlConsole *m_pConsole; - UIGuestControlInterface *m_pControlInterface; - UIGuestFileTable *m_pGuestFileTable; - UIHostFileTable *m_pHostFileTable; + UIGuestControlConsole *m_pConsole; + UIGuestControlInterface *m_pControlInterface; + UIGuestFileTable *m_pGuestFileTable; + UIHostFileTable *m_pHostFileTable; ComObjPtr m_pQtGuestListener; Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.cpp (revision 75283) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.cpp (revision 75284) @@ -96,5 +96,5 @@ } -void UIGuestControlFileManagerLogPanel::appendLog(const QString &strLog) +void UIGuestControlFileManagerLogPanel::appendLog(const QString &strLog, FileManagerLogType) { if (!m_pLogTextEdit) Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.h (revision 75283) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.h (revision 75284) @@ -20,4 +20,5 @@ /* GUI includes: */ +#include "UIGuestControlDefs.h" #include "UIGuestControlFileManagerPanel.h" @@ -34,5 +35,5 @@ UIGuestControlFileManagerLogPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent); - void appendLog(const QString &str); + void appendLog(const QString &str, FileManagerLogType); virtual QString panelName() const /* override */; Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.cpp (revision 75283) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.cpp (revision 75284) @@ -112,5 +112,5 @@ { if (m_pParent) - m_pParent->emitLogOutput(QString(item->path()).append(" could not be renamed")); + m_pParent->emitLogOutput(QString(item->path()).append(" could not be renamed"), FileManagerLogType_Error); } return true; Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp (revision 75283) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp (revision 75284) @@ -644,7 +644,7 @@ } -void UIGuestControlFileTable::emitLogOutput(const QString& strOutput) -{ - emit sigLogOutput(strOutput); +void UIGuestControlFileTable::emitLogOutput(const QString& strOutput, FileManagerLogType eLogType) +{ + emit sigLogOutput(strOutput, eLogType); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.h (revision 75283) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.h (revision 75284) @@ -33,4 +33,5 @@ #include "QITableView.h" #include "QIWithRetranslateUI.h" +#include "UIGuestControlDefs.h" /* Forward declarations: */ @@ -244,5 +245,5 @@ signals: - void sigLogOutput(QString); + void sigLogOutput(QString strLog, FileManagerLogType eLogType); public: @@ -252,5 +253,5 @@ /** Deletes all the tree nodes */ void reset(); - void emitLogOutput(const QString& strOutput); + void emitLogOutput(const QString& strOutput, FileManagerLogType eLogType); /** Returns the path of the rootIndex */ QString currentDirectoryPath() const; Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp (revision 75283) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp (revision 75284) @@ -184,5 +184,5 @@ if (!m_comGuestSession.isOk()) { - emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession)); + emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error); return; } @@ -249,6 +249,6 @@ if (!m_comGuestSession.isOk()) { - emit sigLogOutput(QString(item->path()).append(" could not be deleted")); - emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession)); + emit sigLogOutput(QString(item->path()).append(" could not be deleted"), FileManagerLogType_Error); + emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error); } } @@ -267,5 +267,5 @@ if (!m_comGuestSession.isOk()) { - emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession)); + emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error); return; } @@ -285,5 +285,5 @@ if (!m_comGuestSession.isOk()) { - emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession)); + emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error); return false; } @@ -302,9 +302,9 @@ if (!m_comGuestSession.isOk()) { - emit sigLogOutput(newDirectoryPath.append(" could not be created")); - emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession)); + emit sigLogOutput(newDirectoryPath.append(" could not be created"), FileManagerLogType_Error); + emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error); return false; } - emit sigLogOutput(newDirectoryPath.append(" has been created")); + emit sigLogOutput(newDirectoryPath.append(" has been created"), FileManagerLogType_Info); return true; } @@ -318,5 +318,5 @@ if (!m_comGuestSession.isOk()) { - emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession)); + emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error); //msgCenter().cannotRemoveMachine(machine); return; @@ -326,5 +326,5 @@ if (!progress.isOk() || progress.GetResultCode() != 0) { - emit sigLogOutput(UIErrorString::formatErrorInfo(progress)); + emit sigLogOutput(UIErrorString::formatErrorInfo(progress), FileManagerLogType_Error); return; } @@ -343,5 +343,5 @@ if (!m_comGuestSession.isOk()) { - emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession)); + emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error); return; } @@ -350,5 +350,5 @@ if (!progress.isOk() || progress.GetResultCode() != 0) { - emit sigLogOutput(UIErrorString::formatErrorInfo(progress)); + emit sigLogOutput(UIErrorString::formatErrorInfo(progress), FileManagerLogType_Error); return; } @@ -399,5 +399,5 @@ if (!m_comGuestSession.isOk()) { - emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession)); + emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error); return QString(); } @@ -438,5 +438,5 @@ if (!m_comGuestSession.isOk()) { - emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession)); + emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), FileManagerLogType_Error); continue; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp (revision 75283) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp (revision 75284) @@ -271,5 +271,5 @@ if (!deleteSuccess) - emit sigLogOutput(QString(item->path()).append(" could not be deleted")); + emit sigLogOutput(QString(item->path()).append(" could not be deleted"), FileManagerLogType_Error); } @@ -305,5 +305,5 @@ if (!parentDir.mkdir(directoryName)) { - emit sigLogOutput(UIPathOperations::mergePaths(path, directoryName).append(" could not be created")); + emit sigLogOutput(UIPathOperations::mergePaths(path, directoryName).append(" could not be created"), FileManagerLogType_Error); return false; }