# HG changeset patch
# User BarthaM@N3SIM1218.D03.arc.local
# Date 1409309085 -3600
# Node ID f5805ee62d80c251ab98fa4af587edef587ffff5
# Parent  9480e5ba1a82bfa9bec9e16a9bf0eb9ef5d42447
Added temporary Initialize button to Tray. has to be clicked after import to start the system.
Rewrite of the init.sh script in progress.

diff -r 9480e5ba1a82 -r f5805ee62d80 OpenSecurity/bin/opensecurityd.pyw
--- a/OpenSecurity/bin/opensecurityd.pyw	Fri Aug 29 10:56:26 2014 +0100
+++ b/OpenSecurity/bin/opensecurityd.pyw	Fri Aug 29 11:44:45 2014 +0100
@@ -167,10 +167,11 @@
         trace_file = open(trace_file_name, 'w+')
 
         vm_image = Cygwin.cygPath(gvm_mgr.getMachineFolder()) + '/OsecVM.ova'
+        
         initial_import_script = Cygwin.cygPath(os.path.abspath(os.path.join(os.path.split(__file__)[0], 'initial_vm.sh')))
         Cygwin.bashExecute('\\"' + initial_import_script + '\\" \'' + vm_image + '\'', wait_return = False, stdout = trace_file, stderr = trace_file) 
-        gvm_mgr.start()
         res = '{ "init_log": "' + trace_file_name.replace('\\', '\\\\') + '" }'
+        
         return res
 
 
diff -r 9480e5ba1a82 -r f5805ee62d80 OpenSecurity/bin/ui/configure_dialog.py
--- a/OpenSecurity/bin/ui/configure_dialog.py	Fri Aug 29 10:56:26 2014 +0100
+++ b/OpenSecurity/bin/ui/configure_dialog.py	Fri Aug 29 11:44:45 2014 +0100
@@ -113,6 +113,7 @@
         self.ui.btnDownload.clicked.connect(self.clicked_download)
         self.ui.btnExplorer.clicked.connect(self.clicked_explorer)
         self.ui.btnImport.clicked.connect(self.clicked_import)
+        self.ui.btnInitialize.clicked.connect(self.clicked_initialize)
         self.ui.btnRefresh.clicked.connect(self.clicked_refresh)
         self._file_watcher.timeout.connect(self.update_progress)
 
@@ -170,6 +171,22 @@
 
         except:
             pass
+    
+    def clicked_initialize(self):
+
+        """Import button has been clicked."""
+
+        # remove old stuff
+        self._file_watched_name = ''
+        self._file_watched_size = 0
+        self.ui.edtProgress.clear()
+
+        try:
+
+            json.load(urllib2.urlopen('http://127.0.0.1:8080/initialize'))
+
+        except:
+            pass
 
 
     def clicked_refresh(self):
diff -r 9480e5ba1a82 -r f5805ee62d80 OpenSecurity/bin/ui/ui_ConfigureDialog.py
--- a/OpenSecurity/bin/ui/ui_ConfigureDialog.py	Fri Aug 29 10:56:26 2014 +0100
+++ b/OpenSecurity/bin/ui/ui_ConfigureDialog.py	Fri Aug 29 11:44:45 2014 +0100
@@ -90,7 +90,11 @@
         self.btnImport = QtGui.QPushButton(self.tabConfiguration)
         self.btnImport.setMinimumSize(QtCore.QSize(100, 0))
         self.btnImport.setObjectName(_fromUtf8("btnImport"))
+        self.btnInitialize = QtGui.QPushButton(self.tabConfiguration)
+        self.btnInitialize.setMinimumSize(QtCore.QSize(100, 0))
+        self.btnInitialize.setObjectName(_fromUtf8("btnInitialize"))
         self.lyDownload.addWidget(self.btnImport)
+        self.lyDownload.addWidget(self.btnInitialize)
         self.lyTabConfig.addLayout(self.lyDownload)
         self.lblProgress = QtGui.QLabel(self.tabConfiguration)
         self.lblProgress.setObjectName(_fromUtf8("lblProgress"))
@@ -194,6 +198,7 @@
         self.tvTemplate.headerItem().setText(3, _translate("ConfigureDialog", "Path", None))
         self.btnDownload.setText(_translate("ConfigureDialog", "&Download", None))
         self.btnImport.setText(_translate("ConfigureDialog", "&Import", None))
+        self.btnInitialize.setText(_translate("ConfigureDialog", "&Initialize", None))
         self.lblProgress.setText(_translate("ConfigureDialog", "Progress:", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabConfiguration), _translate("ConfigureDialog", "Configuration", None))
         self.tvMachines.setSortingEnabled(True)