merge
authorOliver Maurhart <oliver.maurhart@ait.ac.at>
Wed, 02 Apr 2014 12:53:05 +0200
changeset 121416dabc5e844
parent 120 52c1face04d3
parent 119 8f1bb21bd395
child 122 d14cb9350dd4
merge
     1.1 --- a/OpenSecurity/bin/ui/configure_dialog.py	Wed Apr 02 12:52:22 2014 +0200
     1.2 +++ b/OpenSecurity/bin/ui/configure_dialog.py	Wed Apr 02 12:53:05 2014 +0200
     1.3 @@ -144,7 +144,20 @@
     1.4      def clicked_import(self):
     1.5  
     1.6          """Import button has been clicked."""
     1.7 -        print('clicked_import()')
     1.8 +
     1.9 +        # remove old stuff
    1.10 +        self._file_watched_name = ''
    1.11 +        self._file_watched_size = 0
    1.12 +        self.ui.edtProgress.clear()
    1.13 +
    1.14 +        try:
    1.15 +
    1.16 +            # get general server info
    1.17 +            j = json.load(urllib2.urlopen('http://127.0.0.1:8080/init'))
    1.18 +            self._file_watched_name = str(j['init_log'])
    1.19 +
    1.20 +        except:
    1.21 +            pass
    1.22  
    1.23  
    1.24      def clicked_refresh(self):