diff mainwindow.cpp @ 53:3c46b2ac45d3

* Put proper labels &c in changeset items; colour branches and users; etc
author Chris Cannam
date Fri, 12 Nov 2010 16:48:18 +0000
parents 384420567575
children f583e44d9d31
line wrap: on
line diff
--- a/mainwindow.cpp	Fri Nov 12 11:32:01 2010 +0000
+++ b/mainwindow.cpp	Fri Nov 12 16:48:18 2010 +0000
@@ -2,8 +2,6 @@
 ** Copyright (C) Jari Korhonen, 2010 (under lgpl)
 ****************************************************************************/
 
-#include "mainwindow.h"
-#include "settingsdialog.h"
 
 #include <QStringList>
 #include <QDir>
@@ -18,6 +16,10 @@
 #include <QToolBar>
 #include <QSettings>
 
+#include "mainwindow.h"
+#include "settingsdialog.h"
+#include "colourset.h"
+
 
 MainWindow::MainWindow()
 {
@@ -1445,6 +1447,12 @@
     initialFileTypesBits = (unsigned char) settings.value("viewFileTypes", QVariant(DEFAULT_HG_STAT_BITS)).toInt();
     resize(size);
     move(pos);
+
+    ColourSet *cs = ColourSet::instance();
+    cs->clearDefaultNames();
+    cs->addDefaultName("");
+    cs->addDefaultName("default");
+    cs->addDefaultName(userInfo);
 }