summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar KingZero <kingzero@pyload.org> 2009-05-30 20:10:48 +0200
committerGravatar KingZero <kingzero@pyload.org> 2009-05-30 20:10:48 +0200
commit6f2964c4d907db314d31c01aff6bc108c82bb97e (patch)
tree1590bebb4ee6546a3c318765aed4e76196122711
parentadded download dialog, fixed typos (diff)
downloadpyload-6f2964c4d907db314d31c01aff6bc108c82bb97e.tar.xz
added client socket, again
-rw-r--r--icons/setup.pngbin0 -> 2518 bytes
-rwxr-xr-xpyMainGui.py10
2 files changed, 6 insertions, 4 deletions
diff --git a/icons/setup.png b/icons/setup.png
new file mode 100644
index 000000000..1badf1d67
--- /dev/null
+++ b/icons/setup.png
Binary files differ
diff --git a/pyMainGui.py b/pyMainGui.py
index 2200788bc..98eaac6ea 100755
--- a/pyMainGui.py
+++ b/pyMainGui.py
@@ -22,6 +22,7 @@ import wx
import wx.lib.sized_controls as sized_control
from os import sep
from os.path import abspath, dirname
+from module.remote.ClientSocket import ClientSocket
class Download_Dialog(sized_control.SizedDialog):
def __init__(self, parent, id):
@@ -67,6 +68,10 @@ class pyload_main_gui(wx.Frame):
wx.Frame.__init__(self,parent,id,title, size=(910,500))
app_path = dirname(abspath(__file__)) + sep
+ # socket
+ self.socket = ClientSocket(self)
+ self.socket.connect(('localhost', 7272))
+ self.socket.push("nonsense\n")
# Menubar
menubar = wx.MenuBar()
@@ -85,15 +90,12 @@ class pyload_main_gui(wx.Frame):
stop = toolbar.AddLabelTool(6,'',wx.Bitmap(app_path + '/icons/stop.png'))
up = toolbar.AddLabelTool(7,'',wx.Bitmap(app_path + '/icons/up.png'))
down = toolbar.AddLabelTool(8,'',wx.Bitmap(app_path + '/icons/down.png'))
+ config = toolbar.AddLabelTool(9,'',wx.Bitmap(app_path + '/icons/setup.png'))
toolbar.Realize()
splitter = wx.SplitterWindow(self)
-
-
panel_up = upper_panel(splitter)
-
panel_down = lower_panel(splitter)
-
splitter.SplitHorizontally(panel_up,panel_down,300)
# Binds