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

List:       kde-commits
Subject:    =?utf-8?q?=5Bgluon/creator=5D_creator2=3A_Enable_the_stop_operat?=
From:       Laszlo Papp <djszapi () archlinux ! us>
Date:       2011-06-06 9:17:37
Message-ID: 20110606091737.CB2E6A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 5037d56ab3c192f587eb4017ced8861d6ecf1774 by Laszlo Papp.
Committed on 06/06/2011 at 11:16.
Pushed by lpapp into branch 'creator'.

Enable the stop operation while the game is paused

M  +1    -1    creator2/mainwindowmanager.cpp     
M  +1    -4    creator2/ui/gluoncreatorui.rc     

http://commits.kde.org/gluon/5037d56ab3c192f587eb4017ced8861d6ecf1774

diff --git a/creator2/mainwindowmanager.cpp b/creator2/mainwindowmanager.cpp
index f930ace..884ea5d 100644
--- a/creator2/mainwindowmanager.cpp
+++ b/creator2/mainwindowmanager.cpp
@@ -155,6 +155,7 @@ void MainWindowManager::openProject( const QString& fileName )
         d->mainWindow->statusBar()->showMessage( i18n( "Opening project..." ) );
 
         KDevelop::ICore::self()->documentController()->openDocument(fileName);
+        stateChanged( "fileOpened" );
 
         GluonEngine::Game::instance()->initializeAll();
         GluonEngine::Game::instance()->drawAll();
@@ -163,7 +164,6 @@ void MainWindowManager::openProject( const QString& fileName )
         d->fileName = fileName;
         d->recentFiles->addUrl( KUrl( fileName ) );
 
-        stateChanged( "fileOpened" );
         ViewManager::instance()->setViewsEnabled( true );
 
         d->mainWindow->statusBar()->showMessage( i18n( "Project successfully opened" ) );
diff --git a/creator2/ui/gluoncreatorui.rc b/creator2/ui/gluoncreatorui.rc
index 54f2095..5f88c7b 100644
--- a/creator2/ui/gluoncreatorui.rc
+++ b/creator2/ui/gluoncreatorui.rc
@@ -56,10 +56,6 @@
         </Menu>
 
         <Menu name="settings">
-            <Menu name="docks">
-                <text>&amp;Docks</text>
-            </Menu>
-            <Action name="lock_layout" />
             <DefineGroup name="configure_merge" append="configure_merge" />
         </Menu>
 
@@ -124,6 +120,7 @@
     <State name="paused">
         <enable>
             <Action name="game_play" />
+            <Action name="game_stop" />
         </enable>
         <disable>
             <Action name="game_pause" />

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