commit 5d59273916eba8cc38f8fd7bf8fc6c6708cfe788
parent 4ef2a0f58d21a5e1cc454fc3b21533ffb0b091e0
Author: paulnasca <paulnasca>
Date: Tue, 31 Oct 2006 18:40:45 +0000
*** empty log message ***
Diffstat:
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/UI/BankUI.fl b/src/UI/BankUI.fl
@@ -268,7 +268,7 @@ if ((what==1)&&(mode==1)&&(!bank->emptyslot(slot))){//Reads from slot
if ((what==1)&&(mode==2)){//save(write) to slot
if (!bank->emptyslot(slot)){
- if (!fl_ask("Overwrite the slot no. %d ?",slot+1)) goto nooverwriteslot;
+ if (!fl_choice("Overwrite the slot no. %d ?","No","Yes",NULL,slot+1)) goto nooverwriteslot;
};
pthread_mutex_lock(&master->mutex);
bank->savetoslot(slot,master->part[*npart]);
@@ -282,7 +282,7 @@ if ((what==1)&&(mode==2)){//save(write) to slot
if ((what==1)&&(mode==3)&&(!bank->emptyslot(slot))){//Clears the slot
- if (fl_ask("Clear the slot no. %d ?",slot+1)){
+ if (fl_choice("Clear the slot no. %d ?","No","Yes",NULL,slot+1)){
bank->clearslot(slot);
bs[slot]->refresh();
};
diff --git a/src/UI/EnvelopeUI.fl b/src/UI/EnvelopeUI.fl
@@ -704,7 +704,7 @@ refresh();} {}
}
Function {reinit()} {} {
code {if (env->Pfreemode!=0){
- int answer=fl_ask("Disable the free mode of the Envelope?");
+ int answer=fl_choice("Disable the free mode of the Envelope?","No","Yes",NULL);
if (env->Pfreemode!=0) freemodebutton->value(1);
else freemodebutton->value(0);
if (answer==0) return;
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -422,7 +422,7 @@ class MasterUI {open
callback {\#ifdef VSTAUDIOOUT
fl_alert("ZynAddSubFX could not be closed this way, because it's a VST plugin. Please use the host aplication to close it.");
\#else
-if (fl_ask("Exit and leave the unsaved data?")) {
+if (fl_choice("Exit and leave the unsaved data?","No","Yes",NULL)) {
config.save();
*exitprogram=1;
};
@@ -485,7 +485,7 @@ filename=fl_filename_setext(filename,".xsz");
result=fileexists(filename);
if (result) {
result=0;
- if (!fl_ask("The file exists. \\nOverwrite it?")) return;
+ if (!fl_choice("The file exists. \\nOverwrite it?","No","Yes",NULL)) return;
};
@@ -527,7 +527,7 @@ updatepanel();}
} {
MenuItem {} {
label {&Clear Instrument...}
- callback {if (fl_ask("Clear instrument's parameters ?")){
+ callback {if (fl_choice("Clear instrument's parameters ?","No","Yes",NULL)){
// int npart=(int)npartcounter->value()-1;
pthread_mutex_lock(&master->mutex);
master->part[npart]->defaultsinstrument();
@@ -576,7 +576,7 @@ filename=fl_filename_setext(filename,".xiz");
int result=fileexists(filename);
if (result) {
result=0;
- if (!fl_ask("The file exists. \\nOverwrite it?")) return;
+ if (!fl_choice("The file exists. \\nOverwrite it?","No","Yes",NULL)) return;
};
@@ -619,7 +619,7 @@ fl_filename_setext(filename,".wav");
int result=master->HDDRecorder.preparefile(filename,0);
if (result==1) {
result=0;
- if (fl_ask("The file exists. \\nOverwrite it?"))
+ if (fl_choice("The file exists. \\nOverwrite it?","No","Yes",NULL))
master->HDDRecorder.preparefile(filename,1);
};
if (result==0) recordbutton->activate();
@@ -644,7 +644,7 @@ if (result!=0) fl_alert("Error: Could not save the file.");}
} {
MenuItem {} {
label {Switch User Interface Mode}
- callback {if (fl_ask("Switch the User Interface to Beginner mode ?")){
+ callback {if (fl_choice("Switch the User Interface to Beginner mode ?","No","Yes",NULL)){
masterwindow->hide();
refresh_master_ui();
simplemasterwindow->show();
@@ -1077,7 +1077,7 @@ updatepanel();}
callback {\#ifdef VSTAUDIOOUT
fl_alert("ZynAddSubFX could not be closed this way, because it's a VST plugin. Please use the host aplication to close it.");
\#else
-if (fl_ask("Exit and leave the unsaved data?")) {
+if (fl_choice("Exit and leave the unsaved data?","No","Yes",NULL)) {
config.save();
*exitprogram=1;
};
@@ -1163,7 +1163,7 @@ if (result==-10) fl_alert("Error: Could not load the file\\nbecause it is not an
} {
MenuItem {} {
label {Switch User Interface Mode}
- callback {if (fl_ask("Switch the User Interface to Advanced mode ?")){
+ callback {if (fl_choice("Switch the User Interface to Advanced mode ?","No","Yes",NULL)){
simplemasterwindow->hide();
refresh_master_ui();
masterwindow->show();
@@ -1691,7 +1691,7 @@ simplepartkeyshiftcounter->value(master->part[npart]->Pkeyshift-64);
simplesyseffsend->value(master->Psysefxvol[nsyseff][npart]);} {}
}
Function {do_new_master()} {} {
- code {if (fl_ask("Clear *ALL* the parameters ?")){
+ code {if (fl_choice("Clear *ALL* the parameters ?","No","Yes",NULL)){
delete microtonalui;
pthread_mutex_lock(&master->mutex);
@@ -1740,7 +1740,7 @@ filename=fl_filename_setext(filename,".xmz");
result=fileexists(filename);
if (result) {
result=0;
- if (!fl_ask("The file exists. \\nOverwrite it?")) return;
+ if (!fl_choice("The file exists. \\nOverwrite it?","No","Yes",NULL)) return;
};
diff --git a/src/UI/OscilGenUI.fl b/src/UI/OscilGenUI.fl
@@ -646,7 +646,7 @@ redrawoscil();}
}
Fl_Button {} {
label Clear
- callback {if (!fl_ask("Clear the harmonics settings?")) return;
+ callback {if (!fl_choice("Clear the harmonics settings?","No","Yes",NULL)) return;
for (int i=0;i<MAX_AD_HARMONICS;i++){
h[i]->mag->value(64);
@@ -1018,7 +1018,7 @@ redrawoscil();}
}
Fl_Button {} {
label Sine
- callback {if (!fl_ask("Convert to SINE?")) return;
+ callback {if (!fl_choice("Convert to SINE?","No","Yes",NULL)) return;
pthread_mutex_lock(&master->mutex);
oscil->convert2sine(0);
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -200,7 +200,7 @@ if (part->kit[n].Ppadenabled!=0) padeditbutton->activate();
Fl_Check_Button enabledcheck {
label 01
callback {int answer=1;
-if (o->value()==0) answer=fl_ask("Delete the item?");
+if (o->value()==0) answer=fl_choice("Delete the item?","No","Yes",NULL);
if (answer!=0){
pthread_mutex_lock(&master->mutex);
part->setkititemstatus(n,(int) o->value());
@@ -241,7 +241,7 @@ if (part->kit[n].Psendtoparteffect==127) sendtoeffect->value(0);
this->redraw();} {
callback {int answer=1;
-if (o->value()==0) answer=fl_ask("Delete the item?");
+if (o->value()==0) answer=fl_choice("Delete the item?","No","Yes",NULL);
if (answer!=0){
pthread_mutex_lock(&master->mutex);
part->setkititemstatus(n,(int) o->value());