#include "actioncollection.h"
#include "buffermodel.h"
#include "bufferview.h"
-#include "bufferviewmanager.h"
#include "bufferwidget.h"
#include "channellistdlg.h"
#include "chatlinemodel.h"
#include "client.h"
#include "clientsyncer.h"
#include "clientbacklogmanager.h"
+#include "clientbufferviewconfig.h"
+#include "clientbufferviewmanager.h"
#include "coreinfodlg.h"
#include "coreconnectdlg.h"
#include "contextmenuactionprovider.h"
restoreState(s.value("MainWinState").toByteArray());
// restore locked state of docks
- QtUi::actionCollection("General")->action("LockDockPositions")->setChecked(s.value("LockDocks", false).toBool());
+ QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool());
setDisconnectedState(); // Disable menus and stuff
coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Buffer Views..."), coll,
this, SLOT(on_actionConfigureViews_triggered())));
- QAction *lockAct = coll->addAction("LockDockPositions", new Action(tr("&Lock Dock Positions"), coll));
+ QAction *lockAct = coll->addAction("LockLayout", new Action(tr("&Lock Layout"), coll));
lockAct->setCheckable(true);
- connect(lockAct, SIGNAL(toggled(bool)), SLOT(on_actionLockDockPositions_toggled(bool)));
+ connect(lockAct, SIGNAL(toggled(bool)), SLOT(on_actionLockLayout_toggled(bool)));
coll->addAction("ToggleSearchBar", new Action(SmallIcon("edit-find"), tr("Show &Search Bar"), coll,
0, 0, tr("Ctrl+F")))->setCheckable(true);
_viewMenu->addAction(coll->action("ToggleStatusBar"));
_viewMenu->addSeparator();
- _viewMenu->addAction(coll->action("LockDockPositions"));
+ _viewMenu->addAction(coll->action("LockLayout"));
_settingsMenu = menuBar()->addMenu(tr("&Settings"));
#ifdef HAVE_KDE
}
void MainWin::addBufferView(int bufferViewConfigId) {
- addBufferView(Client::bufferViewManager()->bufferViewConfig(bufferViewConfigId));
+ addBufferView(Client::bufferViewManager()->clientBufferViewConfig(bufferViewConfigId));
}
-void MainWin::addBufferView(BufferViewConfig *config) {
+void MainWin::addBufferView(ClientBufferViewConfig *config) {
if(!config)
return;
+ config->setLocked(QtUiSettings().value("LockLayout", false).toBool());
BufferViewDock *dock = new BufferViewDock(config, this);
//create the view and initialize it's filter
dlg.exec();
}
-void MainWin::on_actionLockDockPositions_toggled(bool lock) {
+void MainWin::on_actionLockLayout_toggled(bool lock) {
QList<VerticalDock *> docks = findChildren<VerticalDock *>();
foreach(VerticalDock *dock, docks) {
dock->showTitle(!lock);
}
- QtUiSettings().setValue("LockDocks", lock);
+ if(Client::bufferViewManager()) {
+ foreach(ClientBufferViewConfig *config, Client::bufferViewManager()->clientBufferViewConfigs()) {
+ config->setLocked(lock);
+ }
+ }
+ QtUiSettings().setValue("LockLayout", lock);
}
void MainWin::setupNickWidget() {
addDockWidget(Qt::RightDockWidgetArea, nickDock);
_viewMenu->addAction(nickDock->toggleViewAction());
nickDock->toggleViewAction()->setText(tr("Show Nick List"));
- nickDock->toggleViewAction()->setIcon(SmallIcon("view-sidetree"));
+
// See NickListDock::NickListDock();
// connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
ChatMonitorView *chatView = new ChatMonitorView(filter, this);
chatView->show();
dock->setWidget(chatView);
- dock->show();
+ dock->hide();
addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
_viewMenu->addAction(dock->toggleViewAction());
statusBar()->addPermanentWidget(sslLabel);
sslLabel->hide();
- _viewMenu->addSeparator();
QAction *showStatusbar = QtUi::actionCollection("General")->action("ToggleStatusBar");
QtUiSettings uiSettings;
connect(_nickListWidget, SIGNAL(nickSelectionChanged(QModelIndexList)),
QtUi::toolBarActionProvider(), SLOT(nickSelectionChanged(QModelIndexList)));
+#ifdef Q_WS_MAC
+ setUnifiedTitleAndToolBarOnMac(true);
+#endif
_mainToolBar = addToolBar("Main Toolbar");
- _mainToolBar->setObjectName("MainToolBar");
+ // _mainToolBar->setObjectName("MainToolBar"); // setting an object name breaks setUnifiedTitleAndToolBarOnMac... -.-
QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
_toolbarMenu->addAction(_mainToolBar->toggleViewAction());
continue;
}
Message::Flags flags = (Message::Flags)idx.data(ChatLineModel::FlagsRole).toInt();
- if(flags.testFlag(Message::Backlog)) continue;
+ 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);