- direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call;

- obsolete structure SKINSOUNDDESC removed 
- dynamically translated hot keys;
- checked correct LPGEN'ing of the sounds creation;
- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@500 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

7 files changed, 18 insertions, 18 deletions

diff --git a/plugins/Scriver/chat/colorchooser.c b/plugins/Scriver/chat/colorchooser.c
index 4765e71a7f..c2c4d80bce 100644
--- a/plugins/Scriver/chat/colorchooser.c
+++ b/plugins/Scriver/chat/colorchooser.c
@@ -236,7 +236,7 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			}

 

 				if ( (pCC->bForeground && pCC->si->bFGSet && pCC->si->iFG == i) ||

-					 (!pCC->bForeground && pCC->si->bBGSet && pCC->si->iBG == i) ) {

+					 (!pCC->bForeground && pCC->si->bBGSet && pCC->si->iBG == i)) {

 					rc.top = (iThisRow-1) * 20+ 1 +20 ;

 					rc.left = (iThisColumn-1) * 25 + 1 + 1 ;

 					rc.bottom = iThisRow * 20- 1 + 20 ;

diff --git a/plugins/Scriver/chat/manager.c b/plugins/Scriver/chat/manager.c
index 74595f3bc0..061955af45 100644
--- a/plugins/Scriver/chat/manager.c
+++ b/plugins/Scriver/chat/manager.c
@@ -793,7 +793,7 @@ SESSION_INFO* SM_FindSessionAutoComplete(const char* pszModule, SESSION_INFO* cu
             while (pTemp != NULL) {

                     if (pTemp != currSession && !lstrcmpiA(pszModule, pTemp->pszModule)) {

                             if ( my_strstri( pTemp->ptszName, pszOriginal) == pTemp->ptszName ) {

-                                    if ( prevSession != pTemp && lstrcmpi( pTemp->ptszName, pszCurrent ) > 0 && ( !pszName || lstrcmpi( pTemp->ptszName, pszName ) < 0) ) {

+                                    if ( prevSession != pTemp && lstrcmpi( pTemp->ptszName, pszCurrent ) > 0 && ( !pszName || lstrcmpi( pTemp->ptszName, pszName ) < 0)) {

                                             pResult = pTemp;

                                             pszName = pTemp->ptszName;

                                     }

@@ -1273,7 +1273,7 @@ TCHAR* UM_FindUserAutoComplete(USERINFO* pUserList, const TCHAR* pszOriginal, co
 

 	while ( pTemp != NULL ) {

 		if ( my_strstri( pTemp->pszNick, pszOriginal) == pTemp->pszNick )

-			if ( lstrcmpi( pTemp->pszNick, pszCurrent ) > 0 && ( !pszName || lstrcmpi( pTemp->pszNick, pszName ) < 0) )

+			if ( lstrcmpi( pTemp->pszNick, pszCurrent ) > 0 && ( !pszName || lstrcmpi( pTemp->pszNick, pszName ) < 0))

 				pszName = pTemp->pszNick;

 

 		pTemp = pTemp->next;

diff --git a/plugins/Scriver/chat/options.c b/plugins/Scriver/chat/options.c
index 35be477e9d..f030359ee6 100644
--- a/plugins/Scriver/chat/options.c
+++ b/plugins/Scriver/chat/options.c
@@ -424,7 +424,7 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam
 				_T("%yy%"),			TranslateT("year without century, 01-  99"),

 				_T("%yyyy%"),		TranslateT("year with century, 1901-9999"),

 				_T("%wday%"),		TranslateT("abbreviated weekday name"),

-				_T("%weekday%"),	TranslateT("full weekday name") );

+				_T("%weekday%"),	TranslateT("full weekday name"));

 			GetClientRect (GetDlgItem(hwndDlg, IDC_CHAT_LOGDIRECTORY), &rect);

 			rect.left = -85;

 			hPathTip = CreateToolTip(GetDlgItem(hwndDlg, IDC_CHAT_LOGDIRECTORY), tszTooltipText, TranslateT("Variables"), &rect);

@@ -924,17 +924,17 @@ int OptionsInit(void)
 	g_Settings.iSplitterX = DBGetContactSettingWord(NULL, "Chat", "SplitterX", 105);

 	LoadGlobalSettings();

 

-	SkinAddNewSoundEx("ChatMessage", LPGEN("Group chats"), LPGEN("Incoming message"));

+	SkinAddNewSoundEx("ChatMessage",   LPGEN("Group chats"), LPGEN("Incoming message"));

 	SkinAddNewSoundEx("ChatHighlight", LPGEN("Group chats"), LPGEN("Message is highlighted"));

-	SkinAddNewSoundEx("ChatAction", LPGEN("Group chats"), LPGEN("User has performed an action"));

-	SkinAddNewSoundEx("ChatJoin", LPGEN("Group chats"), LPGEN("User has joined"));

-	SkinAddNewSoundEx("ChatPart", LPGEN("Group chats"), LPGEN("User has left"));

-	SkinAddNewSoundEx("ChatKick", LPGEN("Group chats"), LPGEN("User has kicked some other user"));

-	SkinAddNewSoundEx("ChatMode", LPGEN("Group chats"), LPGEN("User's status was changed"));

-	SkinAddNewSoundEx("ChatNick", LPGEN("Group chats"), LPGEN("User has changed name"));

-	SkinAddNewSoundEx("ChatNotice", LPGEN("Group chats"), LPGEN("User has sent a notice"));

-	SkinAddNewSoundEx("ChatQuit", LPGEN("Group chats"), LPGEN("User has disconnected"));

-	SkinAddNewSoundEx("ChatTopic", LPGEN("Group chats"), LPGEN("The topic has been changed"));

+	SkinAddNewSoundEx("ChatAction",    LPGEN("Group chats"), LPGEN("User has performed an action"));

+	SkinAddNewSoundEx("ChatJoin",      LPGEN("Group chats"), LPGEN("User has joined"));

+	SkinAddNewSoundEx("ChatPart",      LPGEN("Group chats"), LPGEN("User has left"));

+	SkinAddNewSoundEx("ChatKick",      LPGEN("Group chats"), LPGEN("User has kicked some other user"));

+	SkinAddNewSoundEx("ChatMode",      LPGEN("Group chats"), LPGEN("User's status was changed"));

+	SkinAddNewSoundEx("ChatNick",      LPGEN("Group chats"), LPGEN("User has changed name"));

+	SkinAddNewSoundEx("ChatNotice",    LPGEN("Group chats"), LPGEN("User has sent a notice"));

+	SkinAddNewSoundEx("ChatQuit",      LPGEN("Group chats"), LPGEN("User has disconnected"));

+	SkinAddNewSoundEx("ChatTopic",     LPGEN("Group chats"), LPGEN("The topic has been changed"));

 	SetIndentSize();

 	return 0;

 }

diff --git a/plugins/Scriver/chat/services.c b/plugins/Scriver/chat/services.c
index 22afdfd389..eb72218e7a 100644
--- a/plugins/Scriver/chat/services.c
+++ b/plugins/Scriver/chat/services.c
@@ -461,7 +461,7 @@ static INT_PTR Service_AddEvent(WPARAM wParam, LPARAM lParam)
 	if ( gce->cbSize != SIZEOF_STRUCT_GCEVENT_V1 && gce->cbSize != SIZEOF_STRUCT_GCEVENT_V2 )

 		return GC_EVENT_WRONGVER;

 

-	if ( !IsEventSupported( gcd->iType ) )

+	if ( !IsEventSupported( gcd->iType ))

 		return GC_EVENT_ERROR;

 

 	EnterCriticalSection(&cs);

diff --git a/plugins/Scriver/chat/window.c b/plugins/Scriver/chat/window.c
index adae5fd909..2acd5aed25 100644
--- a/plugins/Scriver/chat/window.c
+++ b/plugins/Scriver/chat/window.c
@@ -2013,7 +2013,7 @@ LABEL_SHOWWINDOW:
             if (!IsWindowEnabled(GetDlgItem(hwndDlg,IDC_CHAT_COLOR)))

                break;

 

-            if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_COLOR) ) {

+            if (IsDlgButtonChecked(hwndDlg, IDC_CHAT_COLOR)) {

                if (DBGetContactSettingByte(NULL, "Chat", "RightClickFilter", 0) == 0)

                   SendMessage(hwndDlg, GC_SHOWCOLORCHOOSER, 0, (LPARAM)IDC_CHAT_COLOR);

                else if (si->bFGSet) {

diff --git a/plugins/Scriver/multimon.h b/plugins/Scriver/multimon.h
index 1ad717c554..aedd943da4 100644
--- a/plugins/Scriver/multimon.h
+++ b/plugins/Scriver/multimon.h
@@ -146,7 +146,7 @@ typedef struct {
 			(*(FARPROC*)&g_pfnGetMonitorInfo      = GetProcAddress(hUser32,"GetMonitorInfoW")) &&

             (*(FARPROC*)&g_pfnEnumDisplayDevices  = GetProcAddress(hUser32,"EnumDisplayDevicesW")) &&

 			(GetSystemMetrics(SM_CXVIRTUALSCREEN) >= GetSystemMetrics(SM_CXSCREEN)) &&

-            (GetSystemMetrics(SM_CYVIRTUALSCREEN) >= GetSystemMetrics(SM_CYSCREEN)) )

+            (GetSystemMetrics(SM_CYVIRTUALSCREEN) >= GetSystemMetrics(SM_CYSCREEN)))

         {

             fInitDone = TRUE;

             return TRUE;

diff --git a/plugins/Scriver/utils.c b/plugins/Scriver/utils.c
index bad1314b40..8a87b5a5cb 100644
--- a/plugins/Scriver/utils.c
+++ b/plugins/Scriver/utils.c
@@ -120,7 +120,7 @@ TCHAR *a2t(const char *text) {
 }

 

 char* t2a( const TCHAR* src ) {

-return u2a( src, CallService( MS_LANGPACK_GETCODEPAGE, 0, 0 ) );

+return u2a( src, CallService( MS_LANGPACK_GETCODEPAGE, 0, 0 ));

 }

 

 char* t2acp( const TCHAR* src, int codepage ) {