summaryrefslogtreecommitdiff
authordrw <drw>2005-06-05 22:11:17 (UTC)
committer drw <drw>2005-06-05 22:11:17 (UTC)
commite2b65062bd7554062fcc87bbf406c2e3a54d79a2 (patch) (side-by-side diff)
tree52267420665f677fd9c442a4207874af9ccac2a0
parentd5ab3d3170acd2f4ff03f42db8ad93251a698add (diff)
downloadopie-e2b65062bd7554062fcc87bbf406c2e3a54d79a2.zip
opie-e2b65062bd7554062fcc87bbf406c2e3a54d79a2.tar.gz
opie-e2b65062bd7554062fcc87bbf406c2e3a54d79a2.tar.bz2
Resource -> OResource and fix compile warning
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/brightnessapplet/brightnessapplet.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/noncore/applets/brightnessapplet/brightnessapplet.cpp b/noncore/applets/brightnessapplet/brightnessapplet.cpp
index 90fde05..f373dd8 100644
--- a/noncore/applets/brightnessapplet/brightnessapplet.cpp
+++ b/noncore/applets/brightnessapplet/brightnessapplet.cpp
@@ -1,65 +1,65 @@
/*
-                 This file is part of the Opie Project
+ This file is part of the Opie Project
=. (C) 2004 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
.=l. Based on Qtopia 1.7 Brightnessapplet (C) 2003-2004 TrollTech
-           .>+-=
- _;:,     .>    :=|. This program 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 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
-..}^=.=       =       ; General Public License for more
-++=   -.     .`     .: details.
- :     =  ...= . :.=-
- -.   .:....=;==+<; You should have received a copy of the GNU
-  -_. . .   )=.  = General Public License along with
-    --        :-=` this application; see the file COPYING.LIB.
+ .>+-=
+_;:, .> :=|. This program 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 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
+..}^=.= = ; General Public License for more
+++= -. .` .: details.
+: = ...= . :.=-
+-. .:....=;==+<; You should have received a copy of the GNU
+ -_. . . )=. = General Public License along with
+ -- :-=` this application; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include "brightnessapplet.h"
/* OPIE */
#include <opie2/odebug.h>
#include <opie2/odevice.h>
+#include <opie2/oresource.h>
#include <opie2/otaskbarapplet.h>
#include <qpe/applnk.h>
#include <qpe/config.h>
#include <qpe/power.h>
#include <qpe/qcopenvelope_qws.h>
-#include <qpe/resource.h>
using namespace Opie::Core;
using namespace Opie::Ui;
/* QT */
#include <qpainter.h>
#include <qlabel.h>
#include <qslider.h>
#include <qlayout.h>
/* STD */
#include <assert.h>
/* XPM */
static const char * const light_on_xpm[] = {
"9 16 5 1",
" c None",
". c #FFFFFFFF0000",
"X c #000000000000",
"o c #FFFFFFFFFFFF",
"O c #FFFF6C6C0000",
" ",
" XXX ",
" XoooX ",
" Xoooo.X ",
@@ -130,49 +130,49 @@ BrightnessAppletControl::BrightnessAppletControl( OTaskbarApplet* parent, const
setFixedHeight( 100 );
setFixedWidth( gl->sizeHint().width() );
setFocusPolicy(QWidget::NoFocus);
}
BrightnessAppletControl::~BrightnessAppletControl()
{
}
void BrightnessAppletControl::hideEvent( QHideEvent* e )
{
BrightnessApplet* applet = static_cast<BrightnessApplet*>( parent() );
applet->writeSystemBrightness( applet->calcBrightnessValue() );
QFrame::hideEvent( e );
}
BrightnessApplet::BrightnessApplet( QWidget *parent, const char *name )
:OTaskbarApplet( parent, name )
{
setFixedHeight( AppLnk::smallIconSize() );
setFixedWidth( AppLnk::smallIconSize() );
- _pixmap.convertFromImage( Resource::loadImage( "brightnessapplet/icon" ).smoothScale( height(), width() ) );
+ _pixmap = Opie::Core::OResource::loadPixmap( "brightnessapplet/icon", Opie::Core::OResource::SmallIcon );
_control = new BrightnessAppletControl( this, "control" );
}
void BrightnessApplet::writeSystemBrightness(int brightness)
{
PowerStatus ps = PowerStatusManager::readStatus();
Config cfg( "apm" );
if (ps.acStatus() == PowerStatus::Online) {
cfg.setGroup("AC");
} else {
cfg.setGroup("Battery");
}
cfg.writeEntry("Brightness", brightness);
odebug << "writing brightness " << brightness << oendl;
cfg.write();
}
int BrightnessApplet::readSystemBrightness(void)
{
PowerStatus ps = PowerStatusManager::readStatus();
Config cfg( "apm" );
@@ -193,49 +193,49 @@ BrightnessApplet::~BrightnessApplet()
{
}
int BrightnessApplet::position()
{
return 7;
}
void BrightnessApplet::paintEvent( QPaintEvent* )
{
QPainter p(this);
p.drawPixmap(0, 0, _pixmap );
}
int BrightnessApplet::calcBrightnessValue()
{
int v = _control->slider->maxValue() - _control->slider->value();
return (v * 255 + _control->slider->maxValue() / 2) / _control->slider->maxValue();
}
-void BrightnessApplet::sliderMoved( int value )
+void BrightnessApplet::sliderMoved( int /*value*/ )
{
#ifndef QT_NO_COP
QCopEnvelope e("QPE/System", "setBacklight(int)");
e << calcBrightnessValue();
#else
#error This Applet makes no sense without QCOP
#endif // QT_NO_COP
}
void BrightnessApplet::mousePressEvent( QMouseEvent* )
{
if ( !_control->isVisible() )
{
int v = 255 - readSystemBrightness();
popup( _control );
_control->slider->setValue((_control->slider->maxValue() * v + 128) / 255);
connect(_control->slider, SIGNAL(valueChanged(int)), this, SLOT(sliderMoved(int)));
}
}
EXPORT_OPIE_APPLET_v1( BrightnessApplet )