1.1 --- a/OpenSecurity/bin/ui/configure_dialog.py	Thu Jun 12 12:47:43 2014 +0200
     1.2 +++ b/OpenSecurity/bin/ui/configure_dialog.py	Wed Jun 25 19:21:04 2014 +0200
     1.3 @@ -59,6 +59,7 @@
     1.4  
     1.5  import json
     1.6  import os
     1.7 +import subprocess
     1.8  import sys
     1.9  import urllib2
    1.10  
    1.11 @@ -103,13 +104,14 @@
    1.12          self._file_watched_name = ''
    1.13          self._file_watched_size = 0
    1.14          self._file_watcher = QtCore.QTimer(self)
    1.15 -        self._service_log_path = ''
    1.16 +        self._service_log_file = ''
    1.17          self._service_log_size = 0
    1.18  
    1.19          # connectors
    1.20          self.ui.btnAbout.clicked.connect(self.clicked_about)
    1.21          self.ui.btnClose.clicked.connect(self.accept)
    1.22          self.ui.btnDownload.clicked.connect(self.clicked_download)
    1.23 +        self.ui.btnExplorer.clicked.connect(self.clicked_explorer)
    1.24          self.ui.btnImport.clicked.connect(self.clicked_import)
    1.25          self.ui.btnRefresh.clicked.connect(self.clicked_refresh)
    1.26          self._file_watcher.timeout.connect(self.update_progress)
    1.27 @@ -144,6 +146,13 @@
    1.28              pass
    1.29  
    1.30  
    1.31 +    def clicked_explorer(self):
    1.32 +
    1.33 +        """Explorer button has been clicked."""
    1.34 +        if sys.platform == 'win32' or sys.platform == 'cygwin':
    1.35 +            subprocess.Popen([os.path.join(os.environ['WINDIR'], 'explorer.exe'), self._service_log_path])
    1.36 +
    1.37 +
    1.38      def clicked_import(self):
    1.39  
    1.40          """Import button has been clicked."""
    1.41 @@ -181,7 +190,8 @@
    1.42              self.ui.edtStatus.setEnabled(True)
    1.43              self.ui.edtVersion.setText(j['os_server']['version'])
    1.44              self.ui.edtVersion.setEnabled(True)
    1.45 -            self._service_log_path = os.path.join(j['os_server']['current log folder'], 'OpenSecurity.log')
    1.46 +            self._service_log_path = j['os_server']['current log folder']
    1.47 +            self._service_log_file = os.path.join(self._service_log_path, 'OpenSecurity.log')
    1.48              self._service_log_size = 0
    1.49  
    1.50              # get initial template info
    1.51 @@ -216,10 +226,10 @@
    1.52          # This is terrible. 
    1.53  
    1.54          # first the service log
    1.55 -        if self._service_log_path != '':
    1.56 -            file_size = os.stat(self._service_log_path).st_size
    1.57 +        if self._service_log_file != '':
    1.58 +            file_size = os.stat(self._service_log_file).st_size
    1.59              if file_size > self._service_log_size:
    1.60 -                f = open(self._service_log_path, 'r')
    1.61 +                f = open(self._service_log_file, 'r')
    1.62                  f.seek(self._service_log_size)
    1.63                  self.ui.edtLog.appendPlainText(f.read())
    1.64                  self._service_log_size = file_size
    1.65 @@ -233,9 +243,8 @@
    1.66              return
    1.67  
    1.68          f = open(self._file_watched_name, 'r')
    1.69 -        f.seek(self._file_watched_size)
    1.70 -        self.ui.edtProgress.appendPlainText(f.read())
    1.71 -        #self.ui.edtProgress.verticalScrollBar().setValue(self.ui.edtProgress.verticalScrollBar().maximum())
    1.72 +        self.ui.edtProgress.setPlainText(f.read())
    1.73 +        self.ui.edtProgress.verticalScrollBar().setValue(self.ui.edtProgress.verticalScrollBar().maximum())
    1.74          self._file_watched_size = file_size
    1.75  
    1.76