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

List:       kde-commits
Subject:    [umbrello/frameworks] umbrello: Fixing the creation of the properties dialog.
From:       Andi Fischer <andi.fischer () hispeed ! ch>
Date:       2015-04-30 22:10:10
Message-ID: E1Ynweo-0004C3-1v () scm ! kde ! org
[Download RAW message or body]

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/multipagedialogbase.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 = false;
-    if (parent) {
-        useDialog = (strcmp(parent->metaObject()->className(),"PropertiesWindow") != 0);
-    }
+    bool useDialog = !parent || (strcmp(parent->metaObject()->className(),"PropertiesWindow") != 0);
     if (useDialog) {
         m_pageDialog = new KPageDialog(parent);
         m_pageDialog->setModal(true);
diff --git a/umbrello/dialogs/umlviewdialog.cpp b/umbrello/dialogs/umlviewdialog.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 = ListPopupMenu::typeFromAction(action);
+    // DEBUG(DBG_SRC) << "menu= " << action->text() << " / type= " << ListPopupMenu::toString(sel);
     switch (sel) {
     case ListPopupMenu::mt_Undo:
         UMLApp::app()->undo();
[prev in list] [next in list] [prev in thread] [next in thread]