changeset 28c176fea66e in tryton:default
details: https://hg.tryton.org/tryton?cmd=changeset;node=28c176fea66e
description:
Replace Arrow by Image
issue8139
review58561002
diffstat:
CHANGELOG | 1 +
tryton/data/pixmaps/tryton/tryton-arrow-down.svg | 7 ++++
tryton/data/pixmaps/tryton/tryton-arrow-left.svg | 7 ++++
tryton/data/pixmaps/tryton/tryton-arrow-right.svg | 7 ++++
tryton/data/pixmaps/tryton/tryton-arrow-up.svg | 4 ++
tryton/gui/window/view_form/view/calendar_gtk/toolbar.py | 13 ++----
tryton/gui/window/view_form/view/list.py | 28 +++++++++------
7 files changed, 47 insertions(+), 20 deletions(-)
diffs (167 lines):
diff -r 2cf50567693d -r 28c176fea66e CHANGELOG
--- a/CHANGELOG Fri Mar 22 11:40:32 2019 +0100
+++ b/CHANGELOG Fri Mar 22 11:56:04 2019 +0100
@@ -1,3 +1,4 @@
+* Replace Arrow by Image
* Remove Fast Tabbing option
* Remove usage of focus_chain
* Add shortcuts for switch and remove on One2Many
diff -r 2cf50567693d -r 28c176fea66e
tryton/data/pixmaps/tryton/tryton-arrow-down.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tryton/data/pixmaps/tryton/tryton-arrow-down.svg Fri Mar 22 11:56:04
2019 +0100
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
+ width="24px" height="24px" viewBox="0 0 24 24" enable-background="new
0 0 24 24" xml:space="preserve">
+<path d="M7.41,8.59L12,13.17l4.59-4.58L18,10l-6,6l-6-6L7.41,8.59z"/>
+<path fill="none" d="M0,0h24v24H0V0z"/>
+</svg>
diff -r 2cf50567693d -r 28c176fea66e
tryton/data/pixmaps/tryton/tryton-arrow-left.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tryton/data/pixmaps/tryton/tryton-arrow-left.svg Fri Mar 22 11:56:04
2019 +0100
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
+ width="24px" height="24px" viewBox="0 0 24 24" enable-background="new
0 0 24 24" xml:space="preserve">
+<path d="M15.41,16.59L10.83,12l4.58-4.59L14,6l-6,6l6,6L15.41,16.59z"/>
+<path fill="none" d="M0,0h24v24H0V0z"/>
+</svg>
diff -r 2cf50567693d -r 28c176fea66e
tryton/data/pixmaps/tryton/tryton-arrow-right.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tryton/data/pixmaps/tryton/tryton-arrow-right.svg Fri Mar 22 11:56:04
2019 +0100
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
+ width="24px" height="24px" viewBox="0 0 24 24" enable-background="new
0 0 24 24" xml:space="preserve">
+<path d="M8.59,16.59L13.17,12L8.59,7.41L10,6l6,6l-6,6L8.59,16.59z"/>
+<path fill="none" d="M0,0h24v24H0V0z"/>
+</svg>
diff -r 2cf50567693d -r 28c176fea66e
tryton/data/pixmaps/tryton/tryton-arrow-up.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tryton/data/pixmaps/tryton/tryton-arrow-up.svg Fri Mar 22 11:56:04
2019 +0100
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+ <path d="M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6-6 6z"/>
+ <path d="M0 0h24v24H0z" fill="none"/>
+</svg>
diff -r 2cf50567693d -r 28c176fea66e
tryton/gui/window/view_form/view/calendar_gtk/toolbar.py
--- a/tryton/gui/window/view_form/view/calendar_gtk/toolbar.py Fri Mar 22
11:40:32 2019 +0100
+++ b/tryton/gui/window/view_form/view/calendar_gtk/toolbar.py Fri Mar 22
11:56:04 2019 +0100
@@ -7,6 +7,7 @@
from gi.repository import Gdk, Gtk
from tryton.gui import Main
+from tryton.common import IconFactory
from tryton.common.datetime_ import popup_position, popup_show, popup_hide
_ = gettext.gettext
@@ -28,8 +29,7 @@
Gdk.ModifierType.MODIFIER_MASK, Gtk.AccelFlags.VISIBLE)
self.insert(today_button, -1)
- arrow_left = Gtk.Arrow(
- arrow_type=Gtk.ArrowType.LEFT, shadow_type=Gtk.ShadowType.NONE)
+ arrow_left = IconFactory.get_image('tryton-arrow-left')
go_back = Gtk.ToolButton()
go_back.set_icon_widget(arrow_left)
go_back.set_label(_("go back"))
@@ -71,8 +71,7 @@
self.goocalendar.connect('day-selected',
self.on_goocalendar_day_selected)
- arrow_right = Gtk.Arrow(
- arrow_type=Gtk.ArrowType.RIGHT, shadow_type=Gtk.ShadowType.NONE)
+ arrow_right = IconFactory.get_image('tryton-arrow-right')
go_forward = Gtk.ToolButton()
go_forward.set_icon_widget(arrow_right)
go_forward.set_label(_("go forward"))
@@ -81,8 +80,7 @@
go_forward.connect("clicked", self.on_go_forward_clicked)
self.insert(go_forward, -1)
- arrow_left = Gtk.Arrow(
- arrow_type=Gtk.ArrowType.LEFT, shadow_type=Gtk.ShadowType.NONE)
+ arrow_left = IconFactory.get_image('tryton-arrow-left')
previous_year = Gtk.ToolButton()
previous_year.set_icon_widget(arrow_left)
previous_year.set_label(_("previous year"))
@@ -96,8 +94,7 @@
current_year.add(self.current_year_label)
self.insert(current_year, -1)
- arrow_right = Gtk.Arrow(
- arrow_type=Gtk.ArrowType.RIGHT, shadow_type=Gtk.ShadowType.NONE)
+ arrow_right = IconFactory.get_image('tryton-arrow-right')
next_year = Gtk.ToolButton()
next_year.set_icon_widget(arrow_right)
next_year.set_label(_("next year"))
diff -r 2cf50567693d -r 28c176fea66e tryton/gui/window/view_form/view/list.py
--- a/tryton/gui/window/view_form/view/list.py Fri Mar 22 11:40:32 2019 +0100
+++ b/tryton/gui/window/view_form/view/list.py Fri Mar 22 11:56:04 2019 +0100
@@ -374,8 +374,7 @@
tooltips.set_tip(label, help)
tooltips.enable()
if arrow:
- arrow_widget = Gtk.Arrow(
- arrow_type=Gtk.ArrowType.NONE, shadow_type=Gtk.ShadowType.NONE)
+ arrow_widget = Gtk.Image()
arrow_widget.show()
column.arrow = arrow_widget
hbox.pack_start(label, expand=True, fill=True, padding=0)
@@ -502,19 +501,21 @@
return self.widgets[column.name][idx]
def sort_model(self, column):
+ up = common.IconFactory.get_pixbuf('tryton-arrow-up')
+ down = common.IconFactory.get_pixbuf('tryton-arrow-down')
for col in self.treeview.get_columns():
if col != column and getattr(col, 'arrow', None):
- col.arrow.set(Gtk.ArrowType.NONE, Gtk.ShadowType.NONE)
+ col.arrow.clear()
self.screen.order = self.screen.default_order
- if column.arrow.props.arrow_type == Gtk.ArrowType.NONE:
- column.arrow.set(Gtk.ArrowType.DOWN, Gtk.ShadowType.IN)
+ if not column.arrow.props.pixbuf:
+ column.arrow.set_from_pixbuf(down)
self.screen.order = [(column.name, 'ASC')]
else:
- if column.arrow.props.arrow_type == Gtk.ArrowType.DOWN:
- column.arrow.set(Gtk.ArrowType.UP, Gtk.ShadowType.IN)
+ if column.arrow.props.pixbuf == down:
+ column.arrow.set_from_pixbuf(up)
self.screen.order = [(column.name, 'DESC')]
else:
- column.arrow.set(Gtk.ArrowType.NONE, Gtk.ShadowType.NONE)
+ column.arrow.clear()
model = self.treeview.get_model()
unsaved_records = [x for x in model.group if x.id < 0]
search_string = self.screen.screen_container.get_text() or ''
@@ -532,8 +533,8 @@
if order and len(order) == 1:
(name, direction), = order
direction = {
- 'ASC': Gtk.ArrowType.DOWN,
- 'DESC': Gtk.ArrowType.UP,
+ 'ASC': common.IconFactory.get_pixbuf('tryton-arrow-down'),
+ 'DESC': common.IconFactory.get_pixbuf('tryton-arrow-up'),
}[direction]
else:
name, direction = None, None
@@ -542,9 +543,12 @@
arrow = getattr(col, 'arrow', None)
if arrow:
if col.name != name:
- arrow.set(Gtk.ArrowType.NONE, Gtk.ShadowType.NONE)
+ arrow.clear()
else:
- arrow.set(direction, Gtk.ShadowType.IN)
+ if direction:
+ arrow.set_from_pixbuf(direction)
+ else:
+ arrow.clear()
def set_drag_and_drop(self):
dnd = False
