Commit c05f0dbc authored by Florian Blasius's avatar Florian Blasius

OrbTk update.

parent 61cec057
Pipeline #6403 passed with stages
in 22 minutes and 3 seconds
image: 'rust:latest'
stages:
- build
- test
variables:
CARGO_HOME: $CI_PROJECT_DIR/cargo
CARGO_HOME: $CI_PROJECT_DIR/cargo
before_script:
- apt-get update -qq
- apt-get install -qq build-essential curl git
linux:
before_script:
- apt-get update && apt-get -y install cmake
- apt-get install -y libsdl2-dev
build:linux:
stage: build
script:
- rustup default nightly
- cargo build
cache:
paths:
- cargo/
- target/
redox:
variables:
CC: "x86_64-unknown-redox-gcc"
build:web:
stage: build
before_script:
- apt-get update -qq
- apt-get install -qq build-essential curl git gnupg software-properties-common apt-transport-https
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F
- add-apt-repository 'deb https://static.redox-os.org/toolchain/apt /'
- apt-get update -qq && apt-get install -qq x86-64-unknown-redox-gcc
- rustup default nightly-2018-07-18
- rustup target add x86_64-unknown-redox
- cargo install --force cargo-web
script:
- cargo build --target x86_64-unknown-redox
- cargo web build
cache:
paths:
- cargo/
- target/
build:redox:
image: "redoxos/redoxer"
stage: build
script:
- redoxer build --verbose
cache:
paths:
- cargo/
- target/
test:linux:
stage: test
before_script:
- apt-get update && apt-get -y install cmake
- apt-get install libsdl2-dev -y
dependencies:
- build:linux
script:
- rustup default nightly
- cargo test
This diff is collapsed.
......@@ -2,8 +2,8 @@
name = "calculator"
version = "0.1.0"
authors = ["Florian Blasius <flovanpt@posteo.de>"]
edition = "2018"
[dependencies]
calculate = "0.5.1"
lazy_static = "1.2.0"
lazy_static = "1.4.0"
orbtk = { git = "https://gitlab.redox-os.org/redox-os/orbtk.git" }
\ No newline at end of file
[[apps]]
name = "calculator"
width = 212
height = 360
\ No newline at end of file
......@@ -3,6 +3,64 @@
[![Build status](https://gitlab.redox-os.org/redox-os/orbcalculator/badges/master/build.svg)](https://gitlab.redox-os.org/redox-os/orbcalculator/pipelines)
[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
Calculator written in rust, developed with OrbTk.
Calculator written in rust, developed with OrbTk https://gitlab.redox-os.org/redox-os/orbtk".
<img alt="Redox" height="300" src="https://gitlab.redox-os.org/redox-os/assets/raw/master/screenshots/Calculator.png">
\ No newline at end of file
<img alt="Redox" height="300" src="https://gitlab.redox-os.org/redox-os/assets/raw/master/screenshots/Calculator.png">
## Platforms
* Redox OS (native | cargo-node)
* Linux (native | cargo-node)
* macOS (native | cargo-node)
* Windows (native | cargo-node)
* openBSD (not tested, but should work)
* Web (cargo-node)
* Android (native planned after 0.3 | cargo-node)
* iOS (native planned after 0.3 | cargo-node planned after 0.3)
* Ubuntu Touch (native planned after 0.3 | cargo-node planned for 0.3)
## Run
You can start the calculator by executing the following command:
```text
cargo run --release
```
## Run with cargo-node
To run the calculator on as browser, electron or cordova app you have to install
```text
cargo install -f cargo-node
```
Before you could use cargo node you have to install `npm` version 6.9.0. It is included in the `Node.js` version 10.16.3. You could download it from https://nodejs.org/dist/v10.16.3/.
Rust's `cargo` is presumed. All other dependencies of cargo node will be installed automatic.
### Start
You can start the widgets example by executing the following command:
* Run as browser app:
```text
cargo node run --browser
```
* Run as electron app:
```text
cargo node run --electron
```
* Run as cordova app on android:
```text
cargo node run --android
```
## License
Licensed under MIT license ([LICENSE](LICENSE)).
\ No newline at end of file
.header {
background: #444e55;
}
.content {
background: #3b434a;
}
text-box {
background: transparent;
border-width: 0;
color: #9dafbf;
font-size: 16;
}
#input {
font-size: 16;
}
text-block {
font-size: 42;
color: #dfebf5;
}
#input {
background: transparent;
}
button {
border-radius: 1;
font-size: 20;
}
\ No newline at end of file
.header {
background: #ffffff;
}
.content {
background: #fafafa;
}
text-box {
color: #4d4c4c;
}
text-block {
color: #4d4c4c;
}
\ No newline at end of file
calculatorbutton {
background: #6C7A90;
border-radius: 2;
width: 40;
height: 40;
}
calculatorbutton:active {
background: #8cafd1;
}
container {
background: transparent;
padding: 2;
}
textbox {
width: 172;
}
\ No newline at end of file
calculatorbutton {
background: #e5e5e5;
color: black;
border-radius: 2;
width: 40;
height: 40;
}
calculatorbutton:active {
background: #d6d6d6;
}
container {
background: transparent;
padding: 2;
}
textbox {
width: 172;
}
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment