Changeset 82605 in vbox for trunk/src

Timestamp:

Dec 17, 2019 12:32:26 PM (5 years ago)

Author:

vboxsync

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

135492

Message:

FE/Qt: Dealing with todo's mentioned r135326. Part 1.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (2 diffs)
• converter/UIConverterBackendCOM.cpp (modified) (2 diffs)
• globals/UICustomFileSystemModel.cpp (modified) (1 diff)
• guestctrl/UIFileManagerTable.cpp (modified) (2 diffs)
• runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -152 +152 @@
 template<> SHARED_LIBRARY_STUFF bool canConvert<KChipsetType>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<KNATProtocol>();
-template<> SHARED_LIBRARY_STUFF bool canConvert<KGuestSessionStatus>();
-template<> SHARED_LIBRARY_STUFF bool canConvert<KProcessStatus>();
 
 
@@ -308 +306 @@
 template<> SHARED_LIBRARY_STUFF QString toInternalString(const KNATProtocol &protocol);
 template<> SHARED_LIBRARY_STUFF KNATProtocol fromInternalString<KNATProtocol>(const QString &strProtocol);
-template<> SHARED_LIBRARY_STUFF QString toInternalString(const KGuestSessionStatus &status);
-template<> SHARED_LIBRARY_STUFF KGuestSessionStatus fromInternalString<KGuestSessionStatus>(const QString &strStatus);
-template<> SHARED_LIBRARY_STUFF QString toInternalString(const KProcessStatus &status);
-template<> SHARED_LIBRARY_STUFF KProcessStatus fromInternalString<KProcessStatus>(const QString &strStatus);
 
 

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -54 +54 @@
 template<> bool canConvert<KChipsetType>() { return true; }
 template<> bool canConvert<KNATProtocol>() { return true; }
-template<> bool canConvert<KGuestSessionStatus>() { return true; }
-template<> bool canConvert<KProcessStatus>() { return true; }
 
 /* QColor <= KMachineState: */
@@ -702 +700 @@
     return values.at(keys.indexOf(QRegExp(strProtocol, Qt::CaseInsensitive)));
 }
