[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso resources/keymap.xml src/commands/Fade...
|
From: |
Ben Levitt |
|
Subject: |
[Traverso-commit] traverso resources/keymap.xml src/commands/Fade... |
|
Date: |
Sat, 29 Dec 2007 02:03:37 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/12/29 02:03:37
Modified files:
resources : keymap.xml
src/commands : Fade.cpp
src/core : AudioClip.cpp AudioClip.h FadeCurve.h
FadeCurve.cpp
src/traverso/songcanvas: AudioClipView.h FadeView.cpp FadeView.h
Log message:
Reorganize and rename Fade commands.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Fade.cpp?cvsroot=traverso&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.158&r2=1.159
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.h?cvsroot=traverso&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FadeCurve.h?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FadeCurve.cpp?cvsroot=traverso&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.h?cvsroot=traverso&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/FadeView.cpp?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/FadeView.h?cvsroot=traverso&r1=1.5&r2=1.6
Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- resources/keymap.xml 27 Dec 2007 22:27:23 -0000 1.93
+++ resources/keymap.xml 29 Dec 2007 02:03:36 -0000 1.94
@@ -16,6 +16,7 @@
<keyfact type="FKEY" key1="H">
<Objects>
<Object objectname="Interface"
slotsignature="open_help_browser" modes="All" />
+ <Object objectname="FadeCurve"
slotsignature="set_mode" modes="All" sortorder="2" />
</Objects>
</keyfact>
<keyfact type="FKEY" key1="F1" >
@@ -168,7 +169,7 @@
</keyfact>
<keyfact type="FKEY" key1="B" >
<Objects>
- <Object objectname="FadeCurve"
slotsignature="toggle_bypass" modes="All" />
+ <Object objectname="FadeCurve"
slotsignature="toggle_bypass" modes="All" sortorder="10" />
<Object objectname="Plugin"
slotsignature="toggle_bypass" modes="All" />
<Object objectname="LV2Plugin"
slotsignature="toggle_bypass" modes="All" />
<Object objectname="TrackView"
slotsignature="select_bus" modes="All" sortorder="8" />
@@ -176,7 +177,7 @@
</keyfact>
<keyfact type="FKEY" key1="P" >
<Objects>
- <Object objectname="FadeCurve"
slotsignature="set_mode" modes="All" />
+ <Object objectname="FadeView"
slotsignature="select_fade_shape" modes="All" sortorder="1"/>
</Objects>
</keyfact>
<keyfact type="FKEY" key1="M" >
@@ -192,13 +193,12 @@
<keyfact type="FKEY" key1="L" >
<Objects>
<Object objectname="SpectralMeterView"
slotsignature="reset" modes="All" />
- <Object objectname="FadeCurve"
slotsignature="reset" modes="All" />
<Object objectname="AudioClip"
slotsignature="lock" modes="All" sortorder="80" />
</Objects>
</keyfact>
<keyfact type="FKEY" key1="R" >
<Objects>
- <Object objectname="FadeCurve"
slotsignature="toggle_raster" modes="All" />
+ <Object objectname="FadeCurve"
slotsignature="toggle_raster" modes="All" sortorder="11" />
</Objects>
</keyfact>
<keyfact type="FKEY" key1="C" >
@@ -248,7 +248,6 @@
</keyfact>
<keyfact type="FKEY" key1="F" >
<Objects>
- <Object objectname="AudioClipView"
slotsignature="select_fade_shape" modes="All" sortorder="32" submenu="Fade
In/Out" />
<Object objectname="MoveClip"
slotsignature="next_snap_pos" modes="All" sortorder="1" />
<Object objectname="DragMarker"
slotsignature="move_right" modes="All" sortorder="1" />
</Objects>
@@ -397,12 +396,12 @@
</keyfact>
<keyfact type="HKEY" key1="B" >
<Objects>
- <Object objectname="FadeView" mousehint="UD"
slotsignature="bend" modes="All" />
+ <Object objectname="FadeView" mousehint="UD"
slotsignature="bend" modes="All" sortorder="3" />
</Objects>
</keyfact>
<keyfact type="HKEY" key1="S" >
<Objects>
- <Object objectname="FadeView" mousehint="LR"
slotsignature="strength" modes="All" />
+ <Object objectname="FadeView" mousehint="LR"
slotsignature="strength" modes="All" sortorder="4" />
<Object objectname="SongView" mousehint="LRUD"
slotsignature="shuttle" modes="All" sortorder="6" />
</Objects>
</keyfact>
@@ -530,6 +529,7 @@
<Object objectname="CurveView"
slotsignature="remove_node" modes="All" />
<Object objectname="PluginView"
slotsignature="remove_plugin" modes="All" />
<Object objectname="TimeLineView"
slotsignature="remove_marker" modes="All" />
+ <Object objectname="FadeCurve"
slotsignature="reset" modes="All" sortorder="6" />
</Objects>
</keyfact>
<keyfact type="D_FKEY" key1="C" >
Index: src/commands/Fade.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Fade.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/commands/Fade.cpp 5 Nov 2007 15:49:29 -0000 1.25
+++ src/commands/Fade.cpp 29 Dec 2007 02:03:36 -0000 1.26
@@ -48,7 +48,7 @@
m_curve = curve;
d->direction = (m_curve->get_fade_type() == FadeCurve::FadeIn) ? 1 : -1;
d->scalefactor = scalefactor;
- setText( (d->direction == 1) ? tr("Fade In: range") : tr("Fade Out:
range"));
+ setText( (d->direction == 1) ? tr("Fade In: length") : tr("Fade Out:
length"));
}
@@ -60,7 +60,7 @@
d->direction = (m_curve->get_fade_type() == FadeCurve::FadeIn) ? 1 : -1;
m_origRange = m_curve->get_range();
m_newRange = newRange;
- setText( (d->direction == 1) ? tr("Fade In: reset") : tr("Fade Out:
reset"));
+ setText( (d->direction == 1) ? tr("Fade In: delete") : tr("Fade Out:
delete"));
}
@@ -336,7 +336,7 @@
: Command(fade)
, m_fade(fade)
{
- setText( (m_fade->get_fade_type() == FadeCurve::FadeIn) ? tr("Fade In:
mode") : tr("Fade Out: mode"));
+ setText( (m_fade->get_fade_type() == FadeCurve::FadeIn) ? tr("Fade In:
shape") : tr("Fade Out: shape"));
m_newMode = newMode;
m_oldMode = oldMode;
Index: src/core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- src/core/AudioClip.cpp 1 Dec 2007 23:52:46 -0000 1.158
+++ src/core/AudioClip.cpp 29 Dec 2007 02:03:36 -0000 1.159
@@ -659,9 +659,18 @@
Command* AudioClip::reset_fade_both()
{
- CommandGroup* group = new CommandGroup(this, tr("Reset Fades"));
+ if (!fadeOut && !fadeIn) {
+ return 0;
+ }
+
+ CommandGroup* group = new CommandGroup(this, tr("Delete Fades"));
+
+ if (fadeIn) {
group->add_command(reset_fade_in());
+ }
+ if (fadeOut) {
group->add_command(reset_fade_out());
+ }
return group;
}
Index: src/core/AudioClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- src/core/AudioClip.h 29 Nov 2007 11:04:07 -0000 1.70
+++ src/core/AudioClip.h 29 Dec 2007 02:03:36 -0000 1.71
@@ -47,11 +47,11 @@
{
Q_OBJECT
Q_CLASSINFO("mute", tr("Mute"))
- Q_CLASSINFO("reset_fade_in", tr("In: Reset"))
- Q_CLASSINFO("reset_fade_out", tr("Out: Reset"))
- Q_CLASSINFO("reset_fade_both", tr("Reset both"))
+ Q_CLASSINFO("reset_fade_in", tr("In: Delete"))
+ Q_CLASSINFO("reset_fade_out", tr("Out: Delete"))
+ Q_CLASSINFO("reset_fade_both", tr("Both: Delete"))
Q_CLASSINFO("normalize", tr("Normalize"))
- Q_CLASSINFO("denormalize", tr("Normalize: reset"))
+ Q_CLASSINFO("denormalize", tr("Normalize: Reset"))
Q_CLASSINFO("lock", tr("Lock"))
public:
Index: src/core/FadeCurve.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/FadeCurve.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/core/FadeCurve.h 11 Dec 2007 17:30:11 -0000 1.16
+++ src/core/FadeCurve.h 29 Dec 2007 02:03:36 -0000 1.17
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: FadeCurve.h,v 1.16 2007/12/11 17:30:11 r_sijrier Exp $
+$Id: FadeCurve.h,v 1.17 2007/12/29 02:03:36 benjie Exp $
*/
#ifndef FADE_CURVE_H
@@ -37,10 +37,10 @@
{
Q_OBJECT
- Q_CLASSINFO("toggle_bypass", tr("Toggle bypass"))
- Q_CLASSINFO("set_mode", tr("Set Mode"))
- Q_CLASSINFO("reset", tr("Reset"))
- Q_CLASSINFO("toggle_raster", tr("Toggle raster"))
+ Q_CLASSINFO("toggle_bypass", tr("Toggle Bypass"))
+ Q_CLASSINFO("set_mode", tr("Cycle Shape"))
+ Q_CLASSINFO("reset", tr("Delete"))
+ Q_CLASSINFO("toggle_raster", tr("Toggle Raster"))
public:
static QStringList defaultShapes;
Index: src/core/FadeCurve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FadeCurve.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- src/core/FadeCurve.cpp 19 Nov 2007 11:18:53 -0000 1.31
+++ src/core/FadeCurve.cpp 29 Dec 2007 02:03:36 -0000 1.32
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: FadeCurve.cpp,v 1.31 2007/11/19 11:18:53 r_sijrier Exp $
+$Id: FadeCurve.cpp,v 1.32 2007/12/29 02:03:36 benjie Exp $
*/
#include "FadeCurve.h"
@@ -236,7 +236,7 @@
return;
}
- CommandGroup* group = new CommandGroup(this, tr("Fade Shape"));
+ CommandGroup* group = new CommandGroup(this, tr("Fade Preset"));
group->add_command(new FadeBend(this, fadeElement.attribute(
"bendfactor", "0.5" ).toDouble()));
group->add_command(new FadeStrength(this, fadeElement.attribute(
"strengthfactor", "0.5" ).toDouble()));
@@ -375,10 +375,7 @@
Command* FadeCurve::reset( )
{
- set_bend_factor(0.5);
- set_strength_factor(0.5);
-
- return 0;
+ return (m_type == FadeIn) ? m_clip->reset_fade_in() :
m_clip->reset_fade_out();
}
Command* FadeCurve::toggle_bypass( )
Index: src/traverso/songcanvas/AudioClipView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/traverso/songcanvas/AudioClipView.h 14 Dec 2007 21:37:32 -0000
1.35
+++ src/traverso/songcanvas/AudioClipView.h 29 Dec 2007 02:03:37 -0000
1.36
@@ -41,12 +41,12 @@
class AudioClipView : public ViewItem
{
Q_OBJECT
- Q_CLASSINFO("fade_range", tr("In/Out: Range"))
- Q_CLASSINFO("clip_fade_in", tr("In: Range"))
- Q_CLASSINFO("clip_fade_out", tr("Out: Range"))
- Q_CLASSINFO("select_fade_in_shape", tr("In: Select shape"));
- Q_CLASSINFO("select_fade_out_shape", tr("Out: Select shape"));
- Q_CLASSINFO("reset_fade", tr("In/Out: Reset"));
+ Q_CLASSINFO("fade_range", tr("Closest: Adjust Length"))
+ Q_CLASSINFO("clip_fade_in", tr("In: Adjust Length"))
+ Q_CLASSINFO("clip_fade_out", tr("Out: Adjust Length"))
+ Q_CLASSINFO("select_fade_in_shape", tr("In: Select Preset"));
+ Q_CLASSINFO("select_fade_out_shape", tr("Out: Select Preset"));
+ Q_CLASSINFO("reset_fade", tr("Closest: Delete"));
Q_CLASSINFO("set_audio_file", tr("Reset Audio File"));
Q_CLASSINFO("edit_properties", tr("Edit Properties"));
Index: src/traverso/songcanvas/FadeView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/FadeView.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/traverso/songcanvas/FadeView.cpp 19 Nov 2007 11:18:54 -0000
1.21
+++ src/traverso/songcanvas/FadeView.cpp 29 Dec 2007 02:03:37 -0000
1.22
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: FadeView.cpp,v 1.21 2007/11/19 11:18:54 r_sijrier Exp $
+$Id: FadeView.cpp,v 1.22 2007/12/29 02:03:37 benjie Exp $
*/
#include "FadeView.h"
@@ -28,6 +28,7 @@
#include "AudioClipView.h"
#include "FadeContextDialog.h"
#include "SongView.h"
+#include "Interface.h"
#include <Themer.h>
#include <Fade.h>
#include <InputEngine.h>
@@ -271,6 +272,17 @@
return new FadeStrength(this);
}
+Command* FadeView::select_fade_shape()
+{
+ if (m_fadeCurve->get_fade_type() == FadeCurve::FadeIn) {
+ Interface::instance()->select_fade_in_shape();
+ }
+ else {
+ Interface::instance()->select_fade_out_shape();
+ }
+ return 0;
+}
+
void FadeView::set_holding(bool hold)
{
m_holdactive = hold;
Index: src/traverso/songcanvas/FadeView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/FadeView.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/traverso/songcanvas/FadeView.h 27 Jun 2007 19:32:43 -0000 1.5
+++ src/traverso/songcanvas/FadeView.h 29 Dec 2007 02:03:37 -0000 1.6
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: FadeView.h,v 1.5 2007/06/27 19:32:43 benjie Exp $
+$Id: FadeView.h,v 1.6 2007/12/29 02:03:37 benjie Exp $
*/
#ifndef FADE_VIEW_H
@@ -34,8 +34,9 @@
{
Q_OBJECT
- Q_CLASSINFO("bend", tr("Bend"))
- Q_CLASSINFO("strength", tr("Strength"))
+ Q_CLASSINFO("bend", tr("Adjust Bend"))
+ Q_CLASSINFO("strength", tr("Adjust Strength"))
+ Q_CLASSINFO("select_fade_shape", tr("Select Preset"))
public:
FadeView(SongView* sv, AudioClipView* parent, FadeCurve* fadeCuve);
@@ -63,6 +64,7 @@
Command* bend();
Command* strength();
+ Command* select_fade_shape();
// Command* edit_properties();
signals :
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso resources/keymap.xml src/commands/Fade...,
Ben Levitt <=