#include "actioncollection.h"
#include "buffermodel.h"
#include "bufferview.h"
+#include "bufferviewoverlay.h"
+#include "bufferviewoverlayfilter.h"
#include "bufferwidget.h"
#include "channellistdlg.h"
#include "chatlinemodel.h"
#include "inputwidget.h"
#include "inputline.h"
#include "irclistmodel.h"
+#include "ircconnectionwizard.h"
#include "jumpkeyhandler.h"
#include "msgprocessorstatuswidget.h"
#include "nicklistwidget.h"
#include "settingspages/bufferviewsettingspage.h"
#include "settingspages/chatmonitorsettingspage.h"
#include "settingspages/colorsettingspage.h"
-#include "settingspages/fontssettingspage.h"
#include "settingspages/generalsettingspage.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
s.setValue("MainWinState", saveState());
}
-// FIXME
void MainWin::updateIcon() {
+#ifdef Q_WS_MAC
+ const int size = 128;
+#else
+ const int size = 48;
+#endif
+
QPixmap icon;
if(Client::isConnected())
- icon = DesktopIcon("quassel", IconLoader::SizeEnormous);
+ icon = DesktopIcon("quassel", size);
else
- icon = DesktopIcon("quassel_disconnected", IconLoader::SizeEnormous);
+ icon = DesktopIcon("quassel_inactive", size);
setWindowIcon(icon);
qApp->setWindowIcon(icon);
}
qApp, SLOT(aboutQt())));
coll->addAction("DebugNetworkModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &NetworkModel"), coll,
this, SLOT(on_actionDebugNetworkModel_triggered())));
+ coll->addAction("DebugBufferViewOverlay", new Action(SmallIcon("tools-report-bug"), tr("Debug &BufferViewOverlay"), coll,
+ this, SLOT(on_actionDebugBufferViewOverlay_triggered())));
coll->addAction("DebugMessageModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &MessageModel"), coll,
this, SLOT(on_actionDebugMessageModel_triggered())));
coll->addAction("DebugLog", new Action(SmallIcon("tools-report-bug"), tr("Debug &Log"), coll,
_helpMenu->addSeparator();
_helpDebugMenu = _helpMenu->addMenu(SmallIcon("tools-report-bug"), tr("Debug"));
_helpDebugMenu->addAction(coll->action("DebugNetworkModel"));
+ _helpDebugMenu->addAction(coll->action("DebugBufferViewOverlay"));
_helpDebugMenu->addAction(coll->action("DebugMessageModel"));
_helpDebugMenu->addAction(coll->action("DebugLog"));
}
addDockWidget(Qt::LeftDockWidgetArea, dock);
_bufferViewsMenu->addAction(dock->toggleViewAction());
+ connect(dock->toggleViewAction(), SIGNAL(toggled(bool)), this, SLOT(bufferViewToggled(bool)));
_bufferViews.append(dock);
}
}
}
+void MainWin::bufferViewToggled(bool enabled) {
+ QAction *action = qobject_cast<QAction *>(sender());
+ Q_ASSERT(action);
+ BufferViewDock *dock = qobject_cast<BufferViewDock *>(action->parent());
+ Q_ASSERT(dock);
+ if(enabled) {
+ Client::bufferViewManager()->bufferViewOverlay()->addView(dock->bufferViewId());
+ } else {
+ Client::bufferViewManager()->bufferViewOverlay()->removeView(dock->bufferViewId());
+ }
+}
+
BufferView *MainWin::allBuffersView() const {
// "All Buffers" is always the first dock created
if(_bufferViews.count() > 0)
coreLagLabel->setVisible(!Client::internalCore());
updateIcon();
systemTray()->setState(SystemTray::Active);
+
+ if(Client::networkIds().isEmpty()) {
+ IrcConnectionWizard *wizard = new IrcConnectionWizard(this, Qt::Sheet);
+ wizard->show();
+ }
}
void MainWin::loadLayout() {
SettingsDlg *dlg = new SettingsDlg();
//Category: Appearance
- dlg->registerSettingsPage(new ColorSettingsPage(dlg));
- dlg->registerSettingsPage(new FontsSettingsPage(dlg));
dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General
- //Category: Behaviour
- dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
- dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
+ dlg->registerSettingsPage(new ColorSettingsPage(dlg));
dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
- dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
+ dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
+ dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg));
- //Category: General
+
+ //Category: Misc
+ dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg));
dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
- dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
+ dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
dlg->show();
}
// restore
setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
show();
+ activateWindow();
raise();
-
} else {
setWindowState((windowState() & ~Qt::WindowActive) | Qt::WindowMinimized);
hideToTray();
view->show();
}
+void MainWin::on_actionDebugBufferViewOverlay_triggered() {
+ QTreeView *view = new QTreeView;
+ view->setAttribute(Qt::WA_DeleteOnClose);
+ view->setWindowTitle("Debug BufferViewOverlay View");
+ BufferViewOverlayFilter *filter = new BufferViewOverlayFilter(Client::bufferModel(), Client::bufferViewManager()->bufferViewOverlay());
+ filter->setParent(view);
+ view->setModel(filter);
+ view->setColumnWidth(0, 250);
+ view->setColumnWidth(1, 250);
+ view->setColumnWidth(2, 80);
+ view->resize(610, 300);
+ view->show();
+}
+
void MainWin::on_actionDebugMessageModel_triggered() {
QTableView *view = new QTableView(0);
DebugMessageModelFilter *filter = new DebugMessageModelFilter(view);