diff --git a/Changelog.old.yaml b/Changelog.old.yaml index 8acd126afb..261ff14cbd 100644 --- a/Changelog.old.yaml +++ b/Changelog.old.yaml @@ -752,7 +752,7 @@ new features: - title: "Virtual Libraries: Easily partition your large calibre library into smaller 'virtual' libraries" type: major - description: "A virtual library is a way to tell calibre to open only a subset of a normal library. For example, you might want to only work with books by a certain author, or books having only a certain tag. To use this feature, click the button labeled 'Virtual Library' to the left of the search bar. For details, see http://manual.calibre-ebook.com/virtual_libraries.html. This feature used to be called 'Search restriction', the new virtual libraries are easier to use, but otherwise fulfil the same function." + description: "A virtual library is a way to tell calibre to open only a subset of a normal library. For example, you might want to only work with books by a certain author, or books having only a certain tag. To use this feature, click the button labeled 'Virtual Library' to the left of the search bar. For details, see https://manual.calibre-ebook.com/virtual_libraries.html. This feature used to be called 'Search restriction', the new virtual libraries are easier to use, but otherwise fulfil the same function." - title: "Book details panel: Allow copying of links in the book details panel by right clicking on them." tickets: [1171963] @@ -1304,7 +1304,7 @@ - title: "E-book viewer: Add an option to change the minimum font size." tickets: [1122333] - - title: "PDF Output: Add support for converting documents with math typesetting, as described here: http://manual.calibre-ebook.com/typesetting_math.html" + - title: "PDF Output: Add support for converting documents with math typesetting, as described here: https://manual.calibre-ebook.com/typesetting_math.html" - title: "Column coloring/icons: Add more conditions when using date based columns with reference to 'today'." @@ -2512,7 +2512,7 @@ new features: - title: "E-book viewer: Support the display of mathematics in e-books. Supports both embedded TeX and MathML" - description: "The calibre ebook viewer can now display embedded mathematics (symbols, equations, fractions, matrices, etc.) in EPUB and HTML ebooks. For details, see: http://manual.calibre-ebook.com/typesetting_math.html" + description: "The calibre ebook viewer can now display embedded mathematics (symbols, equations, fractions, matrices, etc.) in EPUB and HTML ebooks. For details, see: https://manual.calibre-ebook.com/typesetting_math.html" type: major - title: "Drivers for SONY PRS-T2, Freelander PD10 and Coolreader Tablet" @@ -6839,7 +6839,7 @@ - title: "FB2 Output: Option to set the FB2 genre explicitly." tickets: [743178] - - title: "Plugin developers: calibre now has a new plugin API, see http://manual.calibre-ebook.com/creating_plugins.html. Your existing plugins should continue to work, but it would be good to test them to make sure." + - title: "Plugin developers: calibre now has a new plugin API, see https://manual.calibre-ebook.com/creating_plugins.html. Your existing plugins should continue to work, but it would be good to test them to make sure." bug fixes: - title: "Fix text color in the search bar set to black instead of the system font color" @@ -7224,7 +7224,7 @@ new features: - title: "Tag Browser: Support the creation of nested User Categories" - description: "See http://manual.calibre-ebook.com/gui.html#tag-browser for details" + description: "See https://manual.calibre-ebook.com/gui.html#tag-browser for details" type: major - title: "Disable Kent District Library plugin to download series information. The website could not handle the load calibre's 2 million users put on it. You can manually re-enable it if you really want series information, but it is very slow" @@ -10097,7 +10097,7 @@ type: major description: > "You can now change the icons used in the User Interface and other static resources. Details on how to - do this are at: http://manual.calibre-ebook.com/customize.html#overriding-icons-templates-etcetera" + do this are at: https://manual.calibre-ebook.com/customize.html#overriding-icons-templates-etcetera" - title: "Split the 'Send to device' button into two buttons, 'Connect/share' and 'Send to device'. The new 'Send to device' button will now only be available when a device is connected." @@ -11176,7 +11176,7 @@ type: major description : > "You can now save your frequently used searches and access them with a single click. For details - see http://manual.calibre-ebook.com/gui.html#search-sort" + see https://manual.calibre-ebook.com/gui.html#search-sort" - title: "Add searching by date/published date" tickets: [5244] diff --git a/Changelog.yaml b/Changelog.yaml index 8c4837d797..b570284a23 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -1744,7 +1744,7 @@ new features: - title: "Edit Book: Add support for snippets -- small pieces of text that are often re-used." - description: "You can now create your own snippets and insert them into the text with only a few keystrokes. The snippets include support for placeholders that you can jump between. See http://manual.calibre-ebook.com/snippets.html for details." + description: "You can now create your own snippets and insert them into the text with only a few keystrokes. The snippets include support for placeholders that you can jump between. See https://manual.calibre-ebook.com/snippets.html for details." type: major bug fixes: @@ -1776,7 +1776,7 @@ new features: - title: "Edit Book: Add auto-completion for links." - description: "Now as you type the filename in href or src attributes, a popup with possible completions is displayed. See http://manual.calibre-ebook.com/edit.html#auto-complete for details." + description: "Now as you type the filename in href or src attributes, a popup with possible completions is displayed. See https://manual.calibre-ebook.com/edit.html#auto-complete for details." type: major - title: "Edit Book Function mode: Add builtin functions to change case of text, ignoring HTML tags in the matched text" @@ -1954,7 +1954,7 @@ new features: - title: "Edit Book: Add a new 'function mode' for the Search and Replace tool" - description: "The function mode allows you to create python functions that run on the results of Search and Replace. This allows you to do arbitrarily powerful text processing. For example, you can automatically fix the case of text, automatically add section number to headings, and so on. For examples and documentation, see: http://manual.calibre-ebook.com/function_mode.html" + description: "The function mode allows you to create python functions that run on the results of Search and Replace. This allows you to do arbitrarily powerful text processing. For example, you can automatically fix the case of text, automatically add section number to headings, and so on. For examples and documentation, see: https://manual.calibre-ebook.com/function_mode.html" type: major bug fixes: @@ -1998,7 +1998,7 @@ - title: "Metadata download: Prioritize results that have the same language as the current calibre user interface language" - - title: "Edit Book: Make the CSS used for styling the generated HTML Table of Contents user customizable via http://manual.calibre-ebook.com/customize.html#overriding-icons-templates-et-cetera" + - title: "Edit Book: Make the CSS used for styling the generated HTML Table of Contents user customizable via https://manual.calibre-ebook.com/customize.html#overriding-icons-templates-et-cetera" bug fixes: - title: "E-book viewer: Fix popup footnotes not working on windows" @@ -2621,7 +2621,7 @@ - title: "Comic Input: When sorting the pages inside a comic, recognize numbers, so that page2 sorts before page10" - - title: "Conversion: When inserting a metadata jacket, format the series number using roman numerals. This behavior can be disabled by using a custom jacket template, as described here: http://manual.calibre-ebook.com/customize.html#overriding-icons-templates-et-cetera" + - title: "Conversion: When inserting a metadata jacket, format the series number using roman numerals. This behavior can be disabled by using a custom jacket template, as described here: https://manual.calibre-ebook.com/customize.html#overriding-icons-templates-et-cetera" - title: "Template language: New function author_links: for each author of a book returns the author link value entered in Manage Authors." @@ -2663,7 +2663,7 @@ new features: - title: "Edit Book: Add support for third party plugins to extend the editors functionality." - description: "The editor now supports plugins that can be used to extend its functionality. Documentation of the plugin API and an example plugin are at: http://manual.calibre-ebook.com/creating_plugins.html#edit-book-plugins" + description: "The editor now supports plugins that can be used to extend its functionality. Documentation of the plugin API and an example plugin are at: https://manual.calibre-ebook.com/creating_plugins.html#edit-book-plugins" type: major - title: "calibredb list: Add a --for-machine option that causes the output to be made in a form more easily parsed programmatically (it uses ASCII field and record separators)" @@ -2998,7 +2998,7 @@ new features: - title: "Edit Book: A 'Live CSS' tool that shows all the style rules for the tag you are currently editing." - description: "You can use it to easily jump to any style rules that affect the current tag. Enable it via View->Live CSS. See http://manual.calibre-ebook.com/edit.html#the-live-css-panel for details" + description: "You can use it to easily jump to any style rules that affect the current tag. Enable it via View->Live CSS. See https://manual.calibre-ebook.com/edit.html#the-live-css-panel for details" type: major - title: "Add an option to hide the book rating in the cover browser (Preferences->Look & Feel->Cover Browser)." @@ -3767,7 +3767,7 @@ new features: - title: "A new tool to compare ebook files, showing the differences in their underlying text, styles and images side by side" type: major - description: "The new compare tool is very useful in combination with the book editor. It allows you to see what changes have been made between checkpoints and what changes were made by automated tools. You can also compare different versions of the same ebook file. How to use each of these features is described below. Screenshots and help for using the new compare tool are at http://manual.calibre-ebook.com/diff.html" + description: "The new compare tool is very useful in combination with the book editor. It allows you to see what changes have been made between checkpoints and what changes were made by automated tools. You can also compare different versions of the same ebook file. How to use each of these features is described below. Screenshots and help for using the new compare tool are at https://manual.calibre-ebook.com/diff.html" - title: "Edit book: Add a tool to view the list of checkpoints and compare the current state of the book to the state at the specified checkpoint. To use it click View->Checkpoints" @@ -3905,7 +3905,7 @@ date: 2014-01-10 new features: - - title: "Edit book: A new tool to insert special characters into the text, available via Edit->Insert special character. Supports all unicode characters (over 60,000 of them). See http://manual.calibre-ebook.com/edit.html#inserting-special-characters" + - title: "Edit book: A new tool to insert special characters into the text, available via Edit->Insert special character. Supports all unicode characters (over 60,000 of them). See https://manual.calibre-ebook.com/edit.html#inserting-special-characters" - title: "Edit book: When searching for text in the editor, center the found text on screen" @@ -4115,7 +4115,7 @@ new features: - title: "A new book editor, capable of editing files in the EPUB and AZW3 (Kindle) formats" type: major - description: "Right click on any book in calibre and choose 'Edit Book', to edit e-books in the EPUB and AZW3 formats. The new editor allows you to edit the HTML/CSS and images inside the ebooks in a seamless fashion, with live preview of your changes and many helpful automated tools for checking the book for errors, editing the table of contents, merging, splitting, bulk renaming and so on. See http://manual.calibre-ebook.com/edit.html for more details and help using the new editor. Note that the editor is a completely new codebase and is still being actively developed, so expect a few bugs and many new features in the near future. However, the editor as it stands is extremely useable and useful today. Note that it replaces the old 'Tweak Book' feature in calibre. If you want the old Tweak Book back, it has been renamed to 'Unpack Book', you can go to Preferences->Toolbars and add it back. Happy holidays!" + description: "Right click on any book in calibre and choose 'Edit Book', to edit e-books in the EPUB and AZW3 formats. The new editor allows you to edit the HTML/CSS and images inside the ebooks in a seamless fashion, with live preview of your changes and many helpful automated tools for checking the book for errors, editing the table of contents, merging, splitting, bulk renaming and so on. See https://manual.calibre-ebook.com/edit.html for more details and help using the new editor. Note that the editor is a completely new codebase and is still being actively developed, so expect a few bugs and many new features in the near future. However, the editor as it stands is extremely useable and useful today. Note that it replaces the old 'Tweak Book' feature in calibre. If you want the old Tweak Book back, it has been renamed to 'Unpack Book', you can go to Preferences->Toolbars and add it back. Happy holidays!" - title: "Edit metadata dialog: In the tag editor, allow easy filtering of the lists of available and applied tags." diff --git a/INSTALL b/INSTALL index 0520ef1e38..0f918ce4da 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ calibre supports installation from source, only on Linux. Note that you *do not* need to install from source to hack on the calibre source code. To get started with calibre development, use a normal calibre install and follow the instructions at -http://manual.calibre-ebook.com/develop.html +https://manual.calibre-ebook.com/develop.html On Linux, there are two kinds of installation from source possible. Note that both kinds require lots of dependencies as well as a diff --git a/README.md b/README.md index 5a831c4204..8eace06f8a 100644 --- a/README.md +++ b/README.md @@ -7,19 +7,19 @@ devices. It can go out to the internet and fetch metadata for your books. It can download newspapers and convert them into e-books for convenient reading. It is cross platform, running on Linux, Windows and OS X. -For more information, see the [calibre About page](http://calibre-ebook.com/about) +For more information, see the [calibre About page](https://calibre-ebook.com/about) Screenshots ------------- -[Screenshots page](http://calibre-ebook.com/demo) +[Screenshots page](https://calibre-ebook.com/demo) Usage ------- -See the [User Manual](http://manual.calibre-ebook.com) +See the [User Manual](https://manual.calibre-ebook.com) Development ------------- -[Setting up a development environment for calibre](http://manual.calibre-ebook.com/develop.html) +[Setting up a development environment for calibre](https://manual.calibre-ebook.com/develop.html) A [tarball of the source code](https://calibre-ebook.com/dist/src) for the @@ -36,5 +36,5 @@ Support calibre calibre is a result of the efforts of many volunteers from all over the world. If you find it useful, please consider contributing to support its development. -[Donate to support calibre development](http://calibre-ebook.com/donate). +[Donate to support calibre development](https://calibre-ebook.com/donate). diff --git a/manual/conf.py b/manual/conf.py index e88907b4b1..0a5bf421f6 100644 --- a/manual/conf.py +++ b/manual/conf.py @@ -153,7 +153,7 @@ del sort_languages, get_language epub_author = 'Kovid Goyal' epub_publisher = 'Kovid Goyal' -epub_identifier = 'http://manual.calibre-ebook.com' +epub_identifier = 'https://manual.calibre-ebook.com' epub_scheme = 'url' epub_uid = 'S54a88f8e9d42455e9c6db000e989225f' epub_tocdepth = 4 @@ -176,7 +176,7 @@ html_copy_source = True # Output file base name for HTML help builder. htmlhelp_basename = 'calibredoc' -html_use_opensearch = 'http://manual.calibre-ebook.com' +html_use_opensearch = 'https://manual.calibre-ebook.com' html_show_sphinx = False diff --git a/manual/conversion.rst b/manual/conversion.rst index d250d9bd0b..93d2a3e087 100644 --- a/manual/conversion.rst +++ b/manual/conversion.rst @@ -616,7 +616,7 @@ newer. Just add the file to calibre and click convert (make sure you are running the latest version of calibre as support for ``.docx`` files is very new). .. note:: - There is a `demo .docx file `_ + There is a `demo .docx file `_ that demonstrates the capabilities of the calibre conversion engine. Just download it and convert it to EPUB or AZW3 to see what calibre can do. diff --git a/manual/creating_plugins.rst b/manual/creating_plugins.rst index 33fd42e869..dea34f03a3 100644 --- a/manual/creating_plugins.rst +++ b/manual/creating_plugins.rst @@ -40,7 +40,7 @@ the directory in which you created :file:`__init__.py`:: are in :file:`/Applications/calibre.app/Contents/console.app/Contents/MacOS/`. You can download the Hello World plugin from -`helloworld_plugin.zip `_. +`helloworld_plugin.zip `_. Every time you use calibre to convert a book, the plugin's :meth:`run` method will be called and the converted book will have its publisher set to "Hello World". This is a trivial plugin, lets move on to @@ -54,7 +54,7 @@ This plugin will be spread over a few files (to keep the code clean). It will sh how to create elements in the calibre user interface and how to access and query the books database in calibre. -You can download this plugin from `interface_demo_plugin.zip `_ +You can download this plugin from `interface_demo_plugin.zip `_ .. _import_name_txt: @@ -185,7 +185,7 @@ Edit Book plugins Now let's change gears for a bit and look at creating a plugin to add tools to the calibre book editor. The plugin is available here: -`editor_demo_plugin.zip `_. +`editor_demo_plugin.zip `_. The first step, as for all plugins is to create the import name empty txt file, as described :ref:`above `. diff --git a/manual/edit.rst b/manual/edit.rst index b9c4295eb9..7af5001710 100644 --- a/manual/edit.rst +++ b/manual/edit.rst @@ -27,7 +27,7 @@ Basic workflow .. note:: A video tour of the calibre editor is available `here - `_. + `_. When you first open a book with the Edit book tool, you will be presented with a list of files on the left. These are the individual HTML files, stylesheets, diff --git a/resources/calibre-portable.bat b/resources/calibre-portable.bat index 25005cd264..784d4f2ee9 100644 --- a/resources/calibre-portable.bat +++ b/resources/calibre-portable.bat @@ -31,10 +31,10 @@ REM folder structure then it can be used 'as is' without modification. REM REM More information on the Environment Variables used by Calibre can REM be found at: -REM http://manual.calibre-ebook.com/customize.html#environment-variables +REM https://manual.calibre-ebook.com/customize.html#environment-variables REM REM The documentation for this file in the Calibre manual can be found at: -REM http://manual.calibre-ebook.com/portable.html +REM https://manual.calibre-ebook.com/portable.html REM REM CHANGE HISTORY REM ¬¬¬¬¬¬¬¬¬¬¬¬¬¬ @@ -115,7 +115,7 @@ REM number that is displayed at the bottom of the Calibre main screen. REM REM More information on setting up a development environment can REM be found at: -REM http://manual.calibre-ebook.com/develop.html#develop +REM https://manual.calibre-ebook.com/develop.html#develop REM -------------------------------------------------------------- IF EXIST CalibreSource\src ( diff --git a/resources/calibre-portable.sh b/resources/calibre-portable.sh index 46f4311169..beafb106a3 100755 --- a/resources/calibre-portable.sh +++ b/resources/calibre-portable.sh @@ -32,7 +32,7 @@ # # More information on the Environment Variables used by Calibre can # be found at: -# http://manual.calibre-ebook.com/customize.html#environment-variables +# https://manual.calibre-ebook.com/customize.html#environment-variables # # NOTE: It is quite possible to have both Windows and Linux binaries on the same # USB stick but set up to use the same calibre settings otherwise. @@ -182,7 +182,7 @@ else # # -- More information on setting up a development environment can # -- be found at: - # -- http://manual.calibre-ebook.com/develop.html#develop + # -- https://manual.calibre-ebook.com/develop.html#develop ################################################################ # SRC_DIR="$\(pwd)/CalibreSource/src" @@ -255,7 +255,7 @@ else ################################################################## # -- Set and export any other environment variables needed. More # -- information can be found at: - # http://manual.calibre-ebook.com/customize.html#environment-variables + # https://manual.calibre-ebook.com/customize.html#environment-variables ################################################################## # some other example variables calibre recognizes: diff --git a/setup/installer/osx/app/main.py b/setup/installer/osx/app/main.py index 3aa08e4f32..6550f012fc 100644 --- a/setup/installer/osx/app/main.py +++ b/setup/installer/osx/app/main.py @@ -386,7 +386,7 @@ class Py2App(object): NSAppleScriptEnabled=False, NSHumanReadableCopyright=time.strftime('Copyright %Y, Kovid Goyal'), CFBundleGetInfoString=('calibre, an E-book management ' - 'application. Visit http://calibre-ebook.com for details.'), + 'application. Visit https://calibre-ebook.com for details.'), CFBundleIconFile='calibre.icns', NSHighResolutionCapable=True, LSApplicationCategoryType='public.app-category.productivity', diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py index 4c37bad1cf..539ec35ff3 100644 --- a/setup/installer/windows/freeze.py +++ b/setup/installer/windows/freeze.py @@ -545,7 +545,7 @@ class Win32Freeze(Command, WixMixIn): raise ValueError('No installers found') args = ['signtool.exe', 'sign', '/a', '/fd', 'sha256', '/td', 'sha256', '/d', 'calibre - E-book management', '/du', - 'http://calibre-ebook.com', '/tr'] + 'https://calibre-ebook.com', '/tr'] def runcmd(cmd): for timeserver in ('http://timestamp.geotrust.com/tsa', 'http://timestamp.comodoca.com/rfc3161',): diff --git a/setup/installer/windows/wix-template.xml b/setup/installer/windows/wix-template.xml index da9ca849b4..dd15c4edee 100644 --- a/setup/installer/windows/wix-template.xml +++ b/setup/installer/windows/wix-template.xml @@ -90,10 +90,10 @@ WorkingDirectory="APPLICATIONROOTDIRECTORY" /> + Target="https://manual.calibre-ebook.com"/> + Target="https://calibre-ebook.com/get-involved"/> @@ -137,9 +137,9 @@ - - - + + + ' + RE.REGEXP_HELP_TEXT % localize_user_manual_link( - 'http://manual.calibre-ebook.com/regexp.html')) + 'https://manual.calibre-ebook.com/regexp.html')) la.setOpenExternalLinks(True) la.setWordWrap(True) l.addWidget(la) diff --git a/src/calibre/gui2/dialogs/custom_recipes.py b/src/calibre/gui2/dialogs/custom_recipes.py index e284f2fec4..314d0b777e 100644 --- a/src/calibre/gui2/dialogs/custom_recipes.py +++ b/src/calibre/gui2/dialogs/custom_recipes.py @@ -407,7 +407,7 @@ class AdvancedRecipe(QWidget): # {{{ self.la = la = QLabel(_( 'For help with writing advanced news recipes, see the User Manual' - ) % localize_user_manual_link('http://manual.calibre-ebook.com/news.html')) + ) % localize_user_manual_link('https://manual.calibre-ebook.com/news.html')) l.addWidget(la) self.editor = TextEdit(self) diff --git a/src/calibre/gui2/dialogs/search.py b/src/calibre/gui2/dialogs/search.py index 00ea228476..58d77cd2c6 100644 --- a/src/calibre/gui2/dialogs/search.py +++ b/src/calibre/gui2/dialogs/search.py @@ -36,7 +36,7 @@ class SearchDialog(QDialog, Ui_Dialog): def __init__(self, parent, db): QDialog.__init__(self, parent) self.setupUi(self) - self.um_label.setText(self.um_label.text() % localize_user_manual_link('http://manual.calibre-ebook.com/gui.html#the-search-interface')) + self.um_label.setText(self.um_label.text() % localize_user_manual_link('https://manual.calibre-ebook.com/gui.html#the-search-interface')) for val, text in [(0, '')] + [(i, strftime('%B', date(2010, i, 1).timetuple())) for i in xrange(1, 13)]: self.date_month.addItem(text, val) for val, text in [('today', _('Today')), ('yesterday', _('Yesterday')), ('thismonth', _('This month'))]: diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py index 71566e769a..637b4b54ba 100644 --- a/src/calibre/gui2/dialogs/template_dialog.py +++ b/src/calibre/gui2/dialogs/template_dialog.py @@ -333,11 +333,11 @@ class TemplateDialog(QDialog, Ui_TemplateDialog): tt = _('Template language tutorial') self.template_tutorial.setText( '%s' % ( - localize_user_manual_link('http://manual.calibre-ebook.com/template_lang.html'), tt)) + localize_user_manual_link('https://manual.calibre-ebook.com/template_lang.html'), tt)) tt = _('Template function reference') self.template_func_reference.setText( '%s' % ( - localize_user_manual_link('http://manual.calibre-ebook.com/template_ref.html'), tt)) + localize_user_manual_link('https://manual.calibre-ebook.com/template_ref.html'), tt)) self.font_size_box.setValue(gprefs['gpm_template_editor_font_size']) self.font_size_box.valueChanged.connect(self.font_size_changed) diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py index 97bbf6caa5..4c86a07140 100644 --- a/src/calibre/gui2/search_restriction_mixin.py +++ b/src/calibre/gui2/search_restriction_mixin.py @@ -152,7 +152,7 @@ class CreateVirtualLibrary(QDialog): # {{{

