Fix dbman so RCS checkin window has correct transient parent
This commit is contained in:
@@ -646,7 +646,8 @@ class DbManager(CLIDbManager, ManagedWindow):
|
|||||||
else:
|
else:
|
||||||
base_path = self.dbstate.db.get_save_path()
|
base_path = self.dbstate.db.get_save_path()
|
||||||
archive = os.path.join(base_path, ARCHIVE)
|
archive = os.path.join(base_path, ARCHIVE)
|
||||||
check_in(self.dbstate.db, archive, self.user, self.__start_cursor)
|
_check_in(self.dbstate.db, archive, self.user,
|
||||||
|
self.__start_cursor, parent=self.window)
|
||||||
self.__end_cursor()
|
self.__end_cursor()
|
||||||
|
|
||||||
self.__populate()
|
self.__populate()
|
||||||
@@ -1117,7 +1118,7 @@ def check_out(dbase, rev, path, user):
|
|||||||
rdr(dbase, xml_file, user)
|
rdr(dbase, xml_file, user)
|
||||||
os.unlink(xml_file)
|
os.unlink(xml_file)
|
||||||
|
|
||||||
def check_in(dbase, filename, user, cursor_func=None):
|
def _check_in(dbase, filename, user, cursor_func=None, parent=None):
|
||||||
"""
|
"""
|
||||||
Checks in the specified file into RCS
|
Checks in the specified file into RCS
|
||||||
"""
|
"""
|
||||||
@@ -1128,6 +1129,7 @@ def check_in(dbase, filename, user, cursor_func=None):
|
|||||||
glade = Glade(toplevel='comment')
|
glade = Glade(toplevel='comment')
|
||||||
top = glade.toplevel
|
top = glade.toplevel
|
||||||
text = glade.get_object('description')
|
text = glade.get_object('description')
|
||||||
|
top.set_transient_for(parent)
|
||||||
top.run()
|
top.run()
|
||||||
comment = text.get_text()
|
comment = text.get_text()
|
||||||
top.destroy()
|
top.destroy()
|
||||||
|
Reference in New Issue
Block a user