fixed default alternative nicknames

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4209 17fca916-40b9-46aa-a4ea-0a15b648b75c

8 files changed, 47 insertions, 59 deletions

diff --git a/src/kvilib/config/kvi_defaults.h b/src/kvilib/config/kvi_defaults.h
index 01ee4ce93..effb0de64 100644
--- a/src/kvilib/config/kvi_defaults.h
+++ b/src/kvilib/config/kvi_defaults.h
@@ -34,10 +34,11 @@
 *
 * \def KVI_HOME_CONFIG_FILE_NAME Configuration file in home directory
 * \def KVI_DEFAULT_INCOMING_SUBDIRECTORY_NAME Directory for incoming DCC files
-* \def KVI_DEFAULT_NICKNAME1 Nickname
-* \def KVI_DEFAULT_NICKNAME2 Alternative nickname 2
-* \def KVI_DEFAULT_NICKNAME3 Alternative nickname 3
-* \def KVI_DEFAULT_NICKNAME4 Alternative nickname 4
+* \def KVI_DEFAULT_NICKNAME_TOKEN The substitution token for default nicknames
+* \def KVI_DEFAULT_NICKNAME1 Default Nickname
+* \def KVI_DEFAULT_NICKNAME2 Alternative nickname 2 token
+* \def KVI_DEFAULT_NICKNAME3 Alternative nickname 3 token
+* \def KVI_DEFAULT_NICKNAME4 Alternative nickname 4 token
 * \def KVI_DEFAULT_USERNAME Username
 * \def KVI_DEFAULT_REALNAME Realname
 * \def KVI_DEFAULT_PART_MESSAGE Part message
@@ -63,6 +64,8 @@
 
 #define KVI_DEFAULT_INCOMING_SUBDIRECTORY_NAME "Downloads"
 
+#define KVI_DEFAULT_NICKNAME_TOKEN "%nick%"
+
 #define KVI_DEFAULT_NICKNAME1 "newbie"
 #define KVI_DEFAULT_NICKNAME2 "%nick%|2"
 #define KVI_DEFAULT_NICKNAME3 "%nick%|3"
diff --git a/src/kvilib/irc/kvi_useridentity.cpp b/src/kvilib/irc/kvi_useridentity.cpp
index f43f4265c..ca2bdfa03 100644
--- a/src/kvilib/irc/kvi_useridentity.cpp
+++ b/src/kvilib/irc/kvi_useridentity.cpp
@@ -174,9 +174,10 @@ const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
 
 	ret->setId(__tr2qs("Default"));
 	ret->setNickName(KVI_DEFAULT_NICKNAME1);
-	ret->setAltNickName1(KVI_DEFAULT_NICKNAME2);
-	ret->setAltNickName2(KVI_DEFAULT_NICKNAME3);
-	ret->setAltNickName3(KVI_DEFAULT_NICKNAME4);
+
+	ret->setAltNickName1(QString(KVI_DEFAULT_NICKNAME2).replace(KVI_DEFAULT_NICKNAME_TOKEN, KVI_DEFAULT_NICKNAME1));
+	ret->setAltNickName2(QString(KVI_DEFAULT_NICKNAME3).replace(KVI_DEFAULT_NICKNAME_TOKEN, KVI_DEFAULT_NICKNAME1));
+	ret->setAltNickName3(QString(KVI_DEFAULT_NICKNAME4).replace(KVI_DEFAULT_NICKNAME_TOKEN, KVI_DEFAULT_NICKNAME1));
 	ret->setUserName(KVI_DEFAULT_USERNAME);
 	ret->setRealName(KVI_DEFAULT_REALNAME);
 	ret->setPartMessage(KVI_DEFAULT_PART_MESSAGE);
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index baae6caf2..c00ae6866 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -1156,21 +1156,19 @@ void KviIrcConnection::loginToIrcServer()
 			m_pUserInfo->setNickName(pNet->nickName());
 			m_pStateData->setLoginNickIndex(0);
 		} else {
-			KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
-			if(KVI_OPTION_STRING(KviOption_stringNickname1).isEmpty())
+			if(KVI_OPTION_STRING(KviOption_stringNickname1).trimmed().isEmpty())
 				KVI_OPTION_STRING(KviOption_stringNickname1) = KVI_DEFAULT_NICKNAME1;
-			m_pUserInfo->setNickName(KVI_OPTION_STRING(KviOption_stringNickname1));
+			m_pUserInfo->setNickName(KVI_OPTION_STRING(KviOption_stringNickname1).trimmed());
 			m_pStateData->setLoginNickIndex(1);
 		}
 	}
 
 	// Real name
