From 0b457357a9d0fbccc554c1d5cfc9f09ddf323102 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Tue, 23 Aug 2005 13:22:14 +0000 Subject: [PATCH] save last dir used for emoticons, sounds, sending file, recv files in config and if empty use $HOME. no more bad paths (the dir were we started Gajim, no more saving such info only per session) --- src/common/config.py | 4 ++++ src/config.py | 16 ++++++++++++++++ src/filetransfers_window.py | 16 ++++++++-------- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/common/config.py b/src/common/config.py index e1fcf342e..334d22939 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -135,6 +135,10 @@ class Config: 'use_kib_mib': [opt_bool, False], 'notify_on_all_muc_messages': [opt_bool, False], 'trayicon_notification_on_new_messages': [opt_bool, True], + 'last_save_dir': [opt_str, ''], + 'last_send_dir': [opt_str, ''], + 'last_emoticons_dir': [opt_str, ''], + 'last_sounds_dir': [opt_str, ''], } __options_per_key = { diff --git a/src/config.py b/src/config.py index dd5fa59a7..3f8a7213e 100644 --- a/src/config.py +++ b/src/config.py @@ -991,6 +991,12 @@ class PreferencesWindow: (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK)) dialog.set_default_response(gtk.RESPONSE_OK) + last_sounds_dir = gajim.config.get('last_sounds_dir') + if last_sounds_dir and os.path.isdir('last_sounds_dir'): + dialog.set_current_folder(last_sounds_dir) + else: + home_dir = os.path.expanduser('~') + dialog.set_current_folder(home_dir) filter = gtk.FileFilter() filter.set_name(_('All files')) @@ -1015,6 +1021,8 @@ class PreferencesWindow: break dialog.destroy() if file: + directory = os.path.dirname(file) + gajim.config.set('last_sounds_dir', directory) self.xml.get_widget('sounds_entry').set_text(file) model.set_value(iter, 2, file) model.set_value(iter, 1, 1) @@ -1943,6 +1951,12 @@ class ManageEmoticonsWindow: (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK)) dialog.set_default_response(gtk.RESPONSE_OK) + last_emoticons_dir = gajim.config.get('last_emoticons_dir') + if last_emoticons_dir and os.path.isdir('last_emoticons_dir'): + dialog.set_current_folder(last_emoticons_dir) + else: + home_dir = os.path.expanduser('~') + dialog.set_current_folder(home_dir) filter = gtk.FileFilter() filter.set_name(_('All files')) filter.add_pattern('*') @@ -1979,6 +1993,8 @@ class ManageEmoticonsWindow: ok = True dialog.destroy() if file: + directory = os.path.dirname(file) + gajim.config.set('last_emoticons_dir', directory) model.set_value(iter, 1, file) img = gtk.Image() img.show() diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py index ff6fa63e1..ce512a09d 100644 --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -43,8 +43,6 @@ class FileTransfersWindow: self.files_props = {'r' : {}, 's': {}} self.plugin = plugin self.height_diff = 0 - self.last_save_dir = None - self.last_send_dir = None self.xml = gtk.glade.XML(GTKGUI_GLADE, 'file_transfers_window', APP) self.window = self.xml.get_widget('file_transfers_window') self.tree = self.xml.get_widget('transfers_list') @@ -197,14 +195,15 @@ _('Connection with peer cannot be established.')) def show_file_send_request(self, account, contact): #FIXME: user better name for this function #atm it's like it shows popup for incoming file transfer request + last_send_dir = gajim.config.get('last_send_dir') dialog = gtk.FileChooserDialog(title=_('Choose File to Send...'), action=gtk.FILE_CHOOSER_ACTION_OPEN, buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) butt = dialog.add_button(_('Send'), gtk.RESPONSE_OK) butt.set_use_stock(True) dialog.set_default_response(gtk.RESPONSE_OK) - if self.last_send_dir and os.path.isdir(self.last_send_dir): - dialog.set_current_folder(self.last_send_dir) + if last_send_dir and os.path.isdir(last_send_dir): + dialog.set_current_folder(last_send_dir) else: home_dir = os.path.expanduser('~') dialog.set_current_folder(home_dir) @@ -214,7 +213,7 @@ _('Connection with peer cannot be established.')) file_path = unicode(dialog.get_filename(), 'utf-8') (file_dir, file_name) = os.path.split(file_path) if file_dir: - self.last_send_dir = file_dir + gajim.config.set('last_send_dir', file_dir) dialog.destroy() self.send_file(account, contact, file_path) else: @@ -233,6 +232,7 @@ _('Connection with peer cannot be established.')) file requested by a contact''' if file_props is None or not file_props.has_key('name'): return + last_save_dir = gajim.config.get('last_save_dir') sec_text = '\t' + _('File: %s') % \ gtkgui_helpers.escape_for_pango_markup(file_props['name']) if file_props.has_key('size'): @@ -253,8 +253,8 @@ _('Connection with peer cannot be established.')) gtk.STOCK_SAVE, gtk.RESPONSE_OK)) dialog.set_current_name(file_props['name']) dialog.set_default_response(gtk.RESPONSE_OK) - if self.last_save_dir and os.path.isdir(self.last_save_dir): - dialog.set_current_folder(self.last_save_dir) + if last_save_dir and os.path.isdir(last_save_dir): + dialog.set_current_folder(last_save_dir) else: home_dir = os.path.expanduser('~') dialog.set_current_folder(home_dir) @@ -270,7 +270,7 @@ _('Connection with peer cannot be established.')) continue (file_dir, file_name) = os.path.split(file_path) if file_dir: - self.last_save_dir = file_dir + gajim.config.set('last_save_dir', file_dir) file_props['file-name'] = file_path.decode('utf-8') self.add_transfer(account, contact, file_props) gajim.connections[account].send_file_approval(file_props)