Skip to content

Commit

Permalink
Merge pull request #93 from dynobo/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
dynobo authored Dec 6, 2020
2 parents 4044c55 + 58b4b94 commit 9b0d684
Show file tree
Hide file tree
Showing 37 changed files with 4,833 additions and 41 deletions.
28 changes: 19 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
python3.8-tk
python3.8-venv
- name: Install normcap dependencies
run: >
run: >
sudo apt-get install
tesseract-ocr
tesseract-ocr-deu
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:

# RELEASE
- name: Compress build files
run: cd dist && tar -czvf normcap_linux64.tar.gz normcap-v*
run: cd dist && tar -czvf normcap_linux64.tar.gz normcap
- name: Draft release
uses: softprops/action-gh-release@v1
with:
Expand All @@ -78,7 +78,7 @@ jobs:
- name: Create virtual env
run: python3 -m venv .venv
- name: Install deps
run: .venv/bin/python -m pip install -r requirements-macos.txt
run: .venv/bin/python -m pip install -r requirements-macos.txt
env:
CI: true

Expand All @@ -92,7 +92,7 @@ jobs:

# RELEASE
- name: Compress build files
run: cd dist && tar -czvf normcap_macos.tar.gz normcap-v*
run: cd dist && tar -czvf normcap_macos.tar.gz normcap
- name: Draft release
uses: softprops/action-gh-release@v1
with:
Expand All @@ -110,21 +110,21 @@ jobs:
steps:
- uses: actions/checkout@master

# PREPARE
# PREPARE
- name: Install venv
run: >
python -m pip install virtualenv;
python -c "import os, sys; print(os.path.dirname(sys.executable))";
python --version;
- name: Create virtual env
- name: Create virtual env
run: virtualenv --python C:\hostedtoolcache\windows\Python\3.7.9\x64\python.exe venv
env:
CI: true
- name: Install tesserocr
run: >
.\venv\Scripts\activate;
pip install https://github.com/simonflueckiger/tesserocr-windows_build/releases/download/tesserocr-v2.4.0-tesseract-4.0.0/tesserocr-2.4.0-cp37-cp37m-win_amd64.whl;
deactivate;
deactivate;
- name: Download tessdata
run: >
new-item -Name tessdata -ItemType directory;
Expand Down Expand Up @@ -155,13 +155,23 @@ jobs:
python build.py;
deactivate;
# RELEASE
# Zip
- name: Compress build files
run: cd dist; 7z a -tzip ..\normcap_win64.zip *; cd ..

# Installer
- name: NSIS installer
run: >
move dist\normcap\ressources\win_installer.nsis dist\normcap\;
makensis dist\normcap\win_installer.nsis
# Release
- name: Draft release
uses: softprops/action-gh-release@v1
with:
files: normcap_win64.zip
files: |
dist\normcap\normcap_win64_installer.exe
normcap_win64.zip
body: See [CHANGELOG](https://github.com/dynobo/normcap/blob/master/CHANGELOG.md) for details.
draft: true
prerelease: true
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Edit at https://www.gitignore.io/?templates=python

# Own
shortcut-properties.nsh
.vscode/
cov.xml
coverage
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## v0.1.9 (2020-12-06)

**Changes:**
- Add installer for MS Windows to enables notification management
- Fix crash by caused by missing notification icon in certain setups


## v0.1.8 (2020-11-17)

**Changes:**
Expand Down
21 changes: 16 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
2. Select a region on the screen
3. Retrieve recognized text in clipboard

[![Screencast](https://user-images.githubusercontent.com/11071876/97786948-39ed1e80-1baf-11eb-852c-bce87abc6890.gif)](https://raw.githubusercontent.com/dynobo/normcap/master/normcap/ressources/normcap.gif)
[![Screencast](https://user-images.githubusercontent.com/11071876/97786948-39ed1e80-1baf-11eb-852c-bce87abc6890.gif)](https://raw.githubusercontent.com/dynobo/normcap/master/assets/normcap.gif)

## Installation

Expand Down Expand Up @@ -67,13 +67,23 @@ pip install normcap

3\. Execute `normcap`

### On Windows _(recommended method)_
### On Windows

Choose _one_ of the following three installation method A), B) or C).

#### A) Recommended method

1.) Download and run `normcap_win64_installer.exe` from the [latest release](https://github.com/dynobo/normcap/releases) (admin rights required)

2.) Start the shortcut `NormCap` from start menu.

#### B) Without real installation (portable)

1\. Download and extract the binary package from the [latest release](https://github.com/dynobo/normcap/releases) (no installation required)

2\. Execute `normcap-v{version}.exe`
2\. Execute `normcap.exe`

### On Windows _(alternative method)_
#### C) Package installation

1\. Install "Tesseract", e.g. by using the [installer provided by UB Mannheim](https://github.com/UB-Mannheim/tesseract/wiki)

Expand Down Expand Up @@ -151,7 +161,8 @@ optional arguments:
-v, --verbose print debug information to console (default: False)
-m MODE, --mode MODE startup mode [raw,parse] (default: parse)
-l LANG, --lang LANG languages for ocr, e.g. eng+deu (default: eng)
-c COLOR, --color COLOR set primary color for UI (default: #FF0000)
-n, --no-notifications disable notifications shown after ocr detection (default: False)
-c COLOR, --color COLOR set primary color for UI (default: #BF616A)
-p PATH, --path PATH set a path for storing images (default: None)
```

Expand Down
6 changes: 6 additions & 0 deletions assets/icon/create_icon.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Create icon from SVG source

1. Export SVG to PNG (512x512) with Inkscape
2. Upload to <https://convertico.com/>
3. Select sizes: 256, 128, 64, 48, 32, 24
4. Convert and download
Binary file added assets/icon/normcap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9b0d684

Please sign in to comment.