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

Timestamp:

May 21, 2008 8:30:39 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: NLS: Prepare to synchronize 1.6.2.

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)
• VirtualBox/ui/VBoxVMInformationDlg.ui.h (modified) (1 diff)
• VirtualBox4/src/VBoxConsoleWnd.cpp (modified) (5 diffs)

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

@@ -1561 +1561 @@
 
     if (dbgStatisticsAction)
-        dbgStatisticsAction->setMenuText (tr ("&Statistics..."));
+        dbgStatisticsAction->setMenuText (tr ("&Statistics...", "debug action"));
     if (dbgCommandLineAction)
-        dbgCommandLineAction->setMenuText (tr ("&Command line..."));
+        dbgCommandLineAction->setMenuText (tr ("&Command Line...", "debug action"));
     if (dbgLoggingAction)
-        dbgLoggingAction->setMenuText (tr ("&Logging..."));
+        dbgLoggingAction->setMenuText (tr ("&Logging...", "debug action"));
 #endif
 

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

@@ -706 +706 @@
 }
 
-
-/* Old code for two columns support */
-#if 0
-void VBoxVMInformationDlg::refreshStatistics()
-{
-    QString table = "<p><table border=0 cellspacing=0 cellpadding=0 width=100%>%1</table></p>";
-    QString hdrRow = "<tr><td align=left><img src='%1'></td><td colspan=4><b>%2</b></td></tr>";
-    QString subRow = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td>"
-                                  "<td colspan=2><nobr><u>%2</u></nobr></td></tr>";
-    QString bdyRow = "<tr><td></td><td><nobr>%1</nobr></td><td width=50%><nobr>%2</nobr></td>"
-                                  "<td><nobr>%3</nobr></td><td width=50%><nobr>%4</nobr></td></tr>";
-    QString paragraph = "<tr><td colspan=5></td></tr>";
-    QString interline = "<tr><td colspan=5><font size=1>&nbsp;</font></td></tr>";
-    QString result;
-
-    /* Screen & VT-X Runtime Parameters */
-    if (!mSession.isNull())
-    {
-        CConsole console = mSession.GetConsole();
-        ULONG bpp = console.GetDisplay().GetBitsPerPixel();
-        QString resolution = QString ("%1x%2")
-            .arg (console.GetDisplay().GetWidth())
-            .arg (console.GetDisplay().GetHeight());
-        if (bpp)
-            resolution += QString ("x%1").arg (bpp);
-        QString virt = console.GetDebugger().GetHWVirtExEnabled() ?
-            tr ("Enabled") : tr ("Disabled");
-
-        result += hdrRow.arg ("state_running_16px.png").arg (tr ("Runtime Attributes"));
-        result += bdyRow.arg (tr ("Screen Resolution")) .arg (resolution)
-                        .arg (tr ("Hardware Virtualization")).arg (virt);
-        result += paragraph;
-    }
-
-    /* Hard Disk Statistics. */
-    result += hdrRow.arg ("hd_16px.png").arg (tr ("Hard Disks Statistics"));
-
-    result += subRow.arg (tr ("Primary Master")).arg (tr ("Primary Slave"));
-    result += composeArticle (QString::null, 0, 1, 4, 5);
-    result += composeArticle ("B", 2, 3, 6, 7);
-    result += interline;
-
-    result += subRow.arg (tr ("Secondary Master")).arg (tr ("Secondary Slave"));
-    result += composeArticle (QString::null, 8, 9, 12, 13);
-    result += composeArticle ("B", 10, 11, 14, 15);
-    result += paragraph;
-
-    /* Network Adapters Statistics. Counters are currently missed. */
-    result += hdrRow.arg ("nw_16px.png").arg (tr ("Network Adapter Statistics"));
-    result += subRow.arg (tr ("Adapter 1")).arg (tr ("Adapter 2"));
-    result += composeArticle ("B", 16, 17, 18, 19);
-
-    /* Show full composed page. */
-    mStatisticText->setText (table.arg (result));
-}
-
-
-QString VBoxVMInformationDlg::composeArticle (const QString &aUnits,
-                                              int aStart1, int aFinish1,
-                                              int aStart2, int aFinish2)
-{
-    QString bdyRow = "<tr><td></td><td><nobr>%1</nobr></td><td width=50%><nobr>%2</nobr></td>"
-                                  "<td><nobr>%3</nobr></td><td width=50%><nobr>%4</nobr></td></tr>";
-
-    QString result;
-
-    int id1 = aStart1, id2 = aStart2;
-    while (id1 <= aFinish1 || id2 <= aFinish2)
-    {
-        QString line = bdyRow;
-        /* Processing first column */
-        if (id1 > aFinish1)
-        {
-            line = line.arg (QString::null).arg (QString::null)
-                       .arg (QString::null).arg (QString::null);
-        }
-        else if (mValuesMap.contains (mNamesMap.keys() [id1]))
-        {
-            line = line.arg (mNamesMap.values() [id1]);
-            ULONG64 value = mValuesMap.values() [id1].toULongLong();
-            line = aUnits.isNull() ?
-                line.arg (QString ("%L1").arg (value)) :
-                line.arg (QString ("%L1 %2").arg (value).arg (aUnits));
-        }
-        /* Processing second column */
-        if (id2 > aFinish2)
-        {
-            line = line.arg (QString::null).arg (QString::null)
-                       .arg (QString::null).arg (QString::null);
-        }
-        else if (mValuesMap.contains (mNamesMap.keys() [id2]))
-        {
-            line = line.arg (mNamesMap.values() [id2]);
-            ULONG64 value = mValuesMap.values() [id2].toULongLong();
-            line = aUnits.isNull() ?
-                line.arg (QString ("%L1").arg (value)) :
-                line.arg (QString ("%L1 %2").arg (value).arg (aUnits));
-        }
-        result += line;
-        ++ id1; ++ id2;
-    }
-
-    return result;
-}
-#endif
-

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

@@ -1469 +1469 @@
             break;
         }
-        default: 
+        default:
             break;
     }
@@ -1583 +1583 @@
 
     if (dbgStatisticsAction)
-        dbgStatisticsAction->setText (tr ("&Statistics..."));
+        dbgStatisticsAction->setText (tr ("&Statistics...", "debug action"));
     if (dbgCommandLineAction)
-        dbgCommandLineAction->setText (tr ("&Command line..."));
+        dbgCommandLineAction->setText (tr ("&Command Line...", "debug action"));
 #endif
 
@@ -1617 +1617 @@
     /* main menu & seamless popup menu */
 
-    mVMMenu->setTitle (tr ("&Machine")); 
+    mVMMenu->setTitle (tr ("&Machine"));
 //    mVMMenu->setIcon (VBoxGlobal::iconSet (":/machine_16px.png"));
 
@@ -2238 +2238 @@
             WindowRef windowRef = ::darwinToWindowRef (this);
             Assert (VALID_PTR (windowRef));
-            /* See above. 
+            /* See above.
             status = RemoveEventHandler (mDarwinRegionEventHandlerRef);
             AssertCarbonOSStatus (status);
@@ -3325 +3325 @@
         console->setAutoresizeGuest (   mIsGraphicsSupported
                                      && vmAutoresizeGuestAction->isChecked());
-        vmAutoresizeGuestAction->setEnabled (mIsGraphicsSupported);        
+        vmAutoresizeGuestAction->setEnabled (mIsGraphicsSupported);
     }