diff --git a/gitso/trunk/Gitso.py b/gitso/trunk/Gitso.py index 946c373..f95293d 100644 --- a/gitso/trunk/Gitso.py +++ b/gitso/trunk/Gitso.py @@ -41,9 +41,12 @@ class Connect(wx.Frame): wx.Frame.__init__(self, parent, wx.ID_ANY, title, size=(height,width), style=wx.DEFAULT_FRAME_STYLE & ~ (wx.RESIZE_BORDER | wx.RESIZE_BOX | wx.MAXIMIZE_BOX)) self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) - if sys.platform != 'darwin': - print 'set icon' - #icon = wx.Icon("icon.ico", wx.BITMAP_TYPE_ICO) + if sys.platform.find('linux') != -1: + icon = wx.Icon(os.path.join(sys.path[0], '..', 'share', 'gitso', 'icon.ico'), wx.BITMAP_TYPE_ICO) + self.SetIcon(icon) + elif sys.platform == 'win32': + print "set icon" + #icon = wx.Icon(os.path.join(sys.path[0], '..', 'share', 'gitso', 'icon.ico'), wx.BITMAP_TYPE_ICO) #self.SetIcon(icon) if sys.platform.find('linux') != -1: @@ -74,7 +77,15 @@ class Connect(wx.Frame): # the combobox Control self.sampleList = [] - self.sampleList = self.getHosts(self.sampleList, os.path.join(sys.path[0], 'hosts.txt')) + + if sys.platform == "darwin": + self.sampleList = self.getHosts(self.sampleList, os.path.join(sys.path[0], 'hosts.txt')) + elif sys.platform == "win32": + print "set Hosts" + self.sampleList = self.getHosts(self.sampleList, os.path.join(sys.path[0], 'hosts.txt')) + else: + self.sampleList = self.getHosts(self.sampleList, os.path.join(sys.path[0], '..', 'share', 'gitso', 'hosts.txt')) + self.sampleList = self.getHosts(self.sampleList, prefFile) self.displayHostBox(self.sampleList, "Enter/Select Support Address") @@ -163,9 +174,9 @@ class Connect(wx.Frame): self.displayHostBox(self.sampleList, host) if sys.platform == 'darwin': - self.returnPID = os.spawnl(os.P_NOWAIT, '%sOSXvnc/OSXvnc-server' % devPath, 'OSXvnc-server', '-connectHost', '%s' % host) + self.returnPID = os.spawnl(os.P_NOWAIT, '%sOSXvnc/OSXvnc-server' % devPath, 'OSXvnc-server', '-nopw -connectHost', '%s' % host) elif sys.platform.find('linux') != -1: - self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc', '-connect' , '%s' % host) + self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc', '-ncache 20 -solid black -connect' , '%s' % host) elif sys.platform == 'win32': self.returnPID = os.spawnl(os.P_NOWAIT, 'c:\\windows\\WinVNC.exe', 'c:\\windows\\WinVNC.exe', '-connect', '%s' % host) else: @@ -215,7 +226,15 @@ class Connect(wx.Frame): text = self.hostField.GetValue() self.hostField.Destroy() self.sampleList = [] - self.sampleList = self.getHosts(self.sampleList, os.path.join(sys.path[0], 'hosts.txt')) + + if sys.platform == "darwin": + self.sampleList = self.getHosts(self.sampleList, os.path.join(sys.path[0], 'hosts.txt')) + elif sys.platform == "win32": + print "set Hosts" + self.sampleList = self.getHosts(self.sampleList, os.path.join(sys.path[0], 'hosts.txt')) + else: + self.sampleList = self.getHosts(self.sampleList, os.path.join(sys.path[0], '..', 'share', 'gitso', 'hosts.txt')) + self.sampleList = self.getHosts(self.sampleList, prefFile) self.displayHostBox(self.sampleList, text) @@ -376,6 +395,7 @@ if sys.platform == "darwin": os.makedirs(prefFile, 0700) prefFile = os.path.join(prefFile, "hosts") elif sys.platform == "win32": + print "set Hosts" # I don't know where the best place is for this. prefFile = os.path.join(os.path.expanduser("~"), ".gitso-hosts") else: diff --git a/gitso/trunk/arch/linux/changelog b/gitso/trunk/arch/linux/changelog index af44002..1803d00 100644 --- a/gitso/trunk/arch/linux/changelog +++ b/gitso/trunk/arch/linux/changelog @@ -11,16 +11,16 @@ PACKAGE (0.5) hardy; urgency=low * OS X uses TightVNC 1.3.9 * OS X uses OSXVNC 3.0 - -- Aaron D. Gerber Sun, 15 June 2008 16:17:43 -0600 + -- Aaron D. Gerber Sat, 26 Jul 2008 16:32:40 -0600 PACKAGE (0.4) hardy; urgency=low - * updated with icons and much more + * Made Deb, updated with icons and much more. - -- Aaron D. Gerber Sat, 10 May 2008 16:17:43 -0600 + -- Aaron D. Gerber Sat, 10 May 2008 16:17:43 -0600 PACKAGE (0.3) UNRELEASED; urgency=low * Initial release. (Closes: #XXXXXX) - -- Derek Thu, 08 May 2008 22:35:52 -0600 + -- Aaron D. Gerber Thu, 08 May 2008 22:35:52 -0600 diff --git a/gitso/trunk/arch/linux/control b/gitso/trunk/arch/linux/control index 298964c..7eb9e84 100644 --- a/gitso/trunk/arch/linux/control +++ b/gitso/trunk/arch/linux/control @@ -4,10 +4,11 @@ Priority: optional Section: utils Architecture: all Depends: x11vnc, vncviewer, python-wxtools -Installed-Size: 17830 +Installed-Size: 108 Maintainer: Derek Buranen Description: gitso is to support others (using wxPython and reverse vnc) gitso is a Python and wxWidgets frontend to x11vnc server and vncviewer. It runs x11vnc -connect and vncviewer -listen depending on if you are giving or receiving help. + diff --git a/gitso/trunk/arch/linux/gitso.desktop b/gitso/trunk/arch/linux/gitso.desktop index cb0f8f9..1606915 100644 --- a/gitso/trunk/arch/linux/gitso.desktop +++ b/gitso/trunk/arch/linux/gitso.desktop @@ -1,12 +1,12 @@ [Desktop Entry] -Version=0.4 +Version=0.5 Encoding=UTF-8 Name=Gitso Name[en_GB]=Gitso Name[en_US]=Gitso Comment=Connect to others using VNC protocol Exec=gitso -Icon=/usr/share/gitso/gitso.svg +Icon=/usr/share/gitso/gitso.ico Terminal=false MimeType=application/x-remote-connection; Type=Application diff --git a/gitso/trunk/hosts.txt b/gitso/trunk/hosts.txt index e69de29..3c02088 100644 --- a/gitso/trunk/hosts.txt +++ b/gitso/trunk/hosts.txt @@ -0,0 +1 @@ +192.168.1.30 diff --git a/gitso/trunk/icon.ico b/gitso/trunk/icon.ico index b7889d8..f3b5201 100644 Binary files a/gitso/trunk/icon.ico and b/gitso/trunk/icon.ico differ diff --git a/gitso/trunk/icon_large.ico b/gitso/trunk/icon_large.ico new file mode 100644 index 0000000..b7889d8 Binary files /dev/null and b/gitso/trunk/icon_large.ico differ diff --git a/gitso/trunk/makegitso b/gitso/trunk/makegitso index c7603bd..713b0a4 100755 --- a/gitso/trunk/makegitso +++ b/gitso/trunk/makegitso @@ -46,7 +46,8 @@ if(`uname -a` =~ m/Darwin/) { } } elsif (`uname -a` =~ m/Linux/) { - my $path = "gitso_0.5_all"; + my $deb = "gitso_0.5_all.deb"; + my $path = "gitso"; print "Creating $path.deb"; `rm -rf $path`; `mkdir $path`; @@ -59,22 +60,23 @@ if(`uname -a` =~ m/Darwin/) { `mkdir $path/usr/share`; `mkdir $path/usr/share/applications`; `mkdir $path/usr/share/doc`; - `mkdir $path/usr/share/doc/gitso`; - `mkdir $path/usr/share/gitso`; + `mkdir $path/usr/share/doc/$path`; + `mkdir $path/usr/share/$path`; `cp arch/linux/gitso $path/usr/bin/`; - `chmod u+x $path/usr/bin`; - `cp Gitso.py $path/usr/share/gitso/`; - `cp __init__.py $path/usr/share/gitso/`; - `cp hosts.txt $path/usr/share/gitso/`; + `chmod 755 $path/usr/bin/gitso`; + `cp Gitso.py $path/usr/share/$path/`; + `cp __init__.py $path/usr/share/$path/`; + `cp hosts.txt $path/usr/share/$path/`; + `cp icon.ico $path/usr/share/$path/`; print ".."; `cp arch/linux/gitso.desktop $path/usr/share/applications/`; - `cp arch/linux/README.txt $path/usr/share/doc/gitso/README`; - `cp copyright $path/usr/share/doc/gitso/`; - `gzip -cf arch/linux/changelog > $path/usr/share/doc/gitso/changelog.gz`; + `cp arch/linux/README.txt $path/usr/share/doc/$path/README`; + `cp copyright $path/usr/share/doc/$path/`; + `gzip -cf arch/linux/changelog > $path/usr/share/doc/$path/changelog.gz`; print ".."; - `dpkg -b $path $path.deb`; + `dpkg -b $path/ $deb`; `rm -rf $path`;