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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     09/03/15 22:41:45

Modified files:
        resources      : keymap.xml 
        src/traverso/dialogs: CDWritingDialog.cpp 

Log message:
        fix win32 compile error, move Crop from [ X C ] to [ R ] (with Remon's 
permission) to avoid problems with using < Esc > to cancel a Crop

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/CDWritingDialog.cpp?cvsroot=traverso&r1=1.9&r2=1.10

Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- resources/keymap.xml        11 Mar 2009 21:33:09 -0000      1.116
+++ resources/keymap.xml        15 Mar 2009 22:41:45 -0000      1.117
@@ -460,6 +460,11 @@
                                <Object objectname="SheetView" modes="All" 
sortorder="4" submenu="Scroll"  pluginname="TraversoCommands" 
commandname="ScrollDownHold" arguments="0;20" />
                        </Objects>
                </keyfact>
+                <keyfact type="HKEY" key1="R">
+                        <Objects>
+                                <Object objectname="AudioClipView" 
mousehint="LR" modes="All" sortorder="20" pluginname="TraversoCommands" 
commandname="CropClip" />
+                        </Objects>
+                </keyfact>
                
                
                
@@ -496,11 +501,6 @@
                                <Object objectname="SheetView" mousehint="UD" 
modes="All" sortorder="2" submenu="Zoom" pluginname="TraversoCommands" 
commandname="VJogZoom" arguments="VJogZoom;1.2;0.2" />
                        </Objects>
                </keyfact>
-                <keyfact type="HKEY2" key1="X" key2="C">
-                        <Objects>
-                                <Object objectname="AudioClipView" 
mousehint="LR" modes="All" sortorder="20" pluginname="TraversoCommands" 
commandname="CropClip" />
-                        </Objects>
-                </keyfact>
 
                
                

Index: src/traverso/dialogs/CDWritingDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/CDWritingDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/traverso/dialogs/CDWritingDialog.cpp    19 Jan 2009 21:08:35 -0000      
1.9
+++ src/traverso/dialogs/CDWritingDialog.cpp    15 Mar 2009 22:41:45 -0000      
1.10
@@ -500,7 +500,7 @@
                                return;
                        }
 #if defined (Q_WS_WIN)
-                       if (data.contains(QRegExp("[0-9],[0-9],[0-9]"))) {
+                       if 
(QString(data).contains(QRegExp("[0-9],[0-9],[0-9]"))) {
 #else
                        if (data.contains("/dev/") || data.contains("dev=")) {
 #endif