summaryrefslogtreecommitdiff
path: root/libre/calibre/0002-Remove-new_version_notification.patch
blob: 1199843edeb6ab040db44c98922ece3ad5851045 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 45cc47a..14a5a2e 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -169,8 +169,6 @@ def _config():  # {{{
               help=_('Confirm before deleting'))
     c.add_opt('main_window_geometry', default=None,
               help=_('Main window geometry'))
-    c.add_opt('new_version_notification', default=True,
-              help=_('Notify when a new version is available'))
     c.add_opt('use_roman_numerals_for_series_number', default=True,
               help=_('Use Roman numerals for series number'))
     c.add_opt('sort_tags_by', default='name',
diff --git a/src/calibre/gui2/preferences/behavior.py b/src/calibre/gui2/preferences/behavior.py
index 6db4cb1..51b7ed0 100644
--- a/src/calibre/gui2/preferences/behavior.py
+++ b/src/calibre/gui2/preferences/behavior.py
@@ -40,7 +40,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
         r('network_timeout', prefs)
 
-        r('new_version_notification', config)
         r('upload_news_to_device', config)
         r('delete_news_from_library_on_upload', config)
 
diff --git a/src/calibre/gui2/preferences/behavior.ui b/src/calibre/gui2/preferences/behavior.ui
index 41cc831..de56b69 100644
--- a/src/calibre/gui2/preferences/behavior.ui
+++ b/src/calibre/gui2/preferences/behavior.ui
@@ -14,13 +14,6 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
-    <widget class="QCheckBox" name="opt_new_version_notification">
-     <property name="text">
-      <string>Show notification when &amp;new version is available</string>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="1">
     <widget class="QCheckBox" name="opt_bools_are_tristate">
      <property name="toolTip">
diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py
index 9ce55d0..b08307b 100644
--- a/src/calibre/gui2/update.py
+++ b/src/calibre/gui2/update.py
@@ -125,11 +125,6 @@ class UpdateNotification(QDialog):
         self.setWindowIcon(QIcon(I('lt.png')))
         self.l.addWidget(self.logo, 0, 0)
         self.l.addWidget(self.label, 0, 1)
-        self.cb = QCheckBox(
-            _('Show this notification for future updates'), self)
-        self.l.addWidget(self.cb, 1, 0, 1, -1)
-        self.cb.setChecked(config.get('new_version_notification'))
-        self.cb.stateChanged.connect(self.show_future)
         self.bb = QDialogButtonBox(self)
         b = self.bb.addButton(_('&Get update'), self.bb.AcceptRole)
         b.setDefault(True)
@@ -151,9 +146,6 @@ class UpdateNotification(QDialog):
                 initial_filter=FILTER_UPDATE_AVAILABLE)
         d.exec_()
 
-    def show_future(self, *args):
-        config.set('new_version_notification', bool(self.cb.isChecked()))
-
     def accept(self):
         open_url(QUrl(get_download_url()))
 
@@ -201,8 +193,7 @@ class UpdateMixin(object):
         self.status_bar.update_label.setVisible(True)
 
         if has_calibre_update:
-            if (force or (config.get('new_version_notification') and
-                    dynamic.get('update to version %s'%calibre_version, True))):
+            if force:
                 if not no_show_popup:
                     self._update_notification__ = UpdateNotification(calibre_version,
                             number_of_plugin_updates, parent=self)