From 4873cd60cd661e6ddfcfaebe8a9b739b3ad59010 Mon Sep 17 00:00:00 2001 From: Srevin Saju Date: Sun, 17 May 2020 22:27:50 +0300 Subject: [PATCH 1/7] Hotfix mapper Fixes #133 --- guiscrcpy/lib/mapper.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guiscrcpy/lib/mapper.py b/guiscrcpy/lib/mapper.py index 68954655..afcf5caf 100644 --- a/guiscrcpy/lib/mapper.py +++ b/guiscrcpy/lib/mapper.py @@ -56,6 +56,8 @@ cfgpath = cfgmgr.cfgpath parser = argparse.ArgumentParser() +parser.add_argument('--mapper', action="store_true", + help="Start the mapper") parser.add_argument('--mapper-delay', default=10, help="Set time to delay before screen is captured") parser.add_argument('--mapper-reset', action="store_true", From 2426c6e3f9fc4e4e16e3d3101df96950f04395d3 Mon Sep 17 00:00:00 2001 From: Jess Date: Sun, 24 May 2020 14:45:55 -0700 Subject: [PATCH 2/7] Added financial contributors to the README --- README.md | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a94b310b..742da354 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # guiscrcpy -![Linux](https://github.com/srevinsaju/guiscrcpy/workflows/Linux/badge.svg)![Windows](https://github.com/srevinsaju/guiscrcpy/workflows/Windows/badge.svg)![Mac OS](https://github.com/srevinsaju/guiscrcpy/workflows/Mac%20OS/badge.svg) +[![Financial Contributors on Open Collective](https://opencollective.com/guiscrcpy/all/badge.svg?label=financial+contributors)](https://opencollective.com/guiscrcpy) ![Linux](https://github.com/srevinsaju/guiscrcpy/workflows/Linux/badge.svg)![Windows](https://github.com/srevinsaju/guiscrcpy/workflows/Windows/badge.svg)![Mac OS](https://github.com/srevinsaju/guiscrcpy/workflows/Mac%20OS/badge.svg) [![Updates](https://pyup.io/repos/github/srevinsaju/guiscrcpy/shield.svg)](https://pyup.io/repos/github/srevinsaju/guiscrcpy/)[![Python 3](https://pyup.io/repos/github/srevinsaju/guiscrcpy/python-3-shield.svg)](https://pyup.io/repos/github/srevinsaju/guiscrcpy/)[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/guiscrcpy?style=flat-square)![PyPI](https://img.shields.io/pypi/v/guiscrcpy?style=flat-square)![PyPI - Wheel](https://img.shields.io/pypi/wheel/guiscrcpy?style=flat-square)![PyPI - Downloads](https://img.shields.io/pypi/dm/guiscrcpy?color=dark%20green&logo=PYPI&logoColor=Green&style=flat-square)](https://pypi.org/project/guiscrcpy) @@ -73,6 +73,36 @@ a professional PyCharm IDE; It works fantastic!!3 [![jetbrains](docs/img/jetbrains.svg)](https://www.jetbrains.com/?from=guiscrcpy) +## Contributors + +### Code Contributors + +This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. + + +### Financial Contributors + +Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/guiscrcpy/contribute)] + +#### Individuals + + + +#### Organizations + +Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/guiscrcpy/contribute)] + + + + + + + + + + + + ## License ``` From f16575a2ce716edcb6271f57f2eaf0341b65c08f Mon Sep 17 00:00:00 2001 From: Srevin Saju Date: Sat, 30 May 2020 00:08:21 +0300 Subject: [PATCH 3/7] Fix icon sizes on readme --- docs/FEATURES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/FEATURES.md b/docs/FEATURES.md index 4afe47ae..e785c5bb 100644 --- a/docs/FEATURES.md +++ b/docs/FEATURES.md @@ -103,7 +103,7 @@ It is possible to ask your device to connect to the LAN to enable wireless suppo To get wireless connection, you will need to know the local `IP` address of your device. Alternatively, click the `REFRESH` button to select from the list. -After the selection is complete, you can click the `CONNECT` button. Provided the port and the IP address is correct, you are likely to have connected to your devices. You can test if your connection was successful by pressing the `Refresh` icon refresh icon on the main user interface, you are likely to see your device in the devices view? +After the selection is complete, you can click the `CONNECT` button. Provided the port and the IP address is correct, you are likely to have connected to your devices. You can test if your connection was successful by pressing the `Refresh` icon refresh icon on the main user interface, you are likely to see your device in the devices view? > Can’t see your device? Check if your device is listed when @@ -135,7 +135,7 @@ As seen in the picture, the way to decipher it: ### `usbaudio` -[`usbaudio`](https://github.com/rom1v/usbaudio) is a audio client written by @rom1v, to stream device audio to system with the help of [VLC](https://www.videolan.org/vlc/index.html). `guiscrcpy` has already included the GUI entry point for `usbaudio`. Make sure `usbaudio` is on `PATH` and then click the `usbaudio` button refresh icon on the main gui. +[`usbaudio`](https://github.com/rom1v/usbaudio) is a audio client written by @rom1v, to stream device audio to system with the help of [VLC](https://www.videolan.org/vlc/index.html). `guiscrcpy` has already included the GUI entry point for `usbaudio`. Make sure `usbaudio` is on `PATH` and then click the `usbaudio` button refresh icon on the main gui.
@@ -177,7 +177,7 @@ guiscrcpy --mapper Now, run guiscrcpy as usual. -Key mapper is not enabled by default as it conflicts with input text. To enable the keymapper for a session, click and it will load in a few moments. +Key mapper is not enabled by default as it conflicts with input text. To enable the keymapper for a session, click and it will load in a few moments. ------------------ From 36d6df9a6bea2b0d632c437d22d3c97c1f9c9475 Mon Sep 17 00:00:00 2001 From: Srevin Saju Date: Sat, 30 May 2020 00:20:35 +0300 Subject: [PATCH 4/7] Update version --- guiscrcpy.desktop | 2 +- guiscrcpy/version.py | 2 +- setup.py | 2 +- snap/gui/guiscrcpy.desktop | 2 +- snap/snapcraft.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/guiscrcpy.desktop b/guiscrcpy.desktop index 7e8fcf1a..dec2d238 100644 --- a/guiscrcpy.desktop +++ b/guiscrcpy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=3.9 +Version=3.9.post15.dev Name=guiscrcpy GenericName=guiscrcpy Comment=Open Source Android Screen Mirroring System diff --git a/guiscrcpy/version.py b/guiscrcpy/version.py index 203252dd..53ed3f35 100644 --- a/guiscrcpy/version.py +++ b/guiscrcpy/version.py @@ -20,4 +20,4 @@ """ -VERSION = '3.9' +VERSION = '3.9.post15.dev' diff --git a/setup.py b/setup.py index a57ff03a..86286ca5 100755 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ setup( name='guiscrcpy', - version='3.9', + version='3.9.post15.dev', description='An Open Source - Fast - Android Screen Mirroring system.', long_description=long_description, long_description_content_type='text/markdown', diff --git a/snap/gui/guiscrcpy.desktop b/snap/gui/guiscrcpy.desktop index 1b2a1fb6..d31085c6 100644 --- a/snap/gui/guiscrcpy.desktop +++ b/snap/gui/guiscrcpy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=3.9 +Version=3.9.post15.dev Name=guiscrcpy GenericName=guiscrcpy Comment=Open Source Android Screen Mirroring System diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 41a1bc52..1308cbdb 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: guiscrcpy -version: '3.9' +version: 3.9.post15.dev summary: An opensource GUI for android screen mirroring description: | A full fledged GUI integration for the award winning open source scrcpy, for From adcd7bbf483bcfb80927c5ec424d0543b8b69b6f Mon Sep 17 00:00:00 2001 From: Srevin Saju Date: Sat, 30 May 2020 10:53:46 +0300 Subject: [PATCH 5/7] :tada: Release 3.9.2 --- guiscrcpy.desktop | 2 +- guiscrcpy/version.py | 2 +- setup.py | 2 +- snap/gui/guiscrcpy.desktop | 2 +- snap/snapcraft.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/guiscrcpy.desktop b/guiscrcpy.desktop index dec2d238..7efedbf8 100644 --- a/guiscrcpy.desktop +++ b/guiscrcpy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=3.9.post15.dev +Version=3.9.2 Name=guiscrcpy GenericName=guiscrcpy Comment=Open Source Android Screen Mirroring System diff --git a/guiscrcpy/version.py b/guiscrcpy/version.py index 53ed3f35..c6bff357 100644 --- a/guiscrcpy/version.py +++ b/guiscrcpy/version.py @@ -20,4 +20,4 @@ """ -VERSION = '3.9.post15.dev' +VERSION = '3.9.2' diff --git a/setup.py b/setup.py index 86286ca5..e9762076 100755 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ setup( name='guiscrcpy', - version='3.9.post15.dev', + version='3.9.2', description='An Open Source - Fast - Android Screen Mirroring system.', long_description=long_description, long_description_content_type='text/markdown', diff --git a/snap/gui/guiscrcpy.desktop b/snap/gui/guiscrcpy.desktop index d31085c6..1721903d 100644 --- a/snap/gui/guiscrcpy.desktop +++ b/snap/gui/guiscrcpy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=3.9.post15.dev +Version=3.9.2 Name=guiscrcpy GenericName=guiscrcpy Comment=Open Source Android Screen Mirroring System diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 1308cbdb..a0daafb6 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: guiscrcpy -version: 3.9.post15.dev +version: 3.9.2 summary: An opensource GUI for android screen mirroring description: | A full fledged GUI integration for the award winning open source scrcpy, for From 9eb3b5ed35da0e6b6652d46e40d4ed87820500ec Mon Sep 17 00:00:00 2001 From: Srevin Saju Date: Mon, 1 Jun 2020 11:38:43 +0300 Subject: [PATCH 6/7] Ignore Pipfile.lock --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f1661d1e..516387c7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ build .codacy-coverage *.snap prime +Pipfile.lock /.run/guiscrcpy.sh From a98b6fbe068fc8a481dffa039a660ce8bf9abe00 Mon Sep 17 00:00:00 2001 From: Srevin Saju Date: Mon, 1 Jun 2020 11:39:31 +0300 Subject: [PATCH 7/7] Announce to users the connection of a new device #142 --- guiscrcpy/launcher.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/guiscrcpy/launcher.py b/guiscrcpy/launcher.py index e07f1cdc..cf212039 100644 --- a/guiscrcpy/launcher.py +++ b/guiscrcpy/launcher.py @@ -79,7 +79,7 @@ environment = platform.System() # ============================================================================ -# Load cairosvg conditionally +# Load cairo-svg conditionally if environment.system() == "Linux": from cairosvg import svg2png # noqa: @@ -1340,11 +1340,14 @@ def start_act(self): # its important to pass the device serial id, if more than one # device is found arguments_scrcpy = f"-s {device_id} {arguments_scrcpy}" - # tell end users that the color of the device is this - self.display_public_message( - f"Device {device_id} is connected; (color id matches " - f"toolkit color)" - ) + + # tell end users that the color of the device is this + self.display_public_message( + f"Device {device_id} is connected; (color id matches " + f"toolkit color)" + ) + log("Device connection completed successfully.") + log("Private message box updated successfully") progress = self.progress(progress) # ====================================================================