Do not set maxfreq twice

[qcpufreq] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e904561..c9fecb4 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #define APPNAME "QCPUFreq"
-#define APPVERSION "0.3.2"
+#define APPVERSION "0.3.3"
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -81,6 +81,11 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(&refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
     connect(ui->actionOverclocking, SIGNAL(toggled(bool)), this, SLOT(setOverclocking()));
 
+    //disable overclocking button on vanilla kernels
+    if ( getScalingFreq(0) <= 600000 ) {
+        ui->actionOverclocking->setDisabled(true);
+    }
+
 }
 
 MainWindow::~MainWindow()
@@ -105,6 +110,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
@@ -116,7 +127,7 @@ 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 for setting frequencies above 600MHz!"), 0);
+        QMaemo5InformationBox::information(this, tr( "You need to enable overclocking in QCPUFreq's menu for setting frequencies above 600MHz!"), 0);
         refresh();
         return;
     }
@@ -260,7 +271,7 @@ int MainWindow::getScalingFreq(int step)
 /**
   * Returns the name of the current CPU frequency scaling governor
   *
-  * \return    name of governor
+  * @return    QString - name of governor
   */
 QString MainWindow::getScalingGovernor()
 {
@@ -270,6 +281,8 @@ QString MainWindow::getScalingGovernor()
 
 /**
   * Returns the amount of available scaling steps.
+  *
+  * @return int
   */
 int MainWindow::getScalingSteps()
 {
@@ -281,6 +294,8 @@ int MainWindow::getScalingSteps()
 
 /**
   * Returns the scaling step for the specified frequency.
+  *
+  * @return int
   */
 int MainWindow::getScalingStep( int freq )
 {
@@ -304,10 +319,11 @@ int MainWindow::getSmartReflexState()
 #if defined(Q_WS_MAEMO_5)
     QString tmp = readSysFile( "power/sr_vdd1_autocomp" );
 
-    if ( tmp == "1" )
-       return 1;
-    else
-       return 0;
+    if ( tmp == "1" ) {
+        return 1;
+    } else {
+        return 0;
+    }
 #else
     //disable UI checkbox
     ui->sr_box->setDisabled( true );
@@ -370,9 +386,9 @@ void MainWindow::refresh()
 
     //smart reflex button
     if ( getSmartReflexState() == 1 )
-       ui->sr_box->setCheckState( Qt::Checked );
+        ui->sr_box->setCheckState( Qt::Checked );
     else
-       ui->sr_box->setCheckState( Qt::Unchecked );
+        ui->sr_box->setCheckState( Qt::Unchecked );
 
 
     //display frequency slider
@@ -394,22 +410,22 @@ void MainWindow::orientationChanged()
 
     //check whether we are using portrait or landscape mode
     if ( usePortrait() ) {
-       //in portrait mode we want to display the large image
-       image.load( ":/img/chip256" );
-       scene.clear();
-       scene.addPixmap(  image  );
-
-       ui->graphicsPortrait->setScene( &scene );
-       ui->graphicsPortrait->setMaximumSize( 256, 256 );
-       ui->graphicsLandscape->setMaximumSize( 0, 0 );
+        //in portrait mode we want to display the large image
+        image.load( ":/img/chip256" );
+        scene.clear();
+        scene.addPixmap(  image  );
+
+        ui->graphicsPortrait->setScene( &scene );
+        ui->graphicsPortrait->setMaximumSize( 256, 256 );
+        ui->graphicsLandscape->setMaximumSize( 0, 0 );
     } else {
-       image.load( ":/img/chip128" );
-       scene.clear();
-       scene.addPixmap(  image  );
+        image.load( ":/img/chip128" );
+        scene.clear();
+        scene.addPixmap(  image  );
 
-       ui->graphicsLandscape->setScene( &scene );
-       ui->graphicsLandscape->setMaximumSize( 128, 128 );
-       ui->graphicsPortrait->setMaximumSize( 0, 0 );
+        ui->graphicsLandscape->setScene( &scene );
+        ui->graphicsLandscape->setMaximumSize( 128, 128 );
+        ui->graphicsPortrait->setMaximumSize( 0, 0 );
     }
 }
 
@@ -451,7 +467,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::DefaultTimeout);
+        QMaemo5InformationBox::information(this, tr( "SmartReflex support is known to be unstable on some devices and may cause random reboots." ), 0);
         callHelper( "set_sr", "on");
     }