X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=d244dc856f4d34514f955a213743ae6e83fa9522;hp=963ee4b546091681e3245bed6e00164a6b1151dc;hb=cf28e7152c5d940aec586be1b29fbf8ddc99f087;hpb=4bd0fcd5b0599f3658253353bf2bdc01b32951f7

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 963ee4b5..d244dc85 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -24,28 +24,33 @@
 #include "chatline-old.h"
 #include "client.h"
 #include "coreconnectdlg.h"
+#include "networkmodel.h"
 #include "nicklistwidget.h"
 #include "serverlist.h"
 #include "settingsdlg.h"
-//#include "settingspage.h"
 #include "signalproxy.h"
-
 #include "topicwidget.h"
+#include "uisettings.h"
 
 #include "selectionmodelsynchronizer.h"
 #include "mappedselectionmodel.h"
 
+#include "settingspages/fontssettingspage.h"
+#include "settingspages/identitiessettingspage.h"
+
+#include "debugconsole.h"
+
 MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
   ui.setupUi(this);
   setWindowTitle("Quassel IRC");
   //setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη"));
-  setWindowIcon(QIcon(":/qirc-icon.png"));
+  setWindowIcon(QIcon(":icons/quassel-icon.png"));
   setWindowIconText("Quassel IRC");
 
   statusBar()->showMessage(tr("Waiting for core..."));
   serverListDlg = new ServerListDlg(this);
   settingsDlg = new SettingsDlg(this);
-
+  debugConsole = new DebugConsole(this);
 }
 
 void MainWin::init() {
@@ -61,16 +66,17 @@ void MainWin::init() {
 
   statusBar()->showMessage(tr("Not connected to core."));
   systray = new QSystemTrayIcon(this);
-  systray->setIcon(QIcon(":/qirc-icon.png"));
+  systray->setIcon(QIcon(":/icons/quassel-icon.png"));
   systray->show();
 
   //setupSettingsDlg();
 
   setupMenus();
   setupViews();
+  setupSettingsDlg();
 
   // create nick dock
-  nickDock = new QDockWidget("Nicks", this);
+  nickDock = new QDockWidget(tr("Nicks"), this);
   nickDock->setObjectName("NickDock");
   nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
 
@@ -81,17 +87,8 @@ void MainWin::init() {
   ui.menuViews->addAction(nickDock->toggleViewAction());
 
   // restore mainwin state
-  QSettings s;
-  s.beginGroup("Geometry");
-  //resize(s.value("MainWinSize", QSize(500, 400)).toSize());
-  //move(s.value("MainWinPos", QPoint(50, 50)).toPoint());
-  if(s.contains("MainWinState")) restoreState(s.value("MainWinState").toByteArray());
-  s.endGroup();
-
-  //s.beginGroup("Buffers");
-  //QString net = s.value("CurrentNetwork", "").toString();
-  //QString buf = s.value("CurrentBuffer", "").toString();
-  //s.endGroup();
+  UiSettings s;
+  restoreState(s.value("MainWinState").toByteArray());
 
   disconnectedFromCore();  // Disable menus and stuff
   showCoreConnectionDlg(true); // autoconnect if appropriate
@@ -104,7 +101,8 @@ void MainWin::init() {
   setDockNestingEnabled(true);
   
   
-  // TESTING
+  // new Topic Stuff... should be probably refactored out into a separate method
+  
   setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
   setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
 
@@ -112,19 +110,21 @@ void MainWin::init() {
   setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
 
 
-  QDockWidget *dock = new QDockWidget("Topic Dock", this);
+  QDockWidget *dock = new QDockWidget(tr("Topic Dock"), this);
   dock->setObjectName("TopicDock");
   dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
 
   TopicWidget *topicwidget = new TopicWidget(dock);
   dock->setWidget(topicwidget);
 
-  Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
+  Client::networkModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
 
   addDockWidget(Qt::TopDockWidgetArea, dock);
 
   ui.menuViews->addAction(dock->toggleViewAction());
 
+  //showSettingsDlg();
+
 }
 
 MainWin::~MainWin() {
@@ -150,13 +150,14 @@ void MainWin::setupMenus() {
   connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
   connect(ui.actionEditIdentities, SIGNAL(triggered()), serverListDlg, SLOT(editIdentities()));
   connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
-  ui.actionSettingsDlg->setEnabled(false);
+  connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
+  //ui.actionSettingsDlg->setEnabled(false);
   connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt()));
 }
 
 void MainWin::setupViews() {
   
-  BufferTreeModel *model = Client::bufferModel();
+  NetworkModel *model = Client::networkModel();
   connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
 
   addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<uint>());
@@ -177,7 +178,7 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
   //create the view and initialize it's filter
   BufferView *view = new BufferView(dock);
   view->setFilteredModel(model, mode, nets);
-  Client::bufferModel()->synchronizeView(view);
+  Client::networkModel()->synchronizeView(view);
   dock->setWidget(view);
   
   addDockWidget(Qt::LeftDockWidgetArea, dock);
@@ -186,6 +187,12 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
   netViews.append(dock);
 }
 
+void MainWin::setupSettingsDlg() {
+  settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
+  settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
+
+}
+
 void MainWin::connectedToCore() {
   foreach(BufferInfo id, Client::allBufferInfos()) {
     emit requestBacklog(id, 1000, -1);
@@ -242,20 +249,18 @@ void MainWin::showSettingsDlg() {
   settingsDlg->show();
 }
 
+void MainWin::showDebugConsole() {
+  debugConsole->show();
+}
+
 void MainWin::closeEvent(QCloseEvent *event)
 {
   //if (userReallyWantsToQuit()) {
     ui.bufferWidget->saveState();
-    QSettings s;
-    s.beginGroup("Geometry");
+    UiSettings s;
     s.setValue("MainWinSize", size());
     s.setValue("MainWinPos", pos());
     s.setValue("MainWinState", saveState());
-    s.endGroup();
-    s.beginGroup("Buffers");
-    //s.setValue("CurrentNetwork", currentNetwork);
-    s.setValue("CurrentBuffer", currentBuffer);
-    s.endGroup();
     delete systray;
     event->accept();
   //} else {