X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=d27b892eab28d1c2320326fdf9c90761ebe54171;hb=092e6b212637ffbf68800584b7c1f32d1931b602;hp=d34c0f55cc753fa58c6b7729ffad50e8f04cf243;hpb=f84a3fd303cbea73a7c9b3839e417862fea43baa;p=quassel.git diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index d34c0f55..d27b892e 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -1,5 +1,5 @@ /*************************************************************************** - * 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 * @@ -86,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(); @@ -117,7 +120,7 @@ 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(); @@ -189,6 +192,7 @@ private: void setupChatMonitor(); void setupInputWidget(); void setupTopicWidget(); + void setupTransferWidget(); void setupViewMenuTail(); void setupStatusBar(); void setupSystray(); @@ -222,5 +226,7 @@ private: QHash _jumpKeyMap; int _activeBufferViewIndex; + bool _aboutToQuit; //closeEvent can occur multiple times on OSX + friend class QtUi; };