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 | 54 |
1 files changed, 38 insertions, 16 deletions
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 570ee45..ece51a1 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -45,4 +45,4 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | |||
45 | setCaption( QObject::tr("Opie Eye Caramba" ) ); | 45 | setCaption( QObject::tr("Opie Eye Caramba" ) ); |
46 | m_cfg = new Opie::Core::OConfig("phunkview"); | 46 | m_cfg = new Opie::Core::OConfig("opie-eye"); |
47 | m_cfg->setGroup("Zecke_view" ); | 47 | m_cfg->setGroup("main" ); |
48 | 48 | ||
@@ -110,3 +110,2 @@ void PMainWindow::slotRotateToggled(bool how) | |||
110 | { | 110 | { |
111 | odebug << "Autorotate: " << how << oendl; | ||
112 | autoRotate = how; | 111 | autoRotate = how; |
@@ -228,2 +227,3 @@ void PMainWindow::initT( const char* name, T** ptr, int id) { | |||
228 | } | 227 | } |
228 | |||
229 | void PMainWindow::initInfo() { | 229 | void PMainWindow::initInfo() { |
@@ -232,2 +232,3 @@ void PMainWindow::initInfo() { | |||
232 | } | 232 | } |
233 | |||
233 | void PMainWindow::initDisp() { | 234 | void PMainWindow::initDisp() { |
@@ -258,3 +259,2 @@ void PMainWindow::slotToggleFullScreen() | |||
258 | { | 259 | { |
259 | odebug << "Toggle full " << oendl; | ||
260 | bool current = !m_aFullScreen->isOn(); | 260 | bool current = !m_aFullScreen->isOn(); |
@@ -263,8 +263,24 @@ void PMainWindow::slotToggleFullScreen() | |||
263 | 263 | ||
264 | void PMainWindow::slotFullScreenToggled(bool current) | 264 | void PMainWindow::slotFullScreenButton(bool current) |
265 | { | ||
266 | if (m_disp) odebug << "Disp fenster ist hidden: "<<m_disp->isHidden()<<oendl; | ||
267 | if (!m_disp) return; | ||
268 | |||
269 | /* I can not solve this effects here - it seems that we require some | ||
270 | status variable, too. so we will live with some interesting effects | ||
271 | meanwhile */ | ||
272 | #if 0 | ||
273 | bool th = m_disp->isHidden(); | ||
274 | setupViewWindow(current, false); | ||
275 | /* realy - after setting up the fullscreenmode while the window is hidden | ||
276 | it is unvisibile not hidden!!!!! Hell. */ | ||
277 | if (th) m_disp->hide(); | ||
278 | #endif | ||
279 | setupViewWindow(current, true); | ||
280 | } | ||
281 | |||
282 | void PMainWindow::setupViewWindow(bool current, bool forceDisplay) | ||
265 | { | 283 | { |
266 | odebug << "slotFullScreenToggled " << current << oendl; | ||
267 | if (!m_disp) return; | 284 | if (!m_disp) return; |
268 | if (current) { | 285 | if (current) { |
269 | odebug << "full" << oendl; | ||
270 | m_disp->setBackgroundColor(black); | 286 | m_disp->setBackgroundColor(black); |
@@ -276,3 +292,2 @@ void PMainWindow::slotFullScreenToggled(bool current) | |||
276 | setUpdatesEnabled(false); | 292 | setUpdatesEnabled(false); |
277 | odebug << "window" << oendl; | ||
278 | if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { | 293 | if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { |
@@ -291,3 +306,4 @@ void PMainWindow::slotFullScreenToggled(bool current) | |||
291 | m_disp->setHScrollBarMode(QScrollView::Auto); | 306 | m_disp->setHScrollBarMode(QScrollView::Auto); |
292 | m_stack->raiseWidget(m_disp); | 307 | if (forceDisplay || m_disp->isVisible()) |
308 | m_stack->raiseWidget(m_disp); | ||
293 | if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { | 309 | if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { |
@@ -297,3 +313,8 @@ void PMainWindow::slotFullScreenToggled(bool current) | |||
297 | } | 313 | } |
298 | m_disp->setFullScreen(current); | 314 | m_disp->setFullScreen(current,forceDisplay); |
315 | } | ||
316 | |||
317 | void PMainWindow::slotFullScreenToggled(bool current) | ||
318 | { | ||
319 | setupViewWindow(current,true); | ||
299 | } | 320 | } |
@@ -331,3 +352,2 @@ void PMainWindow::slotShowInfo( const QString& inf ) { | |||
331 | void PMainWindow::slotDisplay( const QString& inf ) { | 352 | void PMainWindow::slotDisplay( const QString& inf ) { |
332 | odebug << "slotDisplay: " << inf << oendl; | ||
333 | if ( !m_disp ) { | 353 | if ( !m_disp ) { |
@@ -349,3 +369,2 @@ void PMainWindow::slotDisplay( const QString& inf ) { | |||
349 | if (m_disp->fullScreen()) { | 369 | if (m_disp->fullScreen()) { |
350 | //m_disp->showFullScreen(); | ||
351 | qwsDisplay()->requestFocus( m_disp->winId(), TRUE); | 370 | qwsDisplay()->requestFocus( m_disp->winId(), TRUE); |
@@ -520,3 +539,3 @@ void PMainWindow::setupActions() | |||
520 | m_aFullScreen->setOn(false); | 539 | m_aFullScreen->setOn(false); |
521 | connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenToggled(bool))); | 540 | connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenButton(bool))); |
522 | 541 | ||
@@ -571,3 +590,3 @@ void PMainWindow::setupToolbar() | |||
571 | m_aTrash->addTo(toolBar); | 590 | m_aTrash->addTo(toolBar); |
572 | m_aSetup->addTo(toolBar); | 591 | // m_aSetup->addTo(toolBar); |
573 | 592 | ||
@@ -588,2 +607,4 @@ void PMainWindow::setupMenu() | |||
588 | menuBar()->insertItem( tr( "Show" ), dispMenu ); | 607 | menuBar()->insertItem( tr( "Show" ), dispMenu ); |
608 | settingsMenu = new QPopupMenu( menuBar() ); | ||
609 | menuBar()->insertItem( tr( "Settings" ), settingsMenu ); | ||
589 | 610 | ||
@@ -606,6 +627,4 @@ void PMainWindow::setupMenu() | |||
606 | fileMenu->insertSeparator(); | 627 | fileMenu->insertSeparator(); |
607 | m_aSetup->addTo(fileMenu); | ||
608 | m_aTrash->addTo(fileMenu); | 628 | m_aTrash->addTo(fileMenu); |
609 | 629 | ||
610 | m_aHideToolbar->addTo(dispMenu); | ||
611 | listviewMenu = new QPopupMenu(dispMenu); | 630 | listviewMenu = new QPopupMenu(dispMenu); |
@@ -618,2 +637,5 @@ void PMainWindow::setupMenu() | |||
618 | m_gPrevNext->addTo(dispMenu); | 637 | m_gPrevNext->addTo(dispMenu); |
638 | |||
639 | m_aSetup->addTo(settingsMenu); | ||
640 | m_aHideToolbar->addTo(settingsMenu); | ||
619 | } | 641 | } |