Changeset 92504 in vbox

Timestamp:

Nov 18, 2021 7:30:14 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10141: Some more improvements on viso creator dialog

• Updating dialog window title as VISO name changes
• Actively enabling/disabling file actions with selection changes

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoBrowserBase.h (modified) (1 diff)
• UIVisoContentBrowser.cpp (modified) (2 diffs)
• UIVisoContentBrowser.h (modified) (1 diff)
• UIVisoCreator.cpp (modified) (6 diffs)
• UIVisoCreator.h (modified) (3 diffs)
• UIVisoHostBrowser.cpp (modified) (1 diff)
• UIVisoHostBrowser.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoBrowserBase.h

@@ -53 +53 @@
     bool isTreeViewVisible() const;
     void hideTreeView();
+    virtual bool tableViewHasSelection() const = 0;
 
 public slots:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -570 +570 @@
 }
 
+bool UIVisoContentBrowser::tableViewHasSelection() const
+{
+    if (!m_pTableView)
+        return false;
+    QItemSelectionModel *pSelectionModel = m_pTableView->selectionModel();
+    if (!pSelectionModel)
+        return false;
+    return pSelectionModel->hasSelection();
+}
+
 QModelIndex UIVisoContentBrowser::convertIndexToTableIndex(const QModelIndex &index)
 {
@@ -653 +663 @@
     if (!rootItem() || !rootItem()->child(0))
         return;
-    const QString strName = QString("%1%2").arg(QDir::toNativeSeparators("/")).arg(m_strVisoName);
+    const QString strName(QDir::toNativeSeparators("/"));
 
     rootItem()->child(0)->setData(strName, UICustomFileSystemModelColumn_Name);

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.h

@@ -59 +59 @@
     virtual void showHideHiddenObjects(bool bShow) /* override */;
     void setVisoName(const QString &strName);
+    virtual bool tableViewHasSelection() const final override;
 
 public slots:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -156 +156 @@
     if(m_pVISOContentBrowser)
         m_pVISOContentBrowser->setVisoName(m_visoOptions.m_strVisoName);
+    emit sigVisoNameChanged(strVisoName);
 }
 
@@ -365 +366 @@
 
     m_pAddAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Add);
+    if (m_pAddAction && m_pHostBrowser)
+        m_pAddAction->setEnabled(m_pHostBrowser->tableViewHasSelection());
     m_pRemoveAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Remove);
+    if (m_pRemoveAction && m_pVISOContentBrowser)
+        m_pRemoveAction->setEnabled(m_pVISOContentBrowser->tableViewHasSelection());
     m_pCreateNewDirectoryAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_CreateNewDirectory);
     m_pRenameAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Rename);
@@ -574 +579 @@
         connect(m_pVisoCreatorWidget, &UIVisoCreatorWidget::sigSetCancelButtonShortCut,
                 this, &UIVisoCreatorDialog::sltSetCancelButtonShortCut);
+        connect(m_pVisoCreatorWidget, &UIVisoCreatorWidget::sigVisoNameChanged,
+                this, &UIVisoCreatorDialog::sltsigVisoNameChanged);
     }
 
@@ -603 +610 @@
 void UIVisoCreatorDialog::retranslateUi()
 {
-    if (!m_strMachineName.isEmpty())
-        setWindowTitle(QString("%1 - %2").arg(m_strMachineName).arg(UIVisoCreatorWidget::tr("VISO Creator")));
-    else
-        setWindowTitle(QString("%1").arg(UIVisoCreatorWidget::tr("VISO Creator")));
+    updateWindowTitle();
     if (m_pButtonBox && m_pButtonBox->button(QDialogButtonBox::Ok))
     {
@@ -643 +647 @@
 }
 
+void UIVisoCreatorDialog::sltsigVisoNameChanged(const QString &strName)
+{
+    Q_UNUSED(strName);
+    updateWindowTitle();
+}
+
 void UIVisoCreatorDialog::loadSettings()
 {
@@ -666 +676 @@
     gEDataManager->setVisoCreatorDialogGeometry(geo, isCurrentlyMaximized());
 }
+
+void UIVisoCreatorDialog::updateWindowTitle()
+{
+    setWindowTitle(QString("%1 - %2.%3").arg(tr("VISO Creator")).arg(visoName()).arg("viso"));
+}

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -54 +54 @@
 
     void sigSetCancelButtonShortCut(QKeySequence keySequence);
+    void sigVisoNameChanged(const QString &strVisoName);
 
 public:
@@ -196 +197 @@
 
     void sltSetCancelButtonShortCut(QKeySequence keySequence);
+    void sltsigVisoNameChanged(const QString &strName);
 
 private:
@@ -203 +205 @@
     void loadSettings();
     void saveDialogGeometry();
+    void updateWindowTitle();
 
     QString m_strMachineName;

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoHostBrowser.cpp

@@ -262 +262 @@
 }
 
+bool UIVisoHostBrowser::tableViewHasSelection() const
+{
+    if (!m_pTableView)
+        return false;
+    QItemSelectionModel *pSelectionModel = m_pTableView->selectionModel();
+    if (!pSelectionModel)
+        return false;
+    return pSelectionModel->hasSelection();
+}
+
 void UIVisoHostBrowser::sltHandleAddAction()
 {

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoHostBrowser.h

@@ -47 +47 @@
     QString      currentPath() const;
     void         setCurrentPath(const QString &strPath);
+    virtual bool tableViewHasSelection() const final override;
 
 public slots:
@@ -72 +73 @@
     UIVisoHostBrowserModel *m_pTreeModel;
     UIVisoHostBrowserModel *m_pTableModel;
-    QTableView            *m_pTableView;
+    QTableView             *m_pTableView;
 };