author | alwin <alwin> | 2005-03-22 22:18:58 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-22 22:18:58 (UTC) |
commit | d7b39880bb7de4908e8a1239d37bb48d83c4a0ba (patch) (unidiff) | |
tree | 64ffc1750d149f52c1c48c676f7ecc29cc442b23 /noncore/graphics/opie-eye/gui/mainwindow.cpp | |
parent | 31035d399edaaaff64976705fd44468b6357c863 (diff) | |
download | opie-d7b39880bb7de4908e8a1239d37bb48d83c4a0ba.zip opie-d7b39880bb7de4908e8a1239d37bb48d83c4a0ba.tar.gz opie-d7b39880bb7de4908e8a1239d37bb48d83c4a0ba.tar.bz2 |
-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.
Diffstat (limited to 'noncore/graphics/opie-eye/gui/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 68 |
1 files changed, 68 insertions, 0 deletions
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 | |||
@@ -16,12 +16,14 @@ | |||
16 | 16 | ||
17 | #include <opie2/odebug.h> | 17 | #include <opie2/odebug.h> |
18 | #include <opie2/owidgetstack.h> | 18 | #include <opie2/owidgetstack.h> |
19 | #include <opie2/oapplicationfactory.h> | 19 | #include <opie2/oapplicationfactory.h> |
20 | #include <opie2/otabwidget.h> | 20 | #include <opie2/otabwidget.h> |
21 | #include <opie2/okeyconfigwidget.h> | 21 | #include <opie2/okeyconfigwidget.h> |
22 | #include <opie2/owait.h> | ||
23 | #include <opie2/oapplication.h> | ||
22 | 24 | ||
23 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
24 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
25 | #include <qpe/ir.h> | 27 | #include <qpe/ir.h> |
26 | #include <qpe/storage.h> | 28 | #include <qpe/storage.h> |
27 | #include <qpe/applnk.h> | 29 | #include <qpe/applnk.h> |
@@ -32,12 +34,13 @@ | |||
32 | #include <qdialog.h> | 34 | #include <qdialog.h> |
33 | #include <qmap.h> | 35 | #include <qmap.h> |
34 | #include <qtimer.h> | 36 | #include <qtimer.h> |
35 | #include <qframe.h> | 37 | #include <qframe.h> |
36 | #include <qmenubar.h> | 38 | #include <qmenubar.h> |
37 | #include <qaction.h> | 39 | #include <qaction.h> |
40 | #include <qspinbox.h> | ||
38 | 41 | ||
39 | //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" ) | 42 | //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" ) |
40 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>) | 43 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>) |
41 | 44 | ||
42 | PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | 45 | PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) |
43 | : QMainWindow( wid, name, style ), m_info( 0 ), m_disp( 0 ) | 46 | : QMainWindow( wid, name, style ), m_info( 0 ), m_disp( 0 ) |
@@ -223,12 +226,15 @@ void PMainWindow::slotConfig() { | |||
223 | if (remdisp) { | 226 | if (remdisp) { |
224 | m_disp->hide(); | 227 | m_disp->hide(); |
225 | } | 228 | } |
226 | if (reminfo) { | 229 | if (reminfo) { |
227 | m_info->hide(); | 230 | m_info->hide(); |
228 | } | 231 | } |
232 | if (m_disp) { | ||
233 | m_disp->setIntensity(m_Intensity,true); | ||
234 | } | ||
229 | } | 235 | } |
230 | 236 | ||
231 | /* | 237 | /* |
232 | * create a new image info component | 238 | * create a new image info component |
233 | * and detach the current one | 239 | * and detach the current one |
234 | * we will make the other delete on exit | 240 | * we will make the other delete on exit |
@@ -366,17 +372,35 @@ void PMainWindow::slotShowInfo( const QString& inf ) { | |||
366 | m_aStartSlide->setEnabled(false); | 372 | m_aStartSlide->setEnabled(false); |
367 | m_stack->raiseWidget( ImageInfo ); | 373 | m_stack->raiseWidget( ImageInfo ); |
368 | } | 374 | } |
369 | 375 | ||
370 | void PMainWindow::slotDisplay( const QString& inf ) { | 376 | void PMainWindow::slotDisplay( const QString& inf ) { |
371 | bool nwindow = false; | 377 | bool nwindow = false; |
378 | bool disp_hack = false; | ||
379 | int lb; | ||
380 | if (m_disp && m_disp->fullScreen()) { | ||
381 | lb = m_disp->Intensity(); | ||
382 | delete m_disp; | ||
383 | m_disp = 0; | ||
384 | |||
385 | disp_hack = true; | ||
386 | } | ||
372 | if ( !m_disp ) { | 387 | if ( !m_disp ) { |
373 | nwindow = true; | 388 | nwindow = true; |
374 | initDisp(); | 389 | initDisp(); |
390 | m_disp->setIntensity((disp_hack?lb:m_Intensity)); | ||
375 | } | 391 | } |
392 | m_setCurrentBrightness->setEnabled(true); | ||
393 | |||
394 | Opie::Ui::OWait wdlg; | ||
395 | wdlg.setTimerLength(30); | ||
396 | wdlg.show(); | ||
397 | //qApp->processEvents(20); | ||
376 | m_disp->setImage( inf ); | 398 | m_disp->setImage( inf ); |
399 | wdlg.hide(); | ||
400 | //qApp->processEvents(20); | ||
377 | if (m_SmallWindow) { | 401 | if (m_SmallWindow) { |
378 | if (m_gPrevNext->isEnabled()==false) { | 402 | if (m_gPrevNext->isEnabled()==false) { |
379 | m_gPrevNext->addTo(toolBar); | 403 | m_gPrevNext->addTo(toolBar); |
380 | fsButton->hide(); | 404 | fsButton->hide(); |
381 | } | 405 | } |
382 | } | 406 | } |
@@ -627,12 +651,25 @@ void PMainWindow::setupActions() | |||
627 | m_aForceSmall = new QAction(tr("Dont show seperate windows"),Resource::loadIconSet( "AppsIcon" ), 0, 0, this, 0, true); | 651 | m_aForceSmall = new QAction(tr("Dont show seperate windows"),Resource::loadIconSet( "AppsIcon" ), 0, 0, this, 0, true); |
628 | m_aForceSmall->setToggleAction(true); | 652 | m_aForceSmall->setToggleAction(true); |
629 | connect(m_aForceSmall,SIGNAL(toggled(bool)),this,SLOT(slotForceSmall(bool))); | 653 | connect(m_aForceSmall,SIGNAL(toggled(bool)),this,SLOT(slotForceSmall(bool))); |
630 | } else { | 654 | } else { |
631 | m_aForceSmall = 0; | 655 | m_aForceSmall = 0; |
632 | } | 656 | } |
657 | m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false); | ||
658 | connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness())); | ||
659 | } | ||
660 | |||
661 | void PMainWindow::setupBrightness() | ||
662 | { | ||
663 | if (!m_disp) { | ||
664 | return; | ||
665 | } | ||
666 | int lb = m_disp->Intensity(); | ||
667 | if (Valuebox(0,-255,255,lb,lb)) { | ||
668 | m_disp->setIntensity(lb,true); | ||
669 | } | ||
633 | } | 670 | } |
634 | 671 | ||
635 | void PMainWindow::setupToolbar() | 672 | void PMainWindow::setupToolbar() |
636 | { | 673 | { |
637 | toolBar = new QToolBar( this ); | 674 | toolBar = new QToolBar( this ); |
638 | addToolBar(toolBar); | 675 | addToolBar(toolBar); |
@@ -695,12 +732,14 @@ void PMainWindow::setupMenu() | |||
695 | m_gListViewMode->addTo(listviewMenu); | 732 | m_gListViewMode->addTo(listviewMenu); |
696 | dispMenu->insertSeparator(); | 733 | dispMenu->insertSeparator(); |
697 | m_aFullScreen->addTo(dispMenu); | 734 | m_aFullScreen->addTo(dispMenu); |
698 | m_gDisplayType->addTo(dispMenu); | 735 | m_gDisplayType->addTo(dispMenu); |
699 | dispMenu->insertSeparator(); | 736 | dispMenu->insertSeparator(); |
700 | m_gPrevNext->addTo(dispMenu); | 737 | m_gPrevNext->addTo(dispMenu); |
738 | m_setCurrentBrightness->addTo(dispMenu); | ||
739 | m_setCurrentBrightness->setEnabled(false); | ||
701 | if (m_aForceSmall) { | 740 | if (m_aForceSmall) { |
702 | dispMenu->insertSeparator(); | 741 | dispMenu->insertSeparator(); |
703 | m_aForceSmall->addTo(dispMenu); | 742 | m_aForceSmall->addTo(dispMenu); |
704 | } | 743 | } |
705 | 744 | ||
706 | m_aSetup->addTo(settingsMenu); | 745 | m_aSetup->addTo(settingsMenu); |
@@ -722,12 +761,13 @@ void PMainWindow::listviewselected(QAction*which) | |||
722 | emit changeListMode(val); | 761 | emit changeListMode(val); |
723 | } | 762 | } |
724 | 763 | ||
725 | void PMainWindow::readConfig() | 764 | void PMainWindow::readConfig() |
726 | { | 765 | { |
727 | autoSave =m_cfg->readBoolEntry("savestatus",true); | 766 | autoSave =m_cfg->readBoolEntry("savestatus",true); |
767 | m_Intensity = m_cfg->readNumEntry("intensity",0); | ||
728 | } | 768 | } |
729 | 769 | ||
730 | void PMainWindow::polish() | 770 | void PMainWindow::polish() |
731 | { | 771 | { |
732 | if (m_disp) { | 772 | if (m_disp) { |
733 | odebug << "======================\n" | 773 | odebug << "======================\n" |
@@ -761,6 +801,34 @@ void PMainWindow::slotForceSmall(bool how) | |||
761 | } | 801 | } |
762 | } | 802 | } |
763 | if (autoSave) { | 803 | if (autoSave) { |
764 | m_cfg->writeEntry("dontshowseperate",how); | 804 | m_cfg->writeEntry("dontshowseperate",how); |
765 | } | 805 | } |
766 | } | 806 | } |
807 | |||
808 | bool PMainWindow::Valuebox(QWidget*parent,int min, int max, int current,int&store) | ||
809 | { | ||
810 | QDialog dlg(parent,"brightnessbox",true); | ||
811 | QVBoxLayout * m_MainLayout; | ||
812 | QGridLayout * m_IntensityLayout; | ||
813 | QSpinBox * m_Intensity; | ||
814 | QLabel * m_IntensityLabel; | ||
815 | |||
816 | m_MainLayout = new QVBoxLayout( &dlg, 11, 6, "m_MainLayout"); | ||
817 | m_IntensityLayout = new QGridLayout( 0, 1, 1, 0, 6, "m_IntensityLayout"); | ||
818 | m_Intensity = new QSpinBox( &dlg, "m_Intensity" ); | ||
819 | m_Intensity->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed)); | ||
820 | m_Intensity->setButtonSymbols( QSpinBox::PlusMinus ); | ||
821 | m_Intensity->setMaxValue( max ); | ||
822 | m_Intensity->setMinValue(min); | ||
823 | m_Intensity->setValue( current ); | ||
824 | m_IntensityLayout->addWidget( m_Intensity, 0, 1 ); | ||
825 | m_IntensityLabel = new QLabel( &dlg, "m_IntensityLabel" ); | ||
826 | m_IntensityLabel->setText(QObject::tr("Display brightness:")); | ||
827 | m_IntensityLayout->addWidget(m_IntensityLabel, 0, 0 ); | ||
828 | m_MainLayout->addLayout(m_IntensityLayout); | ||
829 | if (dlg.exec()) { | ||
830 | store = m_Intensity->value(); | ||
831 | return true; | ||
832 | } | ||
833 | return false; | ||
834 | } | ||