/***************************************************************************
- * Copyright (C) 2005-2016 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
SLOT(messagesInserted(const QModelIndex &, int, int)));
connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showChannelList(NetworkId)), SLOT(showChannelList(NetworkId)));
connect(Client::instance(), SIGNAL(showChannelList(NetworkId)), SLOT(showChannelList(NetworkId)));
+ connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showNetworkConfig(NetworkId)), SLOT(showNetworkConfig(NetworkId)));
connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showIgnoreList(QString)), SLOT(showIgnoreList(QString)));
connect(Client::instance(), SIGNAL(showIgnoreList(QString)), SLOT(showIgnoreList(QString)));
this, SLOT(showCoreInfoDlg())));
coll->addAction("ConfigureNetworks", new Action(QIcon::fromTheme("configure"), tr("Configure &Networks..."), coll,
this, SLOT(on_actionConfigureNetworks_triggered())));
- // FIXME: use QKeySequence::Quit once we depend on Qt 4.6
+ // QKeySequence::Quit was added in Qt 4.6, and could be used instead. However, that key
+ // sequence is empty by default on Windows, which would remove Ctrl-Q to quit. It may be best
+ // to just keep it this way.
+ //
+ // See https://doc.qt.io/qt-5/qkeysequence.html
coll->addAction("Quit", new Action(QIcon::fromTheme("application-exit"), tr("&Quit"), coll,
this, SLOT(quit()), Qt::CTRL + Qt::Key_Q));
coll->addAction("DebugLog", new Action(QIcon::fromTheme("tools-report-bug"), tr("Debug &Log"), coll,
this, SLOT(on_actionDebugLog_triggered())));
coll->addAction("ReloadStyle", new Action(QIcon::fromTheme("view-refresh"), tr("Reload Stylesheet"), coll,
- QtUi::style(), SLOT(reload()), QKeySequence::Refresh));
+ QtUi::style(), SLOT(reload()), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_R)));
coll->addAction("HideCurrentBuffer", new Action(tr("Hide Current Buffer"), coll,
this, SLOT(hideCurrentBuffer()), QKeySequence::Close));
+ // Text formatting
+ coll = QtUi::actionCollection("TextFormat", tr("Text formatting"));
+
+ coll->addAction("FormatApplyColor", new Action(
+ QIcon::fromTheme("format-text-color"), tr("Apply foreground color"), coll,
+ this, SLOT(on_inputFormatApplyColor_triggered()),
+ QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_G)));
+
+ coll->addAction("FormatApplyColorFill", new Action(
+ QIcon::fromTheme("format-fill-color"), tr("Apply background color"), coll,
+ this, SLOT(on_inputFormatApplyColorFill_triggered()),
+ QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B)));
+
+ coll->addAction("FormatClear", new Action(
+ QIcon::fromTheme("edit-clear"), tr("Clear formatting"), coll,
+ this, SLOT(on_inputFormatClear_triggered()),
+ QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_C)));
+
+ coll->addAction("FormatBold", new Action(
+ QIcon::fromTheme("format-text-bold"), tr("Toggle bold"), coll,
+ this, SLOT(on_inputFormatBold_triggered()),
+ QKeySequence::Bold));
+
+ coll->addAction("FormatItalic", new Action(
+ QIcon::fromTheme("format-text-italic"), tr("Toggle italics"), coll,
+ this, SLOT(on_inputFormatItalic_triggered()),
+ QKeySequence::Italic));
+
+ coll->addAction("FormatUnderline", new Action(
+ QIcon::fromTheme("format-text-underline"), tr("Toggle underline"), coll,
+ this, SLOT(on_inputFormatUnderline_triggered()), QKeySequence::Underline));
+
// Navigation
coll = QtUi::actionCollection("Navigation", tr("Navigation"));
config->setLocked(lock);
}
}
+
+ _mainToolBar->setMovable(!lock);
+ _nickToolBar->setMovable(!lock);
+
QtUiSettings().setValue("LockLayout", lock);
}
_mainToolBar->addAction(coll->action("DisconnectCore"));
}
+ _mainToolBar->setMovable(!QtUiSettings().value("LockLayout", false).toBool());
+
QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
_toolbarMenu->addAction(_mainToolBar->toggleViewAction());
_nickToolBar->setWindowTitle(tr("Nick Toolbar"));
_nickToolBar->setVisible(false); //default: not visible
addToolBar(_nickToolBar);
+ _nickToolBar->setMovable(!QtUiSettings().value("LockLayout", false).toBool());
QtUi::toolBarActionProvider()->addActions(_nickToolBar, ToolBarActionProvider::NickToolBar);
_toolbarMenu->addAction(_nickToolBar->toggleViewAction());
}
+void MainWin::showNetworkConfig(NetworkId netId)
+{
+ SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
+ if (netId.isValid())
+ qobject_cast<NetworksSettingsPage *>(dlg.currentPage())->bufferList_Open(netId);
+ dlg.exec();
+}
+
+
void MainWin::showIgnoreList(QString newRule)
{
SettingsPageDlg dlg(new IgnoreListSettingsPage(this), this);
}
+void MainWin::on_inputFormatApplyColor_triggered()
+{
+ if (!_inputWidget)
+ return;
+
+ _inputWidget->applyFormatActiveColor();
+}
+
+
+void MainWin::on_inputFormatApplyColorFill_triggered()
+{
+ if (!_inputWidget)
+ return;
+
+ _inputWidget->applyFormatActiveColorFill();
+}
+
+
+void MainWin::on_inputFormatClear_triggered()
+{
+ if (!_inputWidget)
+ return;
+
+ _inputWidget->clearFormat();
+}
+
+
+void MainWin::on_inputFormatBold_triggered()
+{
+ if (!_inputWidget)
+ return;
+
+ _inputWidget->toggleFormatBold();
+}
+
+
+void MainWin::on_inputFormatItalic_triggered()
+{
+ if (!_inputWidget)
+ return;
+
+ _inputWidget->toggleFormatItalic();
+}
+
+
+void MainWin::on_inputFormatUnderline_triggered()
+{
+ if (!_inputWidget)
+ return;
+
+ _inputWidget->toggleFormatUnderline();
+}
+
+
void MainWin::on_jumpHotBuffer_triggered()
{
if (!_bufferHotList->rowCount())