summaryrefslogtreecommitdiff
authordrw <drw>2005-06-09 20:47:58 (UTC)
committer drw <drw>2005-06-09 20:47:58 (UTC)
commit650c69e864bdfa61137e028efde767527c3c1562 (patch) (side-by-side diff)
tree69c425ba79f1d9252e65819082c91dedfd450900
parentccc819750468aa161255e863dac4d2ca55ace253 (diff)
downloadopie-650c69e864bdfa61137e028efde767527c3c1562.zip
opie-650c69e864bdfa61137e028efde767527c3c1562.tar.gz
opie-650c69e864bdfa61137e028efde767527c3c1562.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp8
-rw-r--r--noncore/settings/appearance2/config.in2
-rw-r--r--noncore/settings/appearance2/exceptlistitem.h8
-rw-r--r--noncore/settings/appearance2/stylelistitem.h3
4 files changed, 11 insertions, 10 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 93e28fa..eea1a19 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -238,261 +238,261 @@ QWidget *Appearance::createFontTab ( QWidget *parent, Config &cfg )
this, SLOT( fontClicked(const QFont&)));
return m_fontselect;
}
QWidget *Appearance::createColorTab ( QWidget *parent, Config &cfg )
{
QWidget *tab = new QWidget( parent, "ColorTab" );
QGridLayout *gridLayout = new QGridLayout( tab, 0, 0, 3, 3 );
gridLayout->setRowStretch ( 3, 10 );
m_color_list = new QListBox ( tab );
gridLayout->addMultiCellWidget ( m_color_list, 0, 3, 0, 0 );
connect( m_color_list, SIGNAL( highlighted(int) ), this, SLOT( colorClicked(int) ) );
QWhatsThis::add( m_color_list, tr( "Color schemes are a collection of colors which are used for various parts of the display.\n\nClick here to select an available scheme." ) );
m_color_list-> insertItem ( new ColorListItem ( tr( "Current scheme" ), cfg ));
QString path = QPEApplication::qpeDir ( );
path.append( "/etc/colors/" );
QStringList sl = QDir ( path ). entryList ( "*.scheme" );
for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
{
QString name = (*it). left ((*it). find ( ".scheme" ));
QString pathstr = path;
pathstr.append( *it );
Config config ( pathstr, Config::File );
config. setGroup ( "Colors" );
m_color_list-> insertItem ( new ColorListItem ( name, config ));
}
m_color_list-> setCurrentItem ( 0 );
QPushButton* tempButton = new QPushButton( tab, "editSchemeButton" );
tempButton->setText( tr( "Edit..." ) );
connect( tempButton, SIGNAL( clicked() ), this, SLOT( editSchemeClicked() ) );
gridLayout->addWidget( tempButton, 0, 1 );
QWhatsThis::add( tempButton, tr( "Click here to change the colors in the current color scheme." ) );
tempButton = new QPushButton( tab, "deleteSchemeButton" );
tempButton->setText( tr( "Delete" ) );
connect( tempButton, SIGNAL( clicked() ), this, SLOT( deleteSchemeClicked() ) );
gridLayout->addWidget( tempButton, 1, 1 );
QWhatsThis::add( tempButton, tr( "Click here to delete the color scheme selected in the list to the left." ) );
tempButton = new QPushButton( tab, "saveSchemeButton" );
tempButton->setText( tr( "Save" ) );
connect( tempButton, SIGNAL( clicked() ), this, SLOT( saveSchemeClicked() ) );
gridLayout->addWidget( tempButton, 2, 1 );
QWhatsThis::add( tempButton, tr( "Click here to name and save the current color scheme." ) );
return tab;
}
QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
{
QWidget *tab = new QWidget ( parent );
QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
/*
* show scrollbars on the left?
*/
m_leftHand = new QCheckBox( tr("Show Scrollbars on the left"), tab );
m_leftHand->setChecked( cfg.readBoolEntry( "LeftHand", false ) );
QWhatsThis::add( m_leftHand, tr( "Click here to display scrollbars on the left side instead of the right." ) );
vertLayout->addWidget( m_leftHand );
QFrame *f = new QFrame ( tab );
f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
vertLayout-> addWidget ( f );
vertLayout-> addSpacing ( 3 );
QGridLayout* gridLayout = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
int style = cfg. readNumEntry ( "TabStyle", 2 ) - 1;
bool tabtop = ( cfg. readEntry ( "TabPosition", "Top" ) == "Top" );
QLabel* label = new QLabel( tr( "Tab style:" ), tab );
gridLayout-> addWidget ( label, 0, 0 );
QWhatsThis::add( label, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
QButtonGroup* btngrp = new QButtonGroup( tab, "buttongroup" );
btngrp-> hide ( );
btngrp-> setExclusive ( true );
m_tabstyle_list = new QComboBox ( false, tab, "tabstyle" );
m_tabstyle_list-> insertItem ( tr( "Tabs" ));
m_tabstyle_list-> insertItem ( tr( "Tabs w/icons" ));
m_tabstyle_list-> insertItem ( tr( "Drop down list" ));
m_tabstyle_list-> insertItem ( tr( "Drop down list w/icons" ));
m_tabstyle_list-> setCurrentItem ( style );
gridLayout-> addMultiCellWidget ( m_tabstyle_list, 0, 0, 1, 2 );
QWhatsThis::add( m_tabstyle_list, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
m_tabstyle_top = new QRadioButton( tr( "Top" ), tab, "tabpostop" );
btngrp-> insert ( m_tabstyle_top );
gridLayout-> addWidget( m_tabstyle_top, 1, 1 );
QWhatsThis::add( m_tabstyle_top, tr( "Click here so that tabs appear at the top of the window." ) );
m_tabstyle_bottom = new QRadioButton( tr( "Bottom" ), tab, "tabposbottom" );
btngrp-> insert ( m_tabstyle_bottom );
gridLayout-> addWidget( m_tabstyle_bottom, 1, 2 );
QWhatsThis::add( m_tabstyle_bottom, tr( "Click here so that tabs appear at the bottom of the window." ) );
m_tabstyle_top-> setChecked ( tabtop );
m_tabstyle_bottom-> setChecked ( !tabtop );
m_original_tabstyle = style;
m_original_tabpos = tabtop;
vertLayout-> addSpacing ( 3 );
QHBoxLayout *rotLay = new QHBoxLayout ( vertLayout, 3 );
QLabel* rotlabel = new QLabel( tr( "Rotation direction:" ), tab );
m_rotdir_cw = new QRadioButton( tab, "rotdir_cw" );
m_rotdir_ccw = new QRadioButton( tab, "rotdir_ccw" );
m_rotdir_flip = new QRadioButton( tab, "rotdir_flip" );
QButtonGroup* rotbtngrp = new QButtonGroup( tab, "rotbuttongroup" );
rotbtngrp-> hide ( );
rotbtngrp-> setExclusive ( true );
rotbtngrp-> insert ( m_rotdir_cw );
rotbtngrp-> insert ( m_rotdir_ccw );
rotbtngrp-> insert ( m_rotdir_flip );
- QImage ccwImage = Resource::loadImage( "redo" );
+ QImage ccwImage = Opie::Core::OResource::loadImage( "redo", Opie::Core::OResource::SmallIcon );
QPixmap cw, ccw, flip;
- cw.convertFromImage( ccwImage.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
- ccw.convertFromImage( ccwImage.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ).mirror( 1, 0 ) );
- flip.convertFromImage( Resource::loadImage( "pass" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+ cw.convertFromImage( ccwImage );
+ ccw.convertFromImage( ccwImage.mirror( 1, 0 ) );
+ flip.convertFromImage( Opie::Core::OResource::loadImage( "pass", Opie::Core::OResource::SmallIcon ) );
m_rotdir_cw-> setPixmap( cw );
m_rotdir_ccw-> setPixmap( ccw );
m_rotdir_flip-> setPixmap( flip );
rotLay-> addWidget ( rotlabel, 0 );
rotLay-> addWidget ( m_rotdir_cw, 0 );
rotLay-> addWidget ( m_rotdir_ccw, 0 );
rotLay-> addWidget ( m_rotdir_flip, 0 );
int rotDirection = cfg.readNumEntry( "rotatedir" );
ODirection rot = CW;
if (rotDirection == -1)
{
rot = ODevice::inst ( )-> direction ( );
}
else
{
rot = (ODirection)rotDirection;
}
m_rotdir_cw-> setChecked ( rot == CW );
m_rotdir_ccw-> setChecked ( rot == CCW );
m_rotdir_flip-> setChecked ( rot == Flip );
/*
* add a spacing
*/
vertLayout->addItem( new QSpacerItem( 1, 1, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding ) );
return tab;
}
Appearance::Appearance( QWidget* parent, const char* name, WFlags )
: QDialog ( parent, name, true, WStyle_ContextHelp )
{
setCaption( tr( "Appearance Settings" ) );
Config config( "qpe" );
config.setGroup( "Appearance" );
QVBoxLayout *top = new QVBoxLayout ( this, 3, 3 );
m_sample = new SampleWindow ( this );
m_sample-> setDecoration ( new DefaultWindowDecoration ( ) );
QWhatsThis::add( m_sample, tr( "This is a preview window. Look here to see your new appearance as options are changed." ) );
OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
QWidget *styletab;
m_color_list = 0;
tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance", tr( "Style" ));
tw-> addTab ( createFontTab ( tw, config ), "font", tr( "Font" ));
tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) );
tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) );
tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "SettingsIcon", tr( "Advanced" ) );
top-> addWidget ( tw, 10 );
top-> addWidget ( m_sample, 1 );
tw-> setCurrentTab ( styletab );
connect ( tw, SIGNAL( currentChanged(QWidget*)), this, SLOT( tabChanged(QWidget*)));
m_style_changed = m_font_changed = m_color_changed = m_deco_changed = false;
}
Appearance::~Appearance()
{}
void Appearance::tabChanged ( QWidget *w )
{
if ( w == m_advtab )
{
m_sample-> hide ( );
updateGeometry ( ); // shouldn't be necessary ...
}
else
m_sample-> show ( );
}
void Appearance::accept ( )
{
bool newtabpos = m_tabstyle_top-> isChecked ( );
int newtabstyle = m_tabstyle_list-> currentItem ( );
Config config ( "qpe" );
config. setGroup ( "Appearance" );
if ( m_style_changed )
{
StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
if ( item )
config.writeEntry( "Style", item-> key ( ));
}
if ( m_deco_changed )
{
DecoListItem *item = (DecoListItem *) m_deco_list-> item ( m_deco_list-> currentItem ( ));
if ( item )
config.writeEntry( "Decoration", item-> key ( ));
}
if (( newtabstyle != m_original_tabstyle ) || ( newtabpos != m_original_tabpos ))
{
config. writeEntry ( "TabStyle", newtabstyle + 1 );
config. writeEntry ( "TabPosition", newtabpos ? "Top" : "Bottom" );
}
if ( m_font_changed )
{
config. writeEntry ( "FontFamily", m_fontselect-> fontFamily ( ));
config. writeEntry ( "FontStyle", m_fontselect-> fontStyle ( ));
config. writeEntry ( "FontSize", m_fontselect-> fontSize ( ));
}
if ( m_color_changed )
{
ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( ));
if ( item )
item-> save ( config );
}
diff --git a/noncore/settings/appearance2/config.in b/noncore/settings/appearance2/config.in
index 9e30429..2f23c1c 100644
--- a/noncore/settings/appearance2/config.in
+++ b/noncore/settings/appearance2/config.in
@@ -1,4 +1,4 @@
config APPEARANCE2
boolean "opie-appearance (control color, widget view etc)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBQTAUX
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX
diff --git a/noncore/settings/appearance2/exceptlistitem.h b/noncore/settings/appearance2/exceptlistitem.h
index 365fa90..b8cec86 100644
--- a/noncore/settings/appearance2/exceptlistitem.h
+++ b/noncore/settings/appearance2/exceptlistitem.h
@@ -1,202 +1,202 @@
/*
                This file is part of the Opie Project
Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
=.
.=l.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU Library 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 program 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
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
:     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef EXCEPTLISTITEM_H
#define EXCEPTLISTITEM_H
#include <qlistview.h>
#include <qpixmap.h>
#include <qimage.h>
#include <qpainter.h>
class ExceptListItem : public QListViewItem {
public:
ExceptListItem ( QListView *lv, QListViewItem *after, const QString &t, bool nostyle = true, bool nofont = true, bool nodeco = true ) : QListViewItem ( lv, after )
{
m_text = t;
m_nofont = nofont;
m_nostyle = nostyle;
m_nodeco = nodeco;
init ( );
}
virtual ~ExceptListItem ( )
{
}
static void overlay ( QImage &img, const QImage &ovl )
{
if (( img. size ( ) != ovl. size ( )) ||
( img. depth ( ) != ovl. depth ( )))
return;
for ( int y = 0; y != img. height ( ); y++ ) {
QRgb *iline = (QRgb *) img. scanLine ( y );
QRgb *oline = (QRgb *) ovl. scanLine ( y );
for ( int x = 0; x != img. width ( ); x++ ) {
QRgb i = *iline;
QRgb o = *oline;
*iline = qRgba (( qRed ( i ) + qRed ( o )) / 2,
( qGreen ( i ) + qGreen ( o )) / 2,
( qBlue ( i ) + qBlue ( o )) / 2,
( qAlpha ( i ) + qAlpha ( o )) / 2 );
iline++;
oline++;
}
}
}
static void init ( )
{
static bool init = false;
if ( init )
return;
- QImage noimg = Resource::loadImage ( "appearance/no.png" );
- QImage fontimg = Resource::loadImage ( "appearance/font.png" );
- QImage styleimg = Resource::loadImage ( "appearance/style.png" );
- QImage decoimg = Resource::loadImage ( "appearance/deco.png" );
+ QImage noimg = Opie::Core::OResource::loadImage ( "appearance/no.png", Opie::Core::OResource::SmallIcon );
+ QImage fontimg = Opie::Core::OResource::loadImage ( "appearance/font.png", Opie::Core::OResource::SmallIcon );
+ QImage styleimg = Opie::Core::OResource::loadImage ( "appearance/style.png", Opie::Core::OResource::SmallIcon );
+ QImage decoimg = Opie::Core::OResource::loadImage ( "appearance/deco.png", Opie::Core::OResource::SmallIcon );
s_fontpix [0] = new QPixmap ( );
s_fontpix [0]-> convertFromImage ( fontimg );
overlay ( fontimg, noimg );
s_fontpix [1] = new QPixmap ( );
s_fontpix [1]-> convertFromImage ( fontimg );
s_stylepix [0] = new QPixmap ( );
s_stylepix [0]-> convertFromImage ( styleimg );
overlay ( styleimg, noimg );
s_stylepix [1] = new QPixmap ( );
s_stylepix [1]-> convertFromImage ( styleimg );
s_decopix [0] = new QPixmap ( );
s_decopix [0]-> convertFromImage ( decoimg );
overlay ( decoimg, noimg );
s_decopix [1] = new QPixmap ( );
s_decopix [1]-> convertFromImage ( decoimg );
init = true;
}
bool noFont ( ) const
{
return m_nofont;
}
bool noStyle ( ) const
{
return m_nostyle;
}
bool noDeco ( ) const
{
return m_nodeco;
}
void setNoDeco ( bool b )
{
if ( b != m_nodeco ) {
m_nodeco = b;
repaint ( );
}
}
void setNoStyle ( bool b )
{
if ( b != m_nostyle ) {
m_nostyle = b;
repaint ( );
}
}
void setNoFont ( bool b )
{
if ( b != m_nofont ) {
m_nofont = b;
repaint ( );
}
}
QString pattern ( ) const
{
return m_text;
}
void setPattern ( const QString &s )
{
if ( s != m_text ) {
m_text = s;
widthChanged ( 3 );
repaint ( );
}
}
QString text ( int i ) const
{
if ( i == 3 )
return m_text;
else
return QString::null;
}
const QPixmap *pixmap ( int i ) const
{
if ( i == 0 )
return (const QPixmap *) s_stylepix [m_nostyle ? 1 : 0];
else if ( i == 1 )
return (const QPixmap *) s_fontpix [m_nofont ? 1 : 0];
else if ( i == 2 )
return (const QPixmap *) s_decopix [m_nodeco ? 1 : 0];
else
return 0;
}
private:
QString m_text;
bool m_nofont;
bool m_nostyle;
bool m_nodeco;
static QPixmap *s_stylepix [2];
static QPixmap *s_fontpix [2];
static QPixmap *s_decopix [2];
};
QPixmap *ExceptListItem::s_stylepix [2] = { 0, 0 };
QPixmap *ExceptListItem::s_fontpix [2] = { 0, 0 };
QPixmap *ExceptListItem::s_decopix [2] = { 0, 0 };
#endif
diff --git a/noncore/settings/appearance2/stylelistitem.h b/noncore/settings/appearance2/stylelistitem.h
index 613fa71..3946190 100644
--- a/noncore/settings/appearance2/stylelistitem.h
+++ b/noncore/settings/appearance2/stylelistitem.h
@@ -1,121 +1,122 @@
/*
                This file is part of the Opie Project
Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
=.
.=l.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU Library 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 program 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
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
:     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef STYLELISTITEM_H
#define STYLELISTITEM_H
/* OPIE */
+#include <opie2/oresource.h>
+
#include <qpe/styleinterface.h>
#include <qpe/qlibrary.h>
-#include <qpe/resource.h>
/* QT */
#include <qlistbox.h>
#include <qfileinfo.h>
#include <stdio.h>
class StyleListItem : public QListBoxText {
public:
StyleListItem ( const QString &t, QStyle *sty ) : QListBoxText ( t )
{
m_lib = 0;
m_style_if = 0;
m_settings_if = 0;
m_style = sty;
}
StyleListItem ( QLibrary *lib, StyleInterface *iface ) : QListBoxText ( iface-> name ( ))
{
m_lib = lib;
m_style_if = iface;
m_settings_if = 0;
m_style = iface-> style ( );
iface-> queryInterface ( IID_StyleExtended, (QUnknownInterface **) &m_settings_if );
}
virtual ~StyleListItem ( )
{
delete m_style;
if ( m_settings_if )
m_settings_if-> release ( );
if ( m_style_if )
m_style_if-> release ( );
delete m_lib;
}
bool hasSettings ( ) const
{
return m_settings_if ? m_settings_if-> hasSettings ( ) : false;
}
QWidget *settings ( QWidget *parent )
{
return m_settings_if ? m_settings_if-> create ( parent ) : 0;
}
bool setSettings ( bool accepted )
{
if ( !m_settings_if )
return false;
if ( accepted )
return m_settings_if-> accept ( );
else {
m_settings_if-> reject ( );
return false;
}
}
QString key ( )
{
if ( m_lib )
return QFileInfo ( m_lib-> library ( )). fileName ( );
else
return text ( );
}
QStyle *style ( )
{
return m_style;
}
private:
QLibrary *m_lib;
QStyle *m_style;
StyleInterface *m_style_if;
StyleExtendedInterface *m_settings_if;
};
#endif