author | harlekin <harlekin> | 2002-09-21 18:13:18 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-21 18:13:18 (UTC) |
commit | 3838d736783c5d33197cb8d99f611ab214460bd9 (patch) (unidiff) | |
tree | 654ac2c3344791245d3efd0eacfaf71f680d4bd7 /core/settings | |
parent | c0c3232de8f21a7a0ad0918b9e6fb7bd33d01468 (diff) | |
download | opie-3838d736783c5d33197cb8d99f611ab214460bd9.zip opie-3838d736783c5d33197cb8d99f611ab214460bd9.tar.gz opie-3838d736783c5d33197cb8d99f611ab214460bd9.tar.bz2 |
usual
-rw-r--r-- | core/settings/launcher/.cvsignore | 2 | ||||
-rw-r--r-- | core/settings/launcher/taskbarsettings.cpp | 23 |
2 files changed, 14 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 @@ | |||
1 | Makefile* | ||
2 | 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 | |||
@@ -67,67 +67,68 @@ TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name ) | |||
67 | connect ( m_omenu, SIGNAL( toggled ( bool )), m_omenu_tabs, SLOT( setEnabled ( bool ))); | 67 | connect ( m_omenu, SIGNAL( toggled ( bool )), m_omenu_tabs, SLOT( setEnabled ( bool ))); |
68 | 68 | ||
69 | // This option does not make sense ! (sandman) | 69 | // This option does not make sense ! (sandman) |
70 | m_omenu_tabs-> hide ( ); | 70 | m_omenu_tabs-> hide ( ); |
71 | 71 | ||
72 | init ( ); | 72 | init ( ); |
73 | } | 73 | } |
74 | 74 | ||
75 | void TaskbarSettings::init ( ) | 75 | void TaskbarSettings::init ( ) |
76 | { | 76 | { |
77 | Config cfg ( "Taskbar" ); | 77 | Config cfg ( "Taskbar" ); |
78 | cfg. setGroup ( "Applets" ); | 78 | cfg. setGroup ( "Applets" ); |
79 | QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' ); | 79 | QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' ); |
80 | 80 | ||
81 | QString path = QPEApplication::qpeDir ( ) + "/plugins/applets"; | 81 | QString path = QPEApplication::qpeDir ( ) + "/plugins/applets"; |
82 | QStringList list = QDir ( path, "lib*.so" ). entryList ( ); | 82 | QStringList list = QDir ( path, "lib*.so" ). entryList ( ); |
83 | 83 | ||
84 | for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { | 84 | for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { |
85 | QString name; | 85 | QString name; |
86 | QPixmap icon; | 86 | QPixmap icon; |
87 | TaskbarNamedAppletInterface *iface = 0; | 87 | TaskbarNamedAppletInterface *iface = 0; |
88 | 88 | ||
89 | QLibrary *lib = new QLibrary ( path + "/" + *it ); | 89 | QLibrary *lib = new QLibrary ( path + "/" + *it ); |
90 | lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface ); | 90 | lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface ); |
91 | if ( iface ) { | 91 | if ( iface ) { |
92 | QString lang = getenv( "LANG" ); | 92 | |
93 | QTranslator *trans = new QTranslator ( qApp ); | 93 | QString lang = getenv( "LANG" ); |
94 | QString type = (*it). left ((*it). find (".")); | 94 | QTranslator *trans = new QTranslator ( qApp ); |
95 | QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; | 95 | QString type = (*it). left ((*it). find (".")); |
96 | if ( trans-> load ( tfn )) | 96 | QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; |
97 | qApp-> installTranslator ( trans ); | 97 | if ( trans-> load ( tfn )) |
98 | qApp-> installTranslator ( trans ); | ||
98 | else | 99 | else |
99 | delete trans; | 100 | delete trans; |
100 | name = iface-> name ( ); | 101 | name = iface-> name ( ); |
101 | icon = iface-> icon ( ); | 102 | icon = iface-> icon ( ); |
102 | iface-> release ( ); | 103 | iface-> release ( ); |
103 | lib-> unload ( ); | 104 | lib-> unload ( ); |
104 | } else { | 105 | } else { |
105 | delete lib; | 106 | delete lib; |
106 | name = (*it). mid ( 3 ); | 107 | name = (*it). mid ( 3 ); |
107 | int sep = name. find( ".so" ); | 108 | int sep = name. find( ".so" ); |
108 | if ( sep > 0 ) | 109 | if ( sep > 0 ) |
109 | name. truncate ( sep ); | 110 | name. truncate ( sep ); |
110 | sep = name. find ( "applet" ); | 111 | sep = name. find ( "applet" ); |
111 | if ( sep == (int) name.length ( ) - 6 ) | 112 | if ( sep == (int) name.length ( ) - 6 ) |
112 | name. truncate ( sep ); | 113 | name. truncate ( sep ); |
113 | name[0] = name[0]. upper ( ); | 114 | name[0] = name[0]. upper ( ); |
114 | } | 115 | } |
115 | QCheckListItem *item; | 116 | QCheckListItem *item; |
116 | item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox ); | 117 | item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox ); |
117 | if ( !icon. isNull ( )) | 118 | if ( !icon. isNull ( )) |
118 | item-> setPixmap ( 0, icon ); | 119 | item-> setPixmap ( 0, icon ); |
119 | item-> setOn ( exclude. find ( *it ) == exclude. end ( )); | 120 | item-> setOn ( exclude. find ( *it ) == exclude. end ( )); |
120 | m_applets [*it] = item; | 121 | m_applets [*it] = item; |
121 | } | 122 | } |
122 | 123 | ||
123 | cfg. setGroup ( "Menu" ); | 124 | cfg. setGroup ( "Menu" ); |
124 | 125 | ||
125 | m_omenu_tabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true )); | 126 | m_omenu_tabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true )); |
126 | m_omenu-> setChecked ( cfg. readBoolEntry ( "ShowMenu", true )); | 127 | m_omenu-> setChecked ( cfg. readBoolEntry ( "ShowMenu", true )); |
127 | 128 | ||
128 | m_omenu_tabs-> setEnabled ( m_omenu-> isChecked ( )); | 129 | m_omenu_tabs-> setEnabled ( m_omenu-> isChecked ( )); |
129 | } | 130 | } |
130 | 131 | ||
131 | void TaskbarSettings::appletChanged() | 132 | void TaskbarSettings::appletChanged() |
132 | { | 133 | { |
133 | m_applets_changed = true; | 134 | m_applets_changed = true; |