Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

references replaced

Browse Source
This commit is contained in:
Kovid Goyal 2010-09-04 12:03:44 -06:00
parent 6a27961f0a
commit 3bb520ce76
107 changed files with 268 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/devices/interface.py
View File

@ -43,7 +43,7 @@ class DevicePlugin(Plugin):
path_sep = os.sep
#: Icon for this device
icon = I('reader.svg')
icon = I('reader.png')
# Used by gui2.ui:annotations_fetched() and devices.kindle.driver:get_annotations()
UserAnnotation = namedtuple('Annotation','type, value')

8
src/calibre/gui2/__init__.py
View File

@ -233,7 +233,7 @@ def warning_dialog(parent, title, msg, det_msg='', show=False,
d = MessageBox(QMessageBox.Warning, 'WARNING: '+title, msg, QMessageBox.Ok,
parent, det_msg)
d.setEscapeButton(QMessageBox.Ok)
d.setIconPixmap(QPixmap(I('dialog_warning.svg')))
d.setIconPixmap(QPixmap(I('dialog_warning.png')))
if not show_copy_button:
d.cb.setVisible(False)
if show:
@ -244,7 +244,7 @@ def error_dialog(parent, title, msg, det_msg='', show=False,
show_copy_button=True):
d = MessageBox(QMessageBox.Critical, 'ERROR: '+title, msg, QMessageBox.Ok,
parent, det_msg)
d.setIconPixmap(QPixmap(I('dialog_error.svg')))
d.setIconPixmap(QPixmap(I('dialog_error.png')))
d.setEscapeButton(QMessageBox.Ok)
if not show_copy_button:
d.cb.setVisible(False)
@ -256,7 +256,7 @@ def question_dialog(parent, title, msg, det_msg='', show_copy_button=True,
buttons=QMessageBox.Yes|QMessageBox.No):
d = MessageBox(QMessageBox.Question, title, msg, buttons,
parent, det_msg)
d.setIconPixmap(QPixmap(I('dialog_question.svg')))
d.setIconPixmap(QPixmap(I('dialog_question.png')))
d.setEscapeButton(QMessageBox.No)
if not show_copy_button:
d.cb.setVisible(False)
@ -266,7 +266,7 @@ def question_dialog(parent, title, msg, det_msg='', show_copy_button=True,
def info_dialog(parent, title, msg, det_msg='', show=False):
d = MessageBox(QMessageBox.Information, title, msg, QMessageBox.Ok,
parent, det_msg)
d.setIconPixmap(QPixmap(I('dialog_information.svg')))
d.setIconPixmap(QPixmap(I('dialog_information.png')))
if show:
return d.exec_()
return d

2
src/calibre/gui2/actions/add.py
View File

@ -22,7 +22,7 @@ from calibre.gui2.actions import InterfaceAction
class AddAction(InterfaceAction):
name = 'Add Books'
action_spec = (_('Add books'), 'add_book.svg',
action_spec = (_('Add books'), 'add_book.png',
_('Add books to the calibre library/device from files on your computer')
, _('A'))

2
src/calibre/gui2/actions/add_to_library.py
View File

@ -10,7 +10,7 @@ from calibre.gui2.actions import InterfaceAction
class AddToLibraryAction(InterfaceAction):
name = 'Add To Library'
action_spec = (_('Add books to library'), 'add_book.svg',
action_spec = (_('Add books to library'), 'add_book.png',
_('Add books to your calibre library from the connected device'), None)
dont_add_to = frozenset(['toolbar', 'context-menu'])

2
src/calibre/gui2/actions/convert.py
View File

@ -19,7 +19,7 @@ from calibre.customize.ui import plugin_for_input_format
class ConvertAction(InterfaceAction):
name = 'Convert Books'
action_spec = (_('Convert books'), 'convert.svg', None, _('C'))
action_spec = (_('Convert books'), 'convert.png', None, _('C'))
dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])
def genesis(self):

2
src/calibre/gui2/actions/delete.py
View File

@ -15,7 +15,7 @@ from calibre.gui2.actions import InterfaceAction
class DeleteAction(InterfaceAction):
name = 'Remove Books'
action_spec = (_('Remove books'), 'trash.svg', None, _('Del'))
action_spec = (_('Remove books'), 'trash.png', None, _('Del'))
def genesis(self):
self.qaction.triggered.connect(self.delete_books)

10
src/calibre/gui2/actions/device.py
View File

@ -36,7 +36,7 @@ class ShareConnMenu(QMenu): # {{{
mitem.setVisible(False)
self.addSeparator()
self.toggle_server_action = \
self.addAction(QIcon(I('network-server.svg')),
self.addAction(QIcon(I('network-server.png')),
_('Start Content Server'))
self.toggle_server_action.triggered.connect(lambda x:
self.toggle_server.emit())
@ -63,9 +63,9 @@ class ShareConnMenu(QMenu): # {{{
for account in keys:
formats, auto, default = opts.accounts[account]
dest = 'mail:'+account+';'+formats
action1 = DeviceAction(dest, False, False, I('mail.svg'),
action1 = DeviceAction(dest, False, False, I('mail.png'),
_('Email to')+' '+account)
action2 = DeviceAction(dest, True, False, I('mail.svg'),
action2 = DeviceAction(dest, True, False, I('mail.png'),
_('Email to')+' '+account+ _(' and delete from library'))
map(self.email_to_menu.addAction, (action1, action2))
map(self.memory.append, (action1, action2))
@ -95,7 +95,7 @@ class ShareConnMenu(QMenu): # {{{
class SendToDeviceAction(InterfaceAction):
name = 'Send To Device'
action_spec = (_('Send to device'), 'sync.svg', None, _('D'))
action_spec = (_('Send to device'), 'sync.png', None, _('D'))
dont_remove_from = frozenset(['toolbar-device'])
dont_add_to = frozenset(['toolbar', 'context-menu'])
@ -114,7 +114,7 @@ class SendToDeviceAction(InterfaceAction):
class ConnectShareAction(InterfaceAction):
name = 'Connect Share'
action_spec = (_('Connect/share'), 'connect_share.svg', None, None)
action_spec = (_('Connect/share'), 'connect_share.png', None, None)
popup_type = QToolButton.InstantPopup
def genesis(self):

4
src/calibre/gui2/actions/edit_metadata.py
View File

@ -21,10 +21,10 @@ from calibre.gui2.dialogs.progress import BlockingBusy
class EditMetadataAction(InterfaceAction):
name = 'Edit Metadata'
action_spec = (_('Edit metadata'), 'edit_input.svg', None, _('E'))
action_spec = (_('Edit metadata'), 'edit_input.png', None, _('E'))
def genesis(self):
self.create_action(spec=(_('Merge book records'), 'merge_books.svg',
self.create_action(spec=(_('Merge book records'), 'merge_books.png',
None, _('M')), attr='action_merge')
md = QMenu()
md.addAction(_('Edit metadata individually'),

2
src/calibre/gui2/actions/fetch_news.py
View File

@ -15,7 +15,7 @@ from calibre.gui2.actions import InterfaceAction
class FetchNewsAction(InterfaceAction):
name = 'Fetch News'
action_spec = (_('Fetch news'), 'news.svg', None, _('F'))
action_spec = (_('Fetch news'), 'news.png', None, _('F'))
def location_selected(self, loc):
enabled = loc == 'library'

2
src/calibre/gui2/actions/help.py
View File

@ -13,7 +13,7 @@ from calibre.gui2.actions import InterfaceAction
class HelpAction(InterfaceAction):
name = 'Help'
action_spec = (_('Help'), 'help.svg', _('Browse the calibre User Manual'), _('F1'),)
action_spec = (_('Help'), 'help.png', _('Browse the calibre User Manual'), _('F1'),)
def genesis(self):
self.qaction.triggered.connect(self.show_help)

2
src/calibre/gui2/actions/open.py
View File

@ -11,7 +11,7 @@ from calibre.gui2.actions import InterfaceAction
class OpenFolderAction(InterfaceAction):
name = 'Open Folder'
action_spec = (_('Open containing folder'), 'document_open.svg', None,
action_spec = (_('Open containing folder'), 'document_open.png', None,
_('O'))
dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])

6
src/calibre/gui2/actions/preferences.py
View File

@ -14,13 +14,13 @@ from calibre.gui2 import error_dialog, config
class PreferencesAction(InterfaceAction):
name = 'Preferences'
action_spec = (_('Preferences'), 'config.svg', None, _('Ctrl+P'))
action_spec = (_('Preferences'), 'config.png', None, _('Ctrl+P'))
dont_remove_from = frozenset(['toolbar'])
def genesis(self):
pm = QMenu()
pm.addAction(QIcon(I('config.svg')), _('Preferences'), self.do_config)
pm.addAction(QIcon(I('wizard.svg')), _('Run welcome wizard'),
pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)
pm.addAction(QIcon(I('wizard.png')), _('Run welcome wizard'),
self.gui.run_wizard)
self.qaction.setMenu(pm)
self.preferences_menu = pm

2
src/calibre/gui2/actions/save_to_disk.py
View File

@ -37,7 +37,7 @@ class SaveMenu(QMenu): # {{{
class SaveToDiskAction(InterfaceAction):
name = "Save To Disk"
action_spec = (_('Save to disk'), 'save.svg', None, _('S'))
action_spec = (_('Save to disk'), 'save.png', None, _('S'))
def genesis(self):
self.qaction.triggered.connect(self.save_to_disk)

2
src/calibre/gui2/actions/show_book_details.py
View File

@ -13,7 +13,7 @@ from calibre.gui2 import error_dialog
class ShowBookDetailsAction(InterfaceAction):
name = 'Show Book Details'
action_spec = (_('Show book details'), 'dialog_information.svg', None,
action_spec = (_('Show book details'), 'dialog_information.png', None,
_('I'))
dont_add_to = frozenset(['toolbar-device', 'context-menu-device'])

6
src/calibre/gui2/actions/similar_books.py
View File

@ -20,11 +20,11 @@ class SimilarBooksAction(InterfaceAction):
def genesis(self):
m = QMenu(self.gui)
for text, icon, target, shortcut in [
(_('Books by same author'), 'user_profile.svg', 'authors', _('Alt+A')),
(_('Books in this series'), 'books_in_series.svg', 'series',
(_('Books by same author'), 'user_profile.png', 'authors', _('Alt+A')),
(_('Books in this series'), 'books_in_series.png', 'series',
_('Alt+Shift+S')),
(_('Books by this publisher'), 'publisher.png', 'publisher', _('Alt+P')),
(_('Books with the same tags'), 'tags.svg', 'tag', _('Alt+T')),]:
(_('Books with the same tags'), 'tags.png', 'tag', _('Alt+T')),]:
ac = self.create_action(spec=(text, icon, None, shortcut),
attr=target)
m.addAction(ac)

2
src/calibre/gui2/actions/view.py
View File

@ -21,7 +21,7 @@ from calibre.gui2.actions import InterfaceAction
class ViewAction(InterfaceAction):
name = 'View'
action_spec = (_('View'), 'view.svg', None, _('V'))
action_spec = (_('View'), 'view.png', None, _('V'))
def genesis(self):
self.persistent_files = []

4
src/calibre/gui2/add_wizard/__init__.py
View File

@ -146,11 +146,11 @@ class Wizard(QWizard): # {{{
QWizard.__init__(self, parent)
self.setModal(True)
self.setWindowTitle(_('Add books to calibre'))
self.setWindowIcon(QIcon(I('add_book.svg')))
self.setWindowIcon(QIcon(I('add_book.png')))
self.setPixmap(self.LogoPixmap, QPixmap(P('content_server/calibre.png')).scaledToHeight(80,
Qt.SmoothTransformation))
self.setPixmap(self.WatermarkPixmap,
QPixmap(I('welcome_wizard.svg')))
QPixmap(I('welcome_wizard.png')))
self.register = {}

2
src/calibre/gui2/add_wizard/welcome.ui
View File

@ -59,7 +59,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
<normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
</property>
</widget>
</item>

2
src/calibre/gui2/book_details.py
View File

@ -80,7 +80,7 @@ class CoverView(QWidget): # {{{
self.setSizePolicy(QSizePolicy.Expanding if vertical else
QSizePolicy.Minimum, QSizePolicy.Expanding)
self.default_pixmap = QPixmap(I('book.svg'))
self.default_pixmap = QPixmap(I('book.png'))
self.pixmap = self.default_pixmap
self.pwidth = self.pheight = None
self.data = {}

2
src/calibre/gui2/convert/__init__.py
View File

@ -40,7 +40,7 @@ def bulk_defaults_for_input_format(fmt):
class Widget(QWidget):
TITLE = _('Unknown')
ICON = I('config.svg')
ICON = I('config.png')
HELP = ''
COMMIT_NAME = None

2
src/calibre/gui2/convert/bulk.py
View File

@ -76,7 +76,7 @@ class BulkConfig(Config):
output_widget = __import__('calibre.gui2.convert.'+name,
fromlist=[1])
pw = output_widget.PluginWidget
pw.ICON = I('back.svg')
pw.ICON = I('back.png')
pw.HELP = _('Options specific to the output format.')
output_widget = widget_factory(pw)
except ImportError:

2
src/calibre/gui2/convert/comic_input.py
View File

@ -15,7 +15,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('Comic Input')
HELP = _('Options specific to')+' comic '+_('input')
COMMIT_NAME = 'comic_input'
ICON = I('mimetypes/png.svg')
ICON = I('mimetypes/png.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent,

2
src/calibre/gui2/convert/debug.py
View File

@ -17,7 +17,7 @@ from calibre.gui2 import error_dialog, choose_dir
class DebugWidget(Widget, Ui_Form):
TITLE = _('Debug')
ICON = I('debug.svg')
ICON = I('debug.png')
HELP = _('Debug the conversion process.')
COMMIT_NAME = 'debug'

4
src/calibre/gui2/convert/debug.ui
View File

@ -41,7 +41,7 @@
</property>
<property name="icon">
<iconset resource="../../../work/calibre/resources/images.qrc">
<normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
<normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
</property>
</widget>
</item>
@ -65,7 +65,7 @@
</property>
<property name="icon">
<iconset resource="../../../work/calibre/resources/images.qrc">
<normaloff>:/images/clear_left.svg</normaloff>:/images/clear_left.svg</iconset>
<normaloff>:/images/clear_left.png</normaloff>:/images/clear_left.png</iconset>
</property>
</widget>
</item>

2
src/calibre/gui2/convert/epub_output.py
View File

@ -15,7 +15,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('EPUB Output')
HELP = _('Options specific to')+' EPUB '+_('output')
COMMIT_NAME = 'epub_output'
ICON = I('mimetypes/epub.svg')
ICON = I('mimetypes/epub.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent,

2
src/calibre/gui2/convert/fb2_input.py
View File

@ -12,7 +12,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('FB2 Input')
HELP = _('Options specific to')+' FB2 '+_('input')
COMMIT_NAME = 'fb2_input'
ICON = I('mimetypes/fb2.svg')
ICON = I('mimetypes/fb2.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent,

2
src/calibre/gui2/convert/fb2_output.py
View File

@ -14,7 +14,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('FB2 Output')
HELP = _('Options specific to')+' FB2 '+_('output')
COMMIT_NAME = 'fb2_output'
ICON = I('mimetypes/fb2.svg')
ICON = I('mimetypes/fb2.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent, ['inline_toc', 'sectionize_chapters'])

2
src/calibre/gui2/convert/font_key.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/wizard.svg</normaloff>:/images/wizard.svg</iconset>
<normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="5" column="1" colspan="3">

2
src/calibre/gui2/convert/look_and_feel.py
View File

@ -14,7 +14,7 @@ from calibre.gui2.convert import Widget
class LookAndFeelWidget(Widget, Ui_Form):
TITLE = _('Look & Feel')
ICON = I('lookfeel.svg')
ICON = I('lookfeel.png')
HELP = _('Control the look and feel of the output')
COMMIT_NAME = 'look_and_feel'

2
src/calibre/gui2/convert/look_and_feel.ui
View File

@ -85,7 +85,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/wizard.svg</normaloff>:/images/wizard.svg</iconset>
<normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
</property>
<property name="iconSize">
<size>

2
src/calibre/gui2/convert/lrf_output.py
View File

@ -19,7 +19,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('LRF Output')
HELP = _('Options specific to')+' LRF '+_('output')
COMMIT_NAME = 'lrf_output'
ICON = I('mimetypes/lrf.svg')
ICON = I('mimetypes/lrf.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent,

4
src/calibre/gui2/convert/metadata.py
View File

@ -39,7 +39,7 @@ def create_cover_file(db, book_id):
class MetadataWidget(Widget, Ui_Form):
TITLE = _('Metadata')
ICON = I('dialog_information.svg')
ICON = I('dialog_information.png')
HELP = _('Set the metadata. The output file will contain as much of this '
'metadata as possible.')
COMMIT_NAME = 'metadata'
@ -89,7 +89,7 @@ class MetadataWidget(Widget, Ui_Form):
self.cover.setPixmap(pm)
self.cover_data = cover
else:
self.cover.setPixmap(QPixmap(I('default_cover.svg')))
self.cover.setPixmap(QPixmap(I('default_cover.png')))
def initialize_combos(self):

2
src/calibre/gui2/convert/metadata.ui
View File

@ -87,7 +87,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
<normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
</property>
</widget>
</item>

2
src/calibre/gui2/convert/mobi_output.py
View File

@ -20,7 +20,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('MOBI Output')
HELP = _('Options specific to')+' MOBI '+_('output')
COMMIT_NAME = 'mobi_output'
ICON = I('mimetypes/mobi.svg')
ICON = I('mimetypes/mobi.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent,

2
src/calibre/gui2/convert/pdb_input.py
View File

@ -12,7 +12,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('PDB Input')
HELP = _('Options specific to')+' PDB '+_('input')
COMMIT_NAME = 'pdb_input'
ICON = I('mimetypes/unknown.svg')
ICON = I('mimetypes/unknown.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent,

2
src/calibre/gui2/convert/pdb_output.py
View File

@ -16,7 +16,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('PDB Output')
HELP = _('Options specific to')+' PDB '+_('output')
COMMIT_NAME = 'pdb_output'
ICON = I('mimetypes/unknown.svg')
ICON = I('mimetypes/unknown.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent, ['format', 'inline_toc'])

2
src/calibre/gui2/convert/pdf_input.py
View File

@ -12,7 +12,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('PDF Input')
HELP = _('Options specific to')+' PDF '+_('input')
COMMIT_NAME = 'pdf_input'
ICON = I('mimetypes/pdf.svg')
ICON = I('mimetypes/pdf.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent,

2
src/calibre/gui2/convert/pdf_output.py
View File

@ -17,7 +17,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('PDF Output')
HELP = _('Options specific to')+' PDF '+_('output')
COMMIT_NAME = 'pdf_output'
ICON = I('mimetypes/pdf.svg')
ICON = I('mimetypes/pdf.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent, ['paper_size',

2
src/calibre/gui2/convert/rb_output.py
View File

@ -14,7 +14,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('RB Output')
HELP = _('Options specific to')+' RB '+_('output')
COMMIT_NAME = 'rb_output'
ICON = I('mimetypes/unknown.svg')
ICON = I('mimetypes/unknown.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent, ['inline_toc'])

4
src/calibre/gui2/convert/single.py
View File

@ -181,7 +181,7 @@ class Config(ResizableDialog, Ui_Dialog):
output_widget = __import__('calibre.gui2.convert.'+name,
fromlist=[1])
pw = output_widget.PluginWidget
pw.ICON = I('back.svg')
pw.ICON = I('back.png')
pw.HELP = _('Options specific to the output format.')
output_widget = widget_factory(pw)
except ImportError:
@ -192,7 +192,7 @@ class Config(ResizableDialog, Ui_Dialog):
input_widget = __import__('calibre.gui2.convert.'+name,
fromlist=[1])
pw = input_widget.PluginWidget
pw.ICON = I('forward.svg')
pw.ICON = I('forward.png')
pw.HELP = _('Options specific to the input format.')
input_widget = widget_factory(pw)
except ImportError:

2
src/calibre/gui2/convert/single.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/convert.svg</normaloff>:/images/convert.svg</iconset>
<normaloff>:/images/convert.png</normaloff>:/images/convert.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">

2
src/calibre/gui2/convert/structure_detection.py
View File

@ -15,7 +15,7 @@ from calibre.gui2 import error_dialog
class StructureDetectionWidget(Widget, Ui_Form):
TITLE = _('Structure\nDetection')
ICON = I('chapters.svg')
ICON = I('chapters.png')
HELP = _('Fine tune the detection of chapter headings and '
'other document structure.')
COMMIT_NAME = 'structure_detection'

2
src/calibre/gui2/convert/toc.py
View File

@ -14,7 +14,7 @@ from calibre.gui2 import error_dialog
class TOCWidget(Widget, Ui_Form):
TITLE = _('Table of\nContents')
ICON = I('series.svg')
ICON = I('series.png')
HELP = _('Control the creation/conversion of the Table of Contents.')
COMMIT_NAME = 'toc'

2
src/calibre/gui2/convert/txt_input.py
View File

@ -12,7 +12,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('TXT Input')
HELP = _('Options specific to')+' TXT '+_('input')
COMMIT_NAME = 'txt_input'
ICON = I('mimetypes/txt.svg')
ICON = I('mimetypes/txt.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent,

2
src/calibre/gui2/convert/txt_output.py
View File

@ -16,7 +16,7 @@ class PluginWidget(Widget, Ui_Form):
TITLE = _('TXT Output')
HELP = _('Options specific to')+' TXT '+_('output')
COMMIT_NAME = 'txt_output'
ICON = I('mimetypes/txt.svg')
ICON = I('mimetypes/txt.png')
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
Widget.__init__(self, parent,

2
src/calibre/gui2/convert/xexp_edit.ui
View File

@ -60,7 +60,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/wizard.svg</normaloff>:/images/wizard.svg</iconset>
<normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
</property>
<property name="iconSize">
<size>

2
src/calibre/gui2/custom_column_widgets.py
View File

@ -57,7 +57,7 @@ class Bool(Base):
QComboBox(parent)]
w = self.widgets[1]
items = [_('Yes'), _('No'), _('Undefined')]
icons = [I('ok.svg'), I('list_remove.svg'), I('blank.svg')]
icons = [I('ok.png'), I('list_remove.png'), I('blank.png')]
if tweaks['bool_custom_columns_are_tristate'] == 'no':
items = items[:-1]
icons = icons[:-1]

24
src/calibre/gui2/device.py
View File

@ -417,33 +417,33 @@ class DeviceMenu(QMenu): # {{{
self._memory = []
self.set_default_menu = QMenu(_('Set default send to device action'))
self.set_default_menu.setIcon(QIcon(I('config.svg')))
self.set_default_menu.setIcon(QIcon(I('config.png')))
basic_actions = [
('main:', False, False, I('reader.svg'),
('main:', False, False, I('reader.png'),
_('Send to main memory')),
('carda:0', False, False, I('sd.svg'),
('carda:0', False, False, I('sd.png'),
_('Send to storage card A')),
('cardb:0', False, False, I('sd.svg'),
('cardb:0', False, False, I('sd.png'),
_('Send to storage card B')),
]
delete_actions = [
('main:', True, False, I('reader.svg'),
('main:', True, False, I('reader.png'),
_('Main Memory')),
('carda:0', True, False, I('sd.svg'),
('carda:0', True, False, I('sd.png'),
_('Storage Card A')),
('cardb:0', True, False, I('sd.svg'),
('cardb:0', True, False, I('sd.png'),
_('Storage Card B')),
]
specific_actions = [
('main:', False, True, I('reader.svg'),
('main:', False, True, I('reader.png'),
_('Main Memory')),
('carda:0', False, True, I('sd.svg'),
('carda:0', False, True, I('sd.png'),
_('Storage Card A')),
('cardb:0', False, True, I('sd.svg'),
('cardb:0', False, True, I('sd.png'),
_('Storage Card B')),
]
@ -488,7 +488,7 @@ class DeviceMenu(QMenu): # {{{
self.group.triggered.connect(self.change_default_action)
self.addSeparator()
mitem = self.addAction(QIcon(I('eject.svg')), _('Eject device'))
mitem = self.addAction(QIcon(I('eject.png')), _('Eject device'))
mitem.setEnabled(False)
mitem.triggered.connect(lambda x : self.disconnect_mounted_device.emit())
self.disconnect_mounted_device_action = mitem
@ -617,7 +617,7 @@ class DeviceMixin(object): # {{{
self.connect_to_folder_named(tweaks['auto_connect_to_folder'])
def set_default_thumbnail(self, height):
r = QSvgRenderer(I('book.svg'))
r = QSvgRenderer(I('book.png'))
pixmap = QPixmap(height, height)
pixmap.fill(QColor(255,255,255))
p = QPainter(pixmap)

4
src/calibre/gui2/device_drivers/configwidget.ui
View File

@ -41,7 +41,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/arrow-up.svg</normaloff>:/images/arrow-up.svg</iconset>
<normaloff>:/images/arrow-up.png</normaloff>:/images/arrow-up.png</iconset>
</property>
</widget>
</item>
@ -65,7 +65,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/arrow-down.svg</normaloff>:/images/arrow-down.svg</iconset>
<normaloff>:/images/arrow-down.png</normaloff>:/images/arrow-down.png</iconset>
</property>
</widget>
</item>

2
src/calibre/gui2/dialogs/add_from_isbn.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/add_book.svg</normaloff>:/images/add_book.svg</iconset>
<normaloff>:/images/add_book.png</normaloff>:/images/add_book.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">

4
src/calibre/gui2/dialogs/book_info.ui
View File

@ -70,7 +70,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/previous.svg</normaloff>:/images/previous.svg</iconset>
<normaloff>:/images/previous.png</normaloff>:/images/previous.png</iconset>
</property>
</widget>
</item>
@ -81,7 +81,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/next.svg</normaloff>:/images/next.svg</iconset>
<normaloff>:/images/next.png</normaloff>:/images/next.png</iconset>
</property>
</widget>
</item>

4
src/calibre/gui2/dialogs/catalog.py
View File

@ -52,7 +52,7 @@ class Catalog(QDialog, Ui_Dialog):
fromlist=[1])
pw = catalog_widget.PluginWidget()
pw.initialize(name)
pw.ICON = I('forward.svg')
pw.ICON = I('forward.png')
self.widgets.append(pw)
[self.fmts.append([file_type.upper(), pw.sync_enabled,pw]) for file_type in plugin.file_types]
except ImportError:
@ -83,7 +83,7 @@ class Catalog(QDialog, Ui_Dialog):
catalog_widget = __import__(name, fromlist=[1])
pw = catalog_widget.PluginWidget()
pw.initialize(name)
pw.ICON = I('forward.svg')
pw.ICON = I('forward.png')
self.widgets.append(pw)
[self.fmts.append([file_type.upper(), pw.sync_enabled,pw]) for file_type in plugin.file_types]
except ImportError:

2
src/calibre/gui2/dialogs/choose_format.ui
View File

@ -13,7 +13,7 @@
<string>Choose Format</string>
</property>
<property name="windowIcon" >
<iconset resource="../../../../resources/images.qrc" >:/images/mimetypes/unknown.svg</iconset>
<iconset resource="../../../../resources/images.qrc" >:/images/mimetypes/unknown.png</iconset>
</property>
<layout class="QVBoxLayout" >
<item>

2
src/calibre/gui2/dialogs/choose_library.ui
View File

@ -118,7 +118,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
<normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
</property>
</widget>
</item>

2
src/calibre/gui2/dialogs/comicconf.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/convert.svg</normaloff>:/images/convert.svg</iconset>
<normaloff>:/images/convert.png</normaloff>:/images/convert.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">

22
src/calibre/gui2/dialogs/config/__init__.py
View File

@ -64,7 +64,7 @@ class ConfigTabs(QTabWidget):
for plugin in input_format_plugins():
pw = config_widget_for_input_plugin(plugin)
if pw is not None:
pw.ICON = I('forward.svg')
pw.ICON = I('forward.png')
self.widgets.append(widget_factory(pw))
for plugin in output_format_plugins():
@ -73,7 +73,7 @@ class ConfigTabs(QTabWidget):
output_widget = __import__('calibre.gui2.convert.'+name,
fromlist=[1])
pw = output_widget.PluginWidget
pw.ICON = I('forward.svg')
pw.ICON = I('forward.png')
self.widgets.append(widget_factory(pw))
except ImportError:
continue
@ -95,7 +95,7 @@ class PluginModel(QAbstractItemModel):
def __init__(self, *args):
QAbstractItemModel.__init__(self, *args)
self.icon = QVariant(QIcon(I('plugins.svg')))
self.icon = QVariant(QIcon(I('plugins.png')))
p = QIcon(self.icon).pixmap(32, 32, QIcon.Disabled, QIcon.On)
self.disabled_icon = QVariant(QIcon(p))
self._p = p
@ -195,14 +195,14 @@ class PluginModel(QAbstractItemModel):
class CategoryModel(QStringListModel):
CATEGORIES = [
('general', _('General'), 'dialog_information.svg'),
('interface', _('Interface'), 'lookfeel.svg'),
('conversion', _('Conversion'), 'convert.svg'),
('email', _('Email\nDelivery'), 'mail.svg'),
('add/save', _('Add/Save'), 'save.svg'),
('advanced', _('Advanced'), 'view.svg'),
('server', _('Content\nServer'), 'network-server.svg'),
('plugins', _('Plugins'), 'plugins.svg'),
('general', _('General'), 'dialog_information.png'),
('interface', _('Interface'), 'lookfeel.png'),
('conversion', _('Conversion'), 'convert.png'),
('email', _('Email\nDelivery'), 'mail.png'),
('add/save', _('Add/Save'), 'save.png'),
('advanced', _('Advanced'), 'view.png'),
('server', _('Content\nServer'), 'network-server.png'),
('plugins', _('Plugins'), 'plugins.png'),
]
def __init__(self, *args):

22
src/calibre/gui2/dialogs/config/config.ui
View File

@ -16,7 +16,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/config.svg</normaloff>:/images/config.svg</iconset>
<normaloff>:/images/config.png</normaloff>:/images/config.png</iconset>
</property>
<layout class="QGridLayout">
<item row="1" column="0">
@ -273,7 +273,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/arrow-up.svg</normaloff>:/images/arrow-up.svg</iconset>
<normaloff>:/images/arrow-up.png</normaloff>:/images/arrow-up.png</iconset>
</property>
</widget>
</item>
@ -297,7 +297,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/arrow-down.svg</normaloff>:/images/arrow-down.svg</iconset>
<normaloff>:/images/arrow-down.png</normaloff>:/images/arrow-down.png</iconset>
</property>
</widget>
</item>
@ -465,7 +465,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/arrow-up.svg</normaloff>:/images/arrow-up.svg</iconset>
<normaloff>:/images/arrow-up.png</normaloff>:/images/arrow-up.png</iconset>
</property>
</widget>
</item>
@ -492,7 +492,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/minus.svg</normaloff>:/images/minus.svg</iconset>
<normaloff>:/images/minus.png</normaloff>:/images/minus.png</iconset>
</property>
</widget>
</item>
@ -519,7 +519,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
<normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
</property>
</widget>
</item>
@ -546,7 +546,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/edit_input.svg</normaloff>:/images/edit_input.svg</iconset>
<normaloff>:/images/edit_input.png</normaloff>:/images/edit_input.png</iconset>
</property>
</widget>
</item>
@ -570,7 +570,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/arrow-down.svg</normaloff>:/images/arrow-down.svg</iconset>
<normaloff>:/images/arrow-down.png</normaloff>:/images/arrow-down.png</iconset>
</property>
</widget>
</item>
@ -699,7 +699,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
<normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
</property>
<property name="iconSize">
<size>
@ -726,7 +726,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/minus.svg</normaloff>:/images/minus.svg</iconset>
<normaloff>:/images/minus.png</normaloff>:/images/minus.png</iconset>
</property>
<property name="iconSize">
<size>
@ -1289,7 +1289,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
<normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
</property>
</widget>
</item>

2
src/calibre/gui2/dialogs/config/device_debug.py
View File

@ -22,7 +22,7 @@ class DebugDevice(QDialog):
self.copy = QPushButton(_('Copy to &clipboard'))
self.copy.setDefault(True)
self.setWindowTitle(_('Debug device detection'))
self.setWindowIcon(QIcon(I('debug.svg')))
self.setWindowIcon(QIcon(I('debug.png')))
self.copy.clicked.connect(self.copy_to_clipboard)
self.ok = QPushButton('&OK')
self.ok.setAutoDefault(False)

4
src/calibre/gui2/dialogs/config/toolbar.py
View File

@ -27,7 +27,7 @@ class BaseModel(QAbstractListModel):
def name_to_action(self, name, gui):
if name == 'Donate':
return FakeAction(name, 'donate.svg',
return FakeAction(name, 'donate.png',
dont_add_to=frozenset(['context-menu',
'context-menu-device']))
if name == 'Location Manager':
@ -53,7 +53,7 @@ class BaseModel(QAbstractListModel):
if role == Qt.DecorationRole:
ic = action[1]
if ic is None:
ic = 'blank.svg'
ic = 'blank.png'
return QVariant(QIcon(I(ic)))
if role == Qt.ToolTipRole and action[2] is not None:
return QVariant(action[2])

8
src/calibre/gui2/dialogs/config/toolbar.ui
View File

@ -96,7 +96,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/arrow-up.svg</normaloff>:/images/arrow-up.svg</iconset>
<normaloff>:/images/arrow-up.png</normaloff>:/images/arrow-up.png</iconset>
</property>
<property name="iconSize">
<size>
@ -129,7 +129,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/arrow-down.svg</normaloff>:/images/arrow-down.svg</iconset>
<normaloff>:/images/arrow-down.png</normaloff>:/images/arrow-down.png</iconset>
</property>
<property name="iconSize">
<size>
@ -159,7 +159,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/forward.svg</normaloff>:/images/forward.svg</iconset>
<normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
</property>
<property name="iconSize">
<size>
@ -195,7 +195,7 @@
</property>
<property name="icon">
<iconset resource="../../../../../resources/images.qrc">
<normaloff>:/images/back.svg</normaloff>:/images/back.svg</iconset>
<normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
</property>
<property name="iconSize">
<size>

2
src/calibre/gui2/dialogs/confirm_delete.py
View File

@ -25,7 +25,7 @@ class Dialog(QDialog, Ui_Dialog):
def toggle(self, *args):
dynamic[_config_name(self.name)] = self.again.isChecked()
def confirm(msg, name, parent=None, pixmap='dialog_warning.svg'):
def confirm(msg, name, parent=None, pixmap='dialog_warning.png'):
if not dynamic.get(_config_name(name), True):
return True
d = Dialog(msg, name, parent)

4
src/calibre/gui2/dialogs/confirm_delete.ui
View File

@ -14,7 +14,7 @@
</property>
<property name="windowIcon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/dialog_warning.svg</normaloff>:/images/dialog_warning.svg</iconset>
<normaloff>:/images/dialog_warning.png</normaloff>:/images/dialog_warning.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
@ -22,7 +22,7 @@
<item>
<widget class="QLabel" name="label" >
<property name="pixmap" >
<pixmap resource="../../../../resources/images.qrc" >:/images/dialog_warning.svg</pixmap>
<pixmap resource="../../../../resources/images.qrc" >:/images/dialog_warning.png</pixmap>
</property>
</widget>
</item>

2
src/calibre/gui2/dialogs/conversion_error.ui
View File

@ -23,7 +23,7 @@
<string/>
</property>
<property name="pixmap" >
<pixmap resource="../../../../resources/images.qrc" >:/images/dialog_error.svg</pixmap>
<pixmap resource="../../../../resources/images.qrc" >:/images/dialog_error.png</pixmap>
</property>
</widget>
</item>

2
src/calibre/gui2/dialogs/fetch_metadata.ui
View File

@ -18,7 +18,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/metadata.svg</normaloff>:/images/metadata.svg</iconset>
<normaloff>:/images/metadata.png</normaloff>:/images/metadata.png</iconset>
</property>
<layout class="QVBoxLayout">
<item>

2
src/calibre/gui2/dialogs/job_view.ui
View File

@ -14,7 +14,7 @@
</property>
<property name="windowIcon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/view.svg</normaloff>:/images/view.svg</iconset>
<normaloff>:/images/view.png</normaloff>:/images/view.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >

2
src/calibre/gui2/dialogs/jobs.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/jobs.svg</normaloff>:/images/jobs.svg</iconset>
<normaloff>:/images/jobs.png</normaloff>:/images/jobs.png</iconset>
</property>
<layout class="QVBoxLayout">
<item>

4
src/calibre/gui2/dialogs/metadata_bulk.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/edit_input.svg</normaloff>:/images/edit_input.svg</iconset>
<normaloff>:/images/edit_input.png</normaloff>:/images/edit_input.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@ -177,7 +177,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/chapters.svg</normaloff>:/images/chapters.svg</iconset>
<normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
</property>
</widget>
</item>

4
src/calibre/gui2/dialogs/metadata_single.py
View File

@ -102,7 +102,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
view_format = pyqtSignal(object)
def do_reset_cover(self, *args):
pix = QPixmap(I('default_cover.svg'))
pix = QPixmap(I('default_cover.png'))
self.cover.setPixmap(pix)
self.cover_changed = True
self.cover_data = None
@ -432,7 +432,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
if cover:
pm.loadFromData(cover)
if pm.isNull():
pm = QPixmap(I('default_cover.svg'))
pm = QPixmap(I('default_cover.png'))
else:
self.cover_data = cover
self.cover.setPixmap(pm)

22
src/calibre/gui2/dialogs/metadata_single.ui
View File

@ -21,7 +21,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/edit_input.svg</normaloff>:/images/edit_input.svg</iconset>
<normaloff>:/images/edit_input.png</normaloff>:/images/edit_input.png</iconset>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
@ -110,7 +110,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/swap.svg</normaloff>:/images/swap.svg</iconset>
<normaloff>:/images/swap.png</normaloff>:/images/swap.png</iconset>
</property>
<property name="iconSize">
<size>
@ -165,7 +165,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/auto_author_sort.svg</normaloff>:/images/auto_author_sort.svg</iconset>
<normaloff>:/images/auto_author_sort.png</normaloff>:/images/auto_author_sort.png</iconset>
</property>
</widget>
</item>
@ -248,7 +248,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/chapters.svg</normaloff>:/images/chapters.svg</iconset>
<normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
</property>
</widget>
</item>
@ -301,7 +301,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/trash.svg</normaloff>:/images/trash.svg</iconset>
<normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
</property>
</widget>
</item>
@ -478,7 +478,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/add_book.svg</normaloff>:/images/add_book.svg</iconset>
<normaloff>:/images/add_book.png</normaloff>:/images/add_book.png</iconset>
</property>
<property name="iconSize">
<size>
@ -498,7 +498,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/trash.svg</normaloff>:/images/trash.svg</iconset>
<normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
</property>
<property name="iconSize">
<size>
@ -518,7 +518,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/book.svg</normaloff>:/images/book.svg</iconset>
<normaloff>:/images/book.png</normaloff>:/images/book.png</iconset>
</property>
<property name="iconSize">
<size>
@ -538,7 +538,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/edit_input.svg</normaloff>:/images/edit_input.svg</iconset>
<normaloff>:/images/edit_input.png</normaloff>:/images/edit_input.png</iconset>
</property>
<property name="iconSize">
<size>
@ -619,7 +619,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
<normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
</property>
</widget>
</item>
@ -633,7 +633,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/trash.svg</normaloff>:/images/trash.svg</iconset>
<normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
</property>
</widget>
</item>

2
src/calibre/gui2/dialogs/password.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/mimetypes/unknown.svg</normaloff>:/images/mimetypes/unknown.svg</iconset>
<normaloff>:/images/mimetypes/unknown.png</normaloff>:/images/mimetypes/unknown.png</iconset>
</property>
<layout class="QGridLayout">
<item row="0" column="1">

2
src/calibre/gui2/dialogs/progress.ui
View File

@ -14,7 +14,7 @@
</property>
<property name="windowIcon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/jobs.svg</normaloff>:/images/jobs.svg</iconset>
<normaloff>:/images/jobs.png</normaloff>:/images/jobs.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >

6
src/calibre/gui2/dialogs/saved_search_editor.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff>:/images/chapters.svg</normaloff>:/images/chapters.svg</iconset>
<normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
</property>
<layout class="QGridLayout">
<item row="2" column="0" colspan="2">
@ -90,7 +90,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>:/images/minus.svg</normaloff>:/images/minus.svg</iconset>
<normaloff>:/images/minus.png</normaloff>:/images/minus.png</iconset>
</property>
</widget>
</item>
@ -130,7 +130,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
<normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
</property>
</widget>
</item>

6
src/calibre/gui2/dialogs/scheduler.py
View File

@ -216,11 +216,11 @@ class Scheduler(QObject):
self.download_queue = set([])
self.news_menu = QMenu()
self.news_icon = QIcon(I('news.svg'))
self.scheduler_action = QAction(QIcon(I('scheduler.svg')), _('Schedule news download'), self)
self.news_icon = QIcon(I('news.png'))
self.scheduler_action = QAction(QIcon(I('scheduler.png')), _('Schedule news download'), self)
self.news_menu.addAction(self.scheduler_action)
self.connect(self.scheduler_action, SIGNAL('triggered(bool)'), self.show_dialog)
self.cac = QAction(QIcon(I('user_profile.svg')), _('Add a custom news source'), self)
self.cac = QAction(QIcon(I('user_profile.png')), _('Add a custom news source'), self)
self.connect(self.cac, SIGNAL('triggered(bool)'), self.customize_feeds)
self.news_menu.addAction(self.cac)
self.news_menu.addSeparator()

2
src/calibre/gui2/dialogs/scheduler.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff>:/images/scheduler.svg</normaloff>:/images/scheduler.svg</iconset>
<normaloff>:/images/scheduler.png</normaloff>:/images/scheduler.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" rowspan="3">

2
src/calibre/gui2/dialogs/search.ui
View File

@ -14,7 +14,7 @@
</property>
<property name="windowIcon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/search.svg</normaloff>:/images/search.svg</iconset>
<normaloff>:/images/search.png</normaloff>:/images/search.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3" >
<item>

6
src/calibre/gui2/dialogs/tag_categories.py
View File

@ -36,11 +36,11 @@ class TagCategories(QDialog, Ui_TagCategories):
self.db = db
self.applied_items = []
cc_icon = QIcon(I('column.svg'))
cc_icon = QIcon(I('column.png'))
self.category_labels = self.category_labels_orig[:]
category_icons = [None, QIcon(I('user_profile.svg')), QIcon(I('series.svg')),
QIcon(I('publisher.png')), QIcon(I('tags.svg'))]
category_icons = [None, QIcon(I('user_profile.png')), QIcon(I('series.png')),
QIcon(I('publisher.png')), QIcon(I('tags.png'))]
category_values = [None,
lambda: [n.replace('|', ',') for (id, n) in self.db.all_authors()],
lambda: [n for (id, n) in self.db.all_series()],

10
src/calibre/gui2/dialogs/tag_categories.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff>:/images/chapters.svg</normaloff>:/images/chapters.svg</iconset>
<normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
</property>
<layout class="QGridLayout">
<item row="1" column="0">
@ -91,7 +91,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>:/images/forward.svg</normaloff>:/images/forward.svg</iconset>
<normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
</property>
</widget>
</item>
@ -176,7 +176,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>:/images/list_remove.svg</normaloff>:/images/list_remove.svg</iconset>
<normaloff>:/images/list_remove.png</normaloff>:/images/list_remove.png</iconset>
</property>
</widget>
</item>
@ -267,7 +267,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>:/images/minus.svg</normaloff>:/images/minus.svg</iconset>
<normaloff>:/images/minus.png</normaloff>:/images/minus.png</iconset>
</property>
</widget>
</item>
@ -307,7 +307,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
<normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
</property>
</widget>
</item>

10
src/calibre/gui2/dialogs/tag_editor.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/chapters.svg</normaloff>:/images/chapters.svg</iconset>
<normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
@ -59,7 +59,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/trash.svg</normaloff>:/images/trash.svg</iconset>
<normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
</property>
</widget>
</item>
@ -105,7 +105,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/forward.svg</normaloff>:/images/forward.svg</iconset>
<normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
</property>
</widget>
</item>
@ -190,7 +190,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/list_remove.svg</normaloff>:/images/list_remove.svg</iconset>
<normaloff>:/images/list_remove.png</normaloff>:/images/list_remove.png</iconset>
</property>
</widget>
</item>
@ -251,7 +251,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
<normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
</property>
</widget>
</item>

6
src/calibre/gui2/dialogs/tag_list_editor.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff>:/images/chapters.svg</normaloff>:/images/chapters.svg</iconset>
<normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
@ -61,7 +61,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>:/images/trash.svg</normaloff>:/images/trash.svg</iconset>
<normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
</property>
<property name="iconSize">
<size>
@ -81,7 +81,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>:/images/edit_input.svg</normaloff>:/images/edit_input.svg</iconset>
<normaloff>:/images/edit_input.png</normaloff>:/images/edit_input.png</iconset>
</property>
<property name="iconSize">
<size>

2
src/calibre/gui2/dialogs/test_email.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/config.svg</normaloff>:/images/config.svg</iconset>
<normaloff>:/images/config.png</normaloff>:/images/config.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

20
src/calibre/gui2/dialogs/user_profiles.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/user_profile.svg</normaloff>:/images/user_profile.svg</iconset>
<normaloff>:/images/user_profile.png</normaloff>:/images/user_profile.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
@ -76,7 +76,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
<normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
</property>
</widget>
</item>
@ -87,7 +87,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/list_remove.svg</normaloff>:/images/list_remove.svg</iconset>
<normaloff>:/images/list_remove.png</normaloff>:/images/list_remove.png</iconset>
</property>
</widget>
</item>
@ -98,7 +98,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/forward.svg</normaloff>:/images/forward.svg</iconset>
<normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
</property>
</widget>
</item>
@ -109,7 +109,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/news.svg</normaloff>:/images/news.svg</iconset>
<normaloff>:/images/news.png</normaloff>:/images/news.png</iconset>
</property>
</widget>
</item>
@ -120,7 +120,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/chapters.svg</normaloff>:/images/chapters.svg</iconset>
<normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
</property>
</widget>
</item>
@ -285,7 +285,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/arrow-up.svg</normaloff>:/images/arrow-up.svg</iconset>
<normaloff>:/images/arrow-up.png</normaloff>:/images/arrow-up.png</iconset>
</property>
</widget>
</item>
@ -299,7 +299,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/list_remove.svg</normaloff>:/images/list_remove.svg</iconset>
<normaloff>:/images/list_remove.png</normaloff>:/images/list_remove.png</iconset>
</property>
</widget>
</item>
@ -310,7 +310,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/arrow-down.svg</normaloff>:/images/arrow-down.svg</iconset>
<normaloff>:/images/arrow-down.png</normaloff>:/images/arrow-down.png</iconset>
</property>
</widget>
</item>
@ -361,7 +361,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
<normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
</property>
</widget>
</item>

8
src/calibre/gui2/init.py
View File

@ -95,7 +95,7 @@ class LibraryWidget(Splitter): # {{{
idx = 0 if orientation == Qt.Vertical else 1
size = 300 if orientation == Qt.Vertical else 550
Splitter.__init__(self, 'cover_browser_splitter', _('Cover Browser'),
I('cover_flow.svg'),
I('cover_flow.png'),
orientation=orientation, parent=parent,
connect_button=not config['separate_cover_flow'],
side_index=idx, initial_side_size=size, initial_show=False,
@ -113,7 +113,7 @@ class Stack(QStackedWidget): # {{{
parent.cb_splitter = LibraryWidget(parent)
self.tb_widget = TagBrowserWidget(parent)
parent.tb_splitter = Splitter('tag_browser_splitter',
_('Tag Browser'), I('tags.svg'),
_('Tag Browser'), I('tags.png'),
parent=parent, side_index=0, initial_side_size=200,
shortcut=_('Shift+Alt+T'))
parent.tb_splitter.addWidget(self.tb_widget)
@ -207,7 +207,7 @@ class LayoutMixin(object): # {{{
self.book_details = BookDetails(False, self)
self.stack = Stack(self)
self.bd_splitter = Splitter('book_details_splitter',
_('Book Details'), I('book.svg'),
_('Book Details'), I('book.png'),
orientation=Qt.Vertical, parent=self, side_index=1,
shortcut=_('Alt+D'))
self.bd_splitter.addWidget(self.stack)
@ -217,7 +217,7 @@ class LayoutMixin(object): # {{{
# }}}
else: # wide {{{
self.bd_splitter = Splitter('book_details_splitter',
_('Book Details'), I('book.svg'), initial_side_size=200,
_('Book Details'), I('book.png'), initial_side_size=200,
orientation=Qt.Horizontal, parent=self, side_index=1,
shortcut=_('Shift+Alt+D'))
self.stack = Stack(self)

8
src/calibre/gui2/jobs.py
View File

@ -33,10 +33,10 @@ class JobManager(QAbstractTableModel):
def __init__(self):
QAbstractTableModel.__init__(self)
self.wait_icon = QVariant(QIcon(I('jobs.svg')))
self.running_icon = QVariant(QIcon(I('exec.svg')))
self.error_icon = QVariant(QIcon(I('dialog_error.svg')))
self.done_icon = QVariant(QIcon(I('ok.svg')))
self.wait_icon = QVariant(QIcon(I('jobs.png')))
self.running_icon = QVariant(QIcon(I('exec.png')))
self.error_icon = QVariant(QIcon(I('dialog_error.png')))
self.done_icon = QVariant(QIcon(I('ok.png')))
self.jobs = []
self.add_job = Dispatcher(self._add_job)

20
src/calibre/gui2/layout.py
View File

@ -50,7 +50,7 @@ class LocationManager(QObject): # {{{
a = m.addAction(icon, tooltip)
a.triggered.connect(receiver)
self._mem.append(a)
a = m.addAction(QIcon(I('eject.svg')), _('Eject this device'))
a = m.addAction(QIcon(I('eject.png')), _('Eject this device'))
a.triggered.connect(self._eject_requested)
ac.setMenu(m)
self._mem.append(a)
@ -61,11 +61,11 @@ class LocationManager(QObject): # {{{
ac('library', _('Library'), 'lt.png',
_('Show books in calibre library'))
ac('main', _('Reader'), 'reader.svg',
ac('main', _('Reader'), 'reader.png',
_('Show books in the main memory of the device'))
ac('carda', _('Card A'), 'sd.svg',
ac('carda', _('Card A'), 'sd.png',
_('Show books in storage card A'))
ac('cardb', _('Card B'), 'sd.svg',
ac('cardb', _('Card B'), 'sd.png',
_('Show books in storage card B'))
def _location_selected(self, location, *args):
@ -80,7 +80,7 @@ class LocationManager(QObject): # {{{
def update_devices(self, cp=(None, None), fs=[-1, -1, -1], icon=None):
if icon is None:
icon = I('reader.svg')
icon = I('reader.png')
self.location_main.setIcon(QIcon(icon))
had_device = self.has_device
if cp is None:
@ -148,7 +148,7 @@ class SearchBar(QWidget): # {{{
x.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
parent.advanced_search_button = x = QToolButton(self)
x.setIcon(QIcon(I('search.svg')))
x.setIcon(QIcon(I('search.png')))
l.addWidget(x)
x.setToolTip(_("Advanced search"))
@ -163,7 +163,7 @@ class SearchBar(QWidget): # {{{
l.addWidget(x)
x = parent.clear_button = QToolButton(self)
x.setIcon(QIcon(I('clear_left.svg')))
x.setIcon(QIcon(I('clear_left.png')))
x.setObjectName("clear_button")
l.addWidget(x)
x.setToolTip(_("Reset Quick Search"))
@ -175,19 +175,19 @@ class SearchBar(QWidget): # {{{
l.addWidget(x)
x = parent.copy_search_button = QToolButton(self)
x.setIcon(QIcon(I("search_copy_saved.svg")))
x.setIcon(QIcon(I("search_copy_saved.png")))
x.setObjectName("copy_search_button")
l.addWidget(x)
x.setToolTip(_("Copy current search text (instead of search name)"))
x = parent.save_search_button = QToolButton(self)
x.setIcon(QIcon(I("search_add_saved.svg")))
x.setIcon(QIcon(I("search_add_saved.png")))
x.setObjectName("save_search_button")
l.addWidget(x)
x.setToolTip(_("Save current search under the name shown in the box"))
x = parent.delete_search_button = QToolButton(self)
x.setIcon(QIcon(I("search_delete_saved.svg")))
x.setIcon(QIcon(I("search_delete_saved.png")))
x.setObjectName("delete_search_button")
l.addWidget(x)
x.setToolTip(_("Delete current saved search"))

2
src/calibre/gui2/library/delegates.py
View File

@ -282,7 +282,7 @@ class CcBoolDelegate(QStyledItemDelegate): # {{{
def createEditor(self, parent, option, index):
editor = QComboBox(parent)
items = [_('Y'), _('N'), ' ']
icons = [I('ok.svg'), I('list_remove.svg'), I('blank.svg')]
icons = [I('ok.png'), I('list_remove.png'), I('blank.png')]
if tweaks['bool_custom_columns_are_tristate'] == 'no':
items = items[:-1]
icons = icons[:-1]

8
src/calibre/gui2/library/models.py
View File

@ -49,7 +49,7 @@ _default_image = None
def default_image():
global _default_image
if _default_image is None:
_default_image = QImage(I('default_cover.svg'))
_default_image = QImage(I('default_cover.png'))
return _default_image
class BooksModel(QAbstractTableModel): # {{{
@ -89,9 +89,9 @@ class BooksModel(QAbstractTableModel): # {{{
self.alignment_map = {}
self.buffer_size = buffer
self.cover_cache = None
self.bool_yes_icon = QIcon(I('ok.svg'))
self.bool_no_icon = QIcon(I('list_remove.svg'))
self.bool_blank_icon = QIcon(I('blank.svg'))
self.bool_yes_icon = QIcon(I('ok.png'))
self.bool_no_icon = QIcon(I('list_remove.png'))
self.bool_blank_icon = QIcon(I('blank.png'))
self.device_connected = False
self.read_config()

2
src/calibre/gui2/lrf_renderer/config.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/config.svg</normaloff>:/images/config.svg</iconset>
<normaloff>:/images/config.png</normaloff>:/images/config.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">

2
src/calibre/gui2/lrf_renderer/main.py
View File

@ -310,7 +310,7 @@ def main(args=sys.argv, logger=None):
pid = os.fork() if (islinux or isfreebsd) else -1
if pid <= 0:
app = Application(args)
app.setWindowIcon(QIcon(I('viewer.svg')))
app.setWindowIcon(QIcon(I('viewer.png')))
QCoreApplication.setOrganizationName(ORG_NAME)
QCoreApplication.setApplicationName(APP_UID)
opts = normalize_settings(parser, opts)

14
src/calibre/gui2/lrf_renderer/main.ui
View File

@ -20,7 +20,7 @@
</property>
<property name="windowIcon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/viewer.svg</normaloff>:/images/viewer.svg</iconset>
<normaloff>:/images/viewer.png</normaloff>:/images/viewer.png</iconset>
</property>
<widget class="QWidget" name="central_widget" >
<property name="geometry" >
@ -174,7 +174,7 @@
<action name="action_next_page" >
<property name="icon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/next.svg</normaloff>:/images/next.svg</iconset>
<normaloff>:/images/next.png</normaloff>:/images/next.png</iconset>
</property>
<property name="text" >
<string>Next Page</string>
@ -183,7 +183,7 @@
<action name="action_previous_page" >
<property name="icon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/previous.svg</normaloff>:/images/previous.svg</iconset>
<normaloff>:/images/previous.png</normaloff>:/images/previous.png</iconset>
</property>
<property name="text" >
<string>Previous Page</string>
@ -192,7 +192,7 @@
<action name="action_back" >
<property name="icon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/back.svg</normaloff>:/images/back.svg</iconset>
<normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
</property>
<property name="text" >
<string>Back</string>
@ -201,7 +201,7 @@
<action name="action_forward" >
<property name="icon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/forward.svg</normaloff>:/images/forward.svg</iconset>
<normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
</property>
<property name="text" >
<string>Forward</string>
@ -215,7 +215,7 @@
<action name="action_open_ebook" >
<property name="icon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
<normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
</property>
<property name="text" >
<string>Open ebook</string>
@ -224,7 +224,7 @@
<action name="action_configure" >
<property name="icon" >
<iconset resource="../../../../resources/images.qrc" >
<normaloff>:/images/config.svg</normaloff>:/images/config.svg</iconset>
<normaloff>:/images/config.png</normaloff>:/images/config.png</iconset>
</property>
<property name="text" >
<string>Configure</string>

4
src/calibre/gui2/main_window.py
View File

@ -58,8 +58,8 @@ class MainWindow(QMainWindow):
@classmethod
def get_menubar_actions(cls):
preferences_action = QAction(QIcon(I('config.svg')), _('&Preferences'), None)
quit_action = QAction(QIcon(I('window-close.svg')), _('&Quit'), None)
preferences_action = QAction(QIcon(I('config.png')), _('&Preferences'), None)
quit_action = QAction(QIcon(I('window-close.png')), _('&Quit'), None)
preferences_action.setMenuRole(QAction.PreferencesRole)
quit_action.setMenuRole(QAction.QuitRole)
return preferences_action, quit_action

4
src/calibre/gui2/preferences/behavior.ui
View File

@ -214,7 +214,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/arrow-up.svg</normaloff>:/images/arrow-up.svg</iconset>
<normaloff>:/images/arrow-up.png</normaloff>:/images/arrow-up.png</iconset>
</property>
</widget>
</item>
@ -238,7 +238,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/arrow-down.svg</normaloff>:/images/arrow-down.svg</iconset>
<normaloff>:/images/arrow-down.png</normaloff>:/images/arrow-down.png</iconset>
</property>
</widget>
</item>

10
src/calibre/gui2/preferences/columns.ui
View File

@ -43,7 +43,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/arrow-up.svg</normaloff>:/images/arrow-up.svg</iconset>
<normaloff>:/images/arrow-up.png</normaloff>:/images/arrow-up.png</iconset>
</property>
</widget>
</item>
@ -70,7 +70,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/minus.svg</normaloff>:/images/minus.svg</iconset>
<normaloff>:/images/minus.png</normaloff>:/images/minus.png</iconset>
</property>
</widget>
</item>
@ -97,7 +97,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/plus.svg</normaloff>:/images/plus.svg</iconset>
<normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
</property>
</widget>
</item>
@ -124,7 +124,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/edit_input.svg</normaloff>:/images/edit_input.svg</iconset>
<normaloff>:/images/edit_input.png</normaloff>:/images/edit_input.png</iconset>
</property>
</widget>
</item>
@ -148,7 +148,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/arrow-down.svg</normaloff>:/images/arrow-down.svg</iconset>
<normaloff>:/images/arrow-down.png</normaloff>:/images/arrow-down.png</iconset>
</property>
</widget>
</item>

4
src/calibre/gui2/preferences/toolbar.py
View File

@ -28,7 +28,7 @@ class BaseModel(QAbstractListModel):
def name_to_action(self, name, gui):
if name == 'Donate':
return FakeAction(name, 'donate.svg',
return FakeAction(name, 'donate.png',
dont_add_to=frozenset(['context-menu',
'context-menu-device']))
if name == 'Location Manager':
@ -54,7 +54,7 @@ class BaseModel(QAbstractListModel):
if role == Qt.DecorationRole:
ic = action[1]
if ic is None:
ic = 'blank.svg'
ic = 'blank.png'
return QVariant(QIcon(I(ic)))
if role == Qt.ToolTipRole and action[2] is not None:
return QVariant(action[2])

8
src/calibre/gui2/preferences/toolbar.ui
View File

@ -96,7 +96,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/arrow-up.svg</normaloff>:/images/arrow-up.svg</iconset>
<normaloff>:/images/arrow-up.png</normaloff>:/images/arrow-up.png</iconset>
</property>
<property name="iconSize">
<size>
@ -129,7 +129,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/arrow-down.svg</normaloff>:/images/arrow-down.svg</iconset>
<normaloff>:/images/arrow-down.png</normaloff>:/images/arrow-down.png</iconset>
</property>
<property name="iconSize">
<size>
@ -159,7 +159,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/forward.svg</normaloff>:/images/forward.svg</iconset>
<normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
</property>
<property name="iconSize">
<size>
@ -195,7 +195,7 @@
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/back.svg</normaloff>:/images/back.svg</iconset>
<normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
</property>
<property name="iconSize">
<size>

4
src/calibre/gui2/shortcuts.ui
View File

@ -69,7 +69,7 @@
</property>
<property name="icon">
<iconset resource="../../../resources/images.qrc">
<normaloff>:/images/clear_left.svg</normaloff>:/images/clear_left.svg</iconset>
<normaloff>:/images/clear_left.png</normaloff>:/images/clear_left.png</iconset>
</property>
</widget>
</item>
@ -110,7 +110,7 @@
</property>
<property name="icon">
<iconset resource="../../../resources/images.qrc">
<normaloff>:/images/clear_left.svg</normaloff>:/images/clear_left.svg</iconset>
<normaloff>:/images/clear_left.png</normaloff>:/images/clear_left.png</iconset>
</property>
</widget>
</item>

18
src/calibre/gui2/tag_view.py
View File

@ -372,19 +372,19 @@ class TagsModel(QAbstractItemModel): # {{{
# before a QPaintDevice'. The ':' in front avoids polluting either the
# user-defined categories (':' at end) or columns namespaces (no ':').
self.category_icon_map = TagsIcons({
'authors' : QIcon(I('user_profile.svg')),
'series' : QIcon(I('series.svg')),
'formats' : QIcon(I('book.svg')),
'authors' : QIcon(I('user_profile.png')),
'series' : QIcon(I('series.png')),
'formats' : QIcon(I('book.png')),
'publisher' : QIcon(I('publisher.png')),
'rating' : QIcon(I('star.png')),
'news' : QIcon(I('news.svg')),
'tags' : QIcon(I('tags.svg')),
':custom' : QIcon(I('column.svg')),
':user' : QIcon(I('drawer.svg')),
'search' : QIcon(I('search.svg'))})
'news' : QIcon(I('news.png')),
'tags' : QIcon(I('tags.png')),
':custom' : QIcon(I('column.png')),
':user' : QIcon(I('drawer.png')),
'search' : QIcon(I('search.png'))})
self.categories_with_ratings = ['authors', 'series', 'publisher', 'tags']
self.icon_state_map = [None, QIcon(I('plus.svg')), QIcon(I('minus.svg'))]
self.icon_state_map = [None, QIcon(I('plus.png')), QIcon(I('minus.png'))]
self.db = db
self.tags_view = parent
self.hidden_categories = hidden_categories

2
src/calibre/gui2/throbber.py
View File

@ -64,7 +64,7 @@ if __name__ == '__main__':
w = QWidget()
w.setLayout(QHBoxLayout())
b = ThrobbingButton()
b.setIcon(QIcon(I('donate.svg')))
b.setIcon(QIcon(I('donate.png')))
w.layout().addWidget(b)
w.show()
b.set_normal_icon_size(64, 64)

8
src/calibre/gui2/ui.py
View File

@ -164,13 +164,13 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{
self.system_tray_icon.show()
self.system_tray_menu = QMenu(self)
self.restore_action = self.system_tray_menu.addAction(
QIcon(I('page.svg')), _('&Restore'))
QIcon(I('page.png')), _('&Restore'))
self.donate_action = self.system_tray_menu.addAction(
QIcon(I('donate.svg')), _('&Donate to support calibre'))
QIcon(I('donate.png')), _('&Donate to support calibre'))
self.donate_button.setDefaultAction(self.donate_action)
self.donate_button.setStatusTip(self.donate_button.toolTip())
self.eject_action = self.system_tray_menu.addAction(
QIcon(I('eject.svg')), _('&Eject connected device'))
QIcon(I('eject.png')), _('&Eject connected device'))
self.eject_action.setEnabled(False)
self.addAction(self.quit_action)
self.system_tray_menu.addAction(self.quit_action)
@ -514,7 +514,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{
d = QMessageBox(QMessageBox.Warning, _('WARNING: Active jobs'), msg,
QMessageBox.Yes|QMessageBox.No, self)
d.setIconPixmap(QPixmap(I('dialog_warning.svg')))
d.setIconPixmap(QPixmap(I('dialog_warning.png')))
d.setDefaultButton(QMessageBox.No)
if d.exec_() != QMessageBox.Yes:
return False

2
src/calibre/gui2/viewer/config.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff>:/images/config.svg</normaloff>:/images/config.svg</iconset>
<normaloff>:/images/config.png</normaloff>:/images/config.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0">

4
src/calibre/gui2/viewer/documentview.py
View File

@ -444,12 +444,12 @@ class DocumentView(QWebView):
self.connect(self.document, SIGNAL('animated_scroll_done()'),
self.animated_scroll_done, Qt.QueuedConnection)
copy_action = self.pageAction(self.document.Copy)
copy_action.setIcon(QIcon(I('convert.svg')))
copy_action.setIcon(QIcon(I('convert.png')))
d = self.document
self.unimplemented_actions = list(map(self.pageAction,
[d.DownloadImageToDisk, d.OpenLinkInNewWindow, d.DownloadLinkToDisk,
d.OpenImageInNewWindow, d.OpenLink]))
self.dictionary_action = QAction(QIcon(I('dictionary.svg')),
self.dictionary_action = QAction(QIcon(I('dictionary.png')),
_('&Lookup in dictionary'), self)
self.dictionary_action.setShortcut(Qt.CTRL+Qt.Key_L)
self.dictionary_action.triggered.connect(self.lookup)

Some files were not shown because too many files have changed in this diff Show More