VirtualBox

Changeset 92790 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Dec 7, 2021 6:18:45 PM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9371. Working on cleaning stuff.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/guestctrl
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

    r92787 r92790  
    4646#include "CGuestFsObjInfo.h"
    4747#include "CGuestSession.h"
    48 #include "CGuestSessionStateChangedEvent.h"
    4948
    5049
    … …  
    129128    , m_pLogPanel(0)
    130129    , m_pOperationsPanel(0)
     130    , m_fCommitDataSignalReceived(false)
    131131{
    132132    loadOptions();
    … …  
    307307                this, &UIFileManager::sltHandleOptionsUpdated);
    308308    }
     309    connect(&uiCommon(), &UICommon::sigAskToCommitData,
     310            this, &UIFileManager::sltCommitDataSignalReceived);
    309311}
    310312
    … …  
    415417}
    416418
     419void UIFileManager::sltCommitDataSignalReceived()
     420{
     421    m_fCommitDataSignalReceived = true;
     422}
     423
    417424void UIFileManager::copyToHost()
    418425{
    … …  
    486493void UIFileManager::saveOptions()
    487494{
     495    if (m_fCommitDataSignalReceived)
     496        return;
    488497    /* Save the options: */
    489498    UIFileManagerOptions *pOptions = UIFileManagerOptions::instance();
    … …  
    596605void UIFileManager::savePanelVisibility()
    597606{
     607    if (m_fCommitDataSignalReceived)
     608        return;
    598609    /* Save a list of currently visible panels: */
    599610    QStringList strNameList;
    … …  
    664675        if (comMachine.isNull())
    665676            continue;
    666         m_pGuestTablesContainer->addTab(new UIFileManagerGuestTable(m_pActionPool, comMachine, m_pGuestTablesContainer), comMachine.GetName());
    667         // if (m_pGuestFileTable)
    668         // {
    669         //     connect(m_pGuestFileTable, &UIFileManagerGuestTable::sigLogOutput,
    670         //             this, &UIFileManager::sltReceieveLogOutput);
     677        UIFileManagerGuestTable *pGuestFileTable = new UIFileManagerGuestTable(m_pActionPool, comMachine, m_pGuestTablesContainer);
     678        m_pGuestTablesContainer->addTab(pGuestFileTable, comMachine.GetName());
     679        if (pGuestFileTable)
     680        {
     681            connect(pGuestFileTable, &UIFileManagerGuestTable::sigLogOutput,
     682                    this, &UIFileManager::sltReceieveLogOutput);
    671683        //     connect(m_pGuestFileTable, &UIFileManagerGuestTable::sigNewFileOperation,
    672684        //             this, &UIFileManager::sltReceieveNewFileOperation);
    673685        //     connect(m_pGuestFileTable, &UIFileManagerGuestTable::sigDeleteConfirmationOptionChanged,
    674686        //             this, &UIFileManager::sltHandleOptionsUpdated);
    675         // }
     687        }
    676688    }
    677689}

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h

    r92753 r92790  
    3939class QTextEdit;
    4040class QVBoxLayout;
    41 class CGuestSessionStateChangedEvent;
    4241class UIActionPool;
    4342class UIDialogPanel;
    … …  
    114113    void sltHandleOptionsUpdated();
    115114    void sltHandleHidePanel(UIDialogPanel *pPanel);
     115    void sltCommitDataSignalReceived();
    116116
    117117private:
    … …  
    151151    void addTabs(const QVector<QUuid> &machineIdsToAdd);
    152152
    153 
    154153    QVBoxLayout              *m_pMainLayout;
    155154    QSplitter                *m_pVerticalSplitter;
    … …  
    170169    UIFileManagerLogPanel              *m_pLogPanel;
    171170    UIFileManagerOperationsPanel       *m_pOperationsPanel;
    172     bool                                m_fDialogBeingClosed;
    173171
     172    bool m_fCommitDataSignalReceived;
    174173
    175174    QVector<QUuid> m_machineIds;

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

    r92788 r92790  
    162162    prepareGuestSessionPanel();
    163163    prepareActionConnections();
    164     setSessionDependentWidgetsEnabled(isSessionPossible());
    165164
    166165    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
    … …  
    171170    if (m_pActionPool && m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession))
    172171        m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession)->setChecked(true);
     172
     173    if (!m_comMachine.isNull() && m_comMachine.GetState() == KMachineState_Running)
     174        openMachineSession();
     175    setSessionDependentWidgetsEnabled(isSessionPossible());
     176
    173177    retranslateUi();
    174178}
    … …  
    859863}
    860864
    861 void UIFileManagerGuestTable::sltMachineStateChange(const QUuid &uMachineId, const KMachineState )
     865void UIFileManagerGuestTable::sltMachineStateChange(const QUuid &uMachineId, const KMachineState enmMachineState)
    862866{
    863867    if (uMachineId.isNull() || m_comMachine.isNull() || uMachineId != m_comMachine.GetId())
    864868        return;
     869
     870    if (enmMachineState == KMachineState_Running)
     871        openMachineSession();
     872    else
     873    {
     874        cleanAll();
     875    }
     876
    865877    setSessionDependentWidgetsEnabled(isSessionPossible());
    866878    retranslateUi();
    867879}
    868880
    869 bool UIFileManagerGuestTable::openSession(const QString &strUserName, const QString &strPassword)
     881bool UIFileManagerGuestTable::closeMachineSession()
     882{
     883    if (!m_comSession.isNull())
     884        m_comSession.UnlockMachine();
     885
     886    if (!m_comGuest.isNull())
     887        m_comGuest.detach();
     888
     889    if (!m_comSession.isNull())
     890        m_comSession.detach();
     891    if (!m_comConsole.isNull())
     892        m_comConsole.detach();
     893
     894    return true;
     895}
     896
     897bool UIFileManagerGuestTable::openMachineSession()
    870898{
    871899    if (m_comMachine.isNull())
    … …  
    881909    }
    882910
    883     CConsole comConsole = m_comSession.GetConsole();
    884     AssertReturn(!comConsole.isNull(), false);
    885     m_comGuest = comConsole.GetGuest();
    886     AssertReturn(!m_comGuest.isNull(), false);
    887 
    888     if (!isGuestAdditionsAvailable(m_comGuest))
    889     {
    890         emit sigLogOutput("Could not find Guest Additions", m_strTableName, FileManagerLogType_Error);
    891         postGuestSessionClosed();
    892         if (m_pGuestSessionPanel)
    893             m_pGuestSessionPanel->markForError(true);
    894         return false;
    895     }
    896 
    897     QVector<KVBoxEventType> eventTypes;
    898     eventTypes << KVBoxEventType_OnGuestSessionRegistered;
    899 
    900     prepareListener(m_pQtGuestListener, m_comGuestListener,
    901                     m_comGuest.GetEventSource(), eventTypes);
    902 
    903     connect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
    904             this, &UIFileManagerGuestTable::sltGuestSessionUnregistered);
    905     connect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionRegistered,
    906             this, &UIFileManagerGuestTable::sltGuestSessionRegistered);
    907 
    908     m_comGuestSession = m_comGuest.CreateSession(strUserName, strPassword,
    909                                                  QString() /* Domain */, "File Manager Session");
    910 
    911     if (!m_comGuestSession.isOk())
    912     {
    913         emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), m_strTableName, FileManagerLogType_Error);
    914         cleanupGuestListener();
    915         return false;
    916     }
    917 
    918     eventTypes.clear();
    919     eventTypes << KVBoxEventType_OnGuestSessionStateChanged;
    920 
    921     prepareListener(m_pQtSessionListener, m_comSessionListener,
    922                     m_comGuestSession.GetEventSource(), eventTypes);
    923 
    924     qRegisterMetaType<CGuestSessionStateChangedEvent>();
    925     connect(m_pQtSessionListener->getWrapped(), &UIMainEventListener::sigGuestSessionStatedChanged,
    926             this, &UIFileManagerGuestTable::sltGuestSessionStateChanged);
    927 
     911    m_comConsole = m_comSession.GetConsole();
     912    if (m_comConsole.isNull())
     913    {
     914        emit sigLogOutput("Machine console is invalid", m_strTableName, FileManagerLogType_Error);
     915        return false;
     916    }
     917
     918    m_comGuest = m_comConsole.GetGuest();
     919    if (m_comGuest.isNull())
     920    {
     921        emit sigLogOutput("Guest reference is invalid", m_strTableName, FileManagerLogType_Error);
     922        return false;
     923    }
     924
     925    /* Prepare guest listener for guest session related events: */
     926    {
     927        QVector<KVBoxEventType> eventTypes;
     928        eventTypes << KVBoxEventType_OnGuestSessionRegistered;
     929        prepareListener(m_pQtGuestListener, m_comGuestListener, m_comGuest.GetEventSource(), eventTypes);
     930        connect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
     931                this, &UIFileManagerGuestTable::sltGuestSessionUnregistered);
     932        connect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionRegistered,
     933                this, &UIFileManagerGuestTable::sltGuestSessionRegistered);
     934    }
     935
     936    /* Prepare console listener for guest additions state change events: */
     937    {
     938        QVector<KVBoxEventType> eventTypes;
     939        eventTypes << KVBoxEventType_OnAdditionsStateChanged;
     940        prepareListener(m_pQtConsoleListener, m_comConsoleListener, m_comConsole.GetEventSource(), eventTypes);
     941        connect(m_pQtConsoleListener->getWrapped(), &UIMainEventListener::sigAdditionsChange,
     942                this, &UIFileManagerGuestTable::sltAdditionsStateChange);
     943    }
     944    emit sigLogOutput("Shared machine session opened", m_strTableName, FileManagerLogType_Info);
    928945    return true;
    929946}
    930947
    931 bool UIFileManagerGuestTable::isGuestAdditionsAvailable(CGuest &guest)
    932 {
    933     if (guest.isNull())
    934         return false;
    935 
    936     return guest.GetAdditionsStatus(guest.GetAdditionsRunLevel());
    937 }
    938 
    939948bool UIFileManagerGuestTable::isGuestAdditionsAvailable()
    940949{
    941     if (m_comMachine.isNull())
    942         return false;
    943     CSession comSession = uiCommon().openSession(m_comMachine.GetId(), KLockType_Shared);
    944     if (comSession.isNull())
    945         return false;
    946     CConsole comConsole = comSession.GetConsole();
    947     if (comConsole.isNull())
    948         return false;
    949     CGuest comGuest = comConsole.GetGuest();
    950     if (comGuest.isNull())
    951         return false;
    952     return comGuest.GetAdditionsStatus(comGuest.GetAdditionsRunLevel());
    953 }
    954 
     950    if (m_comGuest.isNull())
     951        return false;
     952    return m_comGuest.GetAdditionsStatus(m_comGuest.GetAdditionsRunLevel());
     953}
    955954
    956955void UIFileManagerGuestTable::cleanupGuestListener()
    957956{
    958     disconnect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
    959                this, &UIFileManagerGuestTable::sltGuestSessionUnregistered);
    960     disconnect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionRegistered,
    961                this, &UIFileManagerGuestTable::sltGuestSessionRegistered);
    962     cleanupListener(m_pQtGuestListener, m_comGuestListener, m_comGuest.GetEventSource());
    963 }
    964 
    965 void UIFileManagerGuestTable::cleanupSessionListener()
    966 {
    967     disconnect(m_pQtSessionListener->getWrapped(), &UIMainEventListener::sigGuestSessionStatedChanged,
    968             this, &UIFileManagerGuestTable::sltGuestSessionStateChanged);
    969     cleanupListener(m_pQtSessionListener, m_comSessionListener, m_comGuest.GetEventSource());
     957    if (!m_pQtGuestListener.isNull())
     958    {
     959        disconnect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
     960                   this, &UIFileManagerGuestTable::sltGuestSessionUnregistered);
     961        disconnect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionRegistered,
     962                   this, &UIFileManagerGuestTable::sltGuestSessionRegistered);
     963        if (!m_comGuest.isNull())
     964            cleanupListener(m_pQtGuestListener, m_comGuestListener, m_comGuest.GetEventSource());
     965    }
     966}
     967
     968void UIFileManagerGuestTable::cleanupGuestSessionListener()
     969{
     970    if (!m_pQtSessionListener.isNull())
     971    {
     972        disconnect(m_pQtSessionListener->getWrapped(), &UIMainEventListener::sigGuestSessionStatedChanged,
     973                   this, &UIFileManagerGuestTable::sltGuestSessionStateChanged);
     974        if (!m_comGuestSession.isNull())
     975            cleanupListener(m_pQtSessionListener, m_comSessionListener, m_comGuestSession.GetEventSource());
     976    }
     977}
     978
     979void UIFileManagerGuestTable::cleanupConsoleListener()
     980{
     981    if (!m_pQtConsoleListener.isNull())
     982    {
     983        disconnect(m_pQtConsoleListener->getWrapped(), &UIMainEventListener::sigAdditionsChange,
     984                   this, &UIFileManagerGuestTable::sltAdditionsStateChange);
     985        if (!m_comConsole.isNull())
     986            cleanupListener(m_pQtConsoleListener, m_comConsoleListener, m_comConsole.GetEventSource());
     987    }
    970988}
    971989
    … …  
    974992    if (m_pGuestSessionPanel)
    975993        m_pGuestSessionPanel->switchSessionCloseMode();
    976     // if (m_pGuestFileTable)
    977     //     m_pGuestFileTable->setEnabled(true);
    978     // if (m_pVerticalToolBar)
    979     //     m_pVerticalToolBar->setEnabled(true);
    980994}
    981995
    … …  
    984998    if (m_pGuestSessionPanel)
    985999        m_pGuestSessionPanel->switchSessionCreateMode();
    986     // if (m_pGuestFileTable)
    987     //     m_pGuestFileTable->setEnabled(false);
    988     // if (m_pVerticalToolBar)
    989     //     m_pVerticalToolBar->setEnabled(false);
    9901000}
    9911001
    … …  
    10061016    /* Register event sources in their listeners as well: */
    10071017    QtListener->getWrapped()->registerSource(comEventSource, comEventListener);
     1018}
     1019
     1020void UIFileManagerGuestTable::cleanupListener(ComObjPtr<UIMainEventListenerImpl> &QtListener,
     1021                                              CEventListener &comEventListener,
     1022                                              CEventSource comEventSource)
     1023{
     1024    if (!comEventSource.isOk())
     1025        return;
     1026    /* Unregister everything: */
     1027    QtListener->getWrapped()->unregisterSources();
     1028
     1029    /* Make sure VBoxSVC is available: */
     1030    if (!uiCommon().isVBoxSVCAvailable())
     1031        return;
     1032
     1033    /* Unregister event listener for CProgress event source: */
     1034    comEventSource.UnregisterListener(comEventListener);
    10081035}
    10091036
    … …  
    10481075}
    10491076
    1050 void UIFileManagerGuestTable::cleanupListener(ComObjPtr<UIMainEventListenerImpl> &QtListener,
    1051                                               CEventListener &comEventListener,
    1052                                               CEventSource comEventSource)
    1053 {
    1054     if (!comEventSource.isOk())
    1055         return;
    1056     /* Unregister everything: */
    1057     QtListener->getWrapped()->unregisterSources();
    1058 
    1059     /* Make sure VBoxSVC is available: */
    1060     if (!uiCommon().isVBoxSVCAvailable())
    1061         return;
    1062 
    1063     /* Unregister event listener for CProgress event source: */
    1064     comEventSource.UnregisterListener(comEventListener);
    1065 }
    1066 
    10671077void UIFileManagerGuestTable::sltCreateGuestSession(QString strUserName, QString strPassword)
    10681078{
    … …  
    10751085    }
    10761086    if (m_pGuestSessionPanel)
    1077         m_pGuestSessionPanel->markForError(!openSession(strUserName, strPassword));
     1087        m_pGuestSessionPanel->markForError(!openGuestSession(strUserName, strPassword));
    10781088}
    10791089
    … …  
    11011111void UIFileManagerGuestTable::sltHandleCloseSessionRequest()
    11021112{
    1103     closeSession();
     1113    cleanupGuestSessionListener();
     1114
     1115    closeGuestSession();
    11041116}
    11051117
    11061118void UIFileManagerGuestTable::sltCommitDataSignalReceived()
    11071119{
    1108     m_comMachine.detach();
    1109 }
    1110 
    1111 void UIFileManagerGuestTable::sltAdditionsChange()
     1120    cleanAll();
     1121    if (!m_comMachine.isNull())
     1122        m_comMachine.detach();
     1123}
     1124
     1125void UIFileManagerGuestTable::sltAdditionsStateChange()
    11121126{
    11131127    setSessionDependentWidgetsEnabled(isSessionPossible());
    … …  
    11221136}
    11231137
    1124 void UIFileManagerGuestTable::closeSession()
    1125 {
     1138bool UIFileManagerGuestTable::openGuestSession(const QString &strUserName, const QString &strPassword)
     1139{
     1140    if (m_comGuest.isNull())
     1141    {
     1142        emit sigLogOutput("Guest reference is invalid", m_strTableName, FileManagerLogType_Error);
     1143        return false;
     1144    }
     1145
     1146    if (!isGuestAdditionsAvailable())
     1147    {
     1148        emit sigLogOutput("Could not find Guest Additions", m_strTableName, FileManagerLogType_Error);
     1149        postGuestSessionClosed();
     1150        if (m_pGuestSessionPanel)
     1151            m_pGuestSessionPanel->markForError(true);
     1152        return false;
     1153    }
     1154
     1155    m_comGuestSession = m_comGuest.CreateSession(strUserName, strPassword,
     1156                                                 QString() /* Domain */, "File Manager Session");
     1157    if (m_comGuestSession.isNull())
     1158    {
     1159        emit sigLogOutput("Could not create guest session", m_strTableName, FileManagerLogType_Error);
     1160        return false;
     1161    }
     1162
     1163    if (!m_comGuestSession.isOk())
     1164    {
     1165        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession), m_strTableName, FileManagerLogType_Error);
     1166        return false;
     1167    }
     1168
     1169    QVector<KVBoxEventType> eventTypes(QVector<KVBoxEventType>() << KVBoxEventType_OnGuestSessionStateChanged);
     1170    prepareListener(m_pQtSessionListener, m_comSessionListener, m_comGuestSession.GetEventSource(), eventTypes);
     1171    qRegisterMetaType<CGuestSessionStateChangedEvent>();
     1172    connect(m_pQtSessionListener->getWrapped(), &UIMainEventListener::sigGuestSessionStatedChanged,
     1173            this, &UIFileManagerGuestTable::sltGuestSessionStateChanged);
     1174
     1175    return true;
     1176}
     1177
     1178void UIFileManagerGuestTable::closeGuestSession()
     1179{
     1180
    11261181    if (!m_comGuestSession.isNull())
     1182    {
    11271183        m_comGuestSession.Close();
    1128 
     1184        m_comGuestSession.detach();
     1185    }
    11291186    reset();
    1130 
    1131     if (!m_comSession.isNull())
    1132         m_comSession.UnlockMachine();
    1133 
    1134     cleanupGuestListener();
    1135     cleanupSessionListener();
    1136 
    11371187    emit sigLogOutput("Guest session is closed", m_strTableName, FileManagerLogType_Info);
    11381188    postGuestSessionClosed();
    11391189}
    11401190
    1141 
    1142 /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
    1143 /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
    1144 /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
    1145 #if 0
    1146 
    1147 
    1148 
    1149 
    1150 
    1151 
    1152 void UIFileManager::sltCloseGuestSession()
    1153 {
    1154     if (!m_comGuestSession.isOk())
    1155     {
    1156         emit sigLogOutput("Guest session is not valid", m_strTableName, FileManagerLogType_Error);
    1157         postGuestSessionClosed();
    1158         return;
    1159     }
    1160     if (m_pGuestFileTable)
    1161         m_pGuestFileTable->reset();
    1162 
    1163     if (m_comGuestSession.isOk() && m_pQtSessionListener && m_comSessionListener.isOk())
    1164         cleanupListener(m_pQtSessionListener, m_comSessionListener, m_comGuestSession.GetEventSource());
    1165 
    1166     m_comGuestSession.Close();
    1167     emit sigLogOutput("Guest session is closed", m_strTableName, FileManagerLogType_Info);
    1168     postGuestSessionClosed();
    1169 }
    1170 
    1171 
    1172 
    1173     void sltCreateGuestSession(QString strUserName, QString strPassword);
    1174     void sltCloseGuestSession();
    1175 
    1176 
    1177 
    1178 void UIFileManager::sltCleanupListenerAndGuest()
    1179 {
    1180     if (m_comGuest.isOk() && m_pQtGuestListener && m_comGuestListener.isOk())
    1181         cleanupListener(m_pQtGuestListener, m_comGuestListener, m_comGuest.GetEventSource());
    1182     if (m_comGuestSession.isOk() && m_pQtSessionListener && m_comSessionListener.isOk())
    1183         cleanupListener(m_pQtSessionListener, m_comSessionListener, m_comGuestSession.GetEventSource());
    1184 
    1185     if (m_comGuestSession.isOk())
    1186         m_comGuestSession.Close();
    1187 }
    1188 
    1189 #endif
    1190 /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
    1191 /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
    1192 /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
    1193 
    1194 
     1191void UIFileManagerGuestTable::cleanAll()
     1192{
     1193    cleanupConsoleListener();
     1194    cleanupGuestListener();
     1195    cleanupGuestSessionListener();
     1196
     1197    closeGuestSession();
     1198    closeMachineSession();
     1199}
    11951200
    11961201

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.h

    r92787 r92790  
    3333#include "CMachine.h"
    3434#include "CSession.h"
     35#include "CConsole.h"
    3536
    3637
    … …  
    101102    void sltMachineStateChange(const QUuid &uMachineId, const KMachineState state);
    102103    void sltCommitDataSignalReceived();
    103     void sltAdditionsChange();
     104    void sltAdditionsStateChange();
    104105
    105106private:
    … …  
    129130                         CEventSource comEventSource);
    130131    void cleanupGuestListener();
    131     void cleanupSessionListener();
     132    void cleanupGuestSessionListener();
     133    void cleanupConsoleListener();
    132134
    133135    void prepareGuestSessionPanel();
    134     /** Creates a shared machine session, opens a guest session and registers event listeners. */
    135     bool openSession(const QString& strUserName, const QString& strPassword);
    136     void closeSession();
    137     bool isGuestAdditionsAvailable(CGuest &guest);
     136
     137
     138    bool openGuestSession(const QString& strUserName, const QString& strPassword);
     139    void closeGuestSession();
     140
     141    bool openMachineSession();
     142    bool closeMachineSession();
     143
    138144    bool isGuestAdditionsAvailable();
    139145
    … …  
    145151
    146152    void initFileTable();
     153    void cleanAll();
    147154
    148 
    149     CGuest                    m_comGuest;
    150     CGuestSession             m_comGuestSession;
    151     CSession                  m_comSession;
    152     CMachine                  m_comMachine;
     155    CGuest          m_comGuest;
     156    CGuestSession   m_comGuestSession;
     157    CSession        m_comSession;
     158    CMachine        m_comMachine;
     159    CConsole        m_comConsole;
    153160
    154161    ComObjPtr<UIMainEventListenerImpl> m_pQtGuestListener;
    155162    ComObjPtr<UIMainEventListenerImpl> m_pQtSessionListener;
     163    ComObjPtr<UIMainEventListenerImpl> m_pQtConsoleListener;
    156164    CEventListener m_comSessionListener;
    157165    CEventListener m_comGuestListener;
     166    CEventListener m_comConsoleListener;
    158167    UIFileManagerGuestSessionPanel     *m_pGuestSessionPanel;
    159168    CheckMachine m_enmCheckMachine;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette