X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=fd09327e4a23f1e9f6aab491a39bdf3f62097298;hb=2db63c56d4be9865eebd85535f13c2bd379c8e25;hp=8ea4a2416a492fd35f3e13bbe551bd50f99d794b;hpb=e298ebf8d53811d331770526b8c3625e881f7ca5;p=qcpufreq diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8ea4a24..fd09327 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -28,13 +28,12 @@ #endif #define APPNAME "QCPUFreq" -#define APPVERSION "0.3.4" +#define APPVERSION "0.4.1" + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), - //do not allow overclocking per default - allowOverclocking(false), //create helper process helperProcess( this ), //create a new, stackable help window @@ -42,11 +41,7 @@ MainWindow::MainWindow(QWidget *parent) : //create UI refresh timer refreshTimer( this ), //create a QGraphicsScene for the little chip icon - scene( this ), - //the settings widget - settings(this), - //show errors about the sudo setup only once - showSudoError( true ) + scene( this ) { //this is a stacked window on Maemo 5 #if defined(Q_WS_MAEMO_5) @@ -55,11 +50,14 @@ MainWindow::MainWindow(QWidget *parent) : ui->setupUi(this); + //Settings widget + settings = new Settings; + settings->hide(); + init(); - refresh(); - // setup auto rotation - setAutoRotation(); + //applies the settings from the settings dialog + applySettings(); //initialize orientation orientationChanged(); @@ -73,8 +71,8 @@ MainWindow::MainWindow(QWidget *parent) : #endif helpWindow.setWindowFlags( windowFlags() | Qt::Window ); - //Settings widget - settings.hide(); + //show errors about the sudo setup only once + showSudoError = true; //connect signals and slots connect(ui->actionHelp, SIGNAL(triggered()), this, SLOT(showHelp())); @@ -83,19 +81,16 @@ MainWindow::MainWindow(QWidget *parent) : connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(orientationChanged())); connect(ui->sr_box, SIGNAL(clicked()), this, SLOT(setSmartReflex())); connect(&refreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); - connect(ui->actionOverclocking, SIGNAL(toggled(bool)), this, SLOT(setOverclocking())); + connect(ui->actionSave, SIGNAL(triggered()), this, SLOT(save())); + connect(ui->actionLoad, SIGNAL(triggered()), this, SLOT(loadPreset())); connect(ui->actionSettings, SIGNAL(triggered()), this, SLOT(showSettings())); - - - //disable overclocking button on vanilla kernels - if (!powerKernel) { - ui->actionOverclocking->setDisabled(true); - } + connect(settings, SIGNAL(settingsChanged()), this, SLOT(applySettings())); } MainWindow::~MainWindow() { + delete settings; delete ui; } @@ -132,13 +127,19 @@ void MainWindow::adjustFreq() //check for overclocking #if defined(Q_WS_MAEMO_5) - if (this->allowOverclocking == false && newmax > 600000) { - QMaemo5InformationBox::information(this, tr( "You need to enable overclocking in QCPUFreq's menu for setting frequencies above 600MHz!"), 0); + if (!settings->useOverclocking() && newmax > 600000) { + QMaemo5InformationBox::information(this, tr( "You need to enable overclocking in QCPUFreq's settings in order to set frequencies above 600MHz!"), 0); refresh(); return; } #endif + //check for 599MHz <-> 600MHz problem on power kernels + if (max == "600000" && settings->usePowerKernel()) { + //we really need to set the maximum to 599MHz + max = "599000"; + } + callHelper( "set_maxfreq", max ); refresh(); @@ -146,6 +147,19 @@ void MainWindow::adjustFreq() /** + * SLOT: applies the settings from the Settings dialog. + */ +void MainWindow::applySettings() +{ + setAutoRotation(); + setAdvancedTemperature(); + + //refresh the GUI after applying the settings + refresh(); +} + + +/** * Calls the QCPUFreq helper script with "sudo action param" * * @param action : the action of the helper script @@ -168,7 +182,7 @@ int MainWindow::callHelper(QString action, QString param) helperProcess.start( "sudo", arguments, QIODevice::NotOpen ); - if ( showSudoError && !helperProcess.waitForFinished( 400 )) { + if ( showSudoError && !helperProcess.waitForFinished( 2000 )) { //do not show this error again showSudoError = false; QMessageBox::critical(this, tr("QCPUFreq"), tr("There seems to be a problem with your sudo setup!")); @@ -311,7 +325,6 @@ int MainWindow::getSmartReflexState() * - scalingSteps * - scalingFrequencies * - minFreq - * - powerKernel */ void MainWindow::init() { @@ -345,16 +358,38 @@ void MainWindow::init() this->minFreq = min.toInt(); } - //check if we are using a power kernel - if ( getScalingFreq(getScalingSteps()) > 600000 ) { - this->powerKernel = true; - } else { - this->powerKernel = false; + //enable save and load option on power kernels + if (settings->usePowerKernel()) { + //only enable save if /usr/sbin/kernel-config is present + file.close(); + file.setFileName("/usr/sbin/kernel-config"); + if (file.exists()) { + ui->actionSave->setEnabled(true); + ui->actionLoad->setEnabled(true); + } } } /** + * Loads a voltage preset by calling kernel-config. + * + * Available presets are: + * - default + * - ideal + * - lv + * - ulv + * - xlv + * - starving + * - custom -> any preset named "custom" + */ +void MainWindow::loadPreset() +{ + return; +} + + +/** * Reads any file in /sys/ * * \param sys_file : full path to sys file - omit "/sys/" @@ -416,8 +451,6 @@ void MainWindow::refresh() ui->freq_adjust->setMinimum( 1 ); ui->freq_adjust->setMaximum( getScalingSteps() ); ui->freq_adjust->setSliderPosition( getScalingStep(getMaxFreq()) ); - - //ui->retranslateUi(this); } @@ -451,33 +484,43 @@ void MainWindow::orientationChanged() /** - * Enables or disables the auto-rotation feature of Maemo5 devices. + * Saves the current maximim frequency as default (only on power kernel). */ -void MainWindow::setAutoRotation() +void MainWindow::save() { -#if defined(Q_WS_MAEMO_5) - setAttribute(Qt::WA_Maemo5AutoOrientation, settings.useAutoRotate()); -#endif + if (settings->usePowerKernel()) { + callHelper( "save", "null" ); + #if defined(Q_WS_MAEMO_5) + QMaemo5InformationBox::information(this, tr( "The current frequency settings have been saved as default." ), QMaemo5InformationBox::DefaultTimeout); + #endif + } } /** - * SLOT: enable/disable overclocking. + * Checks the settings if the "bq27x00_battery" needs to be loaded. */ -void MainWindow::setOverclocking() +void MainWindow::setAdvancedTemperature() { - if (ui->actionOverclocking->isChecked()) { - #if defined(Q_WS_MAEMO_5) - QMaemo5InformationBox::information(this, tr( "Please note that overclocking voids your warranty and may break your device! Be careful!"), 0); - #endif - this->allowOverclocking = true; - } else { - this->allowOverclocking = false; + if (settings->usePowerKernel() && settings->useAdvancedTemperature()) { + callHelper( "load_bq27", "null" ); } } /** + * Enables or disables the auto-rotation feature of Maemo5 devices. + */ +void MainWindow::setAutoRotation() +{ +#if defined(Q_WS_MAEMO_5) + setAttribute(Qt::WA_Maemo5AutoOrientation, settings->useAutoRotate()); + settings->setAttribute(Qt::WA_Maemo5AutoOrientation, settings->useAutoRotate()); +#endif +} + + +/** * SLOT: Enables or disables Smart Reflex(tm) after pressing sr_btn */ void MainWindow::setSmartReflex() @@ -511,8 +554,8 @@ void MainWindow::showHelp() */ void MainWindow::showSettings() { - settings.reset(); - settings.show(); + settings->reset(); + settings->show(); }