dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added SetLanguage ($LANGUAGE is no longer a variable)

Browse source 
Language can be set not only from .onInit
Added .onMouseOverSection


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@737 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-08-25 16:09:17 +00:00
parent ac702fe1ac
commit df33a31178
2 changed files with 39 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Source/exehead/Ui.c
View file

@ -241,16 +241,14 @@ static void NSISCALL CheckTreeItem(HWND hWnd, TV_ITEM *pItem, int checked) {
int lang_num; int lang_num;
void NSISCALL select_lang() void NSISCALL set_language(LANGID lang)
{ {
int i; int i;
LANGID user_lang, lang_mask=~(LANGID)0; LANGID lang_mask=~(LANGID)0;
user_lang=myatoi(state_language);
lang_again: lang_again:
for (i = 0; i < lang_num; i++) { for (i = 0; i < lang_num; i++) {
if (!((user_lang ^ common_strings_tables[i].lang_id) & lang_mask)) { if (!((lang ^ common_strings_tables[i].lang_id) & lang_mask)) {
cur_common_strings_table+=i; cur_common_strings_table+=i;
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT #ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
if (g_is_uninstaller) if (g_is_uninstaller)
@ -266,7 +264,6 @@ lang_again:
goto lang_again; goto lang_again;
} }
wsprintf(state_language, "%u", cur_common_strings_table->lang_id);
process_string_from_lang(g_caption,LANGID_CAPTION); process_string_from_lang(g_caption,LANGID_CAPTION);
} }
@ -352,7 +349,7 @@ int NSISCALL ui_doinstall(void)
cur_install_strings_table=install_strings_tables=(char *)GlobalAlloc(GPTR,size); cur_install_strings_table=install_strings_tables=(char *)GlobalAlloc(GPTR,size);
GetCompressedDataFromDataBlockToMemory(g_inst_header->common.inst_str_tables,install_strings_tables,size); GetCompressedDataFromDataBlockToMemory(g_inst_header->common.inst_str_tables,install_strings_tables,size);
process_string_from_lang(g_caption,LANGID_CAPTION); set_language(GetUserDefaultLangID());
} }
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT #ifdef NSIS_CONFIG_VISIBLE_SUPPORT
@ -370,12 +367,8 @@ int NSISCALL ui_doinstall(void)
#ifdef NSIS_SUPPORT_CODECALLBACKS #ifdef NSIS_SUPPORT_CODECALLBACKS
g_hwnd=h; g_hwnd=h;
// Select language // Select language
wsprintf(state_language, "%u", GetUserDefaultLangID());
// in onInit
if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1; if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1;
g_hwnd=NULL; g_hwnd=NULL;
// Make the selection from the tables
select_lang();
if (h != GetDesktopWindow()) { if (h != GetDesktopWindow()) {
SendMessage(h, WM_SETTEXT, 0, (LPARAM)g_caption); SendMessage(h, WM_SETTEXT, 0, (LPARAM)g_caption);
ShowWindow(h, SW_SHOW); ShowWindow(h, SW_SHOW);
@ -390,9 +383,7 @@ int NSISCALL ui_doinstall(void)
#endif #endif
{ {
#ifdef NSIS_SUPPORT_CODECALLBACKS #ifdef NSIS_SUPPORT_CODECALLBACKS
wsprintf(state_language, "%u", GetUserDefaultLangID());
if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1; if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1;
select_lang();
#endif//NSIS_SUPPORT_CODECALLBACKS #endif//NSIS_SUPPORT_CODECALLBACKS
if (install_thread(NULL)) if (install_thread(NULL))
{ {
@ -850,6 +841,39 @@ static DWORD WINAPI newTreeWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
SendMessage(GetParent(hwnd),WM_TREEVIEW_KEYHACK,0,0); SendMessage(GetParent(hwnd),WM_TREEVIEW_KEYHACK,0,0);
return 0; return 0;
} }
if (uMsg == WM_MOUSEMOVE) {
TVHITTESTINFO ht = {0};
DWORD dwpos = GetMessagePos();
ht.pt.x = GET_X_LPARAM(dwpos);
ht.pt.y = GET_Y_LPARAM(dwpos);
MapWindowPoints(HWND_DESKTOP, hwnd, &ht.pt, 1);
TreeView_HitTest(hwnd, &ht);
if (ht.flags & (TVHT_ONITEMSTATEICON|TVHT_ONITEMLABEL|TVHT_ONITEMRIGHT|TVHT_ONITEM))
{
static LPARAM last_item;
TVITEM hItem;
hItem.hItem = ht.hItem;
hItem.mask = TVIF_PARAM;
TreeView_GetItem(hwnd, &hItem);
if (last_item != hItem.lParam)
{
last_item = hItem.lParam;
mystrcpy(g_tmp, g_usrvars[0]);
wsprintf(g_usrvars[0], "%u", last_item);
ExecuteCodeSegment(g_inst_entry,g_inst_header->code_onMouseOverSection,NULL);
mystrcpy(g_usrvars[0], g_tmp);
}
}
}
return CallWindowProc((WNDPROC)oldTreeWndProc,hwnd,uMsg,wParam,lParam); return CallWindowProc((WNDPROC)oldTreeWndProc,hwnd,uMsg,wParam,lParam);
} }

2
Source/exehead/ui.h
View file

@ -7,6 +7,8 @@
extern common_strings *cur_common_strings_table; extern common_strings *cur_common_strings_table;
extern char *cur_install_strings_table; // installer_strings/uninstall_strings depending on installer type extern char *cur_install_strings_table; // installer_strings/uninstall_strings depending on installer type
void NSISCALL set_language(LANGID lang);
int NSISCALL ui_doinstall(void); int NSISCALL ui_doinstall(void);
void NSISCALL update_status_text_from_lang(langid_t id, const char *text2); void NSISCALL update_status_text_from_lang(langid_t id, const char *text2);
void NSISCALL update_status_text(const char *text1, const char *text2); void NSISCALL update_status_text(const char *text1, const char *text2);