Index: doc/core/examples/pbgtk2login.glade
===================================================================
--- doc/core/examples/pbgtk2login.glade (revision 34400)
+++ doc/core/examples/pbgtk2login.glade (working copy)
@@ -1,330 +0,0 @@
-
-
-
-
-
-
- Login
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- True
- True
- True
-
-
-
-
-
- True
- False
- 0
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- -6
-
-
-
-
-
- True
- True
- True
- True
- GTK_RELIEF_NORMAL
- -5
-
-
-
- True
- 0.5
- 0.5
- 0
- 0
-
-
-
- True
- False
- 2
-
-
-
- True
- gtk-ok
- 4
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- _Login
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- True
- False
-
-
- 0
- False
- False
- GTK_PACK_END
-
-
-
-
-
- True
- 3
- 2
- False
- 0
- 0
-
-
-
- True
- _Host:
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.9
- 0.5
- 0
- 0
- hostEntry
-
-
-
-
-
-
- 0
- 1
- 0
- 1
- fill
-
-
-
-
-
-
- True
- False
- 0
-
-
-
- True
- The name of a host to connect to.
- True
- True
- True
- True
- 0
- localhost
- True
- *
- True
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- The number of a port to connect on.
- True
- True
- True
- 0
- 8787
- True
- *
- True
- 5
-
-
- 0
- False
- True
-
-
-
-
- 1
- 2
- 0
- 1
- fill
-
-
-
-
-
- True
- _Name:
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.9
- 0.5
- 0
- 0
- userNameEntry
-
-
- 0
- 1
- 1
- 2
- fill
-
-
-
-
-
-
- True
- An identity to log in as.
- True
- True
- True
- 0
- guest
- True
- *
- True
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
-
- True
- The Identity's log-in password.
- True
- True
- False
- 0
- guest
- True
- *
- True
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
-
- True
- _Password:
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.9
- 0.5
- 0
- 0
- passwordEntry
-
-
- 0
- 1
- 2
- 3
- fill
-
-
-
-
-
- 0
- False
- False
-
-
-
-
-
-
-
Index: doc/core/examples/pbgtk2.py
===================================================================
--- doc/core/examples/pbgtk2.py (revision 34400)
+++ doc/core/examples/pbgtk2.py (working copy)
@@ -1,38 +1,34 @@
# Copyright (c) Twisted Matrix Laboratories.
# See LICENSE for details.
-
-from __future__ import nested_scopes
-
from twisted.internet import gtk2reactor
gtk2reactor.install()
import gtk
-from gtk import glade
-from twisted import copyright
+
from twisted.internet import reactor, defer
-from twisted.python import failure, log, util
+from twisted.python import failure, util
from twisted.spread import pb
from twisted.cred.credentials import UsernamePassword
-from twisted.internet import error as netError
-class LoginDialog:
+class LoginDialog(object):
def __init__(self, deferred):
self.deferredResult = deferred
- gladefile = util.sibpath(__file__, "pbgtk2login.glade")
- self.glade = glade.XML(gladefile)
+ uifile = util.sibpath(__file__, "pbgtk2login.ui")
- self.glade.signal_autoconnect(self)
+ self.builder = gtk.Builder()
+ self.builder.add_from_file(uifile)
+ self.builder.connect_signals(self)
- self.setWidgetsFromGladefile()
+ self.setWidgetsFromFile()
self._loginDialog.show()
- def setWidgetsFromGladefile(self):
+ def setWidgetsFromFile(self):
widgets = ("hostEntry", "portEntry", "userNameEntry", "passwordEntry",
"statusBar", "loginDialog")
- gw = self.glade.get_widget
+ gw = self.builder.get_object
for widgetName in widgets:
setattr(self, "_" + widgetName, gw(widgetName))
@@ -66,7 +62,8 @@
client_factory = pb.PBClientFactory()
reactor.connectTCP(host, port, client_factory)
creds = UsernamePassword(userName, password)
- client_factory.login(creds).addCallbacks(self._cbGotPerspective, self._ebFailedLogin)
+ client_factory.login(creds).addCallbacks(self._cbGotPerspective,
+ self._ebFailedLogin)
self.statusMsg("Contacting server...")
@@ -94,12 +91,14 @@
self._statusBar.push(self._statusContext, text)
-class EchoClient:
+class EchoClient(object):
def __init__(self, echoer):
self.echoer = echoer
w = gtk.Window(gtk.WINDOW_TOPLEVEL)
- vb = gtk.VBox(); b = gtk.Button("Echo:")
- self.entry = gtk.Entry(); self.outry = gtk.Entry()
+ vb = gtk.VBox();
+ b = gtk.Button("Echo:")
+ self.entry = gtk.Entry()
+ self.outry = gtk.Entry()
w.add(vb)
map(vb.add, [b, self.entry, self.outry])
b.connect('clicked', self.clicked)
@@ -109,11 +108,12 @@
def clicked(self, b):
txt = self.entry.get_text()
self.entry.set_text("")
- self.echoer.callRemote('echo',txt).addCallback(self.outry.set_text)
+ self.echoer.callRemote('echo', txt).addCallback(self.outry.set_text)
def stop(self, b):
reactor.stop()
+
d = defer.Deferred()
LoginDialog(d)
d.addCallbacks(EchoClient,
Index: doc/core/examples/pbgtk2login.ui
===================================================================
--- doc/core/examples/pbgtk2login.ui (revision 0)
+++ doc/core/examples/pbgtk2login.ui (revision 0)
@@ -0,0 +1,311 @@
+
+
+
+
+