1.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Fri Aug 29 10:56:26 2014 +0100
     1.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Fri Aug 29 11:44:45 2014 +0100
     1.3 @@ -167,10 +167,11 @@
     1.4          trace_file = open(trace_file_name, 'w+')
     1.5  
     1.6          vm_image = Cygwin.cygPath(gvm_mgr.getMachineFolder()) + '/OsecVM.ova'
     1.7 +        
     1.8          initial_import_script = Cygwin.cygPath(os.path.abspath(os.path.join(os.path.split(__file__)[0], 'initial_vm.sh')))
     1.9          Cygwin.bashExecute('\\"' + initial_import_script + '\\" \'' + vm_image + '\'', wait_return = False, stdout = trace_file, stderr = trace_file) 
    1.10 -        gvm_mgr.start()
    1.11          res = '{ "init_log": "' + trace_file_name.replace('\\', '\\\\') + '" }'
    1.12 +        
    1.13          return res
    1.14  
    1.15  

     2.1 --- a/OpenSecurity/bin/ui/configure_dialog.py	Fri Aug 29 10:56:26 2014 +0100
     2.2 +++ b/OpenSecurity/bin/ui/configure_dialog.py	Fri Aug 29 11:44:45 2014 +0100
     2.3 @@ -113,6 +113,7 @@
     2.4          self.ui.btnDownload.clicked.connect(self.clicked_download)
     2.5          self.ui.btnExplorer.clicked.connect(self.clicked_explorer)
     2.6          self.ui.btnImport.clicked.connect(self.clicked_import)
     2.7 +        self.ui.btnInitialize.clicked.connect(self.clicked_initialize)
     2.8          self.ui.btnRefresh.clicked.connect(self.clicked_refresh)
     2.9          self._file_watcher.timeout.connect(self.update_progress)
    2.10  
    2.11 @@ -170,6 +171,22 @@
    2.12  
    2.13          except:
    2.14              pass
    2.15 +    
    2.16 +    def clicked_initialize(self):
    2.17 +
    2.18 +        """Import button has been clicked."""
    2.19 +
    2.20 +        # remove old stuff
    2.21 +        self._file_watched_name = ''
    2.22 +        self._file_watched_size = 0
    2.23 +        self.ui.edtProgress.clear()
    2.24 +
    2.25 +        try:
    2.26 +
    2.27 +            json.load(urllib2.urlopen('http://127.0.0.1:8080/initialize'))
    2.28 +
    2.29 +        except:
    2.30 +            pass
    2.31  
    2.32  
    2.33      def clicked_refresh(self):

     3.1 --- a/OpenSecurity/bin/ui/ui_ConfigureDialog.py	Fri Aug 29 10:56:26 2014 +0100
     3.2 +++ b/OpenSecurity/bin/ui/ui_ConfigureDialog.py	Fri Aug 29 11:44:45 2014 +0100
     3.3 @@ -90,7 +90,11 @@
     3.4          self.btnImport = QtGui.QPushButton(self.tabConfiguration)
     3.5          self.btnImport.setMinimumSize(QtCore.QSize(100, 0))
     3.6          self.btnImport.setObjectName(_fromUtf8("btnImport"))
     3.7 +        self.btnInitialize = QtGui.QPushButton(self.tabConfiguration)
     3.8 +        self.btnInitialize.setMinimumSize(QtCore.QSize(100, 0))
     3.9 +        self.btnInitialize.setObjectName(_fromUtf8("btnInitialize"))
    3.10          self.lyDownload.addWidget(self.btnImport)
    3.11 +        self.lyDownload.addWidget(self.btnInitialize)
    3.12          self.lyTabConfig.addLayout(self.lyDownload)
    3.13          self.lblProgress = QtGui.QLabel(self.tabConfiguration)
    3.14          self.lblProgress.setObjectName(_fromUtf8("lblProgress"))
    3.15 @@ -194,6 +198,7 @@
    3.16          self.tvTemplate.headerItem().setText(3, _translate("ConfigureDialog", "Path", None))
    3.17          self.btnDownload.setText(_translate("ConfigureDialog", "&Download", None))
    3.18          self.btnImport.setText(_translate("ConfigureDialog", "&Import", None))
    3.19 +        self.btnInitialize.setText(_translate("ConfigureDialog", "&Initialize", None))
    3.20          self.lblProgress.setText(_translate("ConfigureDialog", "Progress:", None))
    3.21          self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabConfiguration), _translate("ConfigureDialog", "Configuration", None))
    3.22          self.tvMachines.setSortingEnabled(True)