4 files changed, 95 insertions, 2 deletions

diff --git a/noncore/graphics/opie-eye/gui/basesetup.cpp b/noncore/graphics/opie-eye/gui/basesetup.cpp
index fdf3466..b0fefbf 100644
--- a/noncore/graphics/opie-eye/gui/basesetup.cpp
+++ b/noncore/graphics/opie-eye/gui/basesetup.cpp
@@ -14,6 +14,7 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
 
     m_SlidetimeLayout = new QGridLayout( 0, 1, 1, 0, 6, "m_SlidetimeLayout");
     m_IconsizeLayout = new QGridLayout( 0, 1, 1, 0, 6, "m_IconsizeLayout");
+    m_IntensityLayout = new QGridLayout( 0, 1, 1, 0, 6, "m_IntensityLayout");
 
     m_SlideShowTime = new QSpinBox( this, "m_SlideShowTime" );
     m_SlideShowTime->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed));
@@ -33,7 +34,7 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
     m_Iconsize = new QSpinBox( this, "m_Iconsize" );
     m_Iconsize->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed));
     m_Iconsize->setButtonSymbols( QSpinBox::PlusMinus );
-    m_Iconsize->setMaxValue( 64 );
+    m_Iconsize->setMaxValue( 128 );
     m_Iconsize->setMinValue(12);
     m_Iconsize->setValue( 32 );
     m_Iconsize->setSuffix(tr(" pixel"));
@@ -43,6 +44,17 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
     m_IconsizeLayout->addWidget( m_IconsizeLabel, 0, 0 );
     m_MainLayout->addLayout(m_IconsizeLayout);
 
+    m_Intensity = new QSpinBox( this, "m_Intensity" );
+    m_Intensity->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed));
+    m_Intensity->setButtonSymbols( QSpinBox::PlusMinus );
+    m_Intensity->setMaxValue( 255 );
+    m_Intensity->setMinValue(-255);
+    m_Intensity->setValue( 0 );
+    m_IntensityLayout->addWidget( m_Intensity, 0, 1 );
+    m_IntensityLabel = new QLabel( this, "m_IntensityLabel" );
+    m_IntensityLabel->setText(tr("Default display brightness:"));
+    m_IntensityLayout->addWidget(m_IntensityLabel, 0, 0 );
+    m_MainLayout->addLayout(m_IntensityLayout);
 
 #if 0
     m_ShowToolBar = new QCheckBox( this, "m_ShowToolBar" );
@@ -65,6 +77,10 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
     if (stime<12)stime = 12;
     if (stime>64)stime = 64;
     m_Iconsize->setValue(stime);
+    stime = m_cfg->readNumEntry("intensity",0);
+    if (stime<-255) stime = -255;
+    if (stime>255) stime = 255;
+    m_Intensity->setValue(stime);
 }
 
 BaseSetup::~BaseSetup()
@@ -77,4 +93,5 @@ void BaseSetup::save_values()
     m_cfg->writeEntry("slideshowtimeout",m_SlideShowTime->value());
     m_cfg->writeEntry("savestatus",m_SaveStateAuto->isChecked());
     m_cfg->writeEntry("iconsize",m_Iconsize->value());
+    m_cfg->writeEntry("intensity",m_Intensity->value());
 }
diff --git a/noncore/graphics/opie-eye/gui/basesetup.h b/noncore/graphics/opie-eye/gui/basesetup.h
index 95929f2..cda6777 100644
--- a/noncore/graphics/opie-eye/gui/basesetup.h
+++ b/noncore/graphics/opie-eye/gui/basesetup.h
@@ -33,6 +33,11 @@ protected:
     QGridLayout * m_IconsizeLayout;
     QSpinBox * m_Iconsize;
     QLabel * m_IconsizeLabel;
+
+    QGridLayout * m_IntensityLayout;
+    QSpinBox * m_Intensity;
+    QLabel * m_IntensityLabel;
+
 };
 
 #endif
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index e532867..3a89dfd 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -19,6 +19,8 @@
 #include <opie2/oapplicationfactory.h>
 #include <opie2/otabwidget.h>
 #include <opie2/okeyconfigwidget.h>
+#include <opie2/owait.h>
+#include <opie2/oapplication.h>
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
@@ -35,6 +37,7 @@
 #include <qframe.h>
 #include <qmenubar.h>
 #include <qaction.h>
+#include <qspinbox.h>
 
 //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" )
 OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>)
