Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable icons: Set proper icons for the grep, settings, sync, status and quickop dialogs

Changeset 52a297e02768…

Parent 167cdab90783…

by Angel Ezquerra

Changes to 9 files · Browse files at 52a297e02768 Showing diff from parent 167cdab90783 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​grep.py Stacked
 
30
31
32
33
 
 
34
35
36
 
30
31
32
 
33
34
35
36
37
@@ -30,7 +30,8 @@
  QWidget.__init__(self, parent)     self.thread = None - + self.setWindowIcon(qtlib.geticon('view-filter')) +   mainvbox = QVBoxLayout()   mainvbox.setSpacing(6)   self.setLayout(mainvbox)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​guess.py Stacked
 
33
34
35
 
36
37
38
 
33
34
35
36
37
38
39
@@ -33,6 +33,7 @@
  self.thread = None     self.setWindowTitle(_('Detect Copies/Renames in %s') % repo.displayname) + self.setWindowIcon(qtlib.geticon('detect_rename'))   f = self.windowFlags()   self.setWindowFlags(f & ~Qt.WindowContextHelpButtonHint)  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​hgignore.py Stacked
 
34
35
36
 
37
38
39
 
34
35
36
37
38
39
40
@@ -34,6 +34,7 @@
  self.repo = repo   self.pats = pats   self.setWindowTitle(_('Ignore filter - %s') % repo.displayname) + self.setWindowIcon(qtlib.geticon('ignore'))     vbox = QVBoxLayout()   self.setLayout(vbox)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​quickop.py Stacked
 
21
22
23
 
 
 
 
 
24
25
26
 
37
38
39
40
 
 
41
42
43
 
21
22
23
24
25
26
27
28
29
30
31
 
42
43
44
 
45
46
47
48
49
@@ -21,6 +21,11 @@
  'revert': (_('Checkmark files to revert'), _('Revert')),   'remove': (_('Checkmark files to remove'), _('Remove')),}   +ICONS = { 'add': 'add', + 'forget': 'remove', + 'revert': 'hg-revert', + 'remove': 'remove',} +  class QuickOpDialog(QDialog):   """ Dialog for performing quick dirstate operations """   def __init__(self, repo, command, pats, parent): @@ -37,7 +42,8 @@
  self.command = command     self.setWindowTitle('%s - hg %s' % (repo.displayname, command)) - + self.setWindowIcon(qtlib.geticon(ICONS[command])) +   layout = QVBoxLayout()   layout.setContentsMargins(2, 2, 2, 2)   layout.setMargin(0)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
571
572
573
 
574
575
576
 
571
572
573
574
575
576
577
@@ -571,6 +571,7 @@
  QDialog.__init__(self, parent)   self.setWindowTitle(_('TortoiseHg Settings'))   self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint) + self.setWindowIcon(qtlib.geticon('settings_repo'))     if not hasattr(wconfig.config(), 'write'):   qtlib.ErrorMsgBox(_('Iniparse package not found'),
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​shellconf.py Stacked
 
8
9
10
 
11
12
13
 
187
188
189
 
190
191
192
 
8
9
10
11
12
13
14
 
188
189
190
191
192
193
194
@@ -8,6 +8,7 @@
   import sys   +from tortoisehg.hgqt import qtlib  from tortoisehg.hgqt.i18n import _  from tortoisehg.util import menuthg, hglib   @@ -187,6 +188,7 @@
    self.setLayout(layout)   self.setWindowTitle(_("TortoiseHg Shell Configuration")) + self.setWindowIcon(qtlib.geticon('settings_repo'))     self.load_shell_configs()  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
682
683
684
 
685
686
687
 
682
683
684
685
686
687
688
@@ -682,6 +682,7 @@
  'Standalone status browser'   def __init__(self, pats, opts, root=None, parent=None):   QDialog.__init__(self, parent) + self.setWindowIcon(qtlib.geticon('hg-status'))   layout = QVBoxLayout()   layout.setContentsMargins(0, 6, 0, 0)   self.setLayout(layout)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
80
81
82
 
83
84
85
 
80
81
82
83
84
85
86
@@ -80,6 +80,7 @@
  layout.setContentsMargins(2, 2, 2, 2)   else:   self.setWindowTitle(_('TortoiseHg Sync')) + self.setWindowIcon(qtlib.geticon('sync'))   self.resize(850, 550)     tb = QToolBar(self)
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​shellconf.py Stacked
 
23
24
25
 
26
27
28
 
23
24
25
26
27
28
29
@@ -23,6 +23,7 @@
    self.set_default_size(400, -1)   self.set_title(_('TortoiseHg Shell Configuration')) + self.setWindowIcon(qtlib.geticon('detect_rename'))     okay = gtk.Button(_('OK'))   cancel = gtk.Button(_('Cancel'))