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

Timestamp:

Nov 27, 2018 9:10:13 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Some tranlation and style corrections

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIGuestControlFileManagerDialog.cpp (modified) (1 diff)
• UIGuestControlFileManagerLogPanel.cpp (modified) (1 diff)
• UIGuestControlFileManagerOperationsPanel.cpp (modified) (1 diff)
• UIGuestControlFileManagerSessionPanel.cpp (modified) (7 diffs)
• UIGuestControlFileManagerSessionPanel.h (modified) (3 diffs)
• UIGuestControlFileManagerSettingsPanel.cpp (modified) (2 diffs)
• UIGuestControlFileManagerSettingsPanel.h (modified) (2 diffs)
• UIGuestControlFileModel.h (modified) (3 diffs)

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

@@ -75 +75 @@
 {
     /* Translate window title: */
-    setWindowTitle(tr("%1 - Guest Control").arg(m_strMachineName));
+    setWindowTitle(UIGuestControlFileManager::tr("%1 - Guest Control").arg(m_strMachineName));
     /* Translate buttons: */
     button(ButtonType_Close)->setText(UIGuestControlFileManager::tr("Close"));

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

@@ -71 +71 @@
 {
     QMenu *menu = createStandardContextMenu();
-    void sltClear();
 
-    QAction *pClearAction = menu->addAction(tr("Clear"));
+    QAction *pClearAction = menu->addAction(UIGuestControlFileManager::tr("Clear"));
     connect(pClearAction, &QAction::triggered, this, &UIFileManagerLogViewer::sltClear);
     menu->exec(event->globalPos());

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

@@ -144 +144 @@
     if (m_pCancelButton)
     {
-        //m_pCancelButton->setIcon(UIIconPool::iconSet(":/close_16px.png"));
         m_pCancelButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_DockWidgetCloseButton));
-        //m_pCancelButton->setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } QToolButton::menu-indicator {image: none;}");
         m_pCancelButton->setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } ");
         const QSize sh = m_pCancelButton->sizeHint();

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

@@ -41 +41 @@
 *   UIGuestSessionCreateWidget definition.                                                                                   *
 *********************************************************************************************************************************/
-
+/** A QWidget extension containing text entry fields for password and username and buttons to
+ *  start/stop a guest session. */
 class UIGuestSessionCreateWidget : public QIWithRetranslateUI<QWidget>
 {
@@ -54 +55 @@
 
     UIGuestSessionCreateWidget(QWidget *pParent = 0);
+    /** Disables certain widget after a guest session has been created. */
     void switchSessionCreateMode();
+    /** Makes sure certain widgets are enabled so that a guest session can be created. */
     void switchSessionCloseMode();
 
@@ -68 +71 @@
 
 private:
-    void         prepareWidgets();
+
+    void          prepareWidgets();
     QILineEdit   *m_pUserNameEdit;
     QILineEdit   *m_pPasswordEdit;
@@ -75 +79 @@
     QHBoxLayout  *m_pMainLayout;
     QCheckBox    *m_pShowPasswordCheckBox;
-
 };
 
@@ -112 +115 @@
     {
         m_pMainLayout->addWidget(m_pPasswordEdit, 2);
-        m_pPasswordEdit->setPlaceholderText("Password");
+        m_pPasswordEdit->setPlaceholderText(UIGuestControlFileManager::tr("Password"));
         m_pPasswordEdit->setEchoMode(QLineEdit::Password);
     }
