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

repowidget: remember expander state of SummryPanel

Changeset 503bb0bbb496…

Parent 21a4dbd30b80…

by Yuki KODAMA

Changes to 2 files · Browse files at 503bb0bbb496 Showing diff from parent 21a4dbd30b80 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​csinfo.py Stacked
 
479
480
481
482
 
483
484
485
 
495
496
497
498
499
 
500
501
502
503
504
505
506
 
507
508
509
 
515
516
517
518
 
519
520
521
 
541
542
543
 
 
 
 
 
 
 
544
545
546
 
479
480
481
 
482
483
484
485
 
495
496
497
 
 
498
499
500
501
502
503
504
 
505
506
507
508
 
514
515
516
 
517
518
519
520
 
540
541
542
543
544
545
546
547
548
549
550
551
552
@@ -479,7 +479,7 @@
  hbox.setSpacing(0)   self.setLayout(hbox)   self.revlabel = None - self.expand_btn = None + self.expand_btn = qtlib.PMButton()     def update(self, target=None, style=None, custom=None, repo=None):   if not SummaryBase.update(self, target, custom, repo): @@ -495,15 +495,14 @@
  self.layout().addWidget(self.revlabel, alignment=Qt.AlignTop)     if 'expandable' in self.csstyle and self.csstyle['expandable']: - if self.expand_btn is None: - self.expand_btn = qtlib.PMButton() + if self.expand_btn.parentWidget() is None:   self.expand_btn.clicked.connect(lambda: self.update())   margin = QHBoxLayout()   margin.setMargin(3)   margin.addWidget(self.expand_btn, alignment=Qt.AlignTop)   self.layout().insertLayout(0, margin)   self.expand_btn.setShown(True) - elif self.expand_btn is not None: + elif self.expand_btn.parentWidget() is not None:   self.expand_btn.setHidden(True)     interact = Qt.LinksAccessibleByMouse @@ -515,7 +514,7 @@
    # build info   contents = self.csstyle.get('contents', ()) - if 'expandable' in self.csstyle and self.expand_btn is not None \ + if 'expandable' in self.csstyle and self.csstyle['expandable'] \   and self.expand_btn.is_collapsed():   contents = contents[0:1]   @@ -541,6 +540,13 @@
    return True   + def set_expanded(self, state): + self.expand_btn.set_expanded(state) + self.update() + + def is_expanded(self): + return self.expand_btn.is_expanded() +  LABEL_PAT = re.compile(r'(?:(?<=%%)|(?<!%)%\()(\w+)(?:\)s)')    class SummaryLabel(SummaryBase, QLabel):
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
493
494
495
496
 
497
498
499
 
504
505
506
507
508
 
 
509
510
511
 
493
494
495
 
496
497
498
499
 
504
505
506
 
 
507
508
509
510
511
@@ -493,7 +493,7 @@
  wb = "RepoWidget/"   for n in self.splitternames:   s.setValue(wb + n, getattr(self, n).saveState()) -# s.setValue(wb + 'revdisplay.expanded', self.revdisplay.expanded()) + s.setValue(wb + 'revpanel.expanded', self.revpanel.is_expanded())     def restoreSettings(self):   s = QtCore.QSettings() @@ -504,8 +504,8 @@
  n += '_splitter'   self.splitternames.append(n)   getattr(self, n).restoreState(s.value(wb + n).toByteArray()) -# expanded = s.value(wb + 'revdisplay.expanded', True).toBool() -# self.revdisplay.setExpanded(expanded) + expanded = s.value(wb + 'revpanel.expanded', True).toBool() + self.revpanel.set_expanded(expanded)     def closeRepoWidget(self):   '''returns False if close should be aborted'''