мелкие фиксы

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@176 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

1 files changed, 60 insertions, 23 deletions

diff --git a/ieview/Options.cpp b/ieview/Options.cpp
index 2dcfafd..8ffbdb2 100644
--- a/ieview/Options.cpp
+++ b/ieview/Options.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _WIN32_WINNT  0x0501

 #include "Options.h"

 #include "resource.h"

-//#include "Smiley.h"

 #include "Template.h"

 #include "Utils.h"

 #include "m_MathModule.h"

@@ -428,11 +427,17 @@ int IEViewOptInit(WPARAM wParam, LPARAM lParam)
 	odp.cbSize = sizeof(odp);

 	odp.position = 0;

 	odp.hInstance = hInstance;

-	odp.ptszGroup = TranslateT("Message Sessions");

-	odp.ptszTitle = TranslateT("IEView");

+	odp.ptszGroup = _T("Message Sessions");

+	odp.ptszTitle = _T("IEView");

 	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 	odp.nIDBottomSimpleControl = 0;

-	for (i = 0; i < SIZEOF(tabPages); i++) {

+	odp.pszTemplate = MAKEINTRESOURCEA(tabPages[0].dlgId);

+	odp.pfnDlgProc = tabPages[0].dlgProc;

+	odp.ptszTab = tabPages[0].tabName;

+	CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) & odp);

+	odp.ptszGroup = _T("Skins");

+	odp.ptszTitle = _T("Message Log");

+	for (i = 1; i < SIZEOF(tabPages); i++) {

 		odp.pszTemplate = MAKEINTRESOURCEA(tabPages[i].dlgId);

 		odp.pfnDlgProc = tabPages[i].dlgProc;

 		odp.ptszTab = tabPages[i].tabName;

@@ -497,6 +502,13 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 			}

 			EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLE_MATHMODULE), Options::isMathModule());

 			EnableWindow(GetDlgItem(hwndDlg, IDC_SMILEYS_IN_NAMES), Options::isSmileyAdd());

+			EnableWindow(GetDlgItem(hwndDlg, IDC_EMBED_SIZE), IsDlgButtonChecked(hwndDlg, IDC_ENABLE_EMBED));

+			TCHAR* size[] = {  _T("320�205"), _T("480 x 385") , _T("560 x 349"), _T("640 x 390")};

+			for (i = 0; i < SIZEOF(size); ++i){

+				int item=SendDlgItemMessage(hwndDlg,IDC_EMBED_SIZE,CB_ADDSTRING,0,(LPARAM)TranslateTS(size[i]));

+				SendDlgItemMessage(hwndDlg,IDC_EMBED_SIZE,CB_SETITEMDATA,item,(LPARAM)0);

+			}

+			SendDlgItemMessage(hwndDlg,IDC_EMBED_SIZE,CB_SETCURSEL,Options::getEmbedsize(),0);	

 			return TRUE;

 		}

 	case WM_COMMAND:

@@ -508,8 +520,12 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
             case IDC_ENABLE_PNGHACK:

             case IDC_SMILEYS_IN_NAMES:

             case IDC_NO_BORDER:

+			case IDC_EMBED_SIZE:

+				MarkChanges(1, hwndDlg);

+				break;

 			case IDC_ENABLE_EMBED:

 				MarkChanges(1, hwndDlg);

+				EnableWindow(GetDlgItem(hwndDlg, IDC_EMBED_SIZE), IsDlgButtonChecked(hwndDlg, IDC_ENABLE_EMBED));

 				break;

 			}

 		}

@@ -542,6 +558,7 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 				}

 				Options::setGeneralFlags(i);

 				ApplyChanges(1);

+				Options::setEmbedsize(SendDlgItemMessage(hwndDlg,IDC_EMBED_SIZE,CB_GETCURSEL,0,0));

 				return TRUE;

 			}

 		}

@@ -554,7 +571,7 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 

 static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

 	BOOL bChecked;

-	char path[MAX_PATH];

