X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmain-window.cpp;h=1481e2392f8b6b44ea80679ddaab7a2ef531298c;hb=f8bf44d8af1bcc0c641ff2261fbf235a5bad2107;hp=deda9efdae5396d2a089e4caa91946df5be9724a;hpb=29e0cd9db84d95402389d1975d1750d082b6bb42;p=scorecard

diff --git a/src/main-window.cpp b/src/main-window.cpp
index deda9ef..1481e23 100644
--- a/src/main-window.cpp
+++ b/src/main-window.cpp
@@ -28,6 +28,8 @@ QString scoreFileName("score.xml");
 QString scoreFile;
 QString clubFileName("club.xml");
 QString clubFile;
+QString masterFileName("club-master.xml");
+QString masterFile;
 QString logFile("/tmp/scorecard.log");
 QString titleScores("ScoreCard - Scores");
 QString titleCourses("ScoreCard - Courses");
@@ -117,6 +119,7 @@ MainWindow::MainWindow(QMainWindow *parent): QMainWindow(parent)
   setCentralWidget(centralWidget);
 
   loadScoreFile(scoreFile, scoreList);
+  loadClubFile(masterFile, clubList, true);
   loadClubFile(clubFile, clubList);
 
   // Sort the scores based on dates
@@ -152,6 +155,7 @@ void MainWindow::loadSettings(void)
 #endif
   scoreFile = dataDir + "/" + scoreFileName;
   clubFile = dataDir + "/" + clubFileName;
+  masterFile = dataDir + "/" + masterFileName;
 
   QDir dir(dataDir);
   if (!dir.exists())
@@ -628,11 +632,11 @@ void MainWindow::saveScoreFile(QString &fileName, QList<Score *> &list)
     qWarning() << "Unable to save:" << fileName;
 }
 
-void MainWindow::loadClubFile(QString &fileName, QList<Club *> &list)
+void MainWindow::loadClubFile(QString &fileName, QList<Club *> &list, bool readOnly)
 {
   ClubXmlHandler handler(list);
 
-  if (handler.parse(fileName))
+  if (handler.parse(fileName, readOnly))
     qDebug() << "File loaded:" << fileName << " entries:" << list.size();
 }