Browse Source

Merge pull request #8132 from Piccirello/use-https

Use https for www.qbittorrent.org
adaptive-webui-19844
sledgehammer999 7 years ago committed by GitHub
parent
commit
e5001e8f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      README.md
  2. 8
      configure
  3. 2
      configure.ac
  4. 2
      dist/unix/qbittorrent.appdata.xml
  5. 2
      dist/windows/installer.nsi
  6. 2
      src/gui/about_imp.h
  7. 4
      src/gui/mainwindow.cpp
  8. 2
      src/webui/www/private/index.html
  9. 2
      src/webui/www/public/about.html

2
README.md

@ -35,7 +35,7 @@ You can also download it from [here](https://github.com/qbittorrent/qBittorrent/
### Misc: ### Misc:
For more information please visit: For more information please visit:
http://www.qbittorrent.org https://www.qbittorrent.org
or our wiki here: or our wiki here:
http://wiki.qbittorrent.org http://wiki.qbittorrent.org

8
configure vendored

@ -583,7 +583,7 @@ PACKAGE_TARNAME='qbittorrent'
PACKAGE_VERSION='v3.2.0alpha' PACKAGE_VERSION='v3.2.0alpha'
PACKAGE_STRING='qbittorrent v3.2.0alpha' PACKAGE_STRING='qbittorrent v3.2.0alpha'
PACKAGE_BUGREPORT='bugs.qbittorrent.org' PACKAGE_BUGREPORT='bugs.qbittorrent.org'
PACKAGE_URL='http://www.qbittorrent.org/' PACKAGE_URL='https://www.qbittorrent.org/'
ac_subst_vars='am__EXEEXT_FALSE ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE am__EXEEXT_TRUE
@ -1426,7 +1426,7 @@ Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations. it to find libraries and programs with nonstandard names/locations.
Report bugs to <bugs.qbittorrent.org>. Report bugs to <bugs.qbittorrent.org>.
qbittorrent home page: <http://www.qbittorrent.org/>. qbittorrent home page: <https://www.qbittorrent.org/>.
_ACEOF _ACEOF
ac_status=$? ac_status=$?
fi fi
@ -6139,7 +6139,7 @@ Configuration commands:
$config_commands $config_commands
Report bugs to <bugs.qbittorrent.org>. Report bugs to <bugs.qbittorrent.org>.
qbittorrent home page: <http://www.qbittorrent.org/>." qbittorrent home page: <https://www.qbittorrent.org/>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@ -7454,7 +7454,7 @@ Configuration commands:
$config_commands $config_commands
Report bugs to <bugs.qbittorrent.org>. Report bugs to <bugs.qbittorrent.org>.
qbittorrent home page: <http://www.qbittorrent.org/>." qbittorrent home page: <https://www.qbittorrent.org/>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

2
configure.ac

@ -1,4 +1,4 @@
AC_INIT([qbittorrent], [v3.2.0alpha], [bugs.qbittorrent.org], [], [http://www.qbittorrent.org/]) AC_INIT([qbittorrent], [v3.2.0alpha], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC AC_PROG_CC

2
dist/unix/qbittorrent.appdata.xml vendored

@ -56,7 +56,7 @@
</image> </image>
</screenshot> </screenshot>
</screenshots> </screenshots>
<url type="homepage">http://www.qbittorrent.org/</url> <url type="homepage">https://www.qbittorrent.org/</url>
<update_contact>sledgehammer999@qbittorrent.org</update_contact> <update_contact>sledgehammer999@qbittorrent.org</update_contact>
<developer_name>The qBittorrent Project</developer_name> <developer_name>The qBittorrent Project</developer_name>
<url type="bugtracker">http://bugs.qbittorrent.org/</url> <url type="bugtracker">http://bugs.qbittorrent.org/</url>

2
dist/windows/installer.nsi vendored

@ -86,7 +86,7 @@ Section $(inst_qbt_req) ;"qBittorrent (required)"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "UninstallString" '"$INSTDIR\uninst.exe"' WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "UninstallString" '"$INSTDIR\uninst.exe"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "DisplayIcon" '"$INSTDIR\qbittorrent.exe",0' WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "DisplayIcon" '"$INSTDIR\qbittorrent.exe",0'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "Publisher" "The qBittorrent project" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "Publisher" "The qBittorrent project"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "URLInfoAbout" "http://www.qbittorrent.org" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "URLInfoAbout" "https://www.qbittorrent.org"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "DisplayVersion" "${PROG_VERSION}" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "DisplayVersion" "${PROG_VERSION}"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "NoModify" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "NoModify" 1
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "NoRepair" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "NoRepair" 1

2
src/gui/about_imp.h

@ -59,7 +59,7 @@ public:
"%1\n\n" "%1\n\n"
"%2\n\n" "%2\n\n"
"<table>" "<table>"
"<tr><td>%3</td><td><a href=\"http://www.qbittorrent.org\">http://www.qbittorrent.org</a></td></tr>" "<tr><td>%3</td><td><a href=\"https://www.qbittorrent.org\">https://www.qbittorrent.org</a></td></tr>"
"<tr><td>%4</td><td><a href=\"http://forum.qbittorrent.org\">http://forum.qbittorrent.org</a></td></tr>" "<tr><td>%4</td><td><a href=\"http://forum.qbittorrent.org\">http://forum.qbittorrent.org</a></td></tr>"
"<tr><td>%5</td><td><a href=\"http://bugs.qbittorrent.org\">http://bugs.qbittorrent.org</a></td></tr>" "<tr><td>%5</td><td><a href=\"http://bugs.qbittorrent.org\">http://bugs.qbittorrent.org</a></td></tr>"
"</table>" "</table>"

4
src/gui/mainwindow.cpp

@ -988,7 +988,7 @@ void MainWindow::on_actionCloseWindow_triggered()
{ {
// On macOS window close is basically equivalent to window hide. // On macOS window close is basically equivalent to window hide.
// If you decide to implement this functionality for other OS, // If you decide to implement this functionality for other OS,
// then you will also need ui lock checks like in actionExit. // then you will also need ui lock checks like in actionExit.
close(); close();
} }
#endif #endif
@ -1854,7 +1854,7 @@ void MainWindow::toggleAlternativeSpeeds()
void MainWindow::on_actionDonateMoney_triggered() void MainWindow::on_actionDonateMoney_triggered()
{ {
QDesktopServices::openUrl(QUrl("http://www.qbittorrent.org/donate")); QDesktopServices::openUrl(QUrl("https://www.qbittorrent.org/donate"));
} }
void MainWindow::showConnectionSettings() void MainWindow::showConnectionSettings()

2
src/webui/www/private/index.html

@ -77,7 +77,7 @@
<a class="returnFalse">QBT_TR(&Help)QBT_TR[CONTEXT=MainWindow]</a> <a class="returnFalse">QBT_TR(&Help)QBT_TR[CONTEXT=MainWindow]</a>
<ul> <ul>
<li><a id="docsLink" target="_blank" href="http://wiki.qbittorrent.org/"><img class="MyMenuIcon" src="theme/help-contents" alt="QBT_TR(&Documentation)QBT_TR[CONTEXT=MainWindow]" width="16" height="16" onload="fixPNG(this)"/>QBT_TR(&Documentation)QBT_TR[CONTEXT=MainWindow]</a></li> <li><a id="docsLink" target="_blank" href="http://wiki.qbittorrent.org/"><img class="MyMenuIcon" src="theme/help-contents" alt="QBT_TR(&Documentation)QBT_TR[CONTEXT=MainWindow]" width="16" height="16" onload="fixPNG(this)"/>QBT_TR(&Documentation)QBT_TR[CONTEXT=MainWindow]</a></li>
<li class="divider"><a id="bugLink" target="_blank" href="http://www.qbittorrent.org/donate"><img class="MyMenuIcon" src="theme/wallet-open" alt="QBT_TR(Do&nate!)QBT_TR[CONTEXT=MainWindow]" width="16" height="16" onload="fixPNG(this)"/>QBT_TR(Do&nate!)QBT_TR[CONTEXT=MainWindow]</a></li> <li class="divider"><a id="bugLink" target="_blank" href="https://www.qbittorrent.org/donate"><img class="MyMenuIcon" src="theme/wallet-open" alt="QBT_TR(Do&nate!)QBT_TR[CONTEXT=MainWindow]" width="16" height="16" onload="fixPNG(this)"/>QBT_TR(Do&nate!)QBT_TR[CONTEXT=MainWindow]</a></li>
<li><a id="aboutLink"><img class="MyMenuIcon" src="theme/help-about" alt="QBT_TR(&About)QBT_TR[CONTEXT=MainWindow]" width="16" height="16" onload="fixPNG(this)"/>QBT_TR(&About)QBT_TR[CONTEXT=MainWindow]</a></li> <li><a id="aboutLink"><img class="MyMenuIcon" src="theme/help-about" alt="QBT_TR(&About)QBT_TR[CONTEXT=MainWindow]" width="16" height="16" onload="fixPNG(this)"/>QBT_TR(&About)QBT_TR[CONTEXT=MainWindow]</a></li>
</ul> </ul>
</li> </li>

2
src/webui/www/public/about.html

@ -2,7 +2,7 @@
<h3>qBittorrent ${VERSION} QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</h3> <h3>qBittorrent ${VERSION} QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</h3>
<p>QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR[CONTEXT=about]</p> <p>QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR[CONTEXT=about]</p>
<p>Copyright (c) 2011-2017 The qBittorrent project</p> <p>Copyright (c) 2011-2017 The qBittorrent project</p>
<p>QBT_TR(Home Page:)QBT_TR[CONTEXT=about] <a target="_blank" href="http://www.qbittorrent.org"> http://www.qbittorrent.org</a></p> <p>QBT_TR(Home Page:)QBT_TR[CONTEXT=about] <a target="_blank" href="https://www.qbittorrent.org"> https://www.qbittorrent.org</a></p>
<p>QBT_TR(Bug Tracker:)QBT_TR[CONTEXT=about] <a target="_blank" href="http://bugs.qbittorrent.org"> http://bugs.qbittorrent.org</a></p> <p>QBT_TR(Bug Tracker:)QBT_TR[CONTEXT=about] <a target="_blank" href="http://bugs.qbittorrent.org"> http://bugs.qbittorrent.org</a></p>
<p>QBT_TR(Forum:)QBT_TR[CONTEXT=about] <a target="_blank" href="http://forum.qbittorrent.org"> http://forum.qbittorrent.org</a></p> <p>QBT_TR(Forum:)QBT_TR[CONTEXT=about] <a target="_blank" href="http://forum.qbittorrent.org"> http://forum.qbittorrent.org</a></p>
<p>QBT_TR(IRC: #qbittorrent on Freenode)QBT_TR[CONTEXT=HttpServer]</p> <p>QBT_TR(IRC: #qbittorrent on Freenode)QBT_TR[CONTEXT=HttpServer]</p>

Loading…
Cancel
Save