From 3c42cd451d03b8b59e8dad3e320741f0632b8e07 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Sat, 15 Jun 2019 21:27:28 -0400
Subject: [PATCH] tycho: add close button

---
 source/tycho/cc_headers/menu.h |  2 +-
 source/tycho/cc_source/menu.cc |  8 +++++---
 source/tycho/ui/menu.ui        | 29 +++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/source/tycho/cc_headers/menu.h b/source/tycho/cc_headers/menu.h
index 22e103f..0ae50ff 100644
--- a/source/tycho/cc_headers/menu.h
+++ b/source/tycho/cc_headers/menu.h
@@ -33,7 +33,7 @@ protected:
 private:
    ProjectView *activeProject() const;
    QMdiSubWindow *activeSubWindow() const;
-   void addProject(ProjectView *proj);
+   void addProject(ProjectView *view);
 
    QSharedPointer<Ui::Menu> ui;
 };
diff --git a/source/tycho/cc_source/menu.cc b/source/tycho/cc_source/menu.cc
index 5419421..3476e48 100644
--- a/source/tycho/cc_source/menu.cc
+++ b/source/tycho/cc_source/menu.cc
@@ -17,11 +17,12 @@ Menu::Menu(QWidget *parent) :
 {
    ui->setupUi(this);
 
-   ui->actionOpen->setShortcut(QKeySequence(QKeySequence::Open));
-   ui->actionNew->setShortcut(QKeySequence(QKeySequence::New));
-   ui->actionQuit->setShortcut(QKeySequence(QKeySequence::Quit));
    ui->actionAbout->setShortcut(QKeySequence(QKeySequence::HelpContents));
+   ui->actionClose->setShortcut(QKeySequence(QKeySequence::Close));
    ui->actionMapProps->setShortcut(QKeySequence(tr("Ctrl+P")));
+   ui->actionNew->setShortcut(QKeySequence(QKeySequence::New));
+   ui->actionOpen->setShortcut(QKeySequence(QKeySequence::Open));
+   ui->actionQuit->setShortcut(QKeySequence(QKeySequence::Quit));
 
    dbgPrintFunc();
 }
@@ -110,6 +111,7 @@ void Menu::updateActions()
    auto view   = activeProject();
    bool active = view != nullptr;
 
+   ui->actionClose->setEnabled(active);
    ui->actionMapProps->setEnabled(active);
 
    dbgPrintFunc();
diff --git a/source/tycho/ui/menu.ui b/source/tycho/ui/menu.ui
index 3c4e8ff..954eef4 100644
--- a/source/tycho/ui/menu.ui
+++ b/source/tycho/ui/menu.ui
@@ -61,6 +61,8 @@
     <addaction name="actionNew"/>
     <addaction name="actionOpen"/>
     <addaction name="separator"/>
+    <addaction name="actionClose"/>
+    <addaction name="separator"/>
     <addaction name="actionQuit"/>
    </widget>
    <widget class="QMenu" name="menuEdit">
@@ -128,6 +130,17 @@
     <string>&amp;About Tycho</string>
    </property>
   </action>
+  <action name="actionClose">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="window-close"/>
+   </property>
+   <property name="text">
+    <string>&amp;Close</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
@@ -230,6 +243,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionClose</sender>
+   <signal>triggered()</signal>
+   <receiver>mdiArea</receiver>
+   <slot>closeActiveSubWindow()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>399</x>
+     <y>301</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>openMapProperties()</slot>