Changeset 4352

Timestamp:

Mar 9, 2020 4:49:58 PM (4 years ago)

Author:

toby

Message:

expand proxy GUI for more lines

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (1 diff)
• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIpath.py (modified) (2 diffs)

trunk/GSASIIctrlGUI.py

@@ -2446 +2446 @@
     :param str values: default input values, if any
     :param int size: length of the input box in pixels
+    :param bool addRows: if True, users can add rows to the table 
+      (default is False)
+    :param str hlp: if supplied, a help button is added to the dialog that
+      can be used to display the supplied help text in this variable.
     '''
-    def __init__(self,parent,title,prompts,values=[],size=-1):
-        
+    def __init__(self,parent,title,prompts,values=[],size=-1,
+                     addRows=False,hlp=None):
         wx.Dialog.__init__(self,parent,wx.ID_ANY,title, 
                            pos=wx.DefaultPosition,
                            style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
-        self.values = values
-        self.prompts = prompts
+        self.values = list(values)
+        self.prompts = list(prompts)
+        self.addRows = addRows
+        self.size = size
+        self.hlp = hlp
         self.CenterOnParent()
+        self.Paint()
+
+    def Paint(self):
+        if self.GetSizer():
+            self.GetSizer().Clear(True)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
+        if self.hlp:
+            btnsizer = wx.BoxSizer(wx.HORIZONTAL)
+            hlp = HelpButton(self,self.hlp)
+            btnsizer.Add((-1,-1),1, wx.EXPAND, 1)
+            btnsizer.Add(hlp,0,wx.ALIGN_RIGHT|wx.ALL)
+            mainSizer.Add(btnsizer,0,wx.ALIGN_CENTER|wx.EXPAND)
         promptSizer = wx.FlexGridSizer(0,2,5,5)
+        promptSizer.AddGrowableCol(1,1)
         self.Indx = {}
-        for prompt,value in zip(prompts,values):
-            promptSizer.Add(wx.StaticText(self,-1,prompt),0,WACV)
-            valItem = wx.TextCtrl(self,-1,value=value,style=wx.TE_PROCESS_ENTER,size=(size,-1))
+        for prompt,value in zip(self.prompts,self.values):
+            promptSizer.Add(wx.StaticText(self,-1,prompt),0,WACV,0)
+            valItem = wx.TextCtrl(self,-1,value=value,style=wx.TE_PROCESS_ENTER,size=(self.size,-1))
             self.Indx[valItem.GetId()] = prompt
             valItem.Bind(wx.EVT_TEXT,self.newValue)
             promptSizer.Add(valItem,1,WACV|wx.EXPAND,1)
         mainSizer.Add(promptSizer,1,wx.ALL|wx.EXPAND,1)
-        btnsizer = wx.StdDialogButtonSizer()
+        btnsizer = wx.BoxSizer(wx.HORIZONTAL)
         OKbtn = wx.Button(self, wx.ID_OK)
         OKbtn.SetDefault()
-        btnsizer.AddButton(OKbtn)
+        btnsizer.Add((1,1),1,wx.EXPAND,1)
+        btnsizer.Add(OKbtn)
         btn = wx.Button(self, wx.ID_CANCEL)
-        btnsizer.AddButton(btn)
-        btnsizer.Realize()
-        mainSizer.Add(btnsizer,0,wx.ALIGN_CENTER)
+        btnsizer.Add(btn)
+        btnsizer.Add((1,1),1,wx.EXPAND,1)
+        if self.addRows:
+            btn = wx.Button(self, wx.ID_ANY,'+',style=wx.BU_EXACTFIT)
+            btn.Bind(wx.EVT_BUTTON,self.onExpand)
+            btnsizer.Add(btn,0,wx.ALIGN_RIGHT)
+        mainSizer.Add(btnsizer,0,wx.ALIGN_CENTER|wx.EXPAND)
         self.SetSizer(mainSizer)
         self.Fit()
+
+    def onExpand(self,event):
+        self.values.append('')
+        self.prompts.append('item '+str(len(self.values)))
+        self.Paint()
         
     def newValue(self,event):

trunk/GSASIIdataGUI.py

@@ -2124 +2124 @@
         '''
         h,p,e = host,port,etc = GSASIIpath.getsvnProxy()
