Skip to content

Commit

Permalink
Spring Cleaning and multiple features (#70)
Browse files Browse the repository at this point in the history
* Sprint Cleaning

* Simplifying again

* Simplifying again2

* Sorting

* UI

* Basic saving to file

* Multithreading and also save button

* Move items a little

* Adding to Regex

* Regex, probably nees to be changed

* Regex support

* Regex fixes

* Ui

* Saving

* Saving rules

* Fixed calculating of items

* Added cli arguments

* Translations

* PL translation

* Load/Save languages

* Languages

* Again languages

* Basic Translations

* 180 instead 250

* Replace images

* 1.69

* Toolchain

* 4.8
  • Loading branch information
qarmin authored May 21, 2023
1 parent c6d84cb commit 4087d0b
Show file tree
Hide file tree
Showing 95 changed files with 6,724 additions and 2,158 deletions.
36 changes: 7 additions & 29 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,14 @@ jobs:
linux-default:
strategy:
matrix:
toolchain: [ stable, 1.65.0 ]
toolchain: [ stable, 1.69.0 ]
type: [ release ]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
override: true

- uses: actions/cache@v3
with:
path: |
target
key: linux-default-${{github.ref}}-${{github.sha}}
restore-keys: |
linux-default-${{github.ref}}-${{github.sha}}
- name: Setup rust version
run: rustup default ${{ matrix.toolchain }}

- name: Install basic libraries
run: sudo apt-get update; sudo apt install libgtk-4-dev -y
Expand Down Expand Up @@ -57,18 +47,8 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
override: true

- uses: actions/cache@v3
with:
path: |
target
key: linux-appimage-gui-${{github.ref}}-${{github.sha}}
restore-keys: |
linux-appimage-gui-${{github.ref}}-${{github.sha}}
- name: Setup rust version
run: rustup default ${{ matrix.toolchain }}

- name: Install Dependencies
run: sudo apt-get update; sudo apt install libgtk-4-dev librsvg2-dev wget fuse libfuse2 -y
Expand Down Expand Up @@ -123,10 +103,8 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
override: true
- name: Setup rust version
run: rustup default ${{ matrix.toolchain }}

- name: Install Dependencies
run: sudo apt-get update; sudo apt install libgtk-4-dev librsvg2-dev wget fuse libfuse2 -y xvfb
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,8 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
override: true

- uses: actions/cache@v3
with:
path: |
target
key: mac-${{github.ref}}-${{github.sha}}
restore-keys: |
mac-${{github.ref}}-${{github.sha}}
- name: Setup rust version
run: rustup default ${{ matrix.toolchain }}

- name: Install Homebrew
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
Expand Down
15 changes: 2 additions & 13 deletions .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,8 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/cache@v3
with:
path: |
target
key: quality-${{github.ref}}-${{github.sha}}
restore-keys: |
quality-cli-${{github.ref}}-${{github.sha}}
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: rustfmt, clippy
override: true
- name: Setup rust version
run: rustup default ${{ matrix.toolchain }}

- name: Install Gtk 4
run: sudo apt-get update; sudo apt install -y libgtk-4-dev -y
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
container:
runs-on: ubuntu-22.04
container:
image: ghcr.io/piegamesde/gtk4-cross:gtk-4.6
image: ghcr.io/piegamesde/gtk4-cross:gtk-4.8
steps:
- uses: actions/checkout@v3
- name: Install additional dependencies
Expand Down
3 changes: 1 addition & 2 deletions .rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

newline_style = "Unix"
max_width = 250
max_width = 180
remove_nested_parens = true
Loading

0 comments on commit 4087d0b

Please sign in to comment.