+	char path[MAX_PATH], filter[MAX_PATH];

 	switch (msg) {

 	case WM_INITDIALOG:

 		{

@@ -592,26 +609,30 @@ static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 				MarkChanges(2, hwndDlg);

 				break;

 			case IDC_BROWSE_TEMPLATES:

-				if (BrowseFile(hwndDlg, "Template (*.ivt)\0*.ivt\0All Files\0*.*\0\0", "ivt", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.ivt)%c*.ivt%c%s%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "ivt", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path);

 					UpdateTemplateIcons(hwndDlg, path);

 					MarkChanges(2, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_BACKGROUND_IMAGE:

-				if (BrowseFile(hwndDlg, "All Images (*.jpg,*.gif,*.png,*.bmp)\0*.jpg;*.gif;*.png;*.bmp\0All Files\0*.*\0\0", "jpg", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.jpg,*.gif,*.png,*.bmp)%c*.ivt%c%s%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "jpg", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg,IDC_BACKGROUND_IMAGE_FILENAME,path);

 					MarkChanges(2, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path);

 					MarkChanges(2, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS_RTL:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME_RTL, path);

 					MarkChanges(2, hwndDlg);

 				}

@@ -690,7 +711,7 @@ static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 

 static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

 	BOOL bChecked = FALSE;

-	char path[MAX_PATH];

+	char path[MAX_PATH], filter[MAX_PATH];

 	switch (msg) {

 	case WM_INITDIALOG:

 		{

@@ -728,26 +749,30 @@ static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 				MarkChanges(4, hwndDlg);

 				break;

 			case IDC_BROWSE_TEMPLATES:

-				if (BrowseFile(hwndDlg, "Template (*.ivt)\0*.ivt\0All Files\0*.*\0\0", "ivt", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.ivt)%c*.ivt%c%s%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "ivt", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path);

 					UpdateTemplateIcons(hwndDlg, path);

 					MarkChanges(4, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_BACKGROUND_IMAGE:

-				if (BrowseFile(hwndDlg, "All Images (*.jpg,*.gif,*.png,*.bmp)\0*.jpg;*.gif;*.png;*.bmp\0All Files\0*.*\0\0", "jpg", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.jpg,*.gif,*.png,*.bmp)%c*.ivt%c%s%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "jpg", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg,IDC_BACKGROUND_IMAGE_FILENAME,path);

 					MarkChanges(4, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path);

 					MarkChanges(4, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS_RTL:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME_RTL, path);

 					MarkChanges(4, hwndDlg);

 				}

@@ -826,7 +851,7 @@ static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 

 static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

 	BOOL bChecked;

-	char path[MAX_PATH];

+	char path[MAX_PATH], filter[MAX_PATH];

 	switch (msg) {

 	case WM_INITDIALOG:

 		{

@@ -865,26 +890,30 @@ static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARA
 				MarkChanges(8, hwndDlg);

 				break;

 			case IDC_BROWSE_TEMPLATES:

-				if (BrowseFile(hwndDlg, "Template (*.ivt)\0*.ivt\0All Files\0*.*\0\0", "ivt", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.ivt)%c*.ivt%c%s%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "ivt", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path);

 					UpdateTemplateIcons(hwndDlg, path);

 					MarkChanges(8, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_BACKGROUND_IMAGE:

-				if (BrowseFile(hwndDlg, "All Images (*.jpg,*.gif,*.png,*.bmp)\0*.jpg;*.gif;*.png;*.bmp\0All Files\0*.*\0\0", "jpg", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.jpg,*.gif,*.png,*.bmp)%c*.ivt%c%s%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "jpg", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg,IDC_BACKGROUND_IMAGE_FILENAME,path);

 					MarkChanges(8, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path);

 					MarkChanges(8, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS_RTL:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME_RTL, path);

 					MarkChanges(8, hwndDlg);

 				}

@@ -1487,7 +1516,7 @@ void Options::init() {
 	}

 

 

-	generalFlags = DBGetContactSettingDword(NULL, ieviewModuleName, DBS_BASICFLAGS, 0);

+	generalFlags = DBGetContactSettingDword(NULL, ieviewModuleName, DBS_BASICFLAGS, 13);

 

 	/* TODO: move to buildProtocolList method */

 	int protoCount;

@@ -1515,7 +1544,7 @@ void Options::init() {
 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_SRMM_MODE);

 		proto->setSRMMMode(DBGetContactSettingByte(NULL, ieviewModuleName, dbsName, FALSE));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_SRMM_FLAGS);

-		proto->setSRMMFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, FALSE));

+		proto->setSRMMFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, 16128));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_SRMM_BACKGROUND);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

@@ -1550,7 +1579,7 @@ void Options::init() {
 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_CHAT_MODE);

 		proto->setChatMode(DBGetContactSettingByte(NULL, ieviewModuleName, dbsName, FALSE));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_CHAT_FLAGS);

-		proto->setChatFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, FALSE));

+		proto->setChatFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, 16128));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_CHAT_BACKGROUND);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

@@ -1585,7 +1614,7 @@ void Options::init() {
 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_HISTORY_MODE);

 		proto->setHistoryMode(DBGetContactSettingByte(NULL, ieviewModuleName, dbsName, FALSE));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_HISTORY_FLAGS);

-		proto->setHistoryFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, FALSE));

+		proto->setHistoryFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, 16128));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_HISTORY_BACKGROUND);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

@@ -1656,6 +1685,14 @@ int	Options::getGeneralFlags() {
 	return generalFlags;

 }

 

+void Options::setEmbedsize(int size){

+	DBWriteContactSettingDword(NULL, ieviewModuleName, "Embedsize", (DWORD) size);

+}

+

+int Options::getEmbedsize(){

+	return DBGetContactSettingDword(NULL, ieviewModuleName, "Embedsize", 0);

+}

+

 bool Options::isMathModule() {

 	return bMathModule;

 }