X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmainwindow.cpp;h=cb396ca09ab4e63df6aff0f43d2d8f088968732f;hb=HEAD;hp=6fc41dcc51d8aeeeb00ea672b6e8ed197671ff0b;hpb=8d544a68320b5ca6fcdfa5f1e548e4a3b1e10310;p=qcpufreq diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 6fc41dc..cb396ca 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1,6 +1,6 @@ /* * QCPUFreq - a simple cpufreq GUI - * Copyright (C) 2010 Daniel Klaffenbach + * Copyright (C) 2010-11 Daniel Klaffenbach * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,13 +28,12 @@ #endif #define APPNAME "QCPUFreq" -#define APPVERSION "0.3.4" +#define APPVERSION "0.4.4" + 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,28 @@ MainWindow::MainWindow(QWidget *parent) : ui->setupUi(this); - init(); - refresh(); + //Settings widget + settings = new Settings; + settings->hide(); - // enable auto rotation - setAutoRotation(); + //load preset dialog + loadPresetDialog = new LoadPreset; + loadPresetDialog->hide(); + + //enable save and load option on power kernels + if (settings->usePowerKernel() && settings->isKernelConfigInstalled()) { + ui->actionSave->setEnabled(true); + //loading presets may cause overclocking - only enable it if overclokcing is enabled + if (settings->useOverclocking()) { + ui->actionLoad->setEnabled(true); + } + } + + //display the correct minimum frequency + calculateMinFreq(); + + //applies the settings from the settings dialog + applySettings(); //initialize orientation orientationChanged(); @@ -73,28 +85,29 @@ MainWindow::MainWindow(QWidget *parent) : #endif helpWindow.setWindowFlags( windowFlags() | Qt::Window ); - settings.hide(); + //show errors about the sudo setup only once + showSudoError = true; //connect signals and slots connect(ui->actionHelp, SIGNAL(triggered()), this, SLOT(showHelp())); connect( ui->actionAbout, SIGNAL(triggered()), this, SLOT(about()) ); - connect( ui->freq_adjust, SIGNAL(valueChanged(int)), this, SLOT(adjustFreq()) ); + connect( ui->freq_adjust, SIGNAL(sliderReleased()), this, SLOT(adjustFreq()) ); + connect(ui->freq_adjust, SIGNAL(valueChanged(int)), this, SLOT(showTemporaryMaxFreq())); 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()), loadPresetDialog, SLOT(show())); 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())); + connect(loadPresetDialog, SIGNAL(load(QString)), this, SLOT(loadPreset(QString))); } MainWindow::~MainWindow() { + delete loadPresetDialog; + delete settings; delete ui; } @@ -104,7 +117,7 @@ MainWindow::~MainWindow() */ void MainWindow::about() { - QMessageBox::about(this, APPNAME " " APPVERSION, "

© 2010 Daniel Klaffenbach

" ); + QMessageBox::about(this, APPNAME " " APPVERSION, "

© 2011 Daniel Klaffenbach

" ); refresh(); } @@ -131,20 +144,106 @@ 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"; + } + + if (settings->useConfirmation()) { + QMessageBox box; + #if defined(Q_WS_MAEMO_5) + box.setAttribute(Qt::WA_Maemo5AutoOrientation, settings->useAutoRotate()); + #endif + box.setStandardButtons(QMessageBox::Apply | QMessageBox::Cancel); + box.setDefaultButton(QMessageBox::Apply); + box.setIcon(QMessageBox::Question); + QString verboseMax; + verboseMax.setNum( newmax/1000 ); + box.setText( tr("Do you really want to use %1 MHz as the new maximum frequency?").arg(verboseMax) ); + int ret = box.exec(); + + if (ret != QMessageBox::Apply) { + refresh(); + return; + } + } + callHelper( "set_maxfreq", max ); + refresh(); +} + + +/** + * SLOT: applies the settings from the Settings dialog. + */ +void MainWindow::applySettings() +{ + setAutoRotation(); + setAdvancedTemperature(); + + //if overclocking is/was enabled we can also enable the "Load preset" option + if (settings->useOverclocking() && settings->usePowerKernel() && settings->isKernelConfigInstalled()) { + ui->actionLoad->setEnabled(true); + } else { + ui->actionLoad->setEnabled(false); + } + + //refresh the GUI after applying the settings refresh(); } /** + * Calculates the minimum frequency according to scaling_min_freq and avoid_frequencies. + * + * Since this is a somewhat complex calculation it sould only be performed when it is + * really necessary (on startup, after loading presets, etc.). + */ +void MainWindow::calculateMinFreq() +{ + this->minFreq = 0; + QString freqs = readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies" ); + QStringList freqList = freqs.split( " " ); + //change the order of the QStringList - last element becomes first + for (int i=freqList.size() - 1; i>=0; --i) { + if (freqList.at(i) != "") + this->scalingFrequencies << freqList.at(i); + } + this->scalingSteps = (this->scalingFrequencies.size()); + + //set minFreq and check avoid_frequencies + QString min = readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_min_freq" ); + //check if avoid file exists (only on power kernel) + QFile file( "/sys/devices/system/cpu/cpu0/cpufreq/ondemand/avoid_frequencies" ); + if (file.exists()) { + QString avoid = readSysFile( "devices/system/cpu/cpu0/cpufreq/ondemand/avoid_frequencies" ); + QStringList avoidList = avoid.split( " " ); + + //check if min is in avoid_frequencies + for (int i = getScalingStep( min.toInt() ); i <= this->scalingSteps; ++i) { + min.setNum( getScalingFreq(i) ); + if (!avoidList.contains(min)) { + this->minFreq = min.toInt(); + break; + } + } + } else { + this->minFreq = min.toInt(); + } + file.close(); +} + + +/** * Calls the QCPUFreq helper script with "sudo action param" * * @param action : the action of the helper script @@ -167,7 +266,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!")); @@ -184,11 +283,15 @@ QString MainWindow::getCPUTemp() { #if defined(Q_WS_MAEMO_5) QFile file( "/sys/class/power_supply/bq27200-0/temp" ); + //! The string containing the value of the temperature + QString tstring; //check if we can read a more accurate temperature (only for power kernel) - if (file.exists()) - return QString( readSysFile( "class/power_supply/bq27200-0/temp" ) + " " + QString::fromUtf8("\302\260") + "C" ); - else { + if (file.exists()) { + //this only works on kernel-power > 46 + tstring = readSysFile( "class/power_supply/bq27200-0/temp" ); + return tstring.left(tstring.length()-1) + " " + QString::fromUtf8("\302\260") + "C"; + } else { /* We actually only need to read the raw temperature, but it appears that by also reading temp1_input the raw temperature (temp1_input_raw) is being updated more frequently. @@ -196,7 +299,7 @@ QString MainWindow::getCPUTemp() readSysFile( "devices/platform/omap34xx_temp/temp1_input" ); //read the current system temperature - QString tstring = readSysFile( "devices/platform/omap34xx_temp/temp1_input_raw" ); + tstring = readSysFile( "devices/platform/omap34xx_temp/temp1_input_raw" ); if (tstring == "0") return tr( "Unknown" ); @@ -306,50 +409,24 @@ int MainWindow::getSmartReflexState() /** - * Initializes internal variables, such as: - * - scalingSteps - * - scalingFrequencies - * - minFreq - * - powerKernel + * Loads a voltage preset by calling kernel-config. + * + * Available presets are: + * - default + * - ideal + * - lv + * - ulv + * - xlv + * - custom -> any preset named "custom" */ -void MainWindow::init() +void MainWindow::loadPreset(QString presetName) { - this->minFreq = 0; - QString freqs = readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies" ); - QStringList freqList = freqs.split( " " ); - //change the order of the QStringList - last element becomes first - for (int i=freqList.size() - 1; i>=0; --i) { - if (freqList.at(i) != "") - this->scalingFrequencies << freqList.at(i); - } - this->scalingSteps = (this->scalingFrequencies.size()); - - //set minFreq and check avoid_frequencies - QString min = readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_min_freq" ); - //check if avoid file exists (only on power kernel) - QFile file( "/sys/devices/system/cpu/cpu0/cpufreq/ondemand/avoid_frequencies" ); - if (file.exists()) { - QString avoid = readSysFile( "devices/system/cpu/cpu0/cpufreq/ondemand/avoid_frequencies" ); - QStringList avoidList = avoid.split( " " ); - - //check if min is in avoid_frequencies - for (int i = getScalingStep( min.toInt() ); i <= this->scalingSteps; ++i) { - min.setNum( getScalingFreq(i) ); - if (!avoidList.contains(min)) { - this->minFreq = min.toInt(); - break; - } - } - } else { - this->minFreq = min.toInt(); - } - - //check if we are using a power kernel - if ( getScalingFreq(getScalingSteps()) > 600000 ) { - this->powerKernel = true; - } else { - this->powerKernel = false; - } + #if defined(Q_WS_MAEMO_5) + callHelper("loadpreset", presetName); + calculateMinFreq(); + QMaemo5InformationBox::information(this, tr( "The preset was loaded." ), QMaemo5InformationBox::DefaultTimeout); + refresh(); + #endif } @@ -415,8 +492,6 @@ void MainWindow::refresh() ui->freq_adjust->setMinimum( 1 ); ui->freq_adjust->setMaximum( getScalingSteps() ); ui->freq_adjust->setSliderPosition( getScalingStep(getMaxFreq()) ); - - //ui->retranslateUi(this); } @@ -450,33 +525,44 @@ void MainWindow::orientationChanged() /** - * Enables 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, true); -#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()); + loadPresetDialog->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() @@ -510,8 +596,24 @@ void MainWindow::showHelp() */ void MainWindow::showSettings() { - settings.setWindowFlags(Qt::Popup); - settings.show(); + settings->reset(); + settings->show(); +} + + +/** + * SLOT: This temporarily updates the maximum frequency while using the + * maxFreq slider. + */ +void MainWindow::showTemporaryMaxFreq() +{ + //calulate frequency from slider position + int newmax = getScalingFreq( ui->freq_adjust->sliderPosition() ) / 1000; + //convert it to a string and display it in the UI + QString display; + display.setNum( newmax ); + display.append( " MHz" ); + ui->freq_max->setText( display ); }