From 51376bd2beaf1d069a51fadee8301ac5324ddff3 Mon Sep 17 00:00:00 2001 From: Alex Dedul Date: Fri, 10 Aug 2007 03:38:08 +0000 Subject: [PATCH] Ask user to set his file manager in case he didn't set it yet when trying to open folder. Based on the patch from eternalswd, thanks. --- glade/preferences_dialog.glade | 3 ++- src/common.py | 2 +- src/interface.py | 14 +++++++++++--- src/pref.py | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/glade/preferences_dialog.glade b/glade/preferences_dialog.glade index 285848715..b637792d8 100644 --- a/glade/preferences_dialog.glade +++ b/glade/preferences_dialog.glade @@ -2315,7 +2315,8 @@ HTTP W/ Auth True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Konqueror + -- Choose one -- +Konqueror Nautilus Thunar diff --git a/src/common.py b/src/common.py index 06954d9dc..8651bc3fe 100644 --- a/src/common.py +++ b/src/common.py @@ -179,4 +179,4 @@ class EncLevel: class ProxyType: none, socks4, socks5, socks5_pw, http, http_pw = range(6) class FileManager: - konqueror, nautilus, thunar = range(3) + choose_one, konqueror, nautilus, thunar = range(4) diff --git a/src/interface.py b/src/interface.py index d5ccba718..1e52b1c5c 100644 --- a/src/interface.py +++ b/src/interface.py @@ -625,11 +625,19 @@ class DelugeGTK: def open_folder(self, widget): if self.config.get("open_folder_stock"): - if self.config.get("file_manager") == 0: + if self.config.get("file_manager") == common.FileManager.choose_one: + msgBox = gtk.MessageDialog(parent = None, buttons = gtk.BUTTONS_OK, + message_format = (_("Please set a default file manager in the Other tab in the Preferences."))) + msgBox.set_position(gtk.WIN_POS_CENTER_ALWAYS) + msgBox.set_transient_for(self.window) + msgBox.run() + msgBox.destroy() + return + if self.config.get("file_manager") == common.FileManager.konqueror: file_manager = "konqueror" - if self.config.get("file_manager") == 1: + if self.config.get("file_manager") == common.FileManager.nautilus: file_manager = "nautilus" - if self.config.get("file_manager") == 2: + if self.config.get("file_manager") == common.FileManager.thunar: file_manager = "thunar" elif self.config.get("open_folder_custom"): file_manager = self.config.get("open_folder_location") diff --git a/src/pref.py b/src/pref.py index 468d17e23..f222f2ca0 100644 --- a/src/pref.py +++ b/src/pref.py @@ -40,7 +40,7 @@ import common import os.path DEFAULT_PREFS = { - "file_manager" : common.FileManager.nautilus, + "file_manager" : common.FileManager.choose_one, "open_folder_stock" : True, "open_folder_custom" : False, "open_folder_location": "",