From: konrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Date: Tue, 29 Dec 2009 21:18:24 +0000 (+0000)
Subject: *make interface use its settings from the start
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=67df6bea7a969a445d7479af3a5938673c2859ef;p=web%2Fkonrad%2Fsmoke.git

*make interface use its settings from the start
*fixed config dialog: key im/export
*add clean to unix main makefile


git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@373 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
---

diff --git a/Makefile.unix b/Makefile.unix
index 8216a2d..2bf8f47 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -44,5 +44,12 @@ sdoc:
 	$(DOXYGEN) Doxyfile-php
 	$(DOXYGEN) Doxyfile-cpp
 
+clean:
+	rm -rf zip/Makefile* zip/*.o zip/*.a
+	rm -rf src/.ctmp src/Makefile* src/msmoke src/core*
+	rm -rf src/wob www/inc/wob doc/wob wob/core*
+	rm -rf woc/.ctmp woc/woc woc/core* woc/Makefile*
+	rm -rf doc/source-php doc/source-cpp
+
 #tell Make that the rules above are symbolic:
-.PHONY: woc wob server client sdoc zip
\ No newline at end of file
+.PHONY: woc wob server client sdoc zip
diff --git a/src/dialogs/configdialog.cpp b/src/dialogs/configdialog.cpp
index f3f0750..3b827b0 100644
--- a/src/dialogs/configdialog.cpp
+++ b/src/dialogs/configdialog.cpp
@@ -366,8 +366,8 @@ void MConfigDialog::exportKey()
 	if(!idx.isValid())return;
 	QString pkey=profilemodel->data(idx,Qt::UserRole).toString();
 	st.beginGroup("profiles/"+pkey);
-	QString host=st.value("hostname").toString().trimmed();
-	QString key=st.value("hostkey").toString().trimmed();
+	QString host=hostname->text().trimmed();
+	QString key=hostkey->text().trimmed();
 	saveKey(host,key);
 }
 
@@ -457,6 +457,8 @@ void MConfigDialog::importKey()
 		return;
 	}
 	//save
+	hostname->setText(hname);
+	hostkey->setText(key);
 	QSettings set;
 	set.beginGroup("profiles/"+profkey);
 	set.setValue("hostkey",key);
diff --git a/src/iface/msinterface.cpp b/src/iface/msinterface.cpp
index 1a7afe6..74f4ba0 100644
--- a/src/iface/msinterface.cpp
+++ b/src/iface/msinterface.cpp
@@ -38,6 +38,8 @@ MSInterface::MSInterface(QString pid)
 		);
 	m_host=set.value("hostname").toString();
 	m_hostkey=set.value("hostkey").toString();
+	setLogLevel((LogLevel)set.value("webloglevel",LogOnError).toInt());
+	setWebTimeout(set.value("webtimeout",30).toInt()*1000);
 	sslexcept=new MSslExceptions(dataDir()+"/sslexceptions.xml");
 }