X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=d27b892eab28d1c2320326fdf9c90761ebe54171;hp=30e57269ff0a536d556a460ad8d97cccf2161ccb;hb=68878dc8366f2f4a0afe132847aad9a51a80cdbf;hpb=695758015a80eb8c158a9ac4c0f1c0b547e70df3

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 30e57269..d27b892e 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  *
@@ -18,11 +18,14 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef MAINWIN_H_
-#define MAINWIN_H_
+#pragma once
+
+#include <QUuid>
 
 #ifdef HAVE_KDE4
 #  include <KMainWindow>
+#elif defined HAVE_KF5
+#  include <KXmlGui/KMainWindow>
 #else
 #  include <QMainWindow>
 #endif
@@ -35,8 +38,8 @@ class ActionCollection;
 class BufferHotListFilter;
 class BufferView;
 class BufferViewConfig;
+class ChatMonitorView;
 class ClientBufferViewConfig;
-class ClientTransfer;
 class CoreAccount;
 class CoreConnectionStatusWidget;
 class BufferViewDock;
@@ -45,7 +48,6 @@ class InputWidget;
 class MsgProcessorStatusWidget;
 class NickListWidget;
 class SystemTray;
-class ChatMonitorView;
 class TopicWidget;
 
 class QMenu;
@@ -56,11 +58,10 @@ class KHelpMenu;
 
 //!\brief The main window of Quassel's QtUi.
 class MainWin
-#ifdef HAVE_KDE4
-    : public KMainWindow
-{
+#ifdef HAVE_KDE
+    : public KMainWindow {
 #else
-: public QMainWindow {
+    : public QMainWindow {
 #endif
     Q_OBJECT
 
@@ -85,6 +86,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();
@@ -116,14 +120,15 @@ private slots:
     void showAboutDlg();
     void showChannelList(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 handleCoreConnectionError(const QString &errorMsg);
@@ -138,6 +143,7 @@ private slots:
     void on_actionConfigureViews_triggered();
     void on_actionLockLayout_toggled(bool lock);
     void on_jumpHotBuffer_triggered();
+    void on_bufferSearch_triggered();
     void on_actionDebugNetworkModel_triggered();
     void on_actionDebugBufferViewOverlay_triggered();
     void on_actionDebugMessageModel_triggered();
@@ -169,7 +175,7 @@ signals:
     void disconnectFromCore();
 
 private:
-#ifdef HAVE_KDE4
+#ifdef HAVE_KDE
     KHelpMenu *_kHelpMenu;
 #endif
 
@@ -186,6 +192,7 @@ private:
     void setupChatMonitor();
     void setupInputWidget();
     void setupTopicWidget();
+    void setupTransferWidget();
     void setupViewMenuTail();
     void setupStatusBar();
     void setupSystray();
@@ -203,6 +210,7 @@ private:
     ChatMonitorView *_chatMonitorView;
     TopicWidget *_topicWidget;
 
+    QAction *_fullScreenAction;
     QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
     QMenu *_toolbarMenu;
     QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar;
@@ -218,8 +226,7 @@ private:
     QHash<int, BufferId> _jumpKeyMap;
     int _activeBufferViewIndex;
 
+    bool _aboutToQuit; //closeEvent can occur multiple times on OSX
+
     friend class QtUi;
 };
-
-
-#endif