projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix an issue where empty elements were shown in the highlight list
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
d34c0f5
..
5d77136
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-86,6
+86,9
@@
public:
void saveStateToSettings(UiSettings &);
void restoreStateFromSettings(UiSettings &);
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();
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 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 showCoreInfoDlg();
void showAwayLog();
void showSettingsDlg();
@@
-189,6
+192,7
@@
private:
void setupChatMonitor();
void setupInputWidget();
void setupTopicWidget();
void setupChatMonitor();
void setupInputWidget();
void setupTopicWidget();
+ void setupTransferWidget();
void setupViewMenuTail();
void setupStatusBar();
void setupSystray();
void setupViewMenuTail();
void setupStatusBar();
void setupSystray();
@@
-222,5
+226,7
@@
private:
QHash<int, BufferId> _jumpKeyMap;
int _activeBufferViewIndex;
QHash<int, BufferId> _jumpKeyMap;
int _activeBufferViewIndex;
+ bool _aboutToQuit; //closeEvent can occur multiple times on OSX
+
friend class QtUi;
};
friend class QtUi;
};