diff options
author | Robert Jonsson <spamatica@gmail.com> | 2011-02-13 15:31:38 +0000 |
---|---|---|
committer | Robert Jonsson <spamatica@gmail.com> | 2011-02-13 15:31:38 +0000 |
commit | ab1e5cf55eec23a64eed68835a5f0bd6b2ad0a39 (patch) | |
tree | b9401eec8d60097b1372e6bae2e94db567d55902 /muse2/muse/waveedit | |
parent | fc7c7e9f8dc1e86efa19434c7f01d5ac24f7fc55 (diff) |
fixes, see changelog
Diffstat (limited to 'muse2/muse/waveedit')
-rw-r--r-- | muse2/muse/waveedit/waveedit.cpp | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp index 89e7fb78..2350a2c5 100644 --- a/muse2/muse/waveedit/waveedit.cpp +++ b/muse2/muse/waveedit/waveedit.cpp @@ -5,6 +5,22 @@ // (C) Copyright 2000 Werner Schweer (ws@seh.de) //========================================================= +#include <QMenu> +#include <QSignalMapper> +#include <QToolBar> +#include <QToolButton> +#include <QLayout> +#include <QSizeGrip> +#include <QScrollBar> +#include <QLabel> +#include <QSlider> +#include <QMenuBar> +#include <QAction> +#include <QCloseEvent> +#include <QResizeEvent> +#include <QKeyEvent> +#include <QSettings> + #include "app.h" #include "xml.h" #include "waveedit.h" @@ -21,20 +37,6 @@ #include "icons.h" #include "shortcuts.h" -#include <QMenu> -#include <QSignalMapper> -#include <QToolBar> -#include <QToolButton> -#include <QLayout> -#include <QSizeGrip> -#include <QScrollBar> -#include <QLabel> -#include <QSlider> -#include <QMenuBar> -#include <QAction> -#include <QCloseEvent> -#include <QResizeEvent> -#include <QKeyEvent> extern QColor readColor(Xml& xml); @@ -47,6 +49,9 @@ int WaveEdit::_heightInit = 400; void WaveEdit::closeEvent(QCloseEvent* e) { + QSettings settings("MusE", "MusE-qt"); + //settings.setValue("Waveedit/geometry", saveGeometry()); + settings.setValue("Waveedit/windowState", saveState()); emit deleted((unsigned long)this); e->accept(); } @@ -148,21 +153,25 @@ WaveEdit::WaveEdit(PartList* pl) connect(selectNoneAction, SIGNAL(triggered()), mapper, SLOT(map())); //---------ToolBar---------------------------------- - tools = addToolBar(tr("Wave edit tools")); + tools = addToolBar(tr("Wave edit tools")); + tools->setObjectName("Wave edit tools"); + tools->addActions(undoRedo->actions()); connect(muse, SIGNAL(configChanged()), SLOT(configChanged())); //-------------------------------------------------- // Transport Bar - QToolBar* transport = addToolBar(tr("transport")); + QToolBar* transport = addToolBar(tr("transport")); + transport->setObjectName("transport"); transport->addActions(transportAction->actions()); //-------------------------------------------------- // ToolBar: Solo Cursor1 Cursor2 addToolBarBreak(); - tb1 = addToolBar(tr("Pianoroll tools")); + tb1 = addToolBar(tr("Pianoroll tools")); + tb1->setObjectName("Pianoroll tools"); //tb1->setLabel(tr("weTools")); solo = new QToolButton(); @@ -251,6 +260,10 @@ WaveEdit::WaveEdit(PartList* pl) WavePart* part = (WavePart*)(parts()->begin()->second); solo->setChecked(part->track()->solo()); } + QSettings settings("MusE", "MusE-qt"); + //restoreGeometry(settings.value("Waveedit/geometry").toByteArray()); + restoreState(settings.value("Waveedit/windowState").toByteArray()); + } void WaveEdit::initShortcuts() |