Skip to content

Commit

Permalink
New icons! ESS-1128, ESS-1129
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniele Paganelli committed Aug 23, 2016
1 parent c1137e0 commit c6e2d98
Show file tree
Hide file tree
Showing 20 changed files with 543 additions and 400 deletions.
11 changes: 8 additions & 3 deletions misura/client/acquisition/menubar.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
import os
import functools

from misura.canon.logger import Log as logging
from .. import network, conf, _
from ..clientconf import confdb
Expand All @@ -10,7 +13,7 @@
from . import windows

from PyQt4 import QtGui, QtCore
import functools



class MenuBar(QtGui.QMenuBar):
Expand Down Expand Up @@ -142,15 +145,17 @@ def setServer(self, server=False):
logging.debug('missing handler', name)
continue
f = functools.partial(self.parent().setInstrument, obj, preset=name)
act = self.instruments.addAction('%s' % (title,), f)
icon = QtGui.QIcon(os.path.join(params.pathArt, 'small_' + title + '.svg'))
act = self.instruments.addAction(icon, title.capitalize(), f)
self.func.append(f)
self.lstInstruments.append((act, title))

presets = filter(lambda preset: preset not in ['default', 'factory_default'], obj.listPresets())
for preset in presets:
f = functools.partial(self.parent().setInstrument, preset=preset, remote=obj)
title = ' '.join(preset.split('_'))
act = self.instruments.addAction('%s' % (title,), f)
icon = QtGui.QIcon(os.path.join(params.pathArt, 'small_' + title + '.svg'))
act = self.instruments.addAction(icon, title.capitalize(), f)
self.func.append(f)
self.lstInstruments.append((act, title))

Expand Down
2 changes: 1 addition & 1 deletion misura/client/acquisition/selector.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def redraw(self):

button = add_button(self,
current_instrument_layout,
os.path.join(params.pathArt, title + '.png'),
os.path.join(params.pathArt, title + '.svg'),
title,
200,
0,
Expand Down
30 changes: 30 additions & 0 deletions misura/client/art/browser.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions misura/client/art/dta.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 115 additions & 0 deletions misura/client/art/flex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions misura/client/art/flex_relative.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions misura/client/art/graphics.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions misura/client/art/horizontal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions misura/client/art/hsm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c6e2d98

Please sign in to comment.