Changeset 98378 in vbox
- Timestamp:
- Feb 1, 2023 12:34:07 PM (20 months ago)
- Location:
- trunk
- Files:
-
- 11 edited
-
. (modified) (1 prop)
-
src/VBox (modified) (1 prop)
-
src/VBox/Frontends (modified) (1 prop)
-
src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp (modified) (3 diffs)
-
src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo
-
old new 19 19 /branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644 20 20 /branches/dsen/gui3:79645-79692 21 /branches/dsen/gui4:155183-155185,155187,155198 21 /branches/dsen/gui4:155183-155185,155187,155198,155200-155201 22 22 /trunk/src:92342,154921
-
- Property svn:mergeinfo
-
trunk/src/VBox
- Property svn:mergeinfo
-
old new 19 19 /branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644 20 20 /branches/dsen/gui3/src/VBox:79645-79692 21 /branches/dsen/gui4/src/VBox:155183-155185,155187,155198 21 /branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201
-
- Property svn:mergeinfo
-
trunk/src/VBox/Frontends
- Property svn:mergeinfo
-
old new 16 16 /branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644 17 17 /branches/dsen/gui3/src/VBox/Frontends:79645-79692 18 /branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198 18 /branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201
-
- Property svn:mergeinfo
-
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp
r98103 r98378 46 46 47 47 /* GUI includes: */ 48 #include "UIActionPool.h" 48 49 #include "UICommon.h" 49 50 #include "UIExtraDataManager.h" 51 #include "UIHostComboEditor.h" 52 #include "UIKeyboardHandlerFullscreen.h" 53 #include "UIKeyboardHandlerNormal.h" 54 #include "UIKeyboardHandlerScale.h" 55 #include "UIKeyboardHandlerSeamless.h" 56 #include "UIMachine.h" 57 #include "UIMachineLogic.h" 58 #include "UIMachineView.h" 59 #include "UIMachineWindow.h" 50 60 #include "UIMessageCenter.h" 51 #include "UIActionPool.h"52 #include "UISession.h"53 #include "UIMachineLogic.h"54 #include "UIMachineWindow.h"55 #include "UIMachineView.h"56 #include "UIHostComboEditor.h"57 #include "UIKeyboardHandlerNormal.h"58 #include "UIKeyboardHandlerFullscreen.h"59 #include "UIKeyboardHandlerSeamless.h"60 #include "UIKeyboardHandlerScale.h"61 61 #include "UIMouseHandler.h" 62 62 #include "UINotificationCenter.h" 63 #include "UISession.h" 63 64 #ifdef VBOX_WS_MAC 64 65 # include "UICocoaApplication.h" … … 1079 1080 } 1080 1081 1081 /* Machine-logic getter: */ 1082 UIMachineLogic* UIKeyboardHandler::machineLogic() const 1083 { 1084 return m_pMachineLogic; 1085 } 1086 1087 /* Action-pool getter: */ 1088 UIActionPool* UIKeyboardHandler::actionPool() const 1082 UIActionPool *UIKeyboardHandler::actionPool() const 1089 1083 { 1090 1084 return machineLogic()->actionPool(); 1091 1085 } 1092 1086 1093 /* UI Session getter: */ 1094 UISession* UIKeyboardHandler::uisession() const 1087 UISession *UIKeyboardHandler::uisession() const 1095 1088 { 1096 1089 return machineLogic()->uisession(); 1090 } 1091 1092 UIMachine *UIKeyboardHandler::uimachine() const 1093 { 1094 return machineLogic()->uimachine(); 1097 1095 } 1098 1096 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h
r98103 r98378 51 51 class QWidget; 52 52 class UIActionPool; 53 class UIMachine; 54 class UIMachineLogic; 55 class UIMachineView; 56 class UIMachineWindow; 53 57 class UISession; 54 class UIMachineLogic;55 class UIMachineWindow;56 class UIMachineView;57 58 class CKeyboard; 58 59 #ifdef VBOX_WS_WIN … … 145 146 146 147 /* Common getters: */ 147 UIMachineLogic* machineLogic() const; 148 UIActionPool* actionPool() const; 149 UISession* uisession() const; 148 UIMachineLogic *machineLogic() const { return m_pMachineLogic; } 149 UIActionPool *actionPool() const; 150 UISession *uisession() const; 151 UIMachine *uimachine() const; 150 152 151 153 /** Returns the console's keyboard reference. */ -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp
r98376 r98378 234 234 bool UIMachine::prepare() 235 235 { 236 /* Try to prepare session UI: */237 if (! prepareSession())236 /* Try to create session UI: */ 237 if (!UISession::create(m_pSession, this)) 238 238 return false; 239 240 /* Make sure session UI created: */ 241 AssertReturn(m_pSession, false); 239 242 240 243 /* Cache media data early if necessary: */ 241 244 if (uiCommon().agressiveCaching()) 242 {243 AssertReturn(m_pSession, false);244 245 uiCommon().enumerateMedia(m_pSession->machineMedia()); 245 }246 246 247 247 /* Prepare stuff: */ … … 250 250 251 251 /* Load settings: */ 252 loadSe ssionSettings();252 loadSettings(); 253 253 254 254 /* Try to initialize session UI: */ 255 255 if (!uisession()->initialize()) 256 return false;257 258 /* True by default: */259 return true;260 }261 262 bool UIMachine::prepareSession()263 {264 /* Try to create session UI: */265 if (!UISession::create(m_pSession, this))266 256 return false; 267 257 … … 326 316 } 327 317 328 void UIMachine::loadSe ssionSettings()318 void UIMachine::loadSettings() 329 319 { 330 320 /* Load extra-data settings: */ -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h
r98376 r98378 117 117 /** Prepare routine. */ 118 118 bool prepare(); 119 /** Prepare routine: Session stuff. */ 120 bool prepareSession(); 121 /** Prepares machine-window icon. */ 119 /** Prepare routine: Machine-window icon. */ 122 120 void prepareMachineWindowIcon(); 123 121 /** Prepare routine: Machine-logic stuff. */ 124 122 void prepareMachineLogic(); 125 123 126 /* Settings stuff:*/127 void loadSe ssionSettings();124 /** Performs settings loading. */ 125 void loadSettings(); 128 126 129 127 /** Cleanup routine: Machine-logic stuff. */ … … 160 158 /** Holds the cached machine-window icon. */ 161 159 QIcon *m_pMachineWindowIcon; 160 162 161 #ifndef VBOX_WS_MAC 163 162 /** Holds redefined machine-window name postfix. */ -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
r98103 r98378 39 39 #include "UIDesktopWidgetWatchdog.h" 40 40 #include "UIExtraDataManager.h" 41 #include "UIMachine.h" 41 42 #include "UIMessageCenter.h" 42 43 #include "UISession.h" … … 259 260 /* Update console's display viewport and 3D overlay: */ 260 261 updateViewport(); 262 } 263 264 UIMachine *UIMachineView::uimachine() const 265 { 266 return machineWindow()->uimachine(); 261 267 } 262 268 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h
r98103 r98378 61 61 /* Forward declarations: */ 62 62 class UIActionPool; 63 class UI Session;63 class UIMachine; 64 64 class UIMachineLogic; 65 65 class UIMachineWindow; 66 66 class UINativeEventFilter; 67 class UISession; 67 68 class CConsole; 68 69 class CDisplay; … … 112 113 ulong screenId() const { return m_uScreenId; } 113 114 115 /** Returns the machine UI reference. */ 116 UIMachine *uimachine() const; 114 117 /** Returns the session UI reference. */ 115 118 UISession *uisession() const; -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp
r98103 r98378 36 36 #include "UIDesktopWidgetWatchdog.h" 37 37 #include "UIExtraDataManager.h" 38 #include "UIFrameBuffer.h" 39 #include "UIKeyboardHandler.h" 40 #include "UIMachine.h" 41 #include "UIMachineLogic.h" 42 #include "UIMachineView.h" 43 #include "UIMachineWindow.h" 38 44 #include "UIMessageCenter.h" 45 #include "UIMouseHandler.h" 39 46 #include "UINotificationCenter.h" 40 47 #include "UISession.h" 41 #include "UIMachineLogic.h"42 #include "UIMachineWindow.h"43 #include "UIMachineView.h"44 #include "UIKeyboardHandler.h"45 #include "UIMouseHandler.h"46 #include "UIFrameBuffer.h"47 48 #ifdef VBOX_WS_MAC 48 49 # include "VBoxUtils-darwin.h" … … 548 549 } 549 550 550 /* Machine-logic getter: */ 551 UIMachineLogic* UIMouseHandler::machineLogic() const 552 { 553 return m_pMachineLogic; 554 } 555 556 /* UI Session getter: */ 557 UISession* UIMouseHandler::uisession() const 551 UISession *UIMouseHandler::uisession() const 558 552 { 559 553 return machineLogic()->uisession(); 554 } 555 556 UIMachine *UIMouseHandler::uimachine() const 557 { 558 return machineLogic()->uimachine(); 560 559 } 561 560 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h
r98103 r98378 45 45 class QTouchEvent; 46 46 class QWidget; 47 class UIMachine; 48 class UIMachineLogic; 49 class UIMachineView; 50 class UIMachineWindow; 47 51 class UISession; 48 class UIMachineLogic;49 class UIMachineWindow;50 class UIMachineView;51 52 class CDisplay; 52 53 class CMouse; … … 107 108 108 109 /* Getters: */ 109 UIMachineLogic* machineLogic() const; 110 UISession* uisession() const; 110 UIMachineLogic *machineLogic() const { return m_pMachineLogic; } 111 UISession *uisession() const; 112 UIMachine *uimachine() const; 111 113 112 114 /** Returns the console's display reference. */
Note:
See TracChangeset
for help on using the changeset viewer.

