projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Say hello to the first settings page in our shiny new, almost working SettingsDlg...
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
10b2b98
..
0d4453d
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-27,7
+27,6
@@
#include "nicklistwidget.h"
#include "serverlist.h"
#include "settingsdlg.h"
#include "nicklistwidget.h"
#include "serverlist.h"
#include "settingsdlg.h"
-//#include "settingspage.h"
#include "signalproxy.h"
#include "topicwidget.h"
#include "signalproxy.h"
#include "topicwidget.h"
@@
-35,6
+34,8
@@
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
+#include "settingspages/fontssettingspage.h"
+
MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
ui.setupUi(this);
setWindowTitle("Quassel IRC");
MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
ui.setupUi(this);
setWindowTitle("Quassel IRC");
@@
-68,6
+69,7
@@
void MainWin::init() {
setupMenus();
setupViews();
setupMenus();
setupViews();
+ setupSettingsDlg();
// create nick dock
nickDock = new QDockWidget("Nicks", this);
// create nick dock
nickDock = new QDockWidget("Nicks", this);
@@
-125,6
+127,7
@@
void MainWin::init() {
ui.menuViews->addAction(dock->toggleViewAction());
ui.menuViews->addAction(dock->toggleViewAction());
+ //showSettingsDlg();
}
MainWin::~MainWin() {
}
MainWin::~MainWin() {
@@
-186,6
+189,11
@@
void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
netViews.append(dock);
}
netViews.append(dock);
}
+void MainWin::setupSettingsDlg() {
+ settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
+
+}
+
void MainWin::connectedToCore() {
foreach(BufferInfo id, Client::allBufferInfos()) {
emit requestBacklog(id, 1000, -1);
void MainWin::connectedToCore() {
foreach(BufferInfo id, Client::allBufferInfos()) {
emit requestBacklog(id, 1000, -1);