Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp (revision 35955) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp (revision 35956) @@ -7,5 +7,5 @@ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -18,59 +18,54 @@ */ -#include "UIMachineSettingsSFDetails.h" -#include "VBoxGlobal.h" - /* Qt includes */ #include #include -UIMachineSettingsSFDetails::UIMachineSettingsSFDetails (DialogType aType, - bool aEnableSelector, /* for "permanent" checkbox */ - const SFoldersNameList &aUsedNames, - QWidget *aParent /* = NULL */) - : QIWithRetranslateUI2 (aParent) - , mType (aType) - , mUsePermanent (aEnableSelector) - , mUsedNames (aUsedNames) +/* Other includes */ +#include "UIMachineSettingsSFDetails.h" +#include "VBoxGlobal.h" + +UIMachineSettingsSFDetails::UIMachineSettingsSFDetails(DialogType type, + bool fEnableSelector, /* for "permanent" checkbox */ + const SFoldersNameList &usedNames, + QWidget *pParent /* = 0 */) + : QIWithRetranslateUI2(pParent) + , m_type(type) + , m_fUsePermanent(fEnableSelector) + , m_usedNames(usedNames) { - /* Apply UI decorations */ - Ui::UIMachineSettingsSFDetails::setupUi (this); + /* Apply UI decorations: */ + Ui::UIMachineSettingsSFDetails::setupUi(this); - mCbPermanent->setHidden (!aEnableSelector); - - /* No reset button */ - mPsPath->setResetEnabled (false); + /* Setup widgets: */ + mPsPath->setResetEnabled(false); + mPsPath->setHomeDir(QDir::homePath()); + mCbPermanent->setHidden(!fEnableSelector); /* Setup connections: */ - connect (mPsPath, SIGNAL (currentIndexChanged (int)), - this, SLOT (onSelectPath())); - connect (mPsPath, SIGNAL (pathChanged (const QString &)), - this, SLOT (onSelectPath())); - connect (mLeName, SIGNAL (textChanged (const QString &)), - this, SLOT (validate())); + connect(mPsPath, SIGNAL(currentIndexChanged(int)), this, SLOT(sltSelectPath())); + connect(mPsPath, SIGNAL(pathChanged(const QString &)), this, SLOT(sltSelectPath())); + connect(mLeName, SIGNAL(textChanged(const QString &)), this, SLOT(sltValidate())); + if (fEnableSelector) + connect(mCbPermanent, SIGNAL(toggled(bool)), this, SLOT(sltValidate())); - if (aEnableSelector) - { - connect (mCbPermanent, SIGNAL (toggled (bool)), - this, SLOT (validate())); - } - - /* Applying language settings */ + /* Applying language settings: */ retranslateUi(); - /* Validate the initial fields */ - validate(); + /* Validate the initial field values: */ + sltValidate(); + /* Adjust dialog size: */ adjustSize(); #ifdef Q_WS_MAC - setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed); - setFixedSize (minimumSize()); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + setFixedSize(minimumSize()); #endif /* Q_WS_MAC */ } -void UIMachineSettingsSFDetails::setPath (const QString &aPath) +void UIMachineSettingsSFDetails::setPath(const QString &strPath) { - mPsPath->setPath (aPath); + mPsPath->setPath(strPath); } @@ -80,7 +75,7 @@ } -void UIMachineSettingsSFDetails::setName (const QString &aName) +void UIMachineSettingsSFDetails::setName(const QString &strName) { - mLeName->setText (aName); + mLeName->setText(strName); } @@ -90,7 +85,7 @@ } -void UIMachineSettingsSFDetails::setWriteable (bool aWritable) +void UIMachineSettingsSFDetails::setWriteable(bool fWritable) { - mCbReadonly->setChecked (!aWritable); + mCbReadonly->setChecked(!fWritable); } @@ -100,7 +95,7 @@ } -void UIMachineSettingsSFDetails::setAutoMount (bool aAutoMount) +void UIMachineSettingsSFDetails::setAutoMount(bool fAutoMount) { - mCbAutoMount->setChecked (aAutoMount); + mCbAutoMount->setChecked(fAutoMount); } @@ -110,76 +105,76 @@ } -void UIMachineSettingsSFDetails::setPermanent (bool aPermanent) +void UIMachineSettingsSFDetails::setPermanent(bool fPermanent) { - mCbPermanent->setChecked (aPermanent); + mCbPermanent->setChecked(fPermanent); } bool UIMachineSettingsSFDetails::isPermanent() const { - return mUsePermanent ? mCbPermanent->isChecked() : true; + return m_fUsePermanent ? mCbPermanent->isChecked() : true; } void UIMachineSettingsSFDetails::retranslateUi() { - /* Translate uic generated strings */ - Ui::UIMachineSettingsSFDetails::retranslateUi (this); + /* Translate uic generated strings: */ + Ui::UIMachineSettingsSFDetails::retranslateUi(this); - switch (mType) + switch (m_type) { case AddType: - setWindowTitle (tr ("Add Share")); + setWindowTitle(tr("Add Share")); break; case EditType: - setWindowTitle (tr ("Edit Share")); + setWindowTitle(tr("Edit Share")); break; default: - AssertMsgFailed (("Incorrect SF Dialog type\n")); + AssertMsgFailed(("Incorrect shared-folders dialog type: %d\n", m_type)); } } -void UIMachineSettingsSFDetails::validate() +void UIMachineSettingsSFDetails::sltValidate() { - UISharedFolderType resultType = - mUsePermanent && !mCbPermanent->isChecked() ? ConsoleType : MachineType; - SFolderName pair = qMakePair (mLeName->text(), resultType); + UISharedFolderType resultType = m_fUsePermanent && !mCbPermanent->isChecked() ? ConsoleType : MachineType; + SFolderName pair = qMakePair(mLeName->text(), resultType); - mButtonBox->button (QDialogButtonBox::Ok)->setEnabled (!mPsPath->path().isEmpty() && - QDir(mPsPath->path()).exists() && - !mLeName->text().trimmed().isEmpty() && - !mLeName->text().contains(" ") && - !mUsedNames.contains (pair)); + mButtonBox->button(QDialogButtonBox::Ok)->setEnabled(!mPsPath->path().isEmpty() && + QDir(mPsPath->path()).exists() && + !mLeName->text().trimmed().isEmpty() && + !mLeName->text().contains(" ") && + !m_usedNames.contains (pair)); } -void UIMachineSettingsSFDetails::onSelectPath() +void UIMachineSettingsSFDetails::sltSelectPath() { if (!mPsPath->isPathSelected()) return; - QString folderName (mPsPath->path()); -#if defined (Q_OS_WIN) || defined (Q_OS_OS2) - if (folderName[0].isLetter() && folderName[1] == ':' && folderName[2] == 0) + QString strFolderName(mPsPath->path()); +#if defined (Q_WS_WIN) || defined (Q_OS_OS2) + if (strFolderName[0].isLetter() && strFolderName[1] == ':' && strFolderName[2] == 0) { /* VBoxFilePathSelectorWidget returns root path as 'X:', which is invalid path. - * Append the trailing backslash to get a valid root path 'X:\'. - */ - folderName += "\\"; - mPsPath->setPath(folderName); + * Append the trailing backslash to get a valid root path 'X:\': */ + strFolderName += "\\"; + mPsPath->setPath(strFolderName); } -#endif - QDir folder (folderName); +#endif /* Q_WS_WIN || Q_OS_OS2 */ + QDir folder(strFolderName); if (!folder.isRoot()) + { /* Processing non-root folder */ - mLeName->setText (folder.dirName().replace(' ', '_')); + mLeName->setText(folder.dirName().replace(' ', '_')); + } else { - /* Processing root folder */ -#if defined (Q_OS_WIN) || defined (Q_OS_OS2) - mLeName->setText (folderName.toUpper()[0] + "_DRIVE"); -#elif defined (Q_OS_UNIX) - mLeName->setText ("ROOT"); + /* Processing root folder: */ +#if defined (Q_WS_WIN) || defined (Q_OS_OS2) + mLeName->setText(strFolderName.toUpper()[0] + "_DRIVE"); +#elif defined (Q_WS_X11) + mLeName->setText("ROOT"); #endif } - /* Validate the fields */ - validate(); + /* Validate the field values: */ + sltValidate(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.h (revision 35955) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.h (revision 35956) @@ -6,5 +6,5 @@ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -20,4 +20,5 @@ #define __UIMachineSettingsSFDetails_h__ +/* Includes */ #include "UIMachineSettingsSFDetails.gen.h" #include "QIDialog.h" @@ -25,6 +26,7 @@ #include "UIMachineSettingsSF.h" +/* Shared folders details dialog: */ class UIMachineSettingsSFDetails : public QIWithRetranslateUI2, - public Ui::UIMachineSettingsSFDetails + public Ui::UIMachineSettingsSFDetails { Q_OBJECT; @@ -38,22 +40,22 @@ }; - UIMachineSettingsSFDetails (DialogType aType, - bool aEnableSelector, /* for "permanent" checkbox */ - const SFoldersNameList &aUsedNames, - QWidget *aParent = NULL); + UIMachineSettingsSFDetails(DialogType type, + bool fEnableSelector, /* for "permanent" checkbox */ + const SFoldersNameList &usedNames, + QWidget *pParent = 0); - void setPath (const QString &aPath); + void setPath(const QString &strPath); QString path() const; - void setName (const QString &aName); + void setName(const QString &strName); QString name() const; - void setWriteable (bool aWriteable); + void setWriteable(bool fWriteable); bool isWriteable() const; - void setAutoMount (bool aAutoMount); + void setAutoMount(bool fAutoMount); bool isAutoMounted() const; - void setPermanent (bool aPermanent); + void setPermanent(bool fPermanent); bool isPermanent() const; @@ -64,13 +66,12 @@ private slots: - void onSelectPath(); - void validate(); + void sltSelectPath(); + void sltValidate(); private: - /* Private member vars */ - DialogType mType; - bool mUsePermanent; - SFoldersNameList mUsedNames; + DialogType m_type; + bool m_fUsePermanent; + SFoldersNameList m_usedNames; };