More information and examples are available in the User Manual.

- ''') % localize_user_manual_link('http://manual.calibre-ebook.com/virtual_libraries.html')) + ''') % localize_user_manual_link('https://manual.calibre-ebook.com/virtual_libraries.html')) hl.setWordWrap(True) hl.setOpenExternalLinks(True) hl.setFrameStyle(hl.StyledPanel) diff --git a/src/calibre/gui2/store/config/chooser/adv_search_builder.py b/src/calibre/gui2/store/config/chooser/adv_search_builder.py index 6519a070b2..58d5d8a108 100644 --- a/src/calibre/gui2/store/config/chooser/adv_search_builder.py +++ b/src/calibre/gui2/store/config/chooser/adv_search_builder.py @@ -21,7 +21,7 @@ class AdvSearchBuilderDialog(QDialog, Ui_Dialog): self.setupUi(self) try: self.sh_label.setText(self.sh_label.text() % localize_user_manual_link( - 'http://manual.calibre-ebook.com/gui.html#the-search-interface')) + 'https://manual.calibre-ebook.com/gui.html#the-search-interface')) except TypeError: pass # link already localized diff --git a/src/calibre/gui2/store/search/adv_search_builder.py b/src/calibre/gui2/store/search/adv_search_builder.py index 68934d6fa0..76544e6f62 100644 --- a/src/calibre/gui2/store/search/adv_search_builder.py +++ b/src/calibre/gui2/store/search/adv_search_builder.py @@ -21,7 +21,7 @@ class AdvSearchBuilderDialog(QDialog, Ui_Dialog): self.setupUi(self) try: self.sh_label.setText(self.sh_label.text() % localize_user_manual_link( - 'http://manual.calibre-ebook.com/gui.html#the-search-interface')) + 'https://manual.calibre-ebook.com/gui.html#the-search-interface')) except TypeError: pass # link already localized diff --git a/src/calibre/gui2/tag_mapper.py b/src/calibre/gui2/tag_mapper.py index 5e15bec0de..d15f0935e9 100644 --- a/src/calibre/gui2/tag_mapper.py +++ b/src/calibre/gui2/tag_mapper.py @@ -102,7 +102,7 @@ class RuleEdit(QWidget): self.replace = r = QLineEdit(self) h.addWidget(r) self.regex_help = la = QLabel('

