zynaddsubfx

commit f979f7437039477a3f005bf640090eced2c29eda
parent 7e0d2d173353d166cb22e6f35064e98bd061106d
Author: paulnasca <paulnasca>
Date:   Sat,  3 Jul 2004 10:45:30 +0000

*** empty log message ***

Diffstat:
M
src/UI/MasterUI.fl
 | 
20
++++++++++----------
M
src/UI/PartUI.fl
 | 
6
+++---

2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -285,12 +285,6 @@ bankui->show();}
           code0 {o->value(master->part[npart]->Ppanning);}
           class WidgetPDial
         }
-        Fl_Counter partrcv {
-          callback {master->part[npart]->Prcvchn=(int) o->value();}
-          xywh {15 215 40 15} type Simple minimum 0 maximum 16 step 1
-          code0 {o->bounds(0,NUM_MIDI_CHANNELS-1);}
-          code1 {o->value(master->part[npart]->Prcvchn);}
-        }
         Fl_Button {} {
           label edit
           callback {if ((int)bankui->cbwig->value()!=npart){
@@ -299,6 +293,12 @@ bankui->show();}
 };}
           xywh {15 235 40 20} box PLASTIC_UP_BOX labelsize 10
         }
+        Fl_Choice partrcv {
+          callback {master->part[npart]->Prcvchn=(int) o->value();} open selected
+          tooltip {receive from Midi channel} xywh {10 213 50 15} down_box BORDER_BOX labelsize 10 align 5 textfont 1 textsize 10
+          code0 {char nrstr[10]; for(int i=0;i<NUM_MIDI_CHANNELS;i++){sprintf(nrstr,"Ch%d",i+1);if (i!=9) o->add(nrstr); else o->add("Dr10");};}
+          code1 {o->value(master->part[npart]->Prcvchn);}
+        } {}
       }
       Fl_Check_Button partenabled {
         label 01
@@ -770,7 +770,7 @@ pthread_mutex_unlock(&master->mutex);}
       } {
         Fl_Group {} {
           label {System Effects} open
-          xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 20 align 25 hide
+          xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 20 align 25
         } {
           Fl_Counter syseffnocounter {
             label {Sys.Effect No.}
@@ -851,7 +851,7 @@ swapeffwindow->show();}
         }
         Fl_Group {} {
           label {Insertion Effects}
-          xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 20 align 25
+          xywh {0 100 390 140} box ENGRAVED_FRAME labeltype EMBOSSED_LABEL labelsize 20 align 25 hide
         } {
           Fl_Button {} {
             label {Swap/Copy...}
@@ -875,7 +875,7 @@ if (master->Pinsparts[ninseff]!=-1) {
 	insefftype->deactivate();
  	inseffectui->deactivate();
         inseffectuigroup->deactivate();
-};} selected
+};}
             xywh {5 120 80 20} type Simple labelfont 1 labelsize 11 align 1 minimum 0 maximum 127 step 1 textfont 1
             code0 {o->bounds(0,NUM_INS_EFX-1);}
             code1 {o->value(ninseff);}
@@ -1154,7 +1154,7 @@ swapeffwindow->hide();}
     }
     Fl_Window panelwindow {
       label {ZynAddSubFX Panel}
-      xywh {4 20 632 635} type Double hide
+      xywh {4 20 630 635} type Double hide
     } {
       Fl_Scroll {} {open
         xywh {0 5 570 310} type HORIZONTAL box THIN_UP_BOX
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -260,7 +260,7 @@ class PartUI {: {public Fl_Group,PartUI_}
   Function {make_window()} {private
   } {
     Fl_Window partgroup {
-      private xywh {44 244 385 180} type Double hide
+      private xywh {107 561 385 180} type Double hide
       class Fl_Group
     } {
       Fl_Group partgroupui {
@@ -399,7 +399,7 @@ maxkcounter->do_callback();}
           label {MIDI Chn.Rcv.}
           callback {part->Prcvchn=(int) o->value();} open
           tooltip {receive from Midi channel} xywh {310 45 70 20} down_box BORDER_BOX labelsize 10 align 5 textfont 1 textsize 10
-          code0 {char nrstr[10]; for(int i=0;i<NUM_MIDI_CHANNELS;i++){sprintf(nrstr,"%d",i+1);if (i!=9) o->add(nrstr); else o->add("10Drums");};}
+          code0 {char nrstr[10]; for(int i=0;i<NUM_MIDI_CHANNELS;i++){sprintf(nrstr,"Chn%d",i+1);if (i!=9) o->add(nrstr); else o->add("Drms10");};}
           code1 {o->value(part->Prcvchn);}
         } {}
         Fl_Choice keylimitlist {
@@ -679,7 +679,7 @@ part->Pefxroute[ninseff]=x;}
       }
       Fl_Check_Button bypasseff {
         label bypass
-        callback {part->Pefxbypass[ninseff]=(((int)o->value())!=0);} selected
+        callback {part->Pefxbypass[ninseff]=(((int)o->value())!=0);}
         tooltip {if the effect is not used (is bypassed)} xywh {90 110 60 15} down_box DOWN_BOX labelsize 12
         code0 {int x=part->Pefxbypass[ninseff];}
       }