X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=fdd8c5e61632a9a20f60c33d24edaf4d3aea79c3;hp=2d80e6412a686d1a4d3fd93997d71d339f6583e4;hb=776ecd43e3d9367a862b8b647144f606176308b7;hpb=dc9de5af386f61e6dc5537d04ccc8aceb8126b21 diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 2d80e641..fdd8c5e6 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -45,6 +45,7 @@ class SystemTrayIcon; class QMenu; class QLabel; +class QToolBar; class KHelpMenu; @@ -67,7 +68,6 @@ class MainWin BufferView *allBuffersView() const; inline QSystemTrayIcon *systemTrayIcon() const; - inline BufferWidget *bufferWidget() const; virtual bool event(QEvent *event); @@ -86,14 +86,14 @@ class MainWin protected slots: void connectedToCore(); void setConnectedState(); - void updateLagIndicator(int lag); - void securedConnection(); + void updateLagIndicator(int lag = -1); void disconnectedFromCore(); void setDisconnectedState(); void systrayActivated(QSystemTrayIcon::ActivationReason); private slots: void addBufferView(int bufferViewConfigId); + void awayLogDestroyed(); void removeBufferView(int bufferViewConfigId); void messagesInserted(const QModelIndex &parent, int start, int end); void showAboutDlg(); @@ -101,6 +101,7 @@ class MainWin void startInternalCore(); void showCoreConnectionDlg(bool autoConnect = false); void showCoreInfoDlg(); + void showAwayLog(); void showSettingsDlg(); void showNotificationsDlg(); #ifdef HAVE_KDE @@ -149,9 +150,11 @@ class MainWin void setupStatusBar(); void setupSystray(); void setupTitleSetter(); + void setupToolBars(); void updateIcon(); - void toggleVisibility(); + void hideToTray(); + void toggleMinimizedToTray(); void enableMenus(); QSystemTrayIcon *_trayIcon; @@ -162,7 +165,10 @@ class MainWin InputWidget *_inputWidget; QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu; + QMenu *_toolbarMenu; + QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar; + QWidget *_awayLog; friend class QtUi; }; @@ -170,8 +176,4 @@ QSystemTrayIcon *MainWin::systemTrayIcon() const { return _trayIcon; } -BufferWidget *MainWin::bufferWidget() const { - return _bufferWidget; -} - #endif