TDE
/
tdepowersave
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix unintended renaming

Browse Source
pull/1/head
Darrell Anderson 11 years ago
parent c68a1bac04
commit 5e76e296ce
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

12
src/configuredialog.cpp
Unescape View File

@ -1806,13 +1806,13 @@ TQString ConfigureDialog::mapActionToDescription( TQString action ) {
} else if (action.startsWith("FREEZE")) {
if (actions.contains("Freeze"))
ret = i18n("Freeze");
} else if (action.startsWith("CPUFRETQ_POWERSAVE")) {
} else if (action.startsWith("CPUFREQ_POWERSAVE")) {
if (hwinfo->supportCPUFreq())
ret = i18n("CPU Powersave policy");
} else if (action.startsWith("CPUFRETQ_DYNAMIC")) {
} else if (action.startsWith("CPUFREQ_DYNAMIC")) {
if (hwinfo->supportCPUFreq())
ret = i18n("CPU Dynamic policy");
} else if (action.startsWith("CPUFRETQ_PERFORMANCE")) {
} else if (action.startsWith("CPUFREQ_PERFORMANCE")) {
if (hwinfo->supportCPUFreq())
ret = i18n("CPU Performance policy");
} else if (action.startsWith("BRIGHTNESS")) {
@ -1850,13 +1850,13 @@ TQString ConfigureDialog::mapDescriptionToAction( TQString description ) {
ret = "FREEZE";
} else if (description.startsWith("CPU Powersave policy") ||
description.startsWith(i18n("CPU Powersave policy"))) {
ret = "CPUFRETQ_POWERSAVE";
ret = "CPUFREQ_POWERSAVE";
} else if (description.startsWith("CPU Dynamic policy") ||
description.startsWith(i18n("CPU Dynamic policy"))) {
ret = "CPUFRETQ_DYNAMIC";
ret = "CPUFREQ_DYNAMIC";
} else if (description.startsWith("CPU Performance policy") ||
description.startsWith(i18n("CPU Performance policy"))) {
ret = "CPUFRETQ_PERFORMANCE";
ret = "CPUFREQ_PERFORMANCE";
} else if (description.startsWith("Set Brightness to") ||
description.startsWith(i18n("Set Brightness to"))) {
ret = "BRIGHTNESS";

12
src/settings.cpp
Unescape View File

@ -331,12 +331,12 @@ action Settings::mapActionToType (TQString _action) {
return GO_SUSPEND2RAM;
} else if (_action.startsWith("FREEZE")) {
return GO_FREEZE;
} else if (_action.startsWith("CPUFRETQ_POWERSAVE")) {
return CPUFRETQ_POWERSAVE;
} else if (_action.startsWith("CPUFRETQ_DYNAMIC")) {
return CPUFRETQ_DYNAMIC;
} else if (_action.startsWith("CPUFRETQ_PERFORMANCE")) {
return CPUFRETQ_PERFORMANCE;
} else if (_action.startsWith("CPUFREQ_POWERSAVE")) {
return CPUFREQ_POWERSAVE;
} else if (_action.startsWith("CPUFREQ_DYNAMIC")) {
return CPUFREQ_DYNAMIC;
} else if (_action.startsWith("CPUFREQ_PERFORMANCE")) {
return CPUFREQ_PERFORMANCE;
} else if (_action.startsWith("BRIGHTNESS")) {
return BRIGHTNESS;
} else {

6
src/settings.h
Unescape View File

@ -45,9 +45,9 @@ enum action{
GO_FREEZE,
SWITCH_SCHEME,
BRIGHTNESS,
CPUFRETQ_POWERSAVE,
CPUFRETQ_DYNAMIC,
CPUFRETQ_PERFORMANCE
CPUFREQ_POWERSAVE,
CPUFREQ_DYNAMIC,
CPUFREQ_PERFORMANCE
};
/*!

26
src/tdepowersave.cpp
Unescape View File

@ -204,9 +204,9 @@ void tdepowersave::initMenu() {
speed_menu->insertItem(i18n("Dynamic"), DYNAMIC);
speed_menu->insertItem(i18n("Powersave"), POWERSAVE);
CPUFRETQ_SEPARATOR_MENU_ID = contextMenu()->insertSeparator();
CPUFREQ_SEPARATOR_MENU_ID = contextMenu()->insertSeparator();
CPUFRETQ_MENU_ID = contextMenu()->insertItem(i18n("Set CPU Frequency Policy"), speed_menu);
CPUFREQ_MENU_ID = contextMenu()->insertItem(i18n("Set CPU Frequency Policy"), speed_menu);
connect(speed_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(do_setSpeedPolicy(int)));
connect(hwinfo, TQT_SIGNAL(currentCPUFreqPolicyChanged()), this, TQT_SLOT(updateCPUFreqMenu()));
@ -1394,7 +1394,7 @@ void tdepowersave::_quit (){
}
/*!
* \b TQT_SLOT called if the user select a 'CPU Frequency Policy' from the menu ( \ref CPUFRETQ_MENU_ID ).
* \b TQT_SLOT called if the user select a 'CPU Frequency Policy' from the menu ( \ref CPUFREQ_MENU_ID ).
*/
void tdepowersave::do_setSpeedPolicy(int menu_id){
if (trace) kdDebug() << funcinfo << "IN: " << "menu_id/set policy to: " << menu_id << endl;
@ -1558,9 +1558,9 @@ void tdepowersave::updateCPUFreqMenu(){
if (hwinfo->supportCPUFreq() && hwinfo->isOnline() && hwinfo->isCpuFreqAllowed()) {
/* set CPU frequency menu entries *********/
/* speed menu has id 3 in context menu */
contextMenu()->setItemVisible(CPUFRETQ_MENU_ID, true);
contextMenu()->setItemEnabled(CPUFRETQ_MENU_ID, true);
contextMenu()->setItemVisible(CPUFRETQ_SEPARATOR_MENU_ID, true);
contextMenu()->setItemVisible(CPUFREQ_MENU_ID, true);
contextMenu()->setItemEnabled(CPUFREQ_MENU_ID, true);
contextMenu()->setItemVisible(CPUFREQ_SEPARATOR_MENU_ID, true);
switch (hwinfo->getCurrentCPUFreqPolicy()){
case PERFORMANCE:
@ -1584,13 +1584,13 @@ void tdepowersave::updateCPUFreqMenu(){
if (!speed_menu) {
return ;
} else if (hwinfo->supportCPUFreq() && (hwinfo->isCpuFreqAllowed() != 1)) {
contextMenu()->setItemEnabled(CPUFRETQ_MENU_ID, false);
contextMenu()->setItemVisible(CPUFRETQ_SEPARATOR_MENU_ID, true);
contextMenu()->setItemEnabled(CPUFREQ_MENU_ID, false);
contextMenu()->setItemVisible(CPUFREQ_SEPARATOR_MENU_ID, true);
} else{
/* there were CPU freq policies, but they are not accessible any more */
/* delete speed_menu */
contextMenu()->setItemVisible(CPUFRETQ_MENU_ID, false);
contextMenu()->setItemVisible(CPUFRETQ_SEPARATOR_MENU_ID, false);
contextMenu()->setItemVisible(CPUFREQ_MENU_ID, false);
contextMenu()->setItemVisible(CPUFREQ_SEPARATOR_MENU_ID, false);
}
}
@ -2151,13 +2151,13 @@ void tdepowersave::handleActionCall ( action action, int value , bool checkAC, b
case BRIGHTNESS:
hwinfo->setBrightness( -1, value );
break;
case CPUFRETQ_POWERSAVE:
case CPUFREQ_POWERSAVE:
hwinfo->setCPUFreq( POWERSAVE );
break;
case CPUFRETQ_DYNAMIC:
case CPUFREQ_DYNAMIC:
hwinfo->setCPUFreq( DYNAMIC, settings->cpuFreqDynamicPerformance );
break;
case CPUFRETQ_PERFORMANCE:
case CPUFREQ_PERFORMANCE:
hwinfo->setCPUFreq( PERFORMANCE );
break;
case SWITCH_SCHEME: // not supported atm

4
src/tdepowersave.h
Unescape View File

@ -197,10 +197,10 @@ private:
int STANDBY_MENU_ID;
//! a menu seperator ID
/*! contains the ID of the separator between sleep-states-entries and the cpufreq-submenu */
int CPUFRETQ_SEPARATOR_MENU_ID;
int CPUFREQ_SEPARATOR_MENU_ID;
//! a submenu ID
/*! contains the ID of the cpufreq sub menu*/
int CPUFRETQ_MENU_ID;
int CPUFREQ_MENU_ID;
//! a menu seperator ID
/*! contains the ID of the separator between cpufreq- and scheme-submenu*/
int SCHEME_SEPARATOR_MENU_ID;

Write Preview
Loading…
Cancel
Save