From 8e05c84d422bb8bdb27bb2e0729ccb1956f662b1 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Mon, 10 Jun 2019 14:44:25 -0400
Subject: [PATCH] make the map properties widget actually a widget

---
 source/tycho/cc_source/mapprops.cc | 12 +++++++
 source/tycho/ui/mapprops.ui        | 50 +++---------------------------
 2 files changed, 16 insertions(+), 46 deletions(-)

diff --git a/source/tycho/cc_source/mapprops.cc b/source/tycho/cc_source/mapprops.cc
index 41cc735..f2cf73e 100644
--- a/source/tycho/cc_source/mapprops.cc
+++ b/source/tycho/cc_source/mapprops.cc
@@ -2,11 +2,23 @@
 #include "mapprops.h"
 #include "../ui/ui_mapprops.h"
 
+#include <QDialogButtonBox>
+
 MapProps::MapProps(QWidget *parent) :
    QDialog(parent),
    ui(new Ui::MapProps)
 {
    ui->setupUi(this);
+
+   setModal(true);
+
+   auto bbox = new QDialogButtonBox(this);
+   bbox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+   ui->verticalLayout->addWidget(bbox);
+
+   connect(bbox, SIGNAL(accepted()), this, SLOT(accept()));
+   connect(bbox, SIGNAL(rejected()), this, SLOT(reject()));
+
    dbgPrintFunc();
 }
 
diff --git a/source/tycho/ui/mapprops.ui b/source/tycho/ui/mapprops.ui
index 430239d..5ffb711 100644
--- a/source/tycho/ui/mapprops.ui
+++ b/source/tycho/ui/mapprops.ui
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MapProps</class>
- <widget class="QDialog" name="MapProps">
+ <widget class="QWidget" name="MapProps">
+  <property name="modal" stdset="0">
+   <bool>false</bool>
+  </property>
   <property name="windowModality">
    <enum>Qt::WindowModal</enum>
   </property>
@@ -16,9 +19,6 @@
   <property name="windowTitle">
    <string>Map Properties</string>
   </property>
-  <property name="modal">
-   <bool>true</bool>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox_5">
@@ -431,16 +431,6 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
@@ -461,37 +451,5 @@ Some of them also set the &quot;failure&quot; terminal state when the objective
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>MapProps</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>345</x>
-     <y>645</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>287</x>
-     <y>-12</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>MapProps</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>315</x>
-     <y>648</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>324</x>
-     <y>-6</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>