Commit ccd12688 authored by Meade's avatar Meade

Created logo and icon images, bunches of small improvements, added Arch...

Created logo and icon images, bunches of small improvements, added Arch PKGBUILD, and added install/uninstall scripts.
parent 68f25258
/target/
**/*.rs.bk
*.glade~
\ No newline at end of file
*.glade~
*.glade#
[Desktop Entry]
Version=1.0
Name=BrewStillery
Comment=BrewStillery is a brewer's, vintner's, and distiller's calculator. It has a multitude of great functions, such as calculating ABV, determining carbonation, and total sparge water needed.
Exec=/usr/bin/BrewStillery
Icon=/usr/share/BrewStillery/BrewStilleryIcon.svg
Terminal=false
Type=Application
Categories=GTK;Utility;Science;Calculator;
\ No newline at end of file
# Maintainer: Meade And Emily <thedarkula2049@gmail.com>
pkgname=brewstillery
pkgver=1.1.0
pkgrel=1
pkgdesc="BrewStillery is a brewer's, vintner's, and distiller's calculator. It has a multitude of great functions, such as calculating ABV, determining carbonation, and total sparge water needed."
url="https://monkeylog.in"
arch=('i686' 'x86_64')
license=('AGPL3')
makedepends=('git' 'cargo')
provides=('brewstillery')
conflicts=('brewstillery')
source=('git://github.com/MonkeyLog/BrewStillery')
md5sums=('SKIP')
build() {
cd BrewStillery
cargo build --release
}
package() {
cd $srcdir/BrewStillery/target/release
install -Dm755 BrewStillery "$pkgdir/usr/bin/BrewStillery"
cd $srcdir/BrewStillery/Arch
install -Dm755 BrewStillery.desktop "$pkgdir/usr/share/applications/BrewStillery.desktop"
cd $srcdir/BrewStillery/media
install -Dm755 BrewStilleryIcon.svg "$pkgdir/usr/share/BrewStillery/BrewStilleryIcon.svg"
install -Dm755 BrewStilleryLogo.svg "$pkgdir/usr/share/BrewStillery/BrewStilleryLogo.svg"
}
[root]
name = "BrewStillery"
version = "1.0.1"
version = "1.1.0"
dependencies = [
"gtk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -151,7 +151,7 @@ dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
]
......@@ -218,7 +218,7 @@ dependencies = [
[[package]]
name = "lazy_static"
version = "0.2.8"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
......@@ -286,7 +286,7 @@ name = "thread_local"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
"unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
......@@ -331,7 +331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum gobject-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "edc95561e538381576425264a4ddd08c65d5da218f10b2a47b4479dd147775da"
"checksum gtk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce17f98e7dcdc9d06b3a5f7621d796a24937c04953481205b1be267c5a02697a"
"checksum gtk-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "854b56ce6d6b05945f7735651482835c5ac1f8582142ce67306726259a3dafb0"
"checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
"checksum lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c9e5e58fa1a4c3b915a561a78a22ee0cac6ab97dca2504428bc1cb074375f8d5"
"checksum libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "d1419b2939a0bc44b77feb34661583c7546b532b192feab36249ab584b86856c"
"checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
"checksum pango 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5afa4b4c5380315b12075e7767d9bdd62d53beeb6087d9287ef6990e57a6b643"
......
[package]
name = "BrewStillery"
version = "1.0.1"
version = "1.1.0"
authors = ["Emily And Meade <thedarkula2049@gmail.com>"]
description = "BrewStillery is a brewer's, vintner's, and distiller's calculator. It has a multitude of great functions, such as calculating ABV, determining carbonation, and total sparge water needed."
# documentation to come
......@@ -10,9 +10,11 @@ repository = "https://github.com/MonkeyLog/BrewStillery"
readme = "README.md"
keywords = ["beer", "wine", "champagne", "distilling", "calculator"]
categories = ["science", "gui"]
license = "AGPL-1.0"
license = "AGPL-3.0"
exclude = ["media/screenshots/*", "Arch/*"]
[badges]
maintenance = { status = "actively-developed" }
exclude = ["screenshots/*", "PKGBUILD"]
[dependencies]
regex = "0.2.2"
......
......@@ -6,11 +6,11 @@ Written in Rust, using GTK3
## Screenshots:
![General Tab Screenshot](screenshots/BrewStilleryGeneralTab.png)
![General Tab Screenshot](media/screenshots/BrewStilleryGeneralTab.png)
![Beer Tab Screenshot](screenshots/BrewStilleryBeerTab.png)
![Beer Tab Screenshot](media/screenshots/BrewStilleryBeerTab.png)
![Champagne Tab Screenshot](screenshots/BrewStilleryChampagneTab.png)
![Champagne Tab Screenshot](media/screenshots/BrewStilleryChampagneTab.png)
## To Do:
......@@ -21,6 +21,7 @@ Written in Rust, using GTK3
## Building:
In Cargo.toml, set ```codegen-units``` to however many cores you want to use to compile.
To build, just run ```cargo build --release```. The resultant binary will be ```target/release/BrewStillery```.
To install/uninstall system-wide, run ```install.sh``` or ```uninstall.sh```
## Sources:
......
This diff is collapsed.
This diff is collapsed.
#!/bin/sh
cargo build --release &&
sudo install -Dm755 ../target/release/BrewStillery /usr/bin/BrewStillery &&
install -Dm755 ../Arch/BrewStillery.desktop "$pkgdir/usr/share/applications/BrewStillery.desktop" &&
install -Dm755 ../media/BrewStilleryIcon.svg "$pkgdir/usr/share/BrewStillery/BrewStilleryIcon.svg" &&
install -Dm755 ../media/BrewStilleryLogo.svg "$pkgdir/usr/share/BrewStillery/BrewStilleryLogo.svg"
\ No newline at end of file
#!/bin/sh
sudo rm /usr/bin/BrewStillery &&
sudo rm /usr/share/applications/BrewStillery.desktop &&
sudo rm -rf /usr/share/BrewStillery
\ No newline at end of file
......@@ -945,11 +945,11 @@
<object class="GtkEntry" id="gyleCO2Input">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Desired CO2 Level</property>
<property name="tooltip_text" translatable="yes">Desired CO2 Level (g/L)</property>
<property name="margin_left">3</property>
<property name="margin_right">3</property>
<property name="xalign">0.5</property>
<property name="placeholder_text" translatable="yes">Desired CO2 Level</property>
<property name="placeholder_text" translatable="yes">Desired CO2 Level (g/L)</property>
</object>
<packing>
<property name="expand">True</property>
......@@ -1223,6 +1223,81 @@
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="brewstilleryLogo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">/usr/share/BrewStillery/BrewStilleryLogo.svg</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="versionNumber">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Version 1.1.0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLinkButton" id="githubLink">
<property name="label" translatable="yes">Visit Us On github</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="uri">https://github.com/MonkeyLog/BrewStillery</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkLinkButton" id="cratesLink">
<property name="label" translatable="yes">Visit Us On crates.io</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<property name="uri">https://crates.io/crates/BrewStillery</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="position">4</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">About</property>
</object>
<packing>
<property name="position">4</property>
<property name="tab_fill">False</property>
</packing>
</child>
</object>
</child>
</object>
......
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