-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 5 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index 994fe12..b919ca8 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp | |||
@@ -41,16 +41,17 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name | |||
41 | setMinimumSize(10,10); | 41 | setMinimumSize(10,10); |
42 | } | 42 | } |
43 | connect(this,SIGNAL(incBrightness()),this,SLOT(slotIncBrightness())); | 43 | connect(this,SIGNAL(incBrightness()),this,SLOT(slotIncBrightness())); |
44 | connect(this,SIGNAL(decBrightness()),this,SLOT(slotDecBrightness())); | 44 | connect(this,SIGNAL(decBrightness()),this,SLOT(slotDecBrightness())); |
45 | 45 | ||
46 | m_sysChannel = new QCopChannel( "QPE/System", this ); | 46 | m_sysChannel = new QCopChannel( "QPE/System", this ); |
47 | connect( m_sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ), | 47 | connect( m_sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ), |
48 | this, SLOT( systemMessage(const QCString&,const QByteArray&) ) ); | 48 | this, SLOT( systemMessage(const QCString&,const QByteArray&) ) ); |
49 | setKeyCompression(true); | ||
49 | } | 50 | } |
50 | 51 | ||
51 | void ImageView::slotIncBrightness() | 52 | void ImageView::slotIncBrightness() |
52 | { | 53 | { |
53 | int lb = Intensity()+5; | 54 | int lb = Intensity()+5; |
54 | if (lb>100) lb=100; | 55 | if (lb>100) lb=100; |
55 | setIntensity(lb,true); | 56 | setIntensity(lb,true); |
56 | } | 57 | } |
@@ -61,21 +62,19 @@ void ImageView::slotDecBrightness() | |||
61 | if (lb<-100) lb=-100; | 62 | if (lb<-100) lb=-100; |
62 | setIntensity(lb,true); | 63 | setIntensity(lb,true); |
63 | } | 64 | } |
64 | 65 | ||
65 | void ImageView::systemMessage( const QCString& msg, const QByteArray& data ) | 66 | void ImageView::systemMessage( const QCString& msg, const QByteArray& data ) |
66 | { | 67 | { |
67 | int _newrotation; | 68 | int _newrotation; |
68 | QDataStream stream( data, IO_ReadOnly ); | 69 | QDataStream stream( data, IO_ReadOnly ); |
69 | odebug << "received system message: " << msg << oendl; | ||
70 | if ( msg == "setCurrentRotation(int)" ) | 70 | if ( msg == "setCurrentRotation(int)" ) |
71 | { | 71 | { |
72 | stream >> _newrotation; | 72 | stream >> _newrotation; |
73 | odebug << "received setCurrentRotation(" << _newrotation << ")" << oendl; | ||
74 | if (!fullScreen()) { | 73 | if (!fullScreen()) { |
75 | m_rotation = _newrotation; | 74 | m_rotation = _newrotation; |
76 | return; | 75 | return; |
77 | } | 76 | } |
78 | } | 77 | } |
79 | } | 78 | } |
80 | 79 | ||
81 | void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup,QActionGroup*brightGroup) | 80 | void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup,QActionGroup*brightGroup) |
@@ -231,17 +230,16 @@ void ImageView::slotShowImageInfo() | |||
231 | emit dispImageInfo(m_lastName); | 230 | emit dispImageInfo(m_lastName); |
232 | } | 231 | } |
233 | 232 | ||
234 | void ImageView::contentsMousePressEvent ( QMouseEvent * e) | 233 | void ImageView::contentsMousePressEvent ( QMouseEvent * e) |
235 | { | 234 | { |
236 | if (e->button()==1) { | 235 | if (e->button()==1) { |
237 | return OImageScrollView::contentsMousePressEvent(e); | 236 | return OImageScrollView::contentsMousePressEvent(e); |
238 | } | 237 | } |
239 | odebug << "Popup " << oendl; | ||
240 | QPopupMenu *m = new QPopupMenu(this); | 238 | QPopupMenu *m = new QPopupMenu(this); |
241 | if (!m) return; | 239 | if (!m) return; |
242 | if (m_hGroup) { | 240 | if (m_hGroup) { |
243 | m_hGroup->addTo(m); | 241 | m_hGroup->addTo(m); |
244 | } | 242 | } |
245 | if (fullScreen()) { | 243 | if (fullScreen()) { |
246 | if (m_gPrevNext) { | 244 | if (m_gPrevNext) { |
247 | m->insertSeparator(); | 245 | m->insertSeparator(); |
@@ -284,17 +282,16 @@ void ImageView::setFullScreen(bool how,bool force) | |||
284 | } else { | 282 | } else { |
285 | // setMinimumSize(10,10); | 283 | // setMinimumSize(10,10); |
286 | } | 284 | } |
287 | } | 285 | } |
288 | 286 | ||
289 | void ImageView::focusInEvent(QFocusEvent *) | 287 | void ImageView::focusInEvent(QFocusEvent *) |
290 | { | 288 | { |
291 | // Always do it here, no matter the size. | 289 | // Always do it here, no matter the size. |
292 | odebug << "Focus in (view)" << oendl; | ||
293 | //if (fullScreen()) parentWidget()->showNormal(); | 290 | //if (fullScreen()) parentWidget()->showNormal(); |
294 | if (m_ignore_next_in){m_ignore_next_in=false;return;} | 291 | if (m_ignore_next_in){m_ignore_next_in=false;return;} |
295 | if (fullScreen()) enableFullscreen(); | 292 | if (fullScreen()) enableFullscreen(); |
296 | } | 293 | } |
297 | 294 | ||
298 | void ImageView::hide() | 295 | void ImageView::hide() |
299 | { | 296 | { |
300 | if (fullScreen()) { | 297 | if (fullScreen()) { |
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 | |||
@@ -644,29 +644,39 @@ void PMainWindow::setupActions() | |||
644 | } else { | 644 | } else { |
645 | m_aForceSmall = 0; | 645 | m_aForceSmall = 0; |
646 | } | 646 | } |
647 | m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false); | 647 | m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false); |
648 | connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness())); | 648 | connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness())); |
649 | m_IncBrightness = new QAction(tr("Increase brightness by 5"),Resource::loadIconSet( "up" ),0, 0, this, 0, false); | 649 | m_IncBrightness = new QAction(tr("Increase brightness by 5"),Resource::loadIconSet( "up" ),0, 0, this, 0, false); |
650 | m_DecBrightness = new QAction(tr("Decrease brightness by 5"),Resource::loadIconSet( "down" ),0, 0, this, 0, false); | 650 | m_DecBrightness = new QAction(tr("Decrease brightness by 5"),Resource::loadIconSet( "down" ),0, 0, this, 0, false); |
651 | m_hBright = new QActionGroup(this,"actioncollection",false), | 651 | m_hBright = new QActionGroup(this,"actioncollection",false), |
652 | m_hBright->insert(m_setCurrentBrightness); | ||
652 | m_hBright->insert(m_IncBrightness); | 653 | m_hBright->insert(m_IncBrightness); |
653 | m_hBright->insert(m_DecBrightness); | 654 | m_hBright->insert(m_DecBrightness); |
654 | } | 655 | } |
655 | 656 | ||
656 | void PMainWindow::setupBrightness() | 657 | void PMainWindow::setupBrightness() |
657 | { | 658 | { |
658 | if (!m_disp) { | 659 | if (!m_disp) { |
659 | return; | 660 | return; |
660 | } | 661 | } |
662 | bool reshow=false; | ||
663 | if (m_disp->isVisible()&&m_disp->fullScreen()) { | ||
664 | m_disp->hide(); | ||
665 | reshow = true; | ||
666 | } | ||
661 | int lb = m_disp->Intensity(); | 667 | int lb = m_disp->Intensity(); |
662 | if (Valuebox(0,-100,100,lb,lb)) { | 668 | if (Valuebox(0,-100,100,lb,lb)) { |
663 | m_disp->setIntensity(lb,true); | 669 | m_disp->setIntensity(lb,true); |
664 | } | 670 | } |
671 | if (reshow) { | ||
672 | m_disp->showFullScreen(); | ||
673 | qwsDisplay()->requestFocus( m_disp->winId(), TRUE); | ||
674 | } | ||
665 | } | 675 | } |
666 | 676 | ||
667 | void PMainWindow::setupToolbar() | 677 | void PMainWindow::setupToolbar() |
668 | { | 678 | { |
669 | toolBar = new QToolBar( this ); | 679 | toolBar = new QToolBar( this ); |
670 | addToolBar(toolBar); | 680 | addToolBar(toolBar); |
671 | toolBar->setHorizontalStretchable( true ); | 681 | toolBar->setHorizontalStretchable( true ); |
672 | setToolBarsMovable( false ); | 682 | setToolBarsMovable( false ); |
@@ -678,17 +688,16 @@ void PMainWindow::setupToolbar() | |||
678 | connect( this, SIGNAL( changeDir( const QString& ) ), | 688 | connect( this, SIGNAL( changeDir( const QString& ) ), |
679 | m_view, SLOT(slotChangeDir( const QString& ) ) ); | 689 | m_view, SLOT(slotChangeDir( const QString& ) ) ); |
680 | 690 | ||
681 | if (m_aBeam) { | 691 | if (m_aBeam) { |
682 | m_aBeam->addTo( toolBar ); | 692 | m_aBeam->addTo( toolBar ); |
683 | } | 693 | } |
684 | m_aShowInfo->addTo(toolBar); | 694 | m_aShowInfo->addTo(toolBar); |
685 | m_aTrash->addTo(toolBar); | 695 | m_aTrash->addTo(toolBar); |
686 | // m_aSetup->addTo(toolBar); | ||
687 | 696 | ||
688 | m_gDisplayType->addTo(toolBar); | 697 | m_gDisplayType->addTo(toolBar); |
689 | 698 | ||
690 | if (!m_SmallWindow) { | 699 | if (!m_SmallWindow) { |
691 | m_gPrevNext->addTo(toolBar); | 700 | m_gPrevNext->addTo(toolBar); |
692 | } else { | 701 | } else { |
693 | m_gPrevNext->setEnabled(false); | 702 | m_gPrevNext->setEnabled(false); |
694 | } | 703 | } |
@@ -725,18 +734,16 @@ void PMainWindow::setupMenu() | |||
725 | listviewMenu = new QPopupMenu(dispMenu); | 734 | listviewMenu = new QPopupMenu(dispMenu); |
726 | dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu); | 735 | dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu); |
727 | m_gListViewMode->addTo(listviewMenu); | 736 | m_gListViewMode->addTo(listviewMenu); |
728 | dispMenu->insertSeparator(); | 737 | dispMenu->insertSeparator(); |
729 | m_aFullScreen->addTo(dispMenu); | 738 | m_aFullScreen->addTo(dispMenu); |
730 | m_gDisplayType->addTo(dispMenu); | 739 | m_gDisplayType->addTo(dispMenu); |
731 | dispMenu->insertSeparator(); | 740 | dispMenu->insertSeparator(); |
732 | m_gPrevNext->addTo(dispMenu); | 741 | m_gPrevNext->addTo(dispMenu); |
733 | m_setCurrentBrightness->addTo(dispMenu); | ||
734 | m_setCurrentBrightness->setEnabled(false); | ||
735 | dispMenu->insertSeparator(); | 742 | dispMenu->insertSeparator(); |
736 | m_hBright->addTo(dispMenu); | 743 | m_hBright->addTo(dispMenu); |
737 | m_hBright->setEnabled(false); | 744 | m_hBright->setEnabled(false); |
738 | 745 | ||
739 | if (m_aForceSmall) { | 746 | if (m_aForceSmall) { |
740 | dispMenu->insertSeparator(); | 747 | dispMenu->insertSeparator(); |
741 | m_aForceSmall->addTo(dispMenu); | 748 | m_aForceSmall->addTo(dispMenu); |
742 | } | 749 | } |