summaryrefslogtreecommitdiff
path: root/noncore/graphics/opie-eye
Unidiff
Diffstat (limited to 'noncore/graphics/opie-eye') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp5
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp13
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
@@ -48,2 +48,3 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
48 this, SLOT( systemMessage(const QCString&,const QByteArray&) ) ); 48 this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
49 setKeyCompression(true);
49} 50}
@@ -68,3 +69,2 @@ void ImageView::systemMessage( const QCString& msg, const QByteArray& data )
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)" )
@@ -72,3 +72,2 @@ void ImageView::systemMessage( const QCString& msg, const QByteArray& data )
72 stream >> _newrotation; 72 stream >> _newrotation;
73 odebug << "received setCurrentRotation(" << _newrotation << ")" << oendl;
74 if (!fullScreen()) { 73 if (!fullScreen()) {
@@ -238,3 +237,2 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e)
238 } 237 }
239 odebug << "Popup " << oendl;
240 QPopupMenu *m = new QPopupMenu(this); 238 QPopupMenu *m = new QPopupMenu(this);
@@ -291,3 +289,2 @@ void ImageView::focusInEvent(QFocusEvent *)
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();
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
@@ -651,2 +651,3 @@ void PMainWindow::setupActions()
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);
@@ -660,2 +661,7 @@ void PMainWindow::setupBrightness()
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();
@@ -664,2 +670,6 @@ void PMainWindow::setupBrightness()
664 } 670 }
671 if (reshow) {
672 m_disp->showFullScreen();
673 qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
674 }
665} 675}
@@ -685,3 +695,2 @@ void PMainWindow::setupToolbar()
685 m_aTrash->addTo(toolBar); 695 m_aTrash->addTo(toolBar);
686// m_aSetup->addTo(toolBar);
687 696
@@ -732,4 +741,2 @@ void PMainWindow::setupMenu()
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();