CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1409 from RaiKoHoff/Dev_NewFeatures

Browse Source 
Fix broken Style Scheme Export (due to new ini file handler)
This commit is contained in:
Rainer Kottenhoff 2019-07-08 22:50:44 +02:00 committed by GitHub
commit 4eb2e63277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 94 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Config/Config.cpp
View File

@ -1370,6 +1370,7 @@ bool SaveSettings(bool bSaveSettingsNow)
if (ok) {
Style_Save(); // Scintilla Styles
Globals.bIniFileFromScratch = false;
}
return ok;
}

191
src/Styles.c
View File

@ -633,7 +633,7 @@ bool Style_ImportFromFile(const WCHAR* szFile)
//
void Style_Save()
{
Style_ExportToFile(Theme_Files[s_idxSelectedTheme].szFilePath, false);
Style_ExportToFile(Theme_Files[s_idxSelectedTheme].szFilePath, Globals.bIniFileFromScratch);
if (s_idxSelectedTheme > 1) {
IniFileSetString(Globals.IniFile, L"Styles", STYLING_THEME_NAME, Theme_Files[s_idxSelectedTheme].szName);
@ -667,17 +667,15 @@ bool Style_Export(HWND hwnd)
ofn.Flags = /*OFN_FILEMUSTEXIST |*/ OFN_HIDEREADONLY | OFN_NOCHANGEDIR | OFN_DONTADDTORECENT
| OFN_PATHMUSTEXIST | OFN_SHAREAWARE /*| OFN_NODEREFERENCELINKS*/ | OFN_OVERWRITEPROMPT;
Globals.dwLastError = ERROR_SUCCESS;
bool ok = false;
if (GetSaveFileName(&ofn))
{
Globals.dwLastError = Style_ExportToFile(szFile, true);
if (Globals.dwLastError != ERROR_SUCCESS) {
ok = Style_ExportToFile(szFile, true);
if (!ok) {
InfoBoxLng(MB_ICONERROR, NULL, IDS_MUI_EXPORT_FAIL, PathFindFileName(szFile));
}
}
return (Globals.dwLastError == ERROR_SUCCESS);
return ok;
}
@ -694,115 +692,112 @@ bool Style_ExportToFile(const WCHAR* szFile, bool bForceAll)
return false;
}
bool const ok = LoadIniFile(szFile);
if (ok) {
LoadIniFile(szFile); // reset
// Custom colors
const WCHAR* const CustomColors_Section = L"Custom Colors";
const WCHAR* const CustomColors_Section = L"Custom Colors";
for (int i = 0; i < 16; i++) {
if (bForceAll || (g_colorCustom[i] != s_colorDefault[i])) {
WCHAR tch[32] = { L'\0' };
WCHAR wch[32] = { L'\0' };
StringCchPrintf(tch, COUNTOF(tch), L"%02i", i + 1);
StringCchPrintf(wch, COUNTOF(wch), L"#%02X%02X%02X",
(int)GetRValue(g_colorCustom[i]), (int)GetGValue(g_colorCustom[i]), (int)GetBValue(g_colorCustom[i]));
IniSectionSetString(CustomColors_Section, tch, wch);
}
for (int i = 0; i < 16; i++) {
if (bForceAll || (g_colorCustom[i] != s_colorDefault[i])) {
WCHAR tch[32] = { L'\0' };
WCHAR wch[32] = { L'\0' };
StringCchPrintf(tch, COUNTOF(tch), L"%02i", i + 1);
StringCchPrintf(wch, COUNTOF(wch), L"#%02X%02X%02X",
(int)GetRValue(g_colorCustom[i]), (int)GetGValue(g_colorCustom[i]), (int)GetBValue(g_colorCustom[i]));
IniSectionSetString(CustomColors_Section, tch, wch);
}
}
const WCHAR* const Styles_Section = L"Styles";
const WCHAR* const Styles_Section = L"Styles";
// auto select
bool const bUse2ndSty = Style_GetUse2ndDefault();
if (bUse2ndSty) {
IniSectionSetBool(Styles_Section, L"Use2ndDefaultStyle", bUse2ndSty);
}
else {
IniSectionDelete(Styles_Section, L"Use2ndDefaultStyle", false);
}
// auto select
bool const bUse2ndSty = Style_GetUse2ndDefault();
if (bUse2ndSty) {
IniSectionSetBool(Styles_Section, L"Use2ndDefaultStyle", bUse2ndSty);
}
else {
IniSectionDelete(Styles_Section, L"Use2ndDefaultStyle", false);
}
// default scheme
if (s_iDefaultLexer != 0) {
IniSectionSetInt(Styles_Section, L"DefaultScheme", s_iDefaultLexer);
}
else {
IniSectionDelete(Styles_Section, L"DefaultScheme", false);
}
// default scheme
if (s_iDefaultLexer != 0) {
IniSectionSetInt(Styles_Section, L"DefaultScheme", s_iDefaultLexer);
}
else {
IniSectionDelete(Styles_Section, L"DefaultScheme", false);
}
// auto select
if (!s_bAutoSelect) {
IniSectionSetBool(Styles_Section, L"AutoSelect", s_bAutoSelect);
}
else {
IniSectionDelete(Styles_Section, L"AutoSelect", false);
}
// auto select
if (!s_bAutoSelect) {
IniSectionSetBool(Styles_Section, L"AutoSelect", s_bAutoSelect);
}
else {
IniSectionDelete(Styles_Section, L"AutoSelect", false);
}
// scheme select dlg dimensions
if (s_cxStyleSelectDlg != STYLESELECTDLG_X) {
IniSectionSetInt(Styles_Section, L"SelectDlgSizeX", s_cxStyleSelectDlg);
}
else {
IniSectionDelete(Styles_Section, L"SelectDlgSizeX", false);
}
if (s_cyStyleSelectDlg != STYLESELECTDLG_Y) {
IniSectionSetInt(Styles_Section, L"SelectDlgSizeY", s_cyStyleSelectDlg);
}
else {
IniSectionDelete(Styles_Section, L"SelectDlgSizeY", false);
}
// scheme select dlg dimensions
if (s_cxStyleSelectDlg != STYLESELECTDLG_X) {
IniSectionSetInt(Styles_Section, L"SelectDlgSizeX", s_cxStyleSelectDlg);
}
else {
IniSectionDelete(Styles_Section, L"SelectDlgSizeX", false);
}
if (s_cyStyleSelectDlg != STYLESELECTDLG_Y) {
IniSectionSetInt(Styles_Section, L"SelectDlgSizeY", s_cyStyleSelectDlg);
}
else {
IniSectionDelete(Styles_Section, L"SelectDlgSizeY", false);
}
// create canonical order of lexer sections
if (bForceAll) {
for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); iLexer++)
{
IniSectionClear(g_pLexArray[iLexer]->pszName, true);
}
for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); iLexer++)
{
IniSectionSetString(g_pLexArray[iLexer]->pszName, NULL, NULL);
}
}
WCHAR szTmpStyle[BUFSIZE_STYLE_VALUE];
for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); ++iLexer)
// create canonical order of lexer sections
if (bForceAll) {
for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); iLexer++)
{
LPCWSTR const Lexer_Section = g_pLexArray[iLexer]->pszName;
IniSectionClear(g_pLexArray[iLexer]->pszName, true);
}
for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); iLexer++)
{
IniSectionSetString(g_pLexArray[iLexer]->pszName, NULL, NULL);
}
bForceAll = !Globals.bIniFileFromScratch;
}
if (bForceAll || (StringCchCompareXI(g_pLexArray[iLexer]->szExtensions, g_pLexArray[iLexer]->pszDefExt) != 0))
WCHAR szTmpStyle[BUFSIZE_STYLE_VALUE];
for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); ++iLexer)
{
LPCWSTR const Lexer_Section = g_pLexArray[iLexer]->pszName;
if (bForceAll || (StringCchCompareXI(g_pLexArray[iLexer]->szExtensions, g_pLexArray[iLexer]->pszDefExt) != 0))
{
IniSectionSetString(Lexer_Section, L"FileNameExtensions", g_pLexArray[iLexer]->szExtensions);
}
else {
IniSectionDelete(Lexer_Section, L"FileNameExtensions", false);
}
unsigned i = 0;
while (g_pLexArray[iLexer]->Styles[i].iStyle != -1)
{
// normalize defaults
szTmpStyle[0] = L'\0'; // clear
Style_CopyStyles_IfNotDefined(g_pLexArray[iLexer]->Styles[i].pszDefault, szTmpStyle, COUNTOF(szTmpStyle), true, true);
if (bForceAll || (StringCchCompareXI(g_pLexArray[iLexer]->Styles[i].szValue, szTmpStyle) != 0))
{
IniSectionSetString(Lexer_Section, L"FileNameExtensions", g_pLexArray[iLexer]->szExtensions);
// normalize value
szTmpStyle[0] = L'\0'; // clear
Style_CopyStyles_IfNotDefined(g_pLexArray[iLexer]->Styles[i].szValue, szTmpStyle, COUNTOF(szTmpStyle), true, true);
IniSectionSetString(Lexer_Section, g_pLexArray[iLexer]->Styles[i].pszName, szTmpStyle);
}
else {
IniSectionDelete(Lexer_Section, L"FileNameExtensions", false);
}
unsigned i = 0;
while (g_pLexArray[iLexer]->Styles[i].iStyle != -1)
{
// normalize defaults
szTmpStyle[0] = L'\0'; // clear
Style_CopyStyles_IfNotDefined(g_pLexArray[iLexer]->Styles[i].pszDefault, szTmpStyle, COUNTOF(szTmpStyle), true, true);
if (bForceAll || (StringCchCompareXI(g_pLexArray[iLexer]->Styles[i].szValue, szTmpStyle) != 0))
{
// normalize value
szTmpStyle[0] = L'\0'; // clear
Style_CopyStyles_IfNotDefined(g_pLexArray[iLexer]->Styles[i].szValue, szTmpStyle, COUNTOF(szTmpStyle), true, true);
IniSectionSetString(Lexer_Section, g_pLexArray[iLexer]->Styles[i].pszName, szTmpStyle);
}
else {
IniSectionDelete(Lexer_Section, g_pLexArray[iLexer]->Styles[i].pszName, false);
}
++i;
IniSectionDelete(Lexer_Section, g_pLexArray[iLexer]->Styles[i].pszName, false);
}
++i;
}
SaveIniFile(szFile);
}
return ok;
return SaveIniFile(szFile);
}