[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/krita-scripting-rempt] /: Merge branch 'master' into krita-scripting-rempt
From: Cyrille Berger <cberger () cberger ! net>
Date: 2015-08-18 17:05:31
Message-ID: E1ZRkKJ-0003Ol-Kp () scm ! kde ! org
[Download RAW message or body]
Git commit f3a86e6b75353bbca04d73f22267dee623f6bf18 by Cyrille Berger.
Committed on 18/08/2015 at 17:05.
Pushed by berger into branch 'krita-scripting-rempt'.
Merge branch 'master' into krita-scripting-rempt
M +5 -1 .gitignore
M +32 -17 krita/krita.rc
M +13 -5 krita/ui/CMakeLists.txt
M +89 -30 krita/ui/KisMainWindow.cpp
M +111 -46 krita/ui/KisViewManager.cpp
M +4 -1 krita/ui/KisViewManager.h
M +4 -3 libs/main/KoMainWindow.cpp
http://commits.kde.org/calligra/f3a86e6b75353bbca04d73f22267dee623f6bf18
diff --cc .gitignore
index 8f9ff68,58adc5a..4b605a4
--- a/.gitignore
+++ b/.gitignore
@@@ -22,5 -22,10 +22,9 @@@ CMakeLists.txt.user
*.kate-swap
*.diff
*.patch
+*.pyc
-
+ GTAGS
+ GPATH
+ GRTAGS
+ GSYMS
+ BROWSE
-
-
diff --cc krita/ui/KisViewManager.cpp
index c0bba70,60220e7..9e9dad4
--- a/krita/ui/KisViewManager.cpp
+++ b/krita/ui/KisViewManager.cpp
@@@ -129,7 -131,7 +131,8 @@@
#include "kra/kis_kra_loader.h"
#include "widgets/kis_floating_message.h"
#include "kis_signal_auto_connection.h"
+#include "kis_script_manager.h"
+ #include "kis_icon_utils.h"
class StatusBarItem
@@@ -239,7 -243,7 +244,8 @@@ public
, guiUpdateCompressor(0)
, actionCollection(0)
, mirrorManager(0)
+ , scriptManager(0)
+ , actionAuthor(0)
{
}
@@@ -297,7 -303,7 +306,8 @@@ public
QPointer<KisInputManager> inputManager;
KisSignalAutoConnectionsStore viewConnections;
+ KisScriptManager *scriptManager;
+ KSelectAction *actionAuthor; // Select action for author profile.
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic