diff options
| author | Björn Hagemeister | 2014-05-22 15:28:53 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-22 15:28:53 +0200 |
| commit | 2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b (patch) | |
| tree | bd02cb4e67fef2edcc64ec698ba4be1f8e4a0881 /pvsclient.qrc | |
| parent | Changed the blinking red dot in toolbar while beeing vnc server to blinking eye. (diff) | |
| parent | Stop suggesting the user to be recorded: (diff) | |
| download | pvs2-2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b.tar.gz pvs2-2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b.tar.xz pvs2-2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b.zip | |
Merge branch 'master' of git.openslx.org:pvs2
(Eye icon for VNC streaming)
Conflicts:
pvsclient.qrc
src/client/toolbar/toolbar.cpp
Diffstat (limited to 'pvsclient.qrc')
| -rw-r--r-- | pvsclient.qrc | 88 |
1 files changed, 42 insertions, 46 deletions
diff --git a/pvsclient.qrc b/pvsclient.qrc index 3f3a607..226c898 100644 --- a/pvsclient.qrc +++ b/pvsclient.qrc @@ -1,49 +1,45 @@ <RCC> - <qresource prefix="/"> - <file - alias="dark-green-check-mark.svg">icons/dark-green-check-mark.svg</file> - <file alias="darrow16.svg">icons/darrow16.svg</file> - <file alias="ok16.svg">icons/ok16.svg</file> - - <file alias="cam32.svg">icons/cam32.svg</file> + <qresource prefix="/"> + <file alias="dark-green-check-mark.svg">icons/dark-green-check-mark.svg</file> + <file alias="darrow16.svg">icons/darrow16.svg</file> + <file alias="ok16.svg">icons/ok16.svg</file> + <file alias="cam32.svg">icons/cam32.svg</file> <file alias="eye">icons/eye.svg</file> - <file alias="cam_on32.svg">icons/cam_on32.svg</file> - <file alias="cam_off32.svg">icons/cam_off32.svg</file> - <file alias="chat_msg16.svg">icons/chat_msg16.svg</file> - <file alias="reset">icons/keyboard_key.svg</file> - <file alias="space">icons/space.svg</file> - <file alias="help">icons/help.svg</file> - <file alias="AUTHORS">AUTHORS</file> - <file alias="TRANSLATION">TRANSLATION</file> - </qresource> - <qresource prefix="/" lang="de_DE"> - <file alias="pvsclient.qm">build/pvsclient_de_DE.qm</file> - </qresource> - <qresource prefix="/" lang="de"> - <file alias="pvsclient.qm">build/pvsclient_de_DE.qm</file> - </qresource> - <qresource prefix="/" lang="fr_FR"> - <file alias="pvsclient.qm">build/pvsclient_fr_FR.qm</file> - </qresource> - <qresource prefix="/" lang="fr"> - <file alias="pvsclient.qm">build/pvsclient_fr_FR.qm</file> - </qresource> - <qresource prefix="/" lang="es_MX"> - <file alias="pvsclient.qm">build/pvsclient_es_MX.qm</file> - </qresource> - <qresource prefix="/" lang="es"> - <file alias="pvsclient.qm">build/pvsclient_es_MX.qm</file> - </qresource> - <qresource prefix="/" lang="ar_JO"> - <file alias="pvsclient.qm">build/pvsclient_ar_JO.qm</file> - </qresource> - <qresource prefix="/" lang="ar"> - <file alias="pvsclient.qm">build/pvsclient_ar_JO.qm</file> - </qresource> - <qresource prefix="/" lang="pl_PL"> - <file alias="pvsclient.qm">build/pvsclient_pl_PL.qm</file> - </qresource> - <qresource prefix="/" lang="pl"> - <file alias="pvsclient.qm">build/pvsclient_pl_PL.qm</file> - </qresource> + <file alias="chat_msg16.svg">icons/chat_msg16.svg</file> + <file alias="reset">icons/keyboard_key.svg</file> + <file alias="space">icons/space.svg</file> + <file alias="help">icons/help.svg</file> + <file alias="AUTHORS">AUTHORS</file> + <file alias="TRANSLATION">TRANSLATION</file> + </qresource> + <qresource lang="de_DE" prefix="/"> + <file alias="pvsclient.qm">build/pvsclient_de_DE.qm</file> + </qresource> + <qresource lang="de" prefix="/"> + <file alias="pvsclient.qm">build/pvsclient_de_DE.qm</file> + </qresource> + <qresource lang="fr_FR" prefix="/"> + <file alias="pvsclient.qm">build/pvsclient_fr_FR.qm</file> + </qresource> + <qresource lang="fr" prefix="/"> + <file alias="pvsclient.qm">build/pvsclient_fr_FR.qm</file> + </qresource> + <qresource lang="es_MX" prefix="/"> + <file alias="pvsclient.qm">build/pvsclient_es_MX.qm</file> + </qresource> + <qresource lang="es" prefix="/"> + <file alias="pvsclient.qm">build/pvsclient_es_MX.qm</file> + </qresource> + <qresource lang="ar_JO" prefix="/"> + <file alias="pvsclient.qm">build/pvsclient_ar_JO.qm</file> + </qresource> + <qresource lang="ar" prefix="/"> + <file alias="pvsclient.qm">build/pvsclient_ar_JO.qm</file> + </qresource> + <qresource lang="pl_PL" prefix="/"> + <file alias="pvsclient.qm">build/pvsclient_pl_PL.qm</file> + </qresource> + <qresource lang="pl" prefix="/"> + <file alias="pvsclient.qm">build/pvsclient_pl_PL.qm</file> + </qresource> </RCC> |