@@ -226,6 +229,9 @@ void PMainWindow::slotConfig() {
     if (reminfo) {
         m_info->hide();
     }
+    if (m_disp) {
+        m_disp->setIntensity(m_Intensity,true);
+    }
 }
 
 /*
@@ -369,11 +375,29 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
 
 void PMainWindow::slotDisplay( const QString& inf ) {
     bool nwindow = false;
+    bool disp_hack = false;
+    int lb;
+    if (m_disp && m_disp->fullScreen()) {
+        lb = m_disp->Intensity();
+        delete m_disp;
+        m_disp = 0;
+
+        disp_hack = true;
+    }
     if ( !m_disp ) {
         nwindow = true;
         initDisp();
+        m_disp->setIntensity((disp_hack?lb:m_Intensity));
     }
+    m_setCurrentBrightness->setEnabled(true);
+
+    Opie::Ui::OWait wdlg;
+    wdlg.setTimerLength(30);
+    wdlg.show();
+    //qApp->processEvents(20);
     m_disp->setImage( inf );
+    wdlg.hide();
+    //qApp->processEvents(20);
     if (m_SmallWindow) {
         if (m_gPrevNext->isEnabled()==false) {
             m_gPrevNext->addTo(toolBar);
@@ -630,6 +654,19 @@ void PMainWindow::setupActions()
     } else {
         m_aForceSmall = 0;
     }
+    m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false);
+    connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness()));
+}
+
+void PMainWindow::setupBrightness()
+{
+    if (!m_disp) {
+        return;
+    }
+    int lb = m_disp->Intensity();
+    if (Valuebox(0,-255,255,lb,lb)) {
+        m_disp->setIntensity(lb,true);
+    }
 }
 
 void PMainWindow::setupToolbar()
@@ -698,6 +735,8 @@ void PMainWindow::setupMenu()
     m_gDisplayType->addTo(dispMenu);
     dispMenu->insertSeparator();
     m_gPrevNext->addTo(dispMenu);
+    m_setCurrentBrightness->addTo(dispMenu);
+    m_setCurrentBrightness->setEnabled(false);
     if (m_aForceSmall) {
         dispMenu->insertSeparator();
         m_aForceSmall->addTo(dispMenu);
@@ -725,6 +764,7 @@ void PMainWindow::listviewselected(QAction*which)
 void PMainWindow::readConfig()
 {
     autoSave =m_cfg->readBoolEntry("savestatus",true);
+    m_Intensity = m_cfg->readNumEntry("intensity",0);
 }
 
 void PMainWindow::polish()
@@ -764,3 +804,31 @@ void PMainWindow::slotForceSmall(bool how)
         m_cfg->writeEntry("dontshowseperate",how);
     }
 }
+
+bool PMainWindow::Valuebox(QWidget*parent,int min, int max, int current,int&store)
+{
+    QDialog dlg(parent,"brightnessbox",true);
+    QVBoxLayout * m_MainLayout;
+    QGridLayout * m_IntensityLayout;
+    QSpinBox * m_Intensity;
+    QLabel * m_IntensityLabel;
+
+    m_MainLayout = new QVBoxLayout( &dlg, 11, 6, "m_MainLayout");
+    m_IntensityLayout = new QGridLayout( 0, 1, 1, 0, 6, "m_IntensityLayout");
+    m_Intensity = new QSpinBox( &dlg, "m_Intensity" );
+    m_Intensity->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed));
+    m_Intensity->setButtonSymbols( QSpinBox::PlusMinus );
+    m_Intensity->setMaxValue( max );
+    m_Intensity->setMinValue(min);
+    m_Intensity->setValue( current );
+    m_IntensityLayout->addWidget( m_Intensity, 0, 1 );
+    m_IntensityLabel = new QLabel( &dlg, "m_IntensityLabel" );
+    m_IntensityLabel->setText(QObject::tr("Display brightness:"));
+    m_IntensityLayout->addWidget(m_IntensityLabel, 0, 0 );
+    m_MainLayout->addLayout(m_IntensityLayout);
+    if (dlg.exec()) {
+        store = m_Intensity->value();
+        return true;
+    }
+    return false;
+}
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index a49a9d3..62b446b 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -67,6 +67,7 @@ protected slots:
     void listviewselected(QAction*);
     void slotFullScreenButton(bool);
     void check_view_fullscreen();
+    virtual void setupBrightness();
 
 private:
     template<class T>  void initT( const char* name, T**, int );
@@ -84,6 +85,7 @@ private:
     bool m_setDocCalled:1;
     bool m_polishDone:1;
     bool m_SmallWindow:1;
+    int m_Intensity;
     QToolButton*fsButton;
     QToolBar *toolBar;
     QPopupMenu *fileMenu,*dispMenu,*fsMenu,*listviewMenu,*settingsMenu;
@@ -91,7 +93,7 @@ private:
     QAction*m_aHideToolbar,*m_aSetup,*m_aDirName,*m_aDirShort,*m_aDirLong;
     QActionGroup *m_gListViewMode,*m_gDisplayType,*m_gPrevNext,*m_hGroup;
     QAction *m_aNext,*m_aPrevious,*m_aFullScreen;
-    QAction *m_aAutoRotate,*m_aUnscaled,*m_aZoomer,*m_aForceSmall;
+    QAction *m_aAutoRotate,*m_aUnscaled,*m_aZoomer,*m_aForceSmall,*m_setCurrentBrightness;
 
     /* init funs */
     void readConfig();
@@ -101,6 +103,7 @@ private:
     /* for the device submenu - ToDo: Merge with the special button */
     StorageInfo *m_storage;
     QMap<QString, QString> m_dev;
+    static bool Valuebox(QWidget*parent,int min, int max, int current,int&store);
 
 private slots:
     void slotConfig();