X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=900354b10d737716ae0f15ca5dc76a97340dbdc0;hp=54c19a1c4663105628d9aeacf0906d44220e360c;hb=921321156c2f1ceed0e02d519a1835e63e8c8b48;hpb=e4a23f68789db8aa7dddeebed35f4ff6a90ffa8c

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 54c19a1c..900354b1 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 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
+#ifdef HAVE_KDE4
 #  include <KMainWindow>
+#elif defined HAVE_KF5
+#  include <KXmlGui/KMainWindow>
 #else
 #  include <QMainWindow>
 #endif
@@ -36,6 +37,7 @@ class BufferHotListFilter;
 class BufferView;
 class BufferViewConfig;
 class ClientBufferViewConfig;
+class ClientTransfer;
 class CoreAccount;
 class CoreConnectionStatusWidget;
 class BufferViewDock;
@@ -46,7 +48,6 @@ class NickListWidget;
 class SystemTray;
 class ChatMonitorView;
 class TopicWidget;
-class Transfer;
 
 class QMenu;
 class QLabel;
@@ -57,10 +58,9 @@ 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
 
@@ -123,7 +123,8 @@ private slots:
     void showNotificationsDlg();
     void showIgnoreList(QString newRule = QString());
     void showShortcutsDlg();
-    void showNewTransferDlg(const Transfer *transfer);
+    void showPasswordChangeDlg();
+    void showNewTransferDlg(const ClientTransfer *transfer);
     void onFullScreenToggled();
 
     void handleCoreConnectionError(const QString &errorMsg);
@@ -154,6 +155,7 @@ private slots:
 
     void saveMenuBarStatus(bool enabled);
     void saveStatusBarStatus(bool enabled);
+    void saveMainToolBarStatus(bool enabled);
 
     void loadLayout();
     void saveLayout();
@@ -202,6 +204,7 @@ private:
     ChatMonitorView *_chatMonitorView;
     TopicWidget *_topicWidget;
 
+    QAction *_fullScreenAction;
     QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
     QMenu *_toolbarMenu;
     QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar;
@@ -219,6 +222,3 @@ private:
 
     friend class QtUi;
 };
-
-
-#endif