Git commit 6a68fb7ae32d97ba6330fb10c7e9843428e11f5f by Boudewijn Rempt.
Committed on 11/03/2015 at 08:46.
Pushed by rempt into branch 'master'.
Merge branch 'calligra/2.9'
CCMAIL: calligra-devel@kde.org
Please, do check these merge conflicts. I have assumed that the changes
in 2.9 were not needed in master, so I took the master branch version
of them.
Conflicts:
karbon/data/karbon.appdata.xml
libs/db/expression.cpp
libs/kotext/KoSection.cpp
libs/kotext/KoSectionManager.cpp
libs/kotext/KoSectionManager.h
libs/kotext/commands/DeleteCommand.cpp
plugins/reporting/maps/KoReportItemMaps.cpp
words/part/dockers/KWDebugWidget.cpp
M +2 -2 CMakeLists.txt
M +1 -0 krita/plugins/extensions/layersplit/kritalayersplit.desktop
M +20 -1 krita/ui/KisMainWindow.cpp
M +7 -0 krita/ui/KisMainWindow.h
http://commits.kde.org/calligra/6a68fb7ae32d97ba6330fb10c7e9843428e11f5f
diff --cc krita/plugins/extensions/layersplit/kritalayersplit.desktop
index 24fb799,ac8b142..4ae180f
--- a/krita/plugins/extensions/layersplit/kritalayersplit.desktop
+++ b/krita/plugins/extensions/layersplit/kritalayersplit.desktop
@@@ -1,8 -1,9 +1,9 @@@
[Desktop Entry]
Name=Layer Splitter
-Name[bs]=Razdjeljivač slojeva
+Name[bs]=Razdjeljivač Slojeva
Name[ca]=Separador de capes
Name[da]=Lagopdeler
+ Name[de]=Ebenen-Trennleiste
Name[en_GB]=Layer Splitter
Name[es]=Divisor de capas
Name[fi]=Tason jakaja
diff --cc krita/ui/KisMainWindow.cpp
index d5247bc,585fea8..afbd62d
--- a/krita/ui/KisMainWindow.cpp
+++ b/krita/ui/KisMainWindow.cpp
@@@ -2130,20 -2135,8 +2149,20 @@@ void KisMainWindow::initializeGeometry(
setGeometry(geometry().x(), geometry().y(), w, h);
}
}
- restoreState(QByteArray::fromBase64(cfg.readEntry("ko_windowstate",
QByteArray())));
+ restoreWorkspace(QByteArray::fromBase64(cfg.readEntry("ko_windowstate",
QByteArray())));
}
+void KisMainWindow::showDockerTitleBars(bool show)
+{
+ foreach (QDockWidget *dock, dockWidgets()) {
+ if (dock->titleBarWidget()) {
+ dock->titleBarWidget()->setVisible(show);
+ }
+ }
+
+ KisConfig cfg;
+ cfg.setShowDockerTitleBars(show);
+}
+
#include <KisMainWindow.moc>
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
