KisWindowLayoutResource.cpp (krita-5.1.3.tar.xz) | : | KisWindowLayoutResource.cpp (krita-5.1.4.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 15 | skipping to change at line 15 | |||
*/ | */ | |||
#include "KisWindowLayoutResource.h" | #include "KisWindowLayoutResource.h" | |||
#include "KisWindowLayoutManager.h" | #include "KisWindowLayoutManager.h" | |||
#include <QVector> | #include <QVector> | |||
#include <QList> | #include <QList> | |||
#include <QFile> | #include <QFile> | |||
#include <QDomDocument> | #include <QDomDocument> | |||
#include <QApplication> | #include <QApplication> | |||
#include <QEventLoop> | #include <QEventLoop> | |||
#include <QMessageBox> | ||||
#include <QWindow> | #include <QWindow> | |||
#include <QScreen> | #include <QScreen> | |||
#include <KisPart.h> | #include <KisPart.h> | |||
#include <KisDocument.h> | #include <KisDocument.h> | |||
#include <kis_dom_utils.h> | #include <kis_dom_utils.h> | |||
#include <KisMainWindow.h> | #include <KisMainWindow.h> | |||
static const int WINDOW_LAYOUT_VERSION = 1; | static const int WINDOW_LAYOUT_VERSION = 1; | |||
skipping to change at line 368 | skipping to change at line 369 | |||
root.appendChild(elem); | root.appendChild(elem); | |||
} | } | |||
} | } | |||
void KisWindowLayoutResource::loadXml(const QDomElement &element) const | void KisWindowLayoutResource::loadXml(const QDomElement &element) const | |||
{ | { | |||
d->showImageInAllWindows = KisDomUtils::toInt(element.attribute("showImageIn AllWindows", "0")); | d->showImageInAllWindows = KisDomUtils::toInt(element.attribute("showImageIn AllWindows", "0")); | |||
d->primaryWorkspaceFollowsFocus = KisDomUtils::toInt(element.attribute("prim aryWorkspaceFollowsFocus", "0")); | d->primaryWorkspaceFollowsFocus = KisDomUtils::toInt(element.attribute("prim aryWorkspaceFollowsFocus", "0")); | |||
d->primaryWindow = element.attribute("primaryWindow"); | d->primaryWindow = element.attribute("primaryWindow"); | |||
#ifdef Q_OS_ANDROID | ||||
if (element.firstChildElement("window") != element.lastChildElement("window" | ||||
)) { | ||||
QMessageBox::warning(qApp->activeWindow(), i18nc("@title:window", "Krita | ||||
"), | ||||
"Workspaces with multiple windows isn't supported o | ||||
n Android"); | ||||
return; | ||||
} | ||||
#endif | ||||
for (auto windowElement = element.firstChildElement("window"); | for (auto windowElement = element.firstChildElement("window"); | |||
!windowElement.isNull(); | !windowElement.isNull(); | |||
windowElement = windowElement.nextSiblingElement("window")) { | windowElement = windowElement.nextSiblingElement("window")) { | |||
Private::Window window; | Private::Window window; | |||
window.windowId = QUuid(windowElement.attribute("id", QUuid().toString() )); | window.windowId = QUuid(windowElement.attribute("id", QUuid().toString() )); | |||
if (window.windowId.isNull()) { | if (window.windowId.isNull()) { | |||
window.windowId = QUuid::createUuid(); | window.windowId = QUuid::createUuid(); | |||
} | } | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 12 lines changed or added |