From 8c831e3a8cc9cf7ee120a3a227b6698aa797f740 Mon Sep 17 00:00:00 2001 From: sandman Date: Thu, 26 Sep 2002 01:13:28 +0000 Subject: All settings should work now -- only launcher doesn't (currently) use these config values --- (limited to 'core/settings/launcher') diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index bcb9913..7a020a0 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp @@ -1,3 +1,29 @@ +/* +               =. This file is part of the OPIE Project +             .=l. Copyright (c) 2002 Robert Griebl +           .>+-= + _;:,     .>    :=|. 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_,=:_.      -`: 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 diff --git a/core/settings/launcher/launchersettings.h b/core/settings/launcher/launchersettings.h index c91c765..09ea933 100644 --- a/core/settings/launcher/launchersettings.h +++ b/core/settings/launcher/launchersettings.h @@ -1,3 +1,30 @@ +/* +               =. This file is part of the OPIE Project +             .=l. Copyright (c) 2002 Robert Griebl +           .>+-= + _;:,     .>    :=|. 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_,=:_.      -`: 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 __LAUNCHER_SETTINGS_H__ #define __LAUNCHER_SETTINGS_H__ diff --git a/core/settings/launcher/main.cpp b/core/settings/launcher/main.cpp index ca7102d..dbcd624 100644 --- a/core/settings/launcher/main.cpp +++ b/core/settings/launcher/main.cpp @@ -1,22 +1,29 @@ -/********************************************************************** -** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. -** -** This file is part of the Qtopia Environment. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ +/* +               =. This file is part of the OPIE Project +             .=l. Copyright (c) 2002 Robert Griebl +           .>+-= + _;:,     .>    :=|. 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_,=:_.      -`: 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 "launchersettings.h" diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h index 8f21eb4..1c2e94d 100644 --- a/core/settings/launcher/tabconfig.h +++ b/core/settings/launcher/tabconfig.h @@ -1,3 +1,29 @@ +/* +               =. This file is part of the OPIE Project +             .=l. Copyright (c) 2002 Robert Griebl +           .>+-= + _;:,     .>    :=|. 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_,=:_.      -`: 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 __TABCONFIG_H__ #define __TABCONFIG_H__ diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index ca48e66..86202f0 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp @@ -1,6 +1,33 @@ +/* +               =. This file is part of the OPIE Project +             .=l. Copyright (c) 2002 Robert Griebl +           .>+-= + _;:,     .>    :=|. 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_,=:_.      -`: 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 #include +#include #include #include @@ -10,10 +37,12 @@ #include #include #include +#include #include #include #include +#include #include "tabdialog.h" @@ -38,7 +67,8 @@ public: return (QPixmap *) &m_small; else return (QPixmap *) &m_large; - } + } + private: QPixmap m_large, m_small; }; @@ -185,6 +215,12 @@ public: void paletteChange( const QPalette &p ) { + static bool excllock = false; + + if ( excllock ) + return; + excllock = true; + unsetPalette ( ); QIconView::paletteChange ( p ); if ( m_bgtype == TabConfig::Ruled ) @@ -192,6 +228,8 @@ public: QColorGroup cg = colorGroup ( ); cg.setColor ( QColorGroup::Text, m_textcolor ); setPalette ( QPalette ( cg, cg, cg )); + + excllock = false; } void setBackgroundPixmap ( const QPixmap &pm ) @@ -212,7 +250,7 @@ public: } else p-> fillRect ( r, m_bgcolor ); - } + } private: QColor m_textcolor; @@ -252,8 +290,11 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig m_iconsize-> setButton ( tc. m_view ); iconSizeClicked ( tc. m_view ); + m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); + iconColorClicked ( m_iconcolor-> color ( )); m_bgtype-> setButton ( tc. m_bg_type ); m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); + m_bgimage = tc. m_bg_image; bgTypeClicked ( tc. m_bg_type ); m_fontselect-> setSelectedFont ( tc. m_font_family, tc. m_font_style, tc. m_font_size ); fontClicked ( m_fontselect-> selectedFont ( )); @@ -302,16 +343,30 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) hb-> addSpacing ( 10 ); m_solidcolor = new OColorButton ( tab ); - connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( colorClicked ( const QColor & ))); + connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & ))); hb-> addWidget ( m_solidcolor ); + hb-> addStretch ( 10 ); gridLayout-> addLayout ( hb, 1, 1 ); - rb = new QRadioButton( tr( "Image" ), tab, "image" ); + hb = new QHBoxLayout ( ); + hb-> setSpacing ( 4 ); + + rb = new QRadioButton( tr( "Image" ), tab, "image" ); m_bgtype-> insert ( rb, TabConfig::Image ); - gridLayout-> addWidget( rb, 3, 1 ); + hb-> addWidget( rb ); + hb-> addSpacing ( 10 ); + + m_imagebrowse = new QPushButton ( tr( "Select..." ), tab ); + connect ( m_imagebrowse, SIGNAL( clicked ( )), this, SLOT( bgImageClicked ( ))); + hb-> addWidget ( m_imagebrowse ); + hb-> addStretch ( 10 ); + + gridLayout-> addLayout ( hb, 2, 1 ); -// QPushButton *p; + QPushButton *p = new QPushButton ( tr( "Default" ), tab ); + connect ( p, SIGNAL( clicked ( )), this, SLOT( bgDefaultClicked ( ))); + gridLayout-> addWidget ( p, 3, 1 ); connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int ))); @@ -345,6 +400,18 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) connect ( m_iconsize, SIGNAL( clicked ( int )), this, SLOT( iconSizeClicked ( int ))); +// vertLayout-> addSpacing ( 8 ); + +// gridLayout = new QGridLayout ( vertLayout ); + gridLayout-> addRowSpacing ( 2, 8 ); + + label = new QLabel ( tr( "Color:" ), tab ); + gridLayout-> addWidget ( label, 3, 0 ); + + m_iconcolor = new OColorButton ( tab ); + connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & ))); + gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); + vertLayout-> addStretch ( 10 ); return tab; @@ -365,19 +432,51 @@ void TabDialog::bgTypeClicked ( int t ) { QString s; + if ( m_bgtype-> id ( m_bgtype-> selected ( )) != t ) + m_bgtype-> setButton ( t ); + m_solidcolor-> setEnabled ( t == TabConfig::SolidColor ); -// m_imagebrowse-> setEnabled ( t == TabConfig::Image ); -// m_imagedefault-> setEnabled ( t == TabConfig::Image ); + m_imagebrowse-> setEnabled ( t == TabConfig::Image ); if ( t == TabConfig::SolidColor ) s = m_solidcolor-> color ( ). name ( ); + else if ( t == TabConfig::Image ) + s = m_bgimage; m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s ); } -void TabDialog::colorClicked ( const QColor &col ) +void TabDialog::bgColorClicked ( const QColor & ) +{ + bgTypeClicked ( TabConfig::SolidColor ); +} + +void TabDialog::iconColorClicked ( const QColor &col ) +{ + m_sample-> setTextColor ( col ); +} + +void TabDialog::bgImageClicked ( ) +{ + // ### use OFileSelector here ### + // this is just a quick c&p from the old appearance app + + MimeTypes types; + QStringList list; + list << "image/*"; + types. insert ( "Images", list ); + + QString file = OFileDialog::getOpenFileName ( 1, "/", QString::null, types ); + if ( !file. isEmpty ( )) { + m_bgimage = DocLnk ( file ). file ( ); + bgTypeClicked ( TabConfig::Image ); + } +} + +void TabDialog::bgDefaultClicked ( ) { - m_sample-> setBackgroundType ( TabConfig::SolidColor, col. name ( )); + m_bgimage = Resource::findPixmap ( "launcher/opie-background.jpg" ); + bgTypeClicked ( TabConfig::Image ); } void TabDialog::accept ( ) @@ -385,6 +484,8 @@ void TabDialog::accept ( ) m_tc. m_view = (TabConfig::ViewMode) m_iconsize-> id ( m_iconsize-> selected ( )); m_tc. m_bg_type = (TabConfig::BackgroundType) m_bgtype-> id ( m_bgtype-> selected ( )); m_tc. m_bg_color = m_solidcolor-> color ( ). name ( ); + m_tc. m_bg_image = m_bgimage; + m_tc. m_text_color = m_iconcolor-> color ( ). name ( ); m_tc. m_font_family = m_fontselect-> fontFamily ( ); m_tc. m_font_size = m_fontselect-> fontSize ( ); m_tc. m_font_style = m_fontselect-> fontStyle ( ); diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h index e1935fd..b0afd47 100644 --- a/core/settings/launcher/tabdialog.h +++ b/core/settings/launcher/tabdialog.h @@ -1,3 +1,30 @@ +/* +               =. This file is part of the OPIE Project +             .=l. Copyright (c) 2002 Robert Griebl +           .>+-= + _;:,     .>    :=|. 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_,=:_.      -`: 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 __TABDIALOG_H__ #define __TABDIALOG_H__ @@ -8,6 +35,8 @@ class QButtonGroup; class OFontSelector; class SampleView; class OColorButton; +class QPushButton; + class TabDialog : public QDialog { Q_OBJECT @@ -22,7 +51,10 @@ protected slots: void iconSizeClicked ( int ); void fontClicked ( const QFont & ); void bgTypeClicked ( int ); - void colorClicked ( const QColor & ); + void bgColorClicked ( const QColor & ); + void iconColorClicked ( const QColor & ); + void bgImageClicked ( ); + void bgDefaultClicked ( ); private: QWidget *createBgTab ( QWidget *parent ); @@ -35,7 +67,9 @@ private: QButtonGroup *m_iconsize; OFontSelector *m_fontselect; OColorButton *m_solidcolor; - + OColorButton *m_iconcolor; + QPushButton *m_imagebrowse; + QString m_bgimage; QButtonGroup *m_bgtype; TabConfig &m_tc; diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index ae78733..0faaea3 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp @@ -1,22 +1,29 @@ -/********************************************************************** -** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. -** -** This file is part of the Qtopia Environment. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ +/* +               =. This file is part of the OPIE Project +             .=l. Copyright (c) 2002 Robert Griebl +           .>+-= + _;:,     .>    :=|. 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_,=:_.      -`: 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 "tabssettings.h" @@ -114,8 +121,8 @@ void TabsSettings::readTabSettings ( ) tc. m_bg_type = TabConfig::Image; tc. m_bg_image = cfg. readEntry ( "BackgroundImage", "wallpaper/opie" ); - tc. m_bg_color = cfg. readEntry ( "BackgroundColor" ); - tc. m_text_color = cfg. readEntry ( "TextColor" ); + tc. m_bg_color = cfg. readEntry ( "BackgroundColor", colorGroup ( ). color ( QColorGroup::Base ). name ( )); + tc. m_text_color = cfg. readEntry ( "TextColor", colorGroup ( ). color ( QColorGroup::Text ). name ( )); QStringList f = cfg. readListEntry ( "Font", ',' ); if ( f. count ( ) == 4 ) { tc. m_font_family = f [0]; diff --git a/core/settings/launcher/tabssettings.h b/core/settings/launcher/tabssettings.h index 76cae68..b17b523 100644 --- a/core/settings/launcher/tabssettings.h +++ b/core/settings/launcher/tabssettings.h @@ -1,3 +1,29 @@ +/* +               =. This file is part of the OPIE Project +             .=l. Copyright (c) 2002 Robert Griebl +           .>+-= + _;:,     .>    :=|. 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_,=:_.      -`: 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 __TABS_SETTINGS_H__ #define __TABS_SETTINGS_H__ diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp index 7df9a68..6921ee8 100644 --- a/core/settings/launcher/taskbarsettings.cpp +++ b/core/settings/launcher/taskbarsettings.cpp @@ -1,22 +1,30 @@ -/********************************************************************** -** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. -** -** This file is part of the Qtopia Environment. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ +/* +                This file is part of the OPIE Project + =. Copyright (c) 2002 Trolltech AS +             .=l. Copyright (c) 2002 Robert Griebl +           .>+-= + _;:,     .>    :=|. 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_,=:_.      -`: 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 "taskbarsettings.h" diff --git a/core/settings/launcher/taskbarsettings.h b/core/settings/launcher/taskbarsettings.h index b8c6fbb..2f5242f 100644 --- a/core/settings/launcher/taskbarsettings.h +++ b/core/settings/launcher/taskbarsettings.h @@ -1,3 +1,30 @@ +/* +               =. This file is part of the OPIE Project +             .=l. Copyright (c) 2002 Robert Griebl +           .>+-= + _;:,     .>    :=|. 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_,=:_.      -`: 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 __TASKBAR_SETTINGS_H__ #define __TASKBAR_SETTINGS_H__ -- cgit v0.9.0.2