diff -ru kde-guidance-0.8.0-o/powermanager/guidance-power-manager.py kde-guidance-0.8.0/powermanager/guidance-power-manager.py --- kde-guidance-0.8.0-o/powermanager/guidance-power-manager.py 2007-04-10 20:36:05.000000000 +0200 +++ kde-guidance-0.8.0/powermanager/guidance-power-manager.py 2007-04-10 20:35:44.000000000 +0200 @@ -236,6 +236,8 @@ self.freq_name['dynamic'] = i18n("Dynamic") self.freq_name['powersave'] = i18n("Powersave") self.freq_name['performance'] = i18n("Performance") + self.freq_name['conservative'] = i18n("Conservative") + self.freq_name['ondemand'] = i18n("Ondemand") def _initUI(self, parent): @@ -273,7 +275,15 @@ action.setExclusiveGroup("freqs") action.plug(submenu) - self.systray.actionCollection().action(actualFreq).setChecked(True); + action = KRadioAction(i18n("Conservative"), KShortcut(), self.setCpuPolicyConservative, self.systray.actionCollection(), 'conservative') + action.setExclusiveGroup("freqs") + action.plug(submenu) + + action = KRadioAction(i18n("Ondemand"), KShortcut(), self.setCpuPolicyOndemand, self.systray.actionCollection(), 'ondemand') + action.setExclusiveGroup("freqs") + action.plug(submenu) + + self.systray.actionCollection().action(actualFreq).setChecked(True) menu.insertItem(i18n("CPU policy"),submenu) # Connect some signals. Updates in the dialogue apply instantly @@ -314,6 +324,10 @@ self.cb_freq.append('powersave') if len(self.powermanager.cpu_policy['performance']) > 0: self.cb_freq.append('performance') + if len(self.powermanager.cpu_policy['ondemand']) > 0: + self.cb_freq.append('ondemand') + if len(self.powermanager.cpu_policy['conservative']) > 0: + self.cb_freq.append('conservative') if len(self.cb_freq) > 0: self._initCB(self.PoweredFreqCombo, self.cb_freq, self.freq_name) self._initCB(self.BatteryFreqCombo, self.cb_freq, self.freq_name) @@ -488,6 +502,16 @@ self.powermanager.setCpuPolicy('powersave') self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['powersave'])) + def setCpuPolicyConservative(self): + """Change frequ for all cpu""" + self.powermanager.setCpuPolicy('conservative') + self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['conservative'])) + + def setCpuPolicyOndemand(self): + """Change frequ for all cpu""" + self.powermanager.setCpuPolicy('ondemand') + self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['ondemand'])) + def trySuspend(self): """ If supported, lock the screen and initiate a suspend to RAM (S3). """ if self.canSuspend: Only in kde-guidance-0.8.0/powermanager: guidance-power-manager.py~ diff -ru kde-guidance-0.8.0-o/powermanager/powermanage.py kde-guidance-0.8.0/powermanager/powermanage.py --- kde-guidance-0.8.0-o/powermanager/powermanage.py 2007-04-10 20:36:05.000000000 +0200 +++ kde-guidance-0.8.0/powermanager/powermanage.py 2007-04-10 20:33:38.000000000 +0200 @@ -316,6 +316,8 @@ self.cpu_policy['dynamic'] = [] self.cpu_policy['powersave'] = [] self.cpu_policy['performance'] = [] + self.cpu_policy['ondemand'] = [] + self.cpu_policy['conservative'] = [] try: comp_obj = self.bus.get_object('org.freedesktop.Hal', '/org/freedesktop/Hal/devices/computer') @@ -326,7 +328,9 @@ self.hasCpuFreq = True if 'ondemand' in self.governor_available: - self.cpu_policy['dynamic'].append('ondemand') + self.cpu_policy['ondemand'].append('ondemand') + if 'conservative' in self.governor_available: + self.cpu_policy['conservative'].append('conservative') if 'userspace' in self.governor_available: self.cpu_policy['dynamic'].append('userspace') if 'powersave' in self.governor_available: