X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=cb396ca09ab4e63df6aff0f43d2d8f088968732f;hb=HEAD;hp=cf9f702a3c695f076cdeedf91273a9a0948f5c3c;hpb=8a80270b3742a33d233376f0508749c556f840a0;p=qcpufreq diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index cf9f702..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,7 +28,7 @@ #endif #define APPNAME "QCPUFreq" -#define APPVERSION "0.4.1" +#define APPVERSION "0.4.4" MainWindow::MainWindow(QWidget *parent) : @@ -58,7 +58,17 @@ MainWindow::MainWindow(QWidget *parent) : loadPresetDialog = new LoadPreset; loadPresetDialog->hide(); - init(); + //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(); @@ -81,7 +91,8 @@ MainWindow::MainWindow(QWidget *parent) : //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())); @@ -106,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(); } @@ -146,9 +157,28 @@ void MainWindow::adjustFreq() max = "599000"; } - callHelper( "set_maxfreq", max ); + 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(); + } @@ -173,6 +203,47 @@ void MainWindow::applySettings() /** + * 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 @@ -212,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. @@ -224,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" ); @@ -334,56 +409,6 @@ int MainWindow::getSmartReflexState() /** - * Initializes internal variables, such as: - * - scalingSteps - * - scalingFrequencies - * - minFreq - */ -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(); - } - file.close(); - - //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); - } - } -} - - -/** * Loads a voltage preset by calling kernel-config. * * Available presets are: @@ -398,7 +423,9 @@ void MainWindow::loadPreset(QString presetName) { #if defined(Q_WS_MAEMO_5) callHelper("loadpreset", presetName); + calculateMinFreq(); QMaemo5InformationBox::information(this, tr( "The preset was loaded." ), QMaemo5InformationBox::DefaultTimeout); + refresh(); #endif } @@ -575,6 +602,22 @@ void MainWindow::showSettings() /** + * 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 ); +} + + +/** * Returns true when the device is in portrait mode */ bool MainWindow::usePortrait()