fixed some bugs, see ChangeLog

3 files changed, 12 insertions, 12 deletions

diff --git a/muse2/muse/instruments/editinstrument.cpp b/muse2/muse/instruments/editinstrument.cpp
index 7205af9d..8378bd68 100644
--- a/muse2/muse/instruments/editinstrument.cpp
+++ b/muse2/muse/instruments/editinstrument.cpp
@@ -74,7 +74,7 @@ EditInstrument::EditInstrument(QWidget* parent, Qt::WFlags fl)
       fileOpenAction->setIcon(QIcon(*openIcon));
       fileSaveAction->setIcon(QIcon(*saveIcon));
       fileSaveAsAction->setIcon(QIcon(*saveasIcon));
-      fileExitAction->setIcon(QIcon(*exitIcon));
+      fileCloseAction->setIcon(QIcon(*exitIcon));
       viewController->setSelectionMode(QAbstractItemView::SingleSelection);
       toolBar->addAction(QWhatsThis::createAction(this));
       Help->addAction(QWhatsThis::createAction(this));
@@ -948,12 +948,12 @@ void EditInstrument::fileSaveAs()
     }
 
 //---------------------------------------------------------
-//   fileExit
+//   fileClose
 //---------------------------------------------------------
 
-void EditInstrument::fileExit()
+void EditInstrument::fileClose()
       {
-
+        close();
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/instruments/editinstrument.h b/muse2/muse/instruments/editinstrument.h
index 9e7af7d2..90745301 100644
--- a/muse2/muse/instruments/editinstrument.h
+++ b/muse2/muse/instruments/editinstrument.h
@@ -82,7 +82,7 @@ class EditInstrument : public QMainWindow, public Ui::EditInstrumentBase {
       virtual void fileOpen();
       virtual void fileSave();
       virtual void fileSaveAs();
-      virtual void fileExit();
+      virtual void fileClose();
       virtual void helpWhatsThis();
       void instrumentChanged();
       void tabChanged(QWidget*);
diff --git a/muse2/muse/instruments/editinstrumentbase.ui b/muse2/muse/instruments/editinstrumentbase.ui
index 65bc007d..e1f935d5 100644
--- a/muse2/muse/instruments/editinstrumentbase.ui
+++ b/muse2/muse/instruments/editinstrumentbase.ui
@@ -1837,7 +1837,7 @@ Typically, set to 127/127, or an unused
     <addaction name="fileSaveAction"/>
     <addaction name="fileSaveAsAction"/>
     <addaction name="separator"/>
-    <addaction name="fileExitAction"/>
+    <addaction name="fileCloseAction"/>
    </widget>
    <widget class="QMenu" name="Help">
     <property name="title">
@@ -1909,18 +1909,18 @@ Typically, set to 127/127, or an unused
     <cstring>fileSaveAsAction</cstring>
    </property>
   </action>
-  <action name="fileExitAction">
+  <action name="fileCloseAction">
    <property name="text">
-    <string>E&amp;xit</string>
+    <string>&amp;Close</string>
    </property>
    <property name="iconText">
-    <string>Exit</string>
+    <string>Close</string>
    </property>
    <property name="shortcut">
     <string/>
    </property>
    <property name="name" stdset="0">
-    <cstring>fileExitAction</cstring>
+    <cstring>fileCloseAction</cstring>
    </property>
   </action>
   <action name="filenew_itemAction">
@@ -2040,10 +2040,10 @@ Typically, set to 127/127, or an unused
    </hints>
   </connection>
   <connection>
-   <sender>fileExitAction</sender>
+   <sender>fileCloseAction</sender>
    <signal>activated()</signal>
    <receiver>EditInstrumentBase</receiver>
-   <slot>fileExit()</slot>
+   <slot>fileClose()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>-1</x>