projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Columns are now moveable!
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
4973ba1
..
1515dd4
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-20,7
+20,6
@@
#include "mainwin.h"
#include "aboutdlg.h"
#include "mainwin.h"
#include "aboutdlg.h"
-#include "chatwidget.h"
#include "bufferview.h"
#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
#include "bufferview.h"
#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
@@
-286,7
+285,7
@@
void MainWin::setupNickWidget() {
}
void MainWin::setupChatMonitor() {
}
void MainWin::setupChatMonitor() {
-#ifndef SPUTDEV
+/*
VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this);
dock->setObjectName("ChatMonitorDock");
VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this);
dock->setObjectName("ChatMonitorDock");
@@
-305,7
+304,7
@@
void MainWin::setupChatMonitor() {
addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
ui.menuViews->addAction(dock->toggleViewAction());
addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
ui.menuViews->addAction(dock->toggleViewAction());
-
#endif /* SPUTDEV
*/
+*/
}
void MainWin::setupInputWidget() {
}
void MainWin::setupInputWidget() {
@@
-600,18
+599,19
@@
void MainWin::receiveMessage(const Message &msg) {
UiSettings uiSettings;
UiSettings uiSettings;
-#ifndef SPUTDEV
bool displayBubble = uiSettings.value("NotificationBubble", QVariant(true)).toBool();
bool displayDesktop = uiSettings.value("NotificationDesktop", QVariant(true)).toBool();
if(displayBubble || displayDesktop) {
bool displayBubble = uiSettings.value("NotificationBubble", QVariant(true)).toBool();
bool displayDesktop = uiSettings.value("NotificationDesktop", QVariant(true)).toBool();
if(displayBubble || displayDesktop) {
+/* // FIXME port
+ if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) {
// FIXME don't invoke style engine for this!
QString text = QtUi::style()->styleString(Message::mircToInternal(msg.contents())).plainText;
if(displayBubble) displayTrayIconMessage(title, text);
# ifdef HAVE_DBUS
if(displayDesktop) sendDesktopNotification(title, text);
# endif
// FIXME don't invoke style engine for this!
QString text = QtUi::style()->styleString(Message::mircToInternal(msg.contents())).plainText;
if(displayBubble) displayTrayIconMessage(title, text);
# ifdef HAVE_DBUS
if(displayDesktop) sendDesktopNotification(title, text);
# endif
+ */
}
}
-#endif
if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
QApplication::alert(this);
setTrayIconActivity(true);
if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
QApplication::alert(this);
setTrayIconActivity(true);
@@
-771,7
+771,11
@@
void MainWin::connectOrDisconnectFromNet() {
void MainWin::on_actionDebugNetworkModel_triggered(bool) {
QTreeView *view = new QTreeView;
view->setAttribute(Qt::WA_DeleteOnClose);
void MainWin::on_actionDebugNetworkModel_triggered(bool) {
QTreeView *view = new QTreeView;
view->setAttribute(Qt::WA_DeleteOnClose);
+ view->setWindowTitle("Debug NetworkModel View");
view->setModel(Client::networkModel());
view->setModel(Client::networkModel());
- view->expandAll();
+ view->setColumnWidth(0, 250);
+ view->setColumnWidth(1, 250);
+ view->setColumnWidth(2, 80);
+ view->resize(610, 300);
view->show();
}
view->show();
}