From kde-commits  Thu Apr 30 22:10:10 2015
From: Andi Fischer <andi.fischer () hispeed ! ch>
Date: Thu, 30 Apr 2015 22:10:10 +0000
To: kde-commits
Subject: [umbrello/frameworks] umbrello: Fixing the creation of the properties dialog.
Message-Id: <E1Ynweo-0004C3-1v () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=143043182115848

Git commit 4e66f1e5e4a3e111cdfba81d7983dd641ad98be1 by Andi Fischer.
Committed on 30/04/2015 at 12:37.
Pushed by fischer into branch 'frameworks'.

Fixing the creation of the properties dialog.

M  +2    -5    umbrello/dialogs/multipagedialogbase.cpp
M  +2    -0    umbrello/dialogs/umlviewdialog.cpp
M  +1    -0    umbrello/umlscene.cpp

http://commits.kde.org/umbrello/4e66f1e5e4a3e111cdfba81d7983dd641ad98be1

diff --git a/umbrello/dialogs/multipagedialogbase.cpp b/umbrello/dialogs/mu=
ltipagedialogbase.cpp
index 073cf8c..242acd5 100644
--- a/umbrello/dialogs/multipagedialogbase.cpp
+++ b/umbrello/dialogs/multipagedialogbase.cpp
@@ -38,7 +38,7 @@
 #include <QKeyEvent>
 #include <QPushButton>
 =

-DEBUG_REGISTER(DialogBase)
+DEBUG_REGISTER(MultiPageDialogBase)
 =

 /**
  * Constructor
@@ -54,10 +54,7 @@ MultiPageDialogBase::MultiPageDialogBase(QWidget *parent=
, bool withDefaultButton
     m_pageWidget(0),
     m_isModified(false)
 {
-    bool useDialog =3D false;
-    if (parent) {
-        useDialog =3D (strcmp(parent->metaObject()->className(),"Propertie=
sWindow") !=3D 0);
-    }
+    bool useDialog =3D !parent || (strcmp(parent->metaObject()->className(=
),"PropertiesWindow") !=3D 0);
     if (useDialog) {
         m_pageDialog =3D new KPageDialog(parent);
         m_pageDialog->setModal(true);
diff --git a/umbrello/dialogs/umlviewdialog.cpp b/umbrello/dialogs/umlviewd=
ialog.cpp
index 198243c..847f4fa 100644
--- a/umbrello/dialogs/umlviewdialog.cpp
+++ b/umbrello/dialogs/umlviewdialog.cpp
@@ -31,6 +31,8 @@
 #include <QFontDialog>
 #include <QHBoxLayout>
 =

+DEBUG_REGISTER(UMLViewDialog)
+
 /**
  * Constructor.
  */
diff --git a/umbrello/umlscene.cpp b/umbrello/umlscene.cpp
index 53b304a..679703f 100644
--- a/umbrello/umlscene.cpp
+++ b/umbrello/umlscene.cpp
@@ -2858,6 +2858,7 @@ void UMLScene::setPaste(bool paste)
 void UMLScene::slotMenuSelection(QAction* action)
 {
     ListPopupMenu::MenuType sel =3D ListPopupMenu::typeFromAction(action);
+    // DEBUG(DBG_SRC) << "menu=3D " << action->text() << " / type=3D " << =
ListPopupMenu::toString(sel);
     switch (sel) {
     case ListPopupMenu::mt_Undo:
         UMLApp::app()->undo();