Changeset 45085 in vbox

Timestamp:

Mar 19, 2013 9:28:24 AM (12 years ago)

Author:

vboxsync

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

84368

Message:

FE/Qt: Reworking empty-file selector used in Export/Import appliance wizards to use tool-button instead of push-one.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/VBoxFilePathSelectorWidget.cpp (modified) (7 diffs)
• widgets/VBoxFilePathSelectorWidget.h (modified) (4 diffs)
• wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (modified) (1 diff)
• wizards/exportappliance/UIWizardExportAppPageExpert.cpp (modified) (1 diff)
• wizards/importappliance/UIWizardImportAppPageBasic1.cpp (modified) (2 diffs)
• wizards/importappliance/UIWizardImportAppPageExpert.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 /* Local includes */
 #include "QIFileDialog.h"
+#include "QIToolButton.h"
 #include "QILabel.h"
 #include "QILineEdit.h"
@@ -35 +36 @@
 #include <QHBoxLayout>
 #include <QLineEdit>
-#include <QPushButton>
 #include <QTimer>
 
@@ -567 +567 @@
     , mMode (VBoxFilePathSelectorWidget::Mode_File_Open)
     , mLineEdit (NULL)
-    , m_fButtonTextSet(false)
+    , m_fButtonToolTipSet(false)
     , mHomeDir (QDir::current().absolutePath())
     , mIsModified (false)
@@ -574 +574 @@
     mMainLayout->setMargin (0);
 
-    mSelectButton = new QPushButton (this);
-    connect (mSelectButton, SIGNAL (clicked()),
-             this, SLOT (choose()));
-
-    mMainLayout->addWidget (mSelectButton);
+    mSelectButton = new QIToolButton(this);
+    mSelectButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_dis_16px.png"));
+    connect(mSelectButton, SIGNAL(clicked()), this, SLOT(choose()));
+    mMainLayout->addWidget(mSelectButton);
 
     setEditable (false);
@@ -680 +679 @@
 }
 
-void VBoxEmptyFileSelector::setChooseButtonText(const QString &strText)
-{
-    mSelectButton->setText(strText);
-    m_fButtonTextSet = !strText.isEmpty();
-}
-
-QString VBoxEmptyFileSelector::chooseButtonText() const
-{
-    return mSelectButton->text();
+void VBoxEmptyFileSelector::setChooseButtonToolTip(const QString &strToolTip)
+{
+    m_fButtonToolTipSet = !strToolTip.isEmpty();
+    mSelectButton->setToolTip(strToolTip);
+}
+
+QString VBoxEmptyFileSelector::chooseButtonToolTip() const
+{
+    return mSelectButton->toolTip();
 }
 
@@ -723 +722 @@
 void VBoxEmptyFileSelector::retranslateUi()
 {
-    if (!m_fButtonTextSet)
-        mSelectButton->setText(tr("&Choose..."));
+    if (!m_fButtonToolTipSet)
+        mSelectButton->setToolTip(tr("Choose..."));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 class QHBoxLayout;
 class QAction;
-class QPushButton;
+class QIToolButton;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -162 +162 @@
     void resetModified () { mIsModified = false; }
 
-    void setChooseButtonText(const QString &aText);
-    QString chooseButtonText() const;
+    void setChooseButtonToolTip(const QString &strToolTip);
+    QString chooseButtonToolTip() const;
 
     void setFileDialogTitle (const QString& aTitle);
@@ -194 +194 @@
     VBoxFilePathSelectorWidget::Mode mMode;
     QILineEdit *mLineEdit;
-    QPushButton *mSelectButton;
-    bool m_fButtonTextSet;
+    QIToolButton *mSelectButton;
+    bool m_fButtonToolTipSet;
     QString mFileDialogTitle;
     QString mFileFilters;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

@@ -280 +280 @@
     m_pBucketLabel->setText(UIWizardExportApp::tr("&Bucket:"));
     m_pFileSelectorLabel->setText(UIWizardExportApp::tr("&File:"));
+    m_pFileSelector->setChooseButtonToolTip(tr("Choose a file to export virtual appliance..."));
     m_pFileSelector->setFileDialogTitle(UIWizardExportApp::tr("Please choose a file to export virtual appliance"));
     m_pFileSelector->setFileFilters(UIWizardExportApp::tr("Open Virtualization Format Archive (%1)").arg("*.ova") + ";;" +

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp

@@ -213 +213 @@
     m_pBucketLabel->setText(UIWizardExportApp::tr("&Bucket:"));
     m_pFileSelectorLabel->setText(UIWizardExportApp::tr("&File:"));
+    m_pFileSelector->setChooseButtonToolTip(tr("Choose a file to export virtual appliance..."));
     m_pFileSelector->setFileDialogTitle(UIWizardExportApp::tr("Please choose a file to export virtual appliance"));
     m_pFileSelector->setFileFilters(UIWizardExportApp::tr("Open Virtualization Format Archive (%1)").arg("*.ova") + ";;" +

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

@@ -44 +44 @@
             m_pFileSelector->setHomeDir(vboxGlobal().documentsPath());
             m_pFileSelector->setMode(VBoxFilePathSelectorWidget::Mode_File_Open);
+            m_pFileSelector->setButtonPosition(VBoxEmptyFileSelector::RightPosition);
+            m_pFileSelector->setEditable(true);
         }
         pMainLayout->addWidget(m_pLabel);
@@ -63 +65 @@
                                             "saved in the Open Virtualization Format (OVF). "
                                             "To continue, select the file to import below.</p>"));
-    m_pFileSelector->setChooseButtonText(UIWizardImportApp::tr("Open appliance..."));
+    m_pFileSelector->setChooseButtonToolTip(UIWizardImportApp::tr("Choose a virtual appliance file to import..."));
     m_pFileSelector->setFileDialogTitle(UIWizardImportApp::tr("Please choose a virtual appliance file to import"));
     m_pFileSelector->setFileFilters(UIWizardImportApp::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf"));

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp

@@ -45 +45 @@
                     m_pFileSelector->setHomeDir(vboxGlobal().documentsPath());
                     m_pFileSelector->setMode(VBoxFilePathSelectorWidget::Mode_File_Open);
+                    m_pFileSelector->setButtonPosition(VBoxEmptyFileSelector::RightPosition);
+                    m_pFileSelector->setEditable(true);
                 }
                 pApplianceCntLayout->addWidget(m_pFileSelector);
@@ -93 +95 @@
     /* Translate widgets: */
     m_pApplianceCnt->setTitle(UIWizardImportApp::tr("Appliance to import"));
-    m_pFileSelector->setChooseButtonText(UIWizardImportApp::tr("Open appliance..."));
+    m_pFileSelector->setChooseButtonToolTip(UIWizardImportApp::tr("Choose a virtual appliance file to import..."));
     m_pFileSelector->setFileDialogTitle(UIWizardImportApp::tr("Please choose a virtual appliance file to import"));
     m_pFileSelector->setFileFilters(UIWizardImportApp::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf"));