diff --git a/CMakeLists.txt b/CMakeLists.txt
index e318421f..6a04a25d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,8 @@ set (ICON_NAME ${CMAKE_PROJECT_NAME})
set (APP_NAME "Gradio")
set (GENERIC_NAME "Internet Radio")
set (COMMENT "Listen to radio stations worldwide")
-set (VERSION "5.0 Beta 1")
-set (VERSION_INFO "Stable")
+set (VERSION "5_0_0_Beta_1")
+set (VERSION_INFO "5.0.0 Beta 1")
# where we install data directory (if we have any)
include (GNUInstallDirs)
diff --git a/data/ui/discover-box.ui b/data/ui/discover-box.ui
index dfa724d2..385dd828 100644
--- a/data/ui/discover-box.ui
+++ b/data/ui/discover-box.ui
@@ -161,9 +161,6 @@
-
- -1
-
-
- True
-
diff --git a/data/ui/release-notes.ui b/data/ui/release-notes.ui
index 11723f81..4ee8eba2 100644
--- a/data/ui/release-notes.ui
+++ b/data/ui/release-notes.ui
@@ -101,7 +101,7 @@
-
diff --git a/data/ui/release-notes.ui~ b/data/ui/release-notes.ui~
new file mode 100644
index 00000000..5bf84fbb
--- /dev/null
+++ b/data/ui/release-notes.ui~
@@ -0,0 +1,165 @@
+
+
+
+
+
+ 500
+ 400
+ False
+ True
+ center-always
+ True
+ True
+ True
+
+
+ True
+ False
+ vertical
+
+
+ True
+ False
+ center
+
+
+ gtk-info
+ 100
+ True
+ True
+ True
+ center
+ 5
+ 5
+ True
+
+
+
+ False
+ True
+ 0
+
+
+
+
+ gtk-close
+ 100
+ True
+ True
+ True
+ center
+ 5
+ 5
+ 5
+ True
+
+
+
+
+ False
+ True
+ 1
+
+
+
+
+ False
+ True
+ end
+ 0
+
+
+
+
+ True
+ True
+ in
+
+
+ True
+ False
+
+
+ True
+ False
+ vertical
+
+
+ True
+ False
+ 10
+ 10
+ gradio
+ 6
+
+
+ False
+ True
+ 0
+
+
+
+
+ True
+ False
+ center
+ Gradio 5.0.1 Beta 1
+
+
+
+
+
+ False
+ True
+ 1
+
+
+
+
+ True
+ False
+ 10
+ 10
+ 10
+ 10
+
+
+ True
+ False
+ vertical
+
+
+
+
+
+
+
+ True
+ True
+ 2
+
+
+
+
+
+
+
+
+ True
+ True
+ 1
+
+
+
+
+
+
+
+
+
diff --git a/po/gradio.pot b/po/gradio.pot
index 9fff7b23..b05f062d 100644
--- a/po/gradio.pot
+++ b/po/gradio.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-23 18:27+0200\n"
+"POT-Creation-Date: 2016-09-23 20:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff --git a/src/Config.vala b/src/Config.vala
index dec43235..79ad5db6 100644
--- a/src/Config.vala
+++ b/src/Config.vala
@@ -19,8 +19,8 @@ namespace Constants {
public const string PKG_DATADIR = "/usr/share/gradio";
public const string GETTEXT_PACKAGE = "gradio";
public const string RELEASE_NAME = "";
- public const string VERSION = "5.0 Beta 1";
- public const string VERSION_INFO = "Stable";
+ public const string VERSION = "5_0_0_Beta_1";
+ public const string VERSION_INFO = "5.0.0 Beta 1";
public const string INSTALL_PREFIX = "/usr";
public const string APP_NAME = "Gradio";
public const string EXEC_NAME = "gradio";
diff --git a/src/Gradio.vala b/src/Gradio.vala
index 55ac8414..6bf33924 100644
--- a/src/Gradio.vala
+++ b/src/Gradio.vala
@@ -30,6 +30,7 @@ namespace Gradio {
private Gtk.Menu menuSystem;
public App () {
+ settings = new GLib.Settings ("de.haecker-felix.gradio");
Object(application_id: "de.haeckerfelix.gradio", flags: ApplicationFlags.FLAGS_NONE);
}
@@ -40,7 +41,6 @@ namespace Gradio {
create_app_menu();
player = new AudioPlayer();
- settings = new GLib.Settings ("de.haecker-felix.gradio");
mpris = new MPRIS();
mpris.initialize();
@@ -82,7 +82,7 @@ namespace Gradio {
"title", _("About Gradio"),
"license-type", Gtk.License.GPL_3_0,
"logo-icon-name", "gradio",
- "version", Constants.VERSION,
+ "version", Constants.VERSION_INFO,
"comments", "Database: www.radio-browser.info",
"website", "https://github.com/haecker-felix/gradio",
"wrap-license", true);
@@ -170,6 +170,10 @@ namespace Gradio {
trayicon.popup_menu.connect(app.menuSystem_popup);
// Show release notes if neccesary
+ if(settings != null)
+ message("Release notes: " + settings.get_string("release-notes"));
+
+ message("Current: " + Constants.VERSION);
if(!(settings.get_string("release-notes") == Constants.VERSION)){
ReleaseNotes rn = new ReleaseNotes();
rn.show();
diff --git a/src/Widgets/ReleaseNotes.vala b/src/Widgets/ReleaseNotes.vala
index 29130822..d051cb8d 100644
--- a/src/Widgets/ReleaseNotes.vala
+++ b/src/Widgets/ReleaseNotes.vala
@@ -25,6 +25,9 @@ namespace Gradio{
[GtkChild]
private Box Placeholder;
+ [GtkChild]
+ private Label VersionLabel;
+
private WebView notes;
public ReleaseNotes(){
@@ -33,14 +36,17 @@ namespace Gradio{
notes = new WebView();
Placeholder.add(notes);
+ VersionLabel.set_text(Constants.VERSION_INFO);
+
notes.show();
notes.set_vexpand(true);
- notes.load_uri("https://gradio.haecker-felix.de/release_notes.html");
+ notes.load_uri("https://gradio.haecker-felix.de/release_notes/"+Constants.VERSION+".html");
}
[GtkCallback]
private void CloseButton_clicked (Button button){
+ App.settings.set_string("release-notes", Constants.VERSION);
this.close();
}