X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fmainwin.cpp;h=47e44e53bb7bcce3fc90d5568c8646efe878af91;hb=2e6dc76ae100a6b8e1b1661e422995f90083500e;hp=0d4453d5993d7d41c02f25464d3bf43f98e98d3e;hpb=4bfbd8dcbcb398302aaad0b6707c561760d7a7ac;p=quassel.git

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 0d4453d5..47e44e53 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  *
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+//#define SPUTDEV
 
 #include "mainwin.h"
 
@@ -24,29 +25,34 @@
 #include "chatline-old.h"
 #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"
 
 #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() {
@@ -62,7 +68,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();
@@ -72,7 +78,7 @@ void MainWin::init() {
   setupSettingsDlg();
 
   // create nick dock
-  nickDock = new QDockWidget("Nicks", this);
+  nickDock = new QDockWidget(tr("Nicks"), this);
   nickDock->setObjectName("NickDock");
   nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
 
@@ -83,17 +89,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
@@ -106,7 +103,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);
 
@@ -114,7 +112,7 @@ 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);
 
@@ -127,7 +125,10 @@ void MainWin::init() {
 
   ui.menuViews->addAction(dock->toggleViewAction());
 
-  //showSettingsDlg();
+#ifdef SPUTDEV
+  showSettingsDlg();
+#endif
+
 }
 
 MainWin::~MainWin() {
@@ -153,13 +154,13 @@ 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()));
   connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt()));
 }
 
 void MainWin::setupViews() {
   
-  BufferTreeModel *model = Client::bufferModel();
+  BufferModel *model = Client::bufferModel();
   connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
 
   addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<uint>());
@@ -167,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();
 }
@@ -182,7 +195,7 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
   view->setFilteredModel(model, mode, nets);
   Client::bufferModel()->synchronizeView(view);
   dock->setWidget(view);
-  
+
   addDockWidget(Qt::LeftDockWidgetArea, dock);
   ui.menuViews->addAction(dock->toggleViewAction());
 
@@ -191,7 +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() {
@@ -250,20 +265,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 {