X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=6fc41dcc51d8aeeeb00ea672b6e8ed197671ff0b;hb=8d544a68320b5ca6fcdfa5f1e548e4a3b1e10310;hp=3c3b98a8123050bcac12eca5a9f1dfce743cb33e;hpb=95038e862f3295437cd7a7567115690c6d37939c;p=qcpufreq diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 3c3b98a..6fc41dc 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -28,7 +28,7 @@ #endif #define APPNAME "QCPUFreq" -#define APPVERSION "0.3.3" +#define APPVERSION "0.3.4" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -39,12 +39,12 @@ MainWindow::MainWindow(QWidget *parent) : helperProcess( this ), //create a new, stackable help window helpWindow( this ), - //set minFreq to 0 - minFreq(0), //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 ) { @@ -55,6 +55,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->setupUi(this); + init(); refresh(); // enable auto rotation @@ -72,6 +73,8 @@ MainWindow::MainWindow(QWidget *parent) : #endif helpWindow.setWindowFlags( windowFlags() | Qt::Window ); + settings.hide(); + //connect signals and slots connect(ui->actionHelp, SIGNAL(triggered()), this, SLOT(showHelp())); connect( ui->actionAbout, SIGNAL(triggered()), this, SLOT(about()) ); @@ -80,9 +83,11 @@ MainWindow::MainWindow(QWidget *parent) : 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->actionSettings, SIGNAL(triggered()), this, SLOT(showSettings())); + //disable overclocking button on vanilla kernels - if ( getScalingFreq(0) <= 600000 ) { + if (!powerKernel) { ui->actionOverclocking->setDisabled(true); } @@ -110,6 +115,12 @@ void MainWindow::about() void MainWindow::adjustFreq() { int newmax = getScalingFreq( ui->freq_adjust->sliderPosition() ); + + if (newmax == getMaxFreq() ) { + //we do not need to change anything in this case + return; + } + QString max; //maxfreq should not be smaller than minfreq, because we do not want to decrease minfreq @@ -215,32 +226,7 @@ int MainWindow::getMaxFreq() */ int MainWindow::getMinFreq() { - if (this->minFreq == 0) { - 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>0; --i) { - if (!avoidList.contains(min.setNum( getScalingFreq(i) ))) { - this->minFreq = min.toInt(); - return this->minFreq; - } - } - - //should not happen at all - this->minFreq = 125000; - return this->minFreq; - } else { - this->minFreq = min.toInt(); - return this->minFreq; - } - } else { - return this->minFreq; - } + return this->minFreq; } @@ -249,16 +235,13 @@ int MainWindow::getMinFreq() */ int MainWindow::getScalingFreq(int step) { - QString tmp = readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies" ); - QStringList freqs = tmp.split( " " ); step = step - 1; if ( step < 0 ) step = 0; - if ( step > getScalingSteps() ) - step = getScalingSteps(); + if ( step > getScalingSteps() - 1 ) + step = getScalingSteps() - 1; - tmp = freqs[ step ]; - return tmp.toInt(); + return this->scalingFrequencies[ step ].toInt(); } @@ -280,9 +263,7 @@ QString MainWindow::getScalingGovernor() */ int MainWindow::getScalingSteps() { - QString tmp = readSysFile( "devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies" ); - QStringList freqs = tmp.split( " " ); - return (freqs.size() - 1); + return this->scalingSteps; } @@ -293,12 +274,9 @@ int MainWindow::getScalingSteps() */ int MainWindow::getScalingStep( int freq ) { - for( int i = 1; i <= getScalingSteps(); ++i ) { - if ( getScalingFreq(i) == freq ) - return i; - } - - return 1; + QString tmp; + tmp.setNum(freq); + return this->scalingFrequencies.indexOf(tmp) + 1; } @@ -328,6 +306,54 @@ int MainWindow::getSmartReflexState() /** + * Initializes internal variables, such as: + * - scalingSteps + * - scalingFrequencies + * - minFreq + * - powerKernel + */ +void MainWindow::init() +{ + 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; + } +} + + +/** * Reads any file in /sys/ * * \param sys_file : full path to sys file - omit "/sys/" @@ -388,7 +414,6 @@ void MainWindow::refresh() //display frequency slider ui->freq_adjust->setMinimum( 1 ); ui->freq_adjust->setMaximum( getScalingSteps() ); - ui->freq_adjust->setInvertedAppearance( true ); ui->freq_adjust->setSliderPosition( getScalingStep(getMaxFreq()) ); //ui->retranslateUi(this); @@ -461,7 +486,7 @@ void MainWindow::setSmartReflex() if ( getSmartReflexState() == 1 ) callHelper( "set_sr", "off"); else { - QMaemo5InformationBox::information(this, tr( "SmartReflex support is known to be unstable on some devices and may cause random reboots." )); + QMaemo5InformationBox::information(this, tr( "SmartReflex support is known to be unstable on some devices and may cause random reboots." ), 0); callHelper( "set_sr", "on"); } @@ -481,6 +506,16 @@ void MainWindow::showHelp() /** + * SLOT: displays the settings widget + */ +void MainWindow::showSettings() +{ + settings.setWindowFlags(Qt::Popup); + settings.show(); +} + + +/** * Returns true when the device is in portrait mode */ bool MainWindow::usePortrait()