From e569043d646c2af1bc5664936393fd7c0abad0bb Mon Sep 17 00:00:00 2001 From: "Romain F. T" Date: Tue, 30 Jul 2019 20:40:36 +0200 Subject: [PATCH] Version 0.4.2 --- ...om.github.maoschanz.drawing.appdata.xml.in | 14 +++- debian/changelog | 2 +- meson.build | 2 +- src/minimap.py | 14 ---- src/preferences.py | 43 ----------- src/ui/minimap.ui | 76 ------------------- src/ui/window.ui | 1 - src/window.py | 17 ----- 8 files changed, 14 insertions(+), 155 deletions(-) diff --git a/data/com.github.maoschanz.drawing.appdata.xml.in b/data/com.github.maoschanz.drawing.appdata.xml.in index f632cf4b..4f14bbe2 100644 --- a/data/com.github.maoschanz.drawing.appdata.xml.in +++ b/data/com.github.maoschanz.drawing.appdata.xml.in @@ -10,6 +10,7 @@ UserDocs + Drawing A drawing application for the GNOME desktop @@ -25,7 +26,16 @@

+ + + +

Version 0.4 introduces a new icon, numerous bug fixes, an improved + toolbar for the "legacy" and "toolbar only" layouts, an action for creating + an image from the clipboard content, a smoother pencil, and various new + translations.

+ +

Version 0.4 introduces a new icon, numerous bug fixes, an improved @@ -55,10 +65,10 @@ https://raw.githubusercontent.com/maoschanz/drawing/master/docs/screenshots/gnome_selection.png - https://raw.githubusercontent.com/maoschanz/drawing/master/docs/screenshots/gnome_new.png + https://raw.githubusercontent.com/maoschanz/drawing/master/docs/screenshots/gnome_tools_preview.png - https://raw.githubusercontent.com/maoschanz/drawing/master/docs/screenshots/gnome_tools_preview.png + https://raw.githubusercontent.com/maoschanz/drawing/master/docs/screenshots/gnome_new.png diff --git a/debian/changelog b/debian/changelog index 4dd8ae31..bce452b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -drawing (0.4.1) unstable; urgency=low +drawing (0.4.2) unstable; urgency=low * New icon * Numerous bug fixes diff --git a/meson.build b/meson.build index 3044fa3a..66268b0e 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'drawing', - version: '0.4.1', + version: '0.4.2', meson_version: '>= 0.50.0', ) diff --git a/src/minimap.py b/src/minimap.py index e79094dc..7a903b2d 100644 --- a/src/minimap.py +++ b/src/minimap.py @@ -34,11 +34,6 @@ def __init__(self, window, minimap_btn, **kwargs): builder = Gtk.Builder.new_from_resource('/com/github/maoschanz/drawing/ui/minimap.ui') box = builder.get_object('minimap_box') - if self.window._settings.get_boolean('devel-only'): # XXX à retirer - box.show_all() - - self.zoom_scale = builder.get_object('zoom_scale') - self.zoom_scale.connect('value-changed', self.update_zoom_level) self.minimap_area = builder.get_object('minimap_area') self.minimap_area.set_size(200, 200) @@ -52,15 +47,6 @@ def __init__(self, window, minimap_btn, **kwargs): self.set_relative_to(self.minimap_btn) self.connect('closed', self.on_popover_dismissed) - def update_zoom_level(self, *args): - self.window.get_active_image().zoom_level = self.zoom_scale.get_value()/100 - self.window.get_active_image().update() - zoom_label = str(int(self.zoom_scale.get_value())) + '%' - self.window.minimap_label.set_label(zoom_label) - - def update_zoom_scale(self, value): - self.zoom_scale.set_value(value * 100) - def on_popover_dismissed(self, *args): """Callback of the 'closed' signal, updating the state of the action.""" self.minimap_btn.set_active(False) diff --git a/src/preferences.py b/src/preferences.py index 1b6e75b7..9825842a 100644 --- a/src/preferences.py +++ b/src/preferences.py @@ -78,31 +78,9 @@ def __init__(self, is_beta, wants_csd, **kwargs): w = self.row_from_bool(_("Always add transparency"), 'add-alpha') self.page_images.add(w) - # w = self.row_from_label(_("Zoom"), True) - # self.page_images.add(w) - - # scroll_combobox = Gtk.ComboBoxText() - # scroll_combobox.append('ctrl', _("Ctrl + Scroll")) - # scroll_combobox.append('scroll', _("Scroll")) - # scroll_combobox.set_active_id(self._settings.get_string('zoom-behavior')) - # scroll_combobox.connect('changed', self.on_combo_changed, 'zoom-behavior') - # w = self.row_from_widget(_("Action to zoom"), scroll_combobox) - # self.page_images.add(w) - - # zoom_combobox = Gtk.ComboBoxText() - # zoom_combobox.append('100', _("100%")) - # zoom_combobox.append('opti', _("Optimal zoom")) - # zoom_combobox.set_active_id(self._settings.get_string('default-zoom')) - # zoom_combobox.connect('changed', self.on_combo_changed, 'default-zoom') - # w = self.row_from_widget(_("Default zoom"), zoom_combobox) - # self.page_images.add(w) - ######################################################################## # Build the "tools" page ############################################### - # w = self.row_from_label(_("Appearance"), False) - # self.page_tools.add(w) - pass w = self.row_from_bool(_("Show tools names"), 'show-labels') self.page_tools.add(w) @@ -110,27 +88,6 @@ def __init__(self, is_beta, wants_csd, **kwargs): w = self.row_from_bool(_("Use big icons"), 'big-icons') self.page_tools.add(w) - # w = self.row_from_label(_("Bonus tools"), True) - # self.page_tools.add(w) - - # w = self.row_for_AoS(_("Select by Color"), 'colorselect', 'disabled-tools') - # self.page_tools.add(w) - - # w = self.row_for_AoS(_("Color Picker"), 'picker', 'disabled-tools') - # self.page_tools.add(w) - - # w = self.row_for_AoS(_("Paint"), 'paint', 'disabled-tools') - # self.page_tools.add(w) - - # w = self.row_for_AoS(_("Polygon"), 'polygon', 'disabled-tools') - # self.page_tools.add(w) - - # w = self.row_for_AoS(_("Flip"), 'flip', 'disabled-tools') - # self.page_tools.add(w) - - # w = self.row_for_AoS(_("Saturate"), 'saturate', 'disabled-tools') - # self.page_tools.add(w) - ######################################################################## # Build the "advanced" page ############################################ diff --git a/src/ui/minimap.ui b/src/ui/minimap.ui index a16c644a..caf886aa 100644 --- a/src/ui/minimap.ui +++ b/src/ui/minimap.ui @@ -122,81 +122,5 @@ - - - - True - True - - - True - win.zoom_opti - Optimal Zoom - none - - - zoom-fit-best-symbolic - True - - - - - start - - - - - True - win.zoom_in - Zoom In - none - - - zoom-in-symbolic - True - - - - - end - - - - - True - win.zoom_100 - 100% - none - - - end - - - - - True - win.zoom_out - Zoom Out - none - - - zoom-out-symbolic - True - - - - - end - - - - - - - - 0 - zoom_adj - - diff --git a/src/ui/window.ui b/src/ui/window.ui index 6baa2057..8a1c1278 100644 --- a/src/ui/window.ui +++ b/src/ui/window.ui @@ -9,7 +9,6 @@