diff options
Diffstat (limited to 'libre/calibre/0001-Remove-new_version_notification.patch')
-rw-r--r-- | libre/calibre/0001-Remove-new_version_notification.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/libre/calibre/0001-Remove-new_version_notification.patch b/libre/calibre/0001-Remove-new_version_notification.patch new file mode 100644 index 000000000..432b3ae8d --- /dev/null +++ b/libre/calibre/0001-Remove-new_version_notification.patch @@ -0,0 +1,80 @@ +diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py +index a1cf1849d..6daa2e705 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 6db4cb1f3..51b7ed0a8 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 2926f767b..0ad998884 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 &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 3e294cac3..d1ba09137 100644 +--- a/src/calibre/gui2/update.py ++++ b/src/calibre/gui2/update.py +@@ -125,11 +125,7 @@ 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 +147,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 +194,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) |