mozilla
/
msix-packaging
зеркало из https://github.com/mozilla/msix-packaging.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Adjust UI controls size and add full stop to resource file strings (#302) 

* Increase checkbox and full stop

* More UI updates

* changes

* Update string size
This commit is contained in:
jyvenugo 2019-12-16 17:47:06 -08:00 коммит произвёл GitHub
Родитель 58d5ae771a
Коммит 8a549168bc
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 7 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
MsixCore/msixmgr/InstallUI.cpp
Просмотреть файл

@ -578,7 +578,7 @@ BOOL UI::CreateDisplayErrorText(HWND parentHWnd, RECT parentRect)
GetStringResource(IDS_STRING_ERROR_REASON_TEXT).c_str(), GetStringResource(IDS_STRING_ERROR_REASON_TEXT).c_str(),
WS_CHILD, WS_CHILD,
parentRect.left + 50, parentRect.left + 50,
parentRect.bottom - 80, parentRect.bottom - 120,
120, 120,
20, 20,
parentHWnd, parentHWnd,
@ -590,11 +590,11 @@ BOOL UI::CreateDisplayErrorText(HWND parentHWnd, RECT parentRect)
WS_EX_LEFT, WS_EX_LEFT,
L"Static", L"Static",
L"", L"",
WS_CHILD | WS_BORDER, WS_CHILD,
parentRect.left + 50, parentRect.left + 50,
parentRect.bottom - 60, parentRect.bottom - 100,
375, 375,
40, 80,
parentHWnd, parentHWnd,
(HMENU)IDC_STATICERRORCONTROL, (HMENU)IDC_STATICERRORCONTROL,
reinterpret_cast<HINSTANCE>(GetWindowLongPtr(parentHWnd, GWLP_HINSTANCE)), reinterpret_cast<HINSTANCE>(GetWindowLongPtr(parentHWnd, GWLP_HINSTANCE)),

2
MsixCore/msixmgr/Util.cpp
Просмотреть файл

@ -7,7 +7,7 @@ std::wstring GetStringResource(UINT resourceId)
{ {
HMODULE instance = GetModuleHandle(nullptr); HMODULE instance = GetModuleHandle(nullptr);
WCHAR buffer[MAX_PATH] = L""; WCHAR buffer[2*MAX_PATH] = L"";
int loadStringRet = LoadStringW(instance, resourceId, buffer, ARRAYSIZE(buffer)); int loadStringRet = LoadStringW(instance, resourceId, buffer, ARRAYSIZE(buffer));
if (loadStringRet <= 0) if (loadStringRet <= 0)
{ {

4
MsixCore/msixmgr/msixmgr.rc
Просмотреть файл

@ -116,8 +116,8 @@ BEGIN
IDS_STRING_ERROR_REASON_TEXT "Reason:" IDS_STRING_ERROR_REASON_TEXT "Reason:"
IDS_STRING_LOADING_PACKAGE "Loading Package..." IDS_STRING_LOADING_PACKAGE "Loading Package..."
IDS_STRING_LOADING_PACKAGE_OPEN_ERROR "Cannot open app package" IDS_STRING_LOADING_PACKAGE_OPEN_ERROR "Cannot open app package"
IDS_STRING_SIG_MISSING_ERROR "Ask the app developer for a new app package. This one isn't signed with a trusted certificate" IDS_STRING_SIG_MISSING_ERROR "Ask the app developer for a new app package. This one isn't signed with a trusted certificate."
IDS_STRING_ROOT_SIG_UNTRUSTED_ERROR "Either you need a new certificate installed for this app package, or you need a new app package with trusted certificates. Your system administrator or the app developer can help. A certificate chain processed, but terminated in a root certificate which isn't trusted" IDS_STRING_ROOT_SIG_UNTRUSTED_ERROR "Either you need a new certificate installed for this app package, or you need a new app package with trusted certificates. Your system administrator or the app developer can help. A certificate chain processed, but terminated in a root certificate which isn't trusted."
IDS_STRING_CANNOT_OPEN_PACKAGE_ERROR "Unable to open package. Please go to aka.ms/msix for more information." IDS_STRING_CANNOT_OPEN_PACKAGE_ERROR "Unable to open package. Please go to aka.ms/msix for more information."
IDS_STRING_GENERIC_INSTALL_FAILED_ERROR "Unable to install package. Please go to aka.ms/msix for more information." IDS_STRING_GENERIC_INSTALL_FAILED_ERROR "Unable to install package. Please go to aka.ms/msix for more information."
IDS_STRING_INVALID_TDF_ERROR "A Prerequisite for an install could not be satisfied." IDS_STRING_INVALID_TDF_ERROR "A Prerequisite for an install could not be satisfied."