Changeset 3417

Timestamp:

08/12/08 15:51:52 (5 years ago)

Author:

luis

Message:

Log None, and Debug option done. TODO: Log file -> work with FileHandler?

Location:

branch/PreferencesWindow

Files:

• p.py (modified) (1 diff)
• share/umit/config/umit.conf (modified) (1 diff)
• umit (modified) (3 diffs)
• umitCore/UmitConf.py (modified) (2 diffs)
• umitGUI/MainWindow.py (modified) (2 diffs)
• umitPreferences/GeneralSettings.py (modified) (7 diffs)

branch/PreferencesWindow/p.py

@@ -17 +17 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+
 """
 It's a test to run PreferencesWindows without umit running 

branch/PreferencesWindow/share/umit/config/umit.conf

@@ -90 +90 @@
 warnings = 1
 crash_report = 1
-log = Debug
-log_file = empty 
+log = File
+log_file = umit.log
 warnings_save = 0 
 silent_root = 0

branch/PreferencesWindow/umit

@@ -36 +36 @@
 #########################
 
-UMIT_DEVELOPMENT = os.environ.get("UMIT_DEVELOPMENT", True)
+UMIT_DEVELOPMENT = os.environ.get("UMIT_DEVELOPMENT", False)
 
 class UmitExceptionHook(object):
@@ -109 +109 @@
             extrainfo, '-' * 20, crash_text)
        
-        gs = GeneralSettingsConf()
+        
         if not gs.crash_report:
             return 
@@ -144 +144 @@
             gtk.main_quit()
 
+# Setting the umit home directory
+from umitCore.Paths import Path
+Path.set_umit_conf(os.path.split('umit'))
+gs = GeneralSettingsConf()
 
 if not UMIT_DEVELOPMENT:
     
-    from tempfile import mktemp
-    # Generating temporary files names
-    stdout_output = mktemp()
-    stderr_output = mktemp()
-
-    old_stdout = sys.stdout
-    old_stderr = sys.stderr
-
-    _stdout = open(stdout_output, "w")
-    _stderr = open(stderr_output, "w")
-
-    sys.stdout = _stdout
-    sys.stderr = _stderr
-
+    if gs.log == "None" or gs.log == "File":
+        from tempfile import mktemp
+        # Generating temporary files names
+        stdout_output = mktemp()
+        stderr_output = mktemp()
+    
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+    
+        _stdout = open(stdout_output, "w")
+        _stderr = open(stderr_output, "w")
+    
+        sys.stdout = _stdout
+        sys.stderr = _stderr
+    elif gs.log == "Debug":
+        pass
     
     sys.excepthook = UmitExceptionHook()

branch/PreferencesWindow/umitCore/UmitConf.py

@@ -368 +368 @@
     def set_log(self, log):
         self._set_it("log", log)
-
+        
+    def get_log_file(self):
+        return self._get_it("log_file", "umit.log")
+    def set_log_file(self, filename):
+        self._set_it("log_file", filename)
+    
+    
     def set_warnings_save(self, save):
         self._set_it("warnings_save", self.boolean_sanity(save))
@@ -380 +386 @@
     crash_report = property(get_crash_report, set_crash_report)
     log = property(get_log, set_log)
+    log_file = property(get_log_file, set_log_file)
     warnings_save = property(get_warnings_save, set_warnings_save) 
     

branch/PreferencesWindow/umitGUI/MainWindow.py

@@ -60 +60 @@
 from umitPreferences.PreferencesWindow import PreferencesWindow
 from umitCore.UmitConf import GeneralSettingsConf
-
+gs = GeneralSettingsConf()
 
 root = False
@@ -130 +130 @@
 
     def _verify_root(self):
-        gs = GeneralSettingsConf()
+
         if gs.silent_root:
             return 

branch/PreferencesWindow/umitPreferences/GeneralSettings.py

@@ -72 +72 @@
         self.crash_report = general_settings.crash_report
         self.log = general_settings.log
+        self.log_file = general_settings.log_file
         self.warnings_save = general_settings.warnings_save
         
@@ -123 +124 @@
                                          _('Enable log file'))
         
-        self.__log_file_entry = HIGEntryLabel(_('Log file'))
-        self.__log_file_browser = HIGButton(_('Browse file'))
+        self.__log_file_label = HIGEntryLabel(_('Log file'))
+        self.__log_file_entry = HIGTextEntry()
+        self.__log_file_entry.set_editable(False)
+        # FIXME: Do default file ~/.umit/umit.log
+        self.__log_file_browser = HIGButton(_('Browse file'), \
+                                            gtk.STOCK_DIRECTORY)
+        
+        tmpbox = HIGHBox()
+        tmpbox.pack_start(self.__log_file_entry, False, False)
+        tmpbox.pack_start(self.__log_file_browser, False, False)
+        
+        
         # attach table
         self._box_error.attach(self.__crash_report, 0,1,0,1,\
@@ -134 +145 @@
         self._box_error.attach(self.__log_file, 0,1,3,4,\
                                gtk.FILL|gtk.EXPAND| gtk.SHRINK, gtk.FILL)
-        self._box_error.attach(self.__log_file_entry, 0,1,4,5,\
-                               gtk.FILL|gtk.EXPAND| gtk.SHRINK, gtk.FILL)
-        self._box_error.attach(self.__log_file_browser, 1,2,4,5,\
+        self._box_error.attach(self.__log_file_label, 0,1,4,5,\
+                               gtk.FILL|gtk.EXPAND| gtk.SHRINK, gtk.FILL)
+        self._box_error.attach(tmpbox, 1,2,4,5,\
                                gtk.FILL|gtk.EXPAND| gtk.SHRINK, gtk.FILL)
     def _create_widgets_autosave(self):
@@ -172 +183 @@
         self.__log_terminal.connect('toggled', self.update_log)
         self.__log_no.connect('toggled', self.update_log)
+        
+        self.__log_file_browser.connect('clicked', self.read_file)
+        self.__log_file_entry.connect('changed', self.update_log_file_text)
         self.update_log_file(None)
     # Callbacks
+    def read_file(self, widget):
+        dialog = gtk.FileChooserDialog("Open..",
+                                       None,
+                                       gtk.FILE_CHOOSER_ACTION_SAVE,
+                                       (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                                        gtk.STOCK_SAVE_AS, gtk.RESPONSE_OK))
+        dialog.set_default_response(gtk.RESPONSE_OK)
+        response = dialog.run()
+        if response == gtk.RESPONSE_OK:
+            # Get name of file 
+            self.__log_file_entry.set_text(dialog.get_filename())
+        dialog.destroy()
+
     def update_crash_report(self, widget):
         general_settings.crash_report = self.crash_report
@@ -180 +207 @@
     def update_silent_root(self, widget):
         general_settings.silent_root = self.silent_root
+    def update_log_file_text(self, widget):
+        general_settings.log_file = self.log_file
     def update_log_file(self, widget):
         if not self.__log_file.get_active():
@@ -249 +278 @@
             
     def __log_file_active(self, bool):
+        self.__log_file_label.set_sensitive(bool)
         self.__log_file_entry.set_sensitive(bool)
         self.__log_file_browser.set_sensitive(bool)
-        
+
+    def set_log_file(self, filename):
+        print "setting log file"
+        self.__log_file_entry.set_text(filename)
+    def get_log_file(self):
+        return self.__log_file_entry.get_text()
+    
     def set_warnings_save(self, save):
         pass
@@ -264 +300 @@
     crash_report = property(get_crash_report, set_crash_report)
     log = property(get_log, set_log)
+    log_file = property(get_log_file, set_log_file)
     warnings_save = property(get_warnings_save, set_warnings_save)