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

settings: drop dependency from SettingsForm to parent

Changeset 204413b98152…

Parent 5e1cbdace1f2…

by Yuya Nishihara

Changes to one file · Browse files at 204413b98152 Showing diff from parent 5e1cbdace1f2 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
453
454
455
456
 
457
458
459
460
461
 
462
463
464
 
522
523
524
525
 
526
527
528
 
569
570
571
572
573
 
 
574
575
576
 
453
454
455
 
456
457
458
459
460
 
461
462
463
464
 
522
523
524
 
525
526
527
528
 
569
570
571
 
 
572
573
574
575
576
@@ -453,12 +453,12 @@
  self.conftabs = QTabWidget()   layout.addWidget(self.conftabs)   self.conftabs.addTab(SettingsForm(rcpath=util.user_rcpath(), - focus=focus, parent=self), + focus=focus, readonly=self.readonly),   _('User global settings'))   if repo:   reporcpath = os.sep.join([repo.root, '.hg', 'hgrc'])   self.conftabs.addTab(SettingsForm(rcpath=reporcpath, - focus=focus, parent=self), + focus=focus, readonly=self.readonly),   _('%s repository settings') % hglib.tounicode(name))     BB = QDialogButtonBox @@ -522,7 +522,7 @@
 class SettingsForm(QWidget):   """Widget for each settings file"""   - def __init__(self, rcpath, focus=None, parent=None): + def __init__(self, rcpath, focus=None, readonly=False, parent=None):   super(SettingsForm, self).__init__(parent)     if isinstance(rcpath, (list, tuple)): @@ -569,8 +569,8 @@
  layout.addWidget(desctext)   self.desctext = desctext   - self.settings = parent.settings # FIXME - self.readonly = parent.readonly # FIXME + self.settings = QSettings() + self.readonly = readonly     # add page items to treeview   for meta, info in INFO: