X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=e5b6ba218fd7031c3c605fcfff458c256f1ee434;hp=900354b10d737716ae0f15ca5dc76a97340dbdc0;hb=911f181e0e179eb51279c0880eb701a43163b8b5;hpb=5e6f3661d30bc760f912dfe0627e5c62c6f2c144

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 900354b1..e5b6ba21 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 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  *
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include <QUuid>
+
 #ifdef HAVE_KDE4
 #  include <KMainWindow>
 #elif defined HAVE_KF5
@@ -36,8 +38,8 @@ class ActionCollection;
 class BufferHotListFilter;
 class BufferView;
 class BufferViewConfig;
+class ChatMonitorView;
 class ClientBufferViewConfig;
-class ClientTransfer;
 class CoreAccount;
 class CoreConnectionStatusWidget;
 class BufferViewDock;
@@ -46,11 +48,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;
@@ -85,6 +87,9 @@ public:
     void saveStateToSettings(UiSettings &);
     void restoreStateFromSettings(UiSettings &);
 
+    // We need to override this to add the show/hide menu bar option
+    virtual QMenu *createPopupMenu();
+
 public slots:
     void showStatusBarMessage(const QString &message);
     void hideCurrentBuffer();
@@ -93,6 +98,8 @@ public slots:
     void nextBuffer();
     void previousBuffer();
 
+    void showMigrationWarning(bool show);
+
     //! Quit application
     void quit();
 
@@ -115,8 +122,9 @@ private slots:
     void messagesInserted(const QModelIndex &parent, int start, int end);
     void showAboutDlg();
     void showChannelList(NetworkId netId = NetworkId());
+    void showNetworkConfig(NetworkId netId = NetworkId());
     void showCoreConnectionDlg();
-    void showCoreConfigWizard(const QVariantList &);
+    void showCoreConfigWizard(const QVariantList &, const QVariantList &);
     void showCoreInfoDlg();
     void showAwayLog();
     void showSettingsDlg();
@@ -124,9 +132,11 @@ private slots:
     void showIgnoreList(QString newRule = QString());
     void showShortcutsDlg();
     void showPasswordChangeDlg();
-    void showNewTransferDlg(const ClientTransfer *transfer);
+    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);
@@ -138,7 +148,51 @@ private slots:
     void on_actionConfigureNetworks_triggered();
     void on_actionConfigureViews_triggered();
     void on_actionLockLayout_toggled(bool lock);
+
+    /**
+     * Apply the active color to the input widget selected or typed text
+     *
+     * @seealso InputWidget::applyFormatActiveColor()
+     */
+    void on_inputFormatApplyColor_triggered();
+
+    /**
+     * Apply the active fill color to the input widget selected or typed text background
+     *
+     * @seealso InputWidget::applyFormatActiveColorFill()
+     */
+    void on_inputFormatApplyColorFill_triggered();
+
+    /**
+     * Toggle the boldness of the input widget selected or typed text
+     *
+     * @seealso InputWidget::toggleFormatBold()
+     */
+    void on_inputFormatBold_triggered();
+
+    /**
+     * Toggle the italicness of the input widget selected or typed text
+     *
+     * @seealso InputWidget::toggleFormatItalic()
+     */
+    void on_inputFormatItalic_triggered();
+
+    /**
+     * Toggle the underlining of the input widget selected or typed text
+     *
+     * @seealso InputWidget::toggleFormatUnderline()
+     */
+    void on_inputFormatUnderline_triggered();
+
+    /**
+     * Clear the formatting of the input widget selected or typed text
+     *
+     * @seealso InputWidget::clearFormat()
+     */
+    void on_inputFormatClear_triggered();
+
     void on_jumpHotBuffer_triggered();
+    void on_bufferSearch_triggered();
     void on_actionDebugNetworkModel_triggered();
     void on_actionDebugBufferViewOverlay_triggered();
     void on_actionDebugMessageModel_triggered();
@@ -187,6 +241,7 @@ private:
     void setupChatMonitor();
     void setupInputWidget();
     void setupTopicWidget();
+    void setupTransferWidget();
     void setupViewMenuTail();
     void setupStatusBar();
     void setupSystray();
@@ -211,6 +266,8 @@ private:
 
     QWidget *_awayLog;
 
+    QMessageBox* _migrationWarning{nullptr};
+
     bool _layoutLoaded;
 
     QSize _normalSize; //!< Size of the non-maximized window
@@ -220,5 +277,7 @@ private:
     QHash<int, BufferId> _jumpKeyMap;
     int _activeBufferViewIndex;
 
+    bool _aboutToQuit; //closeEvent can occur multiple times on OSX
+
     friend class QtUi;
 };