projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update norwegian translation, thanks to Terje "tan" Andersen
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
258116d
..
2a53f75
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-21,24
+21,23
@@
#ifndef MAINWIN_H_
#define MAINWIN_H_
#ifndef MAINWIN_H_
#define MAINWIN_H_
-#include "ui_mainwin.h"
+#include <QMainWindow>
+#include <QSystemTrayIcon>
#include "qtui.h"
#include "qtui.h"
-#include "titlesetter.h"
#include "sessionsettings.h"
#include "sessionsettings.h"
-
-#include <QPixmap>
-#include <QSystemTrayIcon>
-#include <QTimer>
+#include "titlesetter.h"
class ActionCollection;
class ActionCollection;
-class Buffer;
class BufferViewConfig;
class BufferViewConfig;
+class BufferWidget;
class MsgProcessorStatusWidget;
class MsgProcessorStatusWidget;
-class Message;
class NickListWidget;
class SystemTrayIcon;
class NickListWidget;
class SystemTrayIcon;
+class QMenu;
+class QLabel;
+
//!\brief The main window of Quassel's QtUi.
class MainWin : public QMainWindow {
Q_OBJECT
//!\brief The main window of Quassel's QtUi.
class MainWin : public QMainWindow {
Q_OBJECT
@@
-57,6
+56,7
@@
class MainWin : public QMainWindow {
public slots:
void saveStateToSession(const QString &sessionId);
void saveStateToSessionSettings(SessionSettings &s);
public slots:
void saveStateToSession(const QString &sessionId);
void saveStateToSessionSettings(SessionSettings &s);
+ void showStatusBarMessage(const QString &message);
protected:
void closeEvent(QCloseEvent *event);
protected:
void closeEvent(QCloseEvent *event);
@@
-83,7
+83,9
@@
class MainWin : public QMainWindow {
void on_actionEditNetworks_triggered();
void on_actionManageViews_triggered();
void on_actionLockDockPositions_toggled(bool lock);
void on_actionEditNetworks_triggered();
void on_actionManageViews_triggered();
void on_actionLockDockPositions_toggled(bool lock);
- void on_actionDebugNetworkModel_triggered(bool);
+ void on_actionDebugNetworkModel_triggered();
+ void on_actionDebugMessageModel_triggered();
+ void on_actionDebugLog_triggered();
void clientNetworkCreated(NetworkId);
void clientNetworkRemoved(NetworkId);
void clientNetworkCreated(NetworkId);
void clientNetworkRemoved(NetworkId);
@@
-100,7
+102,6
@@
class MainWin : public QMainWindow {
void disconnectFromCore();
private:
void disconnectFromCore();
private:
- Ui::MainWin ui;
QMenu *systrayMenu;
QLabel *coreLagLabel;
QMenu *systrayMenu;
QLabel *coreLagLabel;
@@
-110,6
+111,7
@@
class MainWin : public QMainWindow {
TitleSetter _titleSetter;
void setupActions();
TitleSetter _titleSetter;
void setupActions();
+ void setupBufferWidget();
void setupMenus();
void setupViews();
void setupNickWidget();
void setupMenus();
void setupViews();
void setupNickWidget();
@@
-118,22
+120,19
@@
class MainWin : public QMainWindow {
void setupTopicWidget();
void setupStatusBar();
void setupSystray();
void setupTopicWidget();
void setupStatusBar();
void setupSystray();
+ void setupTitleSetter();
+ void updateIcon();
void toggleVisibility();
void enableMenus();
QSystemTrayIcon *_trayIcon;
void toggleVisibility();
void enableMenus();
QSystemTrayIcon *_trayIcon;
- QPixmap activeTrayIcon;
- QPixmap onlineTrayIcon;
- QPixmap offlineTrayIcon;
-
- BufferId currentBuffer;
- QString currentProfile;
QList<QDockWidget *> _netViews;
QList<QDockWidget *> _netViews;
- NickListWidget *nickListWidget;
+ BufferWidget *_bufferWidget;
+ NickListWidget *_nickListWidget;
-
ActionCollection *_actionCollection
;
+
QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu
;
friend class QtUi;
};
friend class QtUi;
};