-rw-r--r-- | core/settings/launcher/doctabsettings.cpp | 6 | ||||
-rw-r--r-- | core/settings/launcher/inputmethodsettings.cpp | 6 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 632 | ||||
-rw-r--r-- | core/settings/launcher/taskbarsettings.cpp | 196 |
4 files changed, 427 insertions, 413 deletions
diff --git a/core/settings/launcher/doctabsettings.cpp b/core/settings/launcher/doctabsettings.cpp index 179a7f9..dfdc9be 100644 --- a/core/settings/launcher/doctabsettings.cpp +++ b/core/settings/launcher/doctabsettings.cpp @@ -28,13 +28,17 @@ #include "doctabsettings.h" +/* OPIE */ #include <qpe/config.h> +#include <opie2/odebug.h> +/* QT */ #include <qcheckbox.h> #include <qlayout.h> #include <qlabel.h> #include <qwhatsthis.h> + DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( parent, name ) { QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); @@ -59,7 +63,7 @@ void DocTabSettings::appletChanged() void DocTabSettings::accept() { - qDebug( "DocTabSettings::accept()" ); + odebug << "DocTabSettings::accept()" << oendl; Config cfg( "Launcher" ); cfg.setGroup( "DocTab" ); cfg.writeEntry( "Enable", _enable->isChecked() ); diff --git a/core/settings/launcher/inputmethodsettings.cpp b/core/settings/launcher/inputmethodsettings.cpp index e342c09..0422075 100644 --- a/core/settings/launcher/inputmethodsettings.cpp +++ b/core/settings/launcher/inputmethodsettings.cpp @@ -28,14 +28,18 @@ #include "inputmethodsettings.h" +/* OPIE */ #include <qpe/config.h> +#include <opie2/odebug.h> +/* QT */ #include <qspinbox.h> #include <qcheckbox.h> #include <qlayout.h> #include <qlabel.h> #include <qwhatsthis.h> + InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QWidget( parent, name ) { QBoxLayout *lay = new QVBoxLayout( this, 4, 4 ); @@ -73,7 +77,7 @@ void InputMethodSettings::appletChanged() void InputMethodSettings::accept() { - qDebug( "InputMethodSettings::accept()" ); + odebug << "InputMethodSettings::accept()" << oendl; Config cfg( "Launcher" ); cfg.setGroup( "InputMethods" ); cfg.writeEntry( "Resize", _resize->isChecked() ); diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 763b360..546e229 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp @@ -25,8 +25,17 @@ */ +#include "tabdialog.h" + +/* OPIE */ #include <qpe/resource.h> +#include <opie2/ofontselector.h> +#include <opie2/otabwidget.h> +#include <opie2/ocolorbutton.h> +#include <opie2/ofiledialog.h> +#include <opie2/odebug.h> +/* QT */ #include <qlayout.h> #include <qvbox.h> #include <qtabbar.h> @@ -38,270 +47,263 @@ #include <qwhatsthis.h> #include <qcheckbox.h> -#include <opie2/ofontselector.h> -#include <opie2/otabwidget.h> -#include <opie2/ocolorbutton.h> -#include <opie2/ofiledialog.h> - -#include "tabdialog.h" - using namespace Opie::Ui; class SampleItem : public QIconViewItem { public: - SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) - { - m_large = pix; - m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 )); - } - - void sizeChange ( ) - { - calcRect ( ); - repaint ( ); - } - - QPixmap *pixmap ( ) const - { - if ( iconView ( )-> itemTextPos ( ) == QIconView::Right ) - return (QPixmap *) &m_small; - else - return (QPixmap *) &m_large; - } + SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) + { + m_large = pix; + m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 )); + } + + void sizeChange ( ) + { + calcRect ( ); + repaint ( ); + } + + QPixmap *pixmap ( ) const + { + if ( iconView ( )-> itemTextPos ( ) == QIconView::Right ) + return (QPixmap *) &m_small; + else + return (QPixmap *) &m_large; + } private: - QPixmap m_large, m_small; + QPixmap m_large, m_small; }; class SampleView : public QIconView { public: - SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name ) - { - setItemsMovable ( false ); - setAutoArrange ( true ); - setSorting ( true ); - setFrameStyle ( QFrame::NoFrame ); - setSpacing ( 4 ); - setMargin ( 0 ); - setSelectionMode ( QIconView::NoSelection ); - setBackgroundMode ( PaletteBase ); - setViewMode ( TabConfig::Icon ); - calculateGrid ( Bottom ); - - - new SampleItem ( this, QObject::tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" )); - new SampleItem ( this, QObject::tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" )); - new SampleItem ( this, QObject::tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" )); - - setBackgroundType ( TabConfig::Ruled, QString::null ); - - setMaximumHeight ( firstItem ( )-> height ( ) + 16 ); - } - - void setViewMode ( TabConfig::ViewMode m ) - { - viewport ( )-> setUpdatesEnabled ( false ); - - switch ( m ) { - case TabConfig::List: - setItemTextPos( QIconView::Right ); - break; - case TabConfig::Icon: - setItemTextPos( QIconView::Bottom ); - break; - } -// hideOrShowItems ( false ); - - for ( QIconViewItem *it = firstItem ( ); it; it = it-> nextItem ( )) - ((SampleItem *) it )-> sizeChange ( ); - arrangeItemsInGrid ( true ); - viewport ( )-> setUpdatesEnabled ( true ); - update ( ); - } - - - void setBackgroundType( TabConfig::BackgroundType t, const QString &val ) - { - switch ( t ) { - case TabConfig::Ruled: { - QPixmap bg ( width ( ), 9 ); - QPainter painter ( &bg ); - for ( int i = 0; i < 3; i++ ) { - painter. setPen ( white ); - painter. drawLine ( 0, i*3, width()-1, i*3 ); - painter. drawLine ( 0, i*3+1, width()-1, i*3+1 ); - painter. setPen ( colorGroup().background().light(105) ); - painter. drawLine ( 0, i*3+2, width()-1, i*3+2 ); - } - painter.end ( ); - setBackgroundPixmap ( bg ); - break; - } - - case TabConfig::SolidColor: { - setBackgroundPixmap ( QPixmap ( )); - if ( val. isEmpty ( )) - setBackgroundColor ( colorGroup ( ). base ( )); - else - setBackgroundColor ( val ); - break; - } - - case TabConfig::Image: { - qDebug( "Loading image: %s", val.latin1() ); - QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val )); - if ( bg. isNull ( )) { - QImageIO imgio; - imgio. setFileName ( val ); - QSize ds = qApp-> desktop ( )-> size ( ); - QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr - imgio. setParameters ( param. arg ( ds. width ( )). arg ( ds. height ( )). latin1 ( )); - imgio. read ( ); - bg = imgio. image ( ); - } - setBackgroundPixmap ( bg ); - break; - } - } - m_bgtype = t; - viewport ( )-> update ( ); - } - - void setTextColor ( const QColor &tc ) - { - m_textcolor = tc; - QColorGroup cg = colorGroup ( ); - cg. setColor ( QColorGroup::Text, tc ); - setPalette ( QPalette ( cg, cg, cg )); - viewport ( )-> update ( ); - } - - void setViewFont ( const QFont &f ) - { - setFont ( f ); - } - - void setItemTextPos ( ItemTextPos pos ) - { - calculateGrid ( pos ); - QIconView::setItemTextPos( pos ); - } - - void calculateGrid ( ItemTextPos pos ) - { - int dw = QApplication::desktop ( )-> width ( ); - int viewerWidth = dw - style ( ).scrollBarExtent ( ). width ( ); - if ( pos == Bottom ) { - int cols = 3; - if ( viewerWidth <= 200 ) - cols = 2; - else if ( viewerWidth >= 400 ) - cols = viewerWidth/96; - setSpacing ( 4 ); - setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols ); - setGridY ( fontMetrics ( ). height ( ) * 2 + 24 ); - } - else { - int cols = 2; - if ( viewerWidth < 150 ) - cols = 1; - else if ( viewerWidth >= 400 ) - cols = viewerWidth / 150; - setSpacing ( 2 ); - setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols ); - setGridY ( fontMetrics ( ). height ( ) + 2 ); - } - } - - void paletteChange( const QPalette &p ) - { - static bool excllock = false; - - if ( excllock ) - return; - excllock = true; - - unsetPalette ( ); - QIconView::paletteChange ( p ); - if ( m_bgtype == TabConfig::Ruled ) - setBackgroundType ( TabConfig::Ruled, QString::null ); - QColorGroup cg = colorGroup ( ); - cg.setColor ( QColorGroup::Text, m_textcolor ); - setPalette ( QPalette ( cg, cg, cg )); - - excllock = false; - } - - void setBackgroundPixmap ( const QPixmap &pm ) - { - m_bgpix = pm; - } - - void setBackgroundColor ( const QColor &c ) - { - m_bgcolor = c; - } - - void drawBackground ( QPainter *p, const QRect &r ) - { - if ( !m_bgpix. isNull ( )) { - p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), - ( r. y ( ) + contentsY ( )) % m_bgpix. height ( ))); - } - else - p-> fillRect ( r, m_bgcolor ); - } + SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name ) + { + setItemsMovable ( false ); + setAutoArrange ( true ); + setSorting ( true ); + setFrameStyle ( QFrame::NoFrame ); + setSpacing ( 4 ); + setMargin ( 0 ); + setSelectionMode ( QIconView::NoSelection ); + setBackgroundMode ( PaletteBase ); + setViewMode ( TabConfig::Icon ); + calculateGrid ( Bottom ); + + + new SampleItem ( this, QObject::tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" )); + new SampleItem ( this, QObject::tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" )); + new SampleItem ( this, QObject::tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" )); + + setBackgroundType ( TabConfig::Ruled, QString::null ); + + setMaximumHeight ( firstItem ( )-> height ( ) + 16 ); + } + + void setViewMode ( TabConfig::ViewMode m ) + { + viewport ( )-> setUpdatesEnabled ( false ); + + switch ( m ) { + case TabConfig::List: + setItemTextPos( QIconView::Right ); + break; + case TabConfig::Icon: + setItemTextPos( QIconView::Bottom ); + break; + } +// hideOrShowItems ( false ); + + for ( QIconViewItem *it = firstItem ( ); it; it = it-> nextItem ( )) + ((SampleItem *) it )-> sizeChange ( ); + arrangeItemsInGrid ( true ); + viewport ( )-> setUpdatesEnabled ( true ); + update ( ); + } + + + void setBackgroundType( TabConfig::BackgroundType t, const QString &val ) + { + switch ( t ) { + case TabConfig::Ruled: { + QPixmap bg ( width ( ), 9 ); + QPainter painter ( &bg ); + for ( int i = 0; i < 3; i++ ) { + painter. setPen ( white ); + painter. drawLine ( 0, i*3, width()-1, i*3 ); + painter. drawLine ( 0, i*3+1, width()-1, i*3+1 ); + painter. setPen ( colorGroup().background().light(105) ); + painter. drawLine ( 0, i*3+2, width()-1, i*3+2 ); + } + painter.end ( ); + setBackgroundPixmap ( bg ); + break; + } + + case TabConfig::SolidColor: { + setBackgroundPixmap ( QPixmap ( )); + if ( val. isEmpty ( )) + setBackgroundColor ( colorGroup ( ). base ( )); + else + setBackgroundColor ( val ); + break; + } + + case TabConfig::Image: { + odebug << "Loading image: " << val << "" << oendl; + QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val )); + if ( bg. isNull ( )) { + QImageIO imgio; + imgio. setFileName ( val ); + QSize ds = qApp-> desktop ( )-> size ( ); + QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr + imgio. setParameters ( param. arg ( ds. width ( )). arg ( ds. height ( )). latin1 ( )); + imgio. read ( ); + bg = imgio. image ( ); + } + setBackgroundPixmap ( bg ); + break; + } + } + m_bgtype = t; + viewport ( )-> update ( ); + } + + void setTextColor ( const QColor &tc ) + { + m_textcolor = tc; + QColorGroup cg = colorGroup ( ); + cg. setColor ( QColorGroup::Text, tc ); + setPalette ( QPalette ( cg, cg, cg )); + viewport ( )-> update ( ); + } + + void setViewFont ( const QFont &f ) + { + setFont ( f ); + } + + void setItemTextPos ( ItemTextPos pos ) + { + calculateGrid ( pos ); + QIconView::setItemTextPos( pos ); + } + + void calculateGrid ( ItemTextPos pos ) + { + int dw = QApplication::desktop ( )-> width ( ); + int viewerWidth = dw - style ( ).scrollBarExtent ( ). width ( ); + if ( pos == Bottom ) { + int cols = 3; + if ( viewerWidth <= 200 ) + cols = 2; + else if ( viewerWidth >= 400 ) + cols = viewerWidth/96; + setSpacing ( 4 ); + setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols ); + setGridY ( fontMetrics ( ). height ( ) * 2 + 24 ); + } + else { + int cols = 2; + if ( viewerWidth < 150 ) + cols = 1; + else if ( viewerWidth >= 400 ) + cols = viewerWidth / 150; + setSpacing ( 2 ); + setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols ); + setGridY ( fontMetrics ( ). height ( ) + 2 ); + } + } + + void paletteChange( const QPalette &p ) + { + static bool excllock = false; + + if ( excllock ) + return; + excllock = true; + + unsetPalette ( ); + QIconView::paletteChange ( p ); + if ( m_bgtype == TabConfig::Ruled ) + setBackgroundType ( TabConfig::Ruled, QString::null ); + QColorGroup cg = colorGroup ( ); + cg.setColor ( QColorGroup::Text, m_textcolor ); + setPalette ( QPalette ( cg, cg, cg )); + + excllock = false; + } + + void setBackgroundPixmap ( const QPixmap &pm ) + { + m_bgpix = pm; + } + + void setBackgroundColor ( const QColor &c ) + { + m_bgcolor = c; + } + + void drawBackground ( QPainter *p, const QRect &r ) + { + if ( !m_bgpix. isNull ( )) { + p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), + ( r. y ( ) + contentsY ( )) % m_bgpix. height ( ))); + } + else + p-> fillRect ( r, m_bgcolor ); + } private: - QColor m_textcolor; - QColor m_bgcolor; - QPixmap m_bgpix; - TabConfig::BackgroundType m_bgtype; + QColor m_textcolor; + QColor m_bgcolor; + QPixmap m_bgpix; + TabConfig::BackgroundType m_bgtype; }; TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *dname, bool modal, WFlags fl ) - : QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc ) + : QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc ) { - setCaption ( tr( "Edit Tab" )); + setCaption ( tr( "Edit Tab" )); - QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 ); + QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 ); - OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); - QWidget *bgtab; + OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); + QWidget *bgtab; - tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/color", tr( "Background" )); - tw-> addTab ( createFontTab ( tw ), "font", tr( "Font" )); - tw-> addTab ( createIconTab ( tw ), "pixmap", tr( "Icons" ) ); + tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/color", tr( "Background" )); + tw-> addTab ( createFontTab ( tw ), "font", tr( "Font" )); + tw-> addTab ( createIconTab ( tw ), "pixmap", tr( "Icons" ) ); - tw-> setCurrentTab ( bgtab ); + tw-> setCurrentTab ( bgtab ); - QWidget *sample = new QVBox ( this ); - QTabBar *tb = new QTabBar ( sample ); - QString name ( tr( "Previewing %1" ). arg ( tabname )); + QWidget *sample = new QVBox ( this ); + QTabBar *tb = new QTabBar ( sample ); + QString name ( tr( "Previewing %1" ). arg ( tabname )); - tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name )); + tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name )); - m_sample = new SampleView ( sample ); + m_sample = new SampleView ( sample ); - lay-> addWidget ( tw, 10 ); - lay-> addWidget ( sample, 1 ); + lay-> addWidget ( tw, 10 ); + lay-> addWidget ( sample, 1 ); - 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_fontuse-> setChecked ( tc. m_font_use ); - m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); - m_fontselect-> setEnabled ( m_fontuse-> isChecked ( )); - fontClicked ( m_fontselect-> selectedFont ( )); + 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_fontuse-> setChecked ( tc. m_font_use ); + m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); + m_fontselect-> setEnabled ( m_fontuse-> isChecked ( )); + fontClicked ( m_fontselect-> selectedFont ( )); - QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." )); + QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." )); } @@ -314,13 +316,13 @@ QWidget *TabDialog::createFontTab ( QWidget *parent ) QWidget *tab = new QWidget ( parent, "FontTab" ); QVBoxLayout *vertLayout = new QVBoxLayout ( tab, 3, 3 ); - m_fontuse = new QCheckBox ( tr( "Use a custom font" ), tab ); - vertLayout-> addWidget ( m_fontuse ); + m_fontuse = new QCheckBox ( tr( "Use a custom font" ), tab ); + vertLayout-> addWidget ( m_fontuse ); m_fontselect = new OFontSelector ( false, tab, "fontsel" ); vertLayout-> addWidget ( m_fontselect ); - connect ( m_fontuse, SIGNAL( toggled(bool)), m_fontselect, SLOT( setEnabled(bool))); + connect ( m_fontuse, SIGNAL( toggled(bool)), m_fontselect, SLOT( setEnabled(bool))); connect( m_fontselect, SIGNAL( fontSelected(const QFont&)), this, SLOT( fontClicked(const QFont&))); @@ -341,50 +343,50 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) m_bgtype-> hide ( ); m_bgtype-> setExclusive ( true ); - QRadioButton *rb; + QRadioButton *rb; rb = new QRadioButton( tr( "Ruled" ), tab, "ruled" ); m_bgtype-> insert ( rb, TabConfig::Ruled ); gridLayout-> addWidget( rb, 0, 1 ); - QHBoxLayout *hb = new QHBoxLayout ( ); - hb-> setSpacing ( 3 ); + QHBoxLayout *hb = new QHBoxLayout ( ); + hb-> setSpacing ( 3 ); rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); m_bgtype-> insert ( rb, TabConfig::SolidColor ); hb-> addWidget ( rb ); - hb-> addSpacing ( 10 ); + hb-> addSpacing ( 10 ); - m_solidcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); - connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&))); - hb-> addWidget ( m_solidcolor ); - hb-> addStretch ( 10 ); + m_solidcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); + connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&))); + hb-> addWidget ( m_solidcolor ); + hb-> addStretch ( 10 ); gridLayout-> addLayout ( hb, 1, 1 ); - hb = new QHBoxLayout ( ); - hb-> setSpacing ( 3 ); + hb = new QHBoxLayout ( ); + hb-> setSpacing ( 3 ); - rb = new QRadioButton( tr( "Image" ), tab, "image" ); + rb = new QRadioButton( tr( "Image" ), tab, "image" ); m_bgtype-> insert ( rb, TabConfig::Image ); 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 ); + 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 = new QPushButton ( tr( "Default" ), tab ); - connect ( p, SIGNAL( clicked()), this, SLOT( bgDefaultClicked())); - gridLayout-> addWidget ( p, 3, 1 ); + 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))); + connect ( m_bgtype, SIGNAL( clicked(int)), this, SLOT( bgTypeClicked(int))); - vertLayout-> addStretch ( 10 ); + vertLayout-> addStretch ( 10 ); - return tab; + return tab; } QWidget *TabDialog::createIconTab ( QWidget *parent ) @@ -401,7 +403,7 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) m_iconsize-> hide ( ); m_iconsize-> setExclusive ( true ); - QRadioButton *rb; + QRadioButton *rb; rb = new QRadioButton( tr( "Small" ), tab, "iconsmall" ); m_iconsize-> insert ( rb, TabConfig::List ); gridLayout-> addWidget( rb, 0, 1 ); @@ -410,105 +412,105 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) m_iconsize-> insert ( rb, TabConfig::Icon ); gridLayout-> addWidget( rb, 1, 1 ); - connect ( m_iconsize, SIGNAL( clicked(int)), this, SLOT( iconSizeClicked(int))); + connect ( m_iconsize, SIGNAL( clicked(int)), this, SLOT( iconSizeClicked(int))); -// vertLayout-> addSpacing ( 8 ); +// vertLayout-> addSpacing ( 8 ); -// gridLayout = new QGridLayout ( vertLayout ); - gridLayout-> addRowSpacing ( 2, 8 ); +// gridLayout = new QGridLayout ( vertLayout ); + gridLayout-> addRowSpacing ( 2, 8 ); - label = new QLabel ( tr( "Color:" ), tab ); - gridLayout-> addWidget ( label, 3, 0 ); + label = new QLabel ( tr( "Color:" ), tab ); + gridLayout-> addWidget ( label, 3, 0 ); - m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) ); - connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&))); - gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); + m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) ); + connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&))); + gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); - vertLayout-> addStretch ( 10 ); + vertLayout-> addStretch ( 10 ); - return tab; + return tab; } void TabDialog::iconSizeClicked ( int s ) { - m_sample-> setViewMode ((TabConfig::ViewMode) s ); + m_sample-> setViewMode ((TabConfig::ViewMode) s ); } void TabDialog::fontClicked ( const QFont &f ) { - m_sample-> setViewFont ( f ); + m_sample-> setViewFont ( f ); } void TabDialog::bgTypeClicked ( int t ) { - QString s; + QString s; - if ( m_bgtype-> id ( m_bgtype-> selected ( )) != t ) - m_bgtype-> setButton ( t ); + 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_solidcolor-> setEnabled ( t == TabConfig::SolidColor ); + m_imagebrowse-> setEnabled ( t == TabConfig::Image ); - if ( t == TabConfig::SolidColor ) - s = m_solidcolor-> color ( ). name ( ); - else if ( t == TabConfig::Image ) - s = Resource::findPixmap ( m_bgimage ); + if ( t == TabConfig::SolidColor ) + s = m_solidcolor-> color ( ). name ( ); + else if ( t == TabConfig::Image ) + s = Resource::findPixmap ( m_bgimage ); - m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s ); + m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s ); } void TabDialog::bgColorClicked ( const QColor & ) { - bgTypeClicked ( TabConfig::SolidColor ); + bgTypeClicked ( TabConfig::SolidColor ); } void TabDialog::iconColorClicked ( const QColor &col ) { - m_sample-> setTextColor ( 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 ); - } + // ### 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_bgimage = "launcher/opie-background"; - bgTypeClicked ( TabConfig::Image ); + m_bgimage = "launcher/opie-background"; + bgTypeClicked ( TabConfig::Image ); } 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_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_use = m_fontuse-> isChecked ( ); + m_tc. m_font_use = m_fontuse-> isChecked ( ); - if ( m_tc. m_font_use ) { - QFont f = m_fontselect-> selectedFont ( ); + if ( m_tc. m_font_use ) { + QFont f = m_fontselect-> selectedFont ( ); - m_tc. m_font_family = f. family ( ); - m_tc. m_font_size = f. pointSize ( ); - m_tc. m_font_weight = f. weight ( ); - m_tc. m_font_italic = f. italic ( ); - } + m_tc. m_font_family = f. family ( ); + m_tc. m_font_size = f. pointSize ( ); + m_tc. m_font_weight = f. weight ( ); + m_tc. m_font_italic = f. italic ( ); + } - QDialog::accept ( ); + QDialog::accept ( ); } diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp index 43886c9..8dd9e97 100644 --- a/core/settings/launcher/taskbarsettings.cpp +++ b/core/settings/launcher/taskbarsettings.cpp @@ -16,7 +16,7 @@ =_ + =;=|` 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 @@ -28,12 +28,15 @@ #include "taskbarsettings.h" +/* OPIE */ #include <qpe/config.h> #include <qpe/qlibrary.h> #include <qpe/qpeapplication.h> #include <qpe/taskbarappletinterface.h> #include <qpe/qcopenvelope_qws.h> +#include <opie2/odebug.h> +/* QT */ #include <qdir.h> #include <qlistview.h> #include <qheader.h> @@ -41,132 +44,133 @@ #include <qlabel.h> #include <qwhatsthis.h> +/* STD */ #include <stdlib.h> TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name ) - : QWidget ( parent, name ) + : QWidget ( parent, name ) { - m_applets_changed = false; + m_applets_changed = false; - QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); + QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); - QLabel *l = new QLabel ( tr( "Load applets in Taskbar:" ), this ); - lay-> addWidget ( l ); + QLabel *l = new QLabel ( tr( "Load applets in Taskbar:" ), this ); + lay-> addWidget ( l ); - m_list = new QListView ( this ); - m_list-> addColumn ( "foobar" ); - m_list-> header ( )-> hide ( ); + m_list = new QListView ( this ); + m_list-> addColumn ( "foobar" ); + m_list-> header ( )-> hide ( ); - lay-> addWidget ( m_list ); + lay-> addWidget ( m_list ); - QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." )); + QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." )); - connect ( m_list, SIGNAL( clicked(QListViewItem*)), this, SLOT( appletChanged())); + connect ( m_list, SIGNAL( clicked(QListViewItem*)), this, SLOT( appletChanged())); - init ( ); + init ( ); } void TaskbarSettings::init ( ) { - Config cfg ( "Taskbar" ); - cfg. setGroup ( "Applets" ); - QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' ); + Config cfg ( "Taskbar" ); + cfg. setGroup ( "Applets" ); + QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' ); - QString path = QPEApplication::qpeDir ( ) + "/plugins/applets"; + QString path = QPEApplication::qpeDir ( ) + "/plugins/applets"; #ifdef Q_OS_MACX - QStringList list = QDir ( path, "lib*.dylib" ). entryList ( ); + QStringList list = QDir ( path, "lib*.dylib" ). entryList ( ); #else - QStringList list = QDir ( path, "lib*.so" ). entryList ( ); + QStringList list = QDir ( path, "lib*.so" ). entryList ( ); #endif /* Q_OS_MACX */ - for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { - QString name; - QPixmap icon; - TaskbarNamedAppletInterface *iface = 0; - - qWarning("Load applet: %s", (*it).latin1() ); - QLibrary *lib = new QLibrary ( path + "/" + *it ); - lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface ); - qWarning("<1>"); - if ( iface ) { - qWarning("<2>"); - 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 ( ); - } - qWarning("<3>"); - if ( !iface ) { - qWarning("<4>"); - lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface ); - - if ( iface ) { - qWarning("<5>"); - name = (*it). mid ( 3 ); - qWarning("Found applet: %s", name.latin1() ); + for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { + QString name; + QPixmap icon; + TaskbarNamedAppletInterface *iface = 0; + + owarn << "Load applet: " << (*it) << "" << oendl; + QLibrary *lib = new QLibrary ( path + "/" + *it ); + lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface ); + owarn << "<1>" << oendl; + if ( iface ) { + owarn << "<2>" << oendl; + 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 ( ); + } + owarn << "<3>" << oendl; + if ( !iface ) { + owarn << "<4>" << oendl; + lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface ); + + if ( iface ) { + owarn << "<5>" << oendl; + name = (*it). mid ( 3 ); + owarn << "Found applet: " << name << "" << oendl; #ifdef Q_OS_MACX - int sep = name. find( ".dylib" ); + int sep = name. find( ".dylib" ); #else - int sep = name. find( ".so" ); + int sep = name. find( ".so" ); #endif /* Q_OS_MACX */ - 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 ( ); - } - } - qWarning("<6>"); - - if ( iface ) { - qWarning("<7>"); - 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; - } + 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 ( ); + } + } + owarn << "<6>" << oendl; + + if ( iface ) { + owarn << "<7>" << oendl; + 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() { - m_applets_changed = true; + 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. write ( ); - - if ( m_applets_changed ) { - QCopEnvelope e ( "QPE/TaskBar", "reloadApplets()" ); - m_applets_changed = false; - } + 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. write ( ); + + if ( m_applets_changed ) { + QCopEnvelope e ( "QPE/TaskBar", "reloadApplets()" ); + m_applets_changed = false; + } } |