diff --git a/ftp_manager/config_dialog.ui b/ftp_manager/config_dialog.ui index ef0d50f..6a0d999 100644 --- a/ftp_manager/config_dialog.ui +++ b/ftp_manager/config_dialog.ui @@ -188,9 +188,7 @@ True - - end - + 0 @@ -201,35 +199,12 @@ end + install/upgrade True False - False + True True - - - True - - - True - gtk-refresh - - - 0 - - - - - True - 0 - Install/Upgrade - - - 1 - - - - False diff --git a/ftp_manager/ftp_manager.py b/ftp_manager/ftp_manager.py index bb50741..5d5d6f1 100644 --- a/ftp_manager/ftp_manager.py +++ b/ftp_manager/ftp_manager.py @@ -301,15 +301,21 @@ class Ftp(threading.Thread): def run(self): try: - self.ftp = ftplib.FTP('dicson.no-ip.info') + gobject.idle_add(self.progressbar.set_text, + 'Connecting to server') + self.ftp = ftplib.FTP('dicson.no-ip.info')#ftp.gajim.org') self.ftp.login() self.ftp.cwd('plugins') if not self.remote_dirs: self.plugins_dirs = self.ftp.nlst() progress_step = 1.0 / len(self.plugins_dirs) + gobject.idle_add(self.progressbar.set_text, + 'Scan files on the server') for dir_ in self.plugins_dirs: fract = self.progressbar.get_fraction() + progress_step gobject.idle_add(self.progressbar.set_fraction, fract) + gobject.idle_add(self.progressbar.set_text, + 'Read "%s"' % dir_) try: self.ftp.retrbinary('RETR %s/manifest.ini' %dir_, self.handleDownload) @@ -341,6 +347,8 @@ class Ftp(threading.Thread): def download_plugin(self): gobject.idle_add(self.progressbar.show) self.pulse = gobject.timeout_add(150, self.progressbar_pulse) + gobject.idle_add(self.progressbar.set_text, + 'Create a list of files') for remote_dir in self.remote_dirs: def nlstr(dir_, subdir=None): @@ -383,6 +391,8 @@ class Ftp(threading.Thread): # downloading files for filename in files: + gobject.idle_add(self.progressbar.set_text, + 'Downloading "%s"' % filename) full_filename = os.path.join(local_dir, filename) try: self.ftp.retrbinary('RETR /%s' % filename, diff --git a/ftp_manager/manifest.ini b/ftp_manager/manifest.ini index 3cbb8ed..ebcfe9e 100644 --- a/ftp_manager/manifest.ini +++ b/ftp_manager/manifest.ini @@ -1,7 +1,7 @@ [info] name: Ftp Manager short_name: ftp_manager -version: 0.1.1 +version: 0.1 description: Install and upgrade plugins from ftp authors: Denis Fomin homepage: http://trac-plugins.gajim.org/wiki/