Changeset 2996 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 2, 2007 12:36:48 PM (18 years ago)

Author:

vboxsync

Message:

1952: Easy way to store the RELEASE log using the GUI:

1. Removed on/of action logic from the LogViewer.
2. Log text browser is 80 chars wide by default.
3. Tab widget margin 10 px wide.
4. Date+Time in the file name to save as is not have leading zeros stripped.
5. The entire tab widget is disabled when there are no logs and an appropriate message is shown inside.
6. The log window is not always "on-top" of the main selector and have its own task bar entry.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxSelectorWnd.h (modified) (1 diff)
• src/VBoxSelectorWnd.cpp (modified) (3 diffs)
• ui/VBoxVMLogViewer.ui (modified) (4 diffs)
• ui/VBoxVMLogViewer.ui.h (modified) (7 diffs)

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

@@ -72 +72 @@
     void vmDiscard();
     void vmRefresh();
-    void vmShowLogs (bool);
+    void vmShowLogs();
 
     void refreshVMList();

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

@@ -420 +420 @@
     vmShowLogsAction->setIconSet (VBoxGlobal::iconSet (
         "show_logs_16px.png", "show_logs_disabled_16px.png"));
-    vmShowLogsAction->setToggleAction (true);
 
     helpContentsAction = new QAction (this, "helpContentsAction");
@@ -576 +575 @@
     connect (vmDiscardAction, SIGNAL (activated()), this, SLOT (vmDiscard()));
     connect (vmRefreshAction, SIGNAL (activated()), this, SLOT (vmRefresh()));
-    connect (vmShowLogsAction, SIGNAL (toggled (bool)), this, SLOT (vmShowLogs (bool)));
+    connect (vmShowLogsAction, SIGNAL (activated()), this, SLOT (vmShowLogs()));
 
     connect (helpContentsAction, SIGNAL (activated()), this, SLOT(showHelpContents()));
@@ -927 +926 @@
 }
 
