OpenSecurity/bin/ui/configure_dialog.py
changeset 221 853af9cfab6a
parent 220 f5805ee62d80
child 240 d7ef04254e9c
     1.1 --- a/OpenSecurity/bin/ui/configure_dialog.py	Fri Aug 29 11:44:45 2014 +0100
     1.2 +++ b/OpenSecurity/bin/ui/configure_dialog.py	Fri Sep 05 12:28:30 2014 +0100
     1.3 @@ -113,7 +113,7 @@
     1.4          self.ui.btnDownload.clicked.connect(self.clicked_download)
     1.5          self.ui.btnExplorer.clicked.connect(self.clicked_explorer)
     1.6          self.ui.btnImport.clicked.connect(self.clicked_import)
     1.7 -        self.ui.btnInitialize.clicked.connect(self.clicked_initialize)
     1.8 +        self.ui.btnUpdate.clicked.connect(self.clicked_update)
     1.9          self.ui.btnRefresh.clicked.connect(self.clicked_refresh)
    1.10          self._file_watcher.timeout.connect(self.update_progress)
    1.11  
    1.12 @@ -164,17 +164,15 @@
    1.13          self.ui.edtProgress.clear()
    1.14  
    1.15          try:
    1.16 -
    1.17 -            # get general server info
    1.18              j = json.load(urllib2.urlopen('http://127.0.0.1:8080/init'))
    1.19              self._file_watched_name = str(j['init_log'])
    1.20 -
    1.21          except:
    1.22              pass
    1.23      
    1.24 -    def clicked_initialize(self):
    1.25 +    
    1.26 +    def clicked_update(self):
    1.27  
    1.28 -        """Import button has been clicked."""
    1.29 +        """Update button has been clicked."""
    1.30  
    1.31          # remove old stuff
    1.32          self._file_watched_name = ''
    1.33 @@ -182,9 +180,8 @@
    1.34          self.ui.edtProgress.clear()
    1.35  
    1.36          try:
    1.37 -
    1.38 -            json.load(urllib2.urlopen('http://127.0.0.1:8080/initialize'))
    1.39 -
    1.40 +            j = json.load(urllib2.urlopen('http://127.0.0.1:8080/update_template'))
    1.41 +            self._file_watched_name = str(j['init_log'])
    1.42          except:
    1.43              pass
    1.44