Merge remote-tracking branch 'anykraus/figureoptions-generate-simple-legend'

tacaswell · tacaswell · commit e37b5c5eac01 · 2014-05-18T18:40:24.000-04:00
Conflicts:
	CHANGELOG
diff --git a/CHANGELOG b/CHANGELOG
@@ -12,6 +12,9 @@
 
 2014-04-27 removed un-needed cast to float in stem
 
+2014-04-22 Added (re-)generate a simple automatic legend to "Figure Options"
+           dialog of the Qt4Agg backend.
+
 2014-04-22 Added an example showing the difference between
            interpolation = 'none' and interpolation = 'nearest' in
            `imshow()` when saving vector graphics files.
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
@@ -251,6 +251,10 @@ added. Furthermore, the the subplottool is now implemented as a modal
 dialog. It was previously a QMainWindow, leaving the SPT open if one closed the
 plotwindow.
 
+In the figureoptions dialog one can now choose to (re-)generate a simple
+automatic legend. Any explicitly set legend entries will be lost, but changes to
+the curves' label, linestyle, et cetera will now be updated in the legend.
+
 Interactive performance of the Qt4 backend has been dramatically improved
 under windows.
 