-        if e:
-            proxyinfo = os.path.join(GSASIIpath.path2GSAS2,"proxyinfo.txt")
-            G2G.G2MessageBox(self,'File {} has manually-'.format(proxyinfo)+
-                'entered information. Please edit this by hand',
-                                 'Unable to edit')
-            return
+        labels = ['Proxy address','proxy port']
+        values = [host,port]
+        i = 1
+        for item in etc:
+            i += 1
+            labels.append('extra svn arg #'+str(i))
+            values.append(item)
+        msg = '''This dialog allows customization of the subversion (svn) 
+        command. If a proxy server is needed, the address/host and port 
+        can be added supplied here. This will generate command-line options 
+
+        --config-option servers:global:http-proxy-host=*host* 
+        --config-option servers:global:http-proxy-port=*port*
+
+        Additional subversion command line options can be supplied here
+        by pressing the '+' button. As examples of options that might be of 
+        value, use two extra lines to add:
+
+        --config-dir
+        DIR
+
+        to specify an alternate configuration location. 
+
+        Or, use four extra lines to add
+
+        --config-option
+        servers:global:http-proxy-username=*account*
+        --config-option
+        servers:global:http-proxy-password=*password*
+
+        to specify a proxy user name and password.
+
+        Note that strings marked *value* are items that will be configured 
+        by the user. See http://svnbook.red-bean.com for more information on
+        subversion. 
+        '''
         dlg = G2G.MultiStringDialog(self,'Enter proxy values',
-                                        ['Proxy address','proxy port'],
-                                        [host,port],size=300)
+                            labels,values,size=300,addRows=True,hlp=msg)
         if dlg.Show():
-            h,p = dlg.GetValues()
+            values = dlg.GetValues()
+            h,p = values[:2]
+            e = values[2:]
         dlg.Destroy()
-        if h != host or p != port:
-            proxyinfo = os.path.join(GSASIIpath.path2GSAS2,"proxyinfo.txt")
-            GSASIIpath.setsvnProxy(h,p)
-            if not h.strip():
-                os.remove(proxyinfo)
+        if h != host or p != port or etc != e:
+            localproxy = proxyinfo = os.path.join(
+                os.path.expanduser('~/.G2local/'),
+                "proxyinfo.txt")
+            if not os.path.exists(proxyinfo):
+                proxyinfo = os.path.join(GSASIIpath.path2GSAS2,"proxyinfo.txt")
+            GSASIIpath.setsvnProxy(h,p,e)
+            if not h.strip() and not e:
+                if os.path.exists(localproxy): os.remove(localproxy)
+                if os.path.exists(proxyinfo): os.remove(proxyinfo)
                 return
             try:
                 fp = open(proxyinfo,'w')
+            except:
+                fp = open(localproxy,'w')
+                proxyinfo = localproxy
+            try:
                 fp.write(h.strip()+'\n')
                 fp.write(p.strip()+'\n')
+                for i in e:
+                    if i.strip():
+                        fp.write(i.strip()+'\n')
                 fp.close()
             except Exception as err:
                 print('Error writing file {}:\n{}'.format(proxyinfo,err))
+            print('File {} written'.format(proxyinfo))
+                
     def _Add_ImportMenu_smallangle(self,parent):
         '''configure the Small Angle Data menus accord to the readers found in _init_Imports

trunk/GSASIIpath.py

@@ -164 +164 @@
     '''Loads a proxy for subversion from the file created by bootstrap.py
     '''
-    proxyinfo = os.path.join(path2GSAS2,"proxyinfo.txt")
-    if os.path.exists(proxyinfo):
-        global proxycmds
-        proxycmds = []
-        fp = open(proxyinfo,'r')
+    global proxycmds
+    proxycmds = []
+    proxyinfo = os.path.join(os.path.expanduser('~/.G2local/'),"proxyinfo.txt")
+    if not os.path.exists(proxyinfo):
+        proxyinfo = os.path.join(path2GSAS2,"proxyinfo.txt")
+    if not os.path.exists(proxyinfo):
+        return '','',''
+    fp = open(proxyinfo,'r')
+    host = fp.readline().strip()
+    # allow file to begin with comments
+    while host.startswith('#'):
         host = fp.readline().strip()
-        # allow file to begin with comments
-        while host.startswith('#'):
-            host = fp.readline().strip()
-        port = fp.readline().strip()
-        etc = []
+    port = fp.readline().strip()
+    etc = []
+    line = fp.readline()
+    while line:
+        etc.append(line.strip())
         line = fp.readline()
-        while line:
-            etc.append(line.strip())
-            line = fp.readline()
-        fp.close()
-        setsvnProxy(host,port,etc)
-        if not host.strip(): return '',''
-        return host,port,etc
-    return '','',''
+    fp.close()
+    setsvnProxy(host,port,etc)
+    return host,port,etc
 
 def setsvnProxy(host,port,etc=[]):
@@ -195 +196 @@
         proxycmds.append('--config-option')
         proxycmds.append('servers:global:http-proxy-host='+host)
-    if port:
-        proxycmds.append('--config-option')
-        proxycmds.append('servers:global:http-proxy-port='+port)
+        if port:
+            proxycmds.append('--config-option')
+            proxycmds.append('servers:global:http-proxy-port='+port)
     for item in etc:
         proxycmds.append(item)