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

status: make a standalone dialog

Changeset 120ceb4fe6ed…

Parent b729a645cf1e…

by Steve Borho

Changes to 2 files · Browse files at 120ceb4fe6ed Showing diff from parent b729a645cf1e Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
352
353
354
 
 
 
 
 
355
356
357
 
358
359
360
 
653
654
655
 
 
 
 
 
656
657
658
 
352
353
354
355
356
357
358
359
360
361
 
362
363
364
365
 
658
659
660
661
662
663
664
665
666
667
668
@@ -352,9 +352,14 @@
  from tortoisehg.hgqt.hgemail import run   qtrun(run, ui, *pats, **opts)   +def status(ui, *pats, **opts): + """browse working copy status""" + from tortoisehg.hgqt.status import run + qtrun(run, ui, *pats, **opts) +  def test(ui, *pats, **opts):   """test arbitrary widgets""" - from tortoisehg.hgqt.status import run + from tortoisehg.hgqt.chunkselect import run   qtrun(run, ui, *pats, **opts)    def bug(ui, *pats, **opts): @@ -653,6 +658,11 @@
  "remove|rm": (revert, [], _('thg remove [FILE]...')),   "revert": (revert, [], _('thg revert [FILE]...')),   "forget": (forget, [], _('thg forget [FILE]...')), + "status": (status, + [('c', 'clean', False, _('show files without changes')), + ('u', 'unknown', False, _('show unknown (not tracked) files')), + ('i', 'ignored', False, _('show ignored files'))], + _('thg status [OPTIONS] [FILE]')),   "test": (test, [], _('thg test')),   "help": (help_, [], _('thg help [COMMAND]')),   "^update|checkout|co":
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
13
14
15
16
 
17
18
19
20
 
21
22
23
 
591
592
593
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
594
595
 
 
13
14
15
 
16
17
18
19
 
20
21
22
23
 
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
 
623
@@ -13,11 +13,11 @@
 from tortoisehg.util.i18n import _    from PyQt4.QtCore import Qt, QVariant, SIGNAL, SLOT, QAbstractTableModel -from PyQt4.QtCore import QObject, QEvent, QMimeData, QUrl, QString +from PyQt4.QtCore import QObject, QEvent, QMimeData, QUrl, QString, QSettings  from PyQt4.QtGui import QWidget, QVBoxLayout, QSplitter, QTreeView, QLineEdit  from PyQt4.QtGui import QTextEdit, QFont, QColor, QDrag  from PyQt4.QtGui import QFrame, QHBoxLayout, QLabel, QPushButton, QMenu -from PyQt4.QtGui import QIcon, QPixmap, QToolButton +from PyQt4.QtGui import QIcon, QPixmap, QToolButton, QDialog    # This widget can be used as the basis of the commit tool or any other  # working copy browser. @@ -591,5 +591,33 @@
  'status.subrepo'),  }   +class StatusDialog(QDialog): + 'Standalone status browser' + def __init__(self, pats, opts, parent=None): + QDialog.__init__(self, parent) + layout = QVBoxLayout() + layout.setMargin(0) + self.setLayout(layout) + self.stwidget = StatusWidget(pats, opts, self) + layout.addWidget(self.stwidget) + s = QSettings() + self.stwidget.restoreState(s.value('status/state').toByteArray()) + self.restoreGeometry(s.value('status/geom').toByteArray()) + + repo = hg.repository(ui.ui(), path=paths.find_root()) + self.setWindowTitle('%s - status' % hglib.get_reponame(repo)) + + def accept(self): + s = QSettings() + s.setValue('status/state', self.stwidget.saveState()) + s.setValue('status/geom', self.saveGeometry()) + QDialog.accept(self) + + def reject(self): + s = QSettings() + s.setValue('status/state', self.stwidget.saveState()) + s.setValue('status/geom', self.saveGeometry()) + QDialog.reject(self) +  def run(ui, *pats, **opts): - return StatusWidget(pats, opts) + return StatusDialog(pats, opts)