Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

settings: dynamically create settings pages as needed intead of in constructor

Changeset f889aa9fd7c7…

Parent ceb6119bdfa4…

by Lloyd Markle

Changes to one file · Browse files at f889aa9fd7c7 Showing diff from parent ceb6119bdfa4 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
824
825
826
827
 
828
829
830
 
847
848
849
850
851
852
853
854
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
855
856
857
 
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
906
907
908
 
997
998
999
1000
1001
1002
1003
1004
 
1005
1006
1007
1008
1009
1010
 
1011
1012
1013
 
824
825
826
 
827
828
829
830
 
847
848
849
 
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
 
888
889
890
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
 
1016
1017
1018
 
 
 
 
 
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
@@ -824,7 +824,7 @@
  stack = QStackedWidget()   bothbox.addWidget(pageList, 0)   bothbox.addWidget(stack, 1) - pageList.currentRowChanged.connect(stack.setCurrentIndex) + pageList.currentRowChanged.connect(self.activatePage)     self.pages = {}   self.stack = stack @@ -847,11 +847,26 @@
  icon.addPixmap(style.standardPixmap(meta['icon']))   item = QListWidgetItem(icon, meta['label'])   pageList.addItem(item) - self.addPage(meta['name'])     self.refresh()   self.focusField(focus or 'ui.merge')   + def activatePage(self, index): + item = self.pageList.currentItem() + for data in INFO: + if item.text() == data[0]['label']: + meta, info = data + break + + pagename = meta['name'] + if self.pages.has_key(pagename): + page = self.pages[pagename] + else: + page = self.createPage(pagename, info) + self.refreshPage(page) + frame = page[2][0].parentWidget() + self.stack.setCurrentWidget(frame) +   def editClicked(self):   'Open internal editor in stacked widget'   if self.isDirty(): @@ -873,36 +888,40 @@
  and os.access(self.fn, os.W_OK))   self.stack.setDisabled(self.readonly)   self.fnedit.setText(hglib.tounicode(self.fn)) - for name, info, widgets in self.pages.values(): - if name == 'extensions': - extsmentioned = False - for row, w in enumerate(widgets): - key = w.opts['label'] - for fullkey in (key, 'hgext.%s' % key, 'hgext/%s' % key): - val = self.readCPath('extensions.' + fullkey) - if val != None: - break - if val == None: - curvalue = False - elif len(val) and val[0] == '!': - curvalue = False - extsmentioned = True - else: - curvalue = True - extsmentioned = True - w.setValue(curvalue) - if val == None: - w.opts['cpath'] = 'extensions.' + key - else: - w.opts['cpath'] = 'extensions.' + fullkey - if not extsmentioned: - # make sure widgets are shown properly, - # even when no extensions mentioned in the config file - self.validateextensions() - else: - for row, e in enumerate(info): - curvalue = self.readCPath(e.cpath) - widgets[row].setValue(curvalue) + for page in self.pages.values(): + self.refreshPage(page) + + def refreshPage(self, page): + name, info, widgets = page + if name == 'extensions': + extsmentioned = False + for row, w in enumerate(widgets): + key = w.opts['label'] + for fullkey in (key, 'hgext.%s' % key, 'hgext/%s' % key): + val = self.readCPath('extensions.' + fullkey) + if val != None: + break + if val == None: + curvalue = False + elif len(val) and val[0] == '!': + curvalue = False + extsmentioned = True + else: + curvalue = True + extsmentioned = True + w.setValue(curvalue) + if val == None: + w.opts['cpath'] = 'extensions.' + key + else: + w.opts['cpath'] = 'extensions.' + fullkey + if not extsmentioned: + # make sure widgets are shown properly, + # even when no extensions mentioned in the config file + self.validateextensions() + else: + for row, e in enumerate(info): + curvalue = self.readCPath(e.cpath) + widgets[row].setValue(curvalue)     def isDirty(self):   if self.readonly: @@ -997,17 +1016,14 @@
  return True # tooltip is shown in self.desctext   return False   - def addPage(self, name): - for data in INFO: - if name == data[0]['name']: - meta, info = data - break + def createPage(self, name, info):   if name == 'extensions':   extsinfo, widgets = self.fillExtensionsFrame()   self.pages[name] = name, extsinfo, widgets   else:   widgets = self.fillFrame(info)   self.pages[name] = name, info, widgets + return self.pages[name]     def readCPath(self, cpath):   'Retrieve a value from the parsed config file'