[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.0.33.0-3-geb0b2aa

X2Go dev team git-admin at x2go.org
Tue Aug 27 13:21:28 CEST 2013


The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  eb0b2aa4b6211b0d1744cd029cda630ef360e032 (commit)
      from  1ff01386aa4a18a7fbceb5c2b1330bc419275789 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 pyhoca/wxgui/profilemanager.py |   80 ++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index d032ccd..95d0e7b 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -88,7 +88,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             'esd': 16001,
             'pulse': 4713,
         }
-        self.dropboxactionChoices = {
+        self.mimeboxactionChoices = {
             'OPEN': _(u'Open file with system\'s default application'),
             'OPENWITH': _(u'Open application chooser dialog'),
             'SAVEAS': _(u'Save incoming file as ...'),
@@ -132,7 +132,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.staticbox_Sound = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Sound"))
         self.staticbox_Printing = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Printing"))
         self.staticbox_FolderSharing = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, ' %s ' % _(u"Folder Exports"))
-        self.staticbox_FileDropbox = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, ' %s ' % _(u"File Import"))
+        self.staticbox_FileMIMEbox = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, ' %s ' % _(u"File Import"))
 
         ###
         ### widgets for the SESSION tab
@@ -246,11 +246,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.ServerEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Server encoding")+':')
         self.ServerEncoding = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY)
 
-        self.UseFileDropbox = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use file dropbox for local file import"))
-        self.FileDropboxExtensionsLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Extensions")+':')
-        self.FileDropboxExtensions = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER)
-        self.FileDropboxActionLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Action")+':')
-        self.FileDropboxAction = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=self.dropboxactionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY)
+        self.UseFileMIMEbox = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use file MIME box for local file import"))
+        self.FileMIMEboxExtensionsLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Extensions")+':')
+        self.FileMIMEboxExtensions = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER)
+        self.FileMIMEboxActionLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Action")+':')
+        self.FileMIMEboxAction = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=self.mimeboxactionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY)
 
         if self.action == 'ADD':
             self.OKButton = wx.Button(self, -1, _(u"Add"))
@@ -287,7 +287,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.Bind(wx.EVT_TEXT_ENTER, self.OnAddSharedFolderPath, self.SharedFolderPath)
         self.Bind(wx.EVT_CHECKBOX, self.OnToggleEncodingConverter, self.UseEncodingConverter)
         self.Bind(wx.EVT_CHECKBOX, self.OnToggleLocalFolderSharing, self.UseLocalFolderSharing)
-        self.Bind(wx.EVT_CHECKBOX, self.OnToggleFileDropbox, self.UseFileDropbox)
+        self.Bind(wx.EVT_CHECKBOX, self.OnToggleFileMIMEbox, self.UseFileMIMEbox)
         self.Bind(wx.EVT_BUTTON, self.OnOKButton, self.OKButton)
         self.Bind(wx.EVT_BUTTON, self.OnCancel, self.CancelButton)
         self.Bind(wx.EVT_BUTTON, self.OnDefault, self.DefaultButton)
@@ -376,8 +376,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.ClientEncoding.SetMinSize((140, _textfield_height))
         self.ServerEncoding.SetMinSize((140, _textfield_height))
 
-        self.FileDropboxExtensions.SetMinSize((140, _textfield_height))
-        self.FileDropboxAction.SetMinSize((180, _textfield_height))
+        self.FileMIMEboxExtensions.SetMinSize((140, _textfield_height))
+        self.FileMIMEboxAction.SetMinSize((180, _textfield_height))
 
         self.OKButton.SetMinSize((-1, 30))
         self.CancelButton.SetMinSize((-1, 30))
@@ -618,18 +618,18 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         sizer_4_1.Add(sizer_4_1_1, flag=wx.EXPAND|wx.ALL, border=7)
         sizer_4_1.Add(sizer_4_1_2, flag=wx.EXPAND|wx.ALL, border=7)
 
-        sizer_4_2 = wx.StaticBoxSizer(self.staticbox_FileDropbox, wx.VERTICAL)
+        sizer_4_2 = wx.StaticBoxSizer(self.staticbox_FileMIMEbox, wx.VERTICAL)
         sizer_4_2_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_4_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4_2_1_1.Add(self.UseFileDropbox, flag=wx.BOTTOM, border=5)
