Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

nuke help dialog

eliminates problematic dependency on docutils

Changeset 1ef797e1d80e…

Parent 3607bb3d8d34…

by Adrian Buehlmann

Changes to 4 files · Browse files at 1ef797e1d80e Showing diff from parent 3607bb3d8d34 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​HelpDialog.ui Stacked
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,66 +0,0 @@
-<ui version="4.0" > - <class>Dialog</class> - <widget class="QDialog" name="Dialog" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Dialog</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QTextBrowser" name="textBrowser" /> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons" > - <set>QDialogButtonBox::Close</set> - </property> - </widget> - </item> - </layout> - </widget> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>Dialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel" > - <x>248</x> - <y>254</y> - </hint> - <hint type="destinationlabel" > - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>Dialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel" > - <x>316</x> - <y>260</y> - </hint> - <hint type="destinationlabel" > - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - </connections> -</ui>
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​HelpDialog_ui.py Stacked
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'C:\Users\adi\hgrepos\thg-qt\tortoisehg\hgqt\HelpDialog.ui' -# -# Created: Sun May 02 13:55:03 2010 -# by: PyQt4 UI code generator 4.7.3 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -class Ui_Dialog(object): - def setupUi(self, Dialog): - Dialog.setObjectName("Dialog") - Dialog.resize(400, 300) - self.verticalLayout = QtGui.QVBoxLayout(Dialog) - self.verticalLayout.setObjectName("verticalLayout") - self.textBrowser = QtGui.QTextBrowser(Dialog) - self.textBrowser.setObjectName("textBrowser") - self.verticalLayout.addWidget(self.textBrowser) - self.buttonBox = QtGui.QDialogButtonBox(Dialog) - self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Close) - self.buttonBox.setObjectName("buttonBox") - self.verticalLayout.addWidget(self.buttonBox) - - self.retranslateUi(Dialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), Dialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), Dialog.reject) - QtCore.QMetaObject.connectSlotsByName(Dialog) - - def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "Dialog", None, QtGui.QApplication.UnicodeUTF8)) -
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​helpdialog.py Stacked
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,46 +0,0 @@
-# -*- coding: iso-8859-1 -*- -#!/usr/bin/env python -# -# Copyright (C) 2007-2010 Logilab. All rights reserved. -# -# This software may be used and distributed according to the terms -# of the GNU General Public License, incorporated herein by reference. -""" -Help window -""" -import sys, os -import re - -from PyQt4 import QtCore, QtGui, Qsci - -from tortoisehg.hgqt import icon as geticon -from tortoisehg.hgqt.dialogmixin import HgDialogMixin -from tortoisehg.hgqt.helpmessages import help_msg, get_options_helpmsg - -Qt = QtCore.Qt -bold = QtGui.QFont.Bold -connect = QtCore.QObject.connect -SIGNAL = QtCore.SIGNAL - -from docutils.core import publish_string - -class HelpDialog(QtGui.QDialog, HgDialogMixin): - """hgview simple help viewer""" - _uifile = 'HelpDialog.ui' - def __init__(self, repo, parent=None): - self.repo = repo - QtGui.QDialog.__init__(self, parent) - HgDialogMixin.__init__(self) - data = help_msg + get_options_helpmsg(rest=True) - - html = publish_string(data, writer_name='html') - self.textBrowser.setText(html) - - # must be redefined cause it's a QDialog - def accept(self): - QtGui.QDialog.accept(self) - - def reject(self): - QtGui.QDialog.reject(self) - -
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
27
28
29
30
31
32
33
 
394
395
396
397
398
399
400
 
401
402
403
 
27
28
29
 
30
31
32
 
393
394
395
 
 
 
 
396
397
398
399
@@ -27,7 +27,6 @@
 from tortoisehg.hgqt import icon as geticon  from tortoisehg.hgqt.dialogmixin import HgDialogMixin  from tortoisehg.hgqt.quickbar import FindInGraphlogQuickBar -from tortoisehg.hgqt.helpdialog import HelpDialog  from tortoisehg.hgqt.repowidget import RepoWidget    from tortoisehg.util import paths @@ -394,10 +393,7 @@
  QtGui.QMessageBox.about(self, "About %s" % modname, msg)     def on_help(self, *args): - w = HelpDialog(self.repo, self) - w.show() - w.raise_() - w.activateWindow() + pass     def okToContinue(self):   '''