X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=5e97426f4ff68fdfb935cf99a2b3010117a27605;hp=8220669f0462ba34f340c9fd7a32478abab67477;hb=a18660ee87e81b6f4072537be3aa10c93a243b2a;hpb=a634acadbcf6017474f68a3eaf7cb632660e9e49 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 8220669f..5e97426f 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-07 by the Quassel IRC Team * * 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 * @@ -21,12 +21,13 @@ #include "mainwin.h" #include "bufferview.h" -#include "chatline.h" +#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" @@ -34,17 +35,21 @@ #include "selectionmodelsynchronizer.h" #include "mappedselectionmodel.h" +#include "settingspages/fontssettingspage.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() { @@ -67,7 +72,20 @@ void MainWin::init() { setupMenus(); setupViews(); + setupSettingsDlg(); + + // create nick dock + nickDock = new QDockWidget("Nicks", this); + nickDock->setObjectName("NickDock"); + nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + + nickListWidget = new NickListWidget(nickDock); + nickDock->setWidget(nickListWidget); + addDockWidget(Qt::RightDockWidgetArea, nickDock); + ui.menuViews->addAction(nickDock->toggleViewAction()); + + // restore mainwin state QSettings s; s.beginGroup("Geometry"); //resize(s.value("MainWinSize", QSize(500, 400)).toSize()); @@ -91,7 +109,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); @@ -100,17 +119,21 @@ void MainWin::init() { QDockWidget *dock = new QDockWidget("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::networkModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); addDockWidget(Qt::TopDockWidgetArea, dock); ui.menuViews->addAction(dock->toggleViewAction()); + //showSettingsDlg(); + + } MainWin::~MainWin() { @@ -136,28 +159,26 @@ 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())); - // for debugging - connect(ui.actionImportBacklog, SIGNAL(triggered()), this, SLOT(importBacklog())); - Client::signalProxy()->attachSignal(this, SIGNAL(importOldBacklog())); } 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, QStringList()); - addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QStringList()); - addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QStringList()); - addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QStringList()); - addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QStringList()); + addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList()); + addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList()); + 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()); ui.menuViews->addSeparator(); } -void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QStringList &nets) { +void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList &nets) { QDockWidget *dock = new QDockWidget(viewname, this); dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state! dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); @@ -166,7 +187,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); @@ -175,9 +196,14 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, netViews.append(dock); } +void MainWin::setupSettingsDlg() { + settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg)); + +} + void MainWin::connectedToCore() { foreach(BufferInfo id, Client::allBufferInfos()) { - emit requestBacklog(id, 100, -1); + emit requestBacklog(id, 1000, -1); } ui.menuViews->setEnabled(true); @@ -186,6 +212,7 @@ void MainWin::connectedToCore() { ui.actionDisconnectCore->setEnabled(true); ui.actionNetworkList->setEnabled(true); ui.bufferWidget->show(); + statusBar()->showMessage(tr("Connected to core.")); } void MainWin::disconnectedFromCore() { @@ -195,7 +222,8 @@ void MainWin::disconnectedFromCore() { ui.actionNetworkList->setEnabled(false); ui.bufferWidget->hide(); ui.actionConnectCore->setEnabled(true); - //qDebug() << "mainwin disconnected"; + nickListWidget->reset(); + statusBar()->showMessage(tr("Not connected to core.")); } AbstractUiMsg *MainWin::layoutMsg(const Message &msg) { @@ -229,6 +257,10 @@ void MainWin::showSettingsDlg() { settingsDlg->show(); } +void MainWin::showDebugConsole() { + debugConsole->show(); +} + void MainWin::closeEvent(QCloseEvent *event) { //if (userReallyWantsToQuit()) { @@ -258,15 +290,9 @@ void MainWin::showBuffer(Buffer *b) { currentBuffer = b->bufferInfo().groupId(); //emit bufferSelected(b); //qApp->processEvents(); - ui.bufferWidget->setBuffer(b); + nickListWidget->setBuffer(b); + //if(b->bufferType() == Buffer::ChannelType) nickDock->show(); + //else nickDock->hide(); //emit bufferSelected(b); } - -void MainWin::importBacklog() { - if(QMessageBox::warning(this, "Import old backlog?", "Do you want to import your old file-based backlog into new the backlog database?
" - "This will permanently delete the contents of your database!", - QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes) { - emit importOldBacklog(); - } -}