Fix up Dialog Window Crash before connecting - Issue #42

OpenZWave · Jun 9, 2020 · 2665f31 · 2665f31
1 parent 18f15f4
commit 2665f31
Show file tree

Hide file tree

Showing 8 changed files with 423 additions and 361 deletions.
diff --git a/ozwadmin-main/configuration.cpp b/ozwadmin-main/configuration.cpp
diff --git a/ozwadmin-main/configuration.h b/ozwadmin-main/configuration.h
@@ -18,7 +18,7 @@ class Configuration : public QDialog
     Q_OBJECT
 
 public:
-    explicit Configuration(QTOZWOptions *options, QWidget *parent = nullptr);
+    explicit Configuration(QWidget *parent = nullptr);
     ~Configuration();
     void saveConfiguration();
 
@@ -28,8 +28,8 @@ class Configuration : public QDialog
     QtTreePropertyBrowser *m_variantEditor;
     QtVariantPropertyManager *variantManager;
     QtEnumPropertyManager *enumManager;
-    QTOZWOptions *m_options;
     QMap<QString, QtProperty *> m_variantToProperty;
+    QTOZWOptions *m_options;
 };
 
 #endif // CONFIGURATION_H
diff --git a/ozwadmin-main/configuration.ui b/ozwadmin-main/configuration.ui
@@ -17,14 +17,19 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="config_ozw">
       <attribute name="title">
        <string>OpenZWave</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout"/>
      </widget>
+     <widget class="QWidget" name="config_net">
+      <attribute name="title">
+       <string>Network</string>
+      </attribute>
+     </widget>
     </widget>
    </item>
    <item>

diff --git a/ozwadmin-main/mainwindow.cpp b/ozwadmin-main/mainwindow.cpp
@@ -69,7 +69,7 @@ MainWindow::MainWindow(QWidget *parent) :
 	connect(ui->actionOpen, SIGNAL(triggered()), this, SLOT(OpenConnection()));
 	connect(ui->action_Close, SIGNAL(triggered()), this, SLOT(CloseConnection()));
 	connect(ui->actionDevice_Database, SIGNAL(triggered()), this, SLOT(OpenDeviceDB()));
-	connect(ui->action_Configuration, SIGNAL(triggered()), this, SLOT(openConfigWindow()));
+	connect(ui->action_Preferences, SIGNAL(triggered()), this, SLOT(openPreferencesWindow()));
 	connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(openAboutWindow()));
 	connect(ui->action_AddNode, SIGNAL(triggered()), this, SLOT(addNode()));
 	connect(ui->action_Delete_Node, SIGNAL(triggered()), this, SLOT(delNode()));
@@ -162,7 +162,10 @@ void MainWindow::openDefaultWindows() {
 
 	ads::CDockWidget *configValueDW = new ads::CDockWidget("Config Values");
 	configValueDW->setWidget(configValues);
-	this->ui->menuWindow->addAction(configValueDW->toggleViewAction());
+	/* OSX thinks this is a Preferences Window, so tell QT to tell it "its not!"" */
+	QAction *configAction = configValueDW->toggleViewAction();
+	configAction->setMenuRole(QAction::NoRole);
+	this->ui->menuWindow->addAction(configAction);
 	this->m_DockManager->addDockWidget(ads::CenterDockWidgetArea, configValueDW, RightDockWidget);
 
 	this->ui->menuWindow->addSeparator();
@@ -293,8 +296,8 @@ void MainWindow::OpenDeviceDB() {
     ddb->show();
 }
 
-void MainWindow::openConfigWindow() {
-    Configuration *cfg = new Configuration(OZWCore::get()->getQTOZWManager()->getOptions(), this);
+void MainWindow::openPreferencesWindow() {
+    Configuration *cfg = new Configuration(this);
     cfg->show();
 }
 

diff --git a/ozwadmin-main/mainwindow.h b/ozwadmin-main/mainwindow.h
@@ -52,7 +52,7 @@ public slots:
     void QTOZW_Ready(bool ready);
     void openAboutWindow();
     void openMetaDataWindow();
-    void openConfigWindow();
+    void openPreferencesWindow();
     void addNode();
     void delNode();
     void healNetwork();

diff --git a/ozwadmin-main/mainwindow.ui b/ozwadmin-main/mainwindow.ui
@@ -37,7 +37,7 @@
     </property>
     <addaction name="separator"/>
     <addaction name="actionDevice_Database"/>
-    <addaction name="action_Configuration"/>
+    <addaction name="action_Preferences"/>
     <addaction name="separator"/>
     <addaction name="actionE_xit"/>
    </widget>
@@ -76,9 +76,12 @@
    <addaction name="actionDevice_Database"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
-  <action name="action_Configuration">
+  <action name="action_Preferences">
    <property name="text">
-    <string>&amp;Configuration</string>
+    <string>&amp;Preferences</string>
+   </property>
+   <property name="toolTip">
+    <string>Preferences</string>
    </property>
   </action>
   <action name="actionE_xit">

diff --git a/ozwadmin-main/ozwadmin-main.pro b/ozwadmin-main/ozwadmin-main.pro
@@ -98,7 +98,7 @@ macx: {
     OZWDB.path = Contents/Resources/
     QMAKE_BUNDLE_DATA += BUNDLE
     QMAKE_BUNDLE_DATA += OZWDB
-    MakeBundle.commands = $$[QT_HOST_BINS]/macdeployqt ../ozwadmin.app && $$top_srcdir/scripts/macdeployqtfix.py ../ozwadmin.app/Contents/MacOS/ozwadmin $$[QT_INSTALL_PREFIX]
+    MakeBundle.commands = $$[QT_HOST_BINS]/macdeployqt ../ozwadmin.app -no-strip && $$top_srcdir/scripts/macdeployqtfix.py ../ozwadmin.app/Contents/MacOS/ozwadmin $$[QT_INSTALL_PREFIX]
     QMAKE_EXTRA_TARGETS += MakeBundle
     QMAKE_POST_LINK += $$MakeBundle.commands
     ICON = res/ozw_logo.icns

diff --git a/ozwadmin-main/ozwcore.cpp b/ozwadmin-main/ozwcore.cpp
@@ -8,8 +8,11 @@
 
 Q_GLOBAL_STATIC(OZWCore, globalState)
 
+
 OZWCore::OZWCore(QObject *parent) : 
-    QObject(parent)
+    QObject(parent),
+    m_openzwave(nullptr),
+    m_qtozwmanager(nullptr)
 {
 }
 
@@ -23,11 +26,16 @@ void OZWCore::initilize() {
 	m_userpath = QFileInfo(settings.value("openzwave/UserPath").toString()).absoluteFilePath();
     this->m_openzwave = new QTOpenZwave(this, m_configpath, m_userpath);
     this->m_qtozwmanager = this->m_openzwave->GetManager();
+    qCInfo(ozwadmin) << "OZWCore Initilized" << this->m_openzwave << this->m_qtozwmanager;
 }
 
 QTOpenZwave *OZWCore::getQTOZW() {
+    if (!this->m_openzwave)
+        qCWarning(ozwadmin) << "QTOpenZWave is not Created!";
     return this->m_openzwave;
 }
 QTOZWManager *OZWCore::getQTOZWManager() {
+    if (!this->m_qtozwmanager)
+        qCWarning(ozwadmin) << "QTOZWManager is not created!";
     return this->m_qtozwmanager;
 }