X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=3034c12bc3cbf946ab26548232dbba6c587eaa6b;hb=dad999f7191efdcc24f727f2e0e649a9f242a4f9;hp=8ea4a2416a492fd35f3e13bbe551bd50f99d794b;hpb=e298ebf8d53811d331770526b8c3625e881f7ca5;p=qcpufreq diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8ea4a24..3034c12 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -28,13 +28,10 @@ #endif #define APPNAME "QCPUFreq" -#define APPVERSION "0.3.4" +#define APPVERSION "0.3.99" 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 @@ -83,15 +80,8 @@ 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->actionSettings, SIGNAL(triggered()), this, SLOT(showSettings())); - - //disable overclocking button on vanilla kernels - if (!powerKernel) { - ui->actionOverclocking->setDisabled(true); - } - } MainWindow::~MainWindow() @@ -132,8 +122,8 @@ 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; } @@ -311,7 +301,6 @@ int MainWindow::getSmartReflexState() * - scalingSteps * - scalingFrequencies * - minFreq - * - powerKernel */ void MainWindow::init() { @@ -344,13 +333,6 @@ void MainWindow::init() } else { this->minFreq = min.toInt(); } - - //check if we are using a power kernel - if ( getScalingFreq(getScalingSteps()) > 600000 ) { - this->powerKernel = true; - } else { - this->powerKernel = false; - } } @@ -416,8 +398,6 @@ void MainWindow::refresh() ui->freq_adjust->setMinimum( 1 ); ui->freq_adjust->setMaximum( getScalingSteps() ); ui->freq_adjust->setSliderPosition( getScalingStep(getMaxFreq()) ); - - //ui->retranslateUi(this); } @@ -462,22 +442,6 @@ void MainWindow::setAutoRotation() /** - * SLOT: enable/disable overclocking. - */ -void MainWindow::setOverclocking() -{ - 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; - } -} - - -/** * SLOT: Enables or disables Smart Reflex(tm) after pressing sr_btn */ void MainWindow::setSmartReflex()