commit cee6580c7e645bdb2e61fcacff5c226021297168
parent 9cf41bba97f64f23b2539f8bbc4d1f75d3268d56
Author: paulnasca <paulnasca>
Date: Sun, 22 Aug 2004 10:46:55 +0000
*** empty log message ***
Diffstat:
7 files changed, 62 insertions(+), 22 deletions(-)
diff --git a/src/Params/Presets.C b/src/Params/Presets.C
@@ -36,11 +36,11 @@ void Presets::setpresettype(char *type){
strcpy(this->type,type);
};
-void Presets::copyclipboard(){
+void Presets::copy(const char *name){
XMLwrapper *xml=new XMLwrapper();
//used only for the clipboard
- xml->minimal=false;
+ if (name==NULL) xml->minimal=false;
char type[MAX_PRESETTYPE_SIZE];
strcpy(type,this->type);
@@ -52,13 +52,14 @@ void Presets::copyclipboard(){
else add2XMLsection(xml,nelement);
xml->endbranch();
- presetsstore.copyclipboard(xml,type);
+ if (name==NULL) presetsstore.copyclipboard(xml,type);
+ else presetsstore.copypreset(xml,type,name);
delete(xml);
nelement=-1;
};
-void Presets::pasteclipboard(){
+void Presets::paste(){
char type[MAX_PRESETTYPE_SIZE];
strcpy(type,this->type);
if (nelement!=-1) strcat(type,"n");
diff --git a/src/Params/Presets.h b/src/Params/Presets.h
@@ -31,9 +31,9 @@ class Presets{
public:
Presets();
virtual ~Presets();
-
- void copyclipboard();
- void pasteclipboard();
+
+ void copy(const char *name);//if name==NULL, the clipboard is used
+ void paste();
bool checkclipboardtype();
char type[MAX_PRESETTYPE_SIZE];
diff --git a/src/Params/PresetsStore.C b/src/Params/PresetsStore.C
@@ -80,10 +80,33 @@ void PresetsStore::clearpresets(){
void PresetsStore::rescanforpresets(char *type){
clearpresets();
- int presetk=0;
+// int presetk=0;
for (int i=0;i<MAX_BANK_ROOT_DIRS;i++){
if (config.cfg.presetsDirList[i]==NULL) continue;
//de continuat aici
};
};
+void PresetsStore::copypreset(XMLwrapper *xml,char *type, const char *name){
+ char filename[MAX_STRING_SIZE],tmpfilename[MAX_STRING_SIZE];
+
+ if (config.cfg.presetsDirList[0]==NULL) return;
+
+ snprintf(tmpfilename,MAX_STRING_SIZE,"%s",name);
+
+ //make the filenames legal
+ for (int i=0;i<(int) strlen(tmpfilename);i++) {
+ char c=tmpfilename[i];
+ if ((c>='0')&&(c<='9')) continue;
+ if ((c>='A')&&(c<='Z')) continue;
+ if ((c>='a')&&(c<='z')) continue;
+ if ((c=='-')||(c==' ')) continue;
+ tmpfilename[i]='_';
+ };
+
+ snprintf(filename,MAX_STRING_SIZE,"%s%s.%s.xpz",config.cfg.presetsDirList[0],name,type);
+
+ xml->saveXMLfile(filename);
+};
+
+
diff --git a/src/Params/PresetsStore.h b/src/Params/PresetsStore.h
@@ -30,9 +30,14 @@ class PresetsStore{
public:
PresetsStore();
~PresetsStore();
+
+ //Clipboard stuff
void copyclipboard(XMLwrapper *xml,char *type);
bool pasteclipboard(XMLwrapper *xml);
bool checkclipboardtype(char *type);
+
+ //presets stuff
+ void copypreset(XMLwrapper *xml,char *type, const char *name);
struct presetstruct{
char *file;
diff --git a/src/Synth/Resonance.C b/src/Synth/Resonance.C
@@ -257,6 +257,7 @@ void Resonance::saveloadbuf(Buffer *buf){
void Resonance::add2XML(XMLwrapper *xml){
xml->addparbool("enabled",Penabled);
+
if ((Penabled==0)&&(xml->minimal)) return;
xml->addpar("max_db",PmaxdB);
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -318,7 +318,7 @@ if (event==FL_RIGHT_MOUSE){
} else {
if (event==FL_LEFT_MOUSE) bankui->show();
else instrumenteditwindow->show();
-};}
+};} selected
tooltip {left mousebutton - to choose/save/.. from/to bank or right mousebutton to change the name or middle button to change the instrument information} xywh {195 5 185 20} box THIN_DOWN_BOX down_box FLAT_BOX labelfont 1 labelsize 12 align 84
code0 {o->label((char *)part->Pname);}
}
@@ -780,7 +780,7 @@ if (part->Pkitmode==0) {
} else {
kitlist->activate();
protectthekitcheck->activate();
-};} selected
+};}
xywh {35 350 70 15} down_box BORDER_BOX labelsize 12 textfont 1 textsize 12
code0 {o->value(part->Pkitmode);}
} {
diff --git a/src/UI/PresetsUI.fl b/src/UI/PresetsUI.fl
@@ -2,6 +2,9 @@
version 1.0105
header_name {.h}
code_name {.cc}
+decl {\#include <FL/fl_ask.h>} {public
+}
+
decl {\#include <stdlib.h>} {public
}
@@ -15,7 +18,8 @@ class PresetsUI_ {} {
} {}
}
-class PresetsUI {} {
+class PresetsUI {open
+} {
Function {PresetsUI()} {} {
code {p=NULL;
make_window();} {}
@@ -24,22 +28,27 @@ make_window();} {}
code {copywin->hide();delete(copywin);
pastewin->hide();delete(pastewin);} {}
}
- Function {make_window()} {} {
+ Function {make_window()} {open
+ } {
Fl_Window copywin {
label {Copy to Clipboard/Preset}
- xywh {95 240 265 315} type Double box PLASTIC_THIN_UP_BOX color 238 hide non_modal
+ xywh {237 99 265 315} type Double box PLASTIC_THIN_UP_BOX color 238 non_modal visible
} {
Fl_Browser {} {
xywh {10 30 245 200}
}
Fl_Button {} {
label {Copy to Preset}
- callback {copywin->hide();}
+ callback {const char *tmp=fl_input("Copy to Preset:",NULL);
+if (tmp!=NULL) {
+ p->copy(tmp);
+ copywin->hide();
+};} selected
xywh {75 240 120 20} box THIN_UP_BOX
}
Fl_Button {} {
label {Copy to Clipboard}
- callback {p->copyclipboard();
+ callback {p->copy(NULL);
copywin->hide();}
xywh {25 270 90 35} box THIN_UP_BOX align 192
}
@@ -69,7 +78,7 @@ copywin->hide();}
}
Fl_Button pastebutton {
label {Paste from Clipboard}
- callback {p->pasteclipboard();
+ callback {p->paste();
pastewin->hide();
pui->refresh();}
xywh {25 270 90 35} box THIN_UP_BOX align 192
@@ -88,24 +97,26 @@ pui->refresh();}
}
}
}
- Function {copy(Presets *p)} {} {
+ Function {copy(Presets *p)} {open
+ } {
code {this->p=p;
this->pui=NULL;
bool but=(Fl::event_button()!=FL_LEFT_MOUSE);
-if (but) p->copyclipboard();
+if (but) p->copy(NULL);
else {
copytypetext->label(&p->type[1]);
copywin->show();
};} {}
}
- Function {paste(Presets *p,PresetsUI_ *pui)} {} {
+ Function {paste(Presets *p,PresetsUI_ *pui)} {open
+ } {
code {this->p=p;
this->pui=pui;
bool but=(Fl::event_button()!=FL_LEFT_MOUSE);
if (but) {
- p->pasteclipboard();
+ p->paste();
pui->refresh();
} else {
pastetypetext->label(&p->type[1]);
@@ -120,8 +131,7 @@ copy(p);} {}
}
Function {paste(Presets *p,PresetsUI_ *pui,int n)} {} {
code {p->setelement(n);
-paste(p,pui);} {selected
- }
+paste(p,pui);} {}
}
decl {Presets *p;} {public
}
