diff options
| author | Sebastien Braun | 2010-10-06 00:04:49 +0200 |
|---|---|---|
| committer | Sebastien Braun | 2010-10-06 00:04:49 +0200 |
| commit | f07fc3b426815e28fde23313242fbbb998a08d45 (patch) | |
| tree | ba9eda1a83135a1727d2d35661d6facabee53b95 /src/pvsgui.h | |
| parent | Fix recognition of letters in keyboard handler (diff) | |
| parent | Merge remote branch 'openslx/master' into mcastft (diff) | |
| download | pvs-f07fc3b426815e28fde23313242fbbb998a08d45.tar.gz pvs-f07fc3b426815e28fde23313242fbbb998a08d45.tar.xz pvs-f07fc3b426815e28fde23313242fbbb998a08d45.zip | |
Merge remote branch 'openslx/mcastft' into input
Conflicts:
CMakeLists.txt
i18n/pvs_ar_JO.ts
i18n/pvs_de_DE.ts
i18n/pvs_es_MX.ts
i18n/pvs_fr_FR.ts
i18n/pvs_pl_PL.ts
i18n/pvsmgr_ar_JO.ts
i18n/pvsmgr_de_DE.ts
i18n/pvsmgr_es_MX.ts
i18n/pvsmgr_fr_FR.ts
i18n/pvsmgr_pl_PL.ts
icons/README
pvsmgr.qrc
src/gui/mainWindow.cpp
src/pvs.cpp
src/pvs.h
src/pvsDaemon.cpp
src/util/clientGUIUtils.h
Diffstat (limited to 'src/pvsgui.h')
| -rw-r--r-- | src/pvsgui.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/pvsgui.h b/src/pvsgui.h index f9a0ab8..b96d73c 100644 --- a/src/pvsgui.h +++ b/src/pvsgui.h @@ -16,6 +16,7 @@ #include <QtGui> #include <QtNetwork> +#include "3rdparty/qtsingleapplication/qtsingleapplication.h" #include "ui_clientToolbar.h" #include "src/gui/clientConfigDialog.h" #include "src/gui/clientChatDialog.h" @@ -30,7 +31,6 @@ class PVSGUI: public QWidget, private Ui_ClientToolbarClass { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.openslx.pvsgui") public: PVSGUI(QWidget *parent = 0); @@ -45,6 +45,9 @@ public: public Q_SLOTS: void updateConfig(); + void setVisible(bool visible); + void setPosition(int position); + void hide(); protected: void enterEvent(QEvent *e); @@ -55,20 +58,18 @@ protected: private Q_SLOTS: void showMessage(QString title, QString msg, bool useDialog = false); - void hide(); void connected(QString host); void disconnected(); void addHost(QString host); void delHost(QString host); void pvsConnect(QAction *action); void pvsDisconnect(); - void setVncAllow(int i); void sendFile(); void receiveFile(); + void incomingMulticastFile(qulonglong, QString sender, QString basename, qulonglong size); private: void setupMenu(); - void setLocation(int location); void hide(bool b); QMenu *_menu; @@ -82,6 +83,7 @@ private: ClientVNCViewer *_vncViewer; AboutDialog *_aboutDialog; + QAction *_showAction; QAction *_disconnectAction; QAction *_startChatAction; QAction *_sendFileAction; @@ -90,7 +92,7 @@ private: QAction *_aboutAction; QAction *_quitAction; - int _location; + int _position; QPoint _clickPoint; QString _passwd; |