From 31cff866a5d186d2df4f07f33f34a09c841d81b1 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Thu, 25 Feb 2016 11:45:54 -0800 Subject: [PATCH] Small UI tweaks Former-commit-id: a23e677fb9b6e831cad1690bbb7fc704dad31975 --- ui/about.ui | 2 +- ui/reader.ui | 2 -- ui/updates.ui | 2 +- yomi_base/gen/about_ui.py | 4 ++-- yomi_base/gen/preferences_ui.py | 2 +- yomi_base/gen/reader_ui.py | 2 +- yomi_base/gen/resources_rc.py | 2 +- yomi_base/gen/updates_ui.py | 4 ++-- yomi_base/reader.py | 8 +------- yomi_base/updates.py | 2 +- 10 files changed, 11 insertions(+), 19 deletions(-) diff --git a/ui/about.ui b/ui/about.ui index 37132dd..c4f5091 100644 --- a/ui/about.ui +++ b/ui/about.ui @@ -45,7 +45,7 @@ - <a href = "http://foosoft.net/projects/yomichan">http://foosoft.net/projects/yomichan</a> + <a href = "https://foosoft.net/projects/yomichan">https://foosoft.net/projects/yomichan</a> true diff --git a/ui/reader.ui b/ui/reader.ui index 3e7e6e2..1872d0b 100644 --- a/ui/reader.ui +++ b/ui/reader.ui @@ -84,8 +84,6 @@ &Help - - diff --git a/ui/updates.ui b/ui/updates.ui index ca6b713..ab8eb96 100644 --- a/ui/updates.ui +++ b/ui/updates.ui @@ -19,7 +19,7 @@ <p>A new version of Yomichan is available for download!</p> -<p>You can download this update (version {0} to version {1}) from the add-ons section on <a href="https://ankiweb.net/shared/info/934748696">Anki Online</a> or directly from the <a href="http://foosoft.net/projects/yomichan">Yomichan homepage</a>.</p> +<p>You can download this update (version {0} to version {1}) from the add-ons section on <a href="https://ankiweb.net/shared/info/934748696">Anki Online</a> or directly from the <a href="https://foosoft.net/projects/yomichan">Yomichan homepage</a>.</p> <p>Changes from your version are listed below:</p> diff --git a/yomi_base/gen/about_ui.py b/yomi_base/gen/about_ui.py index 033d013..9d594c5 100644 --- a/yomi_base/gen/about_ui.py +++ b/yomi_base/gen/about_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/about.ui' # -# Created: Tue Mar 31 12:33:10 2015 +# Created: Thu Feb 25 11:43:19 2016 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -93,7 +93,7 @@ class Ui_DialogAbout(object): DialogAbout.setWindowTitle(_translate("DialogAbout", "About", None)) self.labelVersion.setText(_translate("DialogAbout", "Yomichan {0}", None)) self.label_3.setText(_translate("DialogAbout", "(c) 2013 by Alex Yatskov", None)) - self.label_4.setText(_translate("DialogAbout", "http://foosoft.net/projects/yomichan", None)) + self.label_4.setText(_translate("DialogAbout", "https://foosoft.net/projects/yomichan", None)) self.label_6.setText(_translate("DialogAbout", "This software uses the Silk web icon set created by Mark James.", None)) self.label_7.setText(_translate("DialogAbout", "Portions of this application\'s code and data are based on the Rikaichan extension developed by Jonathan Zarate.", None)) self.label_5.setText(_translate("DialogAbout", "This package uses the EDICT and KANJIDIC dictionary files. These files are the property of the Electronic Dictionary Research and Development Group, and are used in conformance with the Group\'s licence.", None)) diff --git a/yomi_base/gen/preferences_ui.py b/yomi_base/gen/preferences_ui.py index a0241fb..09fa906 100644 --- a/yomi_base/gen/preferences_ui.py +++ b/yomi_base/gen/preferences_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/preferences.ui' # -# Created: Tue Mar 31 12:33:11 2015 +# Created: Thu Feb 25 11:43:19 2016 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/gen/reader_ui.py b/yomi_base/gen/reader_ui.py index 4231cbe..55444f6 100644 --- a/yomi_base/gen/reader_ui.py +++ b/yomi_base/gen/reader_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/reader.ui' # -# Created: Tue Mar 31 12:33:11 2015 +# Created: Thu Feb 25 11:43:19 2016 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/gen/resources_rc.py b/yomi_base/gen/resources_rc.py index 94aebae..66ba91a 100644 --- a/yomi_base/gen/resources_rc.py +++ b/yomi_base/gen/resources_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Tue Mar 31 12:33:11 2015 +# Created: Thu Feb 25 11:43:19 2016 # by: The Resource Compiler for PyQt (Qt v4.8.6) # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/gen/updates_ui.py b/yomi_base/gen/updates_ui.py index 0e25dfd..3367a93 100644 --- a/yomi_base/gen/updates_ui.py +++ b/yomi_base/gen/updates_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/updates.ui' # -# Created: Tue Mar 31 12:33:11 2015 +# Created: Thu Feb 25 11:43:19 2016 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -52,7 +52,7 @@ class Ui_DialogUpdates(object): DialogUpdates.setWindowTitle(_translate("DialogUpdates", "Update Checker", None)) self.labelUpdates.setText(_translate("DialogUpdates", "

A new version of Yomichan is available for download!

\n" "\n" -"

You can download this update (version {0} to version {1}) from the add-ons section on Anki Online or directly from the Yomichan homepage.

\n" +"

You can download this update (version {0} to version {1}) from the add-ons section on Anki Online or directly from the Yomichan homepage.

\n" "\n" "

Changes from your version are listed below:

", None)) diff --git a/yomi_base/reader.py b/yomi_base/reader.py index 2fd1c69..e17842b 100644 --- a/yomi_base/reader.py +++ b/yomi_base/reader.py @@ -70,7 +70,6 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader): self.openFile(filenames[0]) self.actionAbout.triggered.connect(self.onActionAbout) - self.actionFeedback.triggered.connect(self.onActionFeedback) self.actionFind.triggered.connect(self.onActionFind) self.actionFindNext.triggered.connect(self.onActionFindNext) self.actionHomepage.triggered.connect(self.onActionHomepage) @@ -277,12 +276,7 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader): def onActionHomepage(self): - url = QtCore.QUrl('http://foosoft.net/projects/yomichan') - QtGui.QDesktopServices().openUrl(url) - - - def onActionFeedback(self): - url = QtCore.QUrl('http://foosoft.net/about') + url = QtCore.QUrl('https://foosoft.net/projects/yomichan') QtGui.QDesktopServices().openUrl(url) diff --git a/yomi_base/updates.py b/yomi_base/updates.py index fb81f99..6cc1245 100644 --- a/yomi_base/updates.py +++ b/yomi_base/updates.py @@ -60,7 +60,7 @@ class UpdateFinder(QtCore.QThread): updates = list() try: - fp = urllib2.urlopen('http://foosoft.net/projects/yomichan/dl/updates.json') + fp = urllib2.urlopen('https://foosoft.net/projects/yomichan/dl/updates.json') updates = json.loads(fp.read()) fp.close()