zynaddsubfx

commit e0d73bf938aa37fee65e203baf5d585b6164261f
parent 084d48dac6dc2878ad2837054ba93e4bbf5a2123
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Mon, 20 Jul 2009 19:21:14 -0400

Merge branch 'master' of ssh://fundamental@zynaddsubfx.git.sourceforge.net/gitroot/zynaddsubfx

Diffstat:
M
AUTHORS.txt
 | 
1
+
M
ChangeLog
 | 
3
+++
M
src/UI/ConfigUI.fl
 | 
4
++++
M
src/UI/VirKeyboard.fl
 | 
7
+++++++

4 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -10,4 +10,5 @@ Contributors:
 	Daniel Clemente (with a workaround of X11 repeated key bug)
         Emmanuel Saracco (fix for JACK output)
         Achim Settelmeier (QUERTZ keyboard layout for virtual keyboard)
+        jimee [full name unknown] (AZERTY keyboard layout for virtual keyboard)
 
diff --git a/ChangeLog b/ChangeLog
@@ -880,3 +880,6 @@
 
 18 Jul 2009 (Mark McCurry)
 	    - Enabled volume controller by default
+
+20 Jul 2009 (Mark McCurry)
+	    - Incorperated AZERTY layout by sourceforge user jimee
diff --git a/src/UI/ConfigUI.fl b/src/UI/ConfigUI.fl
@@ -272,6 +272,10 @@ midiinputnamebox->label(config.winmididevices[config.cfg.WindowsMidiInId].name);
               label QWERTZ
               xywh {35 35 100 20} labelfont 1 labelsize 11
             }
+            menuitem {} {
+              label AZERTY
+              xywh {45 45 100 20} labelfont 1 labelsize 11
+            }
           }
         }
         Fl_Group {} {
diff --git a/src/UI/VirKeyboard.fl b/src/UI/VirKeyboard.fl
@@ -41,6 +41,10 @@ decl {const int keysoct1qwertz[]={'q','2','w','3','e','r','5','t','6','z','7','u
 
 decl {const int keysoct2qwertz[]={'y','s','x','d','c','v','g','b','h','n','j','m',',','l','.',246,'-',0};} {} 
 
+decl {const int keysoct1az[]={'a',233,'z','\\"','e','r','(','t','-','y',232,'u','i',231,'o',224,'p',65106,'=','$',0};} {}
+
+decl {const int keysoct2az[]={'w','s','x','d','c','v','g','b','h','n','j',',',';','l',':','m','!',0};} {}
+
 class VirKeys {: {public Fl_Box}
 } {
   decl {static const int N_OCT=6;} {}
@@ -158,6 +162,9 @@ if (config.cfg.VirKeybLayout==2) {
 }else if (config.cfg.VirKeybLayout==3) {
 	keysoct1=keysoct1qwertz;
 	keysoct2=keysoct2qwertz;
+}else if (config.cfg.VirKeybLayout==4) {
+	keysoct1=keysoct1az;
+	keysoct2=keysoct2az;
 };
 
 if ((event==FL_KEYDOWN)||(event==FL_KEYUP)){