-
-/// @todo Internal strings never being translated.
-///       If that is user-visible string then it is toString() and then each word should be
-///       translated separately (i.e. "TimedOutKilled" should be "Timed Out Killed").
-///       If that is purely internal thing used to tag something or save value to extra-data
-///       then this is toInternalString() indeed but no QApplication::translate should be used.
-template<> QString toInternalString(const KGuestSessionStatus &enmStatus)
-{
-    switch (enmStatus)
-    {
-        case KGuestSessionStatus_Undefined:           return QApplication::translate("UICommon", "Undefined",          "GuestSessionStatus");
-        case KGuestSessionStatus_Starting:            return QApplication::translate("UICommon", "Starting",           "GuestSessionStatus");
-        case KGuestSessionStatus_Started:             return QApplication::translate("UICommon", "Started",            "GuestSessionStatus");
-        case KGuestSessionStatus_Terminating:         return QApplication::translate("UICommon", "Terminating",        "GuestSessionStatus");
-        case KGuestSessionStatus_Terminated:          return QApplication::translate("UICommon", "Terminated",         "GuestSessionStatus");
-        case KGuestSessionStatus_TimedOutKilled:      return QApplication::translate("UICommon", "TimedOutKilled",     "GuestSessionStatus");
-        case KGuestSessionStatus_TimedOutAbnormally:  return QApplication::translate("UICommon", "TimedOutAbnormally", "GuestSessionStatus");
-        case KGuestSessionStatus_Down:                return QApplication::translate("UICommon", "Down",               "GuestSessionStatus");
-        case KGuestSessionStatus_Error:               return QApplication::translate("UICommon", "Error",              "GuestSessionStatus");
-        default: AssertMsgFailed(("No text for %d", enmStatus)); break;
-    }
-    return QString();
-}
-
-/// @todo Internal strings never being translated.
-///       If that is user-visible string then it is fromString() and then each word should be
-///       translated separately (i.e. "TimedOutKilled" should be "Timed Out Killed").
-///       If that is purely internal thing used to tag something or save value to extra-data
-///       then this is fromInternalString() indeed but no QApplication::translate should be used.
-template<> KGuestSessionStatus fromInternalString<KGuestSessionStatus>(const QString &strStatus)
-{
-    QHash<QString, KGuestSessionStatus> list;
-    list.insert(QApplication::translate("UICommon", "Undefined",          "GuestSessionStatus"),  KGuestSessionStatus_Undefined);
-    list.insert(QApplication::translate("UICommon", "Starting",           "GuestSessionStatus"),  KGuestSessionStatus_Starting);
-    list.insert(QApplication::translate("UICommon", "Started",            "GuestSessionStatus"),  KGuestSessionStatus_Started);
-    list.insert(QApplication::translate("UICommon", "Terminating",        "GuestSessionStatus"),  KGuestSessionStatus_Terminating);
-    list.insert(QApplication::translate("UICommon", "Terminated",         "GuestSessionStatus"),  KGuestSessionStatus_Terminated);
-    list.insert(QApplication::translate("UICommon", "TimedOutKilled",     "GuestSessionStatus"),  KGuestSessionStatus_TimedOutKilled);
-    list.insert(QApplication::translate("UICommon", "TimedOutAbnormally", "GuestSessionStatus"),  KGuestSessionStatus_TimedOutAbnormally);
-    list.insert(QApplication::translate("UICommon", "Down",               "GuestSessionStatus"),  KGuestSessionStatus_Down);
-    list.insert(QApplication::translate("UICommon", "Error",              "GuestSessionStatus"),  KGuestSessionStatus_Error);
-    if (!list.contains(strStatus))
-    {
-        AssertMsgFailed(("No value for '%s'", strStatus.toUtf8().constData()));
-    }
-    return list.value(strStatus, KGuestSessionStatus_Error);
-}
-
-/// @todo Internal strings never being translated.
-///       If that is user-visible string then it is toString() and then each word should be
-///       translated separately (i.e. "TimedOutKilled" should be "Timed Out Killed").
-///       If that is purely internal thing used to tag something or save value to extra-data
-///       then this is toInternalString() indeed but no QApplication::translate should be used.
-template<> QString toInternalString(const KProcessStatus &enmStatus)
-{
-    switch (enmStatus)
-    {
-        case KProcessStatus_Undefined:            return QApplication::translate("UICommon", "Undefined",            "ProcessStatus");
-        case KProcessStatus_Starting:             return QApplication::translate("UICommon", "Starting",             "ProcessStatus");
-        case KProcessStatus_Started:              return QApplication::translate("UICommon", "Started",              "ProcessStatus");
-        case KProcessStatus_Paused:               return QApplication::translate("UICommon", "Paused",               "ProcessStatus");
-        case KProcessStatus_Terminating:          return QApplication::translate("UICommon", "Terminating",          "ProcessStatus");
-        case KProcessStatus_TerminatedNormally:   return QApplication::translate("UICommon", "TerminatedNormally",   "ProcessStatus");
-        case KProcessStatus_TerminatedSignal:     return QApplication::translate("UICommon", "TerminatedSignal",     "ProcessStatus");
-        case KProcessStatus_TerminatedAbnormally: return QApplication::translate("UICommon", "TerminatedAbnormally", "ProcessStatus");
-        case KProcessStatus_TimedOutKilled:       return QApplication::translate("UICommon", "TimedOutKilled",       "ProcessStatus");
-        case KProcessStatus_TimedOutAbnormally:   return QApplication::translate("UICommon", "TimedOutAbnormally",   "ProcessStatus");
-        case KProcessStatus_Down:                 return QApplication::translate("UICommon", "Down",                 "ProcessStatus");
-        case KProcessStatus_Error:                return QApplication::translate("UICommon", "Error",                "ProcessStatus");
-        default: AssertMsgFailed(("No text for %d", enmStatus)); break;
-    }
-    return QString();
-}
-
-/// @todo Internal strings never being translated.
-///       If that is user-visible string then it is fromString() and then each word should be
-///       translated separately (i.e. "TimedOutKilled" should be "Timed Out Killed").
-///       If that is purely internal thing used to tag something or save value to extra-data
-///       then this is fromInternalString() indeed but no QApplication::translate should be used.
-template<> KProcessStatus fromInternalString<KProcessStatus>(const QString &strStatus)
-{
-    QHash<QString, KProcessStatus> list;
-    list.insert(QApplication::translate("UICommon", "Undefined",            "ProcessStatus"),  KProcessStatus_Undefined);
-    list.insert(QApplication::translate("UICommon", "Starting",             "ProcessStatus"),  KProcessStatus_Starting);
-    list.insert(QApplication::translate("UICommon", "Started",              "ProcessStatus"),  KProcessStatus_Started);
-    list.insert(QApplication::translate("UICommon", "Paused",               "ProcessStatus"),  KProcessStatus_Paused);
-    list.insert(QApplication::translate("UICommon", "Terminating",          "ProcessStatus"),  KProcessStatus_Terminating);
-    list.insert(QApplication::translate("UICommon", "TerminatedNormally",   "ProcessStatus"),  KProcessStatus_TerminatedNormally);
-    list.insert(QApplication::translate("UICommon", "TerminatedSignal",     "ProcessStatus"),  KProcessStatus_TerminatedSignal);
-    list.insert(QApplication::translate("UICommon", "TerminatedAbnormally", "ProcessStatus"),  KProcessStatus_TerminatedAbnormally);
-    list.insert(QApplication::translate("UICommon", "TimedOutKilled",       "ProcessStatus"),  KProcessStatus_TimedOutKilled);
-    list.insert(QApplication::translate("UICommon", "TimedOutAbnormally",   "ProcessStatus"),  KProcessStatus_TimedOutAbnormally);
-    list.insert(QApplication::translate("UICommon", "Down",                 "ProcessStatus"),  KProcessStatus_Down);
-    list.insert(QApplication::translate("UICommon", "Error",                "ProcessStatus"),  KProcessStatus_Error);
-
-    if (!list.contains(strStatus))
-    {
-        AssertMsgFailed(("No value for '%s'", strStatus.toUtf8().constData()));
-    }
-    return list.value(strStatus, KProcessStatus_Error);
-
-}

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.cpp

