diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp index 0b62782..28878ed 100644 --- a/src/gmenu2x.cpp +++ b/src/gmenu2x.cpp @@ -1269,7 +1269,6 @@ void GMenu2X::explorer() { void GMenu2X::options() { int curMenuClock = confInt["menuClock"]; - //G int oldBacklight = getBackLight(); int newBacklight = oldBacklight; bool showRootFolder = fileExists(CARD_ROOT); @@ -1292,14 +1291,12 @@ void GMenu2X::options() { sd.addSetting(new MenuSettingInt(this, ts, tr["Clock for GMenu2X"], tr["Set the cpu working frequency when running GMenu2X"], &confInt["menuClock"], cpuFreqMin, cpuFreqSafeMax, cpuFreqMultiple)); sd.addSetting(new MenuSettingInt(this, ts, tr["Maximum overclock"], tr["Set the maximum overclock for launching links"], &confInt["maxClock"], cpuFreqMin, cpuFreqMax, cpuFreqMultiple)); sd.addSetting(new MenuSettingBool(this, ts, tr["Output logs"], tr["Logs the output of the links. Use the Log Viewer to read them."], &confInt["outputLogs"])); - //G sd.addSetting(new MenuSettingInt(this, ts, tr["Lcd Backlight"], tr["Set Lcd Backlight value (default: 100)"], &newBacklight, 5, 100)); sd.addSetting(new MenuSettingInt(this, ts, tr["Screen Timeout"], tr["Set screen's backlight timeout in seconds"], &confInt["backlightTimeout"], 0, 120)); // sd.addSetting(new MenuSettingMultiString(this, ts, tr["Tv-Out encoding"], tr["Encoding of the tv-out signal"], &confStr["tvoutEncoding"], &encodings)); sd.addSetting(new MenuSettingBool(this, ts, tr["Show root"], tr["Show root folder in the file selection dialogs"], &showRootFolder)); if (sd.exec() && sd.edited()) { - //G if (newBacklight != oldBacklight) setBacklight(newBacklight); if (curMenuClock != confInt["menuClock"]) setClock(confInt["menuClock"]); @@ -1685,8 +1682,6 @@ void GMenu2X::editLink() { string linkSelScreens = menu->selLinkApp()->getSelectorScreens(); string linkSelAliases = menu->selLinkApp()->getAliasFile(); int linkClock = menu->selLinkApp()->clock(); - //G - //int linkGamma = menu->selLinkApp()->gamma(); string diagTitle = tr.translate("Edit link: $1",linkTitle.c_str(),NULL); string diagIcon = menu->selLinkApp()->getIconPath(); @@ -1705,7 +1700,6 @@ void GMenu2X::editLink() { sd.addSetting(new MenuSettingString(this, ts, tr["Selector Filter"], tr["Selector filter (Separate values with a comma)"], &linkSelFilter, diagTitle, diagIcon)); sd.addSetting(new MenuSettingDir(this, ts, tr["Selector Screenshots"], tr["Directory of the screenshots for the selector"], &linkSelScreens)); sd.addSetting(new MenuSettingFile(this, ts, tr["Selector Aliases"], tr["File containing a list of aliases for the selector"], &linkSelAliases)); - //G sd.addSetting(new MenuSettingBool(this, ts, tr["Wrapper"], tr["Explicitly relaunch GMenu2X after execution"], &menu->selLinkApp()->needsWrapperRef())); sd.addSetting(new MenuSettingBool(this, ts, tr["Don't Leave"], tr["Don't quit GMenu2X when launching this link"], &menu->selLinkApp()->runsInBackgroundRef())); diff --git a/src/linkapp.cpp b/src/linkapp.cpp index ebd32ac..dc19972 100644 --- a/src/linkapp.cpp +++ b/src/linkapp.cpp @@ -48,8 +48,6 @@ LinkApp::LinkApp(GMenu2X *gmenu2x_, Touchscreen &ts, InputManager &inputMgr_, wrapper = false; dontleave = false; setClock(336); - //G - //setGamma(0); selectordir = ""; selectorfilter = ""; icon = iconPath = ""; @@ -84,9 +82,6 @@ LinkApp::LinkApp(GMenu2X *gmenu2x_, Touchscreen &ts, InputManager &inputMgr_, if (value=="true") dontleave = true; } else if (name == "clock") { setClock( atoi(value.c_str()) ); - //G - } else if (name == "gamma") { - setGamma( atoi(value.c_str()) ); } else if (name == "selectordir") { setSelectorDir( value ); } else if (name == "selectorbrowser") { @@ -150,26 +145,6 @@ void LinkApp::setClock(int mhz) { edited = true; } -//G -int LinkApp::gamma() { - return igamma; -} - -const string &LinkApp::gammaStr() { - return sgamma; -} - -void LinkApp::setGamma(int gamma) { - igamma = constrain(gamma,0,100); - stringstream ss; - sgamma = ""; - ss << igamma; - ss >> sgamma; - - edited = true; -} -// /G - bool LinkApp::targetExists() { return fileExists(exec); @@ -188,8 +163,6 @@ bool LinkApp::save() { if (manual!="" ) f << "manual=" << manual << endl; if (iclock!=0 ) f << "clock=" << iclock << endl; if (useRamTimings ) f << "useramtimings=true" << endl; - //G - if (igamma!=0 ) f << "gamma=" << igamma << endl; if (selectordir!="" ) f << "selectordir=" << selectordir << endl; if (selectorbrowser ) f << "selectorbrowser=true" << endl; if (selectorfilter!="" ) f << "selectorfilter=" << selectorfilter << endl; @@ -444,8 +417,6 @@ void LinkApp::launch(const string &selectedFile, const string &selectedDir) { gmenu2x->setClock(clock()); } gmenu2x->quit(); - //if (gamma()!=0 && gamma()!=gmenu2x->confInt["gamma"]) - // gmenu2x->setGamma(gamma()); /* Make the terminal we're connected to (via stdin/stdout) our controlling terminal again. Else many console programs are diff --git a/src/linkapp.h b/src/linkapp.h index ae4956b..f9ab734 100644 --- a/src/linkapp.h +++ b/src/linkapp.h @@ -39,10 +39,6 @@ private: InputManager &inputMgr; std::string sclock; int iclock; - //G - std::string sgamma; - //G - int igamma; std::string exec, params, workdir, manual, selectordir, selectorfilter, selectorscreens; bool selectorbrowser, useRamTimings; void drawRun(); @@ -81,11 +77,6 @@ public: const std::string &clockStr(int maxClock); void setClock(int mhz); -//G - int gamma(); - const std::string &gammaStr(); - void setGamma(int gamma); - bool save(); void run(); void showManual();