Skip to content

Commit

Permalink
Update UI to use libadwaita 1.4 widgets (#37)
Browse files Browse the repository at this point in the history
  • Loading branch information
tfuxu authored Nov 11, 2023
2 parents 60b96c8 + 918ed34 commit 83192fb
Show file tree
Hide file tree
Showing 14 changed files with 552 additions and 357 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- Success toast that shows after copying logs on error page
- New translations

### Changed

- Updated UI to take advantage of the new widgets included with libadwaita 1.4

### Removed

- Preferences window

## [0.3.1] - 2023-06-30

### Added
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ This is a little bit more advanced way of building Flatpak packages, but if you
#### Prerequisites:

- Flatpak Builder `flatpak-builder`
- GNOME SDK runtime `org.gnome.Sdk//44`
- GNOME Platform runtime `org.gnome.Platform//44`
- GNOME SDK runtime `org.gnome.Sdk//45`
- GNOME Platform runtime `org.gnome.Platform//45`

Install required runtimes:
```shell
flatpak install org.gnome.Sdk//44 org.gnome.Platform//44
flatpak install org.gnome.Sdk//45 org.gnome.Platform//45
```

#### Building Instructions:
Expand Down Expand Up @@ -116,7 +116,7 @@ The following packages are required to build Halftone:
- PyGObject `python-gobject`
- Blueprint [`blueprint-compiler`](https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/setup.html)
- GTK 4 `gtk4`
- Libadwaita (>= 1.2.0) `libadwaita`
- Libadwaita (>= 1.4.0) `libadwaita`
- Imagemagick `imagemagick`
- Meson `meson`
- Ninja `ninja-build`
Expand Down Expand Up @@ -162,6 +162,6 @@ This repository is licensed under the terms of the GNU GPLv3 license. You can fi
## Inspirations:
This project was started after I found out about [Pixfect](https://codeberg.org/daudix-UFO/Pixfect), a little Bash script that does exactly what Halftone does.

The user interface design is based on [Converter](https://gitlab.com/adhami3310/Converter) style, with itself is based on [Upscaler](https://gitlab.gnome.org/World/Upscaler) design.
The original user interface design is based on [Converter](https://gitlab.com/adhami3310/Converter) style, with itself is based on [Upscaler](https://gitlab.gnome.org/World/Upscaler) design.

This README (mostly [How to Build?](#how-to-build) section) is based on [Gradience](https://github.com/GradienceTeam/Gradience) README.
2 changes: 1 addition & 1 deletion TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- [ ] Show how smaller the file is after dithering
- [ ] Implement more dithering algorithms
- [ ] Replace color amount selector with predefined custom palettes
- [ ] Switch to different UI design ([Paleta](https://github.com/nate-xyz/paleta) seems like a good candidate)
- [x] Switch to different UI design ([Paleta](https://github.com/nate-xyz/paleta) seems like a good candidate)

### Issues:
- [ ] When opening image in dither page, the options used on previous image won't be applied on loaded image preview (lack of options retention mechanism)
4 changes: 2 additions & 2 deletions build-aux/flatpak/io.github.tfuxu.Halftone.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"app-id" : "io.github.tfuxu.Halftone",
"runtime" : "org.gnome.Platform",
"runtime-version" : "44",
"runtime-version" : "45",
"sdk" : "org.gnome.Sdk",
"command" : "halftone",
"finish-args" : [
Expand Down Expand Up @@ -49,7 +49,7 @@
{
"type": "git",
"url": "https://github.com/ImageMagick/ImageMagick.git",
"commit": "920f79206ff59f30a4cff22c9c9c393508b82663"
"tag": "7.1.1-21"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions build-aux/flatpak/pypi-dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"sources": [
{
"type": "file",
"url": "https://files.pythonhosted.org/packages/fa/a8/f76bbafa1a42f1ed45ece3c2b2e4f70a5d6cdb5f38bb0780db8efcdc58ab/Wand-0.6.11-py2.py3-none-any.whl",
"sha256": "1b77e25439ace57f665d1ccc6cff2766fad0834005b89ae3e7aaf3ba12b124b0"
"url": "https://files.pythonhosted.org/packages/59/d5/1bdd7c9662d5e9078e25ba0eb69bdb122859295746d40ab8dfef3a7b4d42/Wand-0.6.13-py2.py3-none-any.whl",
"sha256": "e5dda0ac2204a40c29ef5c4cb310770c95d3d05c37b1379e69c94ea79d7d19c0"
}
]
}
1 change: 1 addition & 0 deletions data/halftone.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
<file preprocess="xml-stripblanks" alias="image-adjust-brightness-symbolic.svg">icons/scalable/actions/image-adjust-brightness-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="image-adjust-contrast-symbolic.svg">icons/scalable/actions/image-adjust-contrast-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="image-adjust-size-symbolic.svg">icons/scalable/actions/image-adjust-size-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="sidebar-show-right-symbolic.svg">icons/scalable/actions/sidebar-show-right-symbolic.svg</file>
</gresource>
</gresources>
8 changes: 8 additions & 0 deletions data/icons/scalable/actions/sidebar-show-right-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions data/io.github.tfuxu.Halftone.gschema.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<key name="disable-preview-inaccuracy-warning" type="b">
<default>false</default>
</key>
<key name="preview-content-fit" type="i">
<!--<key name="preview-content-fit" type="i">
<range min="0" max="3"/>
<!-- Translators: Do not translate this description. -->
Translators: Do not translate this description.
<description>
0 - FILL, 1 - CONTAIN, 2 - COVER, 3 - SCALE_DOWN
</description>
<default>2</default>
</key>
</key>-->
</schema>
</schemalist>
5 changes: 5 additions & 0 deletions data/style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
button.osd.circular {
min-width: 42px;
min-height: 42px;
}

.dragndrop_overlay {
background-color: alpha(@accent_bg_color, 0.5);
color: @accent_fg_color;
Expand Down
Loading

0 comments on commit 83192fb

Please sign in to comment.