' + self.REGEXP_HELP_TEXT % localize_user_manual_link( - 'http://manual.calibre-ebook.com/regexp.html')) + 'https://manual.calibre-ebook.com/regexp.html')) la.setOpenExternalLinks(True) la.setWordWrap(True) l.addWidget(la) diff --git a/src/calibre/gui2/tweak_book/editor/snippets.py b/src/calibre/gui2/tweak_book/editor/snippets.py index 7105b84216..f99f1436b4 100644 --- a/src/calibre/gui2/tweak_book/editor/snippets.py +++ b/src/calibre/gui2/tweak_book/editor/snippets.py @@ -451,7 +451,7 @@ class EditSnippet(QWidget): self.heading = la = QLabel('

\xa0') add_row(la) self.helpl = la = QLabel(_('For help with snippets, see the User Manual') % - localize_user_manual_link('http://manual.calibre-ebook.com/snippets.html')) + localize_user_manual_link('https://manual.calibre-ebook.com/snippets.html')) la.setOpenExternalLinks(True) add_row(la) diff --git a/src/calibre/gui2/tweak_book/function_replace.py b/src/calibre/gui2/tweak_book/function_replace.py index ce8487418a..09da71b635 100644 --- a/src/calibre/gui2/tweak_book/function_replace.py +++ b/src/calibre/gui2/tweak_book/function_replace.py @@ -233,7 +233,7 @@ class FunctionEditor(Dialog): self.la2 = la = QLabel(_( 'For help with creating functions, see the User Manual') % - localize_user_manual_link('http://manual.calibre-ebook.com/function_mode.html')) + localize_user_manual_link('https://manual.calibre-ebook.com/function_mode.html')) la.setOpenExternalLinks(True) l.addWidget(la) diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py index 4402b9a49a..88743b987e 100644 --- a/src/calibre/gui2/tweak_book/ui.py +++ b/src/calibre/gui2/tweak_book/ui.py @@ -480,7 +480,7 @@ class Main(MainWindow): 'Close all tabs except the current tab')) self.action_help = treg( 'help.png', _('User &Manual'), lambda : open_url(QUrl(localize_user_manual_link( - 'http://manual.calibre-ebook.com/edit.html'))), 'user-manual', 'F1', _( + 'https://manual.calibre-ebook.com/edit.html'))), 'user-manual', 'F1', _( 'Show User Manual')) self.action_browse_images = treg( 'view-image.png', _('&Browse images in book'), self.boss.browse_images, 'browse-images', (), _( diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py index 7ff14d2f56..dc57fc8004 100644 --- a/src/calibre/gui2/widgets.py +++ b/src/calibre/gui2/widgets.py @@ -67,7 +67,7 @@ class FilenamePattern(QWidget, Ui_Form): # {{{ self.setupUi(self) try: self.help_label.setText(self.help_label.text() % localize_user_manual_link( - 'http://manual.calibre-ebook.com/regexp.html')) + 'https://manual.calibre-ebook.com/regexp.html')) except TypeError: pass # link already localized diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py index 19d7e56e79..3cfdf5140c 100644 --- a/src/calibre/gui2/wizard/__init__.py +++ b/src/calibre/gui2/wizard/__init__.py @@ -477,7 +477,7 @@ class StanzaPage(QWizardPage, StanzaUI): self.setupUi(self) try: self.instructions.setText(self.instructions.text() % localize_user_manual_link( - 'http://manual.calibre-ebook.com/faq.html#how-do-i-use-calibre-with-my-ipad-iphone-ipod-touch')) + 'https://manual.calibre-ebook.com/faq.html#how-do-i-use-calibre-with-my-ipad-iphone-ipod-touch')) except TypeError: pass # user manual link was already replaced self.instructions.setOpenExternalLinks(True) @@ -750,7 +750,7 @@ class FinishPage(QWizardPage, FinishUI): QWizardPage.__init__(self) self.setupUi(self) try: - self.um_label.setText(self.um_label.text() % localize_user_manual_link('http://manual.calibre-ebook.com')) + self.um_label.setText(self.um_label.text() % localize_user_manual_link('https://manual.calibre-ebook.com')) except TypeError: pass # link already localized diff --git a/src/calibre/library/server/ajax.py b/src/calibre/library/server/ajax.py index c0e579fc33..a46f3149d4 100644 --- a/src/calibre/library/server/ajax.py +++ b/src/calibre/library/server/ajax.py @@ -380,7 +380,7 @@ class AjaxServer(object): :param sort_order: asc or desc To learn how to create subcategories see - http://manual.calibre-ebook.com/sub_groups.html + https://manual.calibre-ebook.com/sub_groups.html ''' try: num = int(num) diff --git a/src/calibre/srv/ajax.py b/src/calibre/srv/ajax.py index 788a5f6c42..68c7877aa5 100644 --- a/src/calibre/srv/ajax.py +++ b/src/calibre/srv/ajax.py @@ -328,7 +328,7 @@ def category(ctx, rd, encoded_name, library_id): :param sort_order: asc or desc To learn how to create subcategories see - http://manual.calibre-ebook.com/sub_groups.html + https://manual.calibre-ebook.com/sub_groups.html ''' db = get_db(ctx, rd, library_id)