X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=0feeb63e8d0bcc304c259685c233808ff586f9a1;hp=a12b0434efdf187a2e85941cd53cf51cee81236b;hb=2f05c5d7e94d5e96d2b4bae59140fd3b60a7a62f;hpb=ad9b6e8b1a6798ab388b1c2e447e9a61cb9c0349

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index a12b0434..0feeb63e 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -25,12 +25,13 @@
 #include "client.h"
 #include "coreconnectdlg.h"
 #include "networkmodel.h"
+#include "buffermodel.h"
 #include "nicklistwidget.h"
 #include "serverlist.h"
 #include "settingsdlg.h"
 #include "signalproxy.h"
-
 #include "topicwidget.h"
+#include "uisettings.h"
 
 #include "selectionmodelsynchronizer.h"
 #include "mappedselectionmodel.h"
@@ -66,7 +67,7 @@ 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();
@@ -87,17 +88,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
@@ -126,13 +118,15 @@ void MainWin::init() {
   TopicWidget *topicwidget = new TopicWidget(dock);
   dock->setWidget(topicwidget);
 
-  Client::networkModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
+  Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
 
   addDockWidget(Qt::TopDockWidgetArea, dock);
 
   ui.menuViews->addAction(dock->toggleViewAction());
 
-  //showSettingsDlg();
+#ifdef SPUTDEV
+  showSettingsDlg();
+#endif
 
 }
 
@@ -166,7 +160,7 @@ void MainWin::setupMenus() {
 
 void MainWin::setupViews() {
   
-  NetworkModel *model = Client::networkModel();
+  BufferModel *model = Client::bufferModel();
   connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
 
   addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<uint>());
@@ -174,6 +168,18 @@ void MainWin::setupViews() {
   addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<uint>());
   addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<uint>());
   addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList<uint>());
+
+//   QDockWidget *dock = new QDockWidget("FILTERTEST", this);
+//   dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
+//   BufferView *view = new BufferView(dock);
+//   view->setModel(Client::bufferModel());
+//   dock->setWidget(view);
+
+//   addDockWidget(Qt::LeftDockWidgetArea, dock);
+//   ui.menuViews->addAction(dock->toggleViewAction());
+
+//   netViews.append(dock);
+
   
   ui.menuViews->addSeparator();
 }
@@ -187,9 +193,9 @@ 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::networkModel()->synchronizeView(view);
+  Client::bufferModel()->synchronizeView(view);
   dock->setWidget(view);
-  
+
   addDockWidget(Qt::LeftDockWidgetArea, dock);
   ui.menuViews->addAction(dock->toggleViewAction());
 
@@ -198,8 +204,9 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
 
 void MainWin::setupSettingsDlg() {
   settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
+#ifdef SPUTDEV
   settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
-
+#endif
 }
 
 void MainWin::connectedToCore() {
@@ -266,16 +273,10 @@ 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 {