@@ -119 +122 @@
     if (m_pShowPasswordCheckBox)
     {
-        m_pShowPasswordCheckBox->setText("Show Password");
+        m_pShowPasswordCheckBox->setText(UIGuestControlFileManager::tr("Show Password"));
         m_pMainLayout->addWidget(m_pShowPasswordCheckBox);
         connect(m_pShowPasswordCheckBox, &QCheckBox::toggled,
@@ -162 +165 @@
     if (m_pUserNameEdit)
     {
-        m_pUserNameEdit->setToolTip(QApplication::translate("UIGuestControlFileManager", "User name to authenticate session creation"));
-        m_pUserNameEdit->setPlaceholderText(QApplication::translate("UIGuestControlFileManager", "User Name"));
-
-    }
-    if (m_pPasswordEdit)
-    {
-        m_pPasswordEdit->setToolTip(QApplication::translate("UIGuestControlFileManager", "Password to authenticate session creation"));
-        m_pPasswordEdit->setPlaceholderText(QApplication::translate("UIGuestControlFileManager", "Password"));
-    }
-
-    if (m_pCreateButton)
-        m_pCreateButton->setText(QApplication::translate("UIGuestControlFileManager", "Create Session"));
-    if (m_pCloseButton)
-        m_pCloseButton->setText(QApplication::translate("UIGuestControlFileManager", "Close Session"));
+        m_pUserNameEdit->setToolTip(UIGuestControlFileManager::tr("User name to authenticate session creation"));
+        m_pUserNameEdit->setPlaceholderText(UIGuestControlFileManager::tr("User Name"));
+
+    }
+    if (m_pPasswordEdit)
+    {
+        m_pPasswordEdit->setToolTip(UIGuestControlFileManager::tr("Password to authenticate session creation"));
+        m_pPasswordEdit->setPlaceholderText(UIGuestControlFileManager::tr("Password"));
+    }
+
+    if (m_pCreateButton)
+        m_pCreateButton->setText(UIGuestControlFileManager::tr("Create Session"));
+    if (m_pCloseButton)
+        m_pCloseButton->setText(UIGuestControlFileManager::tr("Close Session"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSessionPanel.h

@@ -27 +27 @@
 class UIGuestSessionCreateWidget;
 
-/** UIVMLogViewerPanel extension providing GUI to manage logviewer settings. */
+/** UIGuestControlFileManagerPanel extension providing GUI for creating/stopping a guest session. */
 class UIGuestControlFileManagerSessionPanel : public UIGuestControlFileManagerPanel
 {
@@ -35 +35 @@
 
     UIGuestControlFileManagerSessionPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent);
-    void switchSessionCloseMode();
-    void switchSessionCreateMode();
+    /** @name Enable/disable member widget wrt. guest session status.
+      * @{ */
+        void switchSessionCloseMode();
+        void switchSessionCreateMode();
+    /** @} */
     virtual QString panelName() const /* override */;
 
@@ -48 +51 @@
     virtual void prepareWidgets() /* override */;
     virtual void prepareConnections() /* override */;
-
-    /** Handles the translation event. */
     void retranslateUi();
-
-private slots:
-
 
 private:

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

@@ -165 +165 @@
     {
         m_pDeleteConfirmationCheckBox->setText(UIGuestControlFileManager::tr("Ask before delete"));
-        m_pDeleteConfirmationCheckBox->setToolTip(UIGuestControlFileManager::tr("List directories before files"));
+        m_pDeleteConfirmationCheckBox->setToolTip(UIGuestControlFileManager::tr("Show a confirmation dialog "
+                                                                                "before deleting files and directories"));
     }
 
@@ -171 +172 @@
     {
         m_pHumanReabableSizesCheckBox->setText(UIGuestControlFileManager::tr("Human readable sizes"));
-        m_pHumanReabableSizesCheckBox->setToolTip(UIGuestControlFileManager::tr("List directories before files"));
+        m_pHumanReabableSizesCheckBox->setToolTip(UIGuestControlFileManager::tr("Show file/directory sizes in human "
+                                                                                "readable format rather than in bytes"));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.h

@@ -29 +29 @@
 class UIGuestControlFileManagerSettings;
 
-/** UIVMLogViewerPanel extension providing GUI to manage logviewer settings. */
+/** UIGuestControlFileManagerPanel extension to change file manager options. It directly
+ *  modifies the options through the passed UIGuestControlFileManagerOptions instance. */
 class UIGuestControlFileManagerSettingsPanel : public UIGuestControlFileManagerPanel
 {
@@ -63 +64 @@
 private:
 
-    QCheckBox          *m_pListDirectoriesOnTopCheckBox;
-    QCheckBox          *m_pDeleteConfirmationCheckBox;
-    QCheckBox          *m_pHumanReabableSizesCheckBox;
-
+    QCheckBox  *m_pListDirectoriesOnTopCheckBox;
+    QCheckBox  *m_pDeleteConfirmationCheckBox;
+    QCheckBox  *m_pHumanReabableSizesCheckBox;
     UIGuestControlFileManagerSettings *m_pFileManagerSettings;
 };

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.h

@@ -41 +41 @@
 
 /** A QSortFilterProxyModel extension used in file tables. Modifies some
-  * of the base class behavior like lessThan(..) */
+ *  of the base class behavior like lessThan(..) */
 class UIGuestControlFileProxyModel : public QSortFilterProxyModel
 {
@@ -57 +57 @@
 
 /** UIGuestControlFileModel serves as the model for a file structure.
-  * it supports a tree level hierarchy which can be displayed with
-  * QTableView and/or QTreeView. Note the file structure data is not
-  * kept by the model but rather by the containing widget which also servers
-  * as the interface to functionality this model provides.*/
+ *  it supports a tree level hierarchy which can be displayed with
+ *  QTableView and/or QTreeView. Note the file structure data is not
+ *  kept by the model but rather by the containing widget which also servers
+ *  as the interface to functionality that this model provides.*/
 class UIGuestControlFileModel : public QAbstractItemModel
 {
@@ -76 +76 @@
     Qt::ItemFlags  flags(const QModelIndex &index) const /* override */;
     QVariant       headerData(int section, Qt::Orientation orientation,
-    int role = Qt::DisplayRole) const /* override */;
+                              int role = Qt::DisplayRole) const /* override */;
     QModelIndex    index(int row, int column,
                       const QModelIndex &parent = QModelIndex()) const /* override */;