diff --git a/.gitignore b/.gitignore index 3144bc4..36ad735 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,7 @@ Icon .Trashes log*.txt -users*.cfg \ No newline at end of file +users*.cfg + +# Object files +*.pyc diff --git a/Flagship 1.0.4.1 - distro/bin/ChatFns.py b/Flagship 1.0.4.1 - distro/bin/ChatFns.py index 16e6a3e..b58ce04 100644 --- a/Flagship 1.0.4.1 - distro/bin/ChatFns.py +++ b/Flagship 1.0.4.1 - distro/bin/ChatFns.py @@ -4,12 +4,10 @@ from socket import * import urllib import re -import win32gui import socket import threading import sys import os -import winsound import time import UDPFunc from ChatFns import * diff --git a/Flagship 1.0.4.1 - distro/bin/FlagshipMain.py b/Flagship 1.0.4.1 - distro/bin/FlagshipMain.py index efa0756..b90697c 100644 --- a/Flagship 1.0.4.1 - distro/bin/FlagshipMain.py +++ b/Flagship 1.0.4.1 - distro/bin/FlagshipMain.py @@ -10,7 +10,6 @@ import threading import sys import os -import winsound import time import UDPFunc import tkMessageBox @@ -52,7 +51,7 @@ def listen(): if not QUIT.isSet(): if (data != ""): #checks if message is not blank if data[0]!="/": #checks if it is a listener-side command - winsound.PlaySound("*", winsound.SND_ALIAS|winsound.SND_ASYNC) + #winsound.PlaySound("*", winsound.SND_ALIAS|winsound.SND_ASYNC) if addr[0] in IP_Lookup: #checks if sender IP is in contacts Name = IP_Lookup[addr[0]] if Name == "192.168.1.1": @@ -334,7 +333,10 @@ def newgchat(): gchat.title(ChatTitle) gchat.geometry("400x500") gchat.resizable(width=TRUE, height=TRUE) - gchat.iconbitmap(default='iconfile.ico') + if "nt" == os.name: + gchat.iconbitmap(bitmap = 'iconfile.ico') + else: + gchat.iconbitmap(bitmap = '@iconfile.xbm') #Create the Button to send message SendButton = Button(gchat, font=30, text="Send", width="12", height=5, @@ -444,7 +446,11 @@ def func(val): base.title(WindowTitle) base.geometry("400x40") base.resizable(width=TRUE, height=TRUE) -base.iconbitmap(default='iconfile.ico') +if "nt" == os.name: + base.iconbitmap(bitmap = 'iconfile.ico') +else: + base.iconbitmap(bitmap = '@iconfile.xbm') + menubar = Menu(base) diff --git a/Flagship 1.0.4.1 - distro/bin/UDPFunc.py b/Flagship 1.0.4.1 - distro/bin/UDPFunc.py index 976bee1..39acdc9 100644 --- a/Flagship 1.0.4.1 - distro/bin/UDPFunc.py +++ b/Flagship 1.0.4.1 - distro/bin/UDPFunc.py @@ -6,12 +6,10 @@ from socket import * import urllib import re -import win32gui import socket import threading import sys import os -import winsound import time from ChatFns import * from UDPSettings import * diff --git a/Flagship 1.0.4.1 - distro/bin/iconfile.xbm b/Flagship 1.0.4.1 - distro/bin/iconfile.xbm new file mode 100644 index 0000000..8f42fad --- /dev/null +++ b/Flagship 1.0.4.1 - distro/bin/iconfile.xbm @@ -0,0 +1,6 @@ +#define iconfile_width 15 +#define iconfile_height 15 +static unsigned char iconfile_bits[] = { + 0x00, 0x00, 0x0c, 0x18, 0x12, 0x24, 0xf1, 0x47, 0x13, 0x66, 0x5a, 0x38, + 0x0c, 0x19, 0x24, 0x12, 0x36, 0x32, 0x26, 0x32, 0x06, 0x30, 0x0e, 0x30, + 0x0e, 0x3c, 0xf4, 0x17, 0x00, 0x00 };