Skip to content

Commit

Permalink
it works
Browse files Browse the repository at this point in the history
  • Loading branch information
TeaM-TL committed Dec 20, 2024
1 parent 6194a4f commit 8ce0c26
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 17 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 2024

5.1.3 get screenshost from clopboard on Linux, MacOS and Windows. Linux and BSD users - please install xclip
5.1.3 get screenshost from clipboard and copy result into clipboard. Linux and BSD users - please install xclip

5.1.2 fixed: compose and crop, updated italian translation, less duplicates, require Python 3.10+

Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ If ImageMagick or Wand are unavailable, Pillow is in use. There some limitation,
- processing JPG, PNG, SVG and TIFF images,
- processing picture in the fly, originals are safe,
- processing single file or whole directory,
- take screenshot (Linux) or get picture from clipboard (Windows and MacOS) and use it as source picture,
- after processing results is copied into clipboard (Windows and MacOS),
- get picture from clipboard and use it as source picture,
- after processing results is copied into clipboard,
- display selected tools,
- tools selection,
- preview orignal and result,
Expand Down Expand Up @@ -140,13 +140,13 @@ Download and install requirements:
- [ImageMagick](https://imagemagick.org/script/download.php#windows) - add path into `%PATH%` environment variable, enable install libraries!

```bash
python -m pip install pywin32 fotokilof
python -m pip install fotokilof
```

#### MacOS
Install requirements:
```bash
brew install imagemagick python@3.12 python-tk@3.12
brew install imagemagick python@3.13 python-tk@3.13
```

For Apple Silicon (M1, M2, M3) based Macs, the default Homebrew install directory differs from that on Homebrew Intel installs. The following environment variable allows FotoKilof to correctly locate the Homebrew-installed ImageMagick on Apple Silicon Macs:
Expand Down Expand Up @@ -215,5 +215,6 @@ Press F2 to toggle from Light to Dark or opposite.
![Python powered](python-powered.png)
[Imagemagick](https://github.com/ImageMagick/ImageMagick)
[Wand](https://github.com/emcconville/wand)
[ttkbootstrap](https://github.com/israel-dryer/ttkbootstrap)

[ttkbootstrap](https://github.com/israel-dryer/ttkbootstrap)
[FindSystemFontsFilename](https://github.com/moi15moi/FindSystemFontsFilename)
[Pillow](https://github.com/python-pillow/Pillow)
27 changes: 17 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
with open("fotokilof/version.py") as fp:
exec(fp.read(), pkg_vars)
setup(
name=pkg_vars['__appname__'],
version=pkg_vars['__version__'],
author=pkg_vars['__author__'],
author_email=pkg_vars['__email__'],
description=pkg_vars['__description__'],
keywords=pkg_vars['__keywords__'],
url=pkg_vars['__url__'],
name=pkg_vars["__appname__"],
version=pkg_vars["__version__"],
author=pkg_vars["__author__"],
author_email=pkg_vars["__email__"],
description=pkg_vars["__description__"],
keywords=pkg_vars["__keywords__"],
url=pkg_vars["__url__"],
long_description=long_description,
long_description_content_type="text/markdown",
license="MIT",
Expand All @@ -25,11 +25,18 @@
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
],
python_requires='>=3.10',
python_requires=">=3.10",
include_package_data=True,
packages=find_packages(),
install_requires=['FindSystemFontsFilename','pillow','requests','ttkbootstrap','wand'],
entry_points = {
install_requires=[
"FindSystemFontsFilename",
"pillow",
"requests",
"ttkbootstrap",
"wand",
'pywin32;platform_system=="Windows"',
],
entry_points={
"gui_scripts": [
"fotokilof = fotokilof:__main__",
]
Expand Down

0 comments on commit 8ce0c26

Please sign in to comment.