summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--muse/awl/tcanvas.cpp12
-rw-r--r--muse/muse/arranger/arranger.cpp2
-rw-r--r--muse/muse/muse.cpp14
-rw-r--r--muse/muse/muse.qrc3
-rw-r--r--muse/muse/shortcuts.cpp44
5 files changed, 49 insertions, 26 deletions
diff --git a/muse/awl/tcanvas.cpp b/muse/awl/tcanvas.cpp
index 9ded1a2a..157c0187 100644
--- a/muse/awl/tcanvas.cpp
+++ b/muse/awl/tcanvas.cpp
@@ -128,6 +128,14 @@ TimeCanvas::TimeCanvas(TimeCanvasType t)
_ymagMax = 1.0;
yRange = drumHeight * 128;
break;
+ case TIME_CANVAS_WAVEEDIT:
+ _xmagMin = 0.001;
+ _xmagMax = 100.0;
+ _xmag = 0.04;
+ _ymagMin = 1.0;
+ _ymagMax = 10.0;
+ _ymag = 1.0;
+ break;
default:
_ymagMin = 1.0;
_ymagMax = 1.0;
@@ -380,11 +388,11 @@ bool TimeCanvas::eventFilter(QObject* obj, QEvent* event)
else if (_xmag > _xmagMax)
_xmag = _xmagMax;
hmag->setValue(xmag2s(_xmag));
+ int newx = pos2pix(pos);
updateScrollBars();
+ hbar->setValue(wpos.x() + (newx - oldx));
updateRulerMag();
magChanged();
- int newx = pos2pix(pos);
- wpos.setX(wpos.x() + (newx - oldx));
_widget->update();
}
else {
diff --git a/muse/muse/arranger/arranger.cpp b/muse/muse/arranger/arranger.cpp
index a904cb1f..66076089 100644
--- a/muse/muse/arranger/arranger.cpp
+++ b/muse/muse/arranger/arranger.cpp
@@ -304,7 +304,7 @@ Arranger::Arranger(QMainWindow* parent)
mixerDock = new QDockWidget(tr("Mix"));
mixerDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-// mixerDock->setMaximumWidth(STRIP_WIDTH);
+mixerDock->setMaximumWidth(STRIP_WIDTH);
mixerDock->layout()->setMargin(1);
mixerDock->layout()->setSpacing(0);
mixerDockAction = mixerDock->toggleViewAction();
diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp
index c15d2c82..cbc802e9 100644
--- a/muse/muse/muse.cpp
+++ b/muse/muse/muse.cpp
@@ -630,7 +630,8 @@ MusE::MusE()
a->setEnabled(!midiOnly);
menu_file->addSeparator();
- a = menu_file->addAction(*onOffIcon, tr("&Quit"));
+ a = getAction("quit", this);
+ menu_file->addAction(a);
connect(a, SIGNAL(triggered()), this, SLOT(quitDoc()));
menu_file->addSeparator();
@@ -651,8 +652,6 @@ MusE::MusE()
pasteAction = getAction("paste", this);
menuEdit->addAction(pasteAction);
-// menuEditActions[CMD_DELETE] = getAction("delete", this);
-
menuEdit->addSeparator();
a = menuEdit->addAction(QIcon(*edit_track_delIcon), tr("Delete Selected Tracks"));
a->setData("delete_track");
@@ -676,13 +675,12 @@ MusE::MusE()
menuEdit->addAction(waveAction);
menuEdit->addAction(trackerAction);
- a = menuEdit->addAction(QIcon(*edit_drummsIcon), tr("Drums"));
+ a = getAction("open_drumedit", this);
+ menuEdit->addAction(a);
connect(a, SIGNAL(triggered()), SLOT(startDrumEditor()));
- a = menuEdit->addAction(QIcon(*edit_listIcon), tr("List"));
- connect(a, SIGNAL(triggered()), SLOT(startListEditor()));
-
- a = menuEdit->addAction(QIcon(*mastertrack_graphicIcon),tr("Mastertrack"));
+ a = getAction("open_master", this);
+ menuEdit->addAction(a);
connect(a, SIGNAL(triggered()), SLOT(startMasterEditor()));
a = menuEdit->addAction(*saveIcon, tr("Project Properties"));
diff --git a/muse/muse/muse.qrc b/muse/muse/muse.qrc
index 20cc4209..543fa3dc 100644
--- a/muse/muse/muse.qrc
+++ b/muse/muse/muse.qrc
@@ -54,6 +54,9 @@
<file>xpm/editcut.xpm</file>
<file>xpm/editcopy.xpm</file>
<file>xpm/editpaste.xpm</file>
+ <file>xpm/edit_drumms.xpm</file>
+ <file>xpm/edit_mastertrack.xpm</file>
+ <file>xpm/wave.xpm</file>
</qresource>
diff --git a/muse/muse/shortcuts.cpp b/muse/muse/shortcuts.cpp
index b2d6a4c9..661e1996 100644
--- a/muse/muse/shortcuts.cpp
+++ b/muse/muse/shortcuts.cpp
@@ -264,7 +264,11 @@ Shortcut MuseApplication::sc[] = {
"quit",
QT_TR_NOOP("File: Quit MusE"),
ARRANG_SHRT,
- Qt::CTRL + Qt::Key_Q
+ Qt::CTRL + Qt::Key_Q,
+ QT_TR_NOOP("Quit MusE"),
+ QT_TR_NOOP("Quit MusE"),
+ ":/xpm/on.svg",
+ ":/xpm/off.svg"
),
Shortcut(
"select_parts_on_track",
@@ -297,7 +301,10 @@ Shortcut MuseApplication::sc[] = {
"open_drumedit",
QT_TR_NOOP("Open drumeditor"),
ARRANG_SHRT,
- Qt::CTRL + Qt::Key_D
+ Qt::CTRL + Qt::Key_D,
+ QT_TR_NOOP("Drum Editor"),
+ QT_TR_NOOP("Start Drum Editor"),
+ ":/xpm/edit_drumms.xpm"
),
Shortcut(
"open_waveedit",
@@ -305,7 +312,8 @@ Shortcut MuseApplication::sc[] = {
ARRANG_SHRT,
0,
QT_TR_NOOP("Wave Editor"),
- QT_TR_NOOP("Wave Editor")
+ QT_TR_NOOP("Wave Editor"),
+ ":/xpm/wave.xpm"
),
Shortcut(
"open_listedit",
@@ -314,16 +322,13 @@ Shortcut MuseApplication::sc[] = {
Qt::CTRL + Qt::Key_L
),
Shortcut(
- "open_graph_master",
- QT_TR_NOOP("Open graphical mastertrack editor"),
- ARRANG_SHRT,
- Qt::CTRL + Qt::Key_M
- ),
- Shortcut(
- "open_list_master",
- QT_TR_NOOP("Open list mastertrack editor"),
+ "open_master",
+ QT_TR_NOOP("Open mastertrack editor"),
ARRANG_SHRT,
- Qt::CTRL + Qt::SHIFT + Qt::Key_M
+ Qt::CTRL + Qt::Key_M,
+ QT_TR_NOOP("Mastertrack (Tempo) Editor"),
+ QT_TR_NOOP("Start Mastertrack (Tempo) Editor"),
+ ":/xpm/edit_mastertrack.xpm"
),
Shortcut(
"add_midi_track",
@@ -997,9 +1002,18 @@ KeyboardMovementIndicator shortcutsKbdMovement; //for keeping track of active pa
void writeShortCuts(Xml& xml)
{
xml.stag("shortcuts");
- foreach(Shortcut* s, shortcuts)
- if (s->xml && s->type != INVIS_SHRT) //Avoid nullptr & hardcoded shortcuts
- xml.tag(s->xml, s->key.toString(QKeySequence::PortableText));
+ foreach(Shortcut* s, shortcuts) {
+ //
+ // save only if different from default
+ //
+ for (unsigned i = 0;; ++i) {
+ if (MuseApplication::sc[i].xml == s->xml) {
+ if (MuseApplication::sc[i].key != s->key)
+ xml.tag(s->xml, s->key.toString(QKeySequence::PortableText));
+ break;
+ }
+ }
+ }
xml.etag("shortcuts");
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 22:45:44 +0000