Changeset 3075 for trunk/GSASIIdataGUI.py

Timestamp:

Sep 13, 2017 4:13:06 PM (4 years ago)

Author:

toby

Message:

Allow editing of proxy info

File:

• trunk/GSASIIdataGUI.py (modified) (4 diffs)

trunk/GSASIIdataGUI.py

@@ -126 +126 @@
 #### class definitions used for main GUI
 ################################################################################
-
                
 class MergeDialog(wx.Dialog):
@@ -457 +456 @@
         item = parent.Append(wx.ID_PREFERENCES, text = "&Preferences")
         self.Bind(wx.EVT_MENU, self.OnPreferences, item)
+        if GSASIIpath.whichsvn():
+            item = parent.Append(
+                help='Edit proxy internet information (used for updates)', id=wx.ID_ANY,
+                kind=wx.ITEM_NORMAL,text='Edit proxy...')
+            self.Bind(wx.EVT_MENU, self.EditProxyInfo, id=item.GetId())
         if GSASIIpath.GetConfigValue('debug'):
             def OnIPython(event):
@@ -462 +466 @@
             item = parent.Append(wx.ID_ANY, text = "IPython Console")
             self.Bind(wx.EVT_MENU, OnIPython, item)
+            def OnwxInspect(event):
+                import wx.lib.inspection as wxeye
+                wxeye.InspectionTool().Show()
+            item = parent.Append(wx.ID_ANY, text = "wx inspection tool")
+            self.Bind(wx.EVT_MENU, OnwxInspect, item)
+            
         item = parent.Append(
             help='Exit from GSAS-II', id=wx.ID_ANY,
@@ -1962 +1972 @@
         dlg.Destroy()
 
+    def EditProxyInfo(self,event):
+        '''Edit the proxy information used by subversion
+        '''
+        h,p = host,port = GSASIIpath.getsvnProxy()
+        dlg = G2G.MultiStringDialog(self,'Enter proxy values',
+                                        ['Proxy address','proxy port'],
+                                        [host,port],size=300)
+        #dlg.SetSize((300,-1))
+        if dlg.Show():
+            h,p = dlg.GetValues()
+        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)
+                return
+            try:
+                fp = open(proxyinfo,'w')
+                fp.write(h.strip()+'\n')
+                fp.write(p.strip()+'\n')
+                fp.close()
+            except Exception as err:
+                print('Error writing file {}:\n{}'.format(proxyinfo,err))
     def _Add_ImportMenu_smallangle(self,parent):
         '''configure the Small Angle Data menus accord to the readers found in _init_Imports