summaryrefslogtreecommitdiff
authoralwin <alwin>2004-04-16 21:53:37 (UTC)
committer alwin <alwin>2004-04-16 21:53:37 (UTC)
commita33ef3772b9603ef60de8c9cfd029436e6cf0399 (patch) (unidiff)
treebc90f3b3b552be411c18acf3e571316fe2623e0b
parent217d387def6d97f912352899fd83908b28d75dfc (diff)
downloadopie-a33ef3772b9603ef60de8c9cfd029436e6cf0399.zip
opie-a33ef3772b9603ef60de8c9cfd029436e6cf0399.tar.gz
opie-a33ef3772b9603ef60de8c9cfd029436e6cf0399.tar.bz2
after hard-testing on real device I hade made some beauty to
the fullscreen mode, now it seems working real fine. Zecke: I think, on real frontend side most work is finish, now we should resolve the problems with iconview and co. And find a faster rotate-algorithm ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp1
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.h1
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp17
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.h2
4 files changed, 19 insertions, 2 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 8e7f982..ee4b0a1 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -66,6 +66,7 @@ void ImageView::keyReleaseEvent(QKeyEvent * e)
66 if (e->key()==Qt::Key_N) slotDispNext(); 66 if (e->key()==Qt::Key_N) slotDispNext();
67 if (e->key()==Qt::Key_P) slotDispPrev(); 67 if (e->key()==Qt::Key_P) slotDispPrev();
68 if (e->key()==Qt::Key_F) emit toggleFullScreen(); 68 if (e->key()==Qt::Key_F) emit toggleFullScreen();
69 if (e->key()==Qt::Key_Escape && fullScreen()) emit hideMe();
69} 70}
70 71
71void ImageView::slotDispNext() 72void ImageView::slotDispNext()
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index 32f7e11..75f798c 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -31,6 +31,7 @@ signals:
31 void dispNext(); 31 void dispNext();
32 void dispPrev(); 32 void dispPrev();
33 void toggleFullScreen(); 33 void toggleFullScreen();
34 void hideMe();
34 35
35protected: 36protected:
36 Opie::Core::OConfig * m_cfg; 37 Opie::Core::OConfig * m_cfg;
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 9b929a1..ef6e6df 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -284,6 +284,7 @@ void PMainWindow::initDisp() {
284 connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext())); 284 connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext()));
285 connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev())); 285 connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev()));
286 connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen())); 286 connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen()));
287 connect(m_disp,SIGNAL(hideMe()),this,SLOT(raiseIconView()));
287 } 288 }
288} 289}
289 290
@@ -298,12 +299,16 @@ void PMainWindow::slotToggleFullScreen()
298 odebug << "full" << oendl; 299 odebug << "full" << oendl;
299 m_disp->setBackgroundColor(black); 300 m_disp->setBackgroundColor(black);
300 m_disp->reparent(0,QPoint(0,0)); 301 m_disp->reparent(0,QPoint(0,0));
302 m_disp->setVScrollBarMode(QScrollView::AlwaysOff);
303 m_disp->setHScrollBarMode(QScrollView::AlwaysOff);
301 m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); 304 m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height());
302 m_disp->showFullScreen(); 305 m_disp->showFullScreen();
303 } else { 306 } else {
304 odebug << "window" << oendl; 307 odebug << "window" << oendl;
305 m_disp->setBackgroundColor(white); 308 m_disp->setBackgroundColor(white);
306 m_stack->addWidget(m_disp,ImageDisplay); 309 m_stack->addWidget(m_disp,ImageDisplay);
310 m_disp->setVScrollBarMode(QScrollView::Auto);
311 m_disp->setHScrollBarMode(QScrollView::Auto);
307 m_stack->raiseWidget(m_disp); 312 m_stack->raiseWidget(m_disp);
308 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { 313 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
309 m_disp->resize(m_disp->minimumSize()); 314 m_disp->resize(m_disp->minimumSize());
@@ -331,6 +336,9 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
331 fsButton->hide(); 336 fsButton->hide();
332 viewModeButton->hide(); 337 viewModeButton->hide();
333 } 338 }
339 if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
340 m_disp->hide();
341 }
334 m_stack->raiseWidget( ImageInfo ); 342 m_stack->raiseWidget( ImageInfo );
335} 343}
336 344
@@ -346,7 +354,11 @@ void PMainWindow::slotDisplay( const QString& inf ) {
346 fsButton->hide(); 354 fsButton->hide();
347 viewModeButton->hide(); 355 viewModeButton->hide();
348 } 356 }
349 m_stack->raiseWidget( ImageDisplay ); 357 if (m_disp->fullScreen()) {
358 m_disp->show();
359 } else {
360 m_stack->raiseWidget( ImageDisplay );
361 }
350} 362}
351 363
352void PMainWindow::slotReturn() { 364void PMainWindow::slotReturn() {
@@ -377,6 +389,9 @@ void PMainWindow::raiseIconView() {
377 fsButton->show(); 389 fsButton->show();
378 viewModeButton->show(); 390 viewModeButton->show();
379 } 391 }
392 if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
393 m_disp->hide();
394 }
380 m_stack->raiseWidget( IconView ); 395 m_stack->raiseWidget( IconView );
381} 396}
382 397
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index 4cfc39c..d238763 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -46,7 +46,7 @@ public slots:
46 void setDocument( const QString& ); 46 void setDocument( const QString& );
47 virtual void slotToggleFullScreen(); 47 virtual void slotToggleFullScreen();
48 48
49protected: 49protected slots:
50 void raiseIconView(); 50 void raiseIconView();
51 void closeEvent( QCloseEvent* ); 51 void closeEvent( QCloseEvent* );
52 52