gitso

gitso Commit Details


Date:2009-08-16 19:55:15 (15 years 4 months ago)
Author:gerberad
Branch:master
Commit:97a1a73dd22356e781fc4f1c986a2ed7a44add6f
Parents: 3a7c15a928b922d25f269d338e1cf86154800bf5
Message:/trunk/AboutWindow.py Updated copyright info for Windows version and added Troy as a contributor

/trunk/Processes.py
Updated the way linux processes are killed, because there's no way to find the correct one, so I kill them all.

/trunk/arch/win32/msvcr71_README.txt
/trunk/makegitso.nsi
Added readme for MSVCR711.dll

/trunk/arch/linux/control
Reverted to the use of vncviewer, not vnc4viewer. vnc4viewer, doesn't change the background back, it crashes Gitso and doesn't support the same commandline arguments.

/trunk/ConnectionWindow.py
Added the timing (sleep for small bits) back in and cleaned up the killPID() parameters.
Changes:

File differences

gitso/trunk/AboutWindow.py
3030
3131
3232
33
34
33
34
3535
3636
3737
......
4747
4848
4949
50
51
52
53
54
55
56
5057
5158
5259
␉␉wx.Panel.__init__(self, parent)␊
␊
␉␉infostring = "Authors:" + "\n\tAaron Gerber\n\tDerek Buranen"␊
␉␉infostring = infostring + "\n\nContributors:" + "\n\tNick Verbeck"␊
␉␉infostring = infostring + "\n\nCopyright (C) 2007 - 2008 by Aaron Gerber and Derek Buranen"␊
␉␉infostring = infostring + "\n\nContributors:" + "\n\tNick Verbeck" + "\n\tTroy Frew"␊
␉␉infostring = infostring + "\n\nCopyright (C) 2007 - 2009 by Aaron Gerber and Derek Buranen"␊
␉␉if sys.platform == "darwin":␊
␉␉␉infostring = infostring + "\n\n+++++++++++++++++++++++"␊
␉␉␉infostring = infostring + "\nChicken Of The VNC:"␊
␉␊
␉␉␉infostring = infostring + "\n\nechoWare:"␊
␉␉␉infostring = infostring + "\n\tCopyright (C) 2004-2007 Echogent Systems, Inc"␊
␉␉elif sys.platform == "win32":␊
␉␉␉infostring = infostring + "\n\n+++++++++++++++++++++++"␊
␉␉␉infostring = infostring + "\nTightVNC && VNCviewer:"␊
␉␉␉infostring = infostring + "\n\tCopyright (C) 1999 AT&T Laboratories Cambridge."␊
␊
␉␉␉infostring = infostring + "\n\nVNCHooks:"␊
␉␉␉infostring = infostring + "\n\tCopyright (C) 2000-2007 TightVNC Group"␊
␊
␉␉info = wx.TextCtrl(self, -1, infostring, style=wx.TE_MULTILINE | wx.ST_NO_AUTORESIZE)␊
␉␉␊
gitso/trunk/ConnectionWindow.py
249249
250250
251251
252
252
253253
254254
255255
......
260260
261261
262262
263
264
263
265264
266
265
266
267267
268268
269269
......
325325
326326
327327
328
328
329329
330330
331331
332332
333333
334334
335
336
335
337336
␉␉␉self.hostField.SetValue("")␊
␉␊
␉␊
␉def KillPID(self, data=None):␊
␉def KillPID(self, showMessage=True):␊
␉␉"""␊
␉␉Kill VNC instance, called by the Stop Button or Application ends.␊
␉␉␊
␉␉␉self.thread.kill()␊
␉␉␉# If you don't wait 0.5+ seconds, the interface won't reload and it'll freeze.␊
␉␉␉# Possibly on older systems you should wait longer, it works fine on mine...␊
␉␉␉# With better thread management, I'm not sure that we need this. If we start getting freezes, look at this.␊
␉␉␉# time.sleep(1)␊
␉␉␉time.sleep(.5)␊
␉␉self.thread = None␊
␉␉self.setMessage("Idle.", False)␊
␉␉if showMessage :␊
␉␉␉self.setMessage("Idle.", False)␊
␉␉return␊
␉␊
␉␊
␉␉self.threadLock.release()␊
␊
␉def createThread(self, host=""):␊
␉␉self.KillPID()␊
␉␉self.KillPID(False)␊
␉␉self.thread = GitsoThread.GitsoThread(self, self.paths)␊
␉␉self.thread.setHost(host)␊
␉␉self.thread.start()␊
␊
␉␉# If you don't wait 1+ seconds, the interface won't reload and it'll freeze.␊
␉␉# Possibly on older systems you should wait longer, it works fine on mine...␊
␉␉# With better thread management, I'm not sure that we need this. If we start getting freezes, look at this.␊
␉␉# time.sleep(1)␊
␉␉time.sleep(1)␊
␊
gitso/trunk/Processes.py
5555
5656
5757
58
5958
6059
61
60
6261
6362
64
6563
6664
6765
......
8583
8684
8785
86
87
88
89
90
8891
8992
9093
␉def giveSupport(self):␊
␉␉if sys.platform == 'darwin':␊
␉␉␉vncviewer = '%scotvnc.app/Contents/MacOS/cotvnc' % self.paths['resources']␊
␉␉␉print vncviewer␊
␉␉␉self.returnPID = os.spawnlp(os.P_NOWAIT, vncviewer, vncviewer, '--listen')␊
␉␉elif sys.platform.find('linux') != -1:␊
␉␉␉self.returnPID = os.spawnlp(os.P_NOWAIT, 'vncviewer', 'vncviewer', '-bgr233', '-listen') ␊
␉␉␉self.returnPID = os.spawnlp(os.P_NOWAIT, 'vncviewer', 'vncviewer', '-bgr233', '-listen')␊
␉␉elif sys.platform == 'win32':␊
␉␉␉import subprocess␊
␉␉␉print self.paths['resources']␊
␉␉␉if self.paths['mode'] == 'dev':␊
␉␉␉␉self.returnPID = subprocess.Popen(['%svncviewer.exe' % self.paths['resources'], '-listen'])␊
␉␉␉else:␊
␉␉␉␉handle = win32api.OpenProcess(PROCESS_TERMINATE, False, self.returnPID.pid)␊
␉␉␉␉win32api.TerminateProcess(handle, -1)␊
␉␉␉␉win32api.CloseHandle(handle)␊
␉␉␉elif sys.platform.find('linux') != -1:␊
␉␉␉␉# New processes are created when you made connections. So if you kill self.returnPID,␊
␉␉␉␉# you're just killing the dispatch process, not the one actually doing business...␊
␉␉␉␉os.spawnlp(os.P_NOWAIT, 'killall', 'killall', 'vncviewer')␊
␉␉␉␉os.spawnlp(os.P_NOWAIT, 'killall', 'killall', 'x11vnc')␊
␉␉␉else:␊
␉␉␉␉os.kill(self.returnPID, signal.SIGKILL)␊
␉␉␉self.returnPID = 0␊
gitso/trunk/arch/linux/control
33
44
55
6
7
6
7
88
99
1010
Priority: optional␊
Section: utils␊
Architecture: all␊
Depends: x11vnc, xvnc4viewer, python-wxtools␊
Installed-Size: 108␊
Depends: x11vnc, vncviewer, python-wxtools␊
Installed-Size: 226132␊
Maintainer: Derek Buranen <derek@buranen.info>␊
Description: gitso is to support others (using wxPython and reverse vnc)␊
gitso is a Python and wxWidgets frontend to x11vnc server␊
gitso/trunk/arch/win32/msvcr71_README.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
Licensees of Python are permitted␊
to redistribute mscvr71.dll, as long as they redistribute it in order␊
to support pythonxy.dll. The EULA says␊
␊
# You also agree not to permit further distribution of the␊
# Redistributables by your end users except you may permit further␊
# redistribution of the Redistributables by your distributors to your␊
# end-user customers if your distributors only distribute the␊
# Redistributables in conjunction with, and as part of, the Licensee␊
# Software, you comply with all other terms of this EULA, and your␊
# distributors comply with all restrictions of this EULA that are␊
# applicable to you.␊
␊
In this text, "you" is the licensee of VS 2003 (i.e. me, redistributing␊
msvcr71.dll as part of Python 2.5), and the "Redistributable" is␊
msvcr71.dll. The "Licensee Software" is "a software application product␊
developed by you that adds significant and primary functionality to the␊
Redistributables", i.e. python25.dll. ␊
gitso/trunk/makegitso.nsi
3131
3232
3333
34
34
3535
3636
3737
......
8989
9090
9191
92
9293
9394
9495
␍␊
;--------------------------------␍␊
; Version Information␍␊
VIProductVersion "0.6.0.0"␍␊
VIProductVersion "0.6.0"␍␊
VIAddVersionKey "ProductName" "Gitso"␍␊
VIAddVersionKey "Comments" "Gitso is to support others"␍␊
VIAddVersionKey "CompanyName" "http://code.google.com/p/gitso"␍␊
File ".\arch\win32\tightVNC_COPYING.txt"␍␊
File ".\arch\win32\tightVNC_README.txt"␍␊
File ".\arch\win32\VNCHooks_COPYING.txt"␍␊
File ".\arch\win32\msvcr71_README.txt"␍␊
;start menu items␍␊
CreateDirectory "$SMPROGRAMS\Gitso"␍␊
CreateShortCut "$SMPROGRAMS\Gitso\Gitso.lnk" "$INSTDIR\Gitso.exe" "" "$INSTDIR\icon.ico" 0␍␊

Archive Download the corresponding diff file

Branches

Number of commits:
Page rendered in 0.06464s using 13 queries.