From b49417adfdc26520bc9f98857577ef1556e96596 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 15 Oct 2013 11:45:52 +0530 Subject: [PATCH] Fix removal of textures not working Also credit subtlepatterns in the texture chooser dialog. --- src/calibre/gui2/preferences/texture_chooser.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/preferences/texture_chooser.py b/src/calibre/gui2/preferences/texture_chooser.py index c48d274759..e10d7d7233 100644 --- a/src/calibre/gui2/preferences/texture_chooser.py +++ b/src/calibre/gui2/preferences/texture_chooser.py @@ -10,7 +10,7 @@ import glob, os, string, shutil from functools import partial from PyQt4.Qt import ( QDialog, QVBoxLayout, QListWidget, QListWidgetItem, Qt, QIcon, - QApplication, QSize, QPixmap, QDialogButtonBox, QTimer) + QApplication, QSize, QPixmap, QDialogButtonBox, QTimer, QLabel) from calibre.constants import config_dir from calibre.gui2 import choose_files, error_dialog @@ -50,6 +50,10 @@ class TextureChooser(QDialog): il.itemSelectionChanged.connect(self.update_remove_state) l.addWidget(il) + self.ad = ad = QLabel(_('The builtin textures come from subtlepatterns.com.')) + ad.setOpenExternalLinks(True) + ad.setWordWrap(True) + l.addWidget(ad) self.bb = bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel) bb.accepted.connect(self.accept) bb.rejected.connect(self.reject) @@ -137,6 +141,7 @@ class TextureChooser(QDialog): if self.selected_fname.startswith(':'): return error_dialog(self, _('Cannot remove'), _('Cannot remover builtin textures'), show=True) + os.remove(unicode(self.selected_item.data(Qt.UserRole+1).toString())) self.images.takeItem(self.images.row(self.selected_item)) if __name__ == '__main__':