-fixed some strange display bugs depending of switch to qte 2.3.10

-inserted the missed (and asked for) feature setting a display brightness
 on the fly.
Known Bugs left: When starting with setting a document the image will not
displayed if too large. It is since switch to qte 2.3.10 eg. seems to be
a timing problem when loading cost too much time. I have no idea how to fix
it this moment.

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
@@ -15,4 +15,5 @@ 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" );
@@ -34,5 +35,5 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
     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 );
@@ -44,4 +45,15 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
     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
@@ -66,4 +78,8 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
     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);
 }
 
@@ -78,3 +94,4 @@ void BaseSetup::save_values()
     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
@@ -34,4 +34,9 @@ protected:
     QSpinBox * m_Iconsize;
     QLabel * m_IconsizeLabel;
+
+    QGridLayout * m_IntensityLayout;
+    QSpinBox * m_Intensity;
+    QLabel * m_IntensityLabel;
+
 };
 
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
@@ -20,4 +20,6 @@
 #include <opie2/otabwidget.h>
 #include <opie2/okeyconfigwidget.h>
+#include <opie2/owait.h>
+#include <opie2/oapplication.h>
 
 #include <qpe/resource.h>
@@ -36,4 +38,5 @@
 #include <qmenubar.h>
 #include <qaction.h>
+#include <qspinbox.h>
 
 //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" )
@@ -227,4 +230,7 @@ void PMainWindow::slotConfig() {
         m_info->hide();
     }
+    if (m_disp) {
+        m_disp->setIntensity(m_Intensity,true);
+    }
 }
 
@@ -370,9 +376,27 @@ 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) {
@@ -631,4 +655,17 @@ void PMainWindow::setupActions()
         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);
+    }
 }
 
@@ -699,4 +736,6 @@ void PMainWindow::setupMenu()
     dispMenu->insertSeparator();
     m_gPrevNext->addTo(dispMenu);
+    m_setCurrentBrightness->addTo(dispMenu);
+    m_setCurrentBrightness->setEnabled(false);
     if (m_aForceSmall) {
         dispMenu->insertSeparator();
@@ -726,4 +765,5 @@ void PMainWindow::readConfig()
 {
     autoSave =m_cfg->readBoolEntry("savestatus",true);
+    m_Intensity = m_cfg->readNumEntry("intensity",0);
 }
 
@@ -765,2 +805,30 @@ void PMainWindow::slotForceSmall(bool 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
@@ -68,4 +68,5 @@ protected slots:
     void slotFullScreenButton(bool);
     void check_view_fullscreen();
+    virtual void setupBrightness();
 
 private:
@@ -85,4 +86,5 @@ private:
     bool m_polishDone:1;
     bool m_SmallWindow:1;
+    int m_Intensity;
     QToolButton*fsButton;
     QToolBar *toolBar;
@@ -92,5 +94,5 @@ private:
     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 */
@@ -102,4 +104,5 @@ private:
     StorageInfo *m_storage;
     QMap<QString, QString> m_dev;
+    static bool Valuebox(QWidget*parent,int min, int max, int current,int&store);
 
 private slots: