Adding back support for previous screenshots for elementary < 8.0

Author: phase1geo

src/Application.vala

@@ -43,6 +43,8 @@ public class Annotator : Gtk.Application {
     Intl.bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
     Intl.textdomain( GETTEXT_PACKAGE );
 
+    stdout.printf( "CPE_NAME: %s\n", Environment.get_os_info( "CPE_NAME" ) );
+
     startup.connect( start_application );
     open.connect( open_files );
 
@@ -75,7 +77,7 @@ public class Annotator : Gtk.Application {
         }
       });
     } else if( take_screenshot ) {
-      appwin.do_screenshot();
+      appwin.do_screenshot( null );
     }
 
     /* Handle any changes to the position of the window */

src/MainWindow.vala

@@ -42,7 +42,8 @@ public class MainWindow : Gtk.ApplicationWindow {
 
   private const GLib.ActionEntry[] action_entries = {
     { "action_open",              do_open },
-    { "action_screenshot",        do_screenshot },
+    { "action_screenshot",           action_screenshot },
+    { "action_screenshot_nonportal", action_screenshot_nonportal, "i" },
     { "action_save",              do_save },
     { "action_quit",              do_quit },
     { "action_undo",              do_undo },
@@ -196,7 +197,9 @@ public class MainWindow : Gtk.ApplicationWindow {
     _screenshot_btn = new Button.from_icon_name( get_icon_name( "insert-image" ) ) {
       tooltip_markup = Utils.tooltip_with_accel( _( "Take Screenshot" ), "<Control>t" )
     };
-    _screenshot_btn.clicked.connect( do_screenshot );
+    _screenshot_btn.clicked.connect(() => {
+      do_screenshot( _screenshot_btn );
+    });
     header.pack_start( _screenshot_btn );
 
     _undo_btn = new Button.from_icon_name( get_icon_name( "edit-undo" ) ) {
@@ -355,7 +358,9 @@ public class MainWindow : Gtk.ApplicationWindow {
     paste.clicked.connect( do_paste );
 
     var screenshot = _welcome.append_button( new ThemedIcon( "insert-image" ), _( "Take A Screenshot" ), _( "Open an image from a screenshot" ) );
-    screenshot.clicked.connect( do_screenshot );
+    screenshot.clicked.connect(() => {
+      do_screenshot( screenshot );
+    });
 
     /* Initialize the clipboard */
     AnnotatorClipboard.get_clipboard().changed.connect(() => {
@@ -539,7 +544,148 @@ public class MainWindow : Gtk.ApplicationWindow {
     return( do_paste_internal( true ) );
   }
 
-  public void do_screenshot() {
+  //-------------------------------------------------------------
+  // Main procedure that initiates a screenshot.  If we are using
+  // elementary OS 7.1 or below, we will roll our own screenshot
+  // UI and functionality; otherwise, we will use the screenshot
+  // portal.
+  public void do_screenshot( Widget? parent ) {
+    var os      = Environment.get_os_info( "ID" );
+    var version = Environment.get_os_info( "VERSION" );
+    if( (os == "elementary") && (double.parse(version) < 8.0) ) {
+      if( parent == null ) {
+        do_screenshot_nonportal( CaptureType.SCREEN );
+      } else {
+        show_screenshot_popover( parent );
+      }
+    } else {
+      do_screenshot_portal();
+    }
+  }
+
+  //-------------------------------------------------------------
+  // Returns the capture mode as determined by the user
+  private void show_screenshot_popover( Widget parent ) {
+
+    var box = new Box( Orientation.VERTICAL, 10 ) {
+      margin_start  = 10,
+      margin_end    = 10,
+      margin_top    = 10,
+      margin_bottom = 10
+    };
+
+    var shot_menu = new GLib.Menu();
+
+    for( int i=0; i<CaptureType.NUM; i++ ) {
+      var mode = (CaptureType)i;
+      shot_menu.append( mode.label(), "win.action_screenshot_nonportal(%d)".printf( i ) );
+    }
+
+    var opt_menu = new GLib.Menu();
+
+    var delay_item = new GLib.MenuItem( null, null );
+    delay_item.set_attribute( "custom", "s", "delay" );
+    opt_menu.append_item( delay_item );
+
+    var delay = new Label( _( "Delay (in seconds)" ) + ":" ) {
+      halign  = Align.START,
+      hexpand = true
+    };
+    var delay_sb = new SpinButton.with_range( 0, 6, 1 ) {
+      halign = Align.END
+    };
+    delay_sb.value = Annotator.settings.get_int( "screenshot-delay" );
+    delay_sb.value_changed.connect(() => {
+      Annotator.settings.set_int( "screenshot-delay", (int)delay_sb.value );
+    });
+
+    var dbox = new Box( Orientation.HORIZONTAL, 10 );
+    dbox.append( delay );
+    dbox.append( delay_sb );
+
+    var include_item = new GLib.MenuItem( null, null );
+    include_item.set_attribute( "custom", "s", "include" );
+    opt_menu.append_item( include_item );
+
+    var include = new Label( _( "Include Annotator window" ) + ":" ) {
+      halign  = Align.START,
+      hexpand = true
+    };
+    var include_sw = new Switch() {
+      halign = Align.END,
+      active = Annotator.settings.get_boolean( "screenshot-include-win" )
+    };
+    include_sw.notify["active"].connect((value) => {
+      Annotator.settings.set_boolean( "screenshot-include-win", include_sw.active );
+    });
+
+    var ibox = new Box( Orientation.HORIZONTAL, 10 );
+    ibox.append( include );
+    ibox.append( include_sw );
+
+    var menu = new GLib.Menu();
+    menu.append_section( null, shot_menu );
+    menu.append_section( null, opt_menu );
+
+    var popover = new PopoverMenu.from_model( menu ) {
+      position = PositionType.BOTTOM
+    };
+    popover.set_parent( parent );
+    popover.add_child( dbox, "delay" );
+    popover.add_child( ibox, "include" );
+    popover.popup();
+
+  }
+
+  private void action_screenshot() {
+    do_screenshot( _screenshot_btn );
+  }
+
+  private void action_screenshot_nonportal( SimpleAction action, Variant? variant ) {
+    if( variant != null ) {
+      var mode = (CaptureType)variant.get_int32();
+      do_screenshot_nonportal( mode );
+    }
+  }
+
+  public void do_screenshot_nonportal( CaptureType capture_mode ) {
+
+    /* If we aren't capturing anything, end now */
+    if( capture_mode == CaptureType.NONE ) return;
+
+    var backend = new ScreenshotBackend();
+    var delay   = Annotator.settings.get_int( "screenshot-delay" );
+    var include = Annotator.settings.get_boolean( "screenshot-include-win" );
+
+    /* Hide the application */
+    if( !include ) {
+      hide();
+    }
+
+    backend.capture.begin (capture_mode, delay, false, false /* redact */, (obj, res) => {
+      Gdk.Pixbuf? pixbuf = null;
+      try {
+        pixbuf = backend.capture.end (res);
+      } catch (GLib.IOError.CANCELLED e) {
+        // TBD
+      } catch (Error e) {
+        // TBD
+      }
+      if (pixbuf != null) {
+        _editor.paste_image( pixbuf, false );
+        _zoom_btn.set_sensitive( true );
+        _export_btn.set_sensitive( true );
+      }
+      if( !include ) {
+        show();
+      }
+    });
+
+  }
+
+  //-------------------------------------------------------------
+  // Generate a screenshot using the screenshot portal.
+  private void do_screenshot_portal() {
 
     _welcome.sensitive = false;