Merge branch '007-release-bond' into 'master'

prepare last amber release

Closes #15

See merge request librem5-apps/librem5-goodies!24

Makefile

@@ -5,7 +5,7 @@ APPDATA = \
 all: shell-check appstream-check
 
 shell-check:
-	shellcheck l5-contacts-importer l5-screenshot l5-scale-the-screen
+	shellcheck l5-contacts-importer l5-screenshot l5-screen-recorder
 
 appstream-check:
 	appstream-util validate-relax $(APPDATA)

debian/changelog

@@ -1,3 +1,26 @@
+librem5-goodies (0.0.7pureos1) amber-phone; urgency=medium
+  
+  [ João Azevedo ]
+  * New upstream release.
+      - Remove scale the screen script, closes #15
+      - Remove wl-randr as a dependency as it is no longer required
+      - Update packge discription to include l5-screen-recorder
+      - Update appdata file to include the l5-screen-recorder
+      - Add l5-screen-recorder to makefile build tests
+      - Fix shellcheck warning with l5-screen-recorder
+      - Add usage function to l5-screen-recorder
+      - Add l5-screen-recorder icon to notifications
+      - Add l5-screen-recorder to build tests
+      - Update debhelper version
+      
+  [ David Hamner ] 
+  * Add l5-screen-recorder:
+      - Add l5-screen-recorder script and l5-screen-recorder desktop file
+      - Add wf-recorder as a dependency required by l5-screen-recorder
+      - Add paths for l5-screen-recorder in librem5-goodies.install file
+      
+ -- João Azevedo <joao.azevedo@puri.sm>  Fri, 29 Oct 2021 23:28:46 +0200
+
 librem5-goodies (0.0.6pureos1) amber-phone; urgency=medium
 
   * Non-maintainer upload.

debian/control

@@ -20,7 +20,6 @@ Depends:
  syncevolution,
  yad,
  xdg-user-dirs,
- wlr-randr,
  wf-recorder,
  ${misc:Depends},
 Description: Librem 5 Goodies
@@ -29,4 +28,4 @@ Description: Librem 5 Goodies
   - L5 Contacts Importer: A simple application to import contacts from a vcard
     file to GNOME Contacts.
   - L5 Screenshot: A simple application to make screenshots on the Librem 5
-  - L5 Scale the screen: A simple application to scale the Librem 5 screen
+  - L5 Screen Recorder: A simple application to record the Librem 5 screen

debian/librem5-goodies.install

@@ -2,8 +2,6 @@ l5-contacts-importer /usr/bin
 l5-contacts-importer.desktop /usr/share/applications
 l5-screenshot /usr/bin
 l5-screenshot.desktop /usr/share/applications
-l5-scale-the-screen /usr/bin
-l5-scale-the-screen.desktop /usr/share/applications
 l5-screen-recorder /usr/bin
 l5-screen-recorder.desktop /usr/share/applications
 sm.puri.librem5.goodies.appdata.xml /usr/share/metainfo

debian/tests/control

@@ -1,3 +1,3 @@
-Test-Command: /usr/bin/l5-contacts-importer --help && /usr/bin/l5-screenshot --help && /usr/bin/l5-scale-the-screen --help
+Test-Command: /usr/bin/l5-contacts-importer --help && /usr/bin/l5-screenshot --help && l5-screen-recorder --help
 Restrictions: superficial
 Depends: librem5-goodies

l5-scale-the-screen

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-function usage()
-{
-  echo "Usage: $0, or just press the Scale the Screen Icon in the app tray"
-  exit 0
-}
-
-case "$1" in
-   --help|-h|-?)
-     usage
-   ;;
-esac
-
-DISPLAY=$(wlr-randr | head -n 1 | awk '{print $1}')
-
-yad --title scale_screen --form \
-  --field='Default dpi (2x scale)':fbtn "wlr-randr --output $DISPLAY --scale 2" \
-  --field='Low dpi (1.75x scale)!window-restore-symbolic':fbtn "wlr-randr --output $DISPLAY --scale 1.75" \
-  --field='Medium dpi (1.5x scale)!window-minimize-symbolic':fbtn "wlr-randr --output $DISPLAY --scale 1.5" \
-  --field='High dpi (1.25x scale)!window-maximize-symbolic':fbtn "wlr-randr --output $DISPLAY --scale 1.25" \
-  --field='Max dpi (1x scale)!view-fullscreen-symbolic':fbtn "wlr-randr --output $DISPLAY --scale 1" \
-  --field='Restart Phosh':fbtn "sudo systemctl restart phosh" \
-  --button='Close!gtk-cancel':1

l5-scale-the-screen.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Scale Screen
-Type=Application
-Icon=video-display-symbolic
-Exec=/usr/bin/l5-scale-the-screen %U
-Categories=Utility;
-# Translators: Do NOT translate or transliterate this text (these are enum types)!
-X-Purism-FormFactor=Workstation;Mobile;
-

l5-screen-recorder

@@ -1,18 +1,32 @@
 #!/bin/bash
 # GPL3
 
+function usage()
+{
+  echo "Usage: Just press the Screen Shot Icon in the app tray"
+  exit 0
+}
+
+NOTIFY_SEND="notify-send -i emblem-videos-symbolic"
+
+case "$1" in
+   --help|-h|-?)
+     usage
+   ;;
+esac
+
 VIDEO="/home/purism/Videos/$(date +%Y-%m-%d-%H%M%S).avi"
 yad --title ScreenCapture --text "A simple GUI to record the screen" --button="Start capture:100" --button="Quit:0" --buttons-layout=center
 start_window_return=$?
 
 if [[ $start_window_return -eq 100 ]]
 then
-    wf-recorder -a -f $VIDEO --codec=asv1 &
+    wf-recorder -a -f "$VIDEO" --codec=asv1 &
 else
     exit
 fi
 
-yad --title ScreenCapture --text "Screen capture is actively running. \nFile: $VIDEO" --button='Stop capture:100' --buttons-layout=center
+yad --title ScreenCapture --text "Screen capture is actively running. \\nFile: $VIDEO" --button='Stop capture:100' --buttons-layout=center
 exit_window_return=$?
 
 if [[ $exit_window_return -eq 100 ]]
@@ -22,5 +36,5 @@ fi
 
 if test -f "$VIDEO"
 then
-    notify-send ScreenCapture "Video stored at $VIDEO"
+    $NOTIFY_SEND ScreenCapture "Video stored at $VIDEO"
 fi

sm.puri.librem5.goodies.appdata.xml

@@ -11,7 +11,7 @@
     <p>Librem5 Goodies contains the following scripts:</p>
     <p>- Contacts importer: An application to import contacts from a vcard</p> 
     <p>- Screen Shot: An application to make screenshots of the Librem 5</p>
-    <p>- Scale the Screen: An application to scale the Librem 5 screen</p>
+    <p>- Screen recorder: An application to record the Librem 5 screen</p> 
   </description>
   <url type="homepage">https://source.puri.sm/librem5-apps/librem5-goodies/</url>
   <developer_name>Purism Developers</developer_name>