← Back to branch summary

~ubuntu-branches/ubuntu/karmic/quassel/karmic-backports

« back to all changes in this revision

Viewing changes to src/qtui/mainwin.h

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2009-02-15 19:46:44 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20090215194644-dr40bbv9rxmtzxh4
Tags: 0.4.0~git090215-0ubuntu1
* New upstream git snapshot
  - Show identities and network settings on first start
  - Multi-line paste protection
  - Settings usability improvments
  - Continued bug fixing
* Adjust quassel-data.install for new and removed icons

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qtui/mainwin.h
42
42
class InputWidget;
43
43
class MsgProcessorStatusWidget;
44
44
class NickListWidget;
45
 
class SystemTrayIcon;
 
45
class SystemTray;
46
46
 
47
47
class QMenu;
48
48
class QLabel;
68
68
    void addBufferView(ClientBufferViewConfig *config);
69
69
    BufferView *allBuffersView() const;
70
70
 
71
 
    inline QSystemTrayIcon *systemTrayIcon() const;
 
71
    inline SystemTray *systemTray() const;
72
72
 
73
73
    virtual bool event(QEvent *event);
74
74
 
134
134
    KHelpMenu *_kHelpMenu;
135
135
#endif
136
136
 
137
 
    QMenu *systrayMenu;
138
137
    QLabel *coreLagLabel;
139
138
    QLabel *sslLabel;
140
139
    MsgProcessorStatusWidget *msgProcessorStatusWidget;
158
157
    void toggleMinimizedToTray();
159
158
    void enableMenus();
160
159
 
161
 
    QSystemTrayIcon *_trayIcon;
 
160
    SystemTray *_systemTray;
162
161
 
163
162
    QList<BufferViewDock *> _bufferViews;
164
163
    BufferWidget *_bufferWidget;
173
172
    friend class QtUi;
174
173
};
175
174
 
176
 
QSystemTrayIcon *MainWin::systemTrayIcon() const {
177
 
  return _trayIcon;
 
175
SystemTray *MainWin::systemTray() const {
 
176
  return _systemTray;
178
177
}
179
178
 
180
179
#endif