|
|
|
@ -86,9 +86,10 @@ org.kde.kdialog.ProgressDialog'
|
|
|
|
|
|
|
|
|
|
def setTitle(self,title):
|
|
|
|
|
'''Установить описания прогресса'''
|
|
|
|
|
self.title = title
|
|
|
|
|
if self.kdialog:
|
|
|
|
|
os.system(self.execenv+
|
|
|
|
|
'/usr/bin/qdbus %s setLabelText %s >/dev/null' % \
|
|
|
|
|
'/usr/bin/qdbus %s setLabelText "%s" >/dev/null' % \
|
|
|
|
|
(self.kdialog,self.title))
|
|
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
@ -101,7 +102,7 @@ org.kde.kdialog.ProgressDialog'
|
|
|
|
|
class ProgressProfile(cl_profile.profile):
|
|
|
|
|
def __init__(self, vars):
|
|
|
|
|
cl_profile.profile.__init__(self,vars)
|
|
|
|
|
self.progress = ProgressBar("Merging profiles...")
|
|
|
|
|
self.progress = ProgressBar(_("Merging profiles ..."))
|
|
|
|
|
|
|
|
|
|
def numberAllProfiles(self, number):
|
|
|
|
|
self.progress.setMaximum(number)
|
|
|
|
@ -122,9 +123,11 @@ class RsyncProgressBar(ProgressBar):
|
|
|
|
|
receiverre = re.compile("recv_generator\(.+,([0-9]+)\)", re.S)
|
|
|
|
|
pipe = None
|
|
|
|
|
maximum = 1
|
|
|
|
|
copyStarting = False
|
|
|
|
|
|
|
|
|
|
def __init__(self, title, rsyncstr, maximum=1):
|
|
|
|
|
def __init__(self, title, secondtitle, rsyncstr, maximum=1):
|
|
|
|
|
self.title = title
|
|
|
|
|
self.secondtitle = secondtitle
|
|
|
|
|
self.maximum = maximum
|
|
|
|
|
self.rsyncstr = rsyncstr
|
|
|
|
|
|
|
|
|
@ -169,8 +172,12 @@ class RsyncProgressBar(ProgressBar):
|
|
|
|
|
self.value = int(q.groups()[0])
|
|
|
|
|
newpercent = self.value * 100 / self.maximum
|
|
|
|
|
if oldpercent < newpercent:
|
|
|
|
|
if not self.copyStarting:
|
|
|
|
|
self.copyStarting = True
|
|
|
|
|
self.setTitle(self.secondtitle)
|
|
|
|
|
oldpercent = newpercent
|
|
|
|
|
self.setValue(oldpercent)
|
|
|
|
|
|
|
|
|
|
# Импортированные классы в cl_ldap
|
|
|
|
|
# Запись ошибок
|
|
|
|
|
imp_cl_err = cl_profile._error
|
|
|
|
@ -1711,8 +1718,10 @@ install/6intranet" %(domain,servDn,unixDN,bindDn,bindPw)
|
|
|
|
|
%str(sync))
|
|
|
|
|
return False
|
|
|
|
|
if execStr:
|
|
|
|
|
host = "<i>" + host +"</i>"
|
|
|
|
|
rsync = RsyncProgressBar(\
|
|
|
|
|
"Syncronizing user settings with %s server..." %
|
|
|
|
|
_("Receiving file list from %s server ...") % host,
|
|
|
|
|
_("Syncronizing user settings with %s server ...") %
|
|
|
|
|
host,execStr)
|
|
|
|
|
configFileName = os.path.join(homeProfile,self.configFile)
|
|
|
|
|
if sync == "login":
|
|
|
|
|