diff --git a/options/default.xml b/options/default.xml
index f4b71f53..387793a0 100644
--- a/options/default.xml
+++ b/options/default.xml
@@ -19,7 +19,7 @@
- true
+ false
false
@@ -89,7 +89,7 @@
true
- false
+ true
true
@@ -137,7 +137,7 @@ QWidget#bottomFrame>QWidget>QTextEdit[correction="true"] {
auto
- 5
+ 10
@@ -217,7 +217,7 @@ QLineEdit#le_status_text {
false
false
true
- true
+ false
status
false
true
@@ -257,7 +257,7 @@ QLineEdit#le_status_text {
false
false
true
- false
+ true
true
64
@@ -293,7 +293,7 @@ QLineEdit#le_status_text {
true
- true
+ false
true
@@ -344,7 +344,7 @@ QLineEdit#le_status_text {
true
- true
+ false
false
true
@@ -362,8 +362,8 @@ QLineEdit#le_status_text {
- #f0f0f0
- #5a5a5a
+ #00007f
+ #969696
#969696
@@ -373,16 +373,16 @@ QLineEdit#le_status_text {
#004bb4
#7e0000
#646464
-
+ #ffffff
- #000000
+ #6f0000
#969696
#808080
true
#e9ecc7
- #000000
+ #ffffff
@@ -393,21 +393,21 @@ QLineEdit#le_status_text {
- Red
#910000
- #00008a
+ #00aaff
#336600
- black
+ #cccccc
- #0000ff
+ #0055ff
#ff0000
#008000
#606060
#FF0000
- #000080
+ #55ffff
#400080
- darkGreen
+ #cccccc
red
grey
@@ -420,10 +420,10 @@ QLineEdit#le_status_text {
false
- Sans Serif,11,-1,5,50,0,0,0,0,0
- Sans Serif,11,-1,5,50,0,0,0,0,0
- Sans Serif,11,-1,5,50,0,0,0,0,0
- Sans Serif,9,-1,5,50,0,0,0,0,0
+ Monospace,@faceSize@,-1,5,50,0,0,0,0,0
+ Monospace,@faceSize@,-1,5,50,0,0,0,0,0
+ Monospace,@faceSize@,-1,5,50,0,0,0,0,0
+ Monospace,@faceSize@,-1,5,50,0,0,0,0,0
@@ -471,20 +471,20 @@ QLineEdit#le_status_text {
false
- sound/chat2.wav
- sound/chat2.wav
- sound/ft_complete.wav
- sound/offline.wav
- sound/online.wav
- true
- sound/ft_incoming.wav
- sound/chat2.wav
- sound/chat2.wav
- sound/chat1.wav
+
+
+
+
+
+ false
+
+
+
+
false
- sound/send.wav
- false
- sound/chat2.wav
+
+ true
+
true
@@ -504,7 +504,7 @@ QLineEdit#le_status_text {
close
detach
- CM
+ ACM
@@ -735,7 +735,7 @@ QLineEdit#le_status_text {
true
- false
+ true
false
true
true
@@ -758,7 +758,20 @@ QLineEdit#le_status_text {
true
false
-
+
+
+ zone
+ false
+ dnd
+ In The Zone[TM]
+
+
+ sleep
+ false
+ offline
+ Sleeping the hell out of here.
+
+
submenu
false
true
@@ -797,5 +810,9 @@ QLineEdit#le_status_text {
-
+
+
+ true
+
+
diff --git a/src/psi_profiles.cpp b/src/psi_profiles.cpp
index 97c44218..d5fa9d53 100644
--- a/src/psi_profiles.cpp
+++ b/src/psi_profiles.cpp
@@ -74,8 +74,8 @@ void UserAccount::reset()
req_mutual_auth = false;
legacy_ssl_probe = false;
security_level = QCA::SL_None;
- ssl = SSL_Auto;
- jid = "";
+ ssl = SSL_Yes;
+ jid = "@jid@";
pass = "";
scramSaltedHashPassword = "";
opt_pass = false;
@@ -85,7 +85,7 @@ void UserAccount::reset()
opt_automatic_resource = true;
priority_dep_on_status = true;
ignore_global_actions = false;
- resource = ApplicationInfo::name();
+ resource = "@resource@";
priority = 55;
ibbOnly = false;
opt_keepAlive = true;
@@ -128,7 +128,7 @@ void UserAccount::reset()
<< "stun.voipbuster.com"
<< "stun.voxgratia.org";
- stunHost = stunHosts[0];
+ stunHost = "";
pgpKnownKeys.clear();
pgpEnabledChats.clear();