X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fmainwin.cpp;h=b56c7947ebba3f797764aae587db6bd506c04bf5;hb=39eb2fda3eaef2de78a8134556015ff86e9b85d4;hp=1e74e18d20437fbd285a7ec28244f3a6c280fbd9;hpb=8c16bc6817aac177791686ac1a5ad8ee2d93410c;p=quassel.git

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 1e74e18d..b56c7947 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -26,6 +26,7 @@
 #  include <KMenuBar>
 #  include <KShortcutsDialog>
 #  include <KStatusBar>
+#  include <KToolBar>
 #endif
 
 #ifdef Q_WS_X11
@@ -62,7 +63,6 @@
 #include "flatproxymodel.h"
 #include "iconloader.h"
 #include "inputwidget.h"
-#include "inputline.h"
 #include "irclistmodel.h"
 #include "ircconnectionwizard.h"
 #include "jumpkeyhandler.h"
@@ -71,6 +71,7 @@
 #include "qtuiapplication.h"
 #include "qtuimessageprocessor.h"
 #include "qtuisettings.h"
+#include "qtuistyle.h"
 #include "settingsdlg.h"
 #include "settingspagedlg.h"
 #include "systemtray.h"
@@ -96,10 +97,13 @@
 #include "settingspages/backlogsettingspage.h"
 #include "settingspages/bufferviewsettingspage.h"
 #include "settingspages/chatmonitorsettingspage.h"
-#include "settingspages/colorsettingspage.h"
+#include "settingspages/chatviewsettingspage.h"
+#include "settingspages/connectionsettingspage.h"
 #include "settingspages/generalsettingspage.h"
 #include "settingspages/highlightsettingspage.h"
 #include "settingspages/identitiessettingspage.h"
+#include "settingspages/inputwidgetsettingspage.h"
+#include "settingspages/itemviewsettingspage.h"
 #include "settingspages/networkssettingspage.h"
 #include "settingspages/notificationssettingspage.h"
 
@@ -283,7 +287,7 @@ void MainWin::setupActions() {
                                       this, SLOT(quit()), tr("Ctrl+Q")));
 
   // View
-  coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Buffer Views..."), coll,
+  coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Chat Lists..."), coll,
                                              this, SLOT(on_actionConfigureViews_triggered())));
 
   QAction *lockAct = coll->addAction("LockLayout", new Action(tr("&Lock Layout"), coll));
@@ -316,9 +320,11 @@ void MainWin::setupActions() {
                                        this, SLOT(on_actionDebugHotList_triggered())));
   coll->addAction("DebugLog", new Action(SmallIcon("tools-report-bug"), tr("Debug &Log"), coll,
                                        this, SLOT(on_actionDebugLog_triggered())));
+  coll->addAction("ReloadStyle", new Action(SmallIcon("view-refresh"), tr("Reload Stylesheet"), coll,
+                                       QtUi::style(), SLOT(reload()), QKeySequence::Refresh));
 
   // Navigation
-  coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot buffer"), coll,
+  coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot chat"), coll,
                                               this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A)));
 }
 
@@ -345,7 +351,7 @@ void MainWin::setupMenus() {
   _fileMenu->addAction(coll->action("Quit"));
 
   _viewMenu = menuBar()->addMenu(tr("&View"));
-  _bufferViewsMenu = _viewMenu->addMenu(tr("&Buffer Views"));
+  _bufferViewsMenu = _viewMenu->addMenu(tr("&Chat Lists"));
   _bufferViewsMenu->addAction(coll->action("ConfigureBufferViews"));
   _toolbarMenu = _viewMenu->addMenu(tr("&Toolbars"));
   _viewMenu->addSeparator();
@@ -380,6 +386,8 @@ void MainWin::setupMenus() {
   _helpDebugMenu->addAction(coll->action("DebugMessageModel"));
   _helpDebugMenu->addAction(coll->action("DebugHotList"));
   _helpDebugMenu->addAction(coll->action("DebugLog"));
+  _helpDebugMenu->addSeparator();
+  _helpDebugMenu->addAction(coll->action("ReloadStyle"));
 }
 
 void MainWin::setupBufferWidget() {
@@ -403,7 +411,7 @@ void MainWin::addBufferView(ClientBufferViewConfig *config) {
   //create the view and initialize it's filter
   BufferView *view = new BufferView(dock);
   view->setFilteredModel(Client::bufferModel(), config);
-  view->installEventFilter(_inputWidget->inputLine()); // for key presses
+  view->installEventFilter(_inputWidget); // for key presses
   view->show();
 
   Client::bufferModel()->synchronizeView(view);
@@ -626,20 +634,18 @@ void MainWin::setupToolBars() {
 #ifdef Q_WS_MAC
   setUnifiedTitleAndToolBarOnMac(true);
 #endif
-  _mainToolBar = addToolBar(tr("Main Toolbar"));
+
+#ifdef HAVE_KDE
+  _mainToolBar = new KToolBar("MainToolBar", this, Qt::TopToolBarArea, false, true, true);
+#else
+  _mainToolBar = new QToolBar(this);
   _mainToolBar->setObjectName("MainToolBar");
+#endif
+  _mainToolBar->setWindowTitle(tr("Main Toolbar"));
+  addToolBar(_mainToolBar);
 
   QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
   _toolbarMenu->addAction(_mainToolBar->toggleViewAction());
-
-  //_nickToolBar = addToolBar("User");
-  //_nickToolBar->setObjectName("NickToolBar");
-  //QtUi::toolBarActionProvider()->addActions(_nickToolBar, ToolBarActionProvider::NickToolBar);
-
-#ifdef HAVE_KDE
-  _mainToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-  //_nickToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-#endif
 }
 
 void MainWin::connectedToCore() {
@@ -802,9 +808,11 @@ void MainWin::awayLogDestroyed() {
 void MainWin::showSettingsDlg() {
   SettingsDlg *dlg = new SettingsDlg();
 
-  //Category: Appearance
-  dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General
-  dlg->registerSettingsPage(new ColorSettingsPage(dlg));
+  //Category: Interface
+  dlg->registerSettingsPage(new AppearanceSettingsPage(dlg));
+  dlg->registerSettingsPage(new ChatViewSettingsPage(dlg));
+  dlg->registerSettingsPage(new ItemViewSettingsPage(dlg));
+  dlg->registerSettingsPage(new InputWidgetSettingsPage(dlg));
   dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
   dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
   dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
@@ -813,6 +821,7 @@ void MainWin::showSettingsDlg() {
 
   //Category: Misc
   dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
+  dlg->registerSettingsPage(new ConnectionSettingsPage(dlg));
   dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg));
   dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
   dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
@@ -938,8 +947,6 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
     Message::Flags flags = (Message::Flags)idx.data(ChatLineModel::FlagsRole).toInt();
     if(flags.testFlag(Message::Backlog) || flags.testFlag(Message::Self))
       continue;
-    flags |= Message::Backlog;  // we only want to trigger a highlight once!
-    Client::messageModel()->setData(idx, (int)flags, ChatLineModel::FlagsRole);
 
     BufferId bufId = idx.data(ChatLineModel::BufferIdRole).value<BufferId>();
     BufferInfo::Type bufType = Client::networkModel()->bufferType(bufId);