Changeset 22391 in vbox

Timestamp:

Aug 21, 2009 4:05:59 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: show some special version number for bleeding edge builds

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/VBoxAboutDlg.cpp (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -195 +195 @@
 VirtualBox_src/main.cpp_DEFS += VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\"
 VirtualBox_src/main.cpp_DEPS += $(VBOX_VERSION_MK)
+
+ifdef VBOX_BLEEDING_EDGE
+VirtualBox_src/VBoxConsoleWnd.cpp_DEFS += \
+    VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" \
+    VBOX_SVN_REV=\"$(VBOX_SVN_REV)\" \
+    VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
+VirtualBox_src/VBoxSelectorWnd.cpp_DEFS += \
+    VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" \
+    VBOX_SVN_REV=\"$(VBOX_SVN_REV)\" \
+    VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
+VirtualBox_src/VBoxAboutDlg.cpp_DEFS += \
+    VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\"
+VirtualBox_src/VBoxConsoleWnd.cpp_DEPS += $(VBOX_VERSION_MK) $(VBOX_SVN_REV_KMK)
+VirtualBox_src/VBoxSelectorWnd.cpp_DEPS += $(VBOX_VERSION_MK) $(VBOX_SVN_REV_KMK)
+endif
 
 VirtualBox_INCS           = \

trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp

@@ -47 +47 @@
     setWindowTitle (tr ("VirtualBox - About"));
     QString aboutText =  tr ("VirtualBox Graphical User Interface");
+#ifdef VBOX_BLEEDING_EDGE
+    QString versionText = "EXPERIMENTAL build %1 - " + QString(VBOX_BLEEDING_EDGE);
+#else
     QString versionText = tr ("Version %1");
+#endif
 #if VBOX_OSE
     mAboutText = aboutText + " " + versionText.arg (mVersion) + "\n" +

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1643 +1643 @@
 #endif
 
+#ifdef VBOX_BLEEDING_EDGE
+    caption_prefix += QString(" EXPERIMENTAL build "VBOX_VERSION_STRING" r"VBOX_SVN_REV" - "VBOX_BLEEDING_EDGE);
+#endif
     /*
      *  Note: All action shortcuts should be added to the menu text in the

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -1286 +1286 @@
 {
 #ifdef VBOX_OSE
-    setWindowTitle (tr ("VirtualBox OSE"));
+    QString title (tr ("VirtualBox OSE"));
 #else
-    setWindowTitle (tr ("Sun VirtualBox"));
+    QString title (tr ("Sun VirtualBox"));
 #endif
+
+#ifdef VBOX_BLEEDING_EDGE
+    title += QString(" EXPERIMENTAL build "VBOX_VERSION_STRING" r"VBOX_SVN_REV" - "VBOX_BLEEDING_EDGE);
+#endif
+
+    setWindowTitle (title);
 
     mVmTabWidget->setTabText (mVmTabWidget->indexOf (mVmDetailsView), tr ("&Details"));