Commits

Steve Borho committed 2e25c7b Merge

Merge with stable

Comments (0)

Files changed (5)

doc/source/.static/tortoisehg.css

+/*
+ * tortoisehg.css
+ * ~~~~~~~~~~~~~
+ *
+ * TortoiseHg stylesheet
+ *
+ */
+
+@import url("default.css");
+
+/* -- figure styles ----------------------------------------------------------- */
+.figure {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+}

doc/source/conf.py

 # The style sheet to use for HTML and HTML Help pages. A file of that name
 # must exist either in Sphinx' static/ path, or in one of the custom paths
 # given in html_static_path.
-html_style = 'default.css'
+html_style = 'tortoisehg.css'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".

tortoisehg/hgqt/cmdui.py

         self.setWrapMode(QsciScintilla.WrapCharacter)
         self._initfont()
         self._initmarkers()
-        self.standardCommands().boundTo(QKeySequence('CTRL+L')).setKey(0)
+        qscilib.unbindConflictedKeys(self)
 
     def _initfont(self):
         tf = qtlib.getfont('fontoutputlog')

tortoisehg/hgqt/qscilib.py

         self.setWrapVisualFlags(QsciScintilla.WrapFlagByBorder)
         self.textChanged.connect(self._resetfindcond)
         self._resetfindcond()
-        self.standardCommands().boundTo(QKeySequence('CTRL+L')).setKey(0)
+        unbindConflictedKeys(self)
 
     def read(self, f):
         result = super(Scintilla, self).read(f)
             return True
         return False
 
+def unbindConflictedKeys(sci):
+    cmdset = sci.standardCommands()
+    try:
+        cmd = cmdset.boundTo(QKeySequence('CTRL+L'))
+        if cmd:
+            cmd.setKey(0)
+    except AttributeError:  # old QScintilla does not have boundTo()
+        pass
+
 def qsciEolModeFromOs():
     if os.name.startswith('nt'):
         return QsciScintilla.EolWindows

tortoisehg/hgqt/settings.py

 ({'name': 'web', 'label': _('Server'), 'icon': 'proxy'}, (
     _fi(_('<b>Behavior:</b>'), None, genSpacer, ''),
     _fi(_("'Publishing' repository"), 'phases.publish', genBoolRBGroup,
-        _('When true, make pushed revisions public. Default: True')),
+        _('Controls draft phase behavior when working as a server. When true, '
+          'pushed changesets are set to public in both client and server and '
+          'pulled or cloned changesets are set to public in the client. '
+          'Default: True')),
     _fi(_('<b>Web Server:</b>'), None, genSpacer, ''),
     _fi(_('Name'), 'web.name', genEditCombo,
         _('Repository name to use in the web interface, and by TortoiseHg '