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

settings: use qtlib.geticon()

Changeset 74383c40fa36…

Parent e6d11086aee9…

by Yuya Nishihara

Changes to one file · Browse files at 74383c40fa36 Showing diff from parent e6d11086aee9 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
175
176
177
178
 
179
180
181
 
217
218
219
220
 
221
222
223
 
251
252
253
254
 
255
256
257
 
284
285
286
287
 
288
289
290
 
458
459
460
461
 
462
463
464
465
466
467
468
 
469
470
471
 
568
569
570
571
572
573
574
 
575
576
 
577
578
579
 
175
176
177
 
178
179
180
181
 
217
218
219
 
220
221
222
223
 
251
252
253
 
254
255
256
257
 
284
285
286
 
287
288
289
290
 
458
459
460
 
461
462
463
464
465
466
467
 
468
469
470
471
 
568
569
570
 
571
 
 
572
573
574
575
576
577
578
@@ -175,7 +175,7 @@
  return hglib.mergetools(ui.ui())    INFO = ( -({'name': 'general', 'label': 'TortoiseHg', 'icon': 'thg_logo.ico'}, ( +({'name': 'general', 'label': 'TortoiseHg', 'icon': 'thg_logo'}, (   (_('Three-way Merge Tool'), 'ui.merge',   (genDeferredCombo, findMergeTools),   _('Graphical merge program for resolving merge conflicts. If left' @@ -217,7 +217,7 @@
  ' instead of just the root directory name. Default: False')),   )),   -({'name': 'log', 'label': _('Workbench'), 'icon': 'menulog.ico'}, ( +({'name': 'log', 'label': _('Workbench'), 'icon': 'menulog'}, (   (_('Author Coloring'), 'tortoisehg.authorcolor', genBoolCombo,   _('Color changesets by author name. If not enabled,'   ' the changes are colored green for merge, red for' @@ -251,7 +251,7 @@
  _('Show changeset details with an expander')),   )),   -({'name': 'commit', 'label': _('Commit'), 'icon': 'menucommit.ico'}, ( +({'name': 'commit', 'label': _('Commit'), 'icon': 'menucommit'}, (   (_('Username'), 'ui.username', genEditCombo,   _('Name associated with commits. The common format is\n'   '"Full Name <email.com>"')), @@ -284,7 +284,7 @@
  ' Default: False')),   )),   -({'name': 'web', 'label': _('Web Server'), 'icon': 'proxy.ico'}, ( +({'name': 'web', 'label': _('Web Server'), 'icon': 'proxy'}, (   (_('Name'), 'web.name', genEditCombo,   _('Repository name to use in the web interface.'   ' Default is the working directory.')), @@ -458,14 +458,14 @@
  layout.addWidget(self.conftabs)   self.conftabs.addTab(SettingsForm(rcpath=util.user_rcpath(),   focus=focus, readonly=self.readonly), - QIcon(paths.get_tortoise_icon('settings_user.ico')), + qtlib.geticon('settings_user'),   _("%s's global settings") % username())   if repo:   reporcpath = os.sep.join([repo.root, '.hg', 'hgrc'])   reponame = hglib.tounicode(os.path.basename(repo.root))   self.conftabs.addTab(SettingsForm(rcpath=reporcpath,   focus=focus, readonly=self.readonly), - QIcon(paths.get_tortoise_icon('settings_repo.ico')), + qtlib.geticon('settings_repo'),   _('%s repository settings') % reponame)     BB = QDialogButtonBox @@ -568,12 +568,11 @@
    # add page items to treeview   for meta, info in INFO: - icon = QIcon()   if isinstance(meta['icon'], str): - iconfile = paths.get_tortoise_icon(meta['icon']) - icon.addPixmap(QPixmap(iconfile), QIcon.Normal, QIcon.Off) + icon = qtlib.geticon(meta['icon'])   else:   style = QApplication.style() + icon = QIcon()   icon.addPixmap(style.standardPixmap(meta['icon']))   item = QListWidgetItem(icon, meta['label'])   pageList.addItem(item)