mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-04-21 16:38:54 +02:00
Replace getenv("HOME") by RDGetHomeDir() in RDCartDialog::LoadState/SaveState. Create RDCartDialog::StateFile to share logic
This commit is contained in:
parent
336d3be06e
commit
ea73b88634
@ -905,14 +905,29 @@ QString RDCartDialog::GetSearchFilter(const QString &filter,
|
|||||||
return search;
|
return search;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString RDCartDialog::StateFile() {
|
||||||
|
bool home_found = false;
|
||||||
|
QString home = RDGetHomeDir(&home_found);
|
||||||
|
if (home_found) {
|
||||||
|
return QString().sprintf("%s/.rdcartdialog",(const char *)home);
|
||||||
|
} else {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void RDCartDialog::LoadState()
|
void RDCartDialog::LoadState()
|
||||||
{
|
{
|
||||||
if(getenv("HOME")==NULL) {
|
QString state_file = StateFile();
|
||||||
|
if (state_file == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RDProfile *p=new RDProfile();
|
RDProfile *p=new RDProfile();
|
||||||
p->setSource(QString().sprintf("%s/.rdcartdialog",getenv("HOME")));
|
p->setSource(state_file);
|
||||||
|
|
||||||
|
bool value_read = false;
|
||||||
|
cart_limit_box->setChecked(p->boolValue("RDCartDialog", "LimitSearch", true, &value_read));
|
||||||
|
|
||||||
delete p;
|
delete p;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -921,11 +936,12 @@ void RDCartDialog::SaveState()
|
|||||||
{
|
{
|
||||||
FILE *f=NULL;
|
FILE *f=NULL;
|
||||||
|
|
||||||
if(getenv("HOME")==NULL) {
|
QString state_file = StateFile();
|
||||||
|
if (state_file == NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if((f=fopen(QString().sprintf("%s/.rdcartdialog",getenv("HOME")),"w"))==
|
|
||||||
NULL) {
|
if((f=fopen(state_file,"w"))==NULL) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
fprintf(f,"[RDCartDialog]\n");
|
fprintf(f,"[RDCartDialog]\n");
|
||||||
|
@ -84,6 +84,7 @@ class RDCartDialog : public QDialog
|
|||||||
void BuildGroupList();
|
void BuildGroupList();
|
||||||
QString GetSearchFilter(const QString &filter,const QString &group,
|
QString GetSearchFilter(const QString &filter,const QString &group,
|
||||||
const QString &schedcode);
|
const QString &schedcode);
|
||||||
|
QString StateFile();
|
||||||
void LoadState();
|
void LoadState();
|
||||||
void SaveState();
|
void SaveState();
|
||||||
int *cart_cartnum;
|
int *cart_cartnum;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user