| -rw-r--r-- | core/settings/launcher/guisettings.cpp | 153 | ||||
| -rw-r--r-- | core/settings/launcher/guisettings.h | 65 | ||||
| -rw-r--r-- | core/settings/launcher/launcher.pro | 4 | ||||
| -rw-r--r-- | core/settings/launcher/launchersettings.cpp | 9 | ||||
| -rw-r--r-- | core/settings/launcher/launchersettings.h | 4 | ||||
| -rw-r--r-- | core/settings/launcher/tabssettings.cpp | 22 | ||||
| -rw-r--r-- | core/settings/launcher/tabssettings.h | 5 | ||||
| -rw-r--r-- | core/settings/launcher/taskbarsettings.cpp | 68 |
8 files changed, 70 insertions, 260 deletions
diff --git a/core/settings/launcher/guisettings.cpp b/core/settings/launcher/guisettings.cpp deleted file mode 100644 index a292663..0000000 --- a/core/settings/launcher/guisettings.cpp +++ b/dev/null @@ -1,153 +0,0 @@ -/* - This file is part of the OPIE Project - =. Copyright (c) 2002 Trolltech AS <info@trolltech.com> - .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> - .>+-= - _;:, .> :=|. This file is free software; you can -.> <`_, > . <= redistribute it and/or modify it under -:`=1 )Y*s>-.-- : the terms of the GNU General Public -.="- .-=="i, .._ License as published by the Free Software - - . .-<_> .<> Foundation; either version 2 of the License, - ._= =} : or (at your option) any later version. - .%`+i> _;_. - .i_,=:_. -<s. This file is distributed in the hope that - + . -:. = it will be useful, but WITHOUT ANY WARRANTY; - : .. .:, . . . without even the implied warranty of - =_ + =;=|` MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General -..}^=.= = ; Public License for more details. -++= -. .` .: - : = ...= . :.=- You should have received a copy of the GNU - -. .:....=;==+<; General Public License along with this file; - -_. . . )=. = see the file COPYING. If not, write to the - -- :-=` Free Software Foundation, Inc., - 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - -*/ - -#include "guisettings.h" - -#include <qpe/config.h> -#include <qpe/qpeapplication.h> -#include <qpe/qcopenvelope_qws.h> - -#include <qlistview.h> -#include <qcheckbox.h> -#include <qheader.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qwhatsthis.h> - -#include <stdlib.h> - - -GuiSettings::GuiSettings ( QWidget *parent, const char *name ) - : QWidget ( parent, name ) -{ - m_menu_changed = false; - m_busy_changed = false; - - QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 ); - lay-> addColSpacing ( 0, 16 ); - - m_omenu = new QCheckBox ( tr( "Show O-Menu" ), this ); - lay-> addMultiCellWidget ( m_omenu, 0, 0, 0, 1 ); - - m_omenu_tabs = new QCheckBox ( tr( "Add Launcher tabs to O-Menu" ), this ); - lay-> addWidget ( m_omenu_tabs, 1, 1 ); - - m_omenu_home = new QCheckBox ( tr( "Add 'Home' shortcut to O-Menu" ), this ); - lay-> addWidget ( m_omenu_home, 2, 1 ); - - m_omenu_suspend = new QCheckBox ( tr( "Add 'Suspend' shortcut to O-Menu" ), this ); - lay-> addWidget ( m_omenu_suspend, 3, 1 ); - - 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_omenu, SIGNAL( toggled ( bool )), m_omenu_tabs, SLOT( setEnabled ( bool ))); - connect ( m_omenu, SIGNAL( toggled ( bool )), m_omenu_home, SLOT( setEnabled ( bool ))); - connect ( m_omenu, SIGNAL( toggled ( bool )), m_omenu_suspend, SLOT( setEnabled ( bool ))); - - connect ( m_omenu, SIGNAL( toggled ( bool )), this, SLOT( menuChanged ( ))); - connect ( m_omenu_tabs, SIGNAL( toggled ( bool )), this, SLOT( menuChanged ( ))); - connect ( m_omenu_home, SIGNAL( toggled ( bool )), this, SLOT( menuChanged ( ))); - connect ( m_omenu_suspend, SIGNAL( toggled ( bool )), this, SLOT( menuChanged ( ))); - - lay-> addRowSpacing ( 4, 8 ); - - m_busy = new QCheckBox ( tr( "Enable blinking busy indicator" ), this ); - lay-> addMultiCellWidget ( m_busy, 5, 5, 0, 1 ); - - connect ( m_busy, SIGNAL( toggled( bool )), this, SLOT( busyChanged ( ))); - - lay-> setRowStretch ( 6, 10 ); - - init ( ); -} - -void GuiSettings::init ( ) -{ - Config cfg ( "Taskbar" ); - cfg. setGroup ( "Menu" ); - - m_omenu-> setChecked ( cfg. readBoolEntry ( "ShowMenu", true )); - m_omenu_tabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true )); - m_omenu_home-> setChecked ( cfg. readBoolEntry ( "Home", true )); - m_omenu_suspend-> setChecked ( cfg. readBoolEntry ( "Suspend", true )); - - m_omenu_tabs-> setEnabled ( m_omenu-> isChecked ( )); - m_omenu_home-> setEnabled ( m_omenu-> isChecked ( )); - m_omenu_suspend-> setEnabled ( m_omenu-> isChecked ( )); - - Config cfg2 ( "Launcher" ); - cfg2. setGroup ( "GUI" ); - - m_busy-> setChecked ( cfg2. readEntry ( "BusyType" ). lower ( ) == "blink" ); -} - -void GuiSettings::menuChanged() -{ - m_menu_changed = true; -} - -void GuiSettings::busyChanged() -{ - m_busy_changed = true; -} - -void GuiSettings::accept ( ) -{ - Config cfg ( "Taskbar" ); - cfg. setGroup ( "Menu" ); - - if ( m_menu_changed ) { - cfg. writeEntry ( "ShowMenu", m_omenu-> isChecked ( )); - cfg. writeEntry ( "LauncherTabs", m_omenu_tabs-> isChecked ( )); - cfg. writeEntry ( "Home", m_omenu_home-> isChecked ( )); - cfg. writeEntry ( "Suspend", m_omenu_suspend-> isChecked ( )); - } - cfg. write ( ); - - if ( m_menu_changed ) - QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" ); - - Config cfg2 ( "Launcher" ); - cfg2. setGroup ( "GUI" ); - - QString busytype = QString ( m_busy-> isChecked ( ) ? "blink" : "" ); - - if ( m_busy_changed ) { - - cfg2. writeEntry ( "BusyType", busytype ); - } - - cfg2. write ( ); - - if ( m_busy_changed ) { - QCopEnvelope e ( "QPE/Launcher", "setBusyIndicatorType(QString)" ); - e << busytype; - } -} - diff --git a/core/settings/launcher/guisettings.h b/core/settings/launcher/guisettings.h deleted file mode 100644 index 2673981..0000000 --- a/core/settings/launcher/guisettings.h +++ b/dev/null @@ -1,65 +0,0 @@ -/* - =. This file is part of the OPIE Project - .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> - .>+-= - _;:, .> :=|. This file is free software; you can -.> <`_, > . <= redistribute it and/or modify it under -:`=1 )Y*s>-.-- : the terms of the GNU General Public -.="- .-=="i, .._ License as published by the Free Software - - . .-<_> .<> Foundation; either version 2 of the License, - ._= =} : or (at your option) any later version. - .%`+i> _;_. - .i_,=:_. -<s. This file is distributed in the hope that - + . -:. = it will be useful, but WITHOUT ANY WARRANTY; - : .. .:, . . . without even the implied warranty of - =_ + =;=|` MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General -..}^=.= = ; Public License for more details. -++= -. .` .: - : = ...= . :.=- You should have received a copy of the GNU - -. .:....=;==+<; General Public License along with this file; - -_. . . )=. = see the file COPYING. If not, write to the - -- :-=` Free Software Foundation, Inc., - 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - -*/ - -#ifndef __GUI_SETTINGS_H__ -#define __GUI_SETTINGS_H__ - -#include <qwidget.h> -#include <qmap.h> - -class QListView; -class QCheckListItem; -class QCheckBox; - - -class GuiSettings : public QWidget { - Q_OBJECT - -public: - GuiSettings ( QWidget *parent = 0, const char *name = 0 ); - - void accept ( ); - -protected slots: - void menuChanged ( ); - void busyChanged ( ); - -protected: - void init ( ); - -private: - QCheckBox *m_omenu; - QCheckBox *m_omenu_tabs; - QCheckBox *m_omenu_home; - QCheckBox *m_omenu_suspend; - QCheckBox *m_busy; - - bool m_menu_changed; - bool m_busy_changed; -}; - -#endif diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro index 0554d0a..1c72126 100644 --- a/core/settings/launcher/launcher.pro +++ b/core/settings/launcher/launcher.pro @@ -3,17 +3,17 @@ CONFIG += qt warn_on release DESTDIR = $(OPIEDIR)/bin HEADERS = launchersettings.h \ tabssettings.h \ taskbarsettings.h \ - guisettings.h \ + menusettings.h \ tabconfig.h \ tabdialog.h SOURCES = main.cpp \ launchersettings.cpp \ tabssettings.cpp \ taskbarsettings.cpp \ - guisettings.cpp \ + menusettings.cpp \ tabdialog.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index 22bf1d1..c32d998 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp @@ -25,15 +25,16 @@ */ #include <qlayout.h> +#include <qapplication.h> #include <opie/otabwidget.h> #include "launchersettings.h" #include "tabssettings.h" +#include "menusettings.h" #include "taskbarsettings.h" -#include "guisettings.h" LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false ) { @@ -45,22 +46,22 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false lay-> addWidget ( tw ); m_tabs = new TabsSettings ( tw ); m_taskbar = new TaskbarSettings ( tw ); - m_gui = new GuiSettings ( tw ); + m_menu = new MenuSettings ( tw ); tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" )); + tw-> addTab ( m_menu, "launchersettings/menutab.png", tr( "O-Menu" )); tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); - tw-> addTab ( m_gui, "launchersettings/guitab.png", tr( "GUI" )); tw-> setCurrentTab ( m_taskbar ); } void LauncherSettings::accept ( ) { m_taskbar-> accept ( ); + m_menu-> accept ( ); m_tabs-> accept ( ); - m_gui-> accept ( ); QDialog::accept ( ); } diff --git a/core/settings/launcher/launchersettings.h b/core/settings/launcher/launchersettings.h index fa9977e..56c916e 100644 --- a/core/settings/launcher/launchersettings.h +++ b/core/settings/launcher/launchersettings.h @@ -31,9 +31,9 @@ #include <qdialog.h> class TabsSettings; class TaskbarSettings; -class GuiSettings; +class MenuSettings; class LauncherSettings : public QDialog { Q_OBJECT @@ -45,8 +45,8 @@ public: private: TabsSettings *m_tabs; TaskbarSettings *m_taskbar; - GuiSettings *m_gui; + MenuSettings *m_menu; }; #endif diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index 8f5f7fa..6cc69c0 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp @@ -38,8 +38,9 @@ #include <qpushbutton.h> #include <qlayout.h> #include <qlabel.h> #include <qwhatsthis.h> +#include <qcheckbox.h> #include "tabdialog.h" #include <stdlib.h> @@ -74,8 +75,11 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name ) connect ( p, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( ))); lay-> setRowStretch ( 4, 10 ); + m_busyblink = new QCheckBox ( tr( "Enable blinking busy indicator" ), this ); + lay-> addMultiCellWidget ( m_busyblink, 5, 5, 0, 1 ); + init ( ); } void TabsSettings::init ( ) @@ -92,14 +96,18 @@ void TabsSettings::init ( ) pix = img. smoothScale ( AppLnk::smallIconSize ( ), AppLnk::smallIconSize ( )); m_list-> insertItem ( pix, tr( "Documents" )); m_ids += "Documents"; // No tr - readTabSettings ( ); + Config cfg ( "Launcher" ); + + readTabSettings ( cfg ); + + cfg. setGroup ( "GUI" ); + m_busyblink-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "blink" ); } -void TabsSettings::readTabSettings ( ) +void TabsSettings::readTabSettings ( Config &cfg ) { - Config cfg ( "Launcher" ); QString grp ( "Tab %1" ); // No tr m_tabs. clear ( ); for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { @@ -197,8 +205,16 @@ void TabsSettings::accept ( ) fe << tc. m_font_weight << ( tc. m_font_italic ? 1 : 0 ); tc. m_changed = false; } + cfg. setGroup ( "GUI" ); + QString busytype = QString ( m_busyblink-> isChecked ( ) ? "blink" : "" ); + + cfg. writeEntry ( "BusyType", busytype ); + { + QCopEnvelope e ( "QPE/Launcher", "setBusyIndicatorType(QString)" ); + e << busytype; + } } void TabsSettings::newClicked ( ) { diff --git a/core/settings/launcher/tabssettings.h b/core/settings/launcher/tabssettings.h index b17b523..47fcee2 100644 --- a/core/settings/launcher/tabssettings.h +++ b/core/settings/launcher/tabssettings.h @@ -32,8 +32,10 @@ #include "tabconfig.h" class QListBox; +class QCheckBox; +class Config; class TabsSettings : public QWidget { Q_OBJECT @@ -49,15 +51,16 @@ protected slots: void editClicked ( ); protected: void init ( ); - void readTabSettings ( ); + void readTabSettings ( Config & ); private: QListBox *m_list; // QString currentTab; QStringList m_ids; QMap <QString, TabConfig> m_tabs; + QCheckBox *m_busyblink; }; diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp index b5c03c8..5bc5ad2 100644 --- a/core/settings/launcher/taskbarsettings.cpp +++ b/core/settings/launcher/taskbarsettings.cpp @@ -51,9 +51,9 @@ 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 ); + QLabel *l = new QLabel ( tr( "Load applets in Taskbar:" ), this ); lay-> addWidget ( l ); m_list = new QListView ( this ); m_list-> addColumn ( "foobar" ); @@ -83,39 +83,47 @@ void TaskbarSettings::init ( ) 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 ); - else - delete trans; - name = iface-> name ( ); - icon = iface-> icon ( ); + 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 ( ); iface-> release ( ); - lib-> unload ( ); - } else { - delete lib; - name = (*it). mid ( 3 ); - int sep = name. find( ".so" ); - if ( sep > 0 ) - 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; + if ( !iface ) { + lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface ); + + if ( iface ) { + name = (*it). mid ( 3 ); + int sep = name. find( ".so" ); + if ( sep > 0 ) + name. truncate ( sep ); + sep = name. find ( "applet" ); + if ( sep == (int) name.length ( ) - 6 ) + name. truncate ( sep ); + name[0] = name[0]. upper ( ); + iface-> release ( ); + } + } + + if ( iface ) { + 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; + } + lib-> unload ( ); + delete lib; } } void TaskbarSettings::appletChanged() |