changelog merge and minor stuff

diff --git a/changelog b/changelog
index 38fdd91..24a92c4 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+Version 0.7.1:
+- bugfixes for win32 build
+- limit the cursor size (problem on Windows, and X11 with Compiz)
+- fixed brushes that lead to save problems (Windows only?)
+- show filename in titlebar
+- zoom on scrollwheel
+- new brushes: splatter and marker
+- other minor fixes
+
 Version 0.7.0:
 - color history popup
 - merge layer down

diff --git a/gui/drawwindow.py b/gui/drawwindow.py
index 6cd395d..4038dff 100644 (file)
--- a/gui/drawwindow.py
+++ b/gui/drawwindow.py
@@ -13,7 +13,7 @@ This is the main drawing window, containing menu actions.
 Painting is done in tileddrawwidget.py.
 """
 
-MYPAINT_VERSION="0.7.0+git"
+MYPAINT_VERSION="0.7.1+git"
 
 import os, re, math
 from glob import glob
@@ -302,8 +302,8 @@ class Window(gtk.Window):
             ('ViewMenu', None, 'View'),
             ('Fullscreen',   None, 'Fullscreen', 'F11', None, self.fullscreen_cb),
             ('ResetView',   None, 'Reset (Zoom, Rotation, Mirror)', None, None, self.reset_view_cb),
-            ('ZoomOut',      None, 'Zoom Out (at cursor)', 'comma', None, self.zoom_cb),
-            ('ZoomIn',       None, 'Zoom In', 'period', None, self.zoom_cb),
+            ('ZoomIn',       None, 'Zoom In (at cursor)', 'period', None, self.zoom_cb),
+            ('ZoomOut',      None, 'Zoom Out', 'comma', None, self.zoom_cb),
             ('RotateLeft',   None, 'Rotate Counterclockwise', None, None, self.rotate_cb),
             ('RotateRight',  None, 'Rotate Clockwise', None, None, self.rotate_cb),
             ('ViewHelp',     None, 'Help', None, None, self.view_help_cb),
@@ -1046,7 +1046,6 @@ class Window(gtk.Window):
         self.tdw.set_rotation(0.0)
         self.zoomlevel = self.zoomlevel_values.index(1.0)
         self.tdw.set_zoom(1.0)
-        self.tdw.set_zoom(1.0)
         self.tdw.set_flipped(False)
         self.action_group.get_action('Flip').set_active(False)