diff --git a/resources/images/mimetypes/mobi.svg b/resources/images/mimetypes/mobi.svg index 1d290d2330..88d19f6c0d 100644 --- a/resources/images/mimetypes/mobi.svg +++ b/resources/images/mimetypes/mobi.svg @@ -1,8 +1,9 @@ + - + width="128" + height="128" + id="svg4486" + inkscape:version="0.47 r22583" + sodipodi:docname="epub.svg"> + id="metadata52"> image/svg+xml + + + id="defs4488"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + transform="matrix(1.0408163,0,0,0.6302428,-1.5714269,43.690218)" + id="g2478"> + + + + + + + + + + + mobi + + + diff --git a/resources/images/mimetypes/rtf.svg b/resources/images/mimetypes/rtf.svg index 485ac41350..c40103d283 100644 --- a/resources/images/mimetypes/rtf.svg +++ b/resources/images/mimetypes/rtf.svg @@ -1,3791 +1,387 @@ + width="48" + height="48" + id="svg2454"> + id="defs2456"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="linearGradient5048"> + id="stop5050" + style="stop-color:#000000;stop-opacity:0" + offset="0" /> + id="stop5056" + style="stop-color:#000000;stop-opacity:1" + offset="0.5" /> + + gradientTransform="matrix(6.732488e-2,0,0,1.470022e-2,-0.3411391,37.040146)" /> + + + id="stop5062" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> - - - - - - - + id="stop5064" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + + + + + + + + + + + + + + + + + + + + + + + + id="stop41" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + id="stop47" + style="stop-color:#000000;stop-opacity:1" + offset="0.18851049" /> + id="stop49" + style="stop-color:#000000;stop-opacity:0" + offset="0.25718147" /> - - - + id="stop51" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> - - - - - - + r="139.55859" + id="radialGradient3721" + xlink:href="#XMLID_8_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3617022,0,0,-0.3907784,0.8510637,47.517004)" /> + + + + + + + + + + + + + + + + + + + + id="filter3212" + color-interpolation-filters="sRGB" + height="1.3286875" + width="1.2969251" + y="-0.16434373" + x="-0.14846256"> + id="feGaussianBlur3214" + stdDeviation="0.77391625" /> + + + + + + + + + + - - - - - image/svg+xml - - - - + + d="M 7.7378475,42.430102 C 7.7378475,42.430102 7.7378475,45.999958 7.7378475,45.999958 C 6.5513473,46.006658 4.869468,45.200135 4.869468,44.2148 C 4.869468,43.229467 6.1935126,42.430103 7.7378475,42.430102 L 7.7378475,42.430102 z" + id="path2881" + style="opacity:0.3;fill:url(#radialGradient3732);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /> + d="M 40.246148,42.430102 C 40.246148,42.430102 40.246148,45.999958 40.246148,45.999958 C 41.432648,46.006658 43.114528,45.200135 43.114528,44.2148 C 43.114528,43.229467 41.790483,42.430103 40.246148,42.430102 z" + id="path2883" + style="opacity:0.3;fill:url(#radialGradient3729);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d="M 6.4999609,0.49719839 C 14.520256,0.49719839 22.540551,0.49719839 30.560847,0.49719839 C 31.086081,2.4573981 36.693941,7.3488012 41.500042,10.123605 C 41.500042,21.583338 41.500042,33.04307 41.500042,44.502803 C 29.833348,44.502803 18.166655,44.502803 6.4999609,44.502803 C 6.4999609,29.834268 6.4999609,15.165733 6.4999609,0.49719839 L 6.4999609,0.49719839 z" + id="path4160" + style="fill:url(#radialGradient3724);fill-opacity:1;stroke:url(#linearGradient3726);stroke-width:0.99992186;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" /> + d="M 18.912879,14 C 14.941321,19.117861 10.971558,24.242219 7,29.36008 C 7,34.571159 7,39.788922 7,45 C 16.433735,45 25.867403,45 35.301136,45 C 37.911168,41.636631 38.313471,41.123931 41,37.661986 C 41,32.936269 41,28.228706 41,23.48345 C 33.204587,20.134987 23.975066,16.174425 18.912879,14 z" + id="path3743" + style="opacity:0.1;fill:url(#linearGradient2721);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.91176528;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + d="M 18.912879,13 C 14.941321,18.117861 10.971558,23.242219 7,28.36008 C 7,33.571159 7,38.788922 7,44 C 16.433735,44 25.867403,44 35.301136,44 C 37.911168,40.636631 38.313471,40.123931 41,36.661986 C 41,31.936269 41,27.228706 41,22.48345 C 33.204587,19.134987 23.975066,15.174425 18.912879,13 z" + id="path3697" + style="opacity:0.4;fill:url(#linearGradient2718);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.91176528;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + + + + + + + + diff --git a/src/calibre/gui2/dialogs/config/__init__.py b/src/calibre/gui2/dialogs/config/__init__.py index 5dcc4feb1a..78cac1b887 100644 --- a/src/calibre/gui2/dialogs/config/__init__.py +++ b/src/calibre/gui2/dialogs/config/__init__.py @@ -512,9 +512,18 @@ class ConfigDialog(ResizableDialog, Ui_Dialog): idx = i self.opt_toolbar_text.addItem(x[0], x[1]) self.opt_toolbar_text.setCurrentIndex(idx) + self.reset_confirmation_button.clicked.connect(self.reset_confirmation) self.category_view.setCurrentIndex(self.category_view.model().index_for_name(initial_category)) + def reset_confirmation(self): + from calibre.gui2 import dynamic + for key in dynamic.keys(): + if key.endswith('_again') and dynamic[key] is False: + dynamic[key] = True + info_dialog(self, _('Done'), + _('Confirmation dialogs have all been reset'), show=True) + def check_port_value(self, *args): port = self.port.value() if port < 1025: diff --git a/src/calibre/gui2/dialogs/config/config.ui b/src/calibre/gui2/dialogs/config/config.ui index df19aa2a26..9035e64bb1 100644 --- a/src/calibre/gui2/dialogs/config/config.ui +++ b/src/calibre/gui2/dialogs/config/config.ui @@ -89,8 +89,8 @@ 0 0 - 724 - 683 + 720 + 679 @@ -222,6 +222,13 @@ + + + + Reset all disabled &confirmation dialogs + + + diff --git a/src/calibre/gui2/dialogs/confirm_delete.py b/src/calibre/gui2/dialogs/confirm_delete.py index 42a1be41c0..1aabcb7b9e 100644 --- a/src/calibre/gui2/dialogs/confirm_delete.py +++ b/src/calibre/gui2/dialogs/confirm_delete.py @@ -5,7 +5,7 @@ __docformat__ = 'restructuredtext en' from calibre.gui2 import dynamic from calibre.gui2.dialogs.confirm_delete_ui import Ui_Dialog -from PyQt4.Qt import QDialog, SIGNAL, Qt +from PyQt4.Qt import QDialog, Qt, QPixmap, QIcon def _config_name(name): return name + '_again' @@ -18,15 +18,17 @@ class Dialog(QDialog, Ui_Dialog): self.msg.setText(msg) self.name = name - self.connect(self.again, SIGNAL('stateChanged(int)'), self.toggle) + self.again.stateChanged.connect(self.toggle) self.buttonBox.setFocus(Qt.OtherFocusReason) - def toggle(self, x): + def toggle(self, *args): dynamic[_config_name(self.name)] = self.again.isChecked() -def confirm(msg, name, parent=None): +def confirm(msg, name, parent=None, pixmap='dialog_warning.svg'): if not dynamic.get(_config_name(name), True): return True d = Dialog(msg, name, parent) + d.label.setPixmap(QPixmap(I(pixmap))) + d.setWindowIcon(QIcon(I(pixmap))) return d.exec_() == d.Accepted