Checkpointing.

Author: phase1geo

meson.build

@@ -41,8 +41,8 @@ cc = meson.get_compiler('c')
 math_dep = cc.find_library('m', required: false)
 
 add_project_arguments([
-        '--vapidir=' + join_paths(meson.current_source_dir(), 'vapi'),
-        '--disable-warnings'
+        '--vapidir=' + join_paths(meson.current_source_dir(), 'vapi')
+        # '--disable-warnings'
     ],
     language: 'vala',
 )

src/About.vala

@@ -37,7 +37,7 @@ public class About {
       program_name       = "Annotator",
       comments           = _( "Image annotation application" ),
       copyright          = _( "Copyright" ) + " © 2023-2026 Trevor Williams",
-      version            = Annotator.version,
+      version            = win.application.version,
       license_type       = License.GPL_3_0,
       website            = "https://appcenter.elementary.io/com.github.phase1geo.annotator/",
       website_label      = _( "Annotator in AppCenter" ),

src/Application.vala

@@ -32,11 +32,14 @@ public class Annotator : Gtk.Application {
   public  static bool          use_clipboard     = false;
   public  static bool          take_screenshot   = false;
   public  static bool          std_input         = false;
-  public  static string        version           = "2.0.3";
 
   public Annotator () {
 
-    Object( application_id: "com.github.phase1geo.annotator", flags: ApplicationFlags.HANDLES_OPEN );
+    Object(
+      application_id: "com.github.phase1geo.annotator",
+      flags: ApplicationFlags.HANDLES_OPEN,
+      version: "2.0.3"
+    );
 
     Intl.setlocale( LocaleCategory.ALL, "" );
     Intl.bindtextdomain( GETTEXT_PACKAGE, LOCALEDIR );

src/CanvasItems.vala

@@ -387,29 +387,34 @@ public class CanvasItems {
     add_item( item, -1, true );
   }
 
+  //-------------------------------------------------------------
+  // Adds an image that the user can select from using a standard
+  // file open dialog.
   public void add_image() {
 
-    // Get the file to open from the user
-    var dialog = new FileChooserNative( _( "Open Insertion Image" ), _canvas.win, FileChooserAction.OPEN, _( "Open" ), _( "Cancel" ) );
-    Utils.set_chooser_folder( dialog );
-
     // Create file filters for each supported format
+    var filters = new GLib.ListStore( typeof( FileFilter ) );
     foreach( FileFilter filter in _canvas.win.image_filters ) {
-      dialog.add_filter( filter );
+      filters.append( filter );
     }
 
-    dialog.response.connect((id) => {
-      if( id == ResponseType.ACCEPT ) {
-        var filename = dialog.get_file().get_path();
-        var item = create_image( filename );
+    // Get the file to open from the user
+    var dialog = new FileDialog() {
+      title   = _( "Open Insertion Image" ),
+      filters = filters
+    };
+    Utils.set_chooser_folder( dialog );
+
+    dialog.open.begin( _canvas.win, null, (obj, res) => {
+      try {
+        var file     = dialog.open.end( res );
+        var filename = file.get_path();
+        var item     = create_image( filename );
         add_item( item, -1, true );
         Utils.store_chooser_folder( filename );
-      }
-      dialog.destroy();
+      } catch( Error e ) {}
     });
 
-    dialog.show();
-
   }
 
   //-------------------------------------------------------------
@@ -1217,7 +1222,7 @@ public class CanvasItems {
   // Saves the given item as a custom item
   private void do_save_custom( CanvasItem item ) {
     var save_item = new CustomItem.with_item( item.duplicate() );
-    custom_items.add( save_item );
+    custom_items.add( _canvas.win, save_item );
   }
 
   //-------------------------------------------------------------

src/CanvasToolbar.vala

@@ -486,7 +486,7 @@ public class CanvasToolbar : Box {
       popover      = new Popover(),
       child        = make_color_icon()
     };
-    mb.get_style_context().add_class( "color_chooser" );
+    mb.add_css_class( "color_chooser" );
 
     var box = new Box( Orientation.VERTICAL, 0 ) {
       margin_start  = 10,
@@ -708,7 +708,7 @@ public class CanvasToolbar : Box {
       has_frame    = false,
       popover      = new Popover()
     };
-    mb.get_style_context().add_class( "color_chooser" );
+    mb.add_css_class( "color_chooser" );
 
     _canvas.win.theme_changed.connect((dark_mode) => {
       mb.icon_name = dark_mode ? "font-annotator-dark-symbolic" : "font-annotator-symbolic";
@@ -805,7 +805,7 @@ public class CanvasToolbar : Box {
   private Image make_color_icon() {
 
     var snapshot = new Snapshot();
-    var rect     = Graphene.Rect.alloc();
+    var rect     = Graphene.Rect();
     rect.init( 0, 0, (float)30, (float)24 );
     var ctx      = snapshot.append_cairo( rect );
 
@@ -842,7 +842,7 @@ public class CanvasToolbar : Box {
     var height = stroke_width;
 
     var snapshot = new Snapshot();
-    var rect     = Graphene.Rect.alloc();
+    var rect     = Graphene.Rect();
     rect.init( 0, 0, (float)width, (float)height );
     var ctx      = snapshot.append_cairo( rect );
 
@@ -866,7 +866,7 @@ public class CanvasToolbar : Box {
     var height = 5;
 
     var snapshot = new Snapshot();
-    var rect     = Graphene.Rect.alloc();
+    var rect     = Graphene.Rect();
     rect.init( 0, 0, (float)width, (float)height );
     var ctx      = snapshot.append_cairo( rect );
 
@@ -892,7 +892,7 @@ public class CanvasToolbar : Box {
     var height  = _canvas.items.props.stroke_width.width();
 
     var snapshot = new Snapshot();
-    var rect     = Graphene.Rect.alloc();
+    var rect     = Graphene.Rect();
     rect.init( 0, 0, (float)50, (float)height );
     var ctx      = snapshot.append_cairo( rect );
 

src/Clipboard.vala

@@ -85,32 +85,36 @@ public class AnnotatorClipboard {
     var clipboard = Display.get_default().get_clipboard();
     var retval    = false;
 
-    try {
-      if( clipboard.get_formats().contain_mime_type( "image/png" ) ) {
-        clipboard.read_texture_async.begin( null, (ob, res) => {
+    if( clipboard.get_formats().contain_mime_type( "image/png" ) ) {
+      clipboard.read_texture_async.begin( null, (ob, res) => {
+        try {
           var texture = clipboard.read_texture_async.end( res );
           if( texture != null ) {
             var pixbuf = Utils.texture_to_pixbuf( texture );
             editor.paste_image( pixbuf, true );
           }
-        });
-        retval = true;
-      } else if( !image_only && clipboard.get_formats().contain_mime_type( "application/xml" ) ) {
-        clipboard.read_async.begin( {"application/xml"}, 0, null, (obj, res) => {
-          string str;
+        } catch( Error e ) {}
+      });
+      retval = true;
+    } else if( !image_only && clipboard.get_formats().contain_mime_type( "application/xml" ) ) {
+      clipboard.read_async.begin( {"application/xml"}, 0, null, (obj, res) => {
+        string str;
+        try {
           var stream   = clipboard.read_async.end( res, out str );
           var contents = Utils.read_stream( stream );
           editor.paste_items( contents );
-        });
-        retval = true;
-      } else if( !image_only && clipboard.get_formats().contain_gtype( Type.STRING ) ) {
-        clipboard.read_text_async.begin( null, (obj, res) => {
+        } catch( Error e ) {}
+      });
+      retval = true;
+    } else if( !image_only && clipboard.get_formats().contain_gtype( Type.STRING ) ) {
+      clipboard.read_text_async.begin( null, (obj, res) => {
+        try {
           var text = clipboard.read_text_async.end( res );
           editor.paste_text( text );
-        });
-        retval = true;
-      }
-    } catch( Error e ) {}
+        } catch( Error e ) {}
+      });
+      retval = true;
+    }
 
     return( retval );
 

src/ColorPicker.vala

@@ -72,7 +72,7 @@ public class ColorPicker : Box {
       has_frame = false
     };
     _toggle.toggled.connect( handle_toggle );
-    _toggle.get_style_context().add_class( type.get_css_class() );
+    _toggle.add_css_class( type.get_css_class() );
     type.set_image( _toggle );
 
     _chooser = new ColorChooserWidget();

src/CustomItem.vala

@@ -1,16 +1,38 @@
+/*
+* Copyright (c) 2020-2026 (https://github.com/phase1geo/Annotator)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*
+* Authored by: Trevor Williams <phase1geo@gmail.com>
+*/
+
 using Gtk;
 using Cairo;
 
 public class CustomItem {
 
-  private static const int icon_size = 24;
+  private const int icon_size = 24;
 
   private Image? _light_image = null;
   private Image? _dark_image  = null;
 
   public CanvasItem? item { get; private set; default = null; }
 
-  /* Default constructor */
+  //-------------------------------------------------------------
+  // Default constructor
   public CustomItem() {
     item         = null;
     _light_image = null;
@@ -42,7 +64,7 @@ public class CustomItem {
   private void create_image( bool light ) {
     if( item != null ) {
       var snapshot = new Snapshot();
-      var rect     = Graphene.Rect.alloc();
+      var rect     = Graphene.Rect();
       rect.init( 0, 0, (float)icon_size, (float)icon_size );
       var ctx      = snapshot.append_cairo( rect );
       var it       = item.duplicate();
@@ -67,14 +89,16 @@ public class CustomItem {
     }
   }
 
-  /* Saves this item as XML format */
+  //-------------------------------------------------------------
+  // Saves this item as XML format
   public Xml.Node* save() {
     Xml.Node* node = new Xml.Node( null, "custom-item" );
     node->add_child( item.save( 0, null ) );
     return( node );
   }
 
-  /* Loads this item from XML format */
+  //-------------------------------------------------------------
+  // Loads this item from XML format
   public void load( Xml.Node* node, CanvasItems canvas_items ) {
     for( Xml.Node* it=node->children; it!=null; it=it->next ) {
       if( (it->type == Xml.ElementType.ELEMENT_NODE) && (it->name == "item") ) {