Removing Annotator export without images.

* Adding image compression option to Annotator export.

Author: phase1geo

src/Canvas.vala

@@ -501,11 +501,11 @@ public class Canvas : DrawingArea {
 
   //-------------------------------------------------------------
   // Saves this canvas and all canvas items in XML format.
-  public Xml.Node* save( string? image_dir = null ) {
+  public Xml.Node* save( string image_dir, int compression ) {
 
     Xml.Node* node = new Xml.Node( null, "canvas" );
 
-    node->add_child( image.save( editor.filename, image_dir ) );
+    node->add_child( image.save( image_dir, compression ) );
     node->add_child( items.save( image_dir ) );
 
     return( node );

src/CanvasImage.vala

@@ -580,23 +580,18 @@ public class CanvasImage {
 
   //-------------------------------------------------------------
   // Saves the contents of this canvas image to XML format.
-  public Xml.Node* save( string fname, string? image_dir ) {
-
-    Xml.Node* node = new Xml.Node( null, "image" );
-
-    if( image_dir != null ) {
-      string[]  options = { "compression" };
-      string[]  values  = { "9" };
-      var       name    = GLib.Path.build_filename( image_dir, "background.png" );
-      stdout.printf( "Attempting to save canvas image as %s\n", name );
-      try {
-        _buf.savev( name, "png", options, values );
-        node->set_prop( "filename", name );
-      } catch( GLib.Error e ) {
-        critical( e.message );
-      }
-    } else {
+  public Xml.Node* save( string image_dir, int compression ) {
+
+    Xml.Node* node    = new Xml.Node( null, "image" );
+    string[]  options = { "compression" };
+    string[]  values  = { compression.to_string() };
+    var       fname   = GLib.Path.build_filename( image_dir, "background.png" );
+
+    try {
+      _buf.savev( fname, "png", options, values );
       node->set_prop( "filename", fname );
+    } catch( GLib.Error e ) {
+      critical( e.message );
     }
 
     node->set_prop( "angle", _angle.to_string() );

src/Exporter.vala

@@ -170,7 +170,6 @@ public class Exporter : Box {
     FileFilter filter = new FileFilter();
     filter.set_filter_name( export.label );
     foreach( string extension in export.extensions ) {
-      stdout.printf( "Setting export to %s\n", extension );
       filter.add_pattern( "*" + extension );
     }
     dialog.set_filter( filter );

src/exports/ExportEditable.vala

@@ -39,11 +39,7 @@ public class ExportEditable : Export {
     var fname = repair_filename( filename );
 
     /* Figure out if the user wants to include the images or not */
-    if( get_bool( "include-images" ) ) {
-      save_with_images( fname );
-    } else {
-      save_without_images( fname );
-    }
+    save( fname );
 
     return( true );
 
@@ -54,7 +50,7 @@ public class ExportEditable : Export {
   // images used within the annotation are saved into the directory
   // and the directory is zipped and archived as the final *.annotator
   // file.
-  private void save_with_images( string fname ) {
+  private void save( string fname ) {
 
     string temp_dir;
 
@@ -142,25 +138,16 @@ public class ExportEditable : Export {
 
   }
 
-  //-------------------------------------------------------------
-  // Saves the *.annotator file as an XML file, leaving the image
-  // paths to point to the local filesystem.
-  private void save_without_images( string fname ) {
-
-    save_xml( fname, null );
-
-  }
-
   //-------------------------------------------------------------
   // Saves the XML information from the annotation.  Copies the stored
   // images in the given image directory, if specified.
-  private void save_xml( string fname, string? image_dir ) {
+  private void save_xml( string fname, string image_dir ) {
 
     Xml.Doc*  doc  = new Xml.Doc( "1.0" );
     Xml.Node* root = new Xml.Node( null, "exports" );
 
     root->set_prop( "version", Annotator.version );
-    root->add_child( canvas.save( image_dir ) );
+    root->add_child( canvas.save( image_dir, get_scale( "image-compression" ) ) );
 
     doc->set_root_element( root );
     doc->save_format_file( fname, 1 );
@@ -218,7 +205,7 @@ public class ExportEditable : Export {
 
     /* Open the portable Minder file for reading */
     if( archive.open_filename( filename, 16384 ) != Archive.Result.OK ) {
-      return( load_xml( filename ) );
+      return( false );
     }
 
     unowned Archive.Entry entry;
@@ -265,21 +252,21 @@ public class ExportEditable : Export {
   // Add the setting to enable/disable including the images included
   // in the annotation.
   public override void add_settings( Grid grid ) {
-    add_setting_bool( "include-images", grid, _( "Include images" ), _( "Including images will allow the saved file to be used on a different machine, but will make the file size much larger" ), false );
+    add_setting_scale( "image-compression", grid, _( "Image Compression" ), null, 0, 9, 1, 0 );
   }
 
   //-------------------------------------------------------------
   // Save the settings.
   public override void save_settings( Xml.Node* node ) {
-    node->set_prop( "include-images", get_bool( "include-images" ).to_string() );
+    node->set_prop( "compression", get_scale( "image-compression" ).to_string() );
   }
 
   //-------------------------------------------------------------
   // Load the settings.
   public override void load_settings( Xml.Node* node ) {
-    var ii = node->get_prop( "include-images" );
-    if( ii != null ) {
-      set_bool( "include-images", bool.parse( ii ) );
+    var c = node->get_prop( "compression" );
+    if( c != null ) {
+      set_scale( "image-compression", int.parse( c ) );
     }
   }