X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=nullclient-ecore.py;h=351e37cc4c9c5e5d316db3a1ad12e67bd4178bfe;hp=53e970ded4fb84b501bc468d3a91a8eb30b94158;hb=54c3652ebe4f40182214f4f37403ac13fcfeb7ff;hpb=55de8749720d1245639c903d2fef844d4e61d19e diff --git a/nullclient-ecore.py b/nullclient-ecore.py index 53e970d..351e37c 100644 --- a/nullclient-ecore.py +++ b/nullclient-ecore.py @@ -13,14 +13,6 @@ request_cbs = {} def account_callback(name): print "---- account callback example: %s" % name -acc_cbs["notify_added"] = account_callback -acc_cbs["status_changed"] = account_callback -acc_cbs["request_add"] = account_callback -acc_cbs["request_authorize"] = account_callback -acc_cbs["close_account_request"] = account_callback - -cbs["account"] = acc_cbs - def blist_callback(name): print "---- blist callback example: %s" % name @@ -108,6 +100,7 @@ class MainWindow: global conv_cbs global signal_cbs self.bt_cbs = {} + self.new_acc_bt_cbs = {} self.send_cbs = {} self.quit_cb = quit_cb conv_cbs["write_im"] = self._write_im_cb @@ -122,13 +115,24 @@ class MainWindow: hbox_cmd.append(self.lcmd, etk.HBox.START, etk.HBox.START, 0) hbox_cmd.append(self.cmd_entry, etk.HBox.START, etk.HBox.EXPAND_FILL, 0) + vbox_accs = etk.VBox() + self.accslistmodel = etk.ListModel() + self.accslist = etk.List(model=self.accslistmodel,\ + columns=[(10, etk.TextRenderer(slot=0),\ + False)], selectable=True,\ + animated_changes=True) + vbox_accs.append(self.accslist, etk.VBox.START, etk.VBox.EXPAND_FILL, 0) + hbox_buttons = etk.HBox(homogeneous=False) send_bt = etk.Button(label="Send") send_bt.on_clicked(self._send_bt_cb) conn_bt = etk.Button(label="Connect") - conn_bt.on_clicked(self._conn_bt_cb) + conn_bt.on_clicked(self.login_window) + new_account_bt = etk.Button(label="New Account") + new_account_bt.on_clicked(self._new_account) hbox_buttons.append(send_bt, etk.HBox.START, etk.HBox.NONE, 0) hbox_buttons.append(conn_bt, etk.HBox.START, etk.HBox.NONE, 0) + hbox_buttons.append(new_account_bt, etk.HBox.START, etk.HBox.NONE, 0) hbox_panel = etk.HBox() @@ -147,6 +151,7 @@ class MainWindow: hbox_panel.append(vbox_txt_area, etk.HBox.START, etk.HBox.EXPAND_FILL, 0) hbox_panel.append(vbox_buddies, etk.HBox.END, etk.HBox.EXPAND_FILL, 0) + hbox_panel.append(vbox_accs, etk.HBox.END, etk.HBox.EXPAND_FILL, 0) self.lstatus = etk.Label(text="Connection status") @@ -160,6 +165,17 @@ class MainWindow: self.set_global_callbacks() self._window.show_all() + def login_window(self, pointer): + self.login_password = etk.Entry() + confirm_login_bt = etk.Button(label="Ok") + confirm_login_bt.on_clicked(self._conn_bt_cb) + vbox_login = etk.VBox() + vbox_login.append(self.login_password, etk.VBox.START, etk.VBox.FILL, 0) + vbox_login.append(confirm_login_bt, etk.VBox.END, etk.VBox.NONE, 0) + self.login_win = etk.Window(title="Password", size_request=(190, 80), + child=vbox_login) + self.login_win.show_all() + def set_global_callbacks(self): global cbs cbs["connection"]["connect_progress"] = self._purple_conn_status_cb @@ -168,7 +184,8 @@ class MainWindow: def _conn_bt_cb(self, pointer): if self.bt_cbs.has_key("on_clicked"): - self.bt_cbs["on_clicked"]() + self.bt_cbs["on_clicked"](self.login_password.text) + self.login_win.destroy() def _send_bt_cb(self, pointer): bname = self.blist.selected_rows[0][0] @@ -180,6 +197,20 @@ class MainWindow: print "Buddy not selected!" self.cmd_entry.text = "" + def selected_accs(self): + try: + acc = self.accslist.selected_rows[0][0] + if acc: + return acc + else: + return "None" + except: + return "None" + + def _new_account(self, pointer): + if self.new_acc_bt_cbs.has_key("on_clicked"): + self.new_acc_bt_cbs["on_clicked"]() + def _purple_conn_status_cb(self, txt, step, step_count): self.lstatus.text = txt @@ -193,6 +224,10 @@ class MainWindow: def remove_buddy(self, bname): self.blistmodel.remove([bname]) + def new_account(self, a): + if [a] not in self.accslistmodel.elements: + self.accslistmodel.append([a]) + def _purple_disconnected_status_cb(self): self.lstatus.text = "Disconnected" @@ -203,6 +238,10 @@ class MainWindow: if callable(cb): self.bt_cbs["on_clicked"] = cb + def add_account_cb(self, cb): + if callable(cb): + self.new_acc_bt_cbs["on_clicked"] = cb + def add_send_cb(self, cb): if callable(cb): self.send_cbs["on_clicked"] = cb @@ -226,18 +265,26 @@ class NullClientPurple: self.window = MainWindow(self.quit) self.buddies = {} #all buddies self.conversations = {} - self.account = None self.protocol_id = "prpl-jabber" - self.username = "carmanplugintest@gmail.com" - self.password = "abc123def" + self.accs = None global cbs cbs["blist"]["update"] = self._purple_update_blist_cb + + self.p.add_account_cb("notify_added", account_callback) + self.p.add_account_cb("status_changed", account_callback) + self.p.add_account_cb("request_add", account_callback) + self.p.add_account_cb("request_authorize", account_callback) + self.p.add_account_cb("close_account_request", account_callback) + + self.p.purple_init(cbs) + self.p.accounts_init() #Initializing UI self.window.add_bt_conn_cb(self.connect) self.window.add_send_cb(self.send_msg) + self.window.add_account_cb(self.add_account) self.window.init_window() def _purple_update_blist_cb(self, type, name=None, alias=None, totalsize=None,\ @@ -264,20 +311,24 @@ class NullClientPurple: conv.initialize(self.account, "IM", bname) self.conversations[bname] = conv - def connect(self): - self.account = purple.Account(self.username, self.protocol_id) - self.account.set_password(self.password) - - self.account.proxy.set_type(purple.ProxyInfoType().HTTP) - self.account.proxy.set_host("172.18.216.211") - self.account.proxy.set_port(8080) - + def connect(self, password): + username_acc = self.window.selected_accs() + self.account = self.p.account_verify(username_acc) self.account.get_protocol_options() - self.account.set_enabled("carman-purple-python", True) + self.account.password = password self.p.connect() self.p.signal_connect("buddy-signed-off", self._purple_signal_sign_off_cb) + def add_account(self): + username = "carmanplugintest@gmail.com" + host = "172.18.216.211" + port = 8080 + self.p.account_add(username, self.protocol_id, host, port) + self.accs = self.p.accounts_get_dict() + for acc in self.accs.keys(): + self.window.new_account(acc) + def send_msg(self, name, msg): if not self.conversations.has_key(name): conv = purple.Conversation()