summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/brightnessapplet/brightnessapplet.cpp4
-rw-r--r--noncore/applets/brightnessapplet/brightnessapplet.pro2
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/applets/brightnessapplet/brightnessapplet.cpp b/noncore/applets/brightnessapplet/brightnessapplet.cpp
index 5aaa27e..90fde05 100644
--- a/noncore/applets/brightnessapplet/brightnessapplet.cpp
+++ b/noncore/applets/brightnessapplet/brightnessapplet.cpp
@@ -99,143 +99,143 @@ static const char * const light_off_xpm[] = {
" .ooo.. ",
" .ooo.. ",
" .o.. ",
" .. "};
BrightnessAppletControl::BrightnessAppletControl( OTaskbarApplet* parent, const char* name )
:QFrame( parent, name, WStyle_StaysOnTop | WType_Popup )
{
setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
QGridLayout *gl = new QGridLayout( this, 3, 2, 6, 3 );
//gl->setRowStretch( 1, 100 );
int maxbright = ODevice::inst()->displayBrightnessResolution();
slider = new QSlider(this);
slider->setMaxValue(maxbright);
slider->setOrientation(QSlider::Vertical);
slider->setTickmarks(QSlider::Right);
slider->setTickInterval(QMAX(1, maxbright / 16));
slider->setLineStep(QMAX(1, maxbright / 16));
slider->setPageStep(QMAX(1, maxbright / 16));
gl->addMultiCellWidget( slider, 0, 2, 0, 0 );
QPixmap onPm( (const char **)light_on_xpm );
QLabel *l = new QLabel( this );
l->setPixmap( onPm );
gl->addWidget( l, 0, 1 );
QPixmap offPm( (const char **)light_off_xpm );
l = new QLabel( this );
l->setPixmap( offPm );
gl->addWidget( l, 2, 1 );
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() ) );
_control = new BrightnessAppletControl( this, "control" );
}
void BrightnessApplet::writeSystemBrightness(int brightness)
{
PowerStatus ps = PowerStatusManager::readStatus();
- Config cfg("qpe");
+ 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("qpe");
+ Config cfg( "apm" );
if (ps.acStatus() == PowerStatus::Online) {
cfg.setGroup("AC");
} else {
cfg.setGroup("Battery");
}
odebug << "reading brightness " << cfg.readNumEntry("Brightness", 128) << oendl;
return cfg.readNumEntry("Brightness", 128);
}
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 )
{
#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 )
diff --git a/noncore/applets/brightnessapplet/brightnessapplet.pro b/noncore/applets/brightnessapplet/brightnessapplet.pro
index 8c65120..79a44d3 100644
--- a/noncore/applets/brightnessapplet/brightnessapplet.pro
+++ b/noncore/applets/brightnessapplet/brightnessapplet.pro
@@ -1,13 +1,13 @@
TEMPLATE = lib
CONFIG += qt plugin warn_on
HEADERS = brightnessapplet.h
SOURCES = brightnessapplet.cpp
TARGET = brightnessapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopiecore2 -lopieui2
-VERSION = 0.1.1
+VERSION = 0.1.2
include ( $(OPIEDIR)/include.pro )