X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=0feeb63e8d0bcc304c259685c233808ff586f9a1;hp=c5ab8fdc7d2d5fdad04d1f80f78592e839cd5080;hb=2f05c5d7e94d5e96d2b4bae59140fd3b60a7a62f;hpb=ec17201104f75eafaddccc174de8709b42b15ccb diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index c5ab8fdc..0feeb63e 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel 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 * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -24,28 +24,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 "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 +67,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 +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 @@ -104,7 +102,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 +111,23 @@ 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(0, Qt::DisplayRole, topicwidget, "topic"); + Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); addDockWidget(Qt::TopDockWidgetArea, dock); ui.menuViews->addAction(dock->toggleViewAction()); +#ifdef SPUTDEV + showSettingsDlg(); +#endif + } MainWin::~MainWin() { @@ -150,13 +153,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(); + BufferModel *model = Client::bufferModel(); connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *))); addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList()); @@ -164,6 +168,18 @@ void MainWin::setupViews() { addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList()); addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList()); addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList()); + +// 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(); } @@ -179,16 +195,23 @@ 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()); netViews.append(dock); } +void MainWin::setupSettingsDlg() { + settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg)); +#ifdef SPUTDEV + settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg)); +#endif +} + void MainWin::connectedToCore() { foreach(BufferInfo id, Client::allBufferInfos()) { - emit requestBacklog(id, 100, -1); + emit requestBacklog(id, 1000, -1); } ui.menuViews->setEnabled(true); @@ -242,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 {