Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release version 0.6.0 #24

Merged
merged 5 commits into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ These dependencies must be present before building:

- `libgranite-dev`
- `libgtk-3-dev`
- `libgtksourceview-3.0-dev`
- `libgtksourceview-4-dev`
- `libhandy-1-dev` >=1.0.0
- `meson`
- `valac`
Expand Down Expand Up @@ -110,6 +110,7 @@ Your commit message should describe what the commit, when applied, does to the c
| [onerbs](https://github.com/onerbs) | Spanish 🇪🇸 |
| [Vistaus](https://github.com/Vistaus) | Dutch 🇳🇱 |
| [logdimov](https://github.com/logdimov) | Russian 🇷🇺 |
| [milotype](https://github.com/milotype) | Croatian 🇭🇷 |

## License

Expand Down
30 changes: 29 additions & 1 deletion data/com.github.manexim.typewriter.appdata.xml.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2019 Manexim -->
<!-- Copyright 2019-2021 Manexim -->
<component type="desktop">
<id>com.github.manexim.typewriter</id>
<metadata_license>CC0</metadata_license>
Expand All @@ -16,6 +16,34 @@
<binary>com.github.manexim.typewriter</binary>
</provides>
​<releases>
<release date="2021-11-02" version="0.6.0">
<description>
<p>New:</p>
<ul>
<li>Grab focus to start typing immediately</li>
</ul>
<p>Improved:</p>
<ul>
<li>Remove Flatpak sandbox hole to query dark style preference</li>
<li>Update dependencies</li>
<li>Update translations</li>
</ul>
<p>Fixed:</p>
<ul>
<li>Fix window handling</li>
</ul>
<p>Translations:</p>
<ul>
<li>French (by NathanBnm)</li>
<li>German (by meisenzahl)</li>
<li>Italian (by mirkobrombin)</li>
<li>Spanish (by onerbs)</li>
<li>Dutch (by Vistaus)</li>
<li>Russian (by logdimov)</li>
<li>Croatian (by milotype)</li>
</ul>
</description>
</release>
<release date="2021-08-03" version="0.5.0">
<description>
<p>New:</p>
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('com.github.manexim.typewriter', 'vala', 'c')
project('com.github.manexim.typewriter', 'vala', 'c', version: '0.6.0')

# Include the translations module
i18n = import('i18n')
Expand Down
40 changes: 20 additions & 20 deletions src/Application.vala
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2019 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/
* Copyright (c) 2019-2021 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/

public class Application : Gtk.Application {
private static Application? _instance;
Expand All @@ -38,7 +38,7 @@ public class Application : Gtk.Application {

private Application () {
Object (
application_id: Config.APP_ID,
application_id: Constants.APP_ID,
flags: ApplicationFlags.FLAGS_NONE
);

Expand Down
29 changes: 0 additions & 29 deletions src/Config/Constants.vala

This file was deleted.

29 changes: 29 additions & 0 deletions src/Constants.vala.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Copyright (c) 2019-2021 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/

namespace Constants {
public const string APP_ID = "@APP_ID@";
public const string APP_AUTHOR = "Manexim";
public const string APP_NAME = "Typewriter";
public const string APP_VERSION = "@APP_VERSION@";

public const uint WORDS_PER_MINUTE = 265;
}
38 changes: 19 additions & 19 deletions src/Controllers/TypewriterController.vala
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2019 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/
* Copyright (c) 2019-2021 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/

public class Controllers.TypewriterController {
private Services.Settings settings;
Expand Down
40 changes: 20 additions & 20 deletions src/MainWindow.vala
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2019 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/
* Copyright (c) 2019-2021 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/

public class MainWindow : Hdy.Window {
private Services.Settings settings;
Expand Down Expand Up @@ -86,7 +86,7 @@ public class MainWindow : Hdy.Window {
headerbar = new Hdy.HeaderBar () {
decoration_layout = "close:",
show_close_button = true,
title = Config.APP_NAME
title = Constants.APP_NAME
};

var zoom_out_button = new Gtk.Button.from_icon_name ("zoom-out-symbolic", Gtk.IconSize.MENU) {
Expand Down
38 changes: 19 additions & 19 deletions src/Models/Font.vala
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2019 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/
* Copyright (c) 2019 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/

public class Models.Font : Object {
private string _font;
Expand Down
44 changes: 22 additions & 22 deletions src/Models/Typewriter.vala
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
/*
* Copyright (c) 2019 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/
* Copyright (c) 2019-2021 Manexim (https://github.com/manexim)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*
* Authored by: Marius Meisenzahl <[email protected]>
*/

public class Models.Typewriter : Object {
public Gtk.SourceBuffer buffer { get; construct set; }
Expand All @@ -42,7 +42,7 @@ public class Models.Typewriter : Object {

characters = text_stripped.length;
words = text_stripped.split (" ").length;
read_time = (uint) ((1.0 * words / Config.WORDS_PER_MINUTE) + 0.5);
read_time = (uint) ((1.0 * words / Constants.WORDS_PER_MINUTE) + 0.5);
}
} catch (RegexError e) {
stderr.printf (e.message);
Expand All @@ -54,7 +54,7 @@ public class Models.Typewriter : Object {
owned get {
return File.new_build_filename (
Environment.get_user_data_dir (),
Config.APP_ID
Constants.APP_ID
);
}
}
Expand All @@ -63,7 +63,7 @@ public class Models.Typewriter : Object {
owned get {
return File.new_build_filename (
Environment.get_user_data_dir (),
Config.APP_ID,
Constants.APP_ID,
"autosave.md"
);
}
Expand Down
Loading