From 3ccdd6b6ebf6fc90f80bb76ef960c5ef03590371 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oliver=20Gro=C3=9F?= Date: Tue, 2 Sep 2008 22:14:55 +0200 Subject: [PATCH] bugfix release 0.1.7 --- constants.h | 4 ++-- debian/changelog | 8 ++++++++ debian/copyright | 5 ----- powermanager.cpp | 12 ++++++------ settings.cpp | 17 ++++++++++++----- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/constants.h b/constants.h index 65ae6a6..e5b8309 100644 --- a/constants.h +++ b/constants.h @@ -1,7 +1,7 @@ #ifndef QBAT_CONSTANTS_H #define QBAT_CONSTANTS_H -#define UI_VERSION "0.1.6" +#define UI_VERSION "0.1.7" #define UI_NAME tr("QBat - Qt Battery Monitor") #define UI_DIR_WORK ".qbat/" @@ -13,7 +13,7 @@ #define UI_FILE_CONFIG (UI_PATH_WORK + "qbat.conf") #define UI_CAPTION_ENERGY "energy" -#define UI_CAPTION_CURRENT "current" +#define UI_CAPTION_CHARGE "charge" #define UI_CAPTION_VOLTAGE "voltage" #define UI_CAPTION_NOW(a) "/" + a + "_now" #define UI_CAPTION_FULL(a) "/" + a + "_full" diff --git a/debian/changelog b/debian/changelog index 699686e..2e5841a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +qbat (0.1.7) unstable; urgency=low + + * fixed "command<->waring" setting + * fixed sysfs filenames + * fixed lintian copyright warning + + -- Oliver Groß Tue, 02 Sep 2008 22:11:25 +0200 + qbat (0.1.6) unstable; urgency=low * added basic support for battery stats in mWh diff --git a/debian/copyright b/debian/copyright index 4ab8f7e..6dc9d8f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,3 @@ -This package was debianized by Oliver Groß on -Tue, 08 Jan 2008 11:31:31 +0100. - -It was downloaded from - Upstream Author: Oliver Groß diff --git a/powermanager.cpp b/powermanager.cpp index 89a1568..8236f3b 100644 --- a/powermanager.cpp +++ b/powermanager.cpp @@ -137,9 +137,9 @@ namespace qbat { currentNow += qRound(readIntSysFile(m_SysfsDir.filePath(i + "/current_now").toAscii().constData()) / voltage); } else { - chargeFull += readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_FULL(UI_CAPTION_CURRENT)).toAscii().constData()); - chargeFullDesign += readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_DESIGN(UI_CAPTION_CURRENT)).toAscii().constData()); - chargeNow += readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_NOW(UI_CAPTION_CURRENT)).toAscii().constData()); + chargeFull += readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_FULL(UI_CAPTION_CHARGE)).toAscii().constData()); + chargeFullDesign += readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_DESIGN(UI_CAPTION_CHARGE)).toAscii().constData()); + chargeNow += readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_NOW(UI_CAPTION_CHARGE)).toAscii().constData()); currentNow += readIntSysFile(m_SysfsDir.filePath(i + "/current_now").toAscii().constData()); } @@ -204,9 +204,9 @@ namespace qbat { chargeNow = readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_NOW(UI_CAPTION_ENERGY)).toAscii().constData()); } else { - chargeFull = readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_FULL(UI_CAPTION_CURRENT)).toAscii().constData()); - chargeFullDesign = readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_DESIGN(UI_CAPTION_CURRENT)).toAscii().constData()); - chargeNow = readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_NOW(UI_CAPTION_CURRENT)).toAscii().constData()); + chargeFull = readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_FULL(UI_CAPTION_CHARGE)).toAscii().constData()); + chargeFullDesign = readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_DESIGN(UI_CAPTION_CHARGE)).toAscii().constData()); + chargeNow = readIntSysFile(m_SysfsDir.filePath(i + UI_CAPTION_NOW(UI_CAPTION_CHARGE)).toAscii().constData()); } currentNow = readIntSysFile(m_SysfsDir.filePath(i + "/current_now").toAscii().constData()); status = toStatusInt(readStringSysFile(m_SysfsDir.filePath(i + "/status").toAscii().constData())); diff --git a/settings.cpp b/settings.cpp index 39142b0..84d948f 100644 --- a/settings.cpp +++ b/settings.cpp @@ -27,9 +27,10 @@ namespace qbat { void CSettings::applySettings() { m_Settings->handleCritical = ui.criticalGroup->isChecked(); m_Settings->criticalCapacity = ui.criticalCapacitySpin->value(); + m_Settings->executeCommand = ui.criticalCommandRadio->isChecked(); m_Settings->criticalCommand = ui.criticalCommandEdit->text(); - m_Settings->mergeBatterys = ui.mergeBatteryCheck->isChecked(); + m_Settings->confirmCommand = ui.confirmCommandBox->isChecked(); m_Settings->confirmWithTimeout = ui.timeoutCheck->isChecked(); m_Settings->timeoutValue = ui.timeoutSpin->value(); @@ -37,6 +38,8 @@ namespace qbat { for (int i = 0; i < UI_COUNT_COLORS; i++) m_Settings->colors[i] = colors[i]; + m_Settings->mergeBatterys = ui.mergeBatteryCheck->isChecked(); + m_Settings->showBalloon = ui.showBalloonCheck->isChecked(); m_Settings->pollingRate = ui.pollingRateSpin->value(); @@ -44,13 +47,15 @@ namespace qbat { } bool CSettings::execute(Settings * settings) { - m_Settings = settings; - ui.criticalGroup->setChecked(settings->handleCritical); ui.criticalCapacitySpin->setValue(settings->criticalCapacity); - ui.criticalCommandRadio->setChecked(settings->executeCommand); + + if (settings->executeCommand) + ui.criticalCommandRadio->setChecked(true); + else + ui.criticalWarningRadio->setChecked(true); + ui.criticalCommandEdit->setText(settings->criticalCommand); - ui.mergeBatteryCheck->setChecked(settings->mergeBatterys); ui.confirmCommandBox->setChecked(settings->confirmCommand); ui.timeoutCheck->setChecked(settings->confirmWithTimeout); ui.timeoutSpin->setValue(settings->timeoutValue); @@ -64,10 +69,12 @@ namespace qbat { colors[i] = settings->colors[i]; } } + ui.mergeBatteryCheck->setChecked(settings->mergeBatterys); ui.pollingRateSpin->setValue(settings->pollingRate); ui.showBalloonCheck->setChecked(settings->showBalloon); + m_Settings = settings; if (exec()) { applySettings(); -- 2.11.4.GIT