Skip to content
This repository has been archived by the owner on Dec 29, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into beta-qtpy
Browse files Browse the repository at this point in the history
  • Loading branch information
srevinsaju committed Jun 1, 2020
2 parents eb43d4a + a98b6fb commit 8383dba
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 9 deletions.
32 changes: 31 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)].
<a href="https://github.com/srevinsaju/guiscrcpy/graphs/contributors"><img src="https://opencollective.com/guiscrcpy/contributors.svg?width=890&button=false" /></a>

### Financial Contributors

Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/guiscrcpy/contribute)]

#### Individuals

<a href="https://opencollective.com/guiscrcpy"><img src="https://opencollective.com/guiscrcpy/individuals.svg?width=890"></a>

#### 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)]

<a href="https://opencollective.com/guiscrcpy/organization/0/website"><img src="https://opencollective.com/guiscrcpy/organization/0/avatar.svg"></a>
<a href="https://opencollective.com/guiscrcpy/organization/1/website"><img src="https://opencollective.com/guiscrcpy/organization/1/avatar.svg"></a>
<a href="https://opencollective.com/guiscrcpy/organization/2/website"><img src="https://opencollective.com/guiscrcpy/organization/2/avatar.svg"></a>
<a href="https://opencollective.com/guiscrcpy/organization/3/website"><img src="https://opencollective.com/guiscrcpy/organization/3/avatar.svg"></a>
<a href="https://opencollective.com/guiscrcpy/organization/4/website"><img src="https://opencollective.com/guiscrcpy/organization/4/avatar.svg"></a>
<a href="https://opencollective.com/guiscrcpy/organization/5/website"><img src="https://opencollective.com/guiscrcpy/organization/5/avatar.svg"></a>
<a href="https://opencollective.com/guiscrcpy/organization/6/website"><img src="https://opencollective.com/guiscrcpy/organization/6/avatar.svg"></a>
<a href="https://opencollective.com/guiscrcpy/organization/7/website"><img src="https://opencollective.com/guiscrcpy/organization/7/avatar.svg"></a>
<a href="https://opencollective.com/guiscrcpy/organization/8/website"><img src="https://opencollective.com/guiscrcpy/organization/8/avatar.svg"></a>
<a href="https://opencollective.com/guiscrcpy/organization/9/website"><img src="https://opencollective.com/guiscrcpy/organization/9/avatar.svg"></a>

## License

```
Expand Down
6 changes: 3 additions & 3 deletions docs/FEATURES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <img src="../guiscrcpy/ui/icons/refresh-page-option.svg" alt="refresh icon" style="zoom:2.5%" /> 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 <img src="../guiscrcpy/ui/icons/refresh-page-option.svg" alt="refresh icon" height="25px" /> 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
Expand Down Expand Up @@ -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 <img src="../guiscrcpy/ui/icons/volume-up-interface-symbol.svg" alt="refresh icon" style="zoom:2.5%" /> 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 <img src="../guiscrcpy/ui/icons/volume-up-interface-symbol.svg" alt="refresh icon" height="25px" /> on the main gui.

<br>

Expand Down Expand Up @@ -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 <img src="https://user-images.githubusercontent.com/48695438/76633072-37bd4d80-6555-11ea-89f8-61a5921c805c.png" style="zoom:25%;" /> 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 <img src="https://user-images.githubusercontent.com/48695438/76633072-37bd4d80-6555-11ea-89f8-61a5921c805c.png" height="25px" /> and it will load in a few moments.

------------------

2 changes: 1 addition & 1 deletion guiscrcpy.desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Desktop Entry]
Version=3.9
Version=3.9.2
Name=guiscrcpy
GenericName=guiscrcpy
Comment=Open Source Android Screen Mirroring System
Expand Down
2 changes: 2 additions & 0 deletions guiscrcpy/lib/mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion guiscrcpy/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
"""

VERSION = '3.9'
VERSION = '3.9.2'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

setup(
name='guiscrcpy',
version='3.9',
version='3.9.2',
description='An Open Source - Fast - Android Screen Mirroring system.',
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down
2 changes: 1 addition & 1 deletion snap/gui/guiscrcpy.desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Desktop Entry]
Version=3.9
Version=3.9.2
Name=guiscrcpy
GenericName=guiscrcpy
Comment=Open Source Android Screen Mirroring System
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: guiscrcpy
version: '3.9'
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
Expand Down

0 comments on commit 8383dba

Please sign in to comment.