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

settings: move "edit" and "reload" buttons into tab

Changeset 4f9593a3b6c1…

Parent 1cce2086d902…

by Yuya Nishihara

Changes to one file · Browse files at 4f9593a3b6c1 Showing diff from parent 1cce2086d902 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
 
486
487
488
489
490
491
492
493
494
495
 
551
552
553
 
 
 
 
 
 
 
 
 
 
 
 
 
554
555
556
 
446
447
448
 
 
 
 
 
 
 
 
 
 
 
 
 
 
449
450
451
 
472
473
474
 
 
 
 
475
476
477
 
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
@@ -446,20 +446,6 @@
  layout = QVBoxLayout()   self.setLayout(layout)   - tophbox = QHBoxLayout() - layout.addLayout(tophbox) - - # TODO: edit/reload button will be in tab widget - edit = QPushButton(_('Edit File')) - edit.clicked.connect(lambda: self.settingsform.editClicked()) # FIXME - self.editbtn = edit - reload = QPushButton(_('Reload')) - reload.clicked.connect(lambda: self.settingsform.reloadClicked()) # FIXME - self.reloadbtn = reload - tophbox.addStretch() - tophbox.addWidget(edit) - tophbox.addWidget(reload) -   s = QSettings()   self.settings = s   self.restoreGeometry(s.value('settings/geom').toByteArray()) @@ -486,10 +472,6 @@
  self.conftabs.currentChanged.connect(self.refreshtitle)   self.refreshtitle()   - @property - def settingsform(self): # FIXME: temporarily added; remove this later - return self.conftabs.currentWidget() -   def refreshtitle(self, *args):   if self.conftabs.currentIndex() == CONF_REPO:   repo = hg.repository(ui.ui(), self.root) @@ -551,6 +533,19 @@
  layout = QVBoxLayout()   self.setLayout(layout)   + tophbox = QHBoxLayout() + layout.addLayout(tophbox) + + edit = QPushButton(_('Edit File')) + edit.clicked.connect(self.editClicked) + self.editbtn = edit + reload = QPushButton(_('Reload')) + reload.clicked.connect(self.reloadClicked) + self.reloadbtn = reload + tophbox.addStretch() + tophbox.addWidget(edit) + tophbox.addWidget(reload) +   bothbox = QHBoxLayout()   layout.addLayout(bothbox)   pageList = QListWidget()