summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Schweer <ws.seh.de>2006-05-09 13:44:20 +0000
committerWerner Schweer <ws.seh.de>2006-05-09 13:44:20 +0000
commit35a46ba162aab33268436e7ecbdd9bf47e23c4ef (patch)
tree56b70112cdd1d40101aaebacb1701118492ab954
parenta69752d9c29e20525cf7b93cd73f48a4e02edf96 (diff)
replace "appearance settings" and "global settings" by "preferences"
Diffstat
-rw-r--r--muse/muse/CMakeLists.txt4
-rw-r--r--muse/muse/appearance.ui1182
-rw-r--r--muse/muse/conf.cpp26
-rw-r--r--muse/muse/genset.cpp475
-rw-r--r--muse/muse/genset.h56
-rw-r--r--muse/muse/muse.cpp42
-rw-r--r--muse/muse/muse.h20
-rw-r--r--muse/muse/preferences.cpp (renamed from muse/muse/appearance.cpp)473
-rw-r--r--muse/muse/preferences.h (renamed from muse/muse/appearance.h)30
-rw-r--r--muse/muse/preferences.ui (renamed from muse/muse/genset.ui)1070
-rw-r--r--muse/muse/shortcuts.cpp4
-rw-r--r--muse/muse/shortcuts.h4
-rw-r--r--muse/muse/widgets/CMakeLists.txt12
13 files changed, 1587 insertions, 1811 deletions
diff --git a/muse/muse/CMakeLists.txt b/muse/muse/CMakeLists.txt
index 64ff6da7..a997f084 100644
--- a/muse/muse/CMakeLists.txt
+++ b/muse/muse/CMakeLists.txt
@@ -44,7 +44,7 @@ subdirs(
ctrl widgets master driver instruments marker liste
)
set (muse_uics
- muse genset appearance exportmididialog configmidifile
+ muse preferences exportmididialog configmidifile
transport aboutbox transpose
midiedit/quantconfig
mixer/routedialog
@@ -52,7 +52,7 @@ set (muse_uics
)
set(muse_mocs
- appearance plugingui midiplugin muse genset song transport conf editor
+ preferences plugingui midiplugin muse song transport conf editor
cobject transpose track midisynti midiport
miditrack wavetrack audiotrack audioaux audiooutput
audioinput audiogroup exportmidi
diff --git a/muse/muse/appearance.ui b/muse/muse/appearance.ui
deleted file mode 100644
index 920d68de..00000000
--- a/muse/muse/appearance.ui
+++ /dev/null
@@ -1,1182 +0,0 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>AppearanceDialogBase</class>
- <widget class="QDialog" name="AppearanceDialogBase" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>583</width>
- <height>395</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>MusE: Appearance settings</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QTabWidget" name="TabWidget2" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <widget class="QWidget" name="tab1" >
- <attribute name="title" >
- <string>Arranger</string>
- </attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="1" column="0" colspan="2" >
- <widget class="QGroupBox" name="useCanvasBgPixmap" >
- <property name="title" >
- <string>Background</string>
- </property>
- <property name="checkable" >
- <bool>false</bool>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="1" column="2" >
- <widget class="QToolButton" name="selectCanvasBgColor" >
- <property name="text" >
- <string>select...</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2" >
- <widget class="QToolButton" name="selectCanvasBgPixmap" >
- <property name="text" >
- <string>select...</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QRadioButton" name="useColor" >
- <property name="text" >
- <string>Color</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QRadioButton" name="usePixmap" >
- <property name="text" >
- <string>Pixmap</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QLabel" name="currentBgLabel" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>bg</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- <property name="indent" >
- <number>-1</number>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLabel" name="canvasBackgroundColor" >
- <property name="text" >
- <string>Color</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="2" column="0" colspan="2" >
- <widget class="QCheckBox" name="arrGrid" >
- <property name="text" >
- <string>show snap grid</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QGroupBox" name="eventButtonGroup" >
- <property name="title" >
- <string>Events</string>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" >
- <widget class="QCheckBox" name="eventNoteon" >
- <property name="text" >
- <string>note on</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QCheckBox" name="eventPolypressure" >
- <property name="text" >
- <string>poly pressure</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QCheckBox" name="eventController" >
- <property name="text" >
- <string>controller</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QCheckBox" name="eventAftertouch" >
- <property name="text" >
- <string>aftertouch</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QCheckBox" name="eventPitchbend" >
- <property name="text" >
- <string>pitch bend</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QCheckBox" name="eventProgramchange" >
- <property name="text" >
- <string>program change</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QCheckBox" name="eventSpecial" >
- <property name="text" >
- <string>special</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QGroupBox" name="ButtonGroup3" >
- <property name="title" >
- <string>Parts</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QCheckBox" name="partShownames" >
- <property name="text" >
- <string>show names</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="partShowevents" >
- <property name="text" >
- <string>show events</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="partShowCakes" >
- <property name="text" >
- <string>show Cakewalk Style</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab2" >
- <attribute name="title" >
- <string>Colors</string>
- </attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="4" column="1" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="textLabel6_2" >
- <property name="text" >
- <string>V</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSlider" name="vslider" >
- <property name="maximum" >
- <number>255</number>
- </property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="3" column="1" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="textLabel5_2" >
- <property name="text" >
- <string>S</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSlider" name="sslider" >
- <property name="maximum" >
- <number>255</number>
- </property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="2" column="1" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="textLabel4_2" >
- <property name="text" >
- <string>H</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSlider" name="hslider" >
- <property name="maximum" >
- <number>255</number>
- </property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="addToPalette" >
- <property name="text" >
- <string>add to palette</string>
- </property>
- </widget>
- </item>
- <item rowspan="5" row="0" column="0" >
- <widget class="QTreeWidget" name="itemList" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="rootIsDecorated" >
- <bool>true</bool>
- </property>
- <column>
- <property name="text" >
- <string>Items</string>
- </property>
- </column>
- </widget>
- </item>
- <item rowspan="2" row="0" column="2" >
- <widget class="QFrame" name="colorframe" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape" >
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Sunken</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QGroupBox" name="colorPalette" >
- <property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
- </property>
- <property name="title" >
- <string>Palette</string>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="3" column="3" >
- <widget class="QToolButton" name="palette15" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="2" >
- <widget class="QToolButton" name="palette14" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="3" >
- <widget class="QToolButton" name="palette11" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="2" >
- <widget class="QToolButton" name="palette10" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="3" >
- <widget class="QToolButton" name="palette7" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="2" >
- <widget class="QToolButton" name="palette6" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QToolButton" name="palette13" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QToolButton" name="palette9" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QToolButton" name="palette5" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QToolButton" name="palette12" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QToolButton" name="palette8" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QToolButton" name="palette4" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="3" >
- <widget class="QToolButton" name="palette3" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="2" >
- <widget class="QToolButton" name="palette2" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QToolButton" name="palette1" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QToolButton" name="palette0" >
- <property name="text" >
- <string/>
- </property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab3" >
- <attribute name="title" >
- <string>Style/Fonts</string>
- </attribute>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QGroupBox" name="GroupBox18" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title" >
- <string>QT Theme</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QComboBox" name="themeComboBox" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <item>
- <property name="text" >
- <string>Windows</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>MusE</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Metal</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Norwegian Wood</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Platinum</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>CDE</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Motif</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Motif Plus</string>
- </property>
- </item>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>190</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="GroupBox6" >
- <property name="title" >
- <string>Fonts</string>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="1" >
- <widget class="QLabel" name="textLabel2" >
- <property name="text" >
- <string>Family</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2" >
- <widget class="QLabel" name="TextLabel1" >
- <property name="text" >
- <string>Size</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel4" >
- <property name="text" >
- <string>Font 1</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="textLabel5" >
- <property name="text" >
- <string>Font 2</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0" >
- <widget class="QLabel" name="textLabel6" >
- <property name="text" >
- <string>Font 3</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="fontName0" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QLineEdit" name="fontName1" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QLineEdit" name="fontName2" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="QLineEdit" name="fontName3" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel3" >
- <property name="text" >
- <string>Font 0</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2" >
- <widget class="QSpinBox" name="fontSize0" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="2" column="2" >
- <widget class="QSpinBox" name="fontSize1" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="3" column="2" >
- <widget class="QSpinBox" name="fontSize2" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="4" column="2" >
- <widget class="QSpinBox" name="fontSize3" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="2" column="3" >
- <widget class="QCheckBox" name="bold1" >
- <property name="text" >
- <string>Bold</string>
- </property>
- </widget>
- </item>
- <item row="3" column="3" >
- <widget class="QCheckBox" name="bold2" >
- <property name="text" >
- <string>Bold</string>
- </property>
- </widget>
- </item>
- <item row="4" column="3" >
- <widget class="QCheckBox" name="bold3" >
- <property name="text" >
- <string>Bold</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3" >
- <widget class="QCheckBox" name="bold0" >
- <property name="text" >
- <string>Bold</string>
- </property>
- </widget>
- </item>
- <item row="3" column="4" >
- <widget class="QCheckBox" name="italic2" >
- <property name="text" >
- <string>Italic</string>
- </property>
- </widget>
- </item>
- <item row="4" column="4" >
- <widget class="QCheckBox" name="italic3" >
- <property name="text" >
- <string>Italic</string>
- </property>
- </widget>
- </item>
- <item row="2" column="4" >
- <widget class="QCheckBox" name="italic1" >
- <property name="text" >
- <string>Italic</string>
- </property>
- </widget>
- </item>
- <item row="1" column="4" >
- <widget class="QCheckBox" name="italic0" >
- <property name="text" >
- <string>Italic</string>
- </property>
- </widget>
- </item>
- <item row="1" column="5" >
- <widget class="QToolButton" name="fontBrowse0" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="2" column="5" >
- <widget class="QToolButton" name="fontBrowse1" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="3" column="5" >
- <widget class="QToolButton" name="fontBrowse2" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="4" column="5" >
- <widget class="QToolButton" name="fontBrowse3" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0" >
- <widget class="QLabel" name="textLabel7" >
- <property name="text" >
- <string>Font 4</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1" >
- <widget class="QLineEdit" name="fontName4" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="6" column="0" >
- <widget class="QLabel" name="textLabel7_2" >
- <property name="text" >
- <string>Font 5</string>
- </property>
- </widget>
- </item>
- <item row="6" column="1" >
- <widget class="QLineEdit" name="fontName5" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="5" column="2" >
- <widget class="QSpinBox" name="fontSize4" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="6" column="2" >
- <widget class="QSpinBox" name="fontSize5" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="5" column="3" >
- <widget class="QCheckBox" name="bold4" >
- <property name="text" >
- <string>Bold</string>
- </property>
- </widget>
- </item>
- <item row="6" column="3" >
- <widget class="QCheckBox" name="bold5" >
- <property name="text" >
- <string>Bold</string>
- </property>
- </widget>
- </item>
- <item row="5" column="4" >
- <widget class="QCheckBox" name="italic4" >
- <property name="text" >
- <string>Italic</string>
- </property>
- </widget>
- </item>
- <item row="6" column="4" >
- <widget class="QCheckBox" name="italic5" >
- <property name="text" >
- <string>Italic</string>
- </property>
- </widget>
- </item>
- <item row="5" column="5" >
- <widget class="QToolButton" name="fontBrowse4" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="6" column="5" >
- <widget class="QToolButton" name="fontBrowse5" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>...</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="applyButton" >
- <property name="text" >
- <string>Apply</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="okButton" >
- <property name="text" >
- <string>Ok</string>
- </property>
- <property name="default" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="cancelButton" >
- <property name="text" >
- <string>Cancel</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
- <tabstop>TabWidget2</tabstop>
- <tabstop>itemList</tabstop>
- <tabstop>addToPalette</tabstop>
- <tabstop>hslider</tabstop>
- <tabstop>sslider</tabstop>
- <tabstop>vslider</tabstop>
- <tabstop>applyButton</tabstop>
- <tabstop>okButton</tabstop>
- <tabstop>cancelButton</tabstop>
- <tabstop>partShownames</tabstop>
- <tabstop>partShowevents</tabstop>
- <tabstop>partShowCakes</tabstop>
- <tabstop>eventNoteon</tabstop>
- <tabstop>eventPolypressure</tabstop>
- <tabstop>eventController</tabstop>
- <tabstop>eventAftertouch</tabstop>
- <tabstop>eventPitchbend</tabstop>
- <tabstop>eventProgramchange</tabstop>
- <tabstop>eventSpecial</tabstop>
- <tabstop>arrGrid</tabstop>
- <tabstop>themeComboBox</tabstop>
- <tabstop>fontName0</tabstop>
- <tabstop>fontName1</tabstop>
- <tabstop>fontName2</tabstop>
- <tabstop>fontName3</tabstop>
- <tabstop>fontSize0</tabstop>
- <tabstop>fontSize1</tabstop>
- <tabstop>fontSize2</tabstop>
- <tabstop>fontSize3</tabstop>
- <tabstop>bold1</tabstop>
- <tabstop>bold2</tabstop>
- <tabstop>bold3</tabstop>
- <tabstop>bold0</tabstop>
- <tabstop>italic2</tabstop>
- <tabstop>italic3</tabstop>
- <tabstop>italic1</tabstop>
- <tabstop>italic0</tabstop>
- <tabstop>fontName4</tabstop>
- <tabstop>fontName5</tabstop>
- <tabstop>fontSize4</tabstop>
- <tabstop>fontSize5</tabstop>
- <tabstop>bold4</tabstop>
- <tabstop>bold5</tabstop>
- <tabstop>italic4</tabstop>
- <tabstop>italic5</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/muse/muse/conf.cpp b/muse/muse/conf.cpp
index 980e0c68..40f91dec 100644
--- a/muse/muse/conf.cpp
+++ b/muse/muse/conf.cpp
@@ -27,7 +27,7 @@
#include "gconfig.h"
#include "al/xml.h"
#include "widgets/midisync.h"
-#include "genset.h"
+// #include "genset.h"
#include "sync.h"
#include "mixer/mixer.h"
#include "globals.h"
@@ -638,18 +638,18 @@ void MidiFileConfig::cancelClicked()
// configGlobalSettings
//---------------------------------------------------------
-void MusE::configGlobalSettings()
- {
- if (!globalSettingsConfig)
- globalSettingsConfig = new GlobalSettingsConfig();
-
- if (globalSettingsConfig->isVisible()) {
- globalSettingsConfig->raise();
-//TD globalSettingsConfig->setActiveWindow();
- }
- else
- globalSettingsConfig->show();
- }
+//void MusE::configGlobalSettings()
+// {
+// if (!globalSettingsConfig)
+// globalSettingsConfig = new GlobalSettingsConfig();
+//
+// if (globalSettingsConfig->isVisible()) {
+// globalSettingsConfig->raise();
+////TD globalSettingsConfig->setActiveWindow();
+// }
+// else
+// globalSettingsConfig->show();
+// }
//---------------------------------------------------------
// write
diff --git a/muse/muse/genset.cpp b/muse/muse/genset.cpp
deleted file mode 100644
index 49950694..00000000
--- a/muse/muse/genset.cpp
+++ /dev/null
@@ -1,475 +0,0 @@
-//=============================================================================
-// MusE
-// Linux Music Editor
-// $Id:$
-//
-// Copyright (C) 2002-2006 by Werner Schweer and others
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//=============================================================================
-
-#include "genset.h"
-#include "muse.h"
-#include "gconfig.h"
-#include "audio.h"
-#include "globals.h"
-#include "mixer/mixer.h"
-#include "icons.h"
-#include "song.h"
-#include "midirc.h"
-#include "driver/alsamidi.h"
-#include "instruments/minstrument.h"
-#include "midiedit/pianoroll.h"
-#include "midiedit/drumedit.h"
-
-static int rtcResolutions[] = {
- 1024, 2048, 4096, 8192
- };
-static int divisions[] = {
- 48, 96, 192, 384, 768, 1536, 3072, 6144, 12288
- };
-
-//---------------------------------------------------------
-// GlobalSettingsConfig
-//---------------------------------------------------------
-
-GlobalSettingsConfig::GlobalSettingsConfig(QWidget* parent)
- : QDialog(parent)
- {
- setupUi(this);
- for (unsigned i = 0; i < sizeof(rtcResolutions)/sizeof(*rtcResolutions); ++i) {
- if (rtcResolutions[i] == config.rtcTicks) {
- rtcResolutionSelect->setCurrentIndex(i);
- break;
- }
- }
- for (unsigned i = 0; i < sizeof(divisions)/sizeof(*divisions); ++i) {
- if (divisions[i] == config.division) {
- midiDivisionSelect->setCurrentIndex(i);
- break;
- }
- }
- std::list<PortName>* ol = midiDriver->inputPorts();
- int i = 0;
- for (std::list<PortName>::iterator ip = ol->begin(); ip != ol->end(); ++ip, ++i) {
- preferredInput->addItem(ip->name);
- if (ip->name == config.defaultMidiInputDevice)
- preferredInput->setCurrentIndex(i);
- }
- ol = midiDriver->outputPorts();
- i = 0;
- for (std::list<PortName>::iterator ip = ol->begin(); ip != ol->end(); ++ip, ++i) {
- preferredOutput->addItem(ip->name);
- if (ip->name == config.defaultMidiOutputDevice)
- preferredOutput->setCurrentIndex(i);
- }
-
- i = 0;
- for (iMidiInstrument mi = midiInstruments.begin(); mi != midiInstruments.end(); ++mi, ++i) {
- preferredInstrument->addItem((*mi)->iname());
- if ((*mi)->iname() == config.defaultMidiInstrument)
- preferredInstrument->setCurrentIndex(i);
- }
-
- connectToAllDevices->setChecked(config.connectToAllMidiDevices);
- connectToAllTracks->setChecked(config.connectToAllMidiTracks);
- createDefaultInput->setChecked(config.createDefaultMidiInput);
-
- guiRefreshSelect->setValue(config.guiRefresh);
- minSliderSelect->setValue(int(config.minSlider));
- minMeterSelect->setValue(config.minMeter);
- peakHoldTime->setValue(config.peakHoldTime);
- helpBrowser->setText(config.helpBrowser);
- startSongEntry->setText(config.startSong);
-
- startSongGroup = new QButtonGroup(this);
- startSongGroup->addButton(startLast);
- startSongGroup->addButton(startTemplate);
- startSongGroup->addButton(startSong);
-
- switch(config.startMode) {
- case 0: startLast->setChecked(true); break;
- case 1: startTemplate->setChecked(true); break;
- case 2: startSong->setChecked(true); break;
- }
-
- showTransport->setChecked(config.transportVisible);
- showBigtime->setChecked(config.bigTimeVisible);
- showMixer1->setChecked(config.mixer1Visible);
- showMixer2->setChecked(config.mixer2Visible);
-
- arrangerX->setValue(config.geometryMain.x());
- arrangerY->setValue(config.geometryMain.y());
- arrangerW->setValue(config.geometryMain.width());
- arrangerH->setValue(config.geometryMain.height());
-
- transportX->setValue(config.geometryTransport.x());
- transportY->setValue(config.geometryTransport.y());
-
- bigtimeX->setValue(config.geometryBigTime.x());
- bigtimeY->setValue(config.geometryBigTime.y());
- bigtimeW->setValue(config.geometryBigTime.width());
- bigtimeH->setValue(config.geometryBigTime.height());
-
- mixerX1->setValue(config.mixer1.geometry.x());
- mixerY1->setValue(config.mixer1.geometry.y());
- mixerW1->setValue(config.mixer1.geometry.width());
- mixerH1->setValue(config.mixer1.geometry.height());
-
- mixerX2->setValue(config.mixer2.geometry.x());
- mixerY2->setValue(config.mixer2.geometry.y());
- mixerW2->setValue(config.mixer2.geometry.width());
- mixerH2->setValue(config.mixer2.geometry.height());
-
- setMixerCurrent1->setEnabled(muse->mixer1Window());
- setMixerCurrent1->setEnabled(muse->mixer2Window());
-
- setBigtimeCurrent->setEnabled(muse->bigtimeWindow());
- setTransportCurrent->setEnabled(muse->transportWindow());
- freewheelMode->setChecked(config.useJackFreewheelMode);
- showSplash->setChecked(config.showSplashScreen);
-
- stopActive->setChecked(midiRCList.isActive(RC_STOP));
- playActive->setChecked(midiRCList.isActive(RC_PLAY));
- gotoLeftMarkActive->setChecked(midiRCList.isActive(RC_GOTO_LEFT_MARK));
- recordActive->setChecked(midiRCList.isActive(RC_RECORD));
-
- connect(applyButton, SIGNAL(clicked()), SLOT(apply()));
- connect(okButton, SIGNAL(clicked()), SLOT(ok()));
- connect(cancelButton, SIGNAL(clicked()), SLOT(cancel()));
- connect(setMixerCurrent1, SIGNAL(clicked()), SLOT(mixerCurrent1()));
- connect(setMixerCurrent2, SIGNAL(clicked()), SLOT(mixerCurrent2()));
- connect(setBigtimeCurrent, SIGNAL(clicked()), SLOT(bigtimeCurrent()));
- connect(setArrangerCurrent, SIGNAL(clicked()), SLOT(arrangerCurrent()));
- connect(setTransportCurrent, SIGNAL(clicked()), SLOT(transportCurrent()));
-
- recordStop->setChecked(false);
- recordRecord->setChecked(false);
- recordGotoLeftMark->setChecked(false);
- recordPlay->setChecked(false);
- rcGroup->setChecked(rcEnable);
-
- pianorollWidth->setValue(PianoRoll::initWidth);
- pianorollHeight->setValue(PianoRoll::initHeight);
- pianorollRaster->setRaster(PianoRoll::initRaster);
- pianorollQuant->setQuant(PianoRoll::initQuant);
-
- drumEditorWidth->setValue(DrumEdit::initWidth);
- drumEditorHeight->setValue(DrumEdit::initHeight);
-
- connect(recordStop, SIGNAL(clicked(bool)), SLOT(recordStopToggled(bool)));
- connect(recordRecord, SIGNAL(clicked(bool)), SLOT(recordRecordToggled(bool)));
- connect(recordGotoLeftMark, SIGNAL(clicked(bool)), SLOT(recordGotoLeftMarkToggled(bool)));
- connect(recordPlay, SIGNAL(clicked(bool)), SLOT(recordPlayToggled(bool)));
- }
-
-//---------------------------------------------------------
-// apply
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::apply()
- {
- rcEnable = rcGroup->isChecked();
- int rtcticks = rtcResolutionSelect->currentIndex();
- int div = midiDivisionSelect->currentIndex();
-
- config.connectToAllMidiDevices = connectToAllDevices->isChecked();
- config.connectToAllMidiTracks = connectToAllTracks->isChecked();
- config.createDefaultMidiInput = createDefaultInput->isChecked();
- config.defaultMidiInputDevice = preferredInput->currentText();
- config.defaultMidiOutputDevice = preferredOutput->currentText();
- config.defaultMidiInstrument = preferredInstrument->currentText();
-
- config.guiRefresh = guiRefreshSelect->value();
- config.minSlider = minSliderSelect->value();
- config.minMeter = minMeterSelect->value();
- config.peakHoldTime = peakHoldTime->value();
- config.rtcTicks = rtcResolutions[rtcticks];
- config.guiDivision = divisions[div];
- config.helpBrowser = helpBrowser->text();
- config.startSong = startSongEntry->text();
-
- if (startLast->isChecked())
- config.startMode = 0;
- else if (startTemplate->isChecked())
- config.startMode = 1;
- else if (startSong->isChecked())
- config.startMode = 2;
-
- config.transportVisible = showTransport->isChecked();
- config.bigTimeVisible = showBigtime->isChecked();
- config.mixer1Visible = showMixer1->isChecked();
- config.mixer2Visible = showMixer2->isChecked();
-
- config.geometryMain.setX(arrangerX->value());
- config.geometryMain.setY(arrangerY->value());
- config.geometryMain.setWidth(arrangerW->value());
- config.geometryMain.setHeight(arrangerH->value());
-
- config.geometryTransport.setX(transportX->value());
- config.geometryTransport.setY(transportY->value());
- config.geometryTransport.setWidth(0);
- config.geometryTransport.setHeight(0);
-
- config.geometryBigTime.setX(bigtimeX->value());
- config.geometryBigTime.setY(bigtimeY->value());
- config.geometryBigTime.setWidth(bigtimeW->value());
- config.geometryBigTime.setHeight(bigtimeH->value());
-
- config.mixer1.geometry.setX(mixerX1->value());
- config.mixer1.geometry.setY(mixerY1->value());
- config.mixer1.geometry.setWidth(mixerW1->value());
- config.mixer1.geometry.setHeight(mixerH1->value());
-
- config.mixer2.geometry.setX(mixerX2->value());
- config.mixer2.geometry.setY(mixerY2->value());
- config.mixer2.geometry.setWidth(mixerW2->value());
- config.mixer2.geometry.setHeight(mixerH2->value());
-
- config.useJackFreewheelMode = freewheelMode->isChecked();
- config.showSplashScreen = showSplash->isChecked();
-
- PianoRoll::initWidth = pianorollWidth->value();
- PianoRoll::initHeight = pianorollHeight->value();
- PianoRoll::initRaster = pianorollRaster->raster();
- PianoRoll::initQuant = pianorollQuant->quant();
-
- DrumEdit::initWidth = drumEditorWidth->value();
- DrumEdit::initHeight = drumEditorHeight->value();
-
- muse->showMixer1(config.mixer1Visible);
- muse->showMixer2(config.mixer2Visible);
- muse->showBigtime(config.bigTimeVisible);
- muse->showTransport(config.transportVisible);
- QWidget* w = muse->transportWindow();
- if (w) {
- w->resize(config.geometryTransport.size());
- w->move(config.geometryTransport.topLeft());
- }
- w = muse->mixer1Window();
- if (w) {
- w->resize(config.mixer1.geometry.size());
- w->move(config.mixer1.geometry.topLeft());
- }
- w = muse->mixer2Window();
- if (w) {
- w->resize(config.mixer2.geometry.size());
- w->move(config.mixer2.geometry.topLeft());
- }
- w = muse->bigtimeWindow();
- if (w) {
- w->resize(config.geometryBigTime.size());
- w->move(config.geometryBigTime.topLeft());
- }
-
- muse->resize(config.geometryMain.size());
- muse->move(config.geometryMain.topLeft());
-
- muse->setHeartBeat(); // set guiRefresh
- audio->msgSetRtc(); // set midi tick rate
- muse->changeConfig(true); // save settings
- }
-
-//---------------------------------------------------------
-// ok
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::ok()
- {
- apply();
- close();
- }
-
-//---------------------------------------------------------
-// cancel
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::cancel()
- {
- close();
- }
-
-//---------------------------------------------------------
-// mixerCurrent1
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::mixerCurrent1()
- {
- QWidget* w = muse->mixer1Window();
- if (!w)
- return;
- QRect r(w->frameGeometry());
- mixerX1->setValue(r.x());
- mixerY1->setValue(r.y());
- mixerW1->setValue(r.width());
- mixerH1->setValue(r.height());
- }
-
-//---------------------------------------------------------
-// mixerCurrent2
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::mixerCurrent2()
- {
- QWidget* w = muse->mixer2Window();
- if (!w)
- return;
- QRect r(w->frameGeometry());
- mixerX2->setValue(r.x());
- mixerY2->setValue(r.y());
- mixerW2->setValue(r.width());
- mixerH2->setValue(r.height());
- }
-
-//---------------------------------------------------------
-// bigtimeCurrent
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::bigtimeCurrent()
- {
- QWidget* w = muse->bigtimeWindow();
- if (!w)
- return;
- QRect r(w->frameGeometry());
- bigtimeX->setValue(r.x());
- bigtimeY->setValue(r.y());
- bigtimeW->setValue(r.width());
- bigtimeH->setValue(r.height());
- }
-
-//---------------------------------------------------------
-// arrangerCurrent
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::arrangerCurrent()
- {
- QRect r(muse->frameGeometry());
- arrangerX->setValue(r.x());
- arrangerY->setValue(r.y());
- arrangerW->setValue(r.width());
- arrangerH->setValue(r.height());
- }
-
-//---------------------------------------------------------
-// transportCurrent
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::transportCurrent()
- {
- QWidget* w = muse->transportWindow();
- if (!w)
- return;
- QRect r(w->frameGeometry());
- transportX->setValue(r.x());
- transportY->setValue(r.y());
- }
-
-//---------------------------------------------------------
-// recordStopToggled
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::recordStopToggled(bool f)
- {
- recordStop->setChecked(!f);
- if (!f) {
- recordRecord->setChecked(false);
- recordGotoLeftMark->setChecked(false);
- recordPlay->setChecked(false);
- connect(song, SIGNAL(midiEvent(MidiEvent)), SLOT(midiEventReceived(MidiEvent)));
- }
- else
- disconnect(song, SIGNAL(midiEvent(MidiEvent)), this, SLOT(midiEventReceived(MidiEvent)));
- }
-
-//---------------------------------------------------------
-// recordRecordToggled
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::recordRecordToggled(bool f)
- {
- recordRecord->setChecked(!f);
- if (!f) {
- recordStop->setChecked(false);
- recordGotoLeftMark->setChecked(false);
- recordPlay->setChecked(false);
- connect(song, SIGNAL(midiEvent(MidiEvent)), SLOT(midiEventReceived(MidiEvent)));
- }
- else
- disconnect(song, SIGNAL(midiEvent(MidiEvent)), this, SLOT(midiEventReceived(MidiEvent)));
- }
-
-//---------------------------------------------------------
-// recordGotoLeftMarkToggled
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::recordGotoLeftMarkToggled(bool f)
- {
- recordGotoLeftMark->setChecked(!f);
- if (!f) {
- recordStop->setChecked(false);
- recordRecord->setChecked(false);
- recordPlay->setChecked(false);
- connect(song, SIGNAL(midiEvent(MidiEvent)), SLOT(midiEventReceived(MidiEvent)));
- }
- else
- disconnect(song, SIGNAL(midiEvent(MidiEvent)), this, SLOT(midiEventReceived(MidiEvent)));
- }
-
-//---------------------------------------------------------
-// recordPlayToggled
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::recordPlayToggled(bool f)
- {
- recordPlay->setChecked(!f);
- if (!f) {
- recordStop->setChecked(false);
- recordRecord->setChecked(false);
- recordGotoLeftMark->setChecked(false);
- connect(song, SIGNAL(midiEvent(MidiEvent)), SLOT(midiEventReceived(MidiEvent)));
- }
- else
- disconnect(song, SIGNAL(midiEvent(MidiEvent)), this, SLOT(midiEventReceived(MidiEvent)));
- }
-
-//---------------------------------------------------------
-// midiEventReceived
-//---------------------------------------------------------
-
-void GlobalSettingsConfig::midiEventReceived(MidiEvent event)
- {
- printf("event received\n");
- if (recordPlay->isChecked()) {
- recordPlay->setChecked(false);
- playActive->setChecked(true);
- midiRCList.setAction(event, RC_PLAY);
- }
- else if (recordStop->isChecked()) {
- recordStop->setChecked(false);
- stopActive->setChecked(true);
- midiRCList.setAction(event, RC_STOP);
- }
- else if (recordRecord->isChecked()) {
- recordRecord->setChecked(false);
- recordActive->setChecked(true);
- midiRCList.setAction(event, RC_RECORD);
- }
- else if (recordGotoLeftMark->isChecked()) {
- recordGotoLeftMark->setChecked(false);
- gotoLeftMarkActive->setChecked(true);
- midiRCList.setAction(event, RC_GOTO_LEFT_MARK);
- }
- // only one shot
- disconnect(song, SIGNAL(midiEvent(MidiEvent)), this, SLOT(midiEventReceived(MidiEvent)));
- }
-
diff --git a/muse/muse/genset.h b/muse/muse/genset.h
deleted file mode 100644
index 6eb602f0..00000000
--- a/muse/muse/genset.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//=============================================================================
-// MusE
-// Linux Music Editor
-// $Id:$
-//
-// Copyright (C) 2002-2006 by Werner Schweer and others
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//=============================================================================
-
-#ifndef __GENSET_H__
-#define __GENSET_H__
-
-#include "ui_genset.h"
-#include "event.h"
-#include "mpevent.h"
-
-//---------------------------------------------------------
-// GlobalSettingsConfig
-//---------------------------------------------------------
-
-class GlobalSettingsConfig : public QDialog, Ui::GlobalSettingsDialogBase {
- Q_OBJECT
-
- QButtonGroup* startSongGroup;
-
- private slots:
- void apply();
- void ok();
- void cancel();
- void mixerCurrent1();
- void mixerCurrent2();
- void bigtimeCurrent();
- void arrangerCurrent();
- void transportCurrent();
- void recordStopToggled(bool);
- void recordRecordToggled(bool);
- void recordGotoLeftMarkToggled(bool);
- void recordPlayToggled(bool);
- void midiEventReceived(MidiEvent);
-
- public:
- GlobalSettingsConfig(QWidget* parent=0);
- };
-
-#endif
diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp
index dba0a186..052c1278 100644
--- a/muse/muse/muse.cpp
+++ b/muse/muse/muse.cpp
@@ -40,7 +40,7 @@
#include "plugin.h"
#include "marker/markerview.h"
#include "transpose.h"
-#include "appearance.h"
+#include "preferences.h"
#include "widgets/gatetime.h"
#include "audio.h"
#include "midiseq.h"
@@ -444,11 +444,12 @@ MusE::MusE()
midiFilterConfig = 0;
midiInputTransform = 0;
midiRhythmGenerator = 0;
- globalSettingsConfig = 0;
+// globalSettingsConfig = 0;
+ preferencesDialog = 0;
softSynthesizerConfig = 0;
midiTransformerDialog = 0;
shortcutConfig = 0;
- appearance = 0;
+// appearance = 0;
editInstrument = 0;
appName = QString("MusE");
_raster = 0;
@@ -794,8 +795,8 @@ MusE::MusE()
menuSettings = mb->addMenu(tr("Setti&ngs"));
- menu_ids[CMD_GLOBAL_CONFIG] = menuSettings->addAction(QIcon(*settings_globalsettingsIcon), tr("Global Settings"));
- connect(menu_ids[CMD_GLOBAL_CONFIG], SIGNAL(triggered()), this, SLOT(configGlobalSettings()));
+// menu_ids[CMD_GLOBAL_CONFIG] = menuSettings->addAction(QIcon(*settings_globalsettingsIcon), tr("Global Settings"));
+// connect(menu_ids[CMD_GLOBAL_CONFIG], SIGNAL(triggered()), this, SLOT(configGlobalSettings()));
menu_ids[CMD_CONFIG_SHORTCUTS] = menuSettings->addAction(QIcon(*settings_configureshortcutsIcon), tr("Configure shortcuts"));
connect(menu_ids[CMD_CONFIG_SHORTCUTS], SIGNAL(triggered()), this, SLOT(configShortCuts()));
@@ -821,8 +822,9 @@ MusE::MusE()
menu_ids[CMD_MIDI_FILE_CONFIG] = menuSettings->addAction(QIcon(*settings_midifileexportIcon), tr("Midi File Export"));
connect(menu_ids[CMD_MIDI_FILE_CONFIG], SIGNAL(triggered()), this, SLOT(configMidiFile()));
menuSettings->addSeparator();
- menu_ids[CMD_APPEARANCE_SETTINGS] = menuSettings->addAction(QIcon(*settings_appearance_settingsIcon), tr("Appearance settings"));
- connect(menu_ids[CMD_APPEARANCE_SETTINGS], SIGNAL(triggered()), this, SLOT(configAppearance()));
+// menu_ids[CMD_GLOBAL_CONFIG] = menuSettings->addAction(QIcon(*settings_globalsettingsIcon), tr("Global Settings"));
+ QAction* action = menuSettings->addAction(QIcon(*settings_globalsettingsIcon), tr("Preferences"));
+ connect(action, SIGNAL(triggered()), this, SLOT(preferences()));
//---------------------------------------------------
// Help
@@ -2252,13 +2254,25 @@ void MusE::mixTrack()
//---------------------------------------------------------
// configAppearance
//---------------------------------------------------------
+//
+//void MusE::configAppearance()
+// {
+// if (!appearance)
+// appearance = new Appearance(arranger);
+// appearance->resetValues();
+// appearance->show();
+// }
+
+//---------------------------------------------------------
+// preferences
+//---------------------------------------------------------
-void MusE::configAppearance()
+void MusE::preferences()
{
- if (!appearance)
- appearance = new Appearance(arranger);
- appearance->resetValues();
- appearance->show();
+ if (!preferencesDialog)
+ preferencesDialog = new PreferencesDialog(arranger);
+ preferencesDialog->resetValues();
+ preferencesDialog->show();
}
//---------------------------------------------------------
@@ -2691,7 +2705,7 @@ void MusE::updateConfiguration()
menu_ids[CMD_AUDIO_BOUNCE_TO_TRACK]->setShortcut(shortcuts[CMD_AUDIO_BOUNCE_TO_TRACK].key);
menu_ids[CMD_AUDIO_BOUNCE_TO_FILE]->setShortcut(shortcuts[CMD_AUDIO_BOUNCE_TO_FILE].key);
- menu_ids[CMD_GLOBAL_CONFIG]->setShortcut(shortcuts[SHRT_GLOBAL_CONFIG].key);
+// menu_ids[CMD_GLOBAL_CONFIG]->setShortcut(shortcuts[SHRT_GLOBAL_CONFIG].key);
menu_ids[CMD_CONFIG_SHORTCUTS]->setShortcut(shortcuts[SHRT_CONFIG_SHORTCUTS].key);
// Follow options
@@ -2701,7 +2715,7 @@ void MusE::updateConfiguration()
menu_ids[CMD_CONFIG_MIDISYNC]->setShortcut(shortcuts[SHRT_CONFIG_MIDISYNC].key);
menu_ids[CMD_MIDI_FILE_CONFIG]->setShortcut(shortcuts[SHRT_MIDI_FILE_CONFIG].key);
- menu_ids[CMD_APPEARANCE_SETTINGS]->setShortcut(shortcuts[SHRT_APPEARANCE_SETTINGS].key);
+// menu_ids[CMD_APPEARANCE_SETTINGS]->setShortcut(shortcuts[SHRT_APPEARANCE_SETTINGS].key);
menu_ids[CMD_OPEN_HELP]->setShortcut(shortcuts[SHRT_OPEN_HELP].key);
// menu_ids[CMD_OPEN_HOMEPAGE]->setShortcut(shortcuts[SHRT_OPEN_HOMEPAGE].key);
diff --git a/muse/muse/muse.h b/muse/muse/muse.h
index 6720bf4f..7b9e0bd6 100644
--- a/muse/muse/muse.h
+++ b/muse/muse/muse.h
@@ -43,13 +43,14 @@ class AudioConf;
class MidiFileConfig;
class MidiFilterConfig;
class MarkerView;
-class GlobalSettingsConfig;
+// class GlobalSettingsConfig;
class MidiInputTransformDialog;
class MidiTransformerDialog;
class RhythmGen;
class MidiTrack;
class ShortcutConfig;
-class Appearance;
+// class Appearance;
+class PreferencesDialog;
class EditInstrument;
class Mixer;
class ExportMidiDialog;
@@ -75,11 +76,11 @@ class MusE : public QMainWindow, public Ui::MuseBase
//File menu items:
enum { CMD_OPEN_RECENT=0, CMD_IMPORT_MIDI,
CMD_EXPORT_MIDI, CMD_IMPORT_AUDIO, CMD_QUIT, CMD_OPEN_DRUMS,
- CMD_OPEN_LIST, CMD_OPEN_LIST_MASTER, CMD_GLOBAL_CONFIG,
+ CMD_OPEN_LIST, CMD_OPEN_LIST_MASTER,
CMD_OPEN_GRAPHIC_MASTER, CMD_OPEN_MIDI_TRANSFORM, CMD_TRANSPOSE,
CMD_GLOBAL_CUT, CMD_GLOBAL_INSERT, CMD_GLOBAL_SPLIT, CMD_COPY_RANGE,
CMD_CUT_EVENTS, CMD_CONFIG_SHORTCUTS, CMD_CONFIG_METRONOME, CMD_CONFIG_MIDISYNC,
- CMD_MIDI_FILE_CONFIG, CMD_APPEARANCE_SETTINGS, CMD_CONFIG_AUDIO_PORTS,
+ CMD_MIDI_FILE_CONFIG, CMD_CONFIG_AUDIO_PORTS,
CMD_MIDI_EDIT_INSTRUMENTS, CMD_MIDI_RESET, CMD_MIDI_INIT, CMD_MIDI_LOCAL_OFF,
CMD_MIXER_SNAPSHOT, CMD_MIXER_AUTOMATION_CLEAR, CMD_OPEN_HELP, CMD_OPEN_HOMEPAGE,
CMD_OPEN_BUG, CMD_START_WHATSTHIS,
@@ -138,11 +139,12 @@ class MusE : public QMainWindow, public Ui::MuseBase
MetronomeConfig* metronomeConfig;
AudioConf* audioConfig;
MidiFileConfig* midiFileConfig;
- GlobalSettingsConfig* globalSettingsConfig;
+// GlobalSettingsConfig* globalSettingsConfig;
MidiFilterConfig* midiFilterConfig;
MidiInputTransformDialog* midiInputTransform;
ShortcutConfig* shortcutConfig;
- Appearance* appearance;
+// Appearance* appearance;
+ PreferencesDialog* preferencesDialog;
ExportMidiDialog* exportMidiDialog;
MidiTransformerDialog* midiTransformerDialog;
@@ -183,7 +185,7 @@ class MusE : public QMainWindow, public Ui::MuseBase
private slots:
void loadProject();
bool save();
- void configGlobalSettings();
+// void configGlobalSettings();
void quitDoc();
void about();
void aboutQt();
@@ -199,7 +201,8 @@ class MusE : public QMainWindow, public Ui::MuseBase
void configMidiSync();
void configMidiFile();
void configShortCuts();
- void configAppearance();
+// void configAppearance();
+
void startMasterEditor();
void startListEditor();
void startListEditor(PartList*);
@@ -248,6 +251,7 @@ class MusE : public QMainWindow, public Ui::MuseBase
void mixer2Closed();
void setRaster(int);
void syncChanged();
+ void preferences();
public slots:
void bounceToFile();
diff --git a/muse/muse/appearance.cpp b/muse/muse/preferences.cpp
index 02b9819a..2c85b228 100644
--- a/muse/muse/appearance.cpp
+++ b/muse/muse/preferences.cpp
@@ -19,7 +19,7 @@
//=============================================================================
#include "icons.h"
-#include "appearance.h"
+#include "preferences.h"
#include "track.h"
#include "muse.h"
#include "song.h"
@@ -31,6 +31,21 @@
#include "conf.h"
#include "gconfig.h"
+#include "audio.h"
+#include "mixer/mixer.h"
+#include "midirc.h"
+#include "driver/alsamidi.h"
+#include "instruments/minstrument.h"
+#include "midiedit/pianoroll.h"
+#include "midiedit/drumedit.h"
+
+static int rtcResolutions[] = {
+ 1024, 2048, 4096, 8192
+ };
+static int divisions[] = {
+ 48, 96, 192, 384, 768, 1536, 3072, 6144, 12288
+ };
+
//---------------------------------------------------------
// twi
//---------------------------------------------------------
@@ -52,10 +67,10 @@ static QTreeWidgetItem* twi(QTreeWidgetItem* tw, const char* txt, int data)
}
//---------------------------------------------------------
-// Appearance
+// PreferencesDialog
//---------------------------------------------------------
-Appearance::Appearance(Arranger* a, QWidget* parent)
+PreferencesDialog::PreferencesDialog(Arranger* a, QWidget* parent)
: QDialog(parent)
{
setupUi(this);
@@ -227,13 +242,139 @@ Appearance::Appearance(Arranger* a, QWidget* parent)
connect(selectCanvasBgColor, SIGNAL(clicked()), SLOT(configCanvasBgColor()));
connect(partShowevents, SIGNAL(toggled(bool)), eventButtonGroup, SLOT(setEnabled(bool)));
updateColor();
+
+ for (unsigned i = 0; i < sizeof(rtcResolutions)/sizeof(*rtcResolutions); ++i) {
+ if (rtcResolutions[i] == config->rtcTicks) {
+ rtcResolutionSelect->setCurrentIndex(i);
+ break;
+ }
+ }
+ for (unsigned i = 0; i < sizeof(divisions)/sizeof(*divisions); ++i) {
+ if (divisions[i] == config->division) {
+ midiDivisionSelect->setCurrentIndex(i);
+ break;
+ }
+ }
+ std::list<PortName>* ol = midiDriver->inputPorts();
+ int i = 0;
+ for (std::list<PortName>::iterator ip = ol->begin(); ip != ol->end(); ++ip, ++i) {
+ preferredInput->addItem(ip->name);
+ if (ip->name == config->defaultMidiInputDevice)
+ preferredInput->setCurrentIndex(i);
+ }
+ ol = midiDriver->outputPorts();
+ i = 0;
+ for (std::list<PortName>::iterator ip = ol->begin(); ip != ol->end(); ++ip, ++i) {
+ preferredOutput->addItem(ip->name);
+ if (ip->name == config->defaultMidiOutputDevice)
+ preferredOutput->setCurrentIndex(i);
+ }
+
+ i = 0;
+ for (iMidiInstrument mi = midiInstruments.begin(); mi != midiInstruments.end(); ++mi, ++i) {
+ preferredInstrument->addItem((*mi)->iname());
+ if ((*mi)->iname() == config->defaultMidiInstrument)
+ preferredInstrument->setCurrentIndex(i);
+ }
+
+ connectToAllDevices->setChecked(config->connectToAllMidiDevices);
+ connectToAllTracks->setChecked(config->connectToAllMidiTracks);
+ createDefaultInput->setChecked(config->createDefaultMidiInput);
+
+ guiRefreshSelect->setValue(config->guiRefresh);
+ minSliderSelect->setValue(int(config->minSlider));
+ minMeterSelect->setValue(config->minMeter);
+ peakHoldTime->setValue(config->peakHoldTime);
+ helpBrowser->setText(config->helpBrowser);
+ startSongEntry->setText(config->startSong);
+
+ startSongGroup = new QButtonGroup(this);
+ startSongGroup->addButton(startLast);
+ startSongGroup->addButton(startTemplate);
+ startSongGroup->addButton(startSong);
+
+ switch(config->startMode) {
+ case 0: startLast->setChecked(true); break;
+ case 1: startTemplate->setChecked(true); break;
+ case 2: startSong->setChecked(true); break;
+ }
+
+ showTransport->setChecked(config->transportVisible);
+ showBigtime->setChecked(config->bigTimeVisible);
+ showMixer1->setChecked(config->mixer1Visible);
+ showMixer2->setChecked(config->mixer2Visible);
+
+ arrangerX->setValue(config->geometryMain.x());
+ arrangerY->setValue(config->geometryMain.y());
+ arrangerW->setValue(config->geometryMain.width());
+ arrangerH->setValue(config->geometryMain.height());
+
+ transportX->setValue(config->geometryTransport.x());
+ transportY->setValue(config->geometryTransport.y());
+
+ bigtimeX->setValue(config->geometryBigTime.x());
+ bigtimeY->setValue(config->geometryBigTime.y());
+ bigtimeW->setValue(config->geometryBigTime.width());
+ bigtimeH->setValue(config->geometryBigTime.height());
+
+ mixerX1->setValue(config->mixer1.geometry.x());
+ mixerY1->setValue(config->mixer1.geometry.y());
+ mixerW1->setValue(config->mixer1.geometry.width());
+ mixerH1->setValue(config->mixer1.geometry.height());
+
+ mixerX2->setValue(config->mixer2.geometry.x());
+ mixerY2->setValue(config->mixer2.geometry.y());
+ mixerW2->setValue(config->mixer2.geometry.width());
+ mixerH2->setValue(config->mixer2.geometry.height());
+
+ setMixerCurrent1->setEnabled(muse->mixer1Window());
+ setMixerCurrent1->setEnabled(muse->mixer2Window());
+
+ setBigtimeCurrent->setEnabled(muse->bigtimeWindow());
+ setTransportCurrent->setEnabled(muse->transportWindow());
+ freewheelMode->setChecked(config->useJackFreewheelMode);
+ showSplash->setChecked(config->showSplashScreen);
+
+ stopActive->setChecked(midiRCList.isActive(RC_STOP));
+ playActive->setChecked(midiRCList.isActive(RC_PLAY));
+ gotoLeftMarkActive->setChecked(midiRCList.isActive(RC_GOTO_LEFT_MARK));
+ recordActive->setChecked(midiRCList.isActive(RC_RECORD));
+
+ connect(applyButton, SIGNAL(clicked()), SLOT(apply()));
+ connect(okButton, SIGNAL(clicked()), SLOT(ok()));
+ connect(cancelButton, SIGNAL(clicked()), SLOT(cancel()));
+ connect(setMixerCurrent1, SIGNAL(clicked()), SLOT(mixerCurrent1()));
+ connect(setMixerCurrent2, SIGNAL(clicked()), SLOT(mixerCurrent2()));
+ connect(setBigtimeCurrent, SIGNAL(clicked()), SLOT(bigtimeCurrent()));
+ connect(setArrangerCurrent, SIGNAL(clicked()), SLOT(arrangerCurrent()));
+ connect(setTransportCurrent, SIGNAL(clicked()), SLOT(transportCurrent()));
+
+ recordStop->setChecked(false);
+ recordRecord->setChecked(false);
+ recordGotoLeftMark->setChecked(false);
+ recordPlay->setChecked(false);
+ rcGroup->setChecked(rcEnable);
+
+ pianorollWidth->setValue(PianoRoll::initWidth);
+ pianorollHeight->setValue(PianoRoll::initHeight);
+ pianorollRaster->setRaster(PianoRoll::initRaster);
+ pianorollQuant->setQuant(PianoRoll::initQuant);
+
+ drumEditorWidth->setValue(DrumEdit::initWidth);
+ drumEditorHeight->setValue(DrumEdit::initHeight);
+
+ connect(recordStop, SIGNAL(clicked(bool)), SLOT(recordStopToggled(bool)));
+ connect(recordRecord, SIGNAL(clicked(bool)), SLOT(recordRecordToggled(bool)));
+ connect(recordGotoLeftMark, SIGNAL(clicked(bool)), SLOT(recordGotoLeftMarkToggled(bool)));
+ connect(recordPlay, SIGNAL(clicked(bool)), SLOT(recordPlayToggled(bool)));
+
}
//---------------------------------------------------------
// resetValues
//---------------------------------------------------------
-void Appearance::resetValues()
+void PreferencesDialog::resetValues()
{
*config = ::config; // init with global config values
updateFonts();
@@ -273,10 +414,10 @@ void Appearance::resetValues()
}
//---------------------------------------------------------
-// Appearance
+// PreferencesDialog
//---------------------------------------------------------
-Appearance::~Appearance()
+PreferencesDialog::~PreferencesDialog()
{
delete config;
}
@@ -285,7 +426,7 @@ Appearance::~Appearance()
// updateFonts
//---------------------------------------------------------
-void Appearance::updateFonts()
+void PreferencesDialog::updateFonts()
{
fontSize0->setValue(config->fonts[0]->pointSize());
fontName0->setText(config->fonts[0]->family());
@@ -322,7 +463,7 @@ void Appearance::updateFonts()
// apply
//---------------------------------------------------------
-void Appearance::apply()
+void PreferencesDialog::apply()
{
int showPartEvent = 0;
int showPartType = 0;
@@ -385,14 +526,113 @@ void Appearance::apply()
config->canvasShowGrid = arrGrid->isChecked();
// set colors...
::config = *config;
- muse->changeConfig(true);
+
+ rcEnable = rcGroup->isChecked();
+ int rtcticks = rtcResolutionSelect->currentIndex();
+ int div = midiDivisionSelect->currentIndex();
+
+ ::config.connectToAllMidiDevices = connectToAllDevices->isChecked();
+ ::config.connectToAllMidiTracks = connectToAllTracks->isChecked();
+ ::config.createDefaultMidiInput = createDefaultInput->isChecked();
+ ::config.defaultMidiInputDevice = preferredInput->currentText();
+ ::config.defaultMidiOutputDevice = preferredOutput->currentText();
+ ::config.defaultMidiInstrument = preferredInstrument->currentText();
+
+ ::config.guiRefresh = guiRefreshSelect->value();
+ ::config.minSlider = minSliderSelect->value();
+ ::config.minMeter = minMeterSelect->value();
+ ::config.peakHoldTime = peakHoldTime->value();
+ ::config.rtcTicks = rtcResolutions[rtcticks];
+ ::config.guiDivision = divisions[div];
+ ::config.helpBrowser = helpBrowser->text();
+ ::config.startSong = startSongEntry->text();
+
+ if (startLast->isChecked())
+ ::config.startMode = 0;
+ else if (startTemplate->isChecked())
+ ::config.startMode = 1;
+ else if (startSong->isChecked())
+ ::config.startMode = 2;
+
+ ::config.transportVisible = showTransport->isChecked();
+ ::config.bigTimeVisible = showBigtime->isChecked();
+ ::config.mixer1Visible = showMixer1->isChecked();
+ ::config.mixer2Visible = showMixer2->isChecked();
+
+ ::config.geometryMain.setX(arrangerX->value());
+ ::config.geometryMain.setY(arrangerY->value());
+ ::config.geometryMain.setWidth(arrangerW->value());
+ ::config.geometryMain.setHeight(arrangerH->value());
+
+ ::config.geometryTransport.setX(transportX->value());
+ ::config.geometryTransport.setY(transportY->value());
+ ::config.geometryTransport.setWidth(0);
+ ::config.geometryTransport.setHeight(0);
+
+ ::config.geometryBigTime.setX(bigtimeX->value());
+ ::config.geometryBigTime.setY(bigtimeY->value());
+ ::config.geometryBigTime.setWidth(bigtimeW->value());
+ ::config.geometryBigTime.setHeight(bigtimeH->value());
+
+ ::config.mixer1.geometry.setX(mixerX1->value());
+ ::config.mixer1.geometry.setY(mixerY1->value());
+ ::config.mixer1.geometry.setWidth(mixerW1->value());
+ ::config.mixer1.geometry.setHeight(mixerH1->value());
+
+ ::config.mixer2.geometry.setX(mixerX2->value());
+ ::config.mixer2.geometry.setY(mixerY2->value());
+ ::config.mixer2.geometry.setWidth(mixerW2->value());
+ ::config.mixer2.geometry.setHeight(mixerH2->value());
+
+ ::config.useJackFreewheelMode = freewheelMode->isChecked();
+ ::config.showSplashScreen = showSplash->isChecked();
+
+ PianoRoll::initWidth = pianorollWidth->value();
+ PianoRoll::initHeight = pianorollHeight->value();
+ PianoRoll::initRaster = pianorollRaster->raster();
+ PianoRoll::initQuant = pianorollQuant->quant();
+
+ DrumEdit::initWidth = drumEditorWidth->value();
+ DrumEdit::initHeight = drumEditorHeight->value();
+
+ muse->showMixer1(::config.mixer1Visible);
+ muse->showMixer2(::config.mixer2Visible);
+ muse->showBigtime(::config.bigTimeVisible);
+ muse->showTransport(::config.transportVisible);
+ QWidget* w = muse->transportWindow();
+ if (w) {
+ w->resize(::config.geometryTransport.size());
+ w->move(::config.geometryTransport.topLeft());
+ }
+ w = muse->mixer1Window();
+ if (w) {
+ w->resize(::config.mixer1.geometry.size());
+ w->move(::config.mixer1.geometry.topLeft());
+ }
+ w = muse->mixer2Window();
+ if (w) {
+ w->resize(::config.mixer2.geometry.size());
+ w->move(::config.mixer2.geometry.topLeft());
+ }
+ w = muse->bigtimeWindow();
+ if (w) {
+ w->resize(::config.geometryBigTime.size());
+ w->move(::config.geometryBigTime.topLeft());
+ }
+
+ muse->resize(::config.geometryMain.size());
+ muse->move(::config.geometryMain.topLeft());
+
+ muse->setHeartBeat(); // set guiRefresh
+ audio->msgSetRtc(); // set midi tick rate
+ muse->changeConfig(true); // save settings
}
//---------------------------------------------------------
// ok
//---------------------------------------------------------
-void Appearance::ok()
+void PreferencesDialog::ok()
{
apply();
close();
@@ -402,7 +642,7 @@ void Appearance::ok()
// cancel
//---------------------------------------------------------
-void Appearance::cancel()
+void PreferencesDialog::cancel()
{
close();
}
@@ -411,7 +651,7 @@ void Appearance::cancel()
// configCanvasBgPixmap
//---------------------------------------------------------
-void Appearance::configCanvasBgPixmap()
+void PreferencesDialog::configCanvasBgPixmap()
{
QString cur(currentBg);
if (cur == "<none>")
@@ -437,7 +677,7 @@ void Appearance::configCanvasBgPixmap()
// configCanvasBgColor
//---------------------------------------------------------
-void Appearance::configCanvasBgColor()
+void PreferencesDialog::configCanvasBgColor()
{
QColor color = QColorDialog::getColor(config->canvasBgColor, this);
if (color.isValid()) {
@@ -452,7 +692,7 @@ void Appearance::configCanvasBgColor()
// selectionChanged
//---------------------------------------------------------
-void Appearance::colorItemSelectionChanged()
+void PreferencesDialog::colorItemSelectionChanged()
{
QTreeWidgetItem* item = (QTreeWidgetItem*)itemList->selectedItems().at(0);
QString txt = item->text(0);
@@ -494,7 +734,7 @@ void Appearance::colorItemSelectionChanged()
// updateColor
//---------------------------------------------------------
-void Appearance::updateColor()
+void PreferencesDialog::updateColor()
{
hslider->setEnabled(color);
sslider->setEnabled(color);
@@ -521,7 +761,7 @@ void Appearance::updateColor()
vslider->blockSignals(false);
}
-void Appearance::hsliderChanged(int val)
+void PreferencesDialog::hsliderChanged(int val)
{
int h, s, v;
if (color) {
@@ -531,7 +771,7 @@ void Appearance::hsliderChanged(int val)
updateColor();
}
-void Appearance::ssliderChanged(int val)
+void PreferencesDialog::ssliderChanged(int val)
{
int h, s, v;
if (color) {
@@ -541,7 +781,7 @@ void Appearance::ssliderChanged(int val)
updateColor();
}
-void Appearance::vsliderChanged(int val)
+void PreferencesDialog::vsliderChanged(int val)
{
int h, s, v;
if (color) {
@@ -555,7 +795,7 @@ void Appearance::vsliderChanged(int val)
// addToPaletteClicked
//---------------------------------------------------------
-void Appearance::addToPaletteClicked()
+void PreferencesDialog::addToPaletteClicked()
{
if (!color)
return;
@@ -595,7 +835,7 @@ void Appearance::addToPaletteClicked()
// paletteClicked
//---------------------------------------------------------
-void Appearance::paletteClicked(QAbstractButton* button)
+void PreferencesDialog::paletteClicked(QAbstractButton* button)
{
QColor c = button->palette().color(QPalette::Button);
int r, g, b;
@@ -610,14 +850,14 @@ void Appearance::paletteClicked(QAbstractButton* button)
// browseFont
//---------------------------------------------------------
-void Appearance::browseFont0() { browseFont(0); }
-void Appearance::browseFont1() { browseFont(1); }
-void Appearance::browseFont2() { browseFont(2); }
-void Appearance::browseFont3() { browseFont(3); }
-void Appearance::browseFont4() { browseFont(4); }
-void Appearance::browseFont5() { browseFont(5); }
+void PreferencesDialog::browseFont0() { browseFont(0); }
+void PreferencesDialog::browseFont1() { browseFont(1); }
+void PreferencesDialog::browseFont2() { browseFont(2); }
+void PreferencesDialog::browseFont3() { browseFont(3); }
+void PreferencesDialog::browseFont4() { browseFont(4); }
+void PreferencesDialog::browseFont5() { browseFont(5); }
-void Appearance::browseFont(int n)
+void PreferencesDialog::browseFont(int n)
{
bool ok;
QFont font = QFontDialog::getFont(&ok, *config->fonts[n], this);
@@ -631,7 +871,7 @@ void Appearance::browseFont(int n)
// usePixmapToggled
//---------------------------------------------------------
-void Appearance::usePixmapToggled(bool val)
+void PreferencesDialog::usePixmapToggled(bool val)
{
useColor->setChecked(!val);
}
@@ -640,8 +880,183 @@ void Appearance::usePixmapToggled(bool val)
// useColorToggled
//---------------------------------------------------------
-void Appearance::useColorToggled(bool val)
+void PreferencesDialog::useColorToggled(bool val)
{
usePixmap->setChecked(!val);
}
+//---------------------------------------------------------
+// mixerCurrent1
+//---------------------------------------------------------
+
+void PreferencesDialog::mixerCurrent1()
+ {
+ QWidget* w = muse->mixer1Window();
+ if (!w)
+ return;
+ QRect r(w->frameGeometry());
+ mixerX1->setValue(r.x());
+ mixerY1->setValue(r.y());
+ mixerW1->setValue(r.width());
+ mixerH1->setValue(r.height());
+ }
+
+//---------------------------------------------------------
+// mixerCurrent2
+//---------------------------------------------------------
+
+void PreferencesDialog::mixerCurrent2()
+ {
+ QWidget* w = muse->mixer2Window();
+ if (!w)
+ return;
+ QRect r(w->frameGeometry());
+ mixerX2->setValue(r.x());
+ mixerY2->setValue(r.y());
+ mixerW2->setValue(r.width());
+ mixerH2->setValue(r.height());
+ }
+
+//---------------------------------------------------------
+// bigtimeCurrent
+//---------------------------------------------------------
+
+void PreferencesDialog::bigtimeCurrent()
+ {
+ QWidget* w = muse->bigtimeWindow();
+ if (!w)
+ return;
+ QRect r(w->frameGeometry());
+ bigtimeX->setValue(r.x());
+ bigtimeY->setValue(r.y());
+ bigtimeW->setValue(r.width());
+ bigtimeH->setValue(r.height());
+ }
+
+//---------------------------------------------------------
+// arrangerCurrent
+//---------------------------------------------------------
+
+void PreferencesDialog::arrangerCurrent()
+ {
+ QRect r(muse->frameGeometry());
+ arrangerX->setValue(r.x());
+ arrangerY->setValue(r.y());
+ arrangerW->setValue(r.width());
+ arrangerH->setValue(r.height());
+ }
+
+//---------------------------------------------------------
+// transportCurrent
+//---------------------------------------------------------
+
+void PreferencesDialog::transportCurrent()
+ {
+ QWidget* w = muse->transportWindow();
+ if (!w)
+ return;
+ QRect r(w->frameGeometry());
+ transportX->setValue(r.x());
+ transportY->setValue(r.y());
+ }
+
+//---------------------------------------------------------
+// recordStopToggled
+//---------------------------------------------------------
+
+void PreferencesDialog::recordStopToggled(bool f)
+ {
+ recordStop->setChecked(!f);
+ if (!f) {
+ recordRecord->setChecked(false);
+ recordGotoLeftMark->setChecked(false);
+ recordPlay->setChecked(false);
+ connect(song, SIGNAL(midiEvent(MidiEvent)), SLOT(midiEventReceived(MidiEvent)));
+ }
+ else
+ disconnect(song, SIGNAL(midiEvent(MidiEvent)), this, SLOT(midiEventReceived(MidiEvent)));
+ }
+
+//---------------------------------------------------------
+// recordRecordToggled
+//---------------------------------------------------------
+
+void PreferencesDialog::recordRecordToggled(bool f)
+ {
+ recordRecord->setChecked(!f);
+ if (!f) {
+ recordStop->setChecked(false);
+ recordGotoLeftMark->setChecked(false);
+ recordPlay->setChecked(false);
+ connect(song, SIGNAL(midiEvent(MidiEvent)), SLOT(midiEventReceived(MidiEvent)));
+ }
+ else
+ disconnect(song, SIGNAL(midiEvent(MidiEvent)), this, SLOT(midiEventReceived(MidiEvent)));
+ }
+
+//---------------------------------------------------------
+// recordGotoLeftMarkToggled
+//---------------------------------------------------------
+
+void PreferencesDialog::recordGotoLeftMarkToggled(bool f)
+ {
+ recordGotoLeftMark->setChecked(!f);
+ if (!f) {
+ recordStop->setChecked(false);
+ recordRecord->setChecked(false);
+ recordPlay->setChecked(false);
+ connect(song, SIGNAL(midiEvent(MidiEvent)), SLOT(midiEventReceived(MidiEvent)));
+ }
+ else
+ disconnect(song, SIGNAL(midiEvent(MidiEvent)), this, SLOT(midiEventReceived(MidiEvent)));
+ }
+
+//---------------------------------------------------------
+// recordPlayToggled
+//---------------------------------------------------------
+
+void PreferencesDialog::recordPlayToggled(bool f)
+ {
+ recordPlay->setChecked(!f);
+ if (!f) {
+ recordStop->setChecked(false);
+ recordRecord->setChecked(false);
+ recordGotoLeftMark->setChecked(false);
+ connect(song, SIGNAL(midiEvent(MidiEvent)), SLOT(midiEventReceived(MidiEvent)));
+ }
+ else
+ disconnect(song, SIGNAL(midiEvent(MidiEvent)), this, SLOT(midiEventReceived(MidiEvent)));
+ }
+
+//---------------------------------------------------------
+// midiEventReceived
+//---------------------------------------------------------
+
+void PreferencesDialog::midiEventReceived(MidiEvent event)
+ {
+ printf("event received\n");
+ if (recordPlay->isChecked()) {
+ recordPlay->setChecked(false);
+ playActive->setChecked(true);
+ midiRCList.setAction(event, RC_PLAY);
+ }
+ else if (recordStop->isChecked()) {
+ recordStop->setChecked(false);
+ stopActive->setChecked(true);
+ midiRCList.setAction(event, RC_STOP);
+ }
+ else if (recordRecord->isChecked()) {
+ recordRecord->setChecked(false);
+ recordActive->setChecked(true);
+ midiRCList.setAction(event, RC_RECORD);
+ }
+ else if (recordGotoLeftMark->isChecked()) {
+ recordGotoLeftMark->setChecked(false);
+ gotoLeftMarkActive->setChecked(true);
+ midiRCList.setAction(event, RC_GOTO_LEFT_MARK);
+ }
+ // only one shot
+ disconnect(song, SIGNAL(midiEvent(MidiEvent)), this, SLOT(midiEventReceived(MidiEvent)));
+ }
+
+
diff --git a/muse/muse/appearance.h b/muse/muse/preferences.h
index e993f437..d4f1496c 100644
--- a/muse/muse/appearance.h
+++ b/muse/muse/preferences.h
@@ -18,27 +18,30 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//=============================================================================
-#ifndef __APPEARANCE_H__
-#define __APPEARANCE_H__
+#ifndef __PREFERENCES_H__
+#define __PREFERENCES_H__
-#include "ui_appearance.h"
+#include "ui_preferences.h"
+#include "mpevent.h"
class MusE;
class Arranger;
class GlobalConfigValues;
//---------------------------------------------------------
-// Appearance Dialog
+// PreferencesDialog
//---------------------------------------------------------
-class Appearance : public QDialog, public Ui::AppearanceDialogBase {
+class PreferencesDialog : public QDialog, public Ui::PreferencesDialogBase {
+ Q_OBJECT
+
Arranger* arr;
QColor* color;
QString currentBg;
GlobalConfigValues* config;
QButtonGroup* colorGroup;
+ QButtonGroup* startSongGroup;
- Q_OBJECT
void updateFonts();
void updateColor();
@@ -64,9 +67,20 @@ class Appearance : public QDialog, public Ui::AppearanceDialogBase {
void useColorToggled(bool);
void usePixmapToggled(bool);
+ void mixerCurrent1();
+ void mixerCurrent2();
+ void bigtimeCurrent();
+ void arrangerCurrent();
+ void transportCurrent();
+ void recordStopToggled(bool);
+ void recordRecordToggled(bool);
+ void recordGotoLeftMarkToggled(bool);
+ void recordPlayToggled(bool);
+ void midiEventReceived(MidiEvent);
+
public:
- Appearance(Arranger*, QWidget* parent=0);
- ~Appearance();
+ PreferencesDialog(Arranger*, QWidget* parent=0);
+ ~PreferencesDialog();
void resetValues();
};
diff --git a/muse/muse/genset.ui b/muse/muse/preferences.ui
index c391fb05..c910c175 100644
--- a/muse/muse/genset.ui
+++ b/muse/muse/preferences.ui
@@ -2,14 +2,14 @@
<author></author>
<comment></comment>
<exportmacro></exportmacro>
- <class>GlobalSettingsDialogBase</class>
- <widget class="QDialog" name="GlobalSettingsDialogBase" >
+ <class>PreferencesDialogBase</class>
+ <widget class="QDialog" name="PreferencesDialogBase" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
- <width>596</width>
- <height>562</height>
+ <width>721</width>
+ <height>569</height>
</rect>
</property>
<property name="windowTitle" >
@@ -389,10 +389,207 @@
<rect>
<x>9</x>
<y>9</y>
- <width>556</width>
+ <width>641</width>
<height>457</height>
</rect>
</property>
+ <widget class="QWidget" name="tab_61" >
+ <attribute name="title" >
+ <string>Arranger</string>
+ </attribute>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="2" column="0" colspan="2" >
+ <widget class="QCheckBox" name="arrGrid" >
+ <property name="text" >
+ <string>show snap grid</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QGroupBox" name="eventButtonGroup" >
+ <property name="title" >
+ <string>Events</string>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>11</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="0" column="0" >
+ <widget class="QCheckBox" name="eventNoteon" >
+ <property name="text" >
+ <string>note on</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QCheckBox" name="eventPolypressure" >
+ <property name="text" >
+ <string>poly pressure</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QCheckBox" name="eventController" >
+ <property name="text" >
+ <string>controller</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QCheckBox" name="eventAftertouch" >
+ <property name="text" >
+ <string>aftertouch</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QCheckBox" name="eventPitchbend" >
+ <property name="text" >
+ <string>pitch bend</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QCheckBox" name="eventProgramchange" >
+ <property name="text" >
+ <string>program change</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QCheckBox" name="eventSpecial" >
+ <property name="text" >
+ <string>special</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2" >
+ <widget class="QGroupBox" name="useCanvasBgPixmap" >
+ <property name="title" >
+ <string>Background</string>
+ </property>
+ <property name="checkable" >
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="1" column="2" >
+ <widget class="QToolButton" name="selectCanvasBgColor" >
+ <property name="text" >
+ <string>select...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" >
+ <widget class="QToolButton" name="selectCanvasBgPixmap" >
+ <property name="text" >
+ <string>select...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QRadioButton" name="useColor" >
+ <property name="text" >
+ <string>Color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QRadioButton" name="usePixmap" >
+ <property name="text" >
+ <string>Pixmap</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLabel" name="currentBgLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>bg</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ <property name="indent" >
+ <number>-1</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLabel" name="canvasBackgroundColor" >
+ <property name="text" >
+ <string>Color</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QGroupBox" name="ButtonGroup3" >
+ <property name="title" >
+ <string>Parts</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>11</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="partShownames" >
+ <property name="text" >
+ <string>show names</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="partShowevents" >
+ <property name="text" >
+ <string>show events</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="partShowCakes" >
+ <property name="text" >
+ <string>show Cakewalk Style</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
<widget class="QWidget" name="tab_6" >
<attribute name="title" >
<string>Pianoroll</string>
@@ -1203,6 +1400,851 @@
</item>
</layout>
</widget>
+ <widget class="QWidget" name="tab_11" >
+ <attribute name="title" >
+ <string>Colors</string>
+ </attribute>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="3" column="1" colspan="2" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="textLabel5_2" >
+ <property name="text" >
+ <string>S</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="sslider" >
+ <property name="maximum" >
+ <number>255</number>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="1" colspan="2" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="textLabel4_2" >
+ <property name="text" >
+ <string>H</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="hslider" >
+ <property name="maximum" >
+ <number>255</number>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item rowspan="2" row="0" column="2" >
+ <widget class="QFrame" name="colorframe" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Sunken</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QPushButton" name="addToPalette" >
+ <property name="text" >
+ <string>add to palette</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QGroupBox" name="colorPalette" >
+ <property name="focusPolicy" >
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="title" >
+ <string>Palette</string>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="3" column="3" >
+ <widget class="QToolButton" name="palette15" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2" >
+ <widget class="QToolButton" name="palette14" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3" >
+ <widget class="QToolButton" name="palette11" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2" >
+ <widget class="QToolButton" name="palette10" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3" >
+ <widget class="QToolButton" name="palette7" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2" >
+ <widget class="QToolButton" name="palette6" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="QToolButton" name="palette13" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QToolButton" name="palette9" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QToolButton" name="palette5" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QToolButton" name="palette12" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QToolButton" name="palette8" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QToolButton" name="palette4" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3" >
+ <widget class="QToolButton" name="palette3" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" >
+ <widget class="QToolButton" name="palette2" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QToolButton" name="palette1" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QToolButton" name="palette0" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item rowspan="5" row="0" column="0" >
+ <widget class="QTreeWidget" name="itemList" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="rootIsDecorated" >
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text" >
+ <string>Items</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item row="4" column="1" colspan="2" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="textLabel6_2" >
+ <property name="text" >
+ <string>V</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="vslider" >
+ <property name="maximum" >
+ <number>255</number>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_12" >
+ <attribute name="title" >
+ <string>Style/Fonts</string>
+ </attribute>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="GroupBox18_3" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title" >
+ <string>QT Theme</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>11</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QComboBox" name="themeComboBox" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <item>
+ <property name="text" >
+ <string>Windows</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>MusE</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Metal</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Norwegian Wood</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Platinum</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>CDE</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Motif</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Motif Plus</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>190</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="GroupBox6_3" >
+ <property name="title" >
+ <string>Fonts</string>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>11</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="0" column="1" >
+ <widget class="QLabel" name="textLabel2_3" >
+ <property name="text" >
+ <string>Family</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" >
+ <widget class="QLabel" name="TextLabel1_3" >
+ <property name="text" >
+ <string>Size</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="textLabel4_6" >
+ <property name="text" >
+ <string>Font 1</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="textLabel5_6" >
+ <property name="text" >
+ <string>Font 2</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QLabel" name="textLabel6_6" >
+ <property name="text" >
+ <string>Font 3</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="fontName0" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QLineEdit" name="fontName1" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="QLineEdit" name="fontName2" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" >
+ <widget class="QLineEdit" name="fontName3" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="textLabel3_3" >
+ <property name="text" >
+ <string>Font 0</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2" >
+ <widget class="QSpinBox" name="fontSize0" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2" >
+ <widget class="QSpinBox" name="fontSize1" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2" >
+ <widget class="QSpinBox" name="fontSize2" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2" >
+ <widget class="QSpinBox" name="fontSize3" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3" >
+ <widget class="QCheckBox" name="bold1" >
+ <property name="text" >
+ <string>Bold</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="3" >
+ <widget class="QCheckBox" name="bold2" >
+ <property name="text" >
+ <string>Bold</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="3" >
+ <widget class="QCheckBox" name="bold3" >
+ <property name="text" >
+ <string>Bold</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3" >
+ <widget class="QCheckBox" name="bold0" >
+ <property name="text" >
+ <string>Bold</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="4" >
+ <widget class="QCheckBox" name="italic2" >
+ <property name="text" >
+ <string>Italic</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="4" >
+ <widget class="QCheckBox" name="italic3" >
+ <property name="text" >
+ <string>Italic</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="4" >
+ <widget class="QCheckBox" name="italic1" >
+ <property name="text" >
+ <string>Italic</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="4" >
+ <widget class="QCheckBox" name="italic0" >
+ <property name="text" >
+ <string>Italic</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="5" >
+ <widget class="QToolButton" name="fontBrowse0" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="5" >
+ <widget class="QToolButton" name="fontBrowse1" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="5" >
+ <widget class="QToolButton" name="fontBrowse2" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="5" >
+ <widget class="QToolButton" name="fontBrowse3" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" >
+ <widget class="QLabel" name="textLabel7_4" >
+ <property name="text" >
+ <string>Font 4</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1" >
+ <widget class="QLineEdit" name="fontName4" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" >
+ <widget class="QLabel" name="textLabel7_5" >
+ <property name="text" >
+ <string>Font 5</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1" >
+ <widget class="QLineEdit" name="fontName5" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="2" >
+ <widget class="QSpinBox" name="fontSize4" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="2" >
+ <widget class="QSpinBox" name="fontSize5" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="3" >
+ <widget class="QCheckBox" name="bold4" >
+ <property name="text" >
+ <string>Bold</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="3" >
+ <widget class="QCheckBox" name="bold5" >
+ <property name="text" >
+ <string>Bold</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="4" >
+ <widget class="QCheckBox" name="italic4" >
+ <property name="text" >
+ <string>Italic</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="4" >
+ <widget class="QCheckBox" name="italic5" >
+ <property name="text" >
+ <string>Italic</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="5" >
+ <widget class="QToolButton" name="fontBrowse4" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="5" >
+ <widget class="QToolButton" name="fontBrowse5" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
<item>
@@ -1254,13 +2296,6 @@
<pixmapfunction></pixmapfunction>
<customwidgets>
<customwidget>
- <class>RecordButton</class>
- <extends>QToolButton</extends>
- <header>recordbutton.h</header>
- <container>0</container>
- <pixmap></pixmap>
- </customwidget>
- <customwidget>
<class>GreendotButton</class>
<extends>QToolButton</extends>
<header>greendotbutton.h</header>
@@ -1281,13 +2316,20 @@
<container>0</container>
<pixmap></pixmap>
</customwidget>
+ <customwidget>
+ <class>RecordButton</class>
+ <extends>QToolButton</extends>
+ <header>recordbutton.h</header>
+ <container>0</container>
+ <pixmap></pixmap>
+ </customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
<sender>okButton</sender>
<signal>clicked()</signal>
- <receiver>GlobalSettingsDialogBase</receiver>
+ <receiver>PreferencesDialogBase</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
@@ -1303,7 +2345,7 @@
<connection>
<sender>cancelButton</sender>
<signal>clicked()</signal>
- <receiver>GlobalSettingsDialogBase</receiver>
+ <receiver>PreferencesDialogBase</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
diff --git a/muse/muse/shortcuts.cpp b/muse/muse/shortcuts.cpp
index a5127e53..6a182b6c 100644
--- a/muse/muse/shortcuts.cpp
+++ b/muse/muse/shortcuts.cpp
@@ -275,12 +275,12 @@ void initShortCuts()
defShrt(SHRT_FOLLOW_NO, 0, 48, ARRANG_SHRT, "follow_no");
defShrt(SHRT_FOLLOW_CONTINUOUS, 0, 49, ARRANG_SHRT, "follow_continuous");
- defShrt(SHRT_GLOBAL_CONFIG, 0, 50, ARRANG_SHRT, "configure_global");
+// defShrt(SHRT_GLOBAL_CONFIG, 0, 50, ARRANG_SHRT, "configure_global");
defShrt(SHRT_CONFIG_SHORTCUTS, 0, 51, ARRANG_SHRT, "configure_shortcuts");
defShrt(SHRT_CONFIG_METRONOME, 0, 52, ARRANG_SHRT, "configure_metronome");
defShrt(SHRT_CONFIG_MIDISYNC, 0, 53, ARRANG_SHRT, "configure_midi_sync");
defShrt(SHRT_MIDI_FILE_CONFIG, 0, 54, ARRANG_SHRT, "configure_midi_file");
- defShrt(SHRT_APPEARANCE_SETTINGS, 0, 55, ARRANG_SHRT, "configure_appearance_settings");
+// defShrt(SHRT_APPEARANCE_SETTINGS, 0, 55, ARRANG_SHRT, "configure_appearance_settings");
defShrt(SHRT_CONFIG_MIDI_PORTS, 0, 56, ARRANG_SHRT, "configure_midi_ports");
defShrt(SHRT_CONFIG_AUDIO_PORTS, 0, 57, ARRANG_SHRT, "configure_audio_ports");
defShrt(SHRT_MIDI_EDIT_INSTRUMENTS, 0, 58, ARRANG_SHRT, "midi_edit_instruments");
diff --git a/muse/muse/shortcuts.h b/muse/muse/shortcuts.h
index f7b885f9..9d29409c 100644
--- a/muse/muse/shortcuts.h
+++ b/muse/muse/shortcuts.h
@@ -158,12 +158,12 @@ enum {
SHRT_FOLLOW_NO, //Default: undefined
SHRT_FOLLOW_CONTINUOUS, //Default: undefined
- SHRT_GLOBAL_CONFIG, //Default: undefined
+// SHRT_GLOBAL_CONFIG, //Default: undefined
SHRT_CONFIG_SHORTCUTS, //Default: undefined
SHRT_CONFIG_METRONOME, //Default: undefined
SHRT_CONFIG_MIDISYNC, //Default: undefined
SHRT_MIDI_FILE_CONFIG, //Default: undefined
- SHRT_APPEARANCE_SETTINGS, //Default: undefined
+// SHRT_APPEARANCE_SETTINGS, //Default: undefined
SHRT_CONFIG_MIDI_PORTS, //Default: undefined
SHRT_CONFIG_AUDIO_PORTS, //Default: undefined
//SHRT_SAVE_GLOBAL_CONFIG, //Default: undefined
diff --git a/muse/muse/widgets/CMakeLists.txt b/muse/muse/widgets/CMakeLists.txt
index 4cf9d05b..27ee7e73 100644
--- a/muse/muse/widgets/CMakeLists.txt
+++ b/muse/muse/widgets/CMakeLists.txt
@@ -51,13 +51,13 @@ QT4_WRAP_UI (widget_ui_headers
velocity.ui
)
-# ADD_CUSTOM_COMMAND(OUTPUT ui_midisync.h
-# COMMAND ${QT_UIC_EXECUTABLE}
-# ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h ${CMAKE_CURRENT_SOURCE_DIR}/midisync.ui
-# DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/midisync.ui
-# )
+add_custom_command(OUTPUT ui_midisync.h
+ COMMAND ${QT_UIC_EXECUTABLE}
+ ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h ${CMAKE_CURRENT_SOURCE_DIR}/midisync.ui
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/midisync.ui
+ )
-# ADD_FILE_DEPENDENCIES(moc_midisync.cxx ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h)
+ADD_FILE_DEPENDENCIES(moc_midisync.cxx ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h)
add_library ( widgets STATIC
${widget_ui_headers}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 04:45:46 +0000