[Traverso-commit] traverso resources/keymap.xml src/traverso/Inte...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/04 23:37:57

Modified files:
        resources      : keymap.xml 
        src/traverso   : Interface.cpp 
        src/traverso/songcanvas: SongView.h 

Log message:
        context submenu population fix, removed redundant Playhead naming in 
submenus, slightly improved ordering

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.h?cvsroot=traverso&r1=1.32&r2=1.33

Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- resources/keymap.xml        4 Jun 2007 17:09:40 -0000       1.80
+++ resources/keymap.xml        4 Jun 2007 23:37:56 -0000       1.81
@@ -213,7 +213,7 @@
                </keyfact>
                <keyfact type="FKEY" key1="MouseButtonMiddle" >
                        <Objects>
-                               <Object objectname="SongView" 
slotsignature="touch_play_cursor" modes="All" sortorder="2" submenu="Playhead" 
/>
+                               <Object objectname="SongView" 
slotsignature="touch_play_cursor" modes="All" sortorder="8" submenu="Playhead" 
/>
                                <Object objectname="TimeLineView" 
slotsignature="playhead_to_marker" modes="All" sortorder="2" />
                        </Objects>
                </keyfact>
@@ -366,12 +366,12 @@
                </keyfact> 
                <keyfact type="HKEY" key1="MouseButtonMiddle" >
                        <Objects>
-                               <Object objectname="SongView" mousehint="LR" 
slotsignature="play_cursor_move" modes="All" sortorder="8" submenu="Playhead" />
+                               <Object objectname="SongView" mousehint="LR" 
slotsignature="play_cursor_move" modes="All" sortorder="9" submenu="Playhead" />
                        </Objects>
                </keyfact>
                <keyfact type="HKEY" key1="W" >
                        <Objects>
-                               <Object objectname="SongView" mousehint="LR" 
slotsignature="work_cursor_move" modes="All" sortorder="14" />
+                               <Object objectname="SongView" mousehint="LR" 
slotsignature="work_cursor_move" modes="All" sortorder="14" submenu="Work 
Cursor" />
                        </Objects>
                </keyfact>
                <keyfact type="HKEY" key1="C" >
@@ -528,7 +528,7 @@
                </keyfact>
                <keyfact type="D_FKEY" key1="SHIFT">
                        <Objects>
-                               <Object objectname="SongView" 
slotsignature="play_to_begin" modes="All" sortorder="1" submenu="Playhead" />
+                               <Object objectname="SongView" 
slotsignature="play_to_begin" modes="All" sortorder="30" submenu="Playhead" />
                        </Objects>
                </keyfact>
 

Index: src/traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- src/traverso/Interface.cpp  3 Jun 2007 20:42:07 -0000       1.88
+++ src/traverso/Interface.cpp  4 Jun 2007 23:37:57 -0000       1.89
@@ -672,7 +672,7 @@
                
                // Merge entries with equal actions, but different key facts.
                for (int j=i+1; j<list.size(); ++j) {
-                       if (list.at(j).description == data.description) {
+                       if (list.at(j).description == data.description && 
list.at(j).submenu == data.submenu) {
                                QString mergestring = list.at(j).keysequence;
                                data.keysequence = 
create_keyfact_string(data.keysequence, data.modifierkeys) +
                                                " ,  " +

Index: src/traverso/songcanvas/SongView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/traverso/songcanvas/SongView.h  3 Jun 2007 22:41:58 -0000       1.32
+++ src/traverso/songcanvas/SongView.h  4 Jun 2007 23:37:57 -0000       1.33
@@ -40,8 +40,8 @@
 class SongView : public ViewItem
 {
         Q_OBJECT
-       Q_CLASSINFO("touch", tr("Workcursor: Set"))
-       Q_CLASSINFO("touch_play_cursor", tr("Playhead: Set"))
+       Q_CLASSINFO("touch", tr("Set"))
+       Q_CLASSINFO("touch_play_cursor", tr("Set"))
        Q_CLASSINFO("hzoom_out", tr("Horizontal Out"))
        Q_CLASSINFO("hzoom_in", tr("Horizontal In"))
        Q_CLASSINFO("vzoom_out", tr("Vertical Out"))
@@ -55,13 +55,13 @@
        Q_CLASSINFO("shuttle", tr("Shuttle"))
        Q_CLASSINFO("goto_begin", tr("To start"))
        Q_CLASSINFO("goto_end", tr("To end"))
-       Q_CLASSINFO("play_to_begin", tr("Playhead: To Start"))
-       Q_CLASSINFO("play_cursor_move", tr("Playhead: Move"))
-       Q_CLASSINFO("work_cursor_move", tr("Workcursor: Move"))
+       Q_CLASSINFO("play_to_begin", tr("To Start"))
+       Q_CLASSINFO("play_cursor_move", tr("Move"))
+       Q_CLASSINFO("work_cursor_move", tr("Move"))
        Q_CLASSINFO("add_marker", tr("Add Marker"))
        Q_CLASSINFO("add_marker_at_playhead", tr("Add Marker at Playhead"))
-       Q_CLASSINFO("playhead_to_workcursor", tr("Playhead: To workcursor"))
-       Q_CLASSINFO("center_playhead", tr("Playhead: Center"))
+       Q_CLASSINFO("playhead_to_workcursor", tr("To workcursor"))
+       Q_CLASSINFO("center_playhead", tr("Center"))
 
 public :