Skip to content

Commit

Permalink
Merge branch 'develop' into fix-autoscroll-with-delay
Browse files Browse the repository at this point in the history
  • Loading branch information
slspencer committed Sep 17, 2024
2 parents 22e950f + 6528274 commit 8eba7db
Show file tree
Hide file tree
Showing 137 changed files with 6,454 additions and 7,656 deletions.
2 changes: 1 addition & 1 deletion .github/README-DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Check the sections below for your operating system to find additional installation requirements.

## Code Documentation
* [Doxygen Docs](https://fashionfreedom.github.io/Seamly2D/)
* [Doxygen Docs](https://fashionfreedom.github.io/Seamly2D/)

## Development methods and styles:
* [GitHub Flow workflow](https://githubflow.github.io)
Expand Down
5 changes: 3 additions & 2 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ Learn more about Seamly2D by joining our friendly, active user [forum](https://f

## Supported platforms:
* Windows 10 & 11 (32-bit and 64-bit)
* Most current Linux distros via [Flathub](https://flathub.org/apps/details/net.seamly.seamly2d)
* Most current Linux distros via [Flathub](https://flathub.org/apps/io.seamly.seamly2d)
* macOS High Sierra 10.13 (64-bit) or later

## Download Seamly2D:

| Windows 64-bit | Windows 32-bit | MacOS | Linux AppImage | Linux Flatpak |
| :---: | :---: | :---: | :---: | :---: |
| [![Seamly2d-windows.zip](img/Microsoft_logo-60x60px.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-windows.zip) | [![Seamly2d-win32.zip](img/Microsoft_logo-60x60px.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-win32.zip) | [<picture><source media="(prefers-color-scheme: dark)" srcset="img/white-apple-logo-transparent-49x60px.png"><source media="(prefers-color-scheme: light)" srcset="img/Apple_logo_black.png" ><img src="img/Apple_logo_black.png" height="60"></picture>](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-macos.zip) | [![Seamly2D-x86_64.AppImage](img/Tux_Mono_60x60.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-x86_64.AppImage) | [<img src="https://dl.flathub.org/assets/badges/flathub-badge-en.svg" alt="Download On Flathub" height="60">](https://flathub.org/apps/details/net.seamly.seamly2d) |
| [![Seamly2d-windows.zip](img/Microsoft_logo-60x60px.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-windows.zip) | [![Seamly2d-win32.zip](img/Microsoft_logo-60x60px.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-win32.zip) | [<picture><source media="(prefers-color-scheme: dark)" srcset="img/white-apple-logo-transparent-49x60px.png"><source media="(prefers-color-scheme: light)" srcset="img/Apple_logo_black.png" ><img src="img/Apple_logo_black.png" height="60"></picture>](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-macos.zip) | [![Seamly2D-x86_64.AppImage](img/Tux_Mono_60x60.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-x86_64.AppImage) | [<img src="https://dl.flathub.org/assets/badges/flathub-badge-en.svg" alt="Download On Flathub" height="60">](https://flathub.org/apps/io.seamly.seamly2d) |

___________________________________________________
## Seamly2D Community Resources:
Expand All @@ -42,6 +42,7 @@ ___________________________________________________
## Seamly2D Developer Resources:
* [Developer README](README-DEVELOPER.md) - _current_
* [Developer Wiki](https://github.com/FashionFreedom/Seamly2D/wiki) - _needs updating_
* [Doxygen docs](https://fashionfreedom.github.io/Seamly2D/)
___________________________________________________
## LICENSING

Expand Down
2 changes: 1 addition & 1 deletion Seamly2D.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
message("Entering Seamly2D.pro")

#These checks need because we can quote all paths that contain space.
#Check if spaces are in directory names
LIST = $$split(PWD,' ')
count(LIST, 1, >): error("The build will fail. Path '$${PWD}' contains space!!!")

Expand Down
Binary file modified dist/Seamly2D.icns
Binary file not shown.
Binary file modified dist/SeamlyMe.icns
Binary file not shown.
Binary file added dist/seamly2d_screenshot_linux.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 8eba7db

Please sign in to comment.