diff options
| author | kali <kali@leap.se> | 2014-08-13 14:16:09 -0500 |
|---|---|---|
| committer | kali <kali@leap.se> | 2014-08-13 14:16:09 -0500 |
| commit | 481b5e51b88bd5e0c2d856fbc0593d81634442da (patch) | |
| tree | 7c8e1bdc72916535ab5fd14697d8dc05e696b4bc /src/leap/bitmask/gui/ui/eip_status.ui | |
| parent | ab28bd5056e5d3e1c5a6b14307e67cea618e3359 (diff) | |
| parent | 8eff8582f39c5f3872f75ebd2c530a17d366310d (diff) | |
Merge branch 'develop' into deb-0.6.1-rc
Diffstat (limited to 'src/leap/bitmask/gui/ui/eip_status.ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/eip_status.ui | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui index e0996620..0fb861bc 100644 --- a/src/leap/bitmask/gui/ui/eip_status.ui +++ b/src/leap/bitmask/gui/ui/eip_status.ui @@ -60,7 +60,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/earth.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/32/earth.png</pixmap> </property> </widget> </item> @@ -103,15 +103,15 @@ <widget class="QLabel" name="lblVPNStatusIcon"> <property name="maximumSize"> <size> - <width>24</width> - <height>24</height> + <width>22</width> + <height>22</height> </size> </property> <property name="text"> <string/> </property> <property name="pixmap"> - <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/black/32/off.png</pixmap> + <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/off.png</pixmap> </property> <property name="scaledContents"> <bool>true</bool> @@ -162,7 +162,7 @@ <string>0.0 KB/s</string> </property> <property name="icon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/black/32/arrow-down.png</normaloff>:/images/black/32/arrow-down.png</iconset> </property> <property name="flat"> @@ -213,7 +213,7 @@ <string>0.0 KB/s</string> </property> <property name="icon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/black/32/arrow-up.png</normaloff>:/images/black/32/arrow-up.png</iconset> </property> <property name="flat"> @@ -265,8 +265,8 @@ </layout> </widget> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> <include location="../../../../../data/resources/icons.qrc"/> + <include location="../../../../../data/resources/flags.qrc"/> </resources> <connections/> </ui> |