author | zecke <zecke> | 2004-07-19 21:48:29 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-19 21:48:29 (UTC) |
commit | 595d3211a7982471f68bb116fb47cf4c6218d7c1 (patch) (side-by-side diff) | |
tree | 1ed2caebe113c43979f0361c172b6232a46fd823 | |
parent | d2dfe297f99684ad361240ab4f63dfb1ff8850dd (diff) | |
download | opie-595d3211a7982471f68bb116fb47cf4c6218d7c1.zip opie-595d3211a7982471f68bb116fb47cf4c6218d7c1.tar.gz opie-595d3211a7982471f68bb116fb47cf4c6218d7c1.tar.bz2 |
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
-rw-r--r-- | core/settings/security/main.cpp | 43 | ||||
-rw-r--r-- | core/settings/security/multiauthconfig.cpp | 44 | ||||
-rw-r--r-- | core/settings/security/multiauthconfig.h | 5 | ||||
-rw-r--r-- | core/settings/security/security.pro | 8 |
4 files changed, 50 insertions, 50 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 @@ -69,188 +69,230 @@ MultiauthGeneralConfig::MultiauthGeneralConfig(QWidget * parent, const char * na onStart = new QCheckBox( tr( "on Opie start" ), lockBox, "lock on opie start"); onResume = new QCheckBox( tr( "on Opie resume" ), lockBox, "lock on opie resume"); boxLayout->addWidget(onStart, 0, 0); boxLayout->addWidget(onResume, 0, 1); QGroupBox *nbBox = new QGroupBox(0, Qt::Vertical, tr("Multiple plugins authentication"), this, "nb box"); vb->addWidget(nbBox); QGridLayout *nbBoxLayout = new QGridLayout( nbBox->layout() ); nbSuccessMin = new QSpinBox(nbBox); QLabel *lNbSuccessMin = new QLabel( tr( "Required successes" ), nbBox); nbBoxLayout->addWidget(nbSuccessMin, 0, 0); nbBoxLayout->addWidget(lNbSuccessMin, 0, 1); nbSuccessMin->setMinValue(1); // the max value is defined in MultiauthConfig constructor QGroupBox *devBox = new QGroupBox(0, Qt::Vertical, tr("Debug options"), this, "dev box"); vb->addWidget(devBox); QGridLayout *devBoxLayout = new QGridLayout( devBox->layout() ); noProtectConfig = new QCheckBox( tr("Don't protect this config screen"), devBox, "don't protect config"); explanScreens = new QCheckBox( tr("Show explanatory screens"), devBox, "Show explan. screens"); allowBypass = new QCheckBox( tr("Allow to bypass authentication"), devBox, "AllowBypass"); QLabel *logicNote = new QLabel( "<p>" + tr("Note: the third option implies the second one") + "</p>", devBox ); devBoxLayout->addWidget(noProtectConfig, 0, 0); devBoxLayout->addWidget(explanScreens, 1, 0); devBoxLayout->addWidget(allowBypass, 2, 0); devBoxLayout->addMultiCellWidget(logicNote, 3, 3, 0, 1); connect( explanScreens, SIGNAL(toggled(bool)), this, SLOT(checkBypass()) ); connect( allowBypass, SIGNAL(toggled(bool)), this, SLOT(checkScreens()) ); } /// nothing to do MultiauthGeneralConfig::~MultiauthGeneralConfig() {} /// Be sure that explanScreens is checked if allowBypass is 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), +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); m_pluginListView = new QListView(pluginListHB); m_pluginListView->addColumn("PluginList"); m_pluginListView->header()->hide(); m_pluginListView->setSorting(-1); QWhatsThis::add(m_pluginListView, tr( "Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in" )); QVBox * pluginListVB = new QVBox(pluginListHB); new ToolButton( pluginListVB, tr( "Move Up" ), "up", this , SLOT( moveSelectedUp() ) ); new ToolButton( pluginListVB, tr( "Move Down" ), "down", this , SLOT( moveSelectedDown() ) ); m_mainTW->addTab( m_pluginListWidget, "pass", tr( "plugins" ) ); connect ( m_pluginListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( pluginsChanged ( ) ) ); // general Opie multi-authentication configuration tab m_generalConfig = new MultiauthGeneralConfig(m_mainTW); m_mainTW->addTab(m_generalConfig, "SettingsIcon", tr( "Authentication") ); // login settings page m_loginWidget = new LoginBase(m_mainTW, "login config widget"); m_mainTW->addTab(m_loginWidget, "security/users", tr( "Login") ); // sync settings page m_syncWidget = new SyncBase( m_mainTW, "sync config widget" ); m_mainTW->addTab(m_syncWidget, "security/sync", tr( "Sync") ); // read the "Security" Config file and update our UI readConfig(); /* loads plugins configuration widgets in mainTW tabs and in pluginListView */ loadPlugins(); for ( int i = pluginList.count() - 1; i >= 0; i-- ) { MultiauthPlugin plugin = pluginList[i]; // load the config widgets in the tabs // (configWidget will return 0l if there is no configuration GUI) MultiauthConfigWidget* widget = plugin.pluginObject->configWidget(m_mainTW); if ( widget != 0l ) { odebug << "plugin " << plugin.name << " has a configuration widget" << oendl; configWidgetList.append(widget); m_mainTW->addTab( widget, plugin.pluginObject->pixmapNameConfig(), plugin.pluginObject->pluginName() ); } // set the order/activate tab QPixmap icon = Resource::loadPixmap( plugin.pluginObject->pixmapNameWidget() ); QCheckListItem * item = new QCheckListItem(m_pluginListView, plugin.pluginObject->pluginName(), QCheckListItem::CheckBox ); if ( !icon.isNull() ) { item->setPixmap( 0, icon ); } if ( m_excludePlugins.find( plugin.name ) == m_excludePlugins.end() ) { item->setOn( TRUE ); } m_plugins[plugin.name] = item; } // set the first tab as default. m_mainTW->setCurrentTab(m_pluginListWidget); // 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() { QListViewItem *item = m_pluginListView->selectedItem(); if ( item && item->itemBelow() ) { item->moveItem( item->itemBelow() ); } } /// reads the <code>Security.conf</code> Config file, and updates parts of the user interface void MultiauthConfig::readConfig() { // pointer, so we release this Config when we want Config* pcfg = new Config("Security"); pcfg->setGroup( "Misc" ); m_generalConfig->onStart->setChecked( pcfg->readBoolEntry( "onStart", false ) ); m_generalConfig->onResume->setChecked( pcfg->readBoolEntry( "onResume", false ) ); m_generalConfig->nbSuccessMin->setValue( pcfg->readNumEntry( "nbSuccessMin", 1 ) ); m_generalConfig->noProtectConfig->setChecked( pcfg->readBoolEntry( "noProtectConfig", true) ); m_generalConfig->explanScreens->setChecked( pcfg->readBoolEntry( "explanScreens", true ) ); m_generalConfig->allowBypass->setChecked( pcfg->readBoolEntry( "allowBypass", false ) ); pcfg->setGroup( "Plugins" ); m_excludePlugins = pcfg->readListEntry( "ExcludePlugins", ',' ); m_allPlugins = pcfg->readListEntry( "AllPlugins", ',' ); /* Login and Sync stuff */ pcfg->setGroup("Sync"); int auth_peer = pcfg->readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24 int auth_peer_bits = pcfg->readNumEntry("auth_peer_bits",24); pcfg->setGroup("SyncMode"); int mode = pcfg->readNumEntry("Mode",2); // Default to Sharp switch( mode ) { case 0x01: m_syncWidget->syncModeCombo->setCurrentItem( 0 ); break; case 0x02: default: 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 @@ -36,102 +36,105 @@ #include <opie2/multiauthplugininterface.h> #include <opie2/multiauthcommon.h> /* OPIE */ #include <opie2/otabwidget.h> /* QT */ #include <qdialog.h> #include <qwidget.h> #include <qcheckbox.h> #include <qspinbox.h> #include <qpe/config.h> #include <qlistview.h> #include <qmap.h> #include <qcombobox.h> #include <qpushbutton.h> #include <qmessagebox.h> #include <qtextstream.h> /* UI */ #include "syncbase.h" #include "loginbase.h" /// the "misc" configuration tab, about general Opie Multiauth settings class MultiauthGeneralConfig : public QWidget { Q_OBJECT public: MultiauthGeneralConfig(QWidget * parent, const char * name); ~MultiauthGeneralConfig(); protected: QCheckBox *onStart, *onResume, *noProtectConfig, *explanScreens, *allowBypass; QSpinBox *nbSuccessMin; 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(); private: /// the widget holding all the tabs (or pages) Opie::Ui::OTabWidget *m_mainTW; /// list of authentication plugins in the "Plugins" page QListView *m_pluginListView; QStringList m_allPlugins, m_excludePlugins; QMap<QString,QCheckListItem*> m_plugins; /// plugin list page QWidget *m_pluginListWidget; /// misc config page MultiauthGeneralConfig *m_generalConfig; /// login (root / ...) choice page LoginBase *m_loginWidget; /// synchronization settings page SyncBase *m_syncWidget; int m_nbSuccessReq; bool m_plugins_changed; void readConfig(); void loadPlugins(); // Login and Sync stuff void loadUsers(); bool telnetAvailable() const; bool sshAvailable() const; void updateGUI(); static void parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits); void selectNet(int auth_peer,int auth_peer_bits,bool update); bool autoLogin; QString autoLoginName; }; 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 ) |