summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse2/muse/midiedit/scoreedit.cpp7
-rw-r--r--muse2/muse/widgets/function_dialogs/crescendobase.ui15
-rw-r--r--muse2/muse/widgets/function_dialogs/deloverlapsbase.ui15
-rw-r--r--muse2/muse/widgets/function_dialogs/gatetimebase.ui15
-rw-r--r--muse2/muse/widgets/function_dialogs/legatobase.ui15
-rw-r--r--muse2/muse/widgets/function_dialogs/movebase.ui15
-rw-r--r--muse2/muse/widgets/function_dialogs/quantbase.ui24
-rw-r--r--muse2/muse/widgets/function_dialogs/removebase.ui21
-rw-r--r--muse2/muse/widgets/function_dialogs/setlenbase.ui15
-rw-r--r--muse2/muse/widgets/function_dialogs/transposebase.ui15
-rw-r--r--muse2/muse/widgets/function_dialogs/velocitybase.ui15
11 files changed, 155 insertions, 17 deletions
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 4ce73eb0..8223d7a8 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -4453,10 +4453,7 @@ void staff_t::update_part_indices()
* changing "share" status, the changed state isn't stored
*
* CURRENT TODO
- * ! o paste-slot must set up the dialog properly: set raster to correct default !!
- * ! o paste function: "move only some parts" !!
- *
- *
+ * ! o fix sigedit boxes
* M o remove that ugly "bool initalizing" stuff. it's probably unneeded (watch out for the FINDMICH message)
* M o shortcuts for "pencil" in score editor etc.
* o mirror most menus to an additional right-click context menu to avoid the long mouse pointer
@@ -4471,8 +4468,6 @@ void staff_t::update_part_indices()
*
* IMPORTANT TODO
* o add "dotted quarter" quantize option (for 6/8 beat)
- * o insert spacer between settings and "Ok" buttons in function dialogs
- * ! o fix sigedit boxes
*
* o rename stuff with F2 key
* o redo transport menu: offer "one beat" and "one bar" steps
diff --git a/muse2/muse/widgets/function_dialogs/crescendobase.ui b/muse2/muse/widgets/function_dialogs/crescendobase.ui
index 5f4ec1f4..e98b7bc3 100644
--- a/muse2/muse/widgets/function_dialogs/crescendobase.ui
+++ b/muse2/muse/widgets/function_dialogs/crescendobase.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>275</width>
- <height>293</height>
+ <height>299</height>
</rect>
</property>
<property name="windowTitle">
@@ -140,6 +140,19 @@
</widget>
</item>
<item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
diff --git a/muse2/muse/widgets/function_dialogs/deloverlapsbase.ui b/muse2/muse/widgets/function_dialogs/deloverlapsbase.ui
index 7484bf97..7f94f83b 100644
--- a/muse2/muse/widgets/function_dialogs/deloverlapsbase.ui
+++ b/muse2/muse/widgets/function_dialogs/deloverlapsbase.ui
@@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>275</width>
- <height>195</height>
+ <height>201</height>
</rect>
</property>
<property name="windowTitle">
@@ -70,6 +70,19 @@
</widget>
</item>
<item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
diff --git a/muse2/muse/widgets/function_dialogs/gatetimebase.ui b/muse2/muse/widgets/function_dialogs/gatetimebase.ui
index e804de17..3f7ede4b 100644
--- a/muse2/muse/widgets/function_dialogs/gatetimebase.ui
+++ b/muse2/muse/widgets/function_dialogs/gatetimebase.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>275</width>
- <height>316</height>
+ <height>320</height>
</rect>
</property>
<property name="windowTitle">
@@ -135,6 +135,19 @@
</widget>
</item>
<item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
diff --git a/muse2/muse/widgets/function_dialogs/legatobase.ui b/muse2/muse/widgets/function_dialogs/legatobase.ui
index 7bc406df..2593f3f5 100644
--- a/muse2/muse/widgets/function_dialogs/legatobase.ui
+++ b/muse2/muse/widgets/function_dialogs/legatobase.ui
@@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>275</width>
- <height>289</height>
+ <height>295</height>
</rect>
</property>
<property name="windowTitle">
@@ -150,6 +150,19 @@
</widget>
</item>
<item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
diff --git a/muse2/muse/widgets/function_dialogs/movebase.ui b/muse2/muse/widgets/function_dialogs/movebase.ui
index a8825dd5..17a3aff6 100644
--- a/muse2/muse/widgets/function_dialogs/movebase.ui
+++ b/muse2/muse/widgets/function_dialogs/movebase.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>275</width>
- <height>264</height>
+ <height>270</height>
</rect>
</property>
<property name="windowTitle">
@@ -120,6 +120,19 @@
</widget>
</item>
<item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
diff --git a/muse2/muse/widgets/function_dialogs/quantbase.ui b/muse2/muse/widgets/function_dialogs/quantbase.ui
index 6a88c86f..973be7b8 100644
--- a/muse2/muse/widgets/function_dialogs/quantbase.ui
+++ b/muse2/muse/widgets/function_dialogs/quantbase.ui
@@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>279</width>
- <height>486</height>
+ <height>475</height>
</rect>
</property>
<property name="windowTitle">
@@ -210,11 +210,18 @@
</item>
<item row="5" column="0" colspan="2">
<widget class="QLabel" name="label_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>If the proposed change in tick or length is smaller than threshold, nothing is done.
If swing=0, this is normal
If swing is 33, you get a 2:1-rhythm.
-If swing is -33, you get a 1:2-rhythm.</string>
+If swing is -33, you get a 1:2-rhythm.
+</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -225,6 +232,19 @@ If swing is -33, you get a 1:2-rhythm.</string>
</widget>
</item>
<item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
diff --git a/muse2/muse/widgets/function_dialogs/removebase.ui b/muse2/muse/widgets/function_dialogs/removebase.ui
index 79d541cc..a01f0c8b 100644
--- a/muse2/muse/widgets/function_dialogs/removebase.ui
+++ b/muse2/muse/widgets/function_dialogs/removebase.ui
@@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>275</width>
- <height>443</height>
+ <height>424</height>
</rect>
</property>
<property name="windowTitle">
@@ -144,6 +144,12 @@
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -165,6 +171,19 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
diff --git a/muse2/muse/widgets/function_dialogs/setlenbase.ui b/muse2/muse/widgets/function_dialogs/setlenbase.ui
index 7d929716..39a87789 100644
--- a/muse2/muse/widgets/function_dialogs/setlenbase.ui
+++ b/muse2/muse/widgets/function_dialogs/setlenbase.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>275</width>
- <height>264</height>
+ <height>270</height>
</rect>
</property>
<property name="windowTitle">
@@ -114,6 +114,19 @@
</widget>
</item>
<item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
diff --git a/muse2/muse/widgets/function_dialogs/transposebase.ui b/muse2/muse/widgets/function_dialogs/transposebase.ui
index c26f2ef9..e1447690 100644
--- a/muse2/muse/widgets/function_dialogs/transposebase.ui
+++ b/muse2/muse/widgets/function_dialogs/transposebase.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>275</width>
- <height>264</height>
+ <height>270</height>
</rect>
</property>
<property name="windowTitle">
@@ -120,6 +120,19 @@
</widget>
</item>
<item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
diff --git a/muse2/muse/widgets/function_dialogs/velocitybase.ui b/muse2/muse/widgets/function_dialogs/velocitybase.ui
index 40fe625f..70e838f5 100644
--- a/muse2/muse/widgets/function_dialogs/velocitybase.ui
+++ b/muse2/muse/widgets/function_dialogs/velocitybase.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>275</width>
- <height>316</height>
+ <height>320</height>
</rect>
</property>
<property name="windowTitle">
@@ -138,6 +138,19 @@
</widget>
</item>
<item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>