Permalink
Browse files

Added famfamfam icons, changed licence file, changed the UI a bit

  • Loading branch information...
1 parent aefe9fe commit f0430e4ffe11322e8d7938ffe3c9a3f90910c867 @dekomote committed Mar 20, 2012
View
@@ -13,4 +13,9 @@ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------------
+Uses famfamfam silk icons from http://www.famfamfam.com/
+
+ License - http://creativecommons.org/licenses/by/2.5/
View
@@ -23,3 +23,6 @@ launcher.files = ../data/QWSnapshot.desktop
icon.path = /usr/share/pixmaps
icon.files = ../data/QWSnapshot.png
INSTALLS += target launcher icon
+
+RESOURCES += \
+ res.qrc
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -0,0 +1,6 @@
+<RCC>
+ <qresource prefix="/icons">
+ <file>stop.png</file>
+ <file>accept.png</file>
+ </qresource>
+</RCC>
View
@@ -48,7 +48,7 @@
<property name="geometry">
<rect>
<x>260</x>
- <y>10</y>
+ <y>0</y>
<width>31</width>
<height>31</height>
</rect>
@@ -57,16 +57,15 @@
<string/>
</property>
<property name="icon">
- <iconset theme="forward">
- <normaloff/>
- </iconset>
+ <iconset resource="res.qrc">
+ <normaloff>:/icons/accept.png</normaloff>:/icons/accept.png</iconset>
</property>
</widget>
<widget class="QLineEdit" name="urlEdit">
<property name="geometry">
<rect>
<x>10</x>
- <y>10</y>
+ <y>0</y>
<width>251</width>
<height>31</height>
</rect>
@@ -91,7 +90,7 @@
<property name="geometry">
<rect>
<x>260</x>
- <y>10</y>
+ <y>0</y>
<width>31</width>
<height>31</height>
</rect>
@@ -100,18 +99,17 @@
<string/>
</property>
<property name="icon">
- <iconset theme="stop">
- <normaloff/>
- </iconset>
+ <iconset resource="res.qrc">
+ <normaloff>:/icons/stop.png</normaloff>:/icons/stop.png</iconset>
</property>
</widget>
<widget class="QProgressBar" name="progressBar">
<property name="geometry">
<rect>
<x>10</x>
- <y>-10</y>
+ <y>30</y>
<width>281</width>
- <height>20</height>
+ <height>16</height>
</rect>
</property>
<property name="styleSheet">
@@ -268,9 +266,8 @@ background-color:transparent;
<string/>
</property>
<property name="icon">
- <iconset theme="media-floppy">
- <normaloff/>
- </iconset>
+ <iconset resource="res.qrc">
+ <normaloff>:/icons/script_save.png</normaloff>:/icons/script_save.png</iconset>
</property>
</widget>
<widget class="QPushButton" name="loadSettings">
@@ -292,9 +289,8 @@ background-color:transparent;
<string/>
</property>
<property name="icon">
- <iconset theme="down">
- <normaloff/>
- </iconset>
+ <iconset resource="res.qrc">
+ <normaloff>:/icons/cog.png</normaloff>:/icons/cog.png</iconset>
</property>
</widget>
</widget>
@@ -356,7 +352,9 @@ background-color:transparent;
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+ <include location="res.qrc"/>
+ </resources>
<connections>
<connection>
<sender>actionExit</sender>
View
@@ -0,0 +1,8 @@
+<RCC>
+ <qresource prefix="/icons">
+ <file>accept.png</file>
+ <file>cog.png</file>
+ <file>stop.png</file>
+ <file>script_save.png</file>
+ </qresource>
+</RCC>
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f0430e4

Please sign in to comment.