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 | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index cdaf34c..274a22a 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <qframe.h> | 33 | #include <qframe.h> |
34 | 34 | ||
35 | 35 | ||
36 | |||
37 | //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" ) | 36 | //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" ) |
38 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>) | 37 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>) |
39 | 38 | ||
@@ -43,7 +42,6 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | |||
43 | setCaption( QObject::tr("Opie Eye Caramba" ) ); | 42 | setCaption( QObject::tr("Opie Eye Caramba" ) ); |
44 | m_cfg = new Opie::Core::OConfig("phunkview"); | 43 | m_cfg = new Opie::Core::OConfig("phunkview"); |
45 | m_cfg->setGroup("Zecke_view" ); | 44 | m_cfg->setGroup("Zecke_view" ); |
46 | tFrame = 0; | ||
47 | // qDebug( "Process-wide OApplication object @ %0x", oApp ); | 45 | // qDebug( "Process-wide OApplication object @ %0x", oApp ); |
48 | /* | 46 | /* |
49 | * Initialize ToolBar and IconView | 47 | * Initialize ToolBar and IconView |
@@ -146,9 +144,6 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | |||
146 | } | 144 | } |
147 | 145 | ||
148 | PMainWindow::~PMainWindow() { | 146 | PMainWindow::~PMainWindow() { |
149 | odebug << "Shutting down" << oendl; | ||
150 | if (tFrame) delete tFrame; | ||
151 | odebug << "Shutting down done" << oendl; | ||
152 | } | 147 | } |
153 | 148 | ||
154 | void PMainWindow::slotToggleZoomer() | 149 | void PMainWindow::slotToggleZoomer() |
@@ -325,28 +320,21 @@ void PMainWindow::slotToggleFullScreen() | |||
325 | odebug << "Toggle full " << oendl; | 320 | odebug << "Toggle full " << oendl; |
326 | if (!m_disp) return; | 321 | if (!m_disp) return; |
327 | bool current = !m_disp->fullScreen(); | 322 | bool current = !m_disp->fullScreen(); |
328 | m_disp->setFullScreen(current); | ||
329 | odebug << "Current = " << current << oendl; | 323 | odebug << "Current = " << current << oendl; |
330 | if (current) { | 324 | if (current) { |
331 | odebug << "full" << oendl; | 325 | odebug << "full" << oendl; |
332 | m_disp->setBackgroundColor(black); | 326 | m_disp->setBackgroundColor(black); |
333 | if (!tFrame) { | 327 | m_disp->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); |
334 | tFrame = new ImageWidget(0,0,WStyle_Customize|WStyle_NoBorder); | ||
335 | tFrame->resize(qApp->desktop()->width(), qApp->desktop()->height()); | ||
336 | tFrame->setMinimumSize(qApp->desktop()->width(), qApp->desktop()->height()); | ||
337 | } | ||
338 | m_disp->reparent(tFrame,QPoint(0,0)); | ||
339 | m_disp->setVScrollBarMode(QScrollView::AlwaysOff); | 328 | m_disp->setVScrollBarMode(QScrollView::AlwaysOff); |
340 | m_disp->setHScrollBarMode(QScrollView::AlwaysOff); | 329 | m_disp->setHScrollBarMode(QScrollView::AlwaysOff); |
341 | m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); | 330 | m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); |
342 | tFrame->showFullScreen(); | 331 | //m_disp->showFullScreen(); |
332 | //qwsDisplay()->requestFocus( m_disp->winId(), TRUE); | ||
343 | } else { | 333 | } else { |
344 | setUpdatesEnabled(false); | 334 | setUpdatesEnabled(false); |
345 | odebug << "window" << oendl; | 335 | odebug << "window" << oendl; |
346 | m_disp->reparent(0,QPoint(0,0)); | 336 | m_disp->reparent(0,QPoint(0,0)); |
347 | m_disp->showNormal(); | 337 | m_disp->showNormal(); |
348 | /* don't forget it! */ | ||
349 | tFrame->hide(); | ||
350 | m_disp->setBackgroundColor(white); | 338 | m_disp->setBackgroundColor(white); |
351 | m_stack->addWidget(m_disp,ImageDisplay); | 339 | m_stack->addWidget(m_disp,ImageDisplay); |
352 | m_disp->setVScrollBarMode(QScrollView::Auto); | 340 | m_disp->setVScrollBarMode(QScrollView::Auto); |
@@ -357,6 +345,7 @@ void PMainWindow::slotToggleFullScreen() | |||
357 | } | 345 | } |
358 | setUpdatesEnabled(true); | 346 | setUpdatesEnabled(true); |
359 | } | 347 | } |
348 | m_disp->setFullScreen(current); | ||
360 | } | 349 | } |
361 | 350 | ||
362 | /** | 351 | /** |
@@ -398,7 +387,8 @@ void PMainWindow::slotDisplay( const QString& inf ) { | |||
398 | viewModeButton->hide(); | 387 | viewModeButton->hide(); |
399 | } | 388 | } |
400 | if (m_disp->fullScreen()) { | 389 | if (m_disp->fullScreen()) { |
401 | tFrame->show();//FullScreen(); | 390 | //m_disp->showFullScreen(); |
391 | qwsDisplay()->requestFocus( m_disp->winId(), TRUE); | ||
402 | } else { | 392 | } else { |
403 | m_stack->raiseWidget( ImageDisplay ); | 393 | m_stack->raiseWidget( ImageDisplay ); |
404 | } | 394 | } |
@@ -439,7 +429,7 @@ void PMainWindow::raiseIconView() { | |||
439 | viewModeButton->show(); | 429 | viewModeButton->show(); |
440 | } | 430 | } |
441 | if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { | 431 | if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { |
442 | tFrame->hide(); | 432 | m_disp->hide(); |
443 | } | 433 | } |
444 | m_stack->raiseWidget( IconView ); | 434 | m_stack->raiseWidget( IconView ); |
445 | setUpdatesEnabled(true); | 435 | setUpdatesEnabled(true); |