class Identity;
class Network;
-
class AbstractUi;
class AbstractUiMsg;
class NetworkModel;
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+
+#include "messagemodel.h"
+
+MessageModel::MessageModel(QObject *parent) : QAbstractItemModel(parent) {
+
+
+
+}
+
+MessageModel::~MessageModel() {
+
+
+}
+
+QVariant MessageModel::data(const QModelIndex &index, int role) const {
+ int row = index.row();
+ if(row < 0 || row >= _messageList.count()) return QVariant();
+ return _messageList[row]->data(index.column(), role);
+}
+
+bool MessageModel::setData(const QModelIndex &index, const QVariant &value, int role) {
+ int row = index.row();
+ if(row < 0 || row >= _messageList.count()) return false;
+ if(_messageList[row]->setData(index.column(), role)) {
+ emit dataChanged(index, index); // FIXME make msg emit this (too)
+ return true;
+ }
+ return false;
+}
+
+void MessageModel::insertMessage(const Message &msg) {
+ MsgId id = msg.msgId();
+ MessageItem *item = createMessageItem(msg);
+ if(id > )
+
+}
+
+// returns index of msg with given Id or of the next message after that (i.e., the index where we'd insert this msg)
+int MessageModel::indexForId(MsgId id) {
+ if(!_messageList.count() || id <= _messageList[0]->data(0, MsgIdRole).value<MsgId>()) return 0;
+ if(id > _messageList.last()->data(0, MsgIdRole).value<MsgId>()) return _messageList.count();
+ // binary search
+ int start = 0; int end = _messageList.count()-1;
+ int idx;
+ while(1) {
+ if(start == end) return start;
+ idx = (end + start) / 2;
+
+}
+
+/**********************************************************************************/
+
#include "global.h"
#include "qtuistyle.h"
+
MainWin::MainWin(QtUi *_gui, QWidget *parent)
: QMainWindow(parent),
gui(_gui),
sslLabel(new QLabel()),
+ _titleSetter(this),
systray(new QSystemTrayIcon(this)),
activeTrayIcon(":/icons/quassel-icon-active.png"),
onlineTrayIcon(":/icons/quassel-icon.png"),
ui.bufferWidget->setModel(Client::bufferModel());
ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
- if(Global::DEBUG) {
- //showSettingsDlg();
- //showAboutDlg();
- //showNetworkDlg();
- //exit(1);
- }
-
+ _titleSetter.setModel(Client::bufferModel());
+ _titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel());
}
MainWin::~MainWin() {
}
+
void MainWin::clientNetworkCreated(NetworkId id) {
const Network *net = Client::network(id);
QAction *act = new QAction(net->networkName(), this);
#include "ui_mainwin.h"
#include "qtui.h"
+#include "titlesetter.h"
#include <QSystemTrayIcon>
#include <QTimer>
+
class ServerListDlg;
class CoreConnectDlg;
class Buffer;
QMenu *systrayMenu;
QLabel *sslLabel;
+ TitleSetter _titleSetter;
+
void setupMenus();
void setupViews();
void setupNickWidget();
SRCS += aboutdlg.cpp bufferwidget.cpp chatitem.cpp chatline.cpp chatline-old.cpp chatscene.cpp chatview.cpp chatwidget.cpp \
coreconfigwizard.cpp coreconnectdlg.cpp configwizard.cpp debugconsole.cpp inputwidget.cpp \
mainwin.cpp nicklistwidget.cpp qtui.cpp qtuisettings.cpp qtuistyle.cpp settingsdlg.cpp settingspagedlg.cpp \
- topicbutton.cpp topicwidget.cpp verticaldock.cpp jumpkeyhandler.cpp
+ titlesetter.cpp topicbutton.cpp topicwidget.cpp verticaldock.cpp jumpkeyhandler.cpp
HDRS += aboutdlg.h bufferwidget.h chatitem.h chatline.h chatline-old.h chatscene.h chatview.h chatwidget.h \
coreconfigwizard.h configwizard.h debugconsole.h inputwidget.h \
coreconnectdlg.h mainwin.h nicklistwidget.h qtui.h qtuisettings.h qtuistyle.h settingsdlg.h settingspagedlg.h \
- topicbutton.h topicwidget.h verticaldock.h jumpkeyhandler.h
+ titlesetter.h topicbutton.h topicwidget.h verticaldock.h jumpkeyhandler.h
FORMNAMES = aboutdlg.ui mainwin.ui coreaccounteditdlg.ui coreconnectdlg.ui bufferviewwidget.ui bufferwidget.ui nicklistwidget.ui settingsdlg.ui \
settingspagedlg.ui topicwidget.ui debugconsole.ui inputwidget.ui \
<rect>
<x>0</x>
<y>0</y>
- <width>736</width>
+ <width>514</width>
<height>452</height>
</rect>
</property>
<rect>
<x>0</x>
<y>0</y>
- <width>398</width>
+ <width>301</width>
<height>326</height>
</rect>
</property>
<rect>
<x>0</x>
<y>0</y>
- <width>398</width>
+ <width>301</width>
<height>326</height>
</rect>
</property>
<property name="checked" >
<bool>true</bool>
</property>
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string>Service:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLineEdit" name="autoIdentifyService" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="text" >
+ <string>NickServ</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label_3" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="text" >
+ <string>Password:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="autoIdentifyPassword" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ <zorder>autoIdentifyService</zorder>
+ <zorder>autoIdentifyPassword</zorder>
+ <zorder>label_2</zorder>
+ <zorder>label_3</zorder>
</widget>
</item>
- <item>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
- <string>Service:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="autoIdentifyService" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="text" >
- <string>NickServ</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="text" >
- <string>Password:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="autoIdentifyPassword" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="echoMode" >
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
</layout>
</widget>
<widget class="QWidget" name="tab" >
<rect>
<x>0</x>
<y>0</y>
- <width>398</width>
+ <width>301</width>
<height>326</height>
</rect>
</property>
--- /dev/null
+/***************************************************************************
+ * Copyright (C) 2005-08 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) version 3. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+#include "titlesetter.h"
+
+#include "abstractitemview.h"
+#include "mainwin.h"
+
+TitleSetter::TitleSetter(MainWin *parent)
+ : AbstractItemView(parent),
+ _mainWin(parent)
+{
+
+}
+
+void TitleSetter::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) {
+ Q_UNUSED(previous);
+ changeWindowTitle(current.sibling(current.row(), 0).data().toString());
+}
+
+void TitleSetter::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
+ QItemSelectionRange changedArea(topLeft, bottomRight);
+ QModelIndex currentTopicIndex = selectionModel()->currentIndex().sibling(selectionModel()->currentIndex().row(), 0);
+ if(changedArea.contains(currentTopicIndex))
+ changeWindowTitle(currentTopicIndex.data().toString());
+};
+
+void TitleSetter::changeWindowTitle(QString title) {
+ QString newTitle = QString("%1 - %2").arg("Quassel IRC").arg(title);
+ _mainWin->setWindowTitle(newTitle);
+ _mainWin->setWindowIconText(newTitle);
+}
--- /dev/null
+/***************************************************************************
+ * Copyright (C) 2005-08 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) version 3. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+
+#ifndef TITLESETTER_H
+#define TITLESETTER_H
+
+#include "abstractitemview.h"
+
+class MainWin;
+
+class TitleSetter : public AbstractItemView {
+ Q_OBJECT
+
+ public:
+ TitleSetter(MainWin *parent);
+
+ protected slots:
+ virtual void currentChanged(const QModelIndex ¤t, const QModelIndex &previous);
+ virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+
+ private:
+ MainWin *_mainWin;
+ void changeWindowTitle(QString title);
+};
+
+
+#endif
void BufferView::setModel(QAbstractItemModel *model) {
delete selectionModel();
if(QTreeView::model()) {
- disconnect(QTreeView::model(), SIGNAL(layoutChanged()), this, SLOT(updateSelection()));
+ disconnect(QTreeView::model(), SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
}
QTreeView::setModel(model);
if(!model)
return;
- connect(model, SIGNAL(layoutChanged()), this, SLOT(updateSelection()));
+ connect(model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged()));
QString sectionName;
QAction *showSection;
QTreeView::keyPressEvent(event);
}
-// ensure that newly inserted network nodes are expanded per default
void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
QTreeView::rowsInserted(parent, start, end);
+
+ // ensure that newly inserted network nodes are expanded per default
if(parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
return;
}
}
-void BufferView::updateSelection() {
+void BufferView::layoutChanged() {
+ Q_ASSERT(model());
+
+ // expand all active networks
+ QModelIndex networkIdx;
+ for(int row = 0; row < model()->rowCount(); row++) {
+ networkIdx = model()->index(row, 0);
+ update(networkIdx);
+ if(model()->rowCount(networkIdx) > 0 && model()->data(networkIdx, NetworkModel::ItemActiveRole) == true) {
+ expand(networkIdx);
+ } else {
+ collapse(networkIdx);
+ }
+ }
+
+ // update selection to current one
MappedSelectionModel *mappedSelectionModel = qobject_cast<MappedSelectionModel *>(selectionModel());
- if(!config())
+ if(!config() || !mappedSelectionModel)
return;
mappedSelectionModel->mappedSetCurrentIndex(Client::bufferModel()->standardSelectionModel()->currentIndex(), QItemSelectionModel::Current);
void joinChannel(const QModelIndex &index);
void toggleHeader(bool checked);
void showContextMenu(const QPoint &);
- void updateSelection();
+ void layoutChanged();
private:
QPointer<BufferViewConfig> _config;
{ using namespace Global;
quasselVersion = "0.2.0-beta1-pre";
- quasselDate = "2008-04-18";
- quasselBuild = 777;
+ quasselDate = "2008-04-21";
+ quasselBuild = 786;
//! Minimum client build number the core needs
clientBuildNeeded = 731;
projects / quassel.git / commitdiff