Mailinglist Archive: zypp-commit (258 mails)
| < Previous | Next > |
[zypp-commit] r8358 - in /trunk/updater-kde: ./ package/ updater/
- From: tgoettlicher@xxxxxxxxxxxxxxxx
- Date: Thu, 24 Jan 2008 12:00:23 -0000
- Message-id: <20080124120023.681AD2636D@xxxxxxxxxxxxxxxx>
Author: tgoettlicher
Date: Thu Jan 24 13:00:22 2008
New Revision: 8358
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8358&view=rev
Log:
Added check for battery state before checking for updates (fate #302960)
Modified:
trunk/updater-kde/VERSION.cmake
trunk/updater-kde/package/opensuse-updater-kde.changes
trunk/updater-kde/package/opensuse-updater-kde.spec
trunk/updater-kde/updater/ConfigWidgetUI.h
trunk/updater-kde/updater/ConfigWidgetUI.ui
trunk/updater-kde/updater/Constants.h
trunk/updater-kde/updater/MainWindow.cpp
Modified: trunk/updater-kde/VERSION.cmake
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/VERSION.cmake?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/VERSION.cmake (original)
+++ trunk/updater-kde/VERSION.cmake Thu Jan 24 13:00:22 2008
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "6")
-SET(VERSION_PATCH "4")
+SET(VERSION_PATCH "5")
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-updater-kde.changes?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Thu Jan 24 13:00:22
2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Jan 24 12:54:07 CET 2008 - tgoettlicher@xxxxxxx
+
+- Added check for battery state before checking for updates (fate #302960)
+- V 0.6.5
+
+-------------------------------------------------------------------
Mon Jan 21 14:08:57 CET 2008 - tgoettlicher@xxxxxxx
- Added check for system load before checking for updates (fate #302960)
Modified: trunk/updater-kde/package/opensuse-updater-kde.spec
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-updater-kde.spec?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.spec (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.spec Thu Jan 24 13:00:22 2008
@@ -15,7 +15,7 @@
License: GPL
Group: System/Management
Summary: KDE updater applet for OpenSUSE
-Version: 0.6.4
+Version: 0.6.5
Release: 1
URL: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -89,8 +89,12 @@
%changelog -n opensuse-updater-kde
-------------------------------------------------------------------
-
+-------------------------------------------------------------------
+* Jan 24 2008 - tgoettlicher@xxxxxxx
+- Added check for battery state before checking for updates (fate #302960)
+- Added check for system load before checking for updates (fate #302960)
+- Show a more understandable message when no network is available
+- fixed crash when selecting upgrade while refreshing (#353515)
* Wed Jan 01 2008 - tgoettlicher@xxxxxxx
- applied timing patch
- fixed initialized pointer (#348614)
Modified: trunk/updater-kde/updater/ConfigWidgetUI.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidgetUI.h?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/updater/ConfigWidgetUI.h (original)
+++ trunk/updater-kde/updater/ConfigWidgetUI.h Thu Jan 24 13:00:22 2008
@@ -37,6 +37,8 @@
QCheckBox* kcfg_ShowNotifications;
QCheckBox* kcfg_NoSimpleView;
QCheckBox* kcfg_CheckingAnimation;
+ QCheckBox* kcfg_SkipCheckSystemBusy;
+ QCheckBox* kcfg_SkipCheckOnBattery;
QLineEdit* kcfg_BackendPlugin;
QFrame* BackendFrame;
QSpinBox* kcfg_WarnInterval;
Modified: trunk/updater-kde/updater/ConfigWidgetUI.ui
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidgetUI.ui?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/updater/ConfigWidgetUI.ui (original)
+++ trunk/updater-kde/updater/ConfigWidgetUI.ui Thu Jan 24 13:00:22 2008
@@ -148,25 +148,22 @@
<string>Animated icon on check</string>
</property>
</widget>
-
<widget class="QCheckBox">
<property name="name">
- <cstring>kcfg_SkipCheckSystemBusy</cstring>
+ <cstring>kcfg_SkipCheckOnBattery</cstring>
</property>
<property name="text">
- <string>Don't check for updates when the system
is busy</string>
+ <string>Don't check for updates when the system
is on battery</string>
</property>
</widget>
-<!--
<widget class="QCheckBox">
<property name="name">
- <cstring>kcfg_SkipCheckOnBattery</cstring>
+ <cstring>kcfg_SkipCheckSystemBusy</cstring>
</property>
<property name="text">
- <string>Don't check for updates when the system
is on battery</string>
+ <string>Don't check for updates when the system
is busy</string>
</property>
</widget>
--->
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
Modified: trunk/updater-kde/updater/Constants.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Constants.h?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/updater/Constants.h (original)
+++ trunk/updater-kde/updater/Constants.h Thu Jan 24 13:00:22 2008
@@ -22,7 +22,7 @@
#define PROGRAM_NAME "opensuseupdater"
#define PROGRAM_DISPLAY_NAME "openSUSE Updater"
-#define VERSION "0.6"
+#define VERSION "0.6.5"
#define TRAY_ICON_GREEN "opensuseupdater_green"
#define TRAY_ICON_RED "opensuseupdater_red"
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Thu Jan 24 13:00:22 2008
@@ -785,9 +785,6 @@
// recheck has to be done at most once
disconnect(applet, SIGNAL(checkAgain()), 0, 0);
- slotAppletState(APPLET_CHECKING, 0, 0);
-
-
// Check whether system is idle or busy
if (UpdaterSettings::self()->skipCheckSystemBusy() && systemIsBusy())
{
@@ -812,7 +809,6 @@
return;
}
-
// Check whether network is avaiable:
// If no network is available let ConnectionManager call this
// function again when network ist connected
@@ -934,19 +930,16 @@
bool MainWindow::systemIsOnBattery()
{
- return false; // this is a dummy function
-
- // prepared for dcop battery call
- // FIXME
bool onBattery = false;
- if ( kapp->dcopClient()->isApplicationRegistered( "kded" ) )
+
+ kdDebug() << "Checking wheter system is on battery..." << endl;
+
+ if ( kapp->dcopClient()->isApplicationRegistered( "kpowersave" ) )
{
QByteArray data, replyData;
-// QDataStream arg(data, IO_WriteOnly);
-// arg << QString("www.novell.com");
QCString replyType;
- if ( !kapp->dcopClient()->call( "kded", "powermanagement",
"onBattery(QString)",
+ if ( !kapp->dcopClient()->call( "kpowersave",
"KPowersaveIface", "isOnBattery()",
data, replyType, replyData ) )
{
kdError() << "DCOP error." << endl;
@@ -959,6 +952,8 @@
}
}
+ kdDebug() << (onBattery?"on battery":"plugged in") << endl;
+
return onBattery;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx
Date: Thu Jan 24 13:00:22 2008
New Revision: 8358
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8358&view=rev
Log:
Added check for battery state before checking for updates (fate #302960)
Modified:
trunk/updater-kde/VERSION.cmake
trunk/updater-kde/package/opensuse-updater-kde.changes
trunk/updater-kde/package/opensuse-updater-kde.spec
trunk/updater-kde/updater/ConfigWidgetUI.h
trunk/updater-kde/updater/ConfigWidgetUI.ui
trunk/updater-kde/updater/Constants.h
trunk/updater-kde/updater/MainWindow.cpp
Modified: trunk/updater-kde/VERSION.cmake
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/VERSION.cmake?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/VERSION.cmake (original)
+++ trunk/updater-kde/VERSION.cmake Thu Jan 24 13:00:22 2008
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "6")
-SET(VERSION_PATCH "4")
+SET(VERSION_PATCH "5")
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-updater-kde.changes?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Thu Jan 24 13:00:22
2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Jan 24 12:54:07 CET 2008 - tgoettlicher@xxxxxxx
+
+- Added check for battery state before checking for updates (fate #302960)
+- V 0.6.5
+
+-------------------------------------------------------------------
Mon Jan 21 14:08:57 CET 2008 - tgoettlicher@xxxxxxx
- Added check for system load before checking for updates (fate #302960)
Modified: trunk/updater-kde/package/opensuse-updater-kde.spec
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-updater-kde.spec?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.spec (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.spec Thu Jan 24 13:00:22 2008
@@ -15,7 +15,7 @@
License: GPL
Group: System/Management
Summary: KDE updater applet for OpenSUSE
-Version: 0.6.4
+Version: 0.6.5
Release: 1
URL: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -89,8 +89,12 @@
%changelog -n opensuse-updater-kde
-------------------------------------------------------------------
-
+-------------------------------------------------------------------
+* Jan 24 2008 - tgoettlicher@xxxxxxx
+- Added check for battery state before checking for updates (fate #302960)
+- Added check for system load before checking for updates (fate #302960)
+- Show a more understandable message when no network is available
+- fixed crash when selecting upgrade while refreshing (#353515)
* Wed Jan 01 2008 - tgoettlicher@xxxxxxx
- applied timing patch
- fixed initialized pointer (#348614)
Modified: trunk/updater-kde/updater/ConfigWidgetUI.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidgetUI.h?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/updater/ConfigWidgetUI.h (original)
+++ trunk/updater-kde/updater/ConfigWidgetUI.h Thu Jan 24 13:00:22 2008
@@ -37,6 +37,8 @@
QCheckBox* kcfg_ShowNotifications;
QCheckBox* kcfg_NoSimpleView;
QCheckBox* kcfg_CheckingAnimation;
+ QCheckBox* kcfg_SkipCheckSystemBusy;
+ QCheckBox* kcfg_SkipCheckOnBattery;
QLineEdit* kcfg_BackendPlugin;
QFrame* BackendFrame;
QSpinBox* kcfg_WarnInterval;
Modified: trunk/updater-kde/updater/ConfigWidgetUI.ui
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidgetUI.ui?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/updater/ConfigWidgetUI.ui (original)
+++ trunk/updater-kde/updater/ConfigWidgetUI.ui Thu Jan 24 13:00:22 2008
@@ -148,25 +148,22 @@
<string>Animated icon on check</string>
</property>
</widget>
-
<widget class="QCheckBox">
<property name="name">
- <cstring>kcfg_SkipCheckSystemBusy</cstring>
+ <cstring>kcfg_SkipCheckOnBattery</cstring>
</property>
<property name="text">
- <string>Don't check for updates when the system
is busy</string>
+ <string>Don't check for updates when the system
is on battery</string>
</property>
</widget>
-<!--
<widget class="QCheckBox">
<property name="name">
- <cstring>kcfg_SkipCheckOnBattery</cstring>
+ <cstring>kcfg_SkipCheckSystemBusy</cstring>
</property>
<property name="text">
- <string>Don't check for updates when the system
is on battery</string>
+ <string>Don't check for updates when the system
is busy</string>
</property>
</widget>
--->
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
Modified: trunk/updater-kde/updater/Constants.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Constants.h?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/updater/Constants.h (original)
+++ trunk/updater-kde/updater/Constants.h Thu Jan 24 13:00:22 2008
@@ -22,7 +22,7 @@
#define PROGRAM_NAME "opensuseupdater"
#define PROGRAM_DISPLAY_NAME "openSUSE Updater"
-#define VERSION "0.6"
+#define VERSION "0.6.5"
#define TRAY_ICON_GREEN "opensuseupdater_green"
#define TRAY_ICON_RED "opensuseupdater_red"
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=8358&r1=8357&r2=8358&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Thu Jan 24 13:00:22 2008
@@ -785,9 +785,6 @@
// recheck has to be done at most once
disconnect(applet, SIGNAL(checkAgain()), 0, 0);
- slotAppletState(APPLET_CHECKING, 0, 0);
-
-
// Check whether system is idle or busy
if (UpdaterSettings::self()->skipCheckSystemBusy() && systemIsBusy())
{
@@ -812,7 +809,6 @@
return;
}
-
// Check whether network is avaiable:
// If no network is available let ConnectionManager call this
// function again when network ist connected
@@ -934,19 +930,16 @@
bool MainWindow::systemIsOnBattery()
{
- return false; // this is a dummy function
-
- // prepared for dcop battery call
- // FIXME
bool onBattery = false;
- if ( kapp->dcopClient()->isApplicationRegistered( "kded" ) )
+
+ kdDebug() << "Checking wheter system is on battery..." << endl;
+
+ if ( kapp->dcopClient()->isApplicationRegistered( "kpowersave" ) )
{
QByteArray data, replyData;
-// QDataStream arg(data, IO_WriteOnly);
-// arg << QString("www.novell.com");
QCString replyType;
- if ( !kapp->dcopClient()->call( "kded", "powermanagement",
"onBattery(QString)",
+ if ( !kapp->dcopClient()->call( "kpowersave",
"KPowersaveIface", "isOnBattery()",
data, replyType, replyData ) )
{
kdError() << "DCOP error." << endl;
@@ -959,6 +952,8 @@
}
}
+ kdDebug() << (onBattery?"on battery":"plugged in") << endl;
+
return onBattery;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx
| < Previous | Next > |