Skip to content

Commit

Permalink
replaced solaar png icons with svgs
Browse files Browse the repository at this point in the history
  • Loading branch information
pwr committed Jun 25, 2013
1 parent 6b0b7ea commit bd5c038
Show file tree
Hide file tree
Showing 15 changed files with 306 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/solaar/ui/about.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def _create():
about.set_version(__version__)
about.set_comments('Shows status of devices connected\nto a Logitech Unifying Receiver.')

about.set_logo_icon_name(NAME.lower() + '-logo')
about.set_logo_icon_name(NAME.lower())

about.set_copyright(b'\xC2\xA9'.decode('utf-8') + ' 2012-2013 Daniel Pavel')
about.set_license_type(Gtk.License.GPL_2_0)
Expand Down
8 changes: 4 additions & 4 deletions lib/solaar/ui/icons.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
# print ("dnd", int(Gtk.IconSize.DND), Gtk.icon_size_lookup(Gtk.IconSize.DND))
# print ("dialog", int(Gtk.IconSize.DIALOG), Gtk.icon_size_lookup(Gtk.IconSize.DIALOG))

TRAY_INIT = 'solaar-tray-init'
TRAY_OKAY = 'solaar-tray'
TRAY_ATTENTION = 'solaar-tray-attention'
TRAY_INIT = 'solaar-init'
TRAY_OKAY = 'solaar'
TRAY_ATTENTION = 'solaar-attention'


def _look_for_application_icons():
Expand All @@ -47,7 +47,7 @@ def _look_for_application_icons():
if _log.isEnabledFor(_DEBUG):
_log.debug("looking for icons in %s", location)

if _path.exists(_path.join(location, TRAY_ATTENTION + '.png')):
if _path.exists(_path.join(location, TRAY_ATTENTION + '.svg')):
yield location

del _environ
Expand Down
2 changes: 1 addition & 1 deletion lib/solaar/ui/window.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#

Gtk.Window.set_default_icon_name(NAME.lower())
Gtk.Window.set_default_icon_from_file(_icons.icon_file(NAME.lower(), 32))
Gtk.Window.set_default_icon_from_file(_icons.icon_file(NAME.lower()))

def _new_button(label, icon_name=None, icon_size=_NORMAL_BUTTON_ICON_SIZE, tooltip=None, toggle=False, clicked=None):
if toggle:
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@
package_dir={'': 'lib'},
packages=['hidapi', 'logitech', 'logitech.unifying_receiver', 'solaar', 'solaar.ui'],

data_files=[('share/pixmaps', ['share/solaar/icons/solaar.png']),
data_files=[('share/pixmaps', ['share/solaar/icons/solaar.svg']),
('share/applications', ['share/applications/solaar.desktop']),
('share/solaar/icons', glob('share/solaar/icons/*.png')),
('share/solaar/icons', glob('share/solaar/icons/light_*.png')),
('share/solaar/icons', glob('share/solaar/icons/solaar*.svg')),
],

scripts=glob('bin/*'),
Expand Down
167 changes: 167 additions & 0 deletions share/solaar-master.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 46 additions & 0 deletions share/solaar/icons/solaar-attention.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed share/solaar/icons/solaar-fail.png
Binary file not shown.
Binary file removed share/solaar/icons/solaar-init.png
Binary file not shown.
42 changes: 42 additions & 0 deletions share/solaar/icons/solaar-init.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed share/solaar/icons/solaar-logo.png
Binary file not shown.
Binary file removed share/solaar/icons/solaar-tray-attention.png
Binary file not shown.
Binary file removed share/solaar/icons/solaar-tray-init.png
Binary file not shown.
Binary file removed share/solaar/icons/solaar-tray.png
Binary file not shown.
Binary file removed share/solaar/icons/solaar.png
Binary file not shown.
42 changes: 42 additions & 0 deletions share/solaar/icons/solaar.svg
Loading
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 bd5c038

Please sign in to comment.