1

Small UI tweaks

Former-commit-id: a23e677fb9b6e831cad1690bbb7fc704dad31975
This commit is contained in:
Alex Yatskov 2016-02-25 11:45:54 -08:00
parent 36ea682b13
commit 31cff866a5
10 changed files with 11 additions and 19 deletions

View File

@ -45,7 +45,7 @@
<item> <item>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>&lt;a href = &quot;http://foosoft.net/projects/yomichan&quot;&gt;http://foosoft.net/projects/yomichan&lt;/a&gt;</string> <string>&lt;a href = &quot;https://foosoft.net/projects/yomichan&quot;&gt;https://foosoft.net/projects/yomichan&lt;/a&gt;</string>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>

View File

@ -84,8 +84,6 @@
<string>&amp;Help</string> <string>&amp;Help</string>
</property> </property>
<addaction name="actionHomepage"/> <addaction name="actionHomepage"/>
<addaction name="actionFeedback"/>
<addaction name="separator"/>
<addaction name="actionAbout"/> <addaction name="actionAbout"/>
</widget> </widget>
<widget class="QMenu" name="menuView"> <widget class="QMenu" name="menuView">

View File

@ -19,7 +19,7 @@
<property name="text"> <property name="text">
<string>&lt;p&gt;A new version of Yomichan is available for download!&lt;/p&gt; <string>&lt;p&gt;A new version of Yomichan is available for download!&lt;/p&gt;
&lt;p&gt;You can download this update (version {0} to version {1}) from the add-ons section on &lt;a href=&quot;https://ankiweb.net/shared/info/934748696&quot;&gt;Anki Online&lt;/a&gt; or directly from the &lt;a href=&quot;http://foosoft.net/projects/yomichan&quot;&gt;Yomichan homepage&lt;/a&gt;.&lt;/p&gt; &lt;p&gt;You can download this update (version {0} to version {1}) from the add-ons section on &lt;a href=&quot;https://ankiweb.net/shared/info/934748696&quot;&gt;Anki Online&lt;/a&gt; or directly from the &lt;a href=&quot;https://foosoft.net/projects/yomichan&quot;&gt;Yomichan homepage&lt;/a&gt;.&lt;/p&gt;
&lt;p&gt;Changes from your version are listed below:&lt;/p&gt;</string> &lt;p&gt;Changes from your version are listed below:&lt;/p&gt;</string>
</property> </property>

