Skip to content

Commit

Permalink
Version 0.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@maoschanz
maoschanz committed Jul 30, 2019
1 parent ae19d72 commit e569043
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 155 deletions.
14 changes: 12 additions & 2 deletions data/com.github.maoschanz.drawing.appdata.xml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<kudo>UserDocs</kudo>
</kudos>
<content_rating type="oars-1.1" />

<name>Drawing</name>
<summary>A drawing application for the GNOME desktop</summary>
<description>
Expand All @@ -25,7 +26,16 @@
</ul>
</p>
</description>

<releases>
<release version="0.4.2" date="2019-07-31">
<description>
<p>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.</p>
</description>
</release>
<release version="0.4.1" date="2019-07-25">
<description>
<p>Version 0.4 introduces a new icon, numerous bug fixes, an improved
Expand Down Expand Up @@ -55,10 +65,10 @@
<image type="source">https://raw.githubusercontent.com/maoschanz/drawing/master/docs/screenshots/gnome_selection.png</image>
</screenshot>
<screenshot>
<image type="source">https://raw.githubusercontent.com/maoschanz/drawing/master/docs/screenshots/gnome_new.png</image>
<image type="source">https://raw.githubusercontent.com/maoschanz/drawing/master/docs/screenshots/gnome_tools_preview.png</image>
</screenshot>
<screenshot>
<image type="source">https://raw.githubusercontent.com/maoschanz/drawing/master/docs/screenshots/gnome_tools_preview.png</image>
<image type="source">https://raw.githubusercontent.com/maoschanz/drawing/master/docs/screenshots/gnome_new.png</image>
</screenshot>
</screenshots>

Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
drawing (0.4.1) unstable; urgency=low
drawing (0.4.2) unstable; urgency=low

* New icon
* Numerous bug fixes
Expand Down
2 changes: 1 addition & 1 deletion meson.build
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project(
'drawing',
version: '0.4.1',
version: '0.4.2',
meson_version: '>= 0.50.0',
)

Expand Down
14 changes: 0 additions & 14 deletions src/minimap.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
43 changes: 0 additions & 43 deletions src/preferences.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,59 +78,16 @@ 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)

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 ############################################

Expand Down
76 changes: 0 additions & 76 deletions src/ui/minimap.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,81 +122,5 @@
</packing>
</child>

<child>
<object class="GtkBox">
<!-- <property name="visible">True</property> -->
<property name="can_focus">True</property>
<property name="expand">True</property>
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="action-name">win.zoom_opti</property>
<property name="tooltip-text" translatable="yes">Optimal Zoom</property>
<property name="relief">none</property>
<child>
<object class="GtkImage">
<property name="icon-name">zoom-fit-best-symbolic</property>
<property name="visible">True</property>
</object>
</child>
</object>
<packing>
<property name="pack-type">start</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="action-name">win.zoom_in</property>
<property name="tooltip-text" translatable="yes">Zoom In</property>
<property name="relief">none</property>
<child>
<object class="GtkImage">
<property name="icon-name">zoom-in-symbolic</property>
<property name="visible">True</property>
</object>
</child>
</object>
<packing>
<property name="pack-type">end</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="action-name">win.zoom_100</property>
<property name="label" translatable="yes">100%</property>
<property name="relief">none</property>
</object>
<packing>
<property name="pack-type">end</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="action-name">win.zoom_out</property>
<property name="tooltip-text" translatable="yes">Zoom Out</property>
<property name="relief">none</property>
<child>
<object class="GtkImage">
<property name="icon-name">zoom-out-symbolic</property>
<property name="visible">True</property>
</object>
</child>
</object>
<packing>
<property name="pack-type">end</property>
</packing>
</child>
</object>
</child>
<child>
<object class="GtkScale" id="zoom_scale">
<!-- <property name="visible">True</property> -->
<property name="digits">0</property>
<property name="adjustment">zoom_adj</property>
</object>
</child>
</object>
</interface>
1 change: 0 additions & 1 deletion src/ui/window.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
</object>

<template class="DrawingWindow" parent="GtkApplicationWindow">
<!-- <property name="default-width">360</property> -->
<property name="default-width">900</property>
<property name="default-height">500</property>
<child>
Expand Down
17 changes: 0 additions & 17 deletions src/window.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,6 @@ def add_all_win_actions(self):
self.add_action_simple('go_down', self.action_go_down, ['<Ctrl>Down'])
self.add_action_simple('go_left', self.action_go_left, ['<Ctrl>Left'])
self.add_action_simple('go_right', self.action_go_right, ['<Ctrl>Right'])
if self._settings.get_boolean('devel-only'):
self.add_action_simple('zoom_in', self.action_zoom_in, ['<Ctrl>plus', '<Ctrl>KP_Add'])
self.add_action_simple('zoom_out', self.action_zoom_out, ['<Ctrl>minus', '<Ctrl>KP_Subtract'])
self.add_action_simple('zoom_100', self.action_zoom_100, ['<Ctrl>1', '<Ctrl>KP_1'])
self.add_action_simple('zoom_opti', self.action_zoom_opti, ['<Ctrl>0', '<Ctrl>KP_0'])

self.add_action_simple('new_tab', self.build_new_image, ['<Ctrl>t'])
self.add_action_simple('new_tab_selection', \
Expand Down Expand Up @@ -1087,18 +1082,6 @@ def action_go_left(self, *args):
def action_go_right(self, *args):
self.get_active_image().add_deltas(1, 0, 100)

def action_zoom_in(self, *args):
self.get_active_image().inc_zoom_level(50)

def action_zoom_out(self, *args):
self.get_active_image().inc_zoom_level(-50)

def action_zoom_100(self, *args):
self.get_active_image().set_zoom_level(100)

def action_zoom_opti(self, *args):
self.get_active_image().set_opti_zoom_level()

############################################################################
################################################################################

0 comments on commit e569043

Please sign in to comment.