From ef294dd89901bdfdc98c0a676fc54f175094bf8b Mon Sep 17 00:00:00 2001
From: "craig.p.drummond" <craig.p.drummond@gmail.com>
Date: Thu, 13 Dec 2012 19:56:20 +0000
Subject: [PATCH] Move group warning to last stage of intial settings wizard.

---
 ChangeLog                     |  1 +
 application.cpp               | 11 -----------
 gui/initialsettingswizard.cpp |  2 ++
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 630265f4e..08c7726ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@
 12. When collapse/expand, only adjust height and not width.
 13. Add a 'Cache' page to settngs dialog, allowing cahce usage to be displayed
     and cache items delete.
+14. Move group warning to last stage of intial settings wizard.
 
 0.9.1
 -----
diff --git a/application.cpp b/application.cpp
index 492d26b0d..3ea996de9 100644
--- a/application.cpp
+++ b/application.cpp
@@ -26,7 +26,6 @@
 #ifdef ENABLE_KDE_SUPPORT
 #include <KDE/KCmdLineArgs>
 #include <KDE/KStartupInfo>
-#include <KDE/KMessageBox>
 #include <KDE/Solid/PowerManagement>
 #include "initialsettingswizard.h"
 #else
@@ -89,16 +88,6 @@ int Application::newInstance() {
                 Settings::self()->save(true);
             }
         }
-        if (0==Utils::getGroupId() && KMessageBox::Cancel==KMessageBox::warningContinueCancel(0,
-                i18n("You are not currently a member of the \"users\" group. "
-                        "Cantata will function better (saving of album covers, lyrics, etc. with the correct permissions) if you "
-                        "(or your administrator) add yourself to this group.\n\n"
-                        "Note, that if you do add yourself you will need to logout and back in for this to take effect.\n\n"
-                        "Select \"Continue\" to start Cantata as is."),
-                QString(), KStandardGuiItem::cont(), KStandardGuiItem::cancel(), "groupWarning")) {
-            QApplication::exit(0);
-            return 0;
-        }
         w=new MainWindow();
         connect(w, SIGNAL(destroyed(QObject *)), this, SLOT(mwDestroyed(QObject *)));
     }
diff --git a/gui/initialsettingswizard.cpp b/gui/initialsettingswizard.cpp
index c9b5f465e..837c4aed3 100644
--- a/gui/initialsettingswizard.cpp
+++ b/gui/initialsettingswizard.cpp
@@ -24,6 +24,7 @@
 #include "initialsettingswizard.h"
 #include "messagebox.h"
 #include "settings.h"
+#include "utils.h"
 #include <QtCore/QDir>
 
 InitialSettingsWizard::InitialSettingsWizard(QWidget *p)
@@ -43,6 +44,7 @@ InitialSettingsWizard::InitialSettingsWizard(QWidget *p)
     port->setValue(det.port);
     password->setText(det.password);
     dir->setText(det.dir);
+    groupWarningLabel->setVisible(0==Utils::getGroupId());
 }
 
 InitialSettingsWizard::~InitialSettingsWizard()