diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index 12849d6ee0..4f4aef4f23 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -22,10 +22,7 @@ CSVDoc::FileDialog::FileDialog(QWidget *parent) :
ContentSelector(parent)
{
// Hide the profile elements
- profileLabel->hide();
- profilesComboBox->hide();
- newProfileButton->hide();
- deleteProfileButton->hide();
+ profileGroupBox->hide();
// Add some extra widgets
QHBoxLayout *nameLayout = new QHBoxLayout();
@@ -34,12 +31,12 @@ CSVDoc::FileDialog::FileDialog(QWidget *parent) :
mNameLabel = new QLabel(tr("File Name:"), this);
QRegExpValidator *validator = new QRegExpValidator(QRegExp("^[a-zA-Z0-9\\s]*$"));
- //mNameLineEdit = new LineEdit(this);
- //mNameLineEdit->setValidator(validator);
+ mNameLineEdit = new EsxView::LineEdit(this);
+ mNameLineEdit->setValidator(validator);
nameLayout->addSpacerItem(spacer);
nameLayout->addWidget(mNameLabel);
- //nameLayout->addWidget(mNameLineEdit);
+ nameLayout->addWidget(mNameLineEdit);
mButtonBox = new QDialogButtonBox(this);
diff --git a/apps/opencs/view/doc/filedialog.hpp b/apps/opencs/view/doc/filedialog.hpp
index d016ad32d1..0e2d8f32b8 100644
--- a/apps/opencs/view/doc/filedialog.hpp
+++ b/apps/opencs/view/doc/filedialog.hpp
@@ -14,10 +14,16 @@ class QPushButton;
class QStringList;
class QString;
class QMenu;
+class QLabel;
class DataFilesModel;
class PluginsProxyModel;
+namespace EsxView
+{
+ class LineEdit;
+}
+
namespace CSVDoc
{
class FileDialog : public EsxView::ContentSelector
@@ -48,7 +54,7 @@ namespace CSVDoc
private:
QLabel *mNameLabel;
- //LineEdit *mNameLineEdit;
+ EsxView::LineEdit *mNameLineEdit;
QPushButton *mCreateButton;
QDialogButtonBox *mButtonBox;
diff --git a/components/esxselector/view/contentselector.cpp b/components/esxselector/view/contentselector.cpp
index 2de68e5bf8..266fd76dcb 100644
--- a/components/esxselector/view/contentselector.cpp
+++ b/components/esxselector/view/contentselector.cpp
@@ -25,9 +25,11 @@ void EsxView::ContentSelector::buildModelsAndViews()
mMasterProxyModel = new EsxModel::MasterProxyModel (this, mDataFilesModel);
mPluginsProxyModel = new EsxModel::PluginsProxyModel (this, mDataFilesModel);
+ masterView->setPlaceholderText(QString("Select a game file..."));
masterView->setModel(mMasterProxyModel);
pluginView->setModel(mPluginsProxyModel);
- pluginView->
+ profilesComboBox->setPlaceholderText(QString("Select a profile..."));
+
connect(mDataFilesModel, SIGNAL(layoutChanged()), this, SLOT(updateViews()));
connect(pluginView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(slotPluginTableItemClicked(const QModelIndex &)));
diff --git a/components/esxselector/view/profilescombobox.cpp b/components/esxselector/view/profilescombobox.cpp
index b765f87ca2..0d709aa50c 100644
--- a/components/esxselector/view/profilescombobox.cpp
+++ b/components/esxselector/view/profilescombobox.cpp
@@ -103,6 +103,11 @@ void EsxView::ProfilesComboBox::paintEvent(QPaintEvent *)
// draw the icon and text
if (!opt.editable && currentIndex() == -1) // <<< we adjust the text displayed when nothing is selected
- opt.currentText = tr("Select a game file...");
+ opt.currentText = mPlaceholderText;
painter.drawControl(QStyle::CE_ComboBoxLabel, opt);
}
+
+void EsxView::ProfilesComboBox::setPlaceholderText(const QString &text)
+{
+ mPlaceholderText = text;
+}
diff --git a/components/esxselector/view/profilescombobox.hpp b/components/esxselector/view/profilescombobox.hpp
index 218948e7bc..28740783ba 100644
--- a/components/esxselector/view/profilescombobox.hpp
+++ b/components/esxselector/view/profilescombobox.hpp
@@ -14,6 +14,7 @@ namespace EsxView
public:
explicit ProfilesComboBox(QWidget *parent = 0);
void setEditEnabled(bool editable);
+ void setPlaceholderText (const QString &text);
signals:
void profileChanged(const QString &previous, const QString ¤t);
@@ -26,6 +27,7 @@ namespace EsxView
private:
QString mOldProfile;
+ QString mPlaceholderText;
QRegExpValidator *mValidator;
protected:
diff --git a/files/ui/datafilespage.ui b/files/ui/datafilespage.ui
index 523ee69cca..6235f31afd 100644
--- a/files/ui/datafilespage.ui
+++ b/files/ui/datafilespage.ui
@@ -14,113 +14,162 @@
Qt::DefaultContextMenu
+
+ 6
+
+
+ 6
+
-
-
-
-
-
-
- false
-
-
-
-
+
+
+ Content
+
+
+
+ 9
+
+
+ 6
+
+
+ 6
+
+ -
+
+
-
+
+
+ false
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Qt::DefaultContextMenu
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ true
+
+
+ QAbstractItemView::SingleSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ Qt::ElideLeft
+
+
+ false
+
+
+ false
+
+
+ true
+
+
+ false
+
+
+
+
+
+
+ pluginView
+ masterView
+ pluginView
+ masterView
+
+
+
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- Qt::DefaultContextMenu
-
-
- QAbstractItemView::NoEditTriggers
-
-
- true
-
-
- QAbstractItemView::SingleSelection
-
-
- QAbstractItemView::SelectRows
-
-
- Qt::ElideLeft
-
-
- false
-
-
- false
-
-
- true
-
-
- false
-
-
-
-
-
- -
-
-
-
-
-
- Current Profile:
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- New Profile
-
-
- &New Profile
-
-
- true
-
-
-
- -
-
-
- Delete Profile
-
-
- Delete Profile
-
-
- Ctrl+D
-
-
- true
-
-
-
-
+
+
+ Qt::NoFocus
+
+
+ Profiles
+
+
+ false
+
+
+
+ 6
+
+
+ 9
+
+
+ 9
+
+
+ 0
+
+
+ 6
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ New Profile
+
+
+ &New Profile
+
+
+ true
+
+
+
+ -
+
+
+ Delete Profile
+
+
+ Delete Profile
+
+
+ Ctrl+D
+
+
+ true
+
+
+
+
+