diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-22 14:10:50 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-22 14:10:50 -0400 |
| commit | 6bae67c3e7c66af9e8ce1605070f7e92f247f0cb (patch) | |
| tree | 64dc7e2588cc5c17fdb6c801877792f83cfcecf3 /data/resources | |
| parent | 00efccabb1eb6c3597282bc0e095cf2026f75a3b (diff) | |
| parent | 00d98a47c60764475d97df1c2eb847e20a77cae5 (diff) | |
Merge tag '0.3.0' into debian
Tag bitmask version 0.3.0
Conflicts:
.coveragerc
.tx/config
NEWS.rst
setup.cfg
src/leap/base/checks.py
src/leap/base/exceptions.py
src/leap/base/tests/test_checks.py
src/leap/eip/checks.py
src/leap/gui/firstrun/login.py
src/leap/gui/locale_rc.py
src/leap/util/polkit.py
tests/test_qt_environment.py
tox.ini
Diffstat (limited to 'data/resources')
| -rw-r--r-- | data/resources/icons.qrc | 9 | ||||
| -rw-r--r-- | data/resources/loggerwindow.qrc | 11 | ||||
| -rw-r--r-- | data/resources/mainwindow.qrc | 33 |
3 files changed, 42 insertions, 11 deletions
diff --git a/data/resources/icons.qrc b/data/resources/icons.qrc new file mode 100644 index 00000000..6a6de9e6 --- /dev/null +++ b/data/resources/icons.qrc @@ -0,0 +1,9 @@ +<RCC> + <qresource prefix="/"> + <file>../images/light/16/down-arrow.png</file> + <file>../images/light/16/up-arrow.png</file> + <file>../images/light/64/network-eip-acquiring.png</file> + <file>../images/light/64/network-eip-down.png</file> + <file>../images/light/64/network-eip-up.png</file> + </qresource> +</RCC> diff --git a/data/resources/loggerwindow.qrc b/data/resources/loggerwindow.qrc new file mode 100644 index 00000000..847ca9a1 --- /dev/null +++ b/data/resources/loggerwindow.qrc @@ -0,0 +1,11 @@ +<RCC> + <qresource prefix="/"> + <file>../images/oxygen-icons/edit-bomb.png</file> + <file>../images/oxygen-icons/document-save-as.png</file> + <file>../images/oxygen-icons/dialog-information.png</file> + <file>../images/oxygen-icons/script-error.png</file> + <file>../images/oxygen-icons/dialog-error.png</file> + <file>../images/oxygen-icons/dialog-information.png</file> + <file>../images/oxygen-icons/dialog-warning.png</file> + </qresource> +</RCC> diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc index 293988e1..d1268186 100644 --- a/data/resources/mainwindow.qrc +++ b/data/resources/mainwindow.qrc @@ -1,12 +1,23 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource prefix="/"> - <file>../images/conn_error.png</file> - <file>../images/conn_connecting.png</file> - <file>../images/conn_connected.png</file> - <file>../images/leap-color-small.png</file> - <file>../images/watermark.png</file> - <file>../images/Dialog-accept.png</file> - <file>../images/Dialog-error.png</file> - <file>../images/Emblem-question.png</file> -</qresource> +<RCC> + <qresource prefix="/"> + <file>../images/mask-launcher.png</file> + <file>../images/mask-icon.png</file> + <file>../images/watermark.png</file> + <file>../images/leap-gray-big.png</file> + <file>../images/Blue-Arrow-Right-32.png</file> + <file>../images/Globe.png</file> + <file>../images/leap-color-big.png</file> + <file>../images/Arrow-Down-32.png</file> + <file>../images/Arrow-Up-32.png</file> + <file>../images/conn_connecting.png</file> + <file>../images/conn_connected.png</file> + <file>../images/conn_error.png</file> + <file>../images/conn_connecting-light.png</file> + <file>../images/conn_connected-light.png</file> + <file>../images/conn_error-light.png</file> + <file>../images/leap-color-small.png</file> + <file>../images/Dialog-accept.png</file> + <file>../images/Dialog-error.png</file> + <file>../images/Emblem-question.png</file> + </qresource> </RCC> |