Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: mgmt by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 9 May 2006 03:43:34 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.py.in
Log Message:
let new dialog be on current top window instead of main window. fix bug 1221
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- haclient.py.in 9 May 2006 06:48:24 -0000 1.30
+++ haclient.py.in 9 May 2006 09:43:34 -0000 1.31
@@ -42,6 +42,7 @@
window = None
manager = None
debug_level = 0
+top_window = None
def log(string) :
syslog.syslog(string)
@@ -117,26 +118,31 @@
tvcolumn.add_attribute(cell, 'text', value)
tvcolumn.set_visible(visible)
-def msgbox(msg, parent = None) :
- if parent == None :
- parent = window.win_widget
- dialog = gtk.Dialog(_("Message"), parent, gtk.DIALOG_MODAL,
(gtk.STOCK_OK, True))
+def msgbox(msg) :
+ global top_window
+ dialog = gtk.Dialog(_("Message"), top_window, gtk.DIALOG_MODAL,
(gtk.STOCK_OK, True))
label = gtk.Label(msg)
dialog.vbox.add(label)
label.show()
+ save_top_window = top_window
+ top_window = dialog
dialog.run()
+ top_window = save_top_window
dialog.destroy()
-def confirmbox(msg, parent = None) :
- if parent == None :
- parent = window.win_widget
- dialog = gtk.Dialog(_("Confirm"), parent, gtk.DIALOG_MODAL,
+
+def confirmbox(msg) :
+ global top_window
+ dialog = gtk.Dialog(_("Confirm"), top_window, gtk.DIALOG_MODAL,
(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO,
gtk.RESPONSE_NO))
label = gtk.Label(msg)
dialog.vbox.add(label)
dialog.set_default_response(gtk.RESPONSE_YES)
label.show()
+ save_top_window = top_window
+ top_window = dialog
ret = dialog.run()
+ top_window = save_top_window
dialog.destroy()
return ret == gtk.RESPONSE_YES
@@ -148,11 +154,9 @@
label.get_parent().connect("button_press_event", on_label_active, url)
#label.get_parent().window.set_cursor(gtk.gdk.Cursor(gtk.gdk.HAND1))
-def kvbox(title, fields, parent=None) :
- if parent == None :
- parent = window.win_widget
-
- dialog = gtk.Dialog(title, parent, gtk.DIALOG_MODAL,
+def kvbox(title, fields) :
+ global top_window
+ dialog = gtk.Dialog(title, top_window, gtk.DIALOG_MODAL,
(gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL))
table = gtk.Table(2, 1, False)
widgets = []
@@ -180,9 +184,13 @@
dialog.vbox.pack_start(table)
dialog.vbox.show_all()
+ save_top_window = top_window
+ top_window = dialog
+
while True :
ret = dialog.run()
if ret in [gtk.RESPONSE_CANCEL,gtk.RESPONSE_DELETE_EVENT] :
+ top_window = save_top_window
dialog.destroy()
return None
else :
@@ -202,6 +210,7 @@
msgbox(fields[row].label+_(" can't be
empty"))
passed = False
if passed :
+ top_window = save_top_window
dialog.destroy()
return kv
@@ -1012,6 +1021,7 @@
glade.get_widget("master_node_max").set_property("sensitive", False)
def run(self):
+ global top_window
dialog = gtk.Dialog(_("Add Native Resource"),
window.win_widget, gtk.DIALOG_MODAL,
(gtk.STOCK_ADD, gtk.RESPONSE_OK,
gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL))
glade = gtk.glade.XML(UI_FILE, "addnativedlg", "haclient")
@@ -1056,9 +1066,12 @@
glade.get_widget("group").set_model(store)
glade.get_widget("group").set_text_column(0)
self.update_param_list()
+ save_top_window = top_window
+ top_window = dialog
while True :
ret = dialog.run()
if ret in [gtk.RESPONSE_CANCEL,
gtk.RESPONSE_DELETE_EVENT] :
+ top_window = save_top_window
dialog.destroy()
return None
else :
@@ -1105,6 +1118,7 @@
rsc["master_node_max"] =
glade.get_widget("master_node_max").get_text()
manager.add_native(rsc)
+ top_window = save_top_window
dialog.destroy()
return None
@@ -1415,7 +1429,6 @@
# show the window
win_widget.show_all()
-
# keep some widgets
self.win_widget = win_widget
self.actiongroup = actiongroup
@@ -1894,5 +1907,6 @@
debug_level = 1
manager = Manager()
window = MainWindow()
+ top_window = window.win_widget
manager.run()
syslog.closelog()
------------------------------
Message: 2
Date: Tue, 9 May 2006 03:56:56 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.py.in
Log Message:
press ENTER in login dialog will invoke login
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- haclient.py.in 9 May 2006 09:43:34 -0000 1.31
+++ haclient.py.in 9 May 2006 09:56:56 -0000 1.32
@@ -1227,7 +1227,10 @@
glade.get_widget("server").set_text(server)
glade.get_widget("username").set_text(user)
glade.get_widget("password").set_text("")
-
+ glade.get_widget("server").set_activates_default(True)
+ glade.get_widget("username").set_activates_default(True)
+ glade.get_widget("password").set_activates_default(True)
+ dialog.set_default_response(gtk.RESPONSE_OK)
ret = dialog.run()
server = glade.get_widget("server").get_text()
user = glade.get_widget("username").get_text()
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 24
********************************************
