1
0
Fork 0
mirror of synced 2024-05-20 04:12:28 +12:00

Remove orbtk frontend (#119)

This commit is contained in:
Rafał Mikrut 2020-12-16 11:20:42 +01:00 committed by GitHub
parent f29e63d049
commit 5d0e784984
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 53 additions and 1336 deletions

View file

@ -169,53 +169,6 @@ jobs:
path: target/release/czkawka_gui
if: ${{ matrix.type == 'release' }}
linux-gui-orbtk:
strategy:
matrix:
toolchain: [ stable ]
type: [ release ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
override: true
- uses: actions/cache@v2
with:
path: |
target
key: linux-gui-orbtk-${{github.ref}}-${{github.sha}}
restore-keys: |
linux-gui-orbtk-${{github.ref}}-${{github.sha}}
- name: Install basic libraries
run: sudo apt-get update; sudo apt install libgtk-3-dev -y
- name: Build GUI Orbtk Debug
run: cargo build --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'debug'}}
- name: Build GUI Orbtk Release
run: cargo build --release --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'release'}}
- name: Store Linux GUI Orbtk
uses: actions/upload-artifact@v2
with:
name: czkawka_gui_orbtk-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_gui_orbtk
if: ${{ matrix.type == 'release' }}
linux-appimage-gui:
strategy:
matrix:

View file

@ -47,47 +47,3 @@ jobs:
name: czkawka_cli-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_cli
if: ${{ matrix.type == 'release' }}
macos-gui-orbtk:
strategy:
matrix:
toolchain: [ stable ]
type: [ release ]
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
override: true
- uses: actions/cache@v2
with:
path: |
target
key: macos-gui-orbtk-${{github.ref}}-${{github.sha}}
restore-keys: |
macos-gui-orbtk-${{github.ref}}-${{github.sha}}
- name: Build GUI Orbtk Debug
run: cargo build --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'debug'}}
- name: Build GUI Orbtk Release
run: cargo build --release --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'release'}}
- name: Store MacOS GUI Orbtk
uses: actions/upload-artifact@v2
with:
name: czkawka_gui_orbtk-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_gui_orbtk
if: ${{ matrix.type == 'release' }}

View file

@ -144,51 +144,6 @@ jobs:
python misc/check_results.py TestSuite 14 8
if: ${{ matrix.type == 'release' }}
windows-gui-orbtk:
strategy:
matrix:
toolchain: [ stable ]
type: [ release ]
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
override: true
- uses: actions/cache@v2
with:
path: |
target
key: windows-gui-orbtk-${{github.ref}}-${{github.sha}}
restore-keys: |
windows-gui-orbtk-${{github.ref}}-${{github.sha}}
- name: Build GUI Orbtk Debug
run: cargo build --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'debug'}}
- name: Build GUI Orbtk Release
run: cargo build --release --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'release'}}
- name: Store Windows GUI Orbtk
uses: actions/upload-artifact@v2
with:
name: czkawka_gui_orbtk-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_gui_orbtk.exe
if: ${{ matrix.type == 'release' }}
windows-gui:
strategy:
matrix:

1163
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -3,7 +3,6 @@ members = [
"czkawka_core",
"czkawka_cli",
"czkawka_gui",
"czkawka_gui_orbtk",
]
#[profile.release]
#lto = true

View file

@ -67,7 +67,7 @@ Sadly some features are not available like mounted drives
sudo snap install czkawka
```
## Flatpak
### Flatpak
Maybe someday
@ -113,12 +113,6 @@ cargo run --bin czkawka_gui
```
For Linux-to-Windows cross-building instruction look at the CI.
![GUI GTK](https://user-images.githubusercontent.com/41945903/94850801-c5945380-0427-11eb-8d4c-af4946ab02d5.png)
- Run alternative Orbtk GUI (Still WIP, currently stopped due https://github.com/intellij-rust/intellij-rust/issues/5943)
```
cargo run --bin czkawka_gui_orbtk
```
![GUI Orbtk](https://user-images.githubusercontent.com/41945903/92405241-7b27fb80-f135-11ea-9fc4-5ebc2b76b011.png)
- Run CLI(this will print help with a lot of examples)
```
cargo run --bin czkawka_cli

View file

@ -1,14 +0,0 @@
[package]
name = "czkawka_gui_orbtk"
version = "1.5.1"
authors = ["Rafał Mikrut <mikrutrafal@protonmail.com>"]
edition = "2018"
description = "Orbtk frontend of Czkawka"
license = "MIT"
homepage = "https://github.com/qarmin/czkawka"
repository = "https://github.com/qarmin/czkawka"
[dependencies]
czkawka_core = { path = "../czkawka_core" }
#orbtk = {git = "https://github.com/redox-os/orbtk", branch="develop"}
orbtk = "=0.3.1-alpha3"

View file

@ -1,53 +0,0 @@
use orbtk::prelude::*;
fn main() {
Application::new()
.window(|ctx| {
Window::new()
.title("Czkawka - Orbtk backend")
.position((100.0, 100.0))
.size(600.0, 500.0)
.resizeable(true)
.child(
TabWidget::new()
.close_button(false)
.tab(
"Duplicate Finder",
Grid::new()
.columns(Columns::create().push(105.0).push(67.0))
.rows(Rows::create().push(50.0).push(32.0).push(32.0).push(32.0).push(32.0))
.margin((84, 40))
.child(TextBlock::new().text("Included Directory:").v_align("center").h_align("start").attach(Grid::column(0)).attach(Grid::row(0)).build(ctx))
.child(
TextBox::new()
.id("included_directory")
.water_mark("Included Directory")
.v_align("center")
.h_align("start")
.attach(Grid::column(1))
.attach(Grid::row(0))
.min_width(300.0)
.build(ctx),
)
.child(TextBlock::new().text("Excluded Directory:").v_align("center").h_align("start").attach(Grid::column(0)).attach(Grid::row(1)).build(ctx))
.child(
TextBox::new()
.id("excluded_directory")
.water_mark("Excluded Directory")
.v_align("center")
.h_align("start")
.attach(Grid::column(1))
.attach(Grid::row(1))
.min_width(300.0)
.build(ctx),
)
.child(TextBlock::new().text("Info:\n\n rr").v_align("center").h_align("start").attach(Grid::column(0)).attach(Grid::row(2)).build(ctx))
.build(ctx),
)
.close_button(false)
.tab("Empty Folders", TextBlock::new().text("Empty Folders").build(ctx))
.build(ctx),
)
.build(ctx)
})
.run();
}

View file

@ -31,15 +31,6 @@ then
fi
git reset --hard
cd "$CZKAWKA_PATH/czkawka_gui_orbtk"
sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_gui_orbtk/Cargo.toml"
cargo package --allow-dirty
if [ $(echo $?) != "0" ]
then
echo "Cargo package failed GUI ORBTK"
exit 1
fi
git reset --hard
@ -52,8 +43,3 @@ cd "$CZKAWKA_PATH/czkawka_gui"
sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_gui/Cargo.toml"
cargo publish --allow-dirty
git reset --hard
cd "$CZKAWKA_PATH/czkawka_gui_orbtk"
sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_gui_orbtk/Cargo.toml"
cargo publish --allow-dirty
git reset --hard