fix #68151, fix #68856, fix #97796, fix #97821, fix #112291: save/res…

…tore geometry
musescore · Jul 30, 2016 · d2bf3b8 · d2bf3b8
1 parent 8c79698
commit d2bf3b8
Show file tree

Hide file tree

Showing 15 changed files with 105 additions and 3 deletions.
diff --git a/mscore/editpitch.cpp b/mscore/editpitch.cpp
@@ -19,6 +19,7 @@
 //=============================================================================
 
 #include "editpitch.h"
+#include "musescore.h"
 
 namespace Ms {
 
@@ -30,24 +31,38 @@ namespace Ms {
 EditPitch::EditPitch(QWidget *parent)
    : QDialog(parent)
       {
+      setObjectName("EditPitchNew");
       setupUi(this);
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       tableWidget->setCurrentCell(4, 0);                    // select centre C by default
+      MuseScore::restoreGeometry(this);
       }
 
 EditPitch::EditPitch(QWidget *parent, int midiCode)
    : QDialog(parent)
       {
+      setObjectName("EditPitchEdit");
       setupUi(this);
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       tableWidget->setCurrentCell(9-(midiCode/12), midiCode%12);
+      MuseScore::restoreGeometry(this);
       }
 
 EditPitch::~EditPitch()
 {
 
 }
 
+//---------------------------------------------------------
+//   hideEvent
+//---------------------------------------------------------
+
+void EditPitch::hideEvent(QHideEvent* ev)
+      {
+      MuseScore::saveGeometry(this);
+      QWidget::hideEvent(ev);
+      }
+
 void EditPitch::accept()
       {
       int   col = tableWidget->currentColumn();

diff --git a/mscore/editpitch.h b/mscore/editpitch.h
@@ -32,6 +32,8 @@ namespace Ms {
 class EditPitch : public QDialog, private Ui::EditPitchBase {
       Q_OBJECT
 
+      virtual void hideEvent(QHideEvent*);
+
    private slots:
       void on_tableWidget_cellDoubleClicked(int row, int column);
       void accept();

diff --git a/mscore/editstafftype.cpp b/mscore/editstafftype.cpp
@@ -36,6 +36,7 @@ const char* g_groupNames[STAFF_GROUP_MAX] = {
 EditStaffType::EditStaffType(QWidget* parent, Staff* st)
    : QDialog(parent)
       {
+      setObjectName("EditStaffType");
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       setupUi(this);
 
@@ -123,6 +124,18 @@ EditStaffType::EditStaffType(QWidget* parent, Staff* st)
       connect(templateReset,        SIGNAL(clicked()),                  SLOT(resetToTemplateClicked()));
       connect(addToTemplates,       SIGNAL(clicked()),                  SLOT(addToTemplatesClicked()));
 //      connect(groupCombo,           SIGNAL(currentIndexChanged(int)),   SLOT(staffGroupChanged(int)));
+
+      MuseScore::restoreGeometry(this);
+      }
+
+//---------------------------------------------------------
+//   hideEvent
+//---------------------------------------------------------
+
+void EditStaffType::hideEvent(QHideEvent* ev)
+      {
+      MuseScore::saveGeometry(this);
+      QWidget::hideEvent(ev);
       }
 
 //---------------------------------------------------------

diff --git a/mscore/editstafftype.h b/mscore/editstafftype.h
@@ -34,6 +34,7 @@ class EditStaffType : public QDialog, private Ui::EditStaffType {
       Staff* staff;
       StaffType staffType;
 
+      virtual void hideEvent(QHideEvent *);
       void blockSignals(bool block);
 
       void setFromDlg();

diff --git a/mscore/editstringdata.cpp b/mscore/editstringdata.cpp
@@ -20,6 +20,7 @@
 
 #include "editstringdata.h"
 #include "editpitch.h"
+#include "musescore.h"
 
 namespace Ms {
 
@@ -31,6 +32,7 @@ namespace Ms {
 EditStringData::EditStringData(QWidget *parent, QList<instrString> * strings, int * frets)
    : QDialog(parent)
       {
+      setObjectName("EditStringData");
       setupUi(this);
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       _strings = strings;
@@ -73,12 +75,24 @@ EditStringData::EditStringData(QWidget *parent, QList<instrString> * strings, in
       connect(stringList,   SIGNAL(doubleClicked(QModelIndex)),     SLOT(editStringClicked()));
       connect(stringList,   SIGNAL(itemClicked(QTableWidgetItem*)), SLOT(listItemClicked(QTableWidgetItem *)));
       _modified = false;
+
+      MuseScore::restoreGeometry(this);
       }
 
 EditStringData::~EditStringData()
 {
 }
 
+//---------------------------------------------------------
+//   hideEvent
+//---------------------------------------------------------
+
+void EditStringData::hideEvent(QHideEvent* ev)
+      {
+      MuseScore::saveGeometry(this);
+      QWidget::hideEvent(ev);
+      }
+
 //---------------------------------------------------------
 //   deleteStringClicked
 //---------------------------------------------------------

diff --git a/mscore/editstringdata.h b/mscore/editstringdata.h
@@ -37,6 +37,8 @@ class EditStringData : public QDialog, private Ui::EditStringDataBase {
       QList<instrString>* _strings;         // pointer to original string list
       QList<instrString>  _stringsLoc;      // local working copy of string list
 
+      virtual void hideEvent(QHideEvent*);
+
    public:
       EditStringData(QWidget *parent, QList<instrString> * strings, int * frets);
       ~EditStringData();

diff --git a/mscore/editstyle.cpp b/mscore/editstyle.cpp
@@ -37,6 +37,7 @@ namespace Ms {
 EditStyle::EditStyle(Score* s, QWidget* parent)
    : QDialog(parent)
       {
+      setObjectName("EditStyle");
       setupUi(this);
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       cs = s;
@@ -434,10 +435,20 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
       connect(mapper,  SIGNAL(mapped(int)), SLOT(resetStyleValue(int)));
       connect(mapper2, SIGNAL(mapped(int)), SLOT(valueChanged(int)));
 
-      resize(904, 577); // override designer values
+      MuseScore::restoreGeometry(this);
       cs->startCmd();
       }
 
+//---------------------------------------------------------
+//   closeEvent
+//---------------------------------------------------------
+
+void EditStyle::hideEvent(QHideEvent* ev)
+      {
+      MuseScore::saveGeometry(this);
+      QWidget::hideEvent(ev);
+      }
+
 //---------------------------------------------------------
 //   buttonClicked
 //---------------------------------------------------------

diff --git a/mscore/editstyle.h b/mscore/editstyle.h
@@ -53,6 +53,7 @@ class EditStyle : public QDialog, private Ui::EditStyleBase {
       QVector<StyleWidget> styleWidgets;
       QSignalMapper* anchorMapper;
 
+      virtual void hideEvent(QHideEvent*);
       QVariant getValue(StyleIdx idx);
 //      void getValues();
       void setValues();

diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1125</width>
-    <height>865</height>
+    <width>904</width>
+    <height>580</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/mscore/pagesettings.cpp b/mscore/pagesettings.cpp
@@ -37,6 +37,7 @@ namespace Ms {
 PageSettings::PageSettings(QWidget* parent)
    : AbstractDialog(parent)
       {
+      setObjectName("PageSettings");
       setupUi(this);
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       setModal(true);
@@ -53,6 +54,9 @@ PageSettings::PageSettings(QWidget* parent)
             mmButton->setChecked(true);
       else
             inchButton->setChecked(true);
+
+      MuseScore::restoreGeometry(this);
+
       connect(mmButton,             SIGNAL(clicked()),            SLOT(mmClicked()));
       connect(inchButton,           SIGNAL(clicked()),            SLOT(inchClicked()));
       connect(buttonApply,          SIGNAL(clicked()),            SLOT(apply()));
@@ -83,6 +87,16 @@ PageSettings::~PageSettings()
       {
       }
 
+//---------------------------------------------------------
+//   hideEvent
+//---------------------------------------------------------
+
+void PageSettings::hideEvent(QHideEvent* ev)
+      {
+      MuseScore::saveGeometry(this);
+      QWidget::hideEvent(ev);
+      }
+
 //---------------------------------------------------------
 //   setScore
 //---------------------------------------------------------

diff --git a/mscore/pagesettings.h b/mscore/pagesettings.h
@@ -40,6 +40,8 @@ class PageSettings : public AbstractDialog, private Ui::PageSettingsBase {
       Navigator* preview;
       bool mmUnit;
       MasterScore* cs;
+
+      virtual void hideEvent(QHideEvent*);
       void updateValues();
       void updatePreview(int);
       void blockSignals(bool);

diff --git a/mscore/preferences.cpp b/mscore/preferences.cpp
@@ -539,6 +539,7 @@ void MuseScore::startPreferenceDialog()
 PreferenceDialog::PreferenceDialog(QWidget* parent)
    : AbstractDialog(parent)
       {
+      setObjectName("PreferenceDialog");
       setupUi(this);
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       setModal(true);
@@ -637,6 +638,8 @@ PreferenceDialog::PreferenceDialog(QWidget* parent)
       connect(useJackAudio, SIGNAL(toggled(bool)), SLOT(nonExclusiveJackDriver(bool)));
       connect(useJackMidi,  SIGNAL(toggled(bool)), SLOT(nonExclusiveJackDriver(bool)));
       updateRemote();
+
+      MuseScore::restoreGeometry(this);
       }
 
 //---------------------------------------------------------
@@ -658,6 +661,16 @@ PreferenceDialog::~PreferenceDialog()
       qDeleteAll(localShortcuts);
       }
 
+//---------------------------------------------------------
+//   hideEvent
+//---------------------------------------------------------
+
+void PreferenceDialog::hideEvent(QHideEvent* ev)
+      {
+      MuseScore::saveGeometry(this);
+      QWidget::hideEvent(ev);
+      }
+
 //---------------------------------------------------------
 //   recordButtonClicked
 //---------------------------------------------------------

diff --git a/mscore/prefsdialog.h b/mscore/prefsdialog.h
@@ -41,6 +41,7 @@ class PreferenceDialog : public AbstractDialog, private Ui::PrefsDialogBase {
       QButtonGroup* recordButtons;
       Preferences prefs;
 
+      virtual void hideEvent(QHideEvent*);
       void apply();
       void updateSCListView();
       void setUseMidiOutput(bool);

diff --git a/mscore/textpalette.cpp b/mscore/textpalette.cpp
@@ -540,6 +540,7 @@ const QStringList unicodeRangeNames = {
 TextPalette::TextPalette(QWidget* parent)
    : QWidget(parent)
       {
+      setObjectName("TextPalette");
       setWindowFlags(Qt::Tool);
       setupUi(this);
 
@@ -604,6 +605,7 @@ TextPalette::TextPalette(QWidget* parent)
       populateSmufl();
 
       setFocusPolicy(Qt::NoFocus);
+      MuseScore::restoreGeometry(this);
       }
 
 //---------------------------------------------------------
@@ -837,6 +839,16 @@ void TextPalette::setText(Text* te)
       _textElement = te;
       }
 
+//---------------------------------------------------------
+//   hideEvent
+//---------------------------------------------------------
+
+void TextPalette::hideEvent(QHideEvent* ev)
+      {
+      MuseScore::saveGeometry(this);
+      QWidget::hideEvent(ev);
+      }
+
 //---------------------------------------------------------
 //   closeEvent
 //---------------------------------------------------------

diff --git a/mscore/textpalette.h b/mscore/textpalette.h
@@ -44,6 +44,7 @@ class TextPalette : public QWidget, public Ui::TextPaletteBase {
       QListWidget* lws;
       QListWidget* lwu;
 
+      virtual void hideEvent(QHideEvent*);
       void closeEvent(QCloseEvent* ev);
       void populateCommon();