[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.0
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2008-03-10 23:28:59
Message-ID: 1205191739.978968.16977.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 784343 by lunakl:

Backport r784333 (remove usage of QWidget::showFullScreen() etc.),
use new KToggleFullScreenAction::setFullScreen() helper.



 M  +2 -2      kdeedu/kig/kig/kig_view.cpp  
 M  +2 -2      kdeedu/kmplot/kmplot/kmplot.cpp  
 M  +2 -2      kdeedu/kstars/kstars/kstarsactions.cpp  
 M  +2 -1      kdeedu/kwordquiz/src/kwordquiz.cpp  
 M  +2 -2      kdeedu/marble/src/QtMainWindow.cpp  
 M  +2 -2      kdeedu/marble/src/marble_part.cpp  
 M  +1 -4      kdegames/kgoldrunner/src/kgoldrunner.cpp  
 M  +2 -2      kdegames/ktuberling/toplevel.cpp  
 M  +1 -4      kdegraphics/kolourpaint/mainWindow/kpMainWindow_Settings.cpp  
 M  +5 -5      kdegraphics/okular/shell/shell.cpp  
 M  +1 -1      kdenetwork/kopete/kopete/chatwindow/chatview.cpp  
 M  +1 -4      kdesdk/kate/app/katemainwindow.cpp  


--- branches/KDE/4.0/kdeedu/kig/kig/kig_view.cpp #784342:784343
@@ -526,9 +526,9 @@
 {
   mrealwidget->setFullScreen( ! mrealwidget->isFullScreen() );
   if ( mrealwidget->isFullScreen() )
-    topLevelWidget()->showFullScreen();
+    topLevelWidget()->setWindowState( topLevelWidget()->windowState() | \
Qt::WindowFullScreen ); // set  else
-    topLevelWidget()->showNormal();
+    topLevelWidget()->setWindowState( topLevelWidget()->windowState() & \
~Qt::WindowFullScreen ); // reset  }
 
 void KigWidget::setFullScreen( bool f )
--- branches/KDE/4.0/kdeedu/kmplot/kmplot/kmplot.cpp #784342:784343
@@ -131,12 +131,12 @@
 {
 	if (checked)
 	{
-		showFullScreen();
+		KToggleFullScreenAction::setFullScreen( this, true )
 		//m_fullScreen->plug( toolBar( "mainToolBar" ) ); deprecated annma 2006-03-01
 	}
 	else
 	{
-		showNormal();
+		KToggleFullScreenAction::setFullScreen( this, false )
 		//m_fullScreen->unplug( toolBar( "mainToolBar" ) ); deprecated annma 2006-03-01
 	}
 }
--- branches/KDE/4.0/kdeedu/kstars/kstars/kstarsactions.cpp #784342:784343
@@ -971,9 +971,9 @@
 void KStars::slotFullScreen()
 {
     if ( topLevelWidget()->isFullScreen() ) {
-        topLevelWidget()->showNormal();
+        topLevelWidget()->setWindowState( topLevelWidget()->windowState() & \
~Qt::WindowFullScreen ); // reset  } else {
-        topLevelWidget()->showFullScreen();
+        topLevelWidget()->setWindowState( topLevelWidget()->windowState() | \
Qt::WindowFullScreen ); // set  }
 }
 
--- branches/KDE/4.0/kdeedu/kwordquiz/src/kwordquiz.cpp #784342:784343
@@ -49,6 +49,7 @@
 #include <KPageWidget>
 #include <kdeprintdialog.h>
 #include <KProcess>
+#include <kwindowsystem.h>
 
 #include "keduvocdocument.h"
 #include "kwqtablemodel.h"
@@ -540,7 +541,7 @@
           if(a->m_doc->url().path() == url.path())
           {
             if (w->isMinimized())
-              w->showNormal();
+              KWindowSystem::unminimizeWindow(w->winId());
             w->activateWindow();
             w->raise();
             break;
--- branches/KDE/4.0/kdeedu/marble/src/QtMainWindow.cpp #784342:784343
@@ -217,10 +217,10 @@
 void MainWindow::showFullScreen( bool isChecked )
 {
     if ( isChecked ) {
-        QWidget::showFullScreen();
+        setWindowState( windowState() | Qt::WindowFullScreen ); // set
     }
     else {
-        showNormal();
+        setWindowState( windowState() & ~Qt::WindowFullScreen ); // reset
     }
 
     m_fullScreenAct->setChecked( isChecked ); // Sync state with the GUI
--- branches/KDE/4.0/kdeedu/marble/src/marble_part.cpp #784342:784343
@@ -172,11 +172,11 @@
 {
     if ( isChecked ) {
         if ( KApplication::activeWindow() )
-            KApplication::activeWindow()->showFullScreen();
+            KToggleFullScreenAction::setFullScreen( KApplication::activeWindow(), \
true );  }
     else {
         if ( KApplication::activeWindow() )
-            KApplication::activeWindow()->showNormal();
+            KToggleFullScreenAction::setFullScreen( KApplication::activeWindow(), \
true );  }
 
     m_fullScreenAct->setChecked( isChecked ); // Sync state with the GUI
--- branches/KDE/4.0/kdegames/kgoldrunner/src/kgoldrunner.cpp #784342:784343
@@ -582,10 +582,7 @@
 
 void KGoldrunner::viewFullScreen(bool activation)
 {
-    if (activation) 
-	showFullScreen();
-    else
-	showNormal();
+    KToggleFullScreenAction::setFullScreen(this, activation);
 }
 
 void KGoldrunner::setupThemes ()
--- branches/KDE/4.0/kdegames/ktuberling/toplevel.cpp #784342:784343
@@ -22,6 +22,7 @@
 #include <kstandardgameaction.h>
 #include <kactioncollection.h>
 #include <ktoggleaction.h>
+#include <ktogglefullscreenaction.h>
 #include <kimageio.h>
 #include <kmimetype.h>
 #include <kconfiggroup.h>
@@ -417,6 +418,5 @@
 
 void TopLevel::toggleFullScreen()
 {
-  if (actionCollection()->action("fullscreen")->isChecked()) showFullScreen();
-  else showNormal();
+  KToggleFullScreenActive::setFullScreen( this, \
actionCollection()->action("fullscreen")->isChecked());  }
--- branches/KDE/4.0/kdegraphics/kolourpaint/mainWindow/kpMainWindow_Settings.cpp \
#784342:784343 @@ -89,10 +89,7 @@
 // private slot
 void kpMainWindow::slotFullScreen ()
 {
-    if (d->actionFullScreen->isChecked ())
-        showFullScreen ();
-    else
-        showNormal ();
+    KToggleFullScreenAction::setFullScreen( this, d->actionFullScreen->isChecked \
());  }
 
 
--- branches/KDE/4.0/kdegraphics/okular/shell/shell.cpp #784342:784343
@@ -271,9 +271,9 @@
 void Shell::setFullScreen( bool useFullScreen )
 {
     if( useFullScreen )
-        showFullScreen();
+        setWindowState( windowState() | Qt::WindowFullScreen ); // set
     else
-        showNormal();
+        setWindowState( windowState() & ~Qt::WindowFullScreen ); // reset
 }
 
 void Shell::slotUpdateFullScreen()
@@ -287,8 +287,8 @@
       m_toolBarWasShown = m_showToolBarAction->isChecked();
       m_showToolBarAction->setChecked(false);
       toolBar()->hide();
-      
-      showFullScreen();
+
+      KToggleFullScreenAction::setFullScreen(this, true);      
     }
     else
     {
@@ -302,7 +302,7 @@
         m_showToolBarAction->setChecked(true);
         toolBar()->show();
       }
-      showNormal();
+      KToggleFullScreenAction::setFullScreen(this, false);      
     }
 }
 
--- branches/KDE/4.0/kdenetwork/kopete/kopete/chatwindow/chatview.cpp #784342:784343
@@ -286,7 +286,7 @@
 #endif
 	if(m_mainWindow->isMinimized())
 	{
-		m_mainWindow->showNormal();
+		KWindowSystem::unminimizeWindow( m_mainWindow->winId());
 	}
 
 
--- branches/KDE/4.0/kdesdk/kate/app/katemainwindow.cpp #784342:784343
@@ -767,10 +767,7 @@
 
 void KateMainWindow::slotFullScreen(bool t)
 {
-  if (t)
-    showFullScreen();
-  else
-    showNormal();
+  KToggleFullScreenAction::setFullScreen(this, t);
 }
 
 bool KateMainWindow::event( QEvent *e )


[prev in list] [next in list] [prev in thread] [next in thread]