Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-16 08:34:12 +02:00
Code Issues Projects Releases Wiki Activity

Replace getenv("HOME") by RDGetHomeDir() in MainWidget::LoadGeometry/SaveGeometry. Create MainWidget::GeometryFile to share logic

Browse Source
This commit is contained in:
Alban Peignier 2014-09-05 10:18:01 +02:00
parent eb8e95d994
commit ea10c041fb
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rdcatch/rdcatch.cpp
View File

@ -2513,15 +2513,24 @@ int MainWidget::GetConnection(QString station,unsigned chan)
return -1; return -1;
} }
QString MainWidget::GeometryFile() {
bool home_found = false;
QString home = RDGetHomeDir(&home_found);
if (home_found) {
return home + "/" + RDCATCH_GEOMETRY_FILE;
} else {
return NULL;
}
}
void MainWidget::LoadGeometry() void MainWidget::LoadGeometry()
{ {
if(getenv("HOME")==NULL) { QString geometry_file = GeometryFile();
if(geometry_file==NULL) {
return; return;
} }
RDProfile *profile=new RDProfile(); RDProfile *profile=new RDProfile();
profile-> profile->setSource(geometry_file);
setSource(QString().sprintf("%s/%s",getenv("HOME"),RDCATCH_GEOMETRY_FILE));
resize(profile->intValue("RDCatch","Width",sizeHint().width()), resize(profile->intValue("RDCatch","Width",sizeHint().width()),
profile->intValue("RDCatch","Height",sizeHint().height())); profile->intValue("RDCatch","Height",sizeHint().height()));
@ -2531,12 +2540,11 @@ void MainWidget::LoadGeometry()
void MainWidget::SaveGeometry() void MainWidget::SaveGeometry()
{ {
if(getenv("HOME")==NULL) { QString geometry_file = GeometryFile();
if(geometry_file==NULL) {
return; return;
} }
FILE *file=fopen((const char *)QString(). FILE *file=fopen(geometry_file,"w");
sprintf("%s/%s",getenv("HOME"),RDCATCH_GEOMETRY_FILE),
"w");
if(file==NULL) { if(file==NULL) {
return; return;
} }

1
rdcatch/rdcatch.h
View File

@ -126,6 +126,7 @@ class MainWidget : public QWidget
RDListViewItem *GetItem(int id); RDListViewItem *GetItem(int id);
int GetMonitor(int serial,int chan); int GetMonitor(int serial,int chan);
int GetConnection(QString station,unsigned chan=0); int GetConnection(QString station,unsigned chan=0);
QString GeometryFile();
void LoadGeometry(); void LoadGeometry();
void SaveGeometry(); void SaveGeometry();
std::vector<CatchMonitor *> catch_monitor; std::vector<CatchMonitor *> catch_monitor;