-	pServer->m_szRealName.trimmed();
-	if(!pServer->m_szRealName.isEmpty())
+	if(!pServer->m_szRealName.trimmed().isEmpty())
 	{
 		if(!_OUTPUT_MUTE)
 			m_pConsole->output(KVI_OUT_VERBOSE,__tr2qs("Using server specific real name (%Q)"),&(pServer->m_szRealName));
-		m_pUserInfo->setRealName(pServer->m_szRealName);
+		m_pUserInfo->setRealName(pServer->m_szRealName.trimmed());
 	} else {
 		if(!pNet->realName().isEmpty())
 		{
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index c8a9894f4..0ac3c708e 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -349,9 +349,9 @@ KviStringOption g_stringOptionsTable[KVI_NUM_STRING_OPTIONS]=
 {
 	STRING_OPTION("UNUSED:FrameCaption","",KviOption_sectFlagFrame),
 	STRING_OPTION("Nickname1",KVI_DEFAULT_NICKNAME1,KviOption_sectFlagUser),
-	STRING_OPTION("Nickname2",KVI_DEFAULT_NICKNAME2,KviOption_sectFlagUser),
-	STRING_OPTION("Nickname3",KVI_DEFAULT_NICKNAME3,KviOption_sectFlagUser),
-	STRING_OPTION("Nickname4",KVI_DEFAULT_NICKNAME4,KviOption_sectFlagUser),
+	STRING_OPTION("Nickname2","",KviOption_sectFlagUser),
+	STRING_OPTION("Nickname3","",KviOption_sectFlagUser),
+	STRING_OPTION("Nickname4","",KviOption_sectFlagUser),
 	STRING_OPTION("Username",KVI_DEFAULT_USERNAME,KviOption_sectFlagUser),
 	STRING_OPTION("Realname",KVI_DEFAULT_REALNAME,KviOption_sectFlagUser),
 	STRING_OPTION("LocalHostIp","127.0.0.1",KviOption_sectFlagIrcSocket),
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index 0565347ff..7ea313e5e 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -921,41 +921,39 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg)
 		{
 			case 0:
 				// used a server specific nickname
-				KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
-				if(KVI_OPTION_STRING(KviOption_stringNickname1).isEmpty())
+				;
+				if(KVI_OPTION_STRING(KviOption_stringNickname1).trimmed().isEmpty())
 					KVI_OPTION_STRING(KviOption_stringNickname1) = KVI_DEFAULT_NICKNAME1;
-				szNextNick = KVI_OPTION_STRING(KviOption_stringNickname1);
+				szNextNick = KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
 				uNickCnt = 1;
+				break;
 			case 1:
 				// used the first nickname of the identity
-				KVI_OPTION_STRING(KviOption_stringNickname2).trimmed();
-				if(KVI_OPTION_STRING(KviOption_stringNickname2).isEmpty())
-					KVI_OPTION_STRING(KviOption_stringNickname2) = KVI_DEFAULT_NICKNAME2;
-				szNextNick = KVI_OPTION_STRING(KviOption_stringNickname2);
 				uNickCnt = 2;
-			break;
+				if(!KVI_OPTION_STRING(KviOption_stringNickname2).trimmed().isEmpty())
+				{
+					szNextNick = KVI_OPTION_STRING(KviOption_stringNickname2).trimmed();
+					break;
+				}
 			case 2:
-				// used the second nickname of the identity
-				KVI_OPTION_STRING(KviOption_stringNickname3).trimmed();
-				if(KVI_OPTION_STRING(KviOption_stringNickname3).isEmpty())
-					KVI_OPTION_STRING(KviOption_stringNickname3) = KVI_DEFAULT_NICKNAME3;
-				szNextNick = KVI_OPTION_STRING(KviOption_stringNickname3);
 				uNickCnt = 3;
-			break;
+				// used the second nickname of the identity
+				if(!KVI_OPTION_STRING(KviOption_stringNickname3).trimmed().isEmpty())
+				{
+					szNextNick = KVI_OPTION_STRING(KviOption_stringNickname3).trimmed();
+					break;
+				}
 			default:
-			{
 				// used all the nicknames of the identity
 				// fall back to a random string...
 				szNextNick = msg->safeParam(1);
-				szNextNick.trimmed();
-				if(szNextNick.isEmpty()) szNextNick = KVI_DEFAULT_NICKNAME1;
-				szNextNick = szNextNick.left(7);
+				if(szNextNick.trimmed().isEmpty()) szNextNick = KVI_DEFAULT_NICKNAME1;
+				szNextNick = szNextNick.trimmed().left(7);
 				QString num;
 				num.setNum(msg->connection()->stateData()->loginNickIndex());
 				szNextNick.append(num);
 				uNickCnt = msg->connection()->stateData()->loginNickIndex() + 1;
-			}
-			break;
+				break;
 		}
 	}
 
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 1f886beb4..261f8ae75 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -106,8 +106,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 			return false;
 		} else {
 			// -c or -n , grab a local nick from somewhere
-			d->szLocalNick  = KVI_OPTION_STRING(KviOption_stringNickname1);
-			d->szLocalNick.trimmed();
+			d->szLocalNick  = KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
 			if(d->szLocalNick.isEmpty())d->szLocalNick = KVI_DEFAULT_NICKNAME1;
 			d->szLocalUser  = __tr2qs_ctx("unknown","dcc"); // we can live without it
 			d->szLocalHost  = d->szLocalUser;  // we can live without it
@@ -1293,8 +1292,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 		if(!(c->hasSwitch('c') || c->hasSwitch('n')))return c->notConnectedToServer();
 		else {
 			// -c or -n , grab a local nick from somewhere
-			d->szLocalNick  = KVI_OPTION_STRING(KviOption_stringNickname1);
-			d->szLocalNick.trimmed();
+			d->szLocalNick  = KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
 			if(d->szLocalNick.isEmpty())d->szLocalNick = KVI_DEFAULT_NICKNAME1;
 			d->szLocalUser  = __tr("unknown"); // we can live without it
 			d->szLocalHost  = d->szLocalUser;  // we can live without it
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index 8a45ca237..4a3125307 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -50,7 +50,7 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
 	connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,SLOT(setEnabled(bool)));
 	connect(m_pEnableCustomAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool)));
 