-void VBoxSelectorWnd::vmShowLogs (bool aOn)
-{
-    if (aOn)
-    {
-        VBoxVMLogViewer *logViewer = new VBoxVMLogViewer (this,
-            "logViewer", WType_TopLevel | WDestructiveClose);
-        VBoxVMListBoxItem *item = (VBoxVMListBoxItem *) vmListBox->selectedItem();
-        CMachine machine = item->machine();
-        logViewer->setup (machine, vmShowLogsAction);
-        logViewer->show();
-    }
+void VBoxSelectorWnd::vmShowLogs()
+{
+    VBoxVMListBoxItem *item = (VBoxVMListBoxItem *) vmListBox->selectedItem();
+    CMachine machine = item->machine();
+    VBoxVMLogViewer::createLogViewer (machine);
 }
 

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui

@@ -37 +37 @@
         <property name="name">
             <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>10</number>
         </property>
         <property name="spacing">
@@ -159 +162 @@
 </forwards>
 <variables>
+    <variable access="private">static VBoxVMLogViewer *mSelf;</variable>
+    <variable access="private">bool mFirstRun;</variable>
     <variable access="private">bool mIsPolished;</variable>
     <variable access="private">QSizeGrip *mSizeGrip;</variable>
     <variable access="private">CMachine mMachine;</variable>
-    <variable access="private">QAction *mAction;</variable>
     <variable access="private">QTabWidget *mLogList;</variable>
     <variable access="private">QStringList mLogFilesList;</variable>
@@ -169 +173 @@
 <slots>
     <slot access="pritave">refresh()</slot>
-    <slot access="private">suicide (bool)</slot>
     <slot access="private">save()</slot>
 </slots>
 <functions>
+    <function specifier="static">createLogViewer( CMachine&amp; )</function>
     <function access="private">init()</function>
     <function access="private">destroy()</function>
+    <function>setup( CMachine &amp; )</function>
+    <function returnType="const CMachine&amp;">machine()</function>
     <function access="pritave">languageChangeImp()</function>
     <function access="pritave" returnType="QPushButton*">searchDefaultButton()</function>
@@ -182 +188 @@
     <function access="protected">showEvent( QShowEvent* )</function>
     <function access="protected">resizeEvent( QResizeEvent* )</function>
-    <function>setup( CMachine &amp;, QAction* )</function>
     <function access="pritave">loadLogFile( const QString &amp; )</function>
     <function access="pritave" returnType="QTextBrowser*">createLogPage( const QString &amp; )</function>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui.h

@@ -31 +31 @@
 
 
+VBoxVMLogViewer *VBoxVMLogViewer::mSelf = 0;
+void VBoxVMLogViewer::createLogViewer (CMachine &aMachine)
+{
+    if (!mSelf)
+    {
+        /* creating new log viewer if there is no one existing */
+        mSelf = new VBoxVMLogViewer (0, "VBoxVMLogViewer",
+                                     WType_TopLevel | WDestructiveClose);
+    }
+
+    if (mSelf->machine() != aMachine)
+    {
+        /* re-read new machine data if the machine was changed or
+         * the log-viewer is opened for the first time */
+        mSelf->setup (aMachine);
+    }
+
+    mSelf->show();
+    mSelf->setWindowState (mSelf->windowState() & ~WindowMinimized);
+    mSelf->setActiveWindow();
+}
+
+
 void VBoxVMLogViewer::init()
 {
+    /* prepare dialog to first run */
+    mFirstRun = true;
+
     /* dialog initially is not polished */
     mIsPolished = false;
@@ -63 +89 @@
 void VBoxVMLogViewer::destroy()
 {
-    /* switch the related toggle action off */
-    mAction->setOn (false);
+    mSelf = 0;
+}
+
+
+void VBoxVMLogViewer::setup (CMachine &aMachine)
+{
+    /* saving related machine */
+    mMachine = aMachine;
+
+    /* reading log files */
+    refresh();
+
+    /* loading language constants */
+    languageChangeImp();
+}
+
+
+const CMachine& VBoxVMLogViewer::machine()
+{
+    return mMachine;
 }
 
@@ -200 +244 @@
 
 
-void VBoxVMLogViewer::setup (CMachine &aMachine, QAction *aAction)
-{
-    /* saving predefined variables */
-    mMachine = aMachine;
-    mAction = aAction;
-
-    /* setup self-destruction handler */
-    connect (mAction, SIGNAL (toggled (bool)), this, SLOT (suicide (bool)));
-
-    /* reading log files */
-    refresh();
-
-    /* loading language constants */
-    languageChangeImp();
-}
-
-
 void VBoxVMLogViewer::refresh()
 {
@@ -247 +274 @@
         QTextBrowser *dummyLog = createLogPage ("VBox.log");
         dummyLog->setTextFormat (Qt::RichText);
+        dummyLog->setWordWrap (QTextEdit::WidgetWidth);
         dummyLog->setText (tr ("<p>No log files found. Press the <b>Refresh</b> "
             "button to rescan the log folder <nobr><b>%1</b></nobr>.</p>")
@@ -252 +280 @@
     }
 
+    /* restore previous tab-widget margin which was reseted when
+     * the tab widget's children was removed */
+    mLogList->setMargin (10);
+
     /* show the first tab widget's page after the refresh */
     mLogList->showPage (mLogList->page(0));
+
+    /* enable/disable save button & tab widget according log presence */
     mSaveButton->setEnabled (isAnyLogPresent);
+    mLogList->setEnabled (isAnyLogPresent);
+
+    if (mFirstRun)
+    {
+        /* resize the whole log-viewer to fit 80 symbols in text-browser for
+         * the first time started */
+        QTextBrowser *firstPage = static_cast<QTextBrowser*> (mLogList->page(0));
+        int fullWidth = firstPage->fontMetrics().width (QChar ('x')) * 80 +
+                        firstPage->verticalScrollBar()->width() +
+                        firstPage->frameWidth() * 2 +
+                        1 * 2 /* some one-pixel margin */ +
+                        mLogList->margin() * 2 +
+                        centralWidget()->layout()->margin() * 2;
+        resize (fullWidth, height());
+        mFirstRun = false;
+    }
 }
 
@@ -280 +330 @@
     font.setFamily ("Courier New,courier");
     logViewer->setFont (font);
+    logViewer->setWordWrap (QTextEdit::NoWrap);
+    logViewer->setVScrollBarMode (QScrollView::AlwaysOn);
     mLogList->addTab (logViewer, aName);
     return logViewer;
@@ -285 +337 @@
 
 
-void VBoxVMLogViewer::suicide (bool aNo)
-{
-    if (!aNo) close();
-}
-
-
 void VBoxVMLogViewer::save()
 {
     /* prepare "save as" dialog */
-    QDate date = QDate::currentDate();
-    QTime time = QTime::currentTime();
-    QString defaultFileName = QString ("%1-%2-%3-%4-%5-%6-%7.log")
-        .arg (mMachine.GetName())
-        .arg (date.year()).arg (date.month()).arg (date.day())
-        .arg (time.hour()).arg (time.minute()).arg (time.second());
-    QString defaultFullName = QDir::convertSeparators (QDir::home().absPath() + "/" +
-                                                       defaultFileName);
+    QDate fullDate = QDate::currentDate();
+    QTime fullTime = QTime::currentTime();
+    QString date = fullDate.toString ("yyyy-MM-dd");
+    QString time = fullTime.toString ("hh-mm-ss");
+    QString defaultFileName = QString ("%1-%2-%3.log")
+        .arg (mMachine.GetName()).arg (date).arg (time);
+    QString defaultFullName = QDir::convertSeparators (QDir::home().absPath() +
+                                                       "/" + defaultFileName);
 
     QString newFileName = QFileDialog::getSaveFileName (defaultFullName,