Changeset 2736 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

May 21, 2007 2:41:11 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

21337

Message:

1. Messages for “your additions are outdated” and “there is a newer additions version” moved into ProblemReporter class.
2. AutoResize event class replaced with zero-single-shot timer with the required slot for the exiting from full-screen and maximized modes.
3. mIsAutoresizeEnabled flag replaced with mIsAdditionsActive which reflects the guest additions status and might be useful in different places to point up are additions activated or not. Currently it is used in "auto-resize mode active possibility" determination.
4. Linux SDL Full-screen mode entering issue (screen is not refreshed in case of there is no changes on the screen and auto-resize mode is off) fixed.

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxConsoleView.h (modified) (3 diffs)
• VBoxConsoleWnd.h (modified) (1 diff)
• VBoxDefs.h (modified) (1 diff)
• VBoxProblemReporter.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -49 +49 @@
 class QMenuData;
 
-/** Auto-resize event.
-  * Useful for posting into events queue to be processed just after all
-  * QEvent::Resize & QEvent::WindowStateChange events currently posted.
-  * This is necessary due to these two events - QEvent::Resize &
-  * QEvent::WindowStateChange are processed in different sequence
-  * under Win32 and X11. */
-class AutoResizeEvent : public QEvent
-{
-public:
-    AutoResizeEvent () :
-        QEvent ((QEvent::Type) VBoxDefs::AutoResizeEventType) {}
-};
-
 class VBoxConsoleView : public QScrollView
 {
@@ -183 +170 @@
     static void dimImage (QImage &img);
 
-    void performAutoResize();
-
 private slots:
+
+    void exitFullScreen();
 
     void doResizeHint();
@@ -218 +205 @@
 
     bool ignore_mainwnd_resize : 1;
-    bool autoresize_guest : 1;
+    bool mAutoresizeGuest : 1;
+
+    bool mIsAdditionsActive;
 
     bool mfNumLock : 1;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -249 +249 @@
     CSession csession;
 
-    bool mIsAutoresizeEnabled;
-
     // widgets
     VBoxConsoleView *console;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h

@@ -129 +129 @@
         MachineStateChangeEventType,
         AdditionsStateChangeEventType,
-        AutoResizeEventType,
         MachineDataChangeEventType,
         MachineRegisteredEventType,

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -200 +200 @@
     bool confirmReleaseImage (QWidget*, QString);
 
+    void warnAboutOldAdditions (QWidget*, const QString &);
+    void warnAboutNewAdditions (QWidget*, const QString &);
+
     bool remindAboutInputCapture();
     bool remindAboutAutoCapture();