-	m_pCustomAwayNick = addStringSelector(g,__tr2qs_ctx("Custom nickname (%%nick%% means a current nick):","options"),KviOption_stringCustomAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway) && !(KVI_OPTION_BOOL(KviOption_boolAutoGeneratedAwayNick)));
+	m_pCustomAwayNick = addStringSelector(g,__tr2qs_ctx("Custom nickname (%nick% means a current nick):","options"),KviOption_stringCustomAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway) && !(KVI_OPTION_BOOL(KviOption_boolAutoGeneratedAwayNick)));
 
 	addRowSpacer(0,4,0,4);
 }
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 2ab756fd5..adbe20879 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -1060,16 +1060,13 @@ void KviSetupWizard::accept()
 			m_pLanguagesSelector->commit();
 			//m_pOtherInfoSelector->commit();
 
-			KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
-			KVI_OPTION_STRING(KviOption_stringNickname1).replace(" ","");
+			KVI_OPTION_STRING(KviOption_stringNickname1) = KVI_OPTION_STRING(KviOption_stringNickname1).trimmed();
 
 			if(KVI_OPTION_STRING(KviOption_stringNickname1).length() > 32)
-			{
-				QString tmp = KVI_OPTION_STRING(KviOption_stringNickname1).left(32);
-				KVI_OPTION_STRING(KviOption_stringNickname1) = tmp;
-			}
+				KVI_OPTION_STRING(KviOption_stringNickname1).truncate(32);
 
-			if(KVI_OPTION_STRING(KviOption_stringNickname1).isEmpty())KVI_OPTION_STRING(KviOption_stringNickname1) = "newbie";
+			if(KVI_OPTION_STRING(KviOption_stringNickname1).isEmpty())
+				KVI_OPTION_STRING(KviOption_stringNickname1) = KVI_DEFAULT_NICKNAME1;
 
 			QString szNickPart;
 			if(KVI_OPTION_STRING(KviOption_stringNickname1).length() < 31)
@@ -1079,18 +1076,11 @@ void KviSetupWizard::accept()
 				szNickPart = KVI_OPTION_STRING(KviOption_stringNickname1).left(30);
 			}
 
-			QString alt = szNickPart;
-			alt.prepend("|"); // <-- this is an erroneous nickname on IrcNet :/
-			alt.append("|");
 			if(!g_bFoundMirc)
-				KVI_OPTION_STRING(KviOption_stringNickname2) = alt;
-			alt = szNickPart;
-			alt.prepend("_");
-			alt.append("_");
-			KVI_OPTION_STRING(KviOption_stringNickname3) = alt;
-			alt = szNickPart;
-			alt.append("2");
-			KVI_OPTION_STRING(KviOption_stringNickname4) = alt;
+				KVI_OPTION_STRING(KviOption_stringNickname2) = QString(KVI_DEFAULT_NICKNAME2).replace(KVI_DEFAULT_NICKNAME_TOKEN, szNickPart);
+
+			KVI_OPTION_STRING(KviOption_stringNickname3) = QString(KVI_DEFAULT_NICKNAME3).replace(KVI_DEFAULT_NICKNAME_TOKEN, szNickPart);
+			KVI_OPTION_STRING(KviOption_stringNickname4) = QString(KVI_DEFAULT_NICKNAME4).replace(KVI_DEFAULT_NICKNAME_TOKEN, szNickPart);
 
 			int i = m_pAgeCombo->currentIndex();
 			if(i < 0)i = 0;