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
@@ -604,179 +604,186 @@ void PMainWindow::setupActions()
     m_aAutoRotate->setToggleAction(true);
 
     if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
         m_aAutoRotate->setOn(true);
     } else {
         m_aAutoRotate->setOn(false);
     }
     if (autoSave) {
         m_aAutoRotate->setOn(m_cfg->readBoolEntry("autorotate",m_aAutoRotate->isOn()));
     }
     connect(m_aAutoRotate,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool)));
 
     m_aUnscaled = new QAction( tr( "Show images unscaled" ), Resource::loadIconSet( "1to1" ), 0, 0, this, 0, true );
     m_aUnscaled->setToggleAction(true);
     connect(m_aUnscaled,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
     if (autoSave) {
         m_aUnscaled->setOn(m_cfg->readBoolEntry("unscaled",false));
     } else {
         m_aUnscaled->setOn(false);
     }
 
     m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ), Resource::loadIconSet( "mag" ), 0, 0, this, 0, true );
     m_aZoomer->setToggleAction(true);
     if (autoSave) {
         m_aZoomer->setOn(m_cfg->readBoolEntry("zoomeron",true));
     } else {
         m_aZoomer->setOn (true);
     }
     connect(m_aZoomer,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool)));
     m_gDisplayType->insert(m_aAutoRotate);
     m_gDisplayType->insert(m_aUnscaled);
     m_gDisplayType->insert(m_aZoomer);
 
     m_hGroup = new QActionGroup(this,"actioncollection",false);
     m_hGroup->insert(m_aFullScreen);
 
     if (!m_SmallWindow) {
         m_aForceSmall = new QAction(tr("Dont show seperate windows"),Resource::loadIconSet( "AppsIcon" ), 0, 0, this, 0, true);
         m_aForceSmall->setToggleAction(true);
         connect(m_aForceSmall,SIGNAL(toggled(bool)),this,SLOT(slotForceSmall(bool)));
     } else {
         m_aForceSmall = 0;
     }
     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);
     toolBar->setHorizontalStretchable( true );
     setToolBarsMovable( false );
     m_aDirUp->addTo( toolBar );
 
     fsButton = new PFileSystem( toolBar );
     connect( fsButton, SIGNAL( changeDir( const QString& ) ),
              m_view, SLOT(slotChangeDir( const QString& ) ) );
     connect( this, SIGNAL( changeDir( const QString& ) ),
              m_view, SLOT(slotChangeDir( const QString& ) ) );
 
     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 {
         m_gPrevNext->setEnabled(false);
     }
 }
 
 void PMainWindow::setupMenu()
 {
     fileMenu = new QPopupMenu( menuBar() );
     menuBar()->insertItem( tr( "File" ), fileMenu );
     dispMenu = new QPopupMenu( menuBar() );
     menuBar()->insertItem( tr( "Show" ), dispMenu );
     settingsMenu = new QPopupMenu( menuBar() );
     menuBar()->insertItem( tr( "Settings" ), settingsMenu );
 
     m_aViewfile->addTo(fileMenu);
     m_aShowInfo->addTo(fileMenu);
     m_aStartSlide->addTo(fileMenu);
 
     fileMenu->insertSeparator();
     m_aDirUp->addTo( fileMenu );
 
     fsMenu = new QPopupMenu(fileMenu);
     fileMenu->insertItem(Resource::loadIconSet( "cardmon/pcmcia" ),tr("Select filesystem"),fsMenu);
     connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) );
     dirChanged();
 
     if ( m_aBeam ) {
         fileMenu->insertSeparator();
         m_aBeam->addTo( fileMenu );
     }
     fileMenu->insertSeparator();
     m_aTrash->addTo(fileMenu);
 
     listviewMenu = new QPopupMenu(dispMenu);
     dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu);
     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();
         m_aForceSmall->addTo(dispMenu);
     }
 
     m_aSetup->addTo(settingsMenu);
     m_aHideToolbar->addTo(settingsMenu);
 }
 
 void PMainWindow::listviewselected(QAction*which)
 {
     if (!which || which->isOn()==false) return;
     int val = 1;
 
     if (which==m_aDirName) {
         val = 3;
     } else if (which==m_aDirShort) {
         val = 2;
     } else if (which==m_aDirLong) {
         val = 1;
     }
     emit changeListMode(val);
 }
 
 void PMainWindow::readConfig()
 {
     autoSave =m_cfg->readBoolEntry("savestatus",true);
     m_Intensity = m_cfg->readNumEntry("intensity",0);
 }
 
 void PMainWindow::polish()
 {
     if (m_disp) {
         odebug << "======================\n"
                << "Called via setdocument\n"
                << "======================" << oendl;
         m_setDocCalled = true;
         m_view->setDoccalled(true);
         m_disp->setCloseIfHide(true);
     } else {
         m_setDocCalled = false;
         m_view->setDoccalled(false);
     }
     m_polishDone = true;