-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
89 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -68,8 +68,7 @@ public class AboutDialog: Gtk.Dialog { | |
public const string TAB_ABOUT = "about"; | ||
public const string TAB_TIPS = "tips"; | ||
public const string TAB_STARTUP = "startup"; | ||
public const string TAB_TERMS = "terms"; | ||
public const int TERMS_VERSION = 1; | ||
public const int TERMS_VERSION = 2; | ||
public StartupView? startup {get; private set;} | ||
public Gtk.Stack stack {get; private set;} | ||
public Gtk.Grid grid {get; private set;} | ||
|
@@ -101,30 +100,6 @@ public class AboutDialog: Gtk.Dialog { | |
if (startup != null) { | ||
stack.add_titled(startup, TAB_STARTUP, "Start-Up"); | ||
} | ||
#if FLATPAK | ||
Gtk.Label terms = Drtgtk.Labels.markup( | ||
"Nuvola Player is an open-source project. You can <a href=\"%1$s\">download the entire source code</a> " | ||
+ "for free under the <a href=\"%2$s\">BSD-2-Clause license</a>. Feel free to study it, modify it, build " | ||
+ "Nuvola for you, or even distribute it further.\n\n" | ||
+ "The official flatpak builds of Nuvola require <a href=\"%3$s\">a purchase</a> to unlock some features " | ||
+ "when a free trial period ends. We ask users for the payment to cover the project's expenses and to " | ||
+ "provide them with support beyond the usual open-source standard. It also motivates us to focus on " | ||
+ "quality and to develop Nuvola further even though some obstacles may seem too demanding.\n\n" | ||
+ "By purchasing Nuvola, you tell us: \"Don't give up, we appreciate your work.\"\n\n\n" | ||
+ "By using Nuvola, you agree with <a href=\"%4$s\">Tiliado Privacy Policy</a>. The short version is: " | ||
+ "We collect only the data we need to provide you with our services. We don't sell your personal " | ||
+ "information. If you have any questions, feedback or a data removal request, " | ||
+ "don't hesitate to contact support: <a href=\"mailto:%5$s\">%5$s</a>", | ||
"https://github.com/tiliado/nuvolaplayer", | ||
"https://github.com/tiliado/nuvolaplayer/blob/master/LICENSE", | ||
"https://nuvola.tiliado.eu/pricing/", | ||
"https://tiliado.eu/privacy/", | ||
"[email protected]"); | ||
terms.margin = 10; | ||
terms.selectable = true; | ||
terms.can_focus = false; | ||
stack.add_titled(terms, TAB_TERMS, "Terms"); | ||
#endif | ||
|
||
var switcher = new Gtk.StackSwitcher(); | ||
switcher.stack = stack; | ||
|
@@ -250,9 +225,12 @@ public class AboutDialog: Gtk.Dialog { | |
|
||
public void show_terms() { | ||
Gtk.Label label = Drtgtk.Labels.markup( | ||
"You need to agree with <a href=\"%s\">Privacy Policy</a>.", "https://tiliado.eu/privacy/"); | ||
"You need to agree with <a href=\"%s\">Terms</a> and <a href=\"%s\">Privacy Policy</a>.", | ||
"https://nuvola.tiliado.eu/terms/", | ||
"https://tiliado.eu/privacy/" | ||
); | ||
label.yalign = 0.5f; | ||
show_tab(TAB_TERMS); | ||
show_tab(TAB_TIPS); | ||
show_action(label, "Accept", Gtk.ResponseType.ACCEPT, Gtk.MessageType.INFO); | ||
add_status_action("Decline", Gtk.ResponseType.REJECT); | ||
present(); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters