Make it quicklaunchable again

-Do the check if allowed to run in the c'tor of MultiauthConfig
 and exit(-1) on failure

-Adopt the .pro to contain CONFIG  quick-app again
-main only contains the call to the factory

4 files changed, 53 insertions, 53 deletions

diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp
index 7f24490..5ba9869 100644
--- a/core/settings/security/main.cpp
+++ b/core/settings/security/main.cpp
@@ -1,44 +1,5 @@
 #include "multiauthconfig.h"
-#include <opie2/oapplication.h>
-#include <opie2/odebug.h>
 
+#include <opie2/oapplicationfactory.h>
 
-
-int main(int argc, char **argv) {
-    Opie::Core::OApplication app(argc, argv, "MultiAuthentication Config");
-    // protect this dialog if option set
-    Config* pcfg = new Config("Security");
-    pcfg->setGroup( "Misc" );
-    bool protectConfigDialog = ! pcfg->readBoolEntry("noProtectConfig", true);
-    delete pcfg;
-    bool show = true;
-    if ( protectConfigDialog )
-    {
-        if (Opie::Security::Internal::runPlugins() != 0)
-        {
-            // authentication failed
-            show = false;
-        }
-    }
-    if ( show == true ){
-        MultiauthConfig dialog;
-        app.setMainWidget(&dialog);
-
-        if ( dialog.exec() == QDialog::Accepted ) {
-            // write the general, login and sync config
-            dialog.writeConfig();
-            // call writeConfig() on each plugin config widget
-            Opie::Security::MultiauthConfigWidget *confWidget;
-            for ( confWidget = dialog.configWidgetList.first(); confWidget != 0;
-                  confWidget = dialog.configWidgetList.next() ) {
-                confWidget->writeConfig();
-            }
-        }
-        dialog.close();
-        app.quit();
-        return 0;
-    } else {
-        owarn << "authentication failed, not showing opie-security" << oendl;
-        return 1;
-    }
-}
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MultiauthConfig> );
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp
index 93e73c3..535352a 100644
--- a/core/settings/security/multiauthconfig.cpp
+++ b/core/settings/security/multiauthconfig.cpp
@@ -105,32 +105,58 @@ void MultiauthGeneralConfig::checkScreens()
 {
     if ( (allowBypass->isChecked() == true) && (explanScreens->isChecked() == false) )
         explanScreens->setChecked(true);
 }
 
 /// Be sure that allowBypass is not checked if explanScreens is not
 void MultiauthGeneralConfig::checkBypass()
 {
     if ( (allowBypass->isChecked() == true) && (explanScreens->isChecked() == false) )
         allowBypass->setChecked(false);
 }
 
+
+
+
+
+
+
+
+
+
+
 /// Builds and displays the Opie multi-authentication configuration dialog
-MultiauthConfig::MultiauthConfig() : QDialog(0, 0, TRUE),
-                                     m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0),
-                                     m_generalConfig(0), m_loginWidget(0), m_syncWidget(0),
-                                     m_nbSuccessReq(0), m_plugins_changed(false)
+static void test_and_start() {
+    Config pcfg("Security");
+    pcfg.setGroup( "Misc" );
+    bool protectConfigDialog = ! pcfg.readBoolEntry("noProtectConfig", true);
+
+    if (protectConfigDialog && Opie::Security::Internal::runPlugins() != 0) {
+         owarn << "authentication failed, not showing opie-security" << oendl;
+        exit( -1 );
+    }
+}
+
+
+
+MultiauthConfig::MultiauthConfig(QWidget* par, const char* w,  WFlags f)
+    : QDialog(par, w, TRUE, f),
+      m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0),
+      m_generalConfig(0), m_loginWidget(0), m_syncWidget(0),
+      m_nbSuccessReq(0), m_plugins_changed(false)
 {
     /* Initializes the global configuration window
      */
+    test_and_start();
+
     setCaption( tr( "Security configuration" ) );
     QVBoxLayout *layout = new QVBoxLayout( this );
     m_mainTW = new Opie::Ui::OTabWidget( this );
     layout->addWidget(m_mainTW);
     m_pluginListWidget = new QWidget(m_mainTW, "plugin list widget");
     QVBoxLayout * pluginListLayout = new QVBoxLayout(m_pluginListWidget);
     pluginListLayout->setSpacing(6);
     pluginListLayout->setMargin(11);
     QLabel * pluginListTitle = new QLabel( tr( "Load which plugins in what order:" ), m_pluginListWidget );
     pluginListLayout->addWidget(pluginListTitle);
     QHBox * pluginListHB = new QHBox(m_pluginListWidget);
     pluginListLayout->addWidget(pluginListHB);
@@ -197,24 +223,40 @@ MultiauthConfig::MultiauthConfig() : QDialog(0, 0, TRUE),
 
     // put the number of plugins as the max number of req. auth.
     m_generalConfig->nbSuccessMin->setMaxValue( pluginList.count() );
 
     showMaximized();
 }
 
 /// nothing to do
 MultiauthConfig::~MultiauthConfig()
 {
 }
 
+void MultiauthConfig::accept() {
+    writeConfig();
+
+    MultiauthConfigWidget* confWidget = 0;
+    for ( confWidget = configWidgetList.first(); confWidget != 0;
+          confWidget = configWidgetList.next() )
+        confWidget->writeConfig();
+
+    QDialog::accept();
+}
+
+void MultiauthConfig::done( int r ) {
+    QDialog::done( r );
+    close();
+}
+
 /// moves up the selected plugin
 void MultiauthConfig::moveSelectedUp()
 {
     QListViewItem *item = m_pluginListView->selectedItem();
     if ( item && item->itemAbove() ) {
         item->itemAbove()->moveItem( item );
     }
 }
 
 /// moves down the selected plugin
 void MultiauthConfig::moveSelectedDown()
 {
diff --git a/core/settings/security/multiauthconfig.h b/core/settings/security/multiauthconfig.h
index ffe920f..649815d 100644
--- a/core/settings/security/multiauthconfig.h
+++ b/core/settings/security/multiauthconfig.h
@@ -72,30 +72,33 @@ private:
     friend class MultiauthConfig;
 private slots:
     void checkBypass();
     void checkScreens();
 };
 
 /// the whole configuration dialog
 class MultiauthConfig : public QDialog
 {
     Q_OBJECT
     
 public:
-    MultiauthConfig();
+    static QString appName() { return QString::fromLatin1("security"); }
+    MultiauthConfig(QWidget *parent, const char* name, WFlags fl);
     virtual ~MultiauthConfig();
     void writeConfig();
     QList<Opie::Security::MultiauthConfigWidget> configWidgetList;
     
 protected slots:
+    void accept();
+    void done(int r); 
     void pluginsChanged();
     void moveSelectedUp();
     void moveSelectedDown();
 
 private slots:
     // Login and Sync stuff
     void setSyncNet(const QString&);
     void changeLoginName(int);
     void toggleAutoLogin(bool);
     void restoreDefaults();
     void insertDefaultRanges();
     void deleteListEntry();
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 5d2ae08..e9f4061 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,16 +1,10 @@
-CONFIG += qt warn_on
-
+CONFIG += qt warn_on quick-app
 HEADERS         = multiauthconfig.h
-
 SOURCES         = multiauthconfig.cpp main.cpp
-
         INTERFACES= loginbase.ui syncbase.ui
 
 INCLUDEPATH     += $(OPIEDIR)/include
-
 LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2
-
-DESTDIR = $(OPIEDIR)/bin
 TARGET = security
 
 include ( $(OPIEDIR)/include.pro )