fix[closes #4355]: Daily donation nag screen

Author: mirkobrombin

bottles/frontend/ui/preferences.blp

@@ -49,6 +49,16 @@ template $PreferencesWindow: Adw.PreferencesWindow {
         }
       }
 
+      Adw.ActionRow {
+        title: _("Show Funding Dialog");
+        subtitle: _("Whether to show the funding dialog to support Bottles development.");
+        activatable-widget: switch_show_funding;
+
+        Switch switch_show_funding {
+          valign: center;
+        }
+      }
+
       Adw.ActionRow {
         title: _("Temp Files");
         subtitle: _("Clean temp files when Bottles launches?");

bottles/frontend/views/preferences.py

@@ -45,6 +45,7 @@ class PreferencesWindow(Adw.PreferencesWindow):
     row_theme = Gtk.Template.Child()
     switch_theme = Gtk.Template.Child()
     switch_notifications = Gtk.Template.Child()
+    switch_show_funding = Gtk.Template.Child()
     switch_force_offline = Gtk.Template.Child()
     switch_temp = Gtk.Template.Child()
     switch_release_candidate = Gtk.Template.Child()
@@ -132,6 +133,12 @@ def __init__(self, window, **kwargs):
             "active",
             Gio.SettingsBindFlags.DEFAULT,
         )
+        self.settings.bind(
+            "show-funding",
+            self.switch_show_funding,
+            "active",
+            Gio.SettingsBindFlags.DEFAULT,
+        )
         self.settings.bind(
             "playtime-enabled",
             self.switch_playtime_tracking,

bottles/frontend/windows/window.py

@@ -84,15 +84,24 @@ def __init__(self, arg_bottle, **kwargs):
 
         super().__init__(**kwargs, default_width=width, default_height=height)
 
-        self.data_mgr = DataManager()
         self.data_mgr = DataManager()
         self._show_funding = False
-        if not self.data_mgr.get(UserDataKeys.FundingDismissed, False):
+        
+        show_funding_setting = self.settings.get_boolean("show-funding")
+        dismissed = self.data_mgr.get(UserDataKeys.FundingDismissed, False)
+        
+        if show_funding_setting and not dismissed:
             last_prompt = self.data_mgr.get(UserDataKeys.LastFundingPrompt, "")
-            today = datetime.now().strftime("%Y-%m-%d")
 
-            if last_prompt != today:
+            if not last_prompt:
                 self._show_funding = True
+            else:
+                try:
+                    last_date = datetime.strptime(last_prompt, "%Y-%m-%d")
+                    if datetime.now() - last_date >= timedelta(days=7):
+                        self._show_funding = True
+                except ValueError:
+                    self._show_funding = True
 
         self.utils_conn = ConnectionUtils(
             force_offline=self.settings.get_boolean("force-offline")
@@ -468,6 +477,7 @@ def __maybe_show_funding_dialog(self):
     def __funding_response(self, dialog, response):
         if response == "dismiss":
             self.data_mgr.set(UserDataKeys.FundingDismissed, True)
+            self.settings.set_boolean("show-funding", False)
 
         dialog.destroy()
 

data/com.usebottles.bottles.gschema.xml

@@ -105,6 +105,11 @@
       <default>50</default>
       <summary>Eagle deep scan limit</summary>
       <description>Maximum number of binaries to scan when analysing installers. Higher values provide more thorough analysis but take longer.</description>
+    </key>
+    <key type="b" name="show-funding">
+      <default>true</default>
+      <summary>Show funding dialog</summary>
+      <description>Toggle the funding dialog.</description>
     </key>
 	</schema>
 </schemalist>