[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 3d303c19df65cfd73ec6e21169456b0bbaddf661

The branch, twofactorauth has been updated via 3d303c19df65cfd73ec6e21169456b0bbaddf661 (commit) from 7dd3213d8dcdd03ed49fe548a1d832ef5634b674 (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: README | 4 +- TODO | 4 +- build-for-reprepro.sh | 2 +- debian/changelog | 10 ++++ debian/control | 2 +- debian/copyright | 4 +- debian/rules | 2 +- man/pyhoca-gui.1 | 2 +- pyhoca-gui | 13 ++--- pyhoca/__init__.py | 4 +- pyhoca/wxgui/__init__.py | 6 +-- pyhoca/wxgui/about.py | 4 +- pyhoca/wxgui/basepath.py | 4 +- pyhoca/wxgui/frontend.py | 4 +- pyhoca/wxgui/logon.py | 4 +- pyhoca/wxgui/menus_taskbar.py | 4 +- pyhoca/wxgui/notify.py | 4 +- pyhoca/wxgui/profilemanager.py | 117 +++++++++++++++++++++++++++++++--------- pyhoca/wxgui/taskbar.py | 4 +- setup.py | 2 +- setup_py2exe.py | 17 ++++++ 21 files changed, 155 insertions(+), 62 deletions(-) The diff of changes is: diff --git a/README b/README index ebe1969..d5a85ec 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -pyhoca-gui - Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> - Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +pyhoca-gui - Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> + Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/TODO b/TODO index 4264fd7..fd85115 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,5 @@ -pyhoca-gui - Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> - Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +pyhoca-gui - Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> + Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/build-for-reprepro.sh b/build-for-reprepro.sh index 5062694..ea4b407 100755 --- a/build-for-reprepro.sh +++ b/build-for-reprepro.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # This programme is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/debian/changelog b/debian/changelog index 235b34d..85f6168 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +pyhoca-gui (0.0.21-0~nwt1) lucid maverick testing unstable; urgency=low + + * added ,,Transfer session'' menu item for running sessions that are not + associated (i.e. running from within PyHoca-GUI) + * now X2goSessionRegistry.update_status() can differentiate between + ,,already running'' sessions (directly after connect) and newly appearing + running sessions while having been connected for quite a while + + -- Mike Gabriel <m.gabriel@das-netzwerkteam.de> Mon, 03 Jan 2011 21:51:00 +0100 + pyhoca-gui (0.0.20-0~nwt1) lucid maverick testing unstable; urgency=low * profile manager: added encoding support for local folder sharing diff --git a/debian/control b/debian/control index 1240cb8..dd81403 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ XS-Python-Version: >= 2.6 Package: pyhoca-gui Architecture: all -Depends: ${misc:Depends}, python, python-x2go (>=0.0.30-0~nwt1), +Depends: ${misc:Depends}, python, python-x2go (>=0.0.31-0~nwt1), python-argparse, python-notify, python-setproctitle (>=1.0.1-1), wx-common(>=2.8.10.0), python-wxtools (>=2.8.10.0) Description: An graphical X2go client written in (wx)Python diff --git a/debian/copyright b/debian/copyright index bbd8562..f4fd8bb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ -pyhoca-gui - Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> - Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +pyhoca-gui - Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> + Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/debian/rules b/debian/rules index f699eca..db6b2c7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debian/rules file - for pyhoca-cli # Based on sample debian/rules file - for GNU Hello (1.3). -# Copyright 2010 by Mike Gabriel +# Copyright 2010-2011 by Mike Gabriel #PYVERS=$(shell pyversions -vr) diff --git a/man/pyhoca-gui.1 b/man/pyhoca-gui.1 index 97cbb07..7a589dc 100644 --- a/man/pyhoca-gui.1 +++ b/man/pyhoca-gui.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH pyhoca-gui 1 "31 Dec 2010" "Version 0.0.20" "X2go Application" +.TH pyhoca-gui 1 "31 Dec 2010" "Version 0.0.21" "X2go Application" .SH NAME pyhoca-gui \- graphical X2go client applet written in Python .SH SYNOPSIS diff --git a/pyhoca-gui b/pyhoca-gui index af40f1b..6fd9030 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -127,12 +127,6 @@ def runtime_error(m, parser=None, exitcode=-1): sys.exit(exitcode) -if check_running(): - sys.stderr.write("\n###############################\n### %s: already running for user %s\n###############################\n" % (PROG_NAME, _CURRENT_LOCAL_USER)) - version() - - - if _X2GOCLIENT_OS == 'Windows': _x = _X2goClientXConfig() _known_xservers = _x.known_xservers @@ -275,6 +269,9 @@ def parseargs(): def main(): args, logger, liblogger = parseargs() + if check_running(): + sys.stderr.write("\n###############################\n### %s: already running for user %s\n###############################\n" % (PROG_NAME, _CURRENT_LOCAL_USER)) + version() try: thisPyHocaGUI = PyHocaGUI(args, logger, liblogger) thisPyHocaGUI.MainLoop() diff --git a/pyhoca/__init__.py b/pyhoca/__init__.py index 373d6dd..e7fc640 100644 --- a/pyhoca/__init__.py +++ b/pyhoca/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index ea8932c..069b422 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.20' +__VERSION__ = '0.0.21' from frontend import * \ No newline at end of file diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index d791e73..2e23ff3 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/basepath.py b/pyhoca/wxgui/basepath.py index 4620518..78c2338 100644 --- a/pyhoca/wxgui/basepath.py +++ b/pyhoca/wxgui/basepath.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 9f0cb1c..8b24520 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index d590f71..d3e35dc 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 3489f7e..f20c1c2 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 16f0329..33e3402 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 78a0f42..2909acc 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -76,6 +76,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): 3: 'WAN', 4: 'LAN', } + self.dropboxactionChoices = { + 'OPEN': 'Open file with system\'s default application', + 'OPENWITH': 'Open application chooser dialog', + 'SAVEAS': 'Save incoming file as ...', + } _compressions = ["4k-jpeg", "32k-jpeg", "64k-jpeg", "256k-jpeg", "2m-jpeg", "16m-jpeg"] self.compressionChoices = {} for _comp in _compressions: @@ -104,19 +109,20 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.tab_Session = wx.Panel(self.X2goTabs, -1) self.tab_Connection = wx.Panel(self.X2goTabs, -1) self.tab_Settings = wx.Panel(self.X2goTabs, -1) - self.tab_SharedFolders = wx.Panel(self.X2goTabs, -1) + self.tab_SharedFilesAndFolders = wx.Panel(self.X2goTabs, -1) # boxes for all tabs self.staticbox_Profile = wx.StaticBox(self.tab_Session, -1, '') self.staticbox_SessionType = wx.StaticBox(self.tab_Session, -1, '') self.staticbox_Server = wx.StaticBox(self.tab_Connection, -1, "Server") - self.staticbox_LinkSpeed = wx.StaticBox(self.tab_Connection, -1, "Connection link speed") + self.staticbox_LinkSpeed = wx.StaticBox(self.tab_Connection, -1, "Connection Link Speed") self.staticbox_Compression = wx.StaticBox(self.tab_Connection, -1, "Compression") self.staticbox_Display = wx.StaticBox(self.tab_Settings, -1, "Display") self.staticbox_Keyboard = wx.StaticBox(self.tab_Settings, -1, "Keyboard") self.staticbox_Sound = wx.StaticBox(self.tab_Settings, -1, "Sound") self.staticbox_Printing = wx.StaticBox(self.tab_Settings, -1, "Printing") - self.staticbox_FolderSharing = wx.StaticBox(self.tab_SharedFolders, -1, "") + self.staticbox_FolderSharing = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, "Folder Exports") + self.staticbox_FileDropbox = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, "File Import") ### ### widgets for the SESSION tab @@ -211,19 +217,25 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SoundPort = wx.SpinCtrl(self.tab_Settings, -1, "4713", min=23, max=64889) self.ClientSidePrinting = wx.CheckBox(self.tab_Settings, -1, "Client Side printing") - self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedFolders, -1, "Use local folder sharing") - self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedFolders, -1, "Path:") - self.SharedFolderPath = wx.TextCtrl(self.tab_SharedFolders, -1, "", style=wx.TE_PROCESS_ENTER) - self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY)) - self.AddSharedFolderPathButton = wx.Button(self.tab_SharedFolders, -1, "Add") - self.SharedFoldersList = wx.ListCtrl(self.tab_SharedFolders, -1, style=wx.LC_LIST|wx.SUNKEN_BORDER|wx.LC_SINGLE_SEL|wx.LC_VRULES) - self.DeleteSharedFolderPathButton = wx.Button(self.tab_SharedFolders, -1, "Delete") - - self.UseEncodingConverter = wx.CheckBox(self.tab_SharedFolders, -1, "Convert between client and server encodings") - self.ClientEncodingLabel = wx.StaticText(self.tab_SharedFolders, -1, "Client encoding:") - self.ClientEncoding = wx.ComboBox(self.tab_SharedFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY) - self.ServerEncodingLabel = wx.StaticText(self.tab_SharedFolders, -1, "Server encoding:") - self.ServerEncoding = wx.ComboBox(self.tab_SharedFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY) + self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, "Use local folder sharing") + self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, "Path:") + self.SharedFolderPath = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER) + self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFilesAndFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY)) + self.AddSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, "Add") + self.SharedFoldersList = wx.ListCtrl(self.tab_SharedFilesAndFolders, -1, style=wx.LC_LIST|wx.SUNKEN_BORDER|wx.LC_SINGLE_SEL|wx.LC_VRULES) + self.DeleteSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, "Delete") + + self.UseFileDropbox = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, "Use file dropbox for local file import") + self.FileDropboxExtensionsLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, "Extensions:") + self.FileDropboxExtensions = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER) + self.FileDropboxActionLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, "Action:") + self.FileDropboxAction = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=self.dropboxactionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) + + self.UseEncodingConverter = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, "Convert between client and server encodings") + self.ClientEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, "Client encoding:") + self.ClientEncoding = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY) + self.ServerEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, "Server encoding:") + self.ServerEncoding = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY) if self.action == 'ADD': self.OKButton = wx.Button(self, -1, "Add") @@ -258,6 +270,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_BUTTON, self.OnOKButton, self.OKButton) self.Bind(wx.EVT_BUTTON, self.OnCancel, self.CancelButton) self.Bind(wx.EVT_BUTTON, self.OnDefault, self.DefaultButton) @@ -340,10 +353,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ClientSidePrinting.SetValue(1) self.SharedFolderPath.SetMinSize((220, _textfield_height)) self.SharedFolderPathBrowseButton.SetSize(self.SharedFolderPathBrowseButton.GetBestSize()) - self.SharedFoldersList.SetMinSize((303, 240)) + self.SharedFoldersList.SetMinSize((303, 180)) + 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.OKButton.SetMinSize((60, 30)) self.CancelButton.SetMinSize((60, 30)) self.DefaultButton.SetMinSize((60, 30)) @@ -560,13 +577,29 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_4_1.Add(sizer_4_1_3, 0, wx.EXPAND, 0) sizer_4_1.Add(sizer_4_1_4, 0, wx.EXPAND, 0) sizer_4_1.Add(sizer_4_1_5, 0, wx.EXPAND, 0) + + sizer_4_2 = wx.StaticBoxSizer(self.staticbox_FileDropbox, wx.VERTICAL) + sizer_4_2_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_4_2_1.Add(self.UseFileDropbox, 0, 0, 0) + sizer_4_2_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_4_2_2.Add(self.FileDropboxExtensionsLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0) + sizer_4_2_2.Add((8,0)) + sizer_4_2_2.Add(self.FileDropboxExtensions, 0, 0, 0) + sizer_4_2_2.Add((16,0)) + sizer_4_2_2.Add(self.FileDropboxActionLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0) + sizer_4_2_2.Add((8,0)) + sizer_4_2_2.Add(self.FileDropboxAction, 0, 0, 0) + sizer_4_2.Add(sizer_4_2_1, 0, wx.EXPAND, 0) + sizer_4_2.Add(sizer_4_2_2, 0, wx.EXPAND, 0) + sizer_4.Add(sizer_4_1, 0, wx.EXPAND, 0) - self.tab_SharedFolders.SetSizer(sizer_4) + sizer_4.Add(sizer_4_2, 1, wx.EXPAND, 0) + self.tab_SharedFilesAndFolders.SetSizer(sizer_4) self.X2goTabs.AddPage(self.tab_Session, "Session Profile") self.X2goTabs.AddPage(self.tab_Connection, "Connection") self.X2goTabs.AddPage(self.tab_Settings, "Settings") - self.X2goTabs.AddPage(self.tab_SharedFolders, "Shared Folders") + self.X2goTabs.AddPage(self.tab_SharedFilesAndFolders, "Sharing") # the bottom area with OK, Defaults and Cancel buttons sizer_B = wx.BoxSizer(wx.HORIZONTAL) @@ -786,6 +819,14 @@ 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']]) + else: + self.FileDropboxAction.SetValue(self.dropboxactionChoices['OPEN']) + self._toggle_useFileDropbox() + self.disable_EditConnected_options() def disable_EditConnected_options(self): @@ -820,7 +861,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyTunnelBetweenLabel.Enable(False) self.SSHProxyTunnelToHost.Enable(False) self.SSHProxyTunnelToPort.Enable(False) - self.tab_SharedFolders.Enable(False) + self.tab_SharedFilesAndFolders.Enable(False) def __update_from_screen(self): self.profile_config['name'] = self.ProfileName.GetValue() @@ -899,6 +940,19 @@ 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() + _extensions = _extensions.replace(' ', ',').replace(';', ',') + _normalized_exts = [] + for _ext in _extensions.split(','): + _ext = _ext.upper() + _ext = _ext.lstrip().lstrip('.').rstrip() + if _ext: + _normalized_exts.append(_ext) + self.profile_config['dropboxextensions'] = ','.join(_normalized_exts) + _dropbox_action = [ a for a in self.dropboxactionChoices.keys() if self.dropboxactionChoices[a] == self.FileDropboxAction.GetValue() ][0] + self.profile_config['dropboxaction'] = _dropbox_action + def OnIconChange(self, event): _share_location = os.path.split(_icons_location)[0] iconsdir = _icons_location @@ -939,7 +993,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ImageQualityLabel.Enable(False) self.ImageQuality.Enable(False) self.tab_Settings.Enable(False) - self.tab_SharedFolders.Enable(False) + self.tab_SharedFilesAndFolders.Enable(False) def disable_DirectRDP(self): @@ -962,7 +1016,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ImageQualityLabel.Enable(True) self.ImageQuality.Enable(True) self.tab_Settings.Enable(True) - self.tab_SharedFolders.Enable(True) + self.tab_SharedFilesAndFolders.Enable(True) def OnSessionTypeSelected(self, event): _session_type = [ i for i in self.sessionChoices.keys() if self.sessionChoices[i] == self.SessionType.GetValue() ][0] @@ -1201,6 +1255,21 @@ 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) + else: + self.FileDropboxExtensionsLabel.Enable(False) + self.FileDropboxExtensions.Enable(False) + self.FileDropboxActionLabel.Enable(False) + self.FileDropboxAction.Enable(False) + + def OnToggleFileDropbox(self, event): + self._toggle_useFileDropbox() + def __validate(self): validateOk = True if len(self.profile_config['name'].strip()) == 0: diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index db1e595..fb24bf3 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca GUI is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/setup.py b/setup.py index debbc0f..ee7f21c 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> # # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/setup_py2exe.py b/setup_py2exe.py index 45dcd46..cbd1ac0 100644 --- a/setup_py2exe.py +++ b/setup_py2exe.py @@ -1,5 +1,22 @@ #!/usr/bin/python +# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> +# +# PyHoca is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PyHoca is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + # # run on Windows with: ,,python setup_py2exe.py py2exe -p greenlet'' # 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)).