diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-20 22:55:49 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-20 22:55:49 +0000 |
commit | 1b01ff89a892df30494fa3d964c6b0acf179804a (patch) | |
tree | 8e71443314925d6a40634ce0c0cd4ec666af28d7 /muse2/muse/widgets | |
parent | e5a7a6f186c458e3c7087dbc5604959b519bdba9 (diff) |
Use the default browser of the system to open help pages. Added some groupboxes and layouts to genset.
Diffstat (limited to 'muse2/muse/widgets')
-rw-r--r-- | muse2/muse/widgets/genset.cpp | 3 | ||||
-rw-r--r-- | muse2/muse/widgets/gensetbase.ui | 316 |
2 files changed, 131 insertions, 188 deletions
diff --git a/muse2/muse/widgets/genset.cpp b/muse2/muse/widgets/genset.cpp index a05020d6..24e58855 100644 --- a/muse2/muse/widgets/genset.cpp +++ b/muse2/muse/widgets/genset.cpp @@ -78,7 +78,6 @@ GlobalSettingsConfig::GlobalSettingsConfig(QWidget* parent) //dummyAudioRealRate->setText(dad ? QString().setNum(sampleRate) : "---"); dummyAudioRealRate->setText(QString().setNum(sampleRate)); - helpBrowser->setText(config.helpBrowser); startSongEntry->setText(config.startSong); startSongGroup->button(config.startMode)->setChecked(true); @@ -183,7 +182,6 @@ void GlobalSettingsConfig::updateSettings() //dummyAudioRealRate->setText(dad ? QString().setNum(sampleRate) : "---"); dummyAudioRealRate->setText(QString().setNum(sampleRate)); - helpBrowser->setText(config.helpBrowser); startSongEntry->setText(config.startSong); startSongGroup->button(config.startMode)->setChecked(true); @@ -258,7 +256,6 @@ void GlobalSettingsConfig::apply() config.useOutputLimiter = outputLimiterCheckBox->isChecked(); config.vstInPlace = vstInPlaceCheckBox->isChecked(); config.rtcTicks = rtcResolutions[rtcticks]; - config.helpBrowser = helpBrowser->text(); config.startSong = startSongEntry->text(); config.startMode = startSongGroup->checkedId(); int das = dummyAudioSize->currentIndex(); diff --git a/muse2/muse/widgets/gensetbase.ui b/muse2/muse/widgets/gensetbase.ui index 9d63cbe5..6e5bfec8 100644 --- a/muse2/muse/widgets/gensetbase.ui +++ b/muse2/muse/widgets/gensetbase.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>494</width> + <width>522</width> <height>518</height> </rect> </property> @@ -28,6 +28,9 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="currentIndex"> + <number>3</number> + </property> <widget class="QWidget" name="TabPage"> <attribute name="title"> <string>Application</string> @@ -424,43 +427,6 @@ <layout class="QGridLayout"> <item row="0" column="0"> <layout class="QGridLayout"> - <item row="0" column="1"> - <layout class="QVBoxLayout"> - <property name="margin"> - <number>9</number> - </property> - <item> - <widget class="QCheckBox" name="showSplash"> - <property name="text"> - <string>show splash screen</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="showDidYouKnow"> - <property name="text"> - <string>show "Did you know?" dialog</string> - </property> - </widget> - </item> - <item> - <spacer name="spacer4"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> <item row="1" column="0"> <spacer name="spacer7_2"> <property name="orientation"> @@ -536,6 +502,42 @@ </layout> </widget> </item> + <item row="0" column="1"> + <widget class="QGroupBox" name="startUpBox"> + <property name="title"> + <string>On Launch</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QCheckBox" name="showSplash"> + <property name="text"> + <string>show splash screen</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="showDidYouKnow"> + <property name="text"> + <string>show "Did you know?" dialog</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="1"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </item> </layout> @@ -1092,156 +1094,100 @@ Shorter periods are desirable.</string> <attribute name="title"> <string>GUI</string> </attribute> - <layout class="QGridLayout"> - <item row="1" column="0"> - <widget class="QLabel" name="textLabel1"> - <property name="text"> - <string>Help Browser:</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLabel" name="TextLabel1"> - <property name="text"> - <string>GUI Refresh Rate</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="3" colspan="2"> - <widget class="QSpinBox" name="guiRefreshSelect"> - <property name="suffix"> - <string>/sec</string> - </property> - <property name="minimum"> - <number>2</number> - </property> - <property name="maximum"> - <number>100</number> - </property> - <property name="value"> - <number>20</number> - </property> - </widget> - </item> - <item row="1" column="1" colspan="4"> - <widget class="QLineEdit" name="helpBrowser"/> - </item> - <item row="4" column="0"> - <spacer name="spacer2"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>240</height> - </size> - </property> - </spacer> - </item> - <item row="4" column="4"> - <spacer name="spacer3"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>240</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="5"> - <widget class="QCheckBox" name="oldStyleStopCheckBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="3" column="5"> - <widget class="QCheckBox" name="moveArmedCheckBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="2" column="2" colspan="3"> - <spacer name="spacer7"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>270</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QLabel" name="textLabel1_4"> - <property name="text"> - <string>Use old-style stop shortcut:</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="3" column="0" colspan="3"> - <widget class="QLabel" name="textLabel1_4_2"> - <property name="text"> - <string>Move single armed track with selection</string> - </property> - <property name="wordWrap"> - <bool>false</bool> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>11</number> + </property> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Behavior</string> </property> + <layout class="QGridLayout" name="gridLayout_2" columnminimumwidth="280,0,0"> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel1"> + <property name="text"> + <string>GUI Refresh Rate</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="1" colspan="2"> + <widget class="QSpinBox" name="guiRefreshSelect"> + <property name="suffix"> + <string>/sec</string> + </property> + <property name="minimum"> + <number>2</number> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>20</number> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="textLabel1_4"> + <property name="text"> + <string>Use old-style stop shortcut:</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="textLabel1_4_2"> + <property name="text"> + <string>Move single armed track with selection</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QCheckBox" name="moveArmedCheckBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="oldStyleStopCheckBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="3" column="3" colspan="2"> - <spacer name="spacer7_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>210</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </widget> </widget> |