+        sizer_4_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5)
         sizer_4_2_1_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4_2_1_2.Add(self.FileDropboxExtensionsLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_4_2_1_2.Add(self.FileMIMEboxExtensionsLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_4_2_1_2.Add((8,0))
-        sizer_4_2_1_2.Add(self.FileDropboxExtensions)
+        sizer_4_2_1_2.Add(self.FileMIMEboxExtensions)
         sizer_4_2_1_2.Add((16,0))
-        sizer_4_2_1_2.Add(self.FileDropboxActionLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_4_2_1_2.Add(self.FileMIMEboxActionLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_4_2_1_2.Add((8,0))
-        sizer_4_2_1_2.Add(self.FileDropboxAction)
+        sizer_4_2_1_2.Add(self.FileMIMEboxAction)
         sizer_4_2_1.Add(sizer_4_2_1_1, flag=wx.EXPAND)
         sizer_4_2_1.Add(sizer_4_2_1_2, flag=wx.EXPAND)
         sizer_4_2.Add(sizer_4_2_1, flag=wx.EXPAND|wx.ALL, border=7)
@@ -864,13 +864,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.ServerEncoding.SetValue(self.profile_config['iconvto'])
         self._toggle_useEncodingConverter()
 
-        self.UseFileDropbox.SetValue(self.profile_config['usedropbox'])
-        self.FileDropboxExtensions.SetValue(self.profile_config['dropboxextensions'])
-        if self.profile_config['dropboxaction'] in self.dropboxactionChoices.keys():
-            self.FileDropboxAction.SetValue(self.dropboxactionChoices[self.profile_config['dropboxaction']])
+        self.UseFileMIMEbox.SetValue(self.profile_config['usemimebox'])
+        self.FileMIMEboxExtensions.SetValue(self.profile_config['mimeboxextensions'])
+        if self.profile_config['mimeboxaction'] in self.mimeboxactionChoices.keys():
+            self.FileMIMEboxAction.SetValue(self.mimeboxactionChoices[self.profile_config['mimeboxaction']])
         else:
-            self.FileDropboxAction.SetValue(self.dropboxactionChoices['OPEN'])
-        self._toggle_useFileDropbox()
+            self.FileMIMEboxAction.SetValue(self.mimeboxactionChoices['OPEN'])
+        self._toggle_useFileMIMEbox()
 
         self.disable_EditConnected_options()
 
@@ -985,8 +985,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.profile_config['iconvfrom'] = self.ClientEncoding.GetValue()
         self.profile_config['iconvto'] = self.ServerEncoding.GetValue()
 
-        self.profile_config['usedropbox'] = self.UseFileDropbox.GetValue()
-        _extensions = self.FileDropboxExtensions.GetValue()
+        self.profile_config['usemimebox'] = self.UseFileMIMEbox.GetValue()
+        _extensions = self.FileMIMEboxExtensions.GetValue()
         _extensions = _extensions.replace(' ', ',').replace(';', ',')
         _normalized_exts = []
         for _ext in _extensions.split(','):
@@ -994,12 +994,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             _ext = _ext.lstrip().lstrip('.').rstrip()
             if _ext:
                 _normalized_exts.append(_ext)
-        self.profile_config['dropboxextensions'] = ','.join(_normalized_exts)
+        self.profile_config['mimeboxextensions'] = ','.join(_normalized_exts)
         try:
-            _dropbox_action = [ a for a in self.dropboxactionChoices.keys() if self.dropboxactionChoices[a] == self.FileDropboxAction.GetValue() ][0]
+            _mimebox_action = [ a for a in self.mimeboxactionChoices.keys() if self.mimeboxactionChoices[a] == self.FileMIMEboxAction.GetValue() ][0]
         except IndexError:
-            _dropbox_action = 'OPEN'
-        self.profile_config['dropboxaction'] = _dropbox_action
+            _mimebox_action = 'OPEN'
+        self.profile_config['mimeboxaction'] = _mimebox_action
 
     def OnIconChange(self, event):
         _share_location = os.path.split(_icons_location)[0]
@@ -1314,20 +1314,20 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
     def OnToggleEncodingConverter(self, event):
         self._toggle_useEncodingConverter()
 
-    def _toggle_useFileDropbox(self):
-        if self.UseFileDropbox.GetValue():
-            self.FileDropboxExtensionsLabel.Enable(True)
-            self.FileDropboxExtensions.Enable(True)
-            self.FileDropboxActionLabel.Enable(True)
-            self.FileDropboxAction.Enable(True)
+    def _toggle_useFileMIMEbox(self):
+        if self.UseFileMIMEbox.GetValue():
+            self.FileMIMEboxExtensionsLabel.Enable(True)
+            self.FileMIMEboxExtensions.Enable(True)
+            self.FileMIMEboxActionLabel.Enable(True)
+            self.FileMIMEboxAction.Enable(True)
         else:
-            self.FileDropboxExtensionsLabel.Enable(False)
-            self.FileDropboxExtensions.Enable(False)
-            self.FileDropboxActionLabel.Enable(False)
-            self.FileDropboxAction.Enable(False)
+            self.FileMIMEboxExtensionsLabel.Enable(False)
+            self.FileMIMEboxExtensions.Enable(False)
+            self.FileMIMEboxActionLabel.Enable(False)
+            self.FileMIMEboxAction.Enable(False)
 
-    def OnToggleFileDropbox(self, event):
-        self._toggle_useFileDropbox()
+    def OnToggleFileMIMEbox(self, event):
+        self._toggle_useFileMIMEbox()
 
     def __validate(self):
         validateOk = True


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).




More information about the x2go-commits mailing list