summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-09-21 18:13:18 (UTC)
committer harlekin <harlekin>2002-09-21 18:13:18 (UTC)
commit3838d736783c5d33197cb8d99f611ab214460bd9 (patch) (side-by-side diff)
tree654ac2c3344791245d3efd0eacfaf71f680d4bd7
parentc0c3232de8f21a7a0ad0918b9e6fb7bd33d01468 (diff)
downloadopie-3838d736783c5d33197cb8d99f611ab214460bd9.zip
opie-3838d736783c5d33197cb8d99f611ab214460bd9.tar.gz
opie-3838d736783c5d33197cb8d99f611ab214460bd9.tar.bz2
usual
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/launcher/.cvsignore2
-rw-r--r--core/settings/launcher/taskbarsettings.cpp23
-rw-r--r--noncore/settings/sshkeys/.cvsignore4
3 files changed, 18 insertions, 11 deletions
diff --git a/core/settings/launcher/.cvsignore b/core/settings/launcher/.cvsignore
new file mode 100644
index 0000000..034a627
--- a/dev/null
+++ b/core/settings/launcher/.cvsignore
@@ -0,0 +1,2 @@
+Makefile*
+moc_* \ No newline at end of file
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index 8f16951..7df9a68 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -43,115 +43,116 @@ TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name )
m_applets_changed = false;
QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
QLabel *l = new QLabel ( tr( "Load applets:" ), this );
lay-> addWidget ( l );
m_list = new QListView ( this );
m_list-> addColumn ( "foobar" );
m_list-> header ( )-> hide ( );
lay-> addWidget ( m_list );
m_omenu = new QCheckBox ( tr( "Show O-Menu" ), this );
lay-> addWidget ( m_omenu );
m_omenu_tabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this );
lay-> addWidget ( m_omenu_tabs );
QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." ));
QWhatsThis::add( m_omenu_tabs, tr( "Adds the contents of the Launcher as menus in the O-Menu." ));
QWhatsThis::add( m_omenu, tr( "Check if you want the O-Menu in the taskbar." ));
connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
connect ( m_omenu, SIGNAL( toggled ( bool )), m_omenu_tabs, SLOT( setEnabled ( bool )));
// This option does not make sense ! (sandman)
m_omenu_tabs-> hide ( );
init ( );
}
void TaskbarSettings::init ( )
{
Config cfg ( "Taskbar" );
cfg. setGroup ( "Applets" );
QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
QStringList list = QDir ( path, "lib*.so" ). entryList ( );
for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
QString name;
QPixmap icon;
TaskbarNamedAppletInterface *iface = 0;
QLibrary *lib = new QLibrary ( path + "/" + *it );
lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
- if ( iface ) {
- QString lang = getenv( "LANG" );
- QTranslator *trans = new QTranslator ( qApp );
- QString type = (*it). left ((*it). find ("."));
- QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm";
- if ( trans-> load ( tfn ))
- qApp-> installTranslator ( trans );
+ if ( iface ) {
+
+ QString lang = getenv( "LANG" );
+ QTranslator *trans = new QTranslator ( qApp );
+ QString type = (*it). left ((*it). find ("."));
+ QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm";
+ if ( trans-> load ( tfn ))
+ qApp-> installTranslator ( trans );
else
- delete trans;
- name = iface-> name ( );
- icon = iface-> icon ( );
+ delete trans;
+ name = iface-> name ( );
+ icon = iface-> icon ( );
iface-> release ( );
lib-> unload ( );
} else {
delete lib;
name = (*it). mid ( 3 );
int sep = name. find( ".so" );
if ( sep > 0 )
- name. truncate ( sep );
+ name. truncate ( sep );
sep = name. find ( "applet" );
if ( sep == (int) name.length ( ) - 6 )
name. truncate ( sep );
name[0] = name[0]. upper ( );
}
QCheckListItem *item;
item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
if ( !icon. isNull ( ))
item-> setPixmap ( 0, icon );
item-> setOn ( exclude. find ( *it ) == exclude. end ( ));
m_applets [*it] = item;
}
cfg. setGroup ( "Menu" );
m_omenu_tabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true ));
m_omenu-> setChecked ( cfg. readBoolEntry ( "ShowMenu", true ));
m_omenu_tabs-> setEnabled ( m_omenu-> isChecked ( ));
}
void TaskbarSettings::appletChanged()
{
m_applets_changed = true;
}
void TaskbarSettings::accept ( )
{
Config cfg ( "Taskbar" );
cfg. setGroup ( "Applets" );
if ( m_applets_changed ) {
QStringList exclude;
QMap <QString, QCheckListItem *>::Iterator it;
for ( it = m_applets. begin ( ); it != m_applets. end ( ); ++it ) {
if ( !(*it)-> isOn ( ))
exclude << it. key ( );
}
cfg. writeEntry ( "ExcludeApplets", exclude, ',' );
}
cfg. writeEntry ( "SafeMode", false );
cfg. setGroup ( "Menu" );
if ( m_omenu_tabs-> isChecked ( ) != cfg. readBoolEntry ( "LauncherTabs", true )) {
m_applets_changed = true;
cfg. writeEntry ( "LauncherTabs", m_omenu_tabs-> isChecked ( ));
}
diff --git a/noncore/settings/sshkeys/.cvsignore b/noncore/settings/sshkeys/.cvsignore
new file mode 100644
index 0000000..19bace6
--- a/dev/null
+++ b/noncore/settings/sshkeys/.cvsignore
@@ -0,0 +1,4 @@
+Makefile*
+moc_*
+sshkeysbase.cpp
+sshkeysbase.h \ No newline at end of file