X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=58e4be454c105240d262b9331761d2b965388863;hp=0840037509ffd9bcc3d2fc06960e39349a840e43;hb=e6217df3a59b911d2c449d2a7b997a799d233ed4;hpb=88dc36d63c95c618f19e15b6f8ee9281e97cb765 diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 08400375..58e4be45 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 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 * @@ -18,11 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef MAINWIN_H_ -#define MAINWIN_H_ +#pragma once -#ifdef HAVE_KDE -# include +#include + +#ifdef HAVE_KF5 +# include #else # include #endif @@ -35,8 +36,8 @@ class ActionCollection; class BufferHotListFilter; class BufferView; class BufferViewConfig; +class ChatMonitorView; class ClientBufferViewConfig; -class ClientTransfer; class CoreAccount; class CoreConnectionStatusWidget; class BufferViewDock; @@ -45,11 +46,11 @@ class InputWidget; class MsgProcessorStatusWidget; class NickListWidget; class SystemTray; -class ChatMonitorView; class TopicWidget; -class QMenu; class QLabel; +class QMenu; +class QMessageBox; class QToolBar; class KHelpMenu; @@ -57,16 +58,14 @@ class KHelpMenu; //!\brief The main window of Quassel's QtUi. class MainWin #ifdef HAVE_KDE - : public KMainWindow -{ + : public KMainWindow { #else -: public QMainWindow { + : public QMainWindow { #endif Q_OBJECT public: - MainWin(QWidget *parent = 0); - virtual ~MainWin(); + MainWin(QWidget *parent = nullptr); void init(); @@ -77,7 +76,7 @@ public: inline BufferWidget *bufferWidget() const { return _bufferWidget; } inline SystemTray *systemTray() const { return _systemTray; } - bool event(QEvent *event); + bool event(QEvent *event) override; static void flagRemoteCoreOnly(QObject *object) { object->setProperty("REMOTE_CORE_ONLY", true); } static bool isRemoteCoreOnly(QObject *object) { return object->property("REMOTE_CORE_ONLY").toBool(); } @@ -85,6 +84,9 @@ public: void saveStateToSettings(UiSettings &); void restoreStateFromSettings(UiSettings &); + // We need to override this to add the show/hide menu bar option + QMenu *createPopupMenu() override; + public slots: void showStatusBarMessage(const QString &message); void hideCurrentBuffer(); @@ -93,13 +95,14 @@ public slots: void nextBuffer(); void previousBuffer(); - //! Quit application - void quit(); + void showMigrationWarning(bool show); + + void onExitRequested(const QString &reason); protected: - void closeEvent(QCloseEvent *event); - void moveEvent(QMoveEvent *event); - void resizeEvent(QResizeEvent *event); + void closeEvent(QCloseEvent *event) override; + void moveEvent(QMoveEvent *event) override; + void resizeEvent(QResizeEvent *event) override; protected slots: void connectedToCore(); @@ -114,18 +117,32 @@ private slots: void currentBufferChanged(BufferId); void messagesInserted(const QModelIndex &parent, int start, int end); void showAboutDlg(); - void showChannelList(NetworkId netId = NetworkId()); + + /** + * Show the channel list dialog for the network, optionally searching by channel name + * + * @param networkId Network ID for associated network + * @param channelFilters Partial channel name to search for, or empty to show all + * @param listImmediately If true, immediately list channels, otherwise just show dialog + */ + void showChannelList(NetworkId netId = {}, const QString &channelFilters = {}, + bool listImmediately = false); + + void showNetworkConfig(NetworkId netId = NetworkId()); void showCoreConnectionDlg(); - void showCoreConfigWizard(const QVariantList &); + void showCoreConfigWizard(const QVariantList &, const QVariantList &); void showCoreInfoDlg(); void showAwayLog(); void showSettingsDlg(); void showNotificationsDlg(); void showIgnoreList(QString newRule = QString()); void showShortcutsDlg(); - void showNewTransferDlg(const ClientTransfer *transfer); + void showPasswordChangeDlg(); + void showNewTransferDlg(const QUuid &transferId); void onFullScreenToggled(); + void doAutoConnect(); + void handleCoreConnectionError(const QString &errorMsg); void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage); void handleNoSslInClient(bool *accepted); @@ -134,15 +151,60 @@ private slots: void handleSslErrors(const QSslSocket *socket, bool *accepted, bool *permanently); #endif - void on_actionConfigureNetworks_triggered(); - void on_actionConfigureViews_triggered(); - void on_actionLockLayout_toggled(bool lock); - void on_jumpHotBuffer_triggered(); - void on_actionDebugNetworkModel_triggered(); - void on_actionDebugBufferViewOverlay_triggered(); - void on_actionDebugMessageModel_triggered(); - void on_actionDebugHotList_triggered(); - void on_actionDebugLog_triggered(); + void onConfigureNetworksTriggered(); + void onConfigureViewsTriggered(); + void onLockLayoutToggled(bool lock); + + /** + * Apply the active color to the input widget selected or typed text + * + * @seealso InputWidget::applyFormatActiveColor() + */ + void onFormatApplyColorTriggered(); + + /** + * Apply the active fill color to the input widget selected or typed text background + * + * @seealso InputWidget::applyFormatActiveColorFill() + */ + void onFormatApplyColorFillTriggered(); + + /** + * Toggle the boldness of the input widget selected or typed text + * + * @seealso InputWidget::toggleFormatBold() + */ + void onFormatBoldTriggered(); + + /** + * Toggle the italicness of the input widget selected or typed text + * + * @seealso InputWidget::toggleFormatItalic() + */ + void onFormatItalicTriggered(); + + /** + * Toggle the underlining of the input widget selected or typed text + * + * @seealso InputWidget::toggleFormatUnderline() + */ + void onFormatUnderlineTriggered(); + + /** + * Clear the formatting of the input widget selected or typed text + * + * @seealso InputWidget::clearFormat() + */ + void onFormatClearTriggered(); + + void onJumpHotBufferTriggered(); + void onBufferSearchTriggered(); + void onDebugNetworkModelTriggered(); + void onDebugBufferViewOverlayTriggered(); + void onDebugMessageModelTriggered(); + void onDebugHotListTriggered(); + void onDebugLogTriggered(); + void onShowResourceTreeTriggered(); void bindJumpKey(); void onJumpKey(); @@ -186,6 +248,7 @@ private: void setupChatMonitor(); void setupInputWidget(); void setupTopicWidget(); + void setupTransferWidget(); void setupViewMenuTail(); void setupStatusBar(); void setupSystray(); @@ -203,23 +266,25 @@ private: ChatMonitorView *_chatMonitorView; TopicWidget *_topicWidget; + QAction *_fullScreenAction{nullptr}; QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu; QMenu *_toolbarMenu; QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar; - QWidget *_awayLog; + QWidget *_awayLog{nullptr}; - bool _layoutLoaded; + QMessageBox* _migrationWarning{nullptr}; + + bool _layoutLoaded{false}; QSize _normalSize; //!< Size of the non-maximized window QPoint _normalPos; //!< Position of the non-maximized window BufferHotListFilter *_bufferHotList; QHash _jumpKeyMap; - int _activeBufferViewIndex; + int _activeBufferViewIndex{-1}; + + bool _aboutToQuit{false}; //closeEvent can occur multiple times on OSX friend class QtUi; }; - - -#endif