author | sandman <sandman> | 2002-09-26 01:13:28 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-26 01:13:28 (UTC) |
commit | 8c831e3a8cc9cf7ee120a3a227b6698aa797f740 (patch) (side-by-side diff) | |
tree | 00c6ce22ebfbf97942022120fd840536f71e6803 /core/settings/launcher/tabdialog.cpp | |
parent | efab463d98c7add7bea327587fddaf5f7f056759 (diff) | |
download | opie-8c831e3a8cc9cf7ee120a3a227b6698aa797f740.zip opie-8c831e3a8cc9cf7ee120a3a227b6698aa797f740.tar.gz opie-8c831e3a8cc9cf7ee120a3a227b6698aa797f740.tar.bz2 |
All settings should work now -- only launcher doesn't (currently) use these
config values
Diffstat (limited to 'core/settings/launcher/tabdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 121 |
1 files changed, 111 insertions, 10 deletions
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,5 +1,32 @@ +/* + =. 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. + +*/ #include <qpe/resource.h> #include <qpe/config.h> +#include <qpe/applnk.h> #include <qlayout.h> @@ -11,8 +38,10 @@ #include <qradiobutton.h> #include <qbuttongroup.h> +#include <qpushbutton.h> #include <opie/ofontselector.h> #include <opie/otabwidget.h> #include <opie/ocolorbutton.h> +#include <opie/ofiledialog.h> #include "tabdialog.h" @@ -39,5 +68,6 @@ public: else return (QPixmap *) &m_large; - } + } + private: QPixmap m_large, m_small; @@ -186,4 +216,10 @@ public: void paletteChange( const QPalette &p ) { + static bool excllock = false; + + if ( excllock ) + return; + excllock = true; + unsetPalette ( ); QIconView::paletteChange ( p ); @@ -193,4 +229,6 @@ public: cg.setColor ( QColorGroup::Text, m_textcolor ); setPalette ( QPalette ( cg, cg, cg )); + + excllock = false; } @@ -213,5 +251,5 @@ public: else p-> fillRect ( r, m_bgcolor ); - } + } private: @@ -253,6 +291,9 @@ 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 ); @@ -303,14 +344,28 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) 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 ))); @@ -346,4 +401,16 @@ 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 ); @@ -366,17 +433,49 @@ 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 ); } @@ -386,4 +485,6 @@ void TabDialog::accept ( ) 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 ( ); |