diff options
| author | Tim E. Real <termtech@rogers.com> | 2011-08-17 01:17:50 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2011-08-17 01:17:50 +0000 |
| commit | 516a5fafd56fa9d70d6aba20978d6e177cdf5502 (patch) | |
| tree | bc1ba0dcb77a0e6835eba05712bf0bfd4d2ebe24 /muse2/muse/master/masteredit.cpp | |
| parent | 96cd2ef23505deaadb030ea0f1ef284e8a753452 (diff) | |
Fixed unreadable Master Edit tempo scale (on left side), and added toolbar saving and restoring.
Diffstat (limited to 'muse2/muse/master/masteredit.cpp')
| -rw-r--r-- | muse2/muse/master/masteredit.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp index 9053f3a8..fafa3b4f 100644 --- a/muse2/muse/master/masteredit.cpp +++ b/muse2/muse/master/masteredit.cpp @@ -31,6 +31,7 @@ #include <QLabel> #include <QToolBar> #include <QToolButton> +#include <QSettings> int MasterEdit::_rasterInit = 0; int MasterEdit::_widthInit = 600; @@ -43,6 +44,10 @@ QByteArray MasterEdit::_toolbarInit; void MasterEdit::closeEvent(QCloseEvent* e) { + QSettings settings("MusE", "MusE-qt"); + //settings.setValue("MasterEdit/geometry", saveGeometry()); + settings.setValue("MasterEdit/windowState", saveState()); + emit deleted((unsigned long)this); e->accept(); } @@ -94,12 +99,14 @@ MasterEdit::MasterEdit() //---------ToolBar---------------------------------- tools = addToolBar(tr("Master tools")); + tools->setObjectName("Master tools"); tools->addActions(undoRedo->actions()); EditToolBar* tools2 = new EditToolBar(this, PointerTool | PencilTool | RubberTool); addToolBar(tools2); QToolBar* enableMaster = addToolBar(tr("Enable master")); + enableMaster->setObjectName("Enable master"); enableButton = new QToolButton(); enableButton->setCheckable(true); enableButton->setText(tr("Enable")); @@ -109,6 +116,7 @@ MasterEdit::MasterEdit() connect(enableButton, SIGNAL(toggled(bool)), song, SLOT(setMasterFlag(bool))); QToolBar* info = addToolBar(tr("Info")); + info->setObjectName("Info"); QLabel* label = new QLabel(tr("Cursor")); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label->setIndent(3); @@ -235,6 +243,10 @@ MasterEdit::MasterEdit() if (!_toolbarInit.isEmpty()) restoreState(_toolbarInit); + + QSettings settings("MusE", "MusE-qt"); + //restoreGeometry(settings.value("MasterEdit/geometry").toByteArray()); + restoreState(settings.value("MasterEdit/windowState").toByteArray()); } //--------------------------------------------------------- |