4.30 beta

This commit is contained in:
Igor Pavlov
2005-11-18 00:00:00 +00:00
committed by Kornel Lesiński
parent bcd1db2f5a
commit e18587ba51
214 changed files with 5385 additions and 2712 deletions

View File

@@ -24,33 +24,7 @@
#include "MyLoadMenu.h"
#include "App.h"
void FillInPropertyPage(PROPSHEETPAGE* page, HINSTANCE instance, int dialogID,
NWindows::NControl::CPropertyPage *propertyPage, const CSysString &title)
{
page->dwSize = sizeof(PROPSHEETPAGE);
// page->dwSize = sizeof(PROPSHEETPAGEW_V1_SIZE);
page->dwFlags = PSP_HASHELP;
page->hInstance = instance;
page->pszTemplate = MAKEINTRESOURCE(dialogID);
page->pszIcon = NULL;
page->pfnDlgProc = NWindows::NControl::ProperyPageProcedure;
if (title.IsEmpty())
page->pszTitle = NULL;
else
{
page->dwFlags |= PSP_USETITLE;
page->pszTitle = title;
}
page->lParam = LPARAM(propertyPage);
page->pfnCallback = NULL;
// page->dwFlags = 0;
// page->pszTitle = NULL;
// page->lParam = 0;
}
using namespace NWindows;
void OptionsDialog(HWND hwndOwner, HINSTANCE hInstance)
{
@@ -60,54 +34,32 @@ void OptionsDialog(HWND hwndOwner, HINSTANCE hInstance)
CSettingsPage settingsPage;
CLangPage langPage;
CSysStringVector titles;
CObjectVector<NControl::CPageInfo> pages;
UINT32 langIDs[] = { 0x03010300, 0x03010100, 0x03010200, 0x03010400, 0x01000400};
UINT pageIDs[] = { IDD_SYSTEM, IDD_PLUGINS, IDD_EDIT, IDD_SETTINGS, IDD_LANG};
NControl::CPropertyPage *pagePinters[] = { &systemPage, &pluginsPage, &editPage, &settingsPage, &langPage };
const int kNumPages = sizeof(langIDs) / sizeof(langIDs[0]);
for (int i = 0; i < kNumPages; i++)
titles.Add(GetSystemString(LangLoadString(langIDs[i])));
PROPSHEETPAGE pages[kNumPages];
{
NControl::CPageInfo page;
page.Title = LangString(langIDs[i]);
page.ID = pageIDs[i];
page.Page = pagePinters[i];
pages.Add(page);
}
FillInPropertyPage(&pages[0], hInstance, IDD_SYSTEM, &systemPage, titles[0]);
FillInPropertyPage(&pages[1], hInstance, IDD_PLUGINS, &pluginsPage, titles[1]);
FillInPropertyPage(&pages[2], hInstance, IDD_EDIT, &editPage, titles[2]);
FillInPropertyPage(&pages[3], hInstance, IDD_SETTINGS, &settingsPage, titles[3]);
FillInPropertyPage(&pages[4], hInstance, IDD_LANG, &langPage, titles[4]);
PROPSHEETHEADER sheet;
// sheet.dwSize = sizeof(PROPSHEETHEADER_V1_SIZE);
sheet.dwSize = sizeof(PROPSHEETHEADER);
sheet.dwFlags = PSH_PROPSHEETPAGE;
sheet.hwndParent = hwndOwner;
sheet.hInstance = hInstance;
CSysString title = LangLoadString(IDS_OPTIONS, 0x03010000);
sheet.pszCaption = title;
sheet.nPages = sizeof(pages) / sizeof(PROPSHEETPAGE);
sheet.nStartPage = 0;
sheet.ppsp = pages;
sheet.pfnCallback = NULL;
if (::PropertySheet(&sheet) != -1)
int res = NControl::MyPropertySheet(pages, hwndOwner, LangString(IDS_OPTIONS, 0x03010000));
if (res != -1 && res != 0)
{
if (langPage._langWasChanged)
{
g_App._window.SetText(LangLoadStringW(IDS_APP_TITLE, 0x03000000));
g_App._window.SetText(LangString(IDS_APP_TITLE, 0x03000000));
MyLoadMenu();
}
g_App.SetListSettings();
g_App.SetShowSystemMenu();
g_App.RefreshAllPanels();
g_App.ReloadToolbars();
// ::PostMessage(hwndOwner, kLangWasChangedMessage, 0 , 0);
// ::PostMessage(hwndOwner, kLangWasChangedMessage, 0 , 0);
}
/*
else
MessageBox(0, NWindows::NError::MyFormatMessage(GetLastError()), TEXT("PropertySheet"), 0);
*/
}