View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'ui/about.ui' # 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 # by: PyQt4 UI code generator 4.10.4
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -93,7 +93,7 @@ class Ui_DialogAbout(object):
DialogAbout.setWindowTitle(_translate("DialogAbout", "About", None)) DialogAbout.setWindowTitle(_translate("DialogAbout", "About", None))
self.labelVersion.setText(_translate("DialogAbout", "<b>Yomichan {0}</b>", None)) self.labelVersion.setText(_translate("DialogAbout", "<b>Yomichan {0}</b>", None))
self.label_3.setText(_translate("DialogAbout", "(c) 2013 by Alex Yatskov", None)) self.label_3.setText(_translate("DialogAbout", "(c) 2013 by Alex Yatskov", None))
self.label_4.setText(_translate("DialogAbout", "<a href = \"http://foosoft.net/projects/yomichan\">http://foosoft.net/projects/yomichan</a>", None)) self.label_4.setText(_translate("DialogAbout", "<a href = \"https://foosoft.net/projects/yomichan\">https://foosoft.net/projects/yomichan</a>", None))
self.label_6.setText(_translate("DialogAbout", "This software uses the <a href = \"http://www.famfamfam.com/lab/icons/silk/\">Silk web icon set</a> created by Mark James.", None)) self.label_6.setText(_translate("DialogAbout", "This software uses the <a href = \"http://www.famfamfam.com/lab/icons/silk/\">Silk web icon set</a> created by Mark James.", None))
self.label_7.setText(_translate("DialogAbout", "Portions of this application\'s code and data are based on the <a href=\"http://www.polarcloud.com/rikaichan/\">Rikaichan</a> extension developed by Jonathan Zarate.", None)) self.label_7.setText(_translate("DialogAbout", "Portions of this application\'s code and data are based on the <a href=\"http://www.polarcloud.com/rikaichan/\">Rikaichan</a> extension developed by Jonathan Zarate.", None))
self.label_5.setText(_translate("DialogAbout", "This package uses the <a href=\"http://www.csse.monash.edu.au/~jwb/edict.html\">EDICT</a> and <a href=\"http://www.csse.monash.edu.au/~jwb/kanjidic.html\">KANJIDIC</a> dictionary files. These files are the property of the <a href=\"http://www.edrdg.org/\"> Electronic Dictionary Research and Development Group</a>, and are used in conformance with the Group\'s <a href=\"http://www.edrdg.org/edrdg/licence.html\">licence</a>.", None)) self.label_5.setText(_translate("DialogAbout", "This package uses the <a href=\"http://www.csse.monash.edu.au/~jwb/edict.html\">EDICT</a> and <a href=\"http://www.csse.monash.edu.au/~jwb/kanjidic.html\">KANJIDIC</a> dictionary files. These files are the property of the <a href=\"http://www.edrdg.org/\"> Electronic Dictionary Research and Development Group</a>, and are used in conformance with the Group\'s <a href=\"http://www.edrdg.org/edrdg/licence.html\">licence</a>.", None))

View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'ui/preferences.ui' # 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 # by: PyQt4 UI code generator 4.10.4
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'ui/reader.ui' # 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 # by: PyQt4 UI code generator 4.10.4
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -2,7 +2,7 @@
# Resource object code # 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) # by: The Resource Compiler for PyQt (Qt v4.8.6)
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'ui/updates.ui' # 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 # by: PyQt4 UI code generator 4.10.4
# #
# WARNING! All changes made in this file will be lost! # 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)) DialogUpdates.setWindowTitle(_translate("DialogUpdates", "Update Checker", None))
self.labelUpdates.setText(_translate("DialogUpdates", "<p>A new version of Yomichan is available for download!</p>\n" self.labelUpdates.setText(_translate("DialogUpdates", "<p>A new version of Yomichan is available for download!</p>\n"
"\n" "\n"
"<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>\n" "<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>\n"
"\n" "\n"
"<p>Changes from your version are listed below:</p>", None)) "<p>Changes from your version are listed below:</p>", None))

View File

@ -70,7 +70,6 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader):
self.openFile(filenames[0]) self.openFile(filenames[0])
self.actionAbout.triggered.connect(self.onActionAbout) self.actionAbout.triggered.connect(self.onActionAbout)
self.actionFeedback.triggered.connect(self.onActionFeedback)
self.actionFind.triggered.connect(self.onActionFind) self.actionFind.triggered.connect(self.onActionFind)
self.actionFindNext.triggered.connect(self.onActionFindNext) self.actionFindNext.triggered.connect(self.onActionFindNext)
self.actionHomepage.triggered.connect(self.onActionHomepage) self.actionHomepage.triggered.connect(self.onActionHomepage)
@ -277,12 +276,7 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader):
def onActionHomepage(self): def onActionHomepage(self):
url = QtCore.QUrl('http://foosoft.net/projects/yomichan') url = QtCore.QUrl('https://foosoft.net/projects/yomichan')
QtGui.QDesktopServices().openUrl(url)
def onActionFeedback(self):
url = QtCore.QUrl('http://foosoft.net/about')
QtGui.QDesktopServices().openUrl(url) QtGui.QDesktopServices().openUrl(url)

View File

@ -60,7 +60,7 @@ class UpdateFinder(QtCore.QThread):
updates = list() updates = list()
try: 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()) updates = json.loads(fp.read())
fp.close() fp.close()