Update of /cvsroot/lmuse/muse/muse/widgets
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25441/muse/widgets
Modified Files:
Tag: REL07
gensetbase.ui genset.cpp musewidgetsplug.cpp
Log Message:
added possiblity to start/stop playback with one shortcut (default space)
Index: genset.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/genset.cpp,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -d -r1.7.2.1 -r1.7.2.2
*** genset.cpp 9 Jul 2005 22:02:10 -0000 1.7.2.1
--- genset.cpp 13 Feb 2007 08:23:53 -0000 1.7.2.2
***************
*** 82,85 ****
--- 82,86 ----
showSplash->setChecked(config.showSplashScreen);
externalWavEditorSelect->setText(config.externalWavEditor);
+ oldStyleStopCheckBox->setChecked(config.useOldStyleStopShortCut);
connect(applyButton, SIGNAL(clicked()), SLOT(apply()));
***************
*** 135,139 ****
config.showSplashScreen = showSplash->isChecked();
config.externalWavEditor = externalWavEditorSelect->text();
!
muse->showMixer(config.mixerVisible);
muse->showBigtime(config.bigTimeVisible);
--- 136,140 ----
config.showSplashScreen = showSplash->isChecked();
config.externalWavEditor = externalWavEditorSelect->text();
! config.useOldStyleStopShortCut = oldStyleStopCheckBox->isChecked();
muse->showMixer(config.mixerVisible);
muse->showBigtime(config.bigTimeVisible);
Index: gensetbase.ui
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/gensetbase.ui,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** gensetbase.ui 9 Jul 2005 22:02:10 -0000 1.8.2.1
--- gensetbase.ui 13 Feb 2007 08:23:53 -0000 1.8.2.2
***************
*** 832,840 ****
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
- <property name="name">
- <cstring>helpBrowser</cstring>
- </property>
- </widget>
<widget class="QLabel" row="1" column="0">
<property name="name">
--- 832,835 ----
***************
*** 845,849 ****
</property>
</widget>
! <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>TextLabel1</cstring>
--- 840,844 ----
</property>
</widget>
! <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>TextLabel1</cstring>
***************
*** 853,857 ****
</property>
</widget>
! <widget class="QSpinBox" row="0" column="2">
<property name="name">
<cstring>guiRefreshSelect</cstring>
--- 848,852 ----
</property>
</widget>
! <widget class="QSpinBox" row="0" column="3" rowspan="1" colspan="2">
<property name="name">
<cstring>guiRefreshSelect</cstring>
***************
*** 870,874 ****
</property>
</widget>
! <spacer row="2" column="0">
<property name="name">
<cstring>spacer2</cstring>
--- 865,874 ----
</property>
</widget>
! <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="4">
! <property name="name">
! <cstring>helpBrowser</cstring>
! </property>
! </widget>
! <spacer row="3" column="0">
<property name="name">
<cstring>spacer2</cstring>
***************
*** 883,891 ****
<size>
<width>20</width>
! <height>40</height>
</size>
</property>
</spacer>
! <spacer row="2" column="2">
<property name="name">
<cstring>spacer3</cstring>
--- 883,891 ----
<size>
<width>20</width>
! <height>300</height>
</size>
</property>
</spacer>
! <spacer row="3" column="3">
<property name="name">
<cstring>spacer3</cstring>
***************
*** 900,904 ****
<size>
<width>20</width>
! <height>40</height>
</size>
</property>
--- 900,945 ----
<size>
<width>20</width>
! <height>300</height>
! </size>
! </property>
! </spacer>
! <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
! <property name="name">
! <cstring>textLabel1_4</cstring>
! </property>
! <property name="text">
! <string>Use old-style stop shortcut:</string>
! </property>
! </widget>
! <widget class="QCheckBox" row="2" column="4">
! <property name="name">
! <cstring>oldStyleStopCheckBox</cstring>
! </property>
! <property name="sizePolicy">
! <sizepolicy>
! <hsizetype>0</hsizetype>
! <vsizetype>0</vsizetype>
! <horstretch>0</horstretch>
! <verstretch>0</verstretch>
! </sizepolicy>
! </property>
! <property name="text">
! <string></string>
! </property>
! </widget>
! <spacer row="2" column="2" rowspan="1" colspan="2">
! <property name="name">
! <cstring>spacer7</cstring>
! </property>
! <property name="orientation">
! <enum>Horizontal</enum>
! </property>
! <property name="sizeType">
! <enum>Expanding</enum>
! </property>
! <property name="sizeHint">
! <size>
! <width>270</width>
! <height>20</height>
</size>
</property>
Index: musewidgetsplug.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/musewidgetsplug.cpp,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -d -r1.9.2.2 -r1.9.2.3
*** musewidgetsplug.cpp 27 Jan 2007 14:52:43 -0000 1.9.2.2
--- musewidgetsplug.cpp 13 Feb 2007 08:23:53 -0000 1.9.2.3
***************
*** 129,133 ****
QString(""), // canvasBgPixmap;
QString(""), // style
! QString("") // externalWavEditor //this line was missing 2007-01-08 (willyfoobar)
};
--- 129,134 ----
QString(""), // canvasBgPixmap;
QString(""), // style
! QString(""), // externalWavEditor //this line was missing 2007-01-08 (willyfoobar)
! false, // useOldStyleStopShortCut
};
|