1 files changed, 10 insertions, 3 deletions

diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 4ee252f..3efbb53 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -646,25 +646,35 @@ void PMainWindow::setupActions()
     }
     m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false);
     connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness()));
     m_IncBrightness = new QAction(tr("Increase brightness by 5"),Resource::loadIconSet( "up" ),0, 0, this, 0, false);
     m_DecBrightness = new QAction(tr("Decrease brightness by 5"),Resource::loadIconSet( "down" ),0, 0, this, 0, false);
     m_hBright = new QActionGroup(this,"actioncollection",false),
+    m_hBright->insert(m_setCurrentBrightness);
     m_hBright->insert(m_IncBrightness);
     m_hBright->insert(m_DecBrightness);
 }
 
 void PMainWindow::setupBrightness()
 {
     if (!m_disp) {
         return;
     }
+    bool reshow=false;
+    if (m_disp->isVisible()&&m_disp->fullScreen()) {
+        m_disp->hide();
+        reshow = true;
+    }
     int lb = m_disp->Intensity();
     if (Valuebox(0,-100,100,lb,lb)) {
         m_disp->setIntensity(lb,true);
     }
+    if (reshow) {
+        m_disp->showFullScreen();
+        qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
+    }
 }
 
 void PMainWindow::setupToolbar()
 {
     toolBar = new QToolBar( this );
     addToolBar(toolBar);
@@ -680,13 +690,12 @@ void PMainWindow::setupToolbar()
 
     if (m_aBeam) {
         m_aBeam->addTo( toolBar );
     }
     m_aShowInfo->addTo(toolBar);
     m_aTrash->addTo(toolBar);
-//    m_aSetup->addTo(toolBar);
 
     m_gDisplayType->addTo(toolBar);
 
     if (!m_SmallWindow) {
         m_gPrevNext->addTo(toolBar);
     } else {
@@ -727,14 +736,12 @@ void PMainWindow::setupMenu()
     m_gListViewMode->addTo(listviewMenu);
     dispMenu->insertSeparator();
     m_aFullScreen->addTo(dispMenu);
     m_gDisplayType->addTo(dispMenu);
     dispMenu->insertSeparator();
     m_gPrevNext->addTo(dispMenu);
-    m_setCurrentBrightness->addTo(dispMenu);
-    m_setCurrentBrightness->setEnabled(false);
     dispMenu->insertSeparator();
     m_hBright->addTo(dispMenu);
     m_hBright->setEnabled(false);
 
     if (m_aForceSmall) {
         dispMenu->insertSeparator();