@@ -611 +611 @@
     m_pRootItem->setData(UICustomFileSystemModel::tr("Owner"), UICustomFileSystemModelColumn_Owner);
     m_pRootItem->setData(UICustomFileSystemModel::tr("Permissions"), UICustomFileSystemModelColumn_Permissions);
-    /// @todo Is this guy really user-readable. If that is so then each word should
-    ///       be translated separately (i.e. "LocalPath" should be "Local Path").
-    m_pRootItem->setData(UICustomFileSystemModel::tr("LocalPath"), UICustomFileSystemModelColumn_LocalPath);
+    m_pRootItem->setData(UICustomFileSystemModel::tr("Local Path"), UICustomFileSystemModelColumn_LocalPath);
     m_pRootItem->setData(UICustomFileSystemModel::tr("Path"), UICustomFileSystemModelColumn_Path);
 }

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -1109 +1109 @@
         return;
 
-    /// @todo Is this guy really user-readable. If that is so then each word should
-    ///       be translated separately (i.e. "NewDirectory" should be "New Directory").
-    QString newDirectoryName(UICustomFileSystemModel::tr("NewDirectory"));
+    QString newDirectoryName(UICustomFileSystemModel::tr("New Directory"));
 
     if (!createDirectory(parentFolderItem->path(), newDirectoryName))
@@ -1303 +1301 @@
     ///       it does support <br> tags.
     if (m_pWarningLabel)
-        m_pWarningLabel->setText(UIFileManager::tr("No Guest Session\nPlease use the Session Panel to start \na guest session"));
+        m_pWarningLabel->setText(UIFileManager::tr("No Guest Session found!<br>Please use the Session Panel to start a new guest session"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -113 +113 @@
     m_pTabWidget->setTabText(1, tr("&Runtime Information"));
     m_pTabWidget->setTabText(2, tr("Performance &Monitor"));
-    /// @todo Shouldn't that be just "&Guest Control"?
-    m_pTabWidget->setTabText(3, tr("Guest Control &Session Information"));
+    m_pTabWidget->setTabText(3, tr("&Guest Control"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -2448 +2448 @@
     dialog.setWindowTitle(UISoftKeyboard::tr("Provide a file name"));
     dialog.setTextValue(currentLayout.name());
-    /// @todo Using \n breaks between words of the same sentence isn't allowed. This isn't easily translateable to other
-    ///       languages.  Moreover, using of \n isn't allowed at all.  This isn't exactly a cross-platform identifier.
-    ///       You can use only <br> between sentenses of the same paragraph. Most of Qt text is HTML by definition, so
-    ///       it does support <br> tags.
-    dialog.setLabelText(QString("%1 %2").arg(UISoftKeyboard::tr("The file will be saved under:\n")).arg(strHomeFolder));
+    dialog.setLabelText(QString("%1 %2").arg(UISoftKeyboard::tr("The file will be saved under:<br>")).arg(strHomeFolder));
     if (dialog.exec() == QDialog::Rejected)
         return;