summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-12-10 22:34:29 (UTC)
committer harlekin <harlekin>2003-12-10 22:34:29 (UTC)
commit35e556fc2a9d07e6e2c73cac6f05cfb4c0c3e4f1 (patch) (unidiff)
treecf9c57d312570cc8d30946d53d6b0fc8c14d38f5
parentdffe105588cace5d96792155cee3a32a70a05017 (diff)
downloadopie-35e556fc2a9d07e6e2c73cac6f05cfb4c0c3e4f1.zip
opie-35e556fc2a9d07e6e2c73cac6f05cfb4c0c3e4f1.tar.gz
opie-35e556fc2a9d07e6e2c73cac6f05cfb4c0c3e4f1.tar.bz2
less includes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/launcher/doctabsettings.cpp3
-rw-r--r--core/settings/launcher/inputmethodsettings.cpp2
-rw-r--r--core/settings/launcher/launchersettings.cpp1
-rw-r--r--core/settings/launcher/main.cpp1
-rw-r--r--core/settings/launcher/tabdialog.cpp3
-rw-r--r--core/settings/launcher/tabssettings.cpp1
-rw-r--r--core/settings/launcher/taskbarsettings.cpp1
-rw-r--r--core/settings/security/main.cpp3
-rw-r--r--core/settings/security/security.cpp1
9 files changed, 0 insertions, 16 deletions
diff --git a/core/settings/launcher/doctabsettings.cpp b/core/settings/launcher/doctabsettings.cpp
index 8077b8c..179a7f9 100644
--- a/core/settings/launcher/doctabsettings.cpp
+++ b/core/settings/launcher/doctabsettings.cpp
@@ -1,71 +1,68 @@
1/* 1/*
2                This file is part of the OPIE Project 2                This file is part of the OPIE Project
3 =. Copyright (c) 2002 Trolltech AS <info@trolltech.com> 3 =. Copyright (c) 2002 Trolltech AS <info@trolltech.com>
4             .=l. Copyright (c) 2003 Michael Lauer <mickeyl@handhelds.org> 4             .=l. Copyright (c) 2003 Michael Lauer <mickeyl@handhelds.org>
5           .>+-= 5           .>+-=
6 _;:,     .>    :=|. This file is free software; you can 6 _;:,     .>    :=|. This file is free software; you can
7.> <`_,   >  .   <= redistribute it and/or modify it under 7.> <`_,   >  .   <= redistribute it and/or modify it under
8:`=1 )Y*s>-.--   : the terms of the GNU General Public 8:`=1 )Y*s>-.--   : the terms of the GNU General Public
9.="- .-=="i,     .._ License as published by the Free Software 9.="- .-=="i,     .._ License as published by the Free Software
10 - .   .-<_>     .<> Foundation; either version 2 of the License, 10 - .   .-<_>     .<> Foundation; either version 2 of the License,
11     ._= =}       : or (at your option) any later version. 11     ._= =}       : or (at your option) any later version.
12    .%`+i>       _;_. 12    .%`+i>       _;_.
13    .i_,=:_.      -<s. This file is distributed in the hope that 13    .i_,=:_.      -<s. This file is distributed in the hope that
14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
15    : ..    .:,     . . . without even the implied warranty of 15    : ..    .:,     . . . without even the implied warranty of
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
18..}^=.=       =       ; Public License for more details. 18..}^=.=       =       ; Public License for more details.
19++=   -.     .`     .: 19++=   -.     .`     .:
20 :     =  ...= . :.=- You should have received a copy of the GNU 20 :     =  ...= . :.=- You should have received a copy of the GNU
21 -.   .:....=;==+<; General Public License along with this file; 21 -.   .:....=;==+<; General Public License along with this file;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
23    --        :-=` Free Software Foundation, Inc., 23    --        :-=` Free Software Foundation, Inc.,
24 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29#include "doctabsettings.h" 29#include "doctabsettings.h"
30 30
31#include <qpe/config.h> 31#include <qpe/config.h>
32#include <qpe/qlibrary.h>
33#include <qpe/qpeapplication.h>
34 32
35#include <qspinbox.h>
36#include <qcheckbox.h> 33#include <qcheckbox.h>
37#include <qlayout.h> 34#include <qlayout.h>
38#include <qlabel.h> 35#include <qlabel.h>
39#include <qwhatsthis.h> 36#include <qwhatsthis.h>
40 37
41DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( parent, name ) 38DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( parent, name )
42{ 39{
43 QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); 40 QBoxLayout *lay = new QVBoxLayout( this, 4, 4 );
44 41
45 _enable = new QCheckBox( tr( "Enable the Documents Tab" ), this ); 42 _enable = new QCheckBox( tr( "Enable the Documents Tab" ), this );
46 43
47 Config cfg( "Launcher" ); 44 Config cfg( "Launcher" );
48 cfg.setGroup( "DocTab" ); 45 cfg.setGroup( "DocTab" );
49 _enable->setChecked( cfg.readBoolEntry( "Enable", true ) ); 46 _enable->setChecked( cfg.readBoolEntry( "Enable", true ) );
50 47
51 lay->addWidget( _enable ); 48 lay->addWidget( _enable );
52 lay->addWidget( new QLabel( tr( "<b>Note:</b> Changing these settings may need restarting Opie to become effective." ), this ) ); 49 lay->addWidget( new QLabel( tr( "<b>Note:</b> Changing these settings may need restarting Opie to become effective." ), this ) );
53 50
54 lay->addStretch(); 51 lay->addStretch();
55 52
56 QWhatsThis::add( _enable, tr( "Check, if you want the Documents Tab to be visible." ) ); 53 QWhatsThis::add( _enable, tr( "Check, if you want the Documents Tab to be visible." ) );
57} 54}
58 55
59void DocTabSettings::appletChanged() 56void DocTabSettings::appletChanged()
60{ 57{
61} 58}
62 59
63void DocTabSettings::accept() 60void DocTabSettings::accept()
64{ 61{
65 qDebug( "DocTabSettings::accept()" ); 62 qDebug( "DocTabSettings::accept()" );
66 Config cfg( "Launcher" ); 63 Config cfg( "Launcher" );
67 cfg.setGroup( "DocTab" ); 64 cfg.setGroup( "DocTab" );
68 cfg.writeEntry( "Enable", _enable->isChecked() ); 65 cfg.writeEntry( "Enable", _enable->isChecked() );
69 cfg.write(); 66 cfg.write();
70} 67}
71 68
diff --git a/core/settings/launcher/inputmethodsettings.cpp b/core/settings/launcher/inputmethodsettings.cpp
index 147a00d..e342c09 100644
--- a/core/settings/launcher/inputmethodsettings.cpp
+++ b/core/settings/launcher/inputmethodsettings.cpp
@@ -1,81 +1,79 @@
1/* 1/*
2                This file is part of the OPIE Project 2                This file is part of the OPIE Project
3 =. Copyright (c) 2002 Trolltech AS <info@trolltech.com> 3 =. Copyright (c) 2002 Trolltech AS <info@trolltech.com>
4             .=l. Copyright (c) 2003 Michael Lauer <mickeyl@handhelds.org> 4             .=l. Copyright (c) 2003 Michael Lauer <mickeyl@handhelds.org>
5           .>+-= 5           .>+-=
6 _;:,     .>    :=|. This file is free software; you can 6 _;:,     .>    :=|. This file is free software; you can
7.> <`_,   >  .   <= redistribute it and/or modify it under 7.> <`_,   >  .   <= redistribute it and/or modify it under
8:`=1 )Y*s>-.--   : the terms of the GNU General Public 8:`=1 )Y*s>-.--   : the terms of the GNU General Public
9.="- .-=="i,     .._ License as published by the Free Software 9.="- .-=="i,     .._ License as published by the Free Software
10 - .   .-<_>     .<> Foundation; either version 2 of the License, 10 - .   .-<_>     .<> Foundation; either version 2 of the License,
11     ._= =}       : or (at your option) any later version. 11     ._= =}       : or (at your option) any later version.
12    .%`+i>       _;_. 12    .%`+i>       _;_.
13    .i_,=:_.      -<s. This file is distributed in the hope that 13    .i_,=:_.      -<s. This file is distributed in the hope that
14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
15    : ..    .:,     . . . without even the implied warranty of 15    : ..    .:,     . . . without even the implied warranty of
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
18..}^=.=       =       ; Public License for more details. 18..}^=.=       =       ; Public License for more details.
19++=   -.     .`     .: 19++=   -.     .`     .:
20 :     =  ...= . :.=- You should have received a copy of the GNU 20 :     =  ...= . :.=- You should have received a copy of the GNU
21 -.   .:....=;==+<; General Public License along with this file; 21 -.   .:....=;==+<; General Public License along with this file;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
23    --        :-=` Free Software Foundation, Inc., 23    --        :-=` Free Software Foundation, Inc.,
24 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29#include "inputmethodsettings.h" 29#include "inputmethodsettings.h"
30 30
31#include <qpe/config.h> 31#include <qpe/config.h>
32#include <qpe/qlibrary.h>
33#include <qpe/qpeapplication.h>
34 32
35#include <qspinbox.h> 33#include <qspinbox.h>
36#include <qcheckbox.h> 34#include <qcheckbox.h>
37#include <qlayout.h> 35#include <qlayout.h>
38#include <qlabel.h> 36#include <qlabel.h>
39#include <qwhatsthis.h> 37#include <qwhatsthis.h>
40 38
41InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QWidget( parent, name ) 39InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QWidget( parent, name )
42{ 40{
43 QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); 41 QBoxLayout *lay = new QVBoxLayout( this, 4, 4 );
44 42
45 _resize = new QCheckBox( tr( "Resize application on Popup" ), this ); 43 _resize = new QCheckBox( tr( "Resize application on Popup" ), this );
46 _float = new QCheckBox( tr( "Enable floating and resizing" ), this ); 44 _float = new QCheckBox( tr( "Enable floating and resizing" ), this );
47 45
48 QHBoxLayout* hbox = new QHBoxLayout( lay, 4 ); 46 QHBoxLayout* hbox = new QHBoxLayout( lay, 4 );
49 hbox->addWidget( new QLabel( "Initial Width:", this ) ); 47 hbox->addWidget( new QLabel( "Initial Width:", this ) );
50 _size = new QSpinBox( 10, 100, 10, this ); 48 _size = new QSpinBox( 10, 100, 10, this );
51 _size->setSuffix( "%" ); 49 _size->setSuffix( "%" );
52 hbox->addWidget( _size ); 50 hbox->addWidget( _size );
53 hbox->addStretch(); 51 hbox->addStretch();
54 52
55 Config cfg( "Launcher" ); 53 Config cfg( "Launcher" );
56 cfg.setGroup( "InputMethods" ); 54 cfg.setGroup( "InputMethods" );
57 _resize->setChecked( cfg.readBoolEntry( "Resize", true ) ); 55 _resize->setChecked( cfg.readBoolEntry( "Resize", true ) );
58 _float->setChecked( cfg.readBoolEntry( "Float", false ) ); 56 _float->setChecked( cfg.readBoolEntry( "Float", false ) );
59 _size->setValue( cfg.readNumEntry( "Width", 100 ) ); 57 _size->setValue( cfg.readNumEntry( "Width", 100 ) );
60 58
61 lay->addWidget( _resize ); 59 lay->addWidget( _resize );
62 lay->addWidget( _float ); 60 lay->addWidget( _float );
63 lay->addWidget( new QLabel( tr( "<b>Note:</b> Changing these settings may need restarting Opie to become effective." ), this ) ); 61 lay->addWidget( new QLabel( tr( "<b>Note:</b> Changing these settings may need restarting Opie to become effective." ), this ) );
64 62
65 lay->addStretch(); 63 lay->addStretch();
66 64
67 QWhatsThis::add( _resize, tr( "Check, if you want the application to be automatically resized if the input method pops up." ) ); 65 QWhatsThis::add( _resize, tr( "Check, if you want the application to be automatically resized if the input method pops up." ) );
68 QWhatsThis::add( _float, tr( "Check, if you want to move and/or resize input methods" ) ); 66 QWhatsThis::add( _float, tr( "Check, if you want to move and/or resize input methods" ) );
69 QWhatsThis::add( _size, tr( "Specify the percentage of the screen width for the input method" ) ); 67 QWhatsThis::add( _size, tr( "Specify the percentage of the screen width for the input method" ) );
70} 68}
71 69
72void InputMethodSettings::appletChanged() 70void InputMethodSettings::appletChanged()
73{ 71{
74} 72}
75 73
76void InputMethodSettings::accept() 74void InputMethodSettings::accept()
77{ 75{
78 qDebug( "InputMethodSettings::accept()" ); 76 qDebug( "InputMethodSettings::accept()" );
79 Config cfg( "Launcher" ); 77 Config cfg( "Launcher" );
80 cfg.setGroup( "InputMethods" ); 78 cfg.setGroup( "InputMethods" );
81 cfg.writeEntry( "Resize", _resize->isChecked() ); 79 cfg.writeEntry( "Resize", _resize->isChecked() );
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp
index e129849..5c11cc8 100644
--- a/core/settings/launcher/launchersettings.cpp
+++ b/core/settings/launcher/launchersettings.cpp
@@ -1,78 +1,77 @@
1 1
2/* 2/*
3               =. This file is part of the OPIE Project 3               =. This file is part of the OPIE Project
4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
5           .>+-= 5           .>+-=
6 _;:,     .>    :=|. This file is free software; you can 6 _;:,     .>    :=|. This file is free software; you can
7.> <`_,   >  .   <= redistribute it and/or modify it under 7.> <`_,   >  .   <= redistribute it and/or modify it under
8:`=1 )Y*s>-.--   : the terms of the GNU General Public 8:`=1 )Y*s>-.--   : the terms of the GNU General Public
9.="- .-=="i,     .._ License as published by the Free Software 9.="- .-=="i,     .._ License as published by the Free Software
10 - .   .-<_>     .<> Foundation; either version 2 of the License, 10 - .   .-<_>     .<> Foundation; either version 2 of the License,
11     ._= =}       : or (at your option) any later version. 11     ._= =}       : or (at your option) any later version.
12    .%`+i>       _;_. 12    .%`+i>       _;_.
13    .i_,=:_.      -<s. This file is distributed in the hope that 13    .i_,=:_.      -<s. This file is distributed in the hope that
14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
15    : ..    .:,     . . . without even the implied warranty of 15    : ..    .:,     . . . without even the implied warranty of
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
18..}^=.=       =       ; Public License for more details. 18..}^=.=       =       ; Public License for more details.
19++=   -.     .`     .: 19++=   -.     .`     .:
20 :     =  ...= . :.=- You should have received a copy of the GNU 20 :     =  ...= . :.=- You should have received a copy of the GNU
21 -.   .:....=;==+<; General Public License along with this file; 21 -.   .:....=;==+<; General Public License along with this file;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
23    --        :-=` Free Software Foundation, Inc., 23    --        :-=` Free Software Foundation, Inc.,
24 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29#include <qlayout.h> 29#include <qlayout.h>
30#include <qapplication.h>
31 30
32#include <opie/otabwidget.h> 31#include <opie/otabwidget.h>
33 32
34#include "launchersettings.h" 33#include "launchersettings.h"
35#include "tabssettings.h" 34#include "tabssettings.h"
36#include "menusettings.h" 35#include "menusettings.h"
37#include "taskbarsettings.h" 36#include "taskbarsettings.h"
38#include "inputmethodsettings.h" 37#include "inputmethodsettings.h"
39#include "doctabsettings.h" 38#include "doctabsettings.h"
40 39
41LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) 40LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags)
42 : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) 41 : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp )
43{ 42{
44 setCaption ( tr( "Launcher Settings" )); 43 setCaption ( tr( "Launcher Settings" ));
45 44
46 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); 45 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
47 46
48 OTabWidget *tw = new OTabWidget ( this, "otab" ); 47 OTabWidget *tw = new OTabWidget ( this, "otab" );
49 lay-> addWidget ( tw ); 48 lay-> addWidget ( tw );
50 49
51 m_tabs = new TabsSettings ( tw ); 50 m_tabs = new TabsSettings ( tw );
52 m_taskbar = new TaskbarSettings ( tw ); 51 m_taskbar = new TaskbarSettings ( tw );
53 m_menu = new MenuSettings ( tw ); 52 m_menu = new MenuSettings ( tw );
54 m_imethods = new InputMethodSettings ( tw ); 53 m_imethods = new InputMethodSettings ( tw );
55 m_doctab = new DocTabSettings ( tw ); 54 m_doctab = new DocTabSettings ( tw );
56 55
57 tw-> addTab ( m_taskbar, "wait", tr( "Taskbar" )); 56 tw-> addTab ( m_taskbar, "wait", tr( "Taskbar" ));
58 tw-> addTab ( m_menu, "go", tr( "O-Menu" )); 57 tw-> addTab ( m_menu, "go", tr( "O-Menu" ));
59 tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); 58 tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" ));
60 tw-> addTab ( m_imethods, "launchersettings/inputmethod.png", tr( "InputMethods" )); 59 tw-> addTab ( m_imethods, "launchersettings/inputmethod.png", tr( "InputMethods" ));
61 tw-> addTab ( m_doctab, "DocsIcon", tr( "DocTab" ) ); 60 tw-> addTab ( m_doctab, "DocsIcon", tr( "DocTab" ) );
62 tw-> setCurrentTab ( m_taskbar ); 61 tw-> setCurrentTab ( m_taskbar );
63} 62}
64 63
65void LauncherSettings::accept ( ) 64void LauncherSettings::accept ( )
66{ 65{
67 m_taskbar-> accept ( ); 66 m_taskbar-> accept ( );
68 m_menu-> accept ( ); 67 m_menu-> accept ( );
69 m_tabs-> accept ( ); 68 m_tabs-> accept ( );
70 m_imethods-> accept ( ); 69 m_imethods-> accept ( );
71 m_doctab-> accept ( ); 70 m_doctab-> accept ( );
72 71
73 QDialog::accept ( ); 72 QDialog::accept ( );
74} 73}
75 74
76void LauncherSettings::done ( int r ) 75void LauncherSettings::done ( int r )
77{ 76{
78 QDialog::done ( r ); 77 QDialog::done ( r );
diff --git a/core/settings/launcher/main.cpp b/core/settings/launcher/main.cpp
index 4cc1d35..bcfdcf6 100644
--- a/core/settings/launcher/main.cpp
+++ b/core/settings/launcher/main.cpp
@@ -1,35 +1,34 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
17..}^=.=       =       ; Public License for more details. 17..}^=.=       =       ; Public License for more details.
18++=   -.     .`     .: 18++=   -.     .`     .:
19 :     =  ...= . :.=- You should have received a copy of the GNU 19 :     =  ...= . :.=- You should have received a copy of the GNU
20 -.   .:....=;==+<; General Public License along with this file; 20 -.   .:....=;==+<; General Public License along with this file;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#include "launchersettings.h" 28#include "launchersettings.h"
29 29
30#include <qpe/qpeapplication.h>
31#include <opie/oapplicationfactory.h> 30#include <opie/oapplicationfactory.h>
32 31
33OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> ) 32OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> )
34 33
35 34
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index de99a09..f79ad40 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -1,88 +1,85 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
17..}^=.=       =       ; Public License for more details. 17..}^=.=       =       ; Public License for more details.
18++=   -.     .`     .: 18++=   -.     .`     .:
19 :     =  ...= . :.=- You should have received a copy of the GNU 19 :     =  ...= . :.=- You should have received a copy of the GNU
20 -.   .:....=;==+<; General Public License along with this file; 20 -.   .:....=;==+<; General Public License along with this file;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#include <qpe/resource.h> 28#include <qpe/resource.h>
29#include <qpe/config.h>
30#include <qpe/applnk.h>
31 29
32#include <qlayout.h> 30#include <qlayout.h>
33#include <qvbox.h> 31#include <qvbox.h>
34#include <qtabbar.h> 32#include <qtabbar.h>
35#include <qiconview.h> 33#include <qiconview.h>
36#include <qapplication.h> 34#include <qapplication.h>
37#include <qlabel.h> 35#include <qlabel.h>
38#include <qradiobutton.h> 36#include <qradiobutton.h>
39#include <qbuttongroup.h> 37#include <qbuttongroup.h>
40#include <qpushbutton.h>
41#include <qwhatsthis.h> 38#include <qwhatsthis.h>
42#include <qcheckbox.h> 39#include <qcheckbox.h>
43 40
44#include <opie/ofontselector.h> 41#include <opie/ofontselector.h>
45#include <opie/otabwidget.h> 42#include <opie/otabwidget.h>
46#include <opie/ocolorbutton.h> 43#include <opie/ocolorbutton.h>
47#include <opie/ofiledialog.h> 44#include <opie/ofiledialog.h>
48 45
49#include "tabdialog.h" 46#include "tabdialog.h"
50 47
51 48
52class SampleItem : public QIconViewItem { 49class SampleItem : public QIconViewItem {
53public: 50public:
54 SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) 51 SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text )
55 { 52 {
56 m_large = pix; 53 m_large = pix;
57 m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 )); 54 m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 ));
58 } 55 }
59 56
60 void sizeChange ( ) 57 void sizeChange ( )
61 { 58 {
62 calcRect ( ); 59 calcRect ( );
63 repaint ( ); 60 repaint ( );
64 } 61 }
65 62
66 QPixmap *pixmap ( ) const 63 QPixmap *pixmap ( ) const
67 { 64 {
68 if ( iconView ( )-> itemTextPos ( ) == QIconView::Right ) 65 if ( iconView ( )-> itemTextPos ( ) == QIconView::Right )
69 return (QPixmap *) &m_small; 66 return (QPixmap *) &m_small;
70 else 67 else
71 return (QPixmap *) &m_large; 68 return (QPixmap *) &m_large;
72 } 69 }
73 70
74private: 71private:
75 QPixmap m_large, m_small; 72 QPixmap m_large, m_small;
76}; 73};
77 74
78class SampleView : public QIconView { 75class SampleView : public QIconView {
79public: 76public:
80 SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name ) 77 SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name )
81 { 78 {
82 setItemsMovable ( false ); 79 setItemsMovable ( false );
83 setAutoArrange ( true ); 80 setAutoArrange ( true );
84 setSorting ( true ); 81 setSorting ( true );
85 setFrameStyle ( QFrame::NoFrame ); 82 setFrameStyle ( QFrame::NoFrame );
86 setSpacing ( 4 ); 83 setSpacing ( 4 );
87 setMargin ( 0 ); 84 setMargin ( 0 );
88 setSelectionMode ( QIconView::NoSelection ); 85 setSelectionMode ( QIconView::NoSelection );
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index 3d8b456..a3d31a5 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -1,78 +1,77 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
17..}^=.=       =       ; Public License for more details. 17..}^=.=       =       ; Public License for more details.
18++=   -.     .`     .: 18++=   -.     .`     .:
19 :     =  ...= . :.=- You should have received a copy of the GNU 19 :     =  ...= . :.=- You should have received a copy of the GNU
20 -.   .:....=;==+<; General Public License along with this file; 20 -.   .:....=;==+<; General Public License along with this file;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#include "tabssettings.h" 28#include "tabssettings.h"
29 29
30#include <qpe/qpeapplication.h>
31#include <qpe/resource.h> 30#include <qpe/resource.h>
32#include <qpe/applnk.h> 31#include <qpe/applnk.h>
33#include <qpe/mimetype.h> 32#include <qpe/mimetype.h>
34#include <qpe/qcopenvelope_qws.h> 33#include <qpe/qcopenvelope_qws.h>
35#include <qpe/config.h> 34#include <qpe/config.h>
36 35
37#include <qlistbox.h> 36#include <qlistbox.h>
38#include <qpushbutton.h> 37#include <qpushbutton.h>
39#include <qlayout.h> 38#include <qlayout.h>
40#include <qlabel.h> 39#include <qlabel.h>
41#include <qwhatsthis.h> 40#include <qwhatsthis.h>
42#include <qcheckbox.h> 41#include <qcheckbox.h>
43 42
44#include "tabdialog.h" 43#include "tabdialog.h"
45 44
46#include <stdlib.h> 45#include <stdlib.h>
47#include <qmessagebox.h> 46#include <qmessagebox.h>
48 47
49 48
50 #define GLOBALID ".global." 49 #define GLOBALID ".global."
51 50
52 51
53TabsSettings::TabsSettings ( QWidget *parent, const char *name ) 52TabsSettings::TabsSettings ( QWidget *parent, const char *name )
54 : QWidget ( parent, name ) 53 : QWidget ( parent, name )
55{ 54{
56 QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 ); 55 QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 );
57 56
58 QLabel *l = new QLabel ( tr( "Launcher Tabs:" ), this ); 57 QLabel *l = new QLabel ( tr( "Launcher Tabs:" ), this );
59 lay-> addMultiCellWidget ( l, 0, 0, 0, 1 ); 58 lay-> addMultiCellWidget ( l, 0, 0, 0, 1 );
60 59
61 m_list = new QListBox ( this ); 60 m_list = new QListBox ( this );
62 lay-> addMultiCellWidget ( m_list, 1, 4, 0, 0 ); 61 lay-> addMultiCellWidget ( m_list, 1, 4, 0, 0 );
63 62
64 QWhatsThis::add ( m_list, tr( "foobar" )); 63 QWhatsThis::add ( m_list, tr( "foobar" ));
65 64
66 QPushButton *p1, *p2, *p3; 65 QPushButton *p1, *p2, *p3;
67 p1 = new QPushButton ( tr( "New" ), this ); 66 p1 = new QPushButton ( tr( "New" ), this );
68 lay-> addWidget ( p1, 1, 1 ); 67 lay-> addWidget ( p1, 1, 1 );
69 connect ( p1, SIGNAL( clicked ( )), this, SLOT( newClicked ( ))); 68 connect ( p1, SIGNAL( clicked ( )), this, SLOT( newClicked ( )));
70 69
71 p2 = new QPushButton ( tr( "Edit" ), this ); 70 p2 = new QPushButton ( tr( "Edit" ), this );
72 lay-> addWidget ( p2, 2, 1 ); 71 lay-> addWidget ( p2, 2, 1 );
73 connect ( p2, SIGNAL( clicked ( )), this, SLOT( editClicked ( ))); 72 connect ( p2, SIGNAL( clicked ( )), this, SLOT( editClicked ( )));
74 73
75 p3 = new QPushButton ( tr( "Delete" ), this ); 74 p3 = new QPushButton ( tr( "Delete" ), this );
76 lay-> addWidget ( p3, 3, 1 ); 75 lay-> addWidget ( p3, 3, 1 );
77 connect ( p3, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( ))); 76 connect ( p3, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( )));
78 77
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index d03ea49..badb98f 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -1,87 +1,86 @@
1/* 1/*
2                This file is part of the OPIE Project 2                This file is part of the OPIE Project
3 =. Copyright (c) 2002 Trolltech AS <info@trolltech.com> 3 =. Copyright (c) 2002 Trolltech AS <info@trolltech.com>
4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
5           .>+-= 5           .>+-=
6 _;:,     .>    :=|. This file is free software; you can 6 _;:,     .>    :=|. This file is free software; you can
7.> <`_,   >  .   <= redistribute it and/or modify it under 7.> <`_,   >  .   <= redistribute it and/or modify it under
8:`=1 )Y*s>-.--   : the terms of the GNU General Public 8:`=1 )Y*s>-.--   : the terms of the GNU General Public
9.="- .-=="i,     .._ License as published by the Free Software 9.="- .-=="i,     .._ License as published by the Free Software
10 - .   .-<_>     .<> Foundation; either version 2 of the License, 10 - .   .-<_>     .<> Foundation; either version 2 of the License,
11     ._= =}       : or (at your option) any later version. 11     ._= =}       : or (at your option) any later version.
12    .%`+i>       _;_. 12    .%`+i>       _;_.
13    .i_,=:_.      -<s. This file is distributed in the hope that 13    .i_,=:_.      -<s. This file is distributed in the hope that
14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
15    : ..    .:,     . . . without even the implied warranty of 15    : ..    .:,     . . . without even the implied warranty of
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
18..}^=.=       =       ; Public License for more details. 18..}^=.=       =       ; Public License for more details.
19++=   -.     .`     .: 19++=   -.     .`     .:
20 :     =  ...= . :.=- You should have received a copy of the GNU 20 :     =  ...= . :.=- You should have received a copy of the GNU
21 -.   .:....=;==+<; General Public License along with this file; 21 -.   .:....=;==+<; General Public License along with this file;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
23    --        :-=` Free Software Foundation, Inc., 23    --        :-=` Free Software Foundation, Inc.,
24 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29#include "taskbarsettings.h" 29#include "taskbarsettings.h"
30 30
31#include <qpe/config.h> 31#include <qpe/config.h>
32#include <qpe/qlibrary.h> 32#include <qpe/qlibrary.h>
33#include <qpe/qpeapplication.h> 33#include <qpe/qpeapplication.h>
34#include <qpe/taskbarappletinterface.h> 34#include <qpe/taskbarappletinterface.h>
35#include <qpe/qcopenvelope_qws.h> 35#include <qpe/qcopenvelope_qws.h>
36 36
37#include <qdir.h> 37#include <qdir.h>
38#include <qlistview.h> 38#include <qlistview.h>
39#include <qcheckbox.h>
40#include <qheader.h> 39#include <qheader.h>
41#include <qlayout.h> 40#include <qlayout.h>
42#include <qlabel.h> 41#include <qlabel.h>
43#include <qwhatsthis.h> 42#include <qwhatsthis.h>
44 43
45#include <stdlib.h> 44#include <stdlib.h>
46 45
47 46
48TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name ) 47TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name )
49 : QWidget ( parent, name ) 48 : QWidget ( parent, name )
50{ 49{
51 m_applets_changed = false; 50 m_applets_changed = false;
52 51
53 QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); 52 QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
54 53
55 QLabel *l = new QLabel ( tr( "Load applets in Taskbar:" ), this ); 54 QLabel *l = new QLabel ( tr( "Load applets in Taskbar:" ), this );
56 lay-> addWidget ( l ); 55 lay-> addWidget ( l );
57 56
58 m_list = new QListView ( this ); 57 m_list = new QListView ( this );
59 m_list-> addColumn ( "foobar" ); 58 m_list-> addColumn ( "foobar" );
60 m_list-> header ( )-> hide ( ); 59 m_list-> header ( )-> hide ( );
61 60
62 lay-> addWidget ( m_list ); 61 lay-> addWidget ( m_list );
63 62
64 QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." )); 63 QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." ));
65 64
66 connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( ))); 65 connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
67 66
68 init ( ); 67 init ( );
69} 68}
70 69
71void TaskbarSettings::init ( ) 70void TaskbarSettings::init ( )
72{ 71{
73 Config cfg ( "Taskbar" ); 72 Config cfg ( "Taskbar" );
74 cfg. setGroup ( "Applets" ); 73 cfg. setGroup ( "Applets" );
75 QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' ); 74 QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
76 75
77 QString path = QPEApplication::qpeDir ( ) + "/plugins/applets"; 76 QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
78#ifdef Q_OS_MACX 77#ifdef Q_OS_MACX
79 QStringList list = QDir ( path, "lib*.dylib" ). entryList ( ); 78 QStringList list = QDir ( path, "lib*.dylib" ). entryList ( );
80#else 79#else
81 QStringList list = QDir ( path, "lib*.so" ). entryList ( ); 80 QStringList list = QDir ( path, "lib*.so" ). entryList ( );
82#endif /* Q_OS_MACX */ 81#endif /* Q_OS_MACX */
83 82
84 for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { 83 for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
85 QString name; 84 QString name;
86 QPixmap icon; 85 QPixmap icon;
87 TaskbarNamedAppletInterface *iface = 0; 86 TaskbarNamedAppletInterface *iface = 0;
diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp
index 3141fb8..aed8ab2 100644
--- a/core/settings/security/main.cpp
+++ b/core/settings/security/main.cpp
@@ -1,32 +1,29 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include <qpe/qpeapplication.h>
22#include <qpe/qcopenvelope_qws.h>
23#include <qpe/global.h>
24 21
25#include "security.h" 22#include "security.h"
26 23
27#include <opie/oapplicationfactory.h> 24#include <opie/oapplicationfactory.h>
28 25
29OPIE_EXPORT_APP( OApplicationFactory<Security> ) 26OPIE_EXPORT_APP( OApplicationFactory<Security> )
30 27
31 28
32 29
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index d7871b3..7bb14cd 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -1,81 +1,80 @@
1/********************************************************************** 1/**********************************************************************
2 ** Copyright (C) 2000 Trolltech AS. All rights reserved. 2 ** Copyright (C) 2000 Trolltech AS. All rights reserved.
3 ** 3 **
4 ** This file is part of Qtopia Environment. 4 ** This file is part of Qtopia Environment.
5 ** 5 **
6 ** This file may be distributed and/or modified under the terms of the 6 ** This file may be distributed and/or modified under the terms of the
7 ** GNU General Public License version 2 as published by the Free Software 7 ** GNU General Public License version 2 as published by the Free Software
8 ** Foundation and appearing in the file LICENSE.GPL included in the 8 ** Foundation and appearing in the file LICENSE.GPL included in the
9 ** packaging of this file. 9 ** packaging of this file.
10 ** 10 **
11 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13 ** 13 **
14 ** See http://www.trolltech.com/gpl/ for GPL licensing information. 14 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
15 ** 15 **
16 ** Contact info@trolltech.com if any conditions of this licensing are 16 ** Contact info@trolltech.com if any conditions of this licensing are
17 ** not clear to you. 17 ** not clear to you.
18 ** 18 **
19 **********************************************************************/ 19 **********************************************************************/
20#include "security.h" 20#include "security.h"
21 21
22#include <qpe/qpeapplication.h> 22#include <qpe/qpeapplication.h>
23#include <qpe/config.h> 23#include <qpe/config.h>
24#include <qpe/password.h> 24#include <qpe/password.h>
25#include <qpe/qpedialog.h> 25#include <qpe/qpedialog.h>
26#include <qpe/qcopenvelope_qws.h> 26#include <qpe/qcopenvelope_qws.h>
27 27
28#include <qcheckbox.h> 28#include <qcheckbox.h>
29#include <qpushbutton.h> 29#include <qpushbutton.h>
30#include <qcombobox.h> 30#include <qcombobox.h>
31#include <qmessagebox.h> 31#include <qmessagebox.h>
32#include <qfile.h> 32#include <qfile.h>
33#include <qlistview.h>
34#include <qtextstream.h> 33#include <qtextstream.h>
35 34
36 Security::Security( QWidget* parent, const char* name, WFlags fl ) 35 Security::Security( QWidget* parent, const char* name, WFlags fl )
37: SecurityBase( parent, name, TRUE, WStyle_ContextHelp ) 36: SecurityBase( parent, name, TRUE, WStyle_ContextHelp )
38{ 37{
39 valid=FALSE; 38 valid=FALSE;
40 Config cfg("Security"); 39 Config cfg("Security");
41 cfg.setGroup("Passcode"); 40 cfg.setGroup("Passcode");
42 passcode = cfg.readEntry("passcode"); 41 passcode = cfg.readEntry("passcode");
43 passcode_poweron->setChecked(cfg.readBoolEntry("passcode_poweron",FALSE)); 42 passcode_poweron->setChecked(cfg.readBoolEntry("passcode_poweron",FALSE));
44 cfg.setGroup("Sync"); 43 cfg.setGroup("Sync");
45 int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24 44 int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24
46 int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24); 45 int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24);
47 selectNet(auth_peer,auth_peer_bits,TRUE); 46 selectNet(auth_peer,auth_peer_bits,TRUE);
48 47
49 connect(syncnet, SIGNAL(textChanged(const QString&)), 48 connect(syncnet, SIGNAL(textChanged(const QString&)),
50 this, SLOT(setSyncNet(const QString&))); 49 this, SLOT(setSyncNet(const QString&)));
51 50
52 cfg.setGroup("Sync"); 51 cfg.setGroup("Sync");
53 QString sa = cfg.readEntry("syncapp","Qtopia"); 52 QString sa = cfg.readEntry("syncapp","Qtopia");
54 53
55 for (int i=0; i<syncapp->count(); i++) { 54 for (int i=0; i<syncapp->count(); i++) {
56 if ( syncapp->text(i) == sa ) { 55 if ( syncapp->text(i) == sa ) {
57 syncapp->setCurrentItem(i); 56 syncapp->setCurrentItem(i);
58 } 57 }
59 } 58 }
60 59
61 /* 60 /*
62 cfg.setGroup("Remote"); 61 cfg.setGroup("Remote");
63 if ( telnetAvailable() ) 62 if ( telnetAvailable() )
64 telnet->setChecked(cfg.readEntry("allow_telnet")); 63 telnet->setChecked(cfg.readEntry("allow_telnet"));
65 else 64 else
66 telnet->hide(); 65 telnet->hide();
67 66
68 if ( sshAvailable() ) 67 if ( sshAvailable() )
69 ssh->setChecked(cfg.readEntry("allow_ssh")); 68 ssh->setChecked(cfg.readEntry("allow_ssh"));
70 else 69 else
71 ssh->hide(); 70 ssh->hide();
72 */ 71 */
73 72
74 QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; 73 QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
75 Config loginCfg(configFile,Config::File); 74 Config loginCfg(configFile,Config::File);
76 75
77 loginCfg.setGroup("General"); 76 loginCfg.setGroup("General");
78 autoLoginName=loginCfg.readEntry("AutoLogin",""); 77 autoLoginName=loginCfg.readEntry("AutoLogin","");
79 78
80 if (autoLoginName.stripWhiteSpace().isEmpty()) { 79 if (autoLoginName.stripWhiteSpace().isEmpty()) {
81 autoLogin=false; 80 autoLogin=false;