author | alwin <alwin> | 2005-03-24 21:13:40 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-24 21:13:40 (UTC) |
commit | b6fc9840f4fe9bad392167c49dbcfa2acda9ed21 (patch) (side-by-side diff) | |
tree | 1d7d1225a9c440f5d0608d8901dfd151db8a6f1c /noncore | |
parent | 1e6c3181dcc7ec4edbe99db0d886ce7a9c483056 (diff) | |
download | opie-b6fc9840f4fe9bad392167c49dbcfa2acda9ed21.zip opie-b6fc9840f4fe9bad392167c49dbcfa2acda9ed21.tar.gz opie-b6fc9840f4fe9bad392167c49dbcfa2acda9ed21.tar.bz2 |
last bugfixes on opie-eye an imagescrollview. Seems that now all is working
as it should.
-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 @@ -46,6 +46,7 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name m_sysChannel = new QCopChannel( "QPE/System", this ); connect( m_sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ), this, SLOT( systemMessage(const QCString&,const QByteArray&) ) ); + setKeyCompression(true); } void ImageView::slotIncBrightness() @@ -66,11 +67,9 @@ void ImageView::systemMessage( const QCString& msg, const QByteArray& data ) { int _newrotation; QDataStream stream( data, IO_ReadOnly ); - odebug << "received system message: " << msg << oendl; if ( msg == "setCurrentRotation(int)" ) { stream >> _newrotation; - odebug << "received setCurrentRotation(" << _newrotation << ")" << oendl; if (!fullScreen()) { m_rotation = _newrotation; return; @@ -236,7 +235,6 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e) if (e->button()==1) { return OImageScrollView::contentsMousePressEvent(e); } - odebug << "Popup " << oendl; QPopupMenu *m = new QPopupMenu(this); if (!m) return; if (m_hGroup) { @@ -289,7 +287,6 @@ void ImageView::setFullScreen(bool how,bool force) void ImageView::focusInEvent(QFocusEvent *) { // Always do it here, no matter the size. - odebug << "Focus in (view)" << oendl; //if (fullScreen()) parentWidget()->showNormal(); if (m_ignore_next_in){m_ignore_next_in=false;return;} if (fullScreen()) enableFullscreen(); 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 @@ -649,6 +649,7 @@ void PMainWindow::setupActions() m_IncBrightness = new QAction(tr("Increase brightness by 5"),Resource::loadIconSet( "up" ),0, 0, this, 0, false); m_DecBrightness = new QAction(tr("Decrease brightness by 5"),Resource::loadIconSet( "down" ),0, 0, this, 0, false); m_hBright = new QActionGroup(this,"actioncollection",false), + m_hBright->insert(m_setCurrentBrightness); m_hBright->insert(m_IncBrightness); m_hBright->insert(m_DecBrightness); } @@ -658,10 +659,19 @@ void PMainWindow::setupBrightness() if (!m_disp) { return; } + bool reshow=false; + if (m_disp->isVisible()&&m_disp->fullScreen()) { + m_disp->hide(); + reshow = true; + } int lb = m_disp->Intensity(); if (Valuebox(0,-100,100,lb,lb)) { m_disp->setIntensity(lb,true); } + if (reshow) { + m_disp->showFullScreen(); + qwsDisplay()->requestFocus( m_disp->winId(), TRUE); + } } void PMainWindow::setupToolbar() @@ -683,7 +693,6 @@ void PMainWindow::setupToolbar() } m_aShowInfo->addTo(toolBar); m_aTrash->addTo(toolBar); -// m_aSetup->addTo(toolBar); m_gDisplayType->addTo(toolBar); @@ -730,8 +739,6 @@ void PMainWindow::setupMenu() m_gDisplayType->addTo(dispMenu); dispMenu->insertSeparator(); m_gPrevNext->addTo(dispMenu); - m_setCurrentBrightness->addTo(dispMenu); - m_setCurrentBrightness->setEnabled(false); dispMenu->insertSeparator(); m_hBright->addTo(dispMenu); m_hBright->setEnabled(false); |