Skip to content

Commit

Permalink
Prepare 0.1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
tkashkin committed Aug 5, 2018
1 parent 00c7887 commit b80ba29
Show file tree
Hide file tree
Showing 14 changed files with 296 additions and 86 deletions.
28 changes: 28 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---

language: node_js

node_js:
- lts/*

sudo: required

services:
- docker

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libstdc++-5-dev

cache:
directories:
- /tmp/liftoff

install:
- npm install @elementaryos/houston

script:
- houston ci
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ Simple app to control Redmond Skykettle RK-G200S/RK-G210S/RK-G211S (and probably
- RK-G200S, RK-G210S, RK-G211S (tested)
- other 2nd-gen devices (RK-G2xx) (not tested)

## Runtime dependencies
* bluez

Note: Bluetooth 4.0 adapter with BLE support required.

## Installation
Prebuilt releases can be found on [releases page](https://github.com/tkashkin/Boiler/releases).

Expand Down
15 changes: 13 additions & 2 deletions data/com.github.tkashkin.boiler.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,18 @@
<summary>Control your kettle remotely</summary>

<description>
<p>Simple app to control Redmond Skykettle RK-G200S.</p>
<p>Simple app to control smart kettles using bluetooth.</p>
<p>Supported devices:</p>
<ul>
<li>
Redmond
<ul>
<li>RK-G200S, RK-G210S, RK-G211S (tested)</li>
<li>other 2nd-gen devices (RK-G2xx) (not tested)</li>
</ul>
</li>
</ul>
<p>Note: Bluetooth 4.0 adapter with BLE support required.</p>
</description>

<developer_name>Anatoliy Kashkin</developer_name>
Expand All @@ -29,7 +40,7 @@
</screenshots>

<releases>
<release type="development" version="0.1.0" date="2018-07-30">
<release type="development" version="0.1.0" date="2018-08-05">
<description>
<p>Initial release.</p>
</description>
Expand Down
6 changes: 6 additions & 0 deletions data/com.github.tkashkin.boiler.desktop.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ X-GNOME-Gettext-Domain=com.github.tkashkin.boiler
Icon=com.github.tkashkin.boiler
Terminal=false
Type=Application
Actions=Toggle;

[Desktop Action Toggle]
Name=Enable/Disable
Exec=com.github.tkashkin.boiler --toggle
Icon=system-shutdown-symbolic
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ com.github.tkashkin.boiler (0.1.0) xenial; urgency=low

* Initial release

-- tkashkin <[email protected]> Mon, 30 Jul 2018 10:31:15 +0300
-- tkashkin <[email protected]> Sun, 05 Aug 2018 21:34:20 +0300
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ Standards-Version: 4.1.4
Package: com.github.tkashkin.boiler
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, bluez
Description: Simple app to control Redmond Skykettle RK-G200S
Description: Simple app to control smart kettles using bluetooth
2 changes: 1 addition & 1 deletion po/POTFILES
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ data/com.github.tkashkin.boiler.appdata.xml.in
data/com.github.tkashkin.boiler.desktop.in
data/com.github.tkashkin.boiler.gschema.xml

src/app.vala
src/Application.vala

src/ui/windows/MainWindow.vala

Expand Down
39 changes: 35 additions & 4 deletions po/com.github.tkashkin.boiler.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: com.github.tkashkin.boiler\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-05 03:29+0300\n"
"POT-Creation-Date: 2018-08-05 21:35+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -17,13 +17,44 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: data/com.github.tkashkin.boiler.appdata.xml.in:8
#: data/com.github.tkashkin.boiler.desktop.in:3
#: data/com.github.tkashkin.boiler.desktop.in:4
#: src/ui/windows/MainWindow.vala:24
msgid "Boiler"
msgstr ""

#: data/com.github.tkashkin.boiler.appdata.xml.in:9
#: data/com.github.tkashkin.boiler.desktop.in:5
msgid "Control your kettle remotely"
msgstr ""

#: data/com.github.tkashkin.boiler.appdata.xml.in:12
msgid "Simple app to control Redmond Skykettle RK-G200S."
msgid "Simple app to control smart kettles using bluetooth."
msgstr ""

#: data/com.github.tkashkin.boiler.appdata.xml.in:13
msgid "Supported devices:"
msgstr ""

#: data/com.github.tkashkin.boiler.appdata.xml.in:18
msgid "RK-G200S, RK-G210S, RK-G211S (tested)"
msgstr ""

#: data/com.github.tkashkin.boiler.appdata.xml.in:19
msgid "other 2nd-gen devices (RK-G2xx) (not tested)"
msgstr ""

#: data/com.github.tkashkin.boiler.appdata.xml.in:23
msgid "Note: Bluetooth 4.0 adapter with BLE support required."
msgstr ""

#: data/com.github.tkashkin.boiler.desktop.in:7
msgid "Kettle;Teapot;Redmond;Remote;Control;"
msgstr ""

#: data/com.github.tkashkin.boiler.desktop.in:16
msgid "Enable/Disable"
msgstr ""

#: src/ui/views/connect/ConnectView.vala:32
Expand All @@ -38,10 +69,10 @@ msgstr ""
msgid "Connect"
msgstr ""

#: src/ui/views/kettle/KettleView.vala:117
#: src/ui/views/kettle/KettleView.vala:162
msgid "Disable"
msgstr ""

#: src/ui/views/kettle/KettleView.vala:117
#: src/ui/views/kettle/KettleView.vala:162
msgid "Enable"
msgstr ""
46 changes: 43 additions & 3 deletions po/ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: com.github.tkashkin.boiler\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-05 03:29+0300\n"
"POT-Creation-Date: 2018-08-05 21:35+0300\n"
"PO-Revision-Date: 2018-07-30 10:26+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Expand All @@ -18,6 +18,46 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

#: data/com.github.tkashkin.boiler.appdata.xml.in:8
#: data/com.github.tkashkin.boiler.desktop.in:3
#: data/com.github.tkashkin.boiler.desktop.in:4
#: src/ui/windows/MainWindow.vala:24
msgid "Boiler"
msgstr ""

#: data/com.github.tkashkin.boiler.appdata.xml.in:9
#: data/com.github.tkashkin.boiler.desktop.in:5
msgid "Control your kettle remotely"
msgstr "Удалённое управление чайником"

#: data/com.github.tkashkin.boiler.appdata.xml.in:12
msgid "Simple app to control smart kettles using bluetooth."
msgstr "Простое приложение для управления чайниками через bluetooth"

#: data/com.github.tkashkin.boiler.appdata.xml.in:13
msgid "Supported devices:"
msgstr "Поддерживаемые устройства:"

#: data/com.github.tkashkin.boiler.appdata.xml.in:18
msgid "RK-G200S, RK-G210S, RK-G211S (tested)"
msgstr "RK-G200S, RK-G210S, RK-G211S (проверено)"

#: data/com.github.tkashkin.boiler.appdata.xml.in:19
msgid "other 2nd-gen devices (RK-G2xx) (not tested)"
msgstr "другие устройства второго поколения (RK-G2xx) (не проверено)"

#: data/com.github.tkashkin.boiler.appdata.xml.in:23
msgid "Note: Bluetooth 4.0 adapter with BLE support required."
msgstr "Примечание: Необходим адаптер Bluetooth 4.0 с поддержкой BLE."

#: data/com.github.tkashkin.boiler.desktop.in:7
msgid "Kettle;Teapot;Redmond;Remote;Control;"
msgstr "Kettle;Teapot;Redmond;Remote;Control;Чайник;Удалённое;Управление;"

#: data/com.github.tkashkin.boiler.desktop.in:16
msgid "Enable/Disable"
msgstr "Включить/Выключить"

#: src/ui/views/connect/ConnectView.vala:32
msgid "No devices"
msgstr "Нет устройств"
Expand All @@ -30,10 +70,10 @@ msgstr "Убедитесь, что устройства находятся в р
msgid "Connect"
msgstr "Подключить"

#: src/ui/views/kettle/KettleView.vala:117
#: src/ui/views/kettle/KettleView.vala:162
msgid "Disable"
msgstr "Выключить"

#: src/ui/views/kettle/KettleView.vala:117
#: src/ui/views/kettle/KettleView.vala:162
msgid "Enable"
msgstr "Включить"
103 changes: 103 additions & 0 deletions src/Application.vala
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
using Gtk;
using Gdk;
using Granite;

using Boiler.UI.Windows;

namespace Boiler
{
public class Application: Granite.Application
{
private MainWindow? main_window;

public static Application instance;

public bool kettle_toggle_pending = false;
public signal void toggle_kettle();

construct
{
application_id = ProjectConfig.PROJECT_NAME;
flags = ApplicationFlags.HANDLES_COMMAND_LINE;
program_name = "Boiler";
build_version = ProjectConfig.VERSION;
instance = this;
}

protected override void activate()
{
if(main_window == null)
{
weak IconTheme default_theme = IconTheme.get_default();
default_theme.add_resource_path("/com/github/tkashkin/boiler/icons");

var provider = new CssProvider();
provider.load_from_resource("/com/github/tkashkin/boiler/Boiler.css");
StyleContext.add_provider_for_screen(Screen.get_default(), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);

main_window = new Boiler.UI.Windows.MainWindow(this);
main_window.show_all();
}
}

public static int main(string[] args)
{
#if USE_IVY
Ivy.Stacktrace.register_handlers();
#endif

var app = new Application();

var lang = Environment.get_variable("LC_ALL") ?? "";
Intl.setlocale(LocaleCategory.ALL, lang);
Intl.bindtextdomain(ProjectConfig.GETTEXT_PACKAGE, ProjectConfig.GETTEXT_DIR);
Intl.textdomain(ProjectConfig.GETTEXT_PACKAGE);

var rk_g2xx_auth = Settings.Dev.Redmond.RK_G2XX.get_instance();
if(rk_g2xx_auth.auth_key == "")
{
var bytes = Utils.random_bytes(8);
rk_g2xx_auth.auth_key = Converter.bin_to_hex(bytes, ' ');
}

return app.run(args);
}

public override int command_line(ApplicationCommandLine cmd)
{
string[] oargs = cmd.get_arguments ();
unowned string[] args = oargs;

bool toggle = false;
bool show = false;

OptionEntry[] options = new OptionEntry[3];
options[0] = { "toggle", 't', 0, OptionArg.NONE, out toggle, "Start or stop kettle", null };
options[1] = { "show", 's', 0, OptionArg.NONE, out show, "Show window", null };
options[2] = { null };

var ctx = new OptionContext();
ctx.add_main_entries(options, null);
try
{
ctx.parse(ref args);
}
catch(Error e)
{
warning(e.message);
}

if(toggle)
{
kettle_toggle_pending = true;
toggle_kettle();
}

activate();

if(show) main_window.present();

return 0;
}
}
}
52 changes: 0 additions & 52 deletions src/app.vala

This file was deleted.

Loading

0 comments on commit b80ba29

Please sign in to comment.