From af883991e2d3410ec67be345c0065f3ee332dcb1 Mon Sep 17 00:00:00 2001
From: pvdk <pvdkloet@gmail.com>
Date: Thu, 17 Apr 2014 02:17:18 +0200
Subject: [PATCH] Reimplemented the old new profile dialog behaviour

---
 apps/launcher/datafilespage.cpp | 26 +++++++++++++++++++++-----
 apps/launcher/datafilespage.hpp |  4 +++-
 apps/launcher/settingspage.cpp  |  2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 21652a8f40..6b53d89a44 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -30,6 +30,11 @@ Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config:
     setObjectName ("DataFilesPage");
     mSelector = new ContentSelectorView::ContentSelector (ui.contentSelectorWidget);
 
+    mProfileDialog = new TextInputDialog(tr("New Profile"), tr("Profile name:"), this);
+
+    connect(mProfileDialog->lineEdit(), SIGNAL(textChanged(QString)),
+            this, SLOT(updateOkButton(QString)));
+
     buildView();
     setupDataFiles();
 }
@@ -212,15 +217,13 @@ void Launcher::DataFilesPage::slotProfileChanged(int index)
 
 void Launcher::DataFilesPage::on_newProfileAction_triggered()
 {
-    TextInputDialog newDialog (tr("New Profile"), tr("Profile name:"), this);
-
-    if (newDialog.exec() != QDialog::Accepted)
+    if (!mProfileDialog->exec() == QDialog::Accepted)
         return;
 
-    QString profile = newDialog.lineEdit()->text();
+    QString profile = mProfileDialog->lineEdit()->text();
 
     if (profile.isEmpty())
-            return;
+        return;
 
     saveSettings();
 
@@ -271,6 +274,19 @@ void Launcher::DataFilesPage::on_deleteProfileAction_triggered()
     checkForDefaultProfile();
 }
 
+void Launcher::DataFilesPage::updateOkButton(const QString &text)
+{
+    // We do this here because we need the profiles combobox text
+    if (text.isEmpty()) {
+         mProfileDialog->setOkButtonEnabled(false);
+         return;
+    }
+
+    (ui.profilesComboBox->findText(text) == -1)
+            ? mProfileDialog->setOkButtonEnabled(true)
+            : mProfileDialog->setOkButtonEnabled(false);
+}
+
 void Launcher::DataFilesPage::checkForDefaultProfile()
 {
     //don't allow deleting "Default" profile
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 06efdfca3b..908394ae15 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -55,12 +55,14 @@ namespace Launcher
         void slotProfileRenamed(const QString &previous, const QString &current);
         void slotProfileDeleted(const QString &item);
 
+        void updateOkButton(const QString &text);
+
         void on_newProfileAction_triggered();
         void on_deleteProfileAction_triggered();
 
     private:
 
-        QMenu *mContextMenu;
+        TextInputDialog *mProfileDialog;
 
         Files::ConfigurationManager &mCfgMgr;
 
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index f673917fdb..8eaec95db8 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -222,7 +222,7 @@ void Launcher::SettingsPage::importerFinished(int exitCode, QProcess::ExitStatus
 
 void Launcher::SettingsPage::updateOkButton(const QString &text)
 {
-    // We do this here because we need the profiles combobox text
+    // We do this here because we need to access the profiles
     if (text.isEmpty()) {
          mProfileDialog->setOkButtonEnabled(false);
          return;