We are currently indexing your data, so search results may be incomplete until we finish.
about: further finetuning
- show full thg version info
- put name, version, and libs together in a rich text label,
so they can be selected all at once
Changeset 48c061c54905…
Parent 12fa1324a99c…
by
Changes to 3 files · Browse files at 48c061c54905 Showing diff from parent 12fa1324a99c Diff from another changeset...
|
@@ -50,15 +50,14 @@ thglogofile = paths.get_tortoise_icon('thg_logo_92x50.png')
self._qui.logo_label.setPixmap(QPixmap(thglogofile))
- thgv = version.version()
- if '+' in thgv:
- thgv = thgv[0:thgv.index('+')]
- self._qui.name_version_label.setText(_('TortoiseHg (version %s)') % thgv)
-
- lib_versions = (_("with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s") % \
- (hglib.hgversion, make_version(sys.version_info[0:3]),
- PYQT_VERSION_STR, QT_VERSION_STR))
- self._qui.libs_label.setText(lib_versions)
+ thgv = (_('version %s') % version.version())
+ libv = (_('with Mercurial-%s, Python-%s, PyQt-%s, Qt-%s') % \
+ (hglib.hgversion, make_version(sys.version_info[0:3]),
+ PYQT_VERSION_STR, QT_VERSION_STR))
+ nvl = hglib.fromunicode(self._qui.name_version_libs_label.text())
+ nvl = nvl.replace('*version_string*', thgv)
+ nvl = nvl.replace('*libs_string*', libv)
+ self._qui.name_version_libs_label.setText(nvl)
self._qui.copyright_label.setText(_('Copyright 2008-2010 Steve Borho and others'))
self._qui.courtesy_label.setText(
|
||
|
@@ -7,7 +7,7 @@ <x>0</x>
<y>0</y>
<width>327</width>
- <height>306</height>
+ <height>343</height>
</rect>
</property>
<property name="windowTitle">
@@ -62,44 +62,15 @@ </widget>
</item>
<item>
- <widget class="QLabel" name="name_version_label">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- <pointsize>14</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
+ <widget class="QLabel" name="name_version_libs_label">
<property name="text">
- <string>TortoiseHg (version %s)</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::TextSelectableByMouse</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="libs_label">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>with Mercurial-%s, Python-%s, PyQt4-%s, Qt-%s</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body>
+<p align="center" style=" margin-top:0px; margin-bottom:6px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">TortoiseHg</span></p>
+<p align="center" style=" margin-top:0px; margin-bottom:6px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">*version_string*</span></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span>*libs_string*</span></p></body></html></string>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
@@ -201,6 +172,9 @@ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
+ <property name="textInteractionFlags">
+ <set>Qt::LinksAccessibleByMouse</set>
+ </property>
</widget>
</item>
<item>
|
||
|
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'tortoisehg/hgqt/about.ui'
#
-# Created: Tue May 18 21:54:26 2010
+# Created: Wed May 19 20:14:16 2010
# by: PyQt4 UI code generator 4.7.3
#
# WARNING! All changes made in this file will be lost!
@@ -12,7 +12,7 @@class Ui_AboutDialog(object):
def setupUi(self, AboutDialog):
AboutDialog.setObjectName("AboutDialog")
- AboutDialog.resize(327, 306)
+ AboutDialog.resize(327, 343)
AboutDialog.setModal(True)
self.verticalLayout = QtGui.QVBoxLayout(AboutDialog)
self.verticalLayout.setSizeConstraint(QtGui.QLayout.SetFixedSize)
@@ -38,31 +38,10 @@ self.label_6.setText("")
self.label_6.setObjectName("label_6")
self.info_vlayout.addWidget(self.label_6)
- self.name_version_label = QtGui.QLabel(AboutDialog)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.name_version_label.sizePolicy().hasHeightForWidth())
- self.name_version_label.setSizePolicy(sizePolicy)
- font = QtGui.QFont()
- font.setPointSize(14)
- font.setWeight(75)
- font.setBold(True)
- self.name_version_label.setFont(font)
- self.name_version_label.setAlignment(QtCore.Qt.AlignCenter)
- self.name_version_label.setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse)
- self.name_version_label.setObjectName("name_version_label")
- self.info_vlayout.addWidget(self.name_version_label)
- self.libs_label = QtGui.QLabel(AboutDialog)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.libs_label.sizePolicy().hasHeightForWidth())
- self.libs_label.setSizePolicy(sizePolicy)
- self.libs_label.setAlignment(QtCore.Qt.AlignCenter)
- self.libs_label.setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse)
- self.libs_label.setObjectName("libs_label")
- self.info_vlayout.addWidget(self.libs_label)
+ self.name_version_libs_label = QtGui.QLabel(AboutDialog)
+ self.name_version_libs_label.setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse)
+ self.name_version_libs_label.setObjectName("name_version_libs_label")
+ self.info_vlayout.addWidget(self.name_version_libs_label)
self.label_8 = QtGui.QLabel(AboutDialog)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
@@ -116,6 +95,7 @@ self.download_url_label.setSizePolicy(sizePolicy)
self.download_url_label.setMouseTracking(True)
self.download_url_label.setAlignment(QtCore.Qt.AlignCenter)
+ self.download_url_label.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse)
self.download_url_label.setObjectName("download_url_label")
self.info_vlayout.addWidget(self.download_url_label)
self.label_10 = QtGui.QLabel(AboutDialog)
@@ -157,8 +137,13 @@ def retranslateUi(self, AboutDialog):
AboutDialog.setWindowTitle(QtGui.QApplication.translate("AboutDialog", "Dialog", None, QtGui.QApplication.UnicodeUTF8))
self.logo_label.setText(QtGui.QApplication.translate("AboutDialog", "thg logo", None, QtGui.QApplication.UnicodeUTF8))
- self.name_version_label.setText(QtGui.QApplication.translate("AboutDialog", "TortoiseHg (version %s)", None, QtGui.QApplication.UnicodeUTF8))
- self.libs_label.setText(QtGui.QApplication.translate("AboutDialog", "with Mercurial-%s, Python-%s, PyQt4-%s, Qt-%s", None, QtGui.QApplication.UnicodeUTF8))
+ self.name_version_libs_label.setText(QtGui.QApplication.translate("AboutDialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body>\n"
+"<p align=\"center\" style=\" margin-top:0px; margin-bottom:6px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:14pt; font-weight:600;\">TortoiseHg</span></p>\n"
+"<p align=\"center\" style=\" margin-top:0px; margin-bottom:6px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt; font-weight:600;\">*version_string*</span></p>\n"
+"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span>*libs_string*</span></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
self.copyright_label.setText(QtGui.QApplication.translate("AboutDialog", "Copyright 2008-2010 Steve Borho and others", None, QtGui.QApplication.UnicodeUTF8))
self.courtesy_label.setText(QtGui.QApplication.translate("AboutDialog", "Several icons are courtesy of the TortoiseSVN project", None, QtGui.QApplication.UnicodeUTF8))
self.download_label.setText(QtGui.QApplication.translate("AboutDialog", "A new version of TortoiseHg is ready for download!", None, QtGui.QApplication.UnicodeUTF8))
|
||
Add a tag
Loading...