del "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" 2> NUL
-7z.exe a -t7z -xr!*.gcno -xr!*.gcda -xr!*.gcov -xr!*.orig -xr!*.o -xr!*.a -xr!.dep -xr!*.out -xr!debug_static* -xr!debug_shared* -xr!release_static* -xr!release_shared* -xr!*.bak -xr!*.lang -xr!*.db -xr!*.ncb -xr!*.sdf -xr!*.bsc -xr!*.opt -xr!*.plg -xr!*.suo -xr!*.obj -xr!*.ilk -xr!*.pdb -xr!*.pch -xr!*.res -xr!*.exe -xr!*.sbr -xr!.vs -xr!*.VC.db-* -xr!*.zip -xr!WinMergeSplash.psd -xr!*.lib -xr!*.exp -xr!*.idb -xr!*.%COMPUTERNAME%.%USERNAME%.user -xr!BuildLog.htm -xr!ipch -xr!*.tlb -xr!*.tlog -xr!*.*~ -xr!CVS -xr!.svn -xr!.hg -xr!*.log -xr!*.lastbuildstate -xr!FreeImage*.dll -xr!WinIMergeLib.dll -xr!WinIMerge.exe -xr!BuildTmp -xr!Docs\Manual\Tools "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" ArchiveSupport Docs Externals Filters Installer Plugins ShellExtension Src Testing Tools Translations Web readme.txt Version.h *.cmd *.bat *.inf *.sln *.vbs
+7z.exe a -t7z -xr!*.gcno -xr!*.gcda -xr!*.gcov -xr!*.orig -xr!*.o -xr!*.a -xr!.dep -xr!*.out -xr!debug_static* -xr!debug_shared* -xr!release_static* -xr!release_shared* -xr!*.bak -xr!*.lang -xr!*.db -xr!*.ncb -xr!*.sdf -xr!*.bsc -xr!*.opt -xr!*.plg -xr!*.suo -xr!*.obj -xr!*.ilk -xr!*.pdb -xr!*.pch -xr!*.res -xr!*.exe -xr!*.sbr -xr!.vs -xr!*.VC.db-* -xr!*.zip -xr!WinMergeSplash.psd -xr!*.lib -xr!*.exp -xr!*.idb -xr!*.%COMPUTERNAME%.%USERNAME%.user -xr!BuildLog.htm -xr!ipch -xr!*.tlb -xr!*.tlog -xr!*.*~ -xr!CVS -xr!.svn -xr!.hg -xr!*.log -xr!*.lastbuildstate -xr!FreeImage*.dll -xr!WinIMergeLib.dll -xr!WinIMerge.exe -xr!BuildTmp -xr!Docs\Manual\Tools "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" ArchiveSupport ColorSchemes Docs Externals Filters Installer Plugins ShellExtension Src Testing Tools Translations Web readme.txt Version.h *.cmd *.bat *.inf *.sln *.vbs
(
echo "%DISTDIR%\WinMerge-%SAFEAPPVER%-Setup.exe"
copy "Build\WinMerge-%RCVER%-%PLATFORMH%Setup.exe" "%DISTDIR%\WinMerge-%SAFEAPPVER%-%PLATFORMH%Setup.exe"
-for %%i in (Languages Filters MergePlugins Docs Frhed\Docs Frhed\Languages WinIMerge Merge7z\Lang GnuWin32) do (
+for %%i in (ColorSchemes Languages Filters MergePlugins Docs Frhed\Docs Frhed\Languages WinIMerge Merge7z\Lang GnuWin32) do (
mkdir "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\%%i" 2> NUL
)
echo Copy Translations...
copy Build\%PLATFORM%\Release\Languages\*.po "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Languages\" > NUL
+rem ColorSchemes
+echo Copy ColorSchemes...
+for %%i in (ColorSchemes\*.ini) do (
+ copy "%%i" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\ColorSchemes" > NUL
+)
+
rem Filters
echo Copy Filters...
for %%i in (Filters\*.flt Filters\*.tmpl Filters\*.txt) do (
--- /dev/null
+; Default color scheme
+[WinMerge]
+DefaultSyntaxColors/Bold00=0
+DefaultSyntaxColors/Bold01=0
+DefaultSyntaxColors/Bold02=0
+DefaultSyntaxColors/Bold03=0
+DefaultSyntaxColors/Bold04=0
+DefaultSyntaxColors/Bold05=0
+DefaultSyntaxColors/Bold06=0
+DefaultSyntaxColors/Bold07=1
+DefaultSyntaxColors/Bold08=0
+DefaultSyntaxColors/Bold09=0
+DefaultSyntaxColors/Bold10=0
+DefaultSyntaxColors/Bold11=0
+DefaultSyntaxColors/Bold12=0
+DefaultSyntaxColors/Bold13=0
+DefaultSyntaxColors/Bold14=0
+DefaultSyntaxColors/Bold15=0
+DefaultSyntaxColors/Bold16=0
+DefaultSyntaxColors/Bold17=0
+DefaultSyntaxColors/Bold18=0
+DefaultSyntaxColors/Bold19=0
+DefaultSyntaxColors/Bold20=0
+DefaultSyntaxColors/Bold21=0
+DefaultSyntaxColors/Bold22=0
+DefaultSyntaxColors/Bold23=0
+DefaultSyntaxColors/Bold24=0
+DefaultSyntaxColors/Bold25=0
+DefaultSyntaxColors/Color00=128
+DefaultSyntaxColors/Color01=16777215
+DefaultSyntaxColors/Color02=16777215
+DefaultSyntaxColors/Color03=0
+DefaultSyntaxColors/Color04=15790320
+DefaultSyntaxColors/Color05=14120960
+DefaultSyntaxColors/Color06=16777215
+DefaultSyntaxColors/Color07=16711680
+DefaultSyntaxColors/Color08=8388736
+DefaultSyntaxColors/Color09=32768
+DefaultSyntaxColors/Color10=255
+DefaultSyntaxColors/Color11=6316128
+DefaultSyntaxColors/Color12=128
+DefaultSyntaxColors/Color13=12615680
+DefaultSyntaxColors/Color14=10526975
+DefaultSyntaxColors/Color15=0
+DefaultSyntaxColors/Color16=65535
+DefaultSyntaxColors/Color17=0
+DefaultSyntaxColors/Color18=128
+DefaultSyntaxColors/Color19=128
+DefaultSyntaxColors/Color20=8388608
+DefaultSyntaxColors/Color21=12615680
+DefaultSyntaxColors/Color22=8388607
+DefaultSyntaxColors/Color23=8388479
+DefaultSyntaxColors/Color24=8355839
+DefaultSyntaxColors/Color25=16744319
+DefaultSyntaxColors/Values=26
+Settings/DefaultTextColoring=1
+Settings/DifferenceColor=379887
+Settings/DifferenceDeletedColor=12632256
+Settings/DifferenceTextColor=0x80000008
+Settings/DirMarginColor=0x80000005
+Settings/DirItemDiffColor=8249072
+Settings/DirItemDiffTextColor=0x80000008
+Settings/DirItemEqualColor=0x80000005
+Settings/DirItemEqualTextColor=0x80000008
+Settings/DirItemFilteredColor=14153210
+Settings/DirItemFilteredTextColor=0x80000008
+Settings/DirItemNotExistAllColor=14540253
+Settings/DirItemNotExistAllTextColor=0x80000008
+Settings/MovedBlockColor=5413860
+Settings/MovedBlockDeletedColor=12632256
+Settings/MovedBlockTextColor=0
+Settings/SNPColor=14678779
+Settings/SNPDeletedColor=15329769
+Settings/SNPTextColor=0
+Settings/SelectedDifferenceColor=7632879
+Settings/SelectedDifferenceDeletedColor=12632304
+Settings/SelectedDifferenceTextColor=0
+Settings/SelectedMovedBlockColor=5140728
+Settings/SelectedMovedBlockDeletedColor=10728956
+Settings/SelectedMovedBlockTextColor=0
+Settings/SelectedSNPColor=11843567
+Settings/SelectedSNPDeletedColor=14737648
+Settings/SelectedSNPTextColor=0
+Settings/SelectedWordDifferenceColor=10526975
+Settings/SelectedWordDifferenceDeletedColor=7111112
+Settings/SelectedWordDifferenceTextColor=0
+Settings/TrivialDifferenceColor=12579579
+Settings/TrivialDifferenceDeletedColor=15329769
+Settings/TrivialDifferenceTextColor=0
+Settings/UseDirCompareColors=1
+Settings/WordDifferenceColor=11395825
+Settings/WordDifferenceDeletedColor=8563455
+Settings/WordDifferenceTextColor=0
+++ /dev/null
-Settings/MovedBlockColor=0xc0d8f0
-Settings/MovedBlockDeletedColor=0xc0c0c0
-Settings/MovedBlockTextColor=0xffffffff
-Settings/SNPColor=0xdffafb
-Settings/SNPDeletedColor=0xe9e9e9
-Settings/SNPTextColor=0xffffffff
-Settings/SelectedDifferenceColor=0xddddff
-Settings/SelectedDifferenceDeletedColor=0xc0c0f0
-Settings/SelectedDifferenceTextColor=0xffffffff
-Settings/SelectedMovedBlockColor=0x4e70f8
-Settings/SelectedMovedBlockDeletedColor=0xa3b5fc
-Settings/SelectedMovedBlockTextColor=0xffffffff
-Settings/SelectedSNPColor=0xb4b7ef
-Settings/SelectedSNPDeletedColor=0xe0e0f0
-Settings/SelectedSNPTextColor=0xffffffff
-Settings/SelectedWordDifferenceColor=0xaaaaff
-Settings/SelectedWordDifferenceDeletedColor=0x8c96e6
-Settings/SelectedWordDifferenceTextColor=0xffffffff
-Settings/TrivialDifferenceColor=0xbff2fb
-Settings/TrivialDifferenceDeletedColor=0xe9e9e9
-Settings/TrivialDifferenceTextColor=0xffffffff
-Settings/WordDifferenceColor=0xaaffaa
-Settings/WordDifferenceDeletedColor=0xa0e6a0
-Settings/WordDifferenceTextColor=0xffffffff
--- /dev/null
+; Modern color scheme
+[WinMerge]
+DefaultSyntaxColors/Bold00=0
+DefaultSyntaxColors/Bold01=0
+DefaultSyntaxColors/Bold02=0
+DefaultSyntaxColors/Bold03=0
+DefaultSyntaxColors/Bold04=0
+DefaultSyntaxColors/Bold05=0
+DefaultSyntaxColors/Bold06=0
+DefaultSyntaxColors/Bold07=1
+DefaultSyntaxColors/Bold08=0
+DefaultSyntaxColors/Bold09=0
+DefaultSyntaxColors/Bold10=0
+DefaultSyntaxColors/Bold11=0
+DefaultSyntaxColors/Bold12=0
+DefaultSyntaxColors/Bold13=0
+DefaultSyntaxColors/Bold14=0
+DefaultSyntaxColors/Bold15=0
+DefaultSyntaxColors/Bold16=0
+DefaultSyntaxColors/Bold17=0
+DefaultSyntaxColors/Bold18=0
+DefaultSyntaxColors/Bold19=0
+DefaultSyntaxColors/Bold20=0
+DefaultSyntaxColors/Bold21=0
+DefaultSyntaxColors/Bold22=0
+DefaultSyntaxColors/Bold23=0
+DefaultSyntaxColors/Bold24=0
+DefaultSyntaxColors/Bold25=0
+DefaultSyntaxColors/Color00=128
+DefaultSyntaxColors/Color01=16777215
+DefaultSyntaxColors/Color02=16777215
+DefaultSyntaxColors/Color03=0
+DefaultSyntaxColors/Color04=15790320
+DefaultSyntaxColors/Color05=14120960
+DefaultSyntaxColors/Color06=16777215
+DefaultSyntaxColors/Color07=16711680
+DefaultSyntaxColors/Color08=8388736
+DefaultSyntaxColors/Color09=32768
+DefaultSyntaxColors/Color10=255
+DefaultSyntaxColors/Color11=6316128
+DefaultSyntaxColors/Color12=128
+DefaultSyntaxColors/Color13=12615680
+DefaultSyntaxColors/Color14=10526975
+DefaultSyntaxColors/Color15=0
+DefaultSyntaxColors/Color16=65535
+DefaultSyntaxColors/Color17=0
+DefaultSyntaxColors/Color18=128
+DefaultSyntaxColors/Color19=128
+DefaultSyntaxColors/Color20=8388608
+DefaultSyntaxColors/Color21=12615680
+DefaultSyntaxColors/Color22=8388607
+DefaultSyntaxColors/Color23=8388479
+DefaultSyntaxColors/Color24=8355839
+DefaultSyntaxColors/Color25=16744319
+DefaultSyntaxColors/Values=26
+Settings/DefaultTextColoring=1
+Settings/DifferenceColor=14548957
+Settings/DifferenceDeletedColor=16769248
+Settings/DifferenceTextColor=-1
+Settings/DirMarginColor=0x80000005
+Settings/DirItemDiffColor=14548957
+Settings/DirItemDiffTextColor=0
+Settings/DirItemEqualColor=0x80000005
+Settings/DirItemEqualTextColor=0x80000008
+Settings/DirItemFilteredColor=14153210
+Settings/DirItemFilteredTextColor=0x80000008
+Settings/DirItemNotExistAllColor=16769248
+Settings/DirItemNotExistAllTextColor=0x80000008
+Settings/MovedBlockColor=12638448
+Settings/MovedBlockDeletedColor=12632256
+Settings/MovedBlockTextColor=-1
+Settings/SNPColor=14678779
+Settings/SNPDeletedColor=15329769
+Settings/SNPTextColor=-1
+Settings/SelectedDifferenceColor=14540287
+Settings/SelectedDifferenceDeletedColor=12632304
+Settings/SelectedDifferenceTextColor=-1
+Settings/SelectedMovedBlockColor=5140728
+Settings/SelectedMovedBlockDeletedColor=10728956
+Settings/SelectedMovedBlockTextColor=-1
+Settings/SelectedSNPColor=11843567
+Settings/SelectedSNPDeletedColor=14737648
+Settings/SelectedSNPTextColor=-1
+Settings/SelectedWordDifferenceColor=11184895
+Settings/SelectedWordDifferenceDeletedColor=9213670
+Settings/SelectedWordDifferenceTextColor=-1
+Settings/TrivialDifferenceColor=12579579
+Settings/TrivialDifferenceDeletedColor=15329769
+Settings/TrivialDifferenceTextColor=-1
+Settings/UseDirCompareColors=1
+Settings/WordDifferenceColor=11206570
+Settings/WordDifferenceDeletedColor=10544800
+Settings/WordDifferenceTextColor=-1
--- /dev/null
+; Solarized Dark color scheme for WinMerge
+; based on https://ethanschoonover.com/solarized/ and https://github.com/keeleyt83/winmerge-solarized-dark
+; license: MIT
+[WinMerge]
+; base03
+Custom Colors/0=0x362b00
+; base02
+Custom Colors/1=0x423607
+; base01
+Custom Colors/2=0x756e58
+; base00
+Custom Colors/3=0x837b65
+; base0
+Custom Colors/4=0x969483
+; base1
+Custom Colors/5=0xa1a193
+; base2
+Custom Colors/6=0xd5e8ee
+; base3
+Custom Colors/7=0xe3f6fd
+; yellow
+Custom Colors/8=0x0089b5
+; orange
+Custom Colors/9=0x164bcb
+; red
+Custom Colors/10=0x2f32dc
+; magenta
+Custom Colors/11=0x8236d3
+; violet
+Custom Colors/12=0xc4716c
+; blue
+Custom Colors/13=0xc98b26
+; cyan
+Custom Colors/14=0x98a12a
+; green
+Custom Colors/15=0x009985
+
+; Syntax Category
+DefaultSyntaxColors/Bold00=0
+DefaultSyntaxColors/Bold01=0
+DefaultSyntaxColors/Bold02=0
+DefaultSyntaxColors/Bold03=0
+DefaultSyntaxColors/Bold04=0
+DefaultSyntaxColors/Bold05=0
+DefaultSyntaxColors/Bold06=0
+DefaultSyntaxColors/Bold07=0
+DefaultSyntaxColors/Bold08=0
+DefaultSyntaxColors/Bold09=0
+DefaultSyntaxColors/Bold10=0
+DefaultSyntaxColors/Bold11=0
+DefaultSyntaxColors/Bold12=0
+DefaultSyntaxColors/Bold13=0
+DefaultSyntaxColors/Bold14=0
+DefaultSyntaxColors/Bold15=0
+DefaultSyntaxColors/Bold16=0
+DefaultSyntaxColors/Bold17=0
+DefaultSyntaxColors/Bold18=0
+DefaultSyntaxColors/Bold19=0
+DefaultSyntaxColors/Bold20=0
+DefaultSyntaxColors/Bold21=0
+DefaultSyntaxColors/Bold22=0
+DefaultSyntaxColors/Bold23=0
+DefaultSyntaxColors/Bold24=0
+DefaultSyntaxColors/Bold25=0
+DefaultSyntaxColors/Color00=0x000080
+; base03
+DefaultSyntaxColors/Color01=0x362b00
+; base03
+DefaultSyntaxColors/Color02=0x362b00
+; base1
+DefaultSyntaxColors/Color03=0xa1a193
+; base02
+DefaultSyntaxColors/Color04=0x423607
+; base01
+DefaultSyntaxColors/Color05=0x756e58
+; base03
+DefaultSyntaxColors/Color06=0x362b00
+; yellow
+DefaultSyntaxColors/Color07=0x0089b5
+; base1
+DefaultSyntaxColors/Color08=0xa1a193
+DefaultSyntaxColors/Color09=0x0f42ca
+DefaultSyntaxColors/Color10=0x0f42ca
+; base1
+DefaultSyntaxColors/Color11=0xa1a193
+; cyan
+DefaultSyntaxColors/Color12=0x98a12a
+; blue
+DefaultSyntaxColors/Color13=0xc98b26
+DefaultSyntaxColors/Color14=0xa0a0ff
+DefaultSyntaxColors/Color15=0x000000
+DefaultSyntaxColors/Color16=0x00ffff
+DefaultSyntaxColors/Color17=0x000000
+DefaultSyntaxColors/Color18=0x000080
+DefaultSyntaxColors/Color19=0x000080
+; violet
+DefaultSyntaxColors/Color20=0xc4716c
+; base2
+DefaultSyntaxColors/Color21=0xd5e8ee
+; base01
+DefaultSyntaxColors/Color22=0x756e58
+; cyan
+DefaultSyntaxColors/Color23=0x98a12a
+; magenta
+DefaultSyntaxColors/Color24=0x8236d3
+; violet
+DefaultSyntaxColors/Color25=0xc4716c
+DefaultSyntaxColors/Values=26
+Settings/DefaultTextColoring=0
+
+; Folder Compare Category
+; base02
+Settings/DirItemDiffColor=0x423607
+; orange
+Settings/DirItemDiffTextColor=0x164bcb
+; base03
+Settings/DirItemEqualColor=0x362b00
+; base0
+Settings/DirItemEqualTextColor=0x969483
+; base02
+Settings/DirItemFilteredColor=0x423607
+; base2
+Settings/DirItemFilteredTextColor=0xd5e8ee
+; base01
+Settings/DirItemNotExistAllColor=0x756e58
+; base03
+Settings/DirItemNotExistAllTextColor=0x362b00
+; base02
+Settings/DirMarginColor=0x423607
+
+; Differences Category
+Settings/DifferenceColor=0x3c461f
+Settings/DifferenceDeletedColor=0x2c360f
+Settings/DifferenceTextColor=0xffffffff
+Settings/MovedBlockColor=0x0f3386
+Settings/MovedBlockDeletedColor=0x0c2767
+Settings/MovedBlockTextColor=0xffffffff
+Settings/SNPColor=0x40210a
+Settings/SNPDeletedColor=0x251305
+Settings/SNPTextColor=0xffffffff
+Settings/SelectedDifferenceColor=0x2b2233
+Settings/SelectedDifferenceDeletedColor=0x1b1223
+Settings/SelectedDifferenceTextColor=0xffffffff
+Settings/SelectedMovedBlockColor=0x423607
+Settings/SelectedMovedBlockDeletedColor=0x423607
+Settings/SelectedMovedBlockTextColor=0xffffffff
+Settings/SelectedSNPColor=0x362b14
+Settings/SelectedSNPDeletedColor=0x1f180c
+Settings/SelectedSNPTextColor=0xffffffff
+Settings/SelectedWordDifferenceColor=0x221b5c
+Settings/SelectedWordDifferenceDeletedColor=0x171342
+Settings/SelectedWordDifferenceTextColor=0xffffffff
+Settings/TrivialDifferenceColor=0x2c170a
+Settings/TrivialDifferenceDeletedColor=0x110a04
+Settings/TrivialDifferenceTextColor=0xffffffff
+Settings/UseDirCompareColors=1
+Settings/WordDifferenceColor=0x25653d
+Settings/WordDifferenceDeletedColor=0x416036
+Settings/WordDifferenceTextColor=0xffffffff
--- /dev/null
+; Solarized Light color scheme for WinMerge
+; based on https://ethanschoonover.com/solarized/ and https://github.com/keeleyt83/winmerge-solarized-dark
+; license: MIT
+[WinMerge]
+; base03
+Custom Colors/0=0x362b00
+; base02
+Custom Colors/1=0x423607
+; base01
+Custom Colors/2=0x756e58
+; base00
+Custom Colors/3=0x837b65
+; base0
+Custom Colors/4=0x969483
+; base1
+Custom Colors/5=0xa1a193
+; base2
+Custom Colors/6=0xd5e8ee
+; base3
+Custom Colors/7=0xe3f6fd
+; yellow
+Custom Colors/8=0x0089b5
+; orange
+Custom Colors/9=0x164bcb
+; red
+Custom Colors/10=0x2f32dc
+; magenta
+Custom Colors/11=0x8236d3
+; violet
+Custom Colors/12=0xc4716c
+; blue
+Custom Colors/13=0xc98b26
+; cyan
+Custom Colors/14=0x98a12a
+; green
+Custom Colors/15=0x009985
+
+; Syntax Category
+DefaultSyntaxColors/Bold00=0
+DefaultSyntaxColors/Bold01=0
+DefaultSyntaxColors/Bold02=0
+DefaultSyntaxColors/Bold03=0
+DefaultSyntaxColors/Bold04=0
+DefaultSyntaxColors/Bold05=0
+DefaultSyntaxColors/Bold06=0
+DefaultSyntaxColors/Bold07=0
+DefaultSyntaxColors/Bold08=0
+DefaultSyntaxColors/Bold09=0
+DefaultSyntaxColors/Bold10=0
+DefaultSyntaxColors/Bold11=0
+DefaultSyntaxColors/Bold12=0
+DefaultSyntaxColors/Bold13=0
+DefaultSyntaxColors/Bold14=0
+DefaultSyntaxColors/Bold15=0
+DefaultSyntaxColors/Bold16=0
+DefaultSyntaxColors/Bold17=0
+DefaultSyntaxColors/Bold18=0
+DefaultSyntaxColors/Bold19=0
+DefaultSyntaxColors/Bold20=0
+DefaultSyntaxColors/Bold21=0
+DefaultSyntaxColors/Bold22=0
+DefaultSyntaxColors/Bold23=0
+DefaultSyntaxColors/Bold24=0
+DefaultSyntaxColors/Bold25=0
+DefaultSyntaxColors/Color00=0x000080
+; base3
+DefaultSyntaxColors/Color01=0xe3f6fd
+; base3
+DefaultSyntaxColors/Color02=0xe3f6fd
+; base01
+DefaultSyntaxColors/Color03=0x756e58
+; base2
+DefaultSyntaxColors/Color04=0xd5e8ee
+; base1
+DefaultSyntaxColors/Color05=0xa1a193
+; base3
+DefaultSyntaxColors/Color06=0xe3f6fd
+; yellow
+DefaultSyntaxColors/Color07=0x0089b5
+; base1
+DefaultSyntaxColors/Color08=0xa1a193
+DefaultSyntaxColors/Color09=0x0f42ca
+DefaultSyntaxColors/Color10=0x0f42ca
+; base1
+DefaultSyntaxColors/Color11=0xa1a193
+; cyan
+DefaultSyntaxColors/Color12=0x98a12a
+; blue
+DefaultSyntaxColors/Color13=0xc98b26
+DefaultSyntaxColors/Color14=0xa0a0ff
+DefaultSyntaxColors/Color15=0x000000
+DefaultSyntaxColors/Color16=0x00ffff
+DefaultSyntaxColors/Color17=0x000000
+DefaultSyntaxColors/Color18=0x000080
+DefaultSyntaxColors/Color19=0x000080
+; violet
+DefaultSyntaxColors/Color20=0xc4716c
+; base2
+DefaultSyntaxColors/Color21=0xd5e8ee
+; yellow
+DefaultSyntaxColors/Color22=0x0089b5
+; cyan
+DefaultSyntaxColors/Color23=0x98a12a
+; magenta
+DefaultSyntaxColors/Color24=0x8236d3
+; violet
+DefaultSyntaxColors/Color25=0xc4716c
+DefaultSyntaxColors/Values=26
+Settings/DefaultTextColoring=0
+
+; Folder Compare Category
+; base2
+Settings/DirItemDiffColor=0xd5e8ee
+; orange
+Settings/DirItemDiffTextColor=0x164bcb
+; base3
+Settings/DirItemEqualColor=0xe3f6fd
+; base00
+Settings/DirItemEqualTextColor=0x837b65
+; base2
+Settings/DirItemFilteredColor=0xd5e8ee
+; base02
+Settings/DirItemFilteredTextColor=0x423607
+; base1
+Settings/DirItemNotExistAllColor=0xa1a193
+; base3
+Settings/DirItemNotExistAllTextColor=0xe3f6fd
+; base2
+Settings/DirMarginColor=0xd5e8ee
+
+; Differences Category
+Settings/DifferenceColor=0xddffdd
+Settings/DifferenceDeletedColor=0xffe0e0
+Settings/DifferenceTextColor=0xffffffff
+Settings/MovedBlockColor=0xc0d8f0
+Settings/MovedBlockDeletedColor=0xc0c0c0
+Settings/MovedBlockTextColor=0xffffffff
+Settings/SNPColor=0xdffafb
+Settings/SNPDeletedColor=0xe9e9e9
+Settings/SNPTextColor=0xffffffff
+Settings/SelectedDifferenceColor=0xddddff
+Settings/SelectedDifferenceDeletedColor=0xc0c0f0
+Settings/SelectedDifferenceTextColor=0xffffffff
+Settings/SelectedMovedBlockColor=0x4e70f8
+Settings/SelectedMovedBlockDeletedColor=0xa3b5fc
+Settings/SelectedMovedBlockTextColor=0xffffffff
+Settings/SelectedSNPColor=0xb4b7ef
+Settings/SelectedSNPDeletedColor=0xe0e0f0
+Settings/SelectedSNPTextColor=0xffffffff
+Settings/SelectedWordDifferenceColor=0xaaaaff
+Settings/SelectedWordDifferenceDeletedColor=0x8c96e6
+Settings/SelectedWordDifferenceTextColor=0xffffffff
+Settings/TrivialDifferenceColor=0xbff2fb
+Settings/TrivialDifferenceDeletedColor=0xe9e9e9
+Settings/TrivialDifferenceTextColor=0xffffffff
+Settings/UseDirCompareColors=1
+Settings/WordDifferenceColor=0xaaffaa
+Settings/WordDifferenceDeletedColor=0xa0e6a0
+Settings/WordDifferenceTextColor=0xffffffff
strStyles += _T("}\n");
}
}
+ COLORREF clrSelMargin = GetColor(COLORINDEX_SELMARGIN);
+ COLORREF clrNormalText = GetColor(COLORINDEX_NORMALTEXT);
+ strStyles += Fmt(_T(".ln {text-align: right; word-break: normal; color: #%02x%02x%02x; background-color: #%02x%02x%02x;}\n"),
+ GetRValue(clrNormalText), GetGValue(clrNormalText), GetBValue(clrNormalText),
+ GetRValue(clrSelMargin), GetGValue(clrSelMargin), GetBValue(clrSelMargin));
return strStyles;
}
Source: ..\..\Filters\*.flt; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters\r
Source: ..\..\Filters\FileFilter.tmpl; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters\r
\r
+;ColorSchemes\r
+Source: ..\..\ColorSchemes\*.ini; DestDir: {app}\ColorSchemes; Flags: sortfilesbyextension comparetimestamp ignoreversion\r
+\r
;Documentation\r
Source: ..\..\Docs\Users\ReadMe.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core\r
Source: ..\..\Docs\Users\Contributors.txt; DestDir: {app}; Flags: comparetimestamp ignoreversion promptifolder; Components: Core\r
Source: ..\..\Filters\*.flt; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters\r
Source: ..\..\Filters\FileFilter.tmpl; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters\r
\r
+;ColorSchemes\r
+Source: ..\..\ColorSchemes\*.ini; DestDir: {app}\ColorSchemes; Flags: sortfilesbyextension comparetimestamp ignoreversion\r
+\r
;Documentation\r
Source: ..\..\Docs\Users\ReadMe.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core\r
Source: ..\..\Docs\Users\Contributors.txt; DestDir: {app}; Flags: comparetimestamp ignoreversion promptifolder; Components: Core\r
Source: ..\..\Filters\*.flt; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters\r
Source: ..\..\Filters\FileFilter.tmpl; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters\r
\r
+;ColorSchemes\r
+Source: ..\..\ColorSchemes\*.ini; DestDir: {app}\ColorSchemes; Flags: sortfilesbyextension comparetimestamp ignoreversion\r
+\r
;Documentation\r
Source: ..\..\Docs\Users\ReadMe.txt; DestDir: {app}\Docs; Flags: comparetimestamp ignoreversion promptifolder; Components: Core\r
Source: ..\..\Docs\Users\Contributors.txt; DestDir: {app}; Flags: comparetimestamp ignoreversion promptifolder; Components: Core\r
, m_pOptionsMgr(regOptions)
, m_pageGeneral(regOptions)
, m_pageCompare(regOptions)
+, m_pageColorSchemes(regOptions)
, m_pageMergeColors(regOptions)
, m_pSyntaxColors(colors)
, m_pageTextColors(regOptions, colors)
ON_NOTIFY(TVN_SELCHANGED, IDC_TREEOPT_PAGES, OnSelchangedPages)
ON_BN_CLICKED(IDC_TREEOPT_IMPORT, OnImportButton)
ON_BN_CLICKED(IDC_TREEOPT_EXPORT, OnExportButton)
+ ON_MESSAGE(WM_APP + IDC_COLOR_SCHEMES, OnColorSchemeChanged)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
AddPage(&m_pageCompareBinary, IDS_OPTIONSPG_COMPARE, IDS_OPTIONSPG_BINARYCOMPARE);
AddPage(&m_pageCompareImage, IDS_OPTIONSPG_COMPARE, IDS_OPTIONSPG_IMAGECOMPARE);
AddPage(&m_pageEditor, IDS_OPTIONSPG_EDITOR);
+ AddPage(&m_pageColorSchemes, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_COLOR_SCHEMES);
AddPage(&m_pageMergeColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_MERGECOLORS);
AddPage(&m_pageSyntaxColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_SYNTAXCOLORS);
AddPage(&m_pageTextColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_TEXTCOLORS);
void CPreferencesDlg::ReadOptions(bool bUpdate)
{
m_pageGeneral.ReadOptions();
+ m_pageColorSchemes.ReadOptions();
m_pageMergeColors.ReadOptions();
m_pageTextColors.ReadOptions();
m_pageSyntaxColors.ReadOptions();
if (bUpdate)
{
SafeUpdatePage(&m_pageGeneral, false);
+ SafeUpdatePage(&m_pageColorSchemes, false);
SafeUpdatePage(&m_pageMergeColors, false);
SafeUpdatePage(&m_pageTextColors, false);
SafeUpdatePage(&m_pageSyntaxColors, false);
m_pageCompareBinary.WriteOptions();
m_pageCompareImage.WriteOptions();
m_pageEditor.WriteOptions();
+ m_pageColorSchemes.WriteOptions();
m_pageMergeColors.WriteOptions();
m_pageTextColors.WriteOptions();
m_pageSyntaxColors.WriteOptions();
m_pphost.UpdatePagesData();
SaveOptions();
- if (m_pOptionsMgr->ExportOptions(settingsFile) == COption::OPT_OK)
+ if (m_pOptionsMgr->ExportOptions(settingsFile, true) == COption::OPT_OK)
LangMessageBox(IDS_OPT_EXPORT_DONE, MB_ICONINFORMATION);
else
LangMessageBox(IDS_OPT_EXPORT_ERR, MB_ICONWARNING);
}
}
+LRESULT CPreferencesDlg::OnColorSchemeChanged(WPARAM wParams, LPARAM lParam)
+{
+ Options::SyntaxColors::Load(m_pOptionsMgr, m_pSyntaxColors);
+ ReadOptions(true);
+ return 0;
+}
+
/**
* @brief Do a safe UpdateData call for propertypage.
* This function does safe UpdateData call for given propertypage. As it is,
#include "PropCompare.h"
#include "PropEditor.h"
#include "PropRegistry.h"
+#include "PropColorSchemes.h"
#include "PropMergeColors.h"
#include "PropTextColors.h"
#include "PropSyntaxColors.h"
PropEditor m_pageEditor;
PropRegistry m_pageSystem;
PropCodepage m_pageCodepage;
+ PropColorSchemes m_pageColorSchemes;
PropMergeColors m_pageMergeColors;
PropTextColors m_pageTextColors;
PropSyntaxColors m_pageSyntaxColors;
afx_msg void OnHelpButton();
afx_msg void OnImportButton();
afx_msg void OnExportButton();
+ afx_msg LRESULT OnColorSchemeChanged(WPARAM wParam, LPARAM lParam);
afx_msg void OnSelchangedPages(NMHDR* pNMHDR, LRESULT* pResult);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
* already in options storage its is not created.
*
* @param [in] filename Filename where optios are written.
- * @return
+ * @return
* - COption::OPT_OK when succeeds
* - COption::OPT_NOTFOUND if file wasn't found or didn't contain values
*/
int retVal = COption::OPT_OK;
const int BufSize = 20480; // This should be enough for a long time..
TCHAR buf[BufSize] = {0};
+ auto oleTranslateColor = [](unsigned color) -> unsigned { return ((color & 0xffffff00) == 0x80000000) ? GetSysColor(color & 0x000000ff) : color; };
// Query keys - returns NUL separated strings
DWORD len = GetPrivateProfileString(_T("WinMerge"), nullptr, _T(""),buf, BufSize, filename.c_str());
else if (value.GetType() == varprop::VT_INT)
{
int intVal = GetPrivateProfileInt(_T("WinMerge"), pKey, 0, filename.c_str());
+ if (strutils::makelower(pKey).find(String(_T("color"))) != std::string::npos)
+ intVal = static_cast<int>(oleTranslateColor(static_cast<unsigned>(intVal)));
value.SetInt(intVal);
SaveOption(pKey, intVal);
}
}
else
{
- COLORREF color = m_pList->GetBackColor(currRow);
- String attr = strutils::format(_T("style='background-color: #%02x%02x%02x'"),
- GetRValue(color), GetGValue(color), GetBValue(color));
+ COLORREF backcolor = m_pList->GetBackColor(currRow);
+ COLORREF textcolor = m_pList->GetTextColor(currRow);
+ String attr = strutils::format(_T("style='%sbackground-color: #%02x%02x%02x'"),
+ textcolor == 0 ? _T("") : strutils::format(_T("color: #%02x%02x%02x; "),
+ GetRValue(textcolor), GetGValue(textcolor), GetBValue(textcolor)).c_str(),
+ GetRValue(backcolor), GetGValue(backcolor), GetBValue(backcolor));
WriteString(BeginEl(rowEl, attr));
}
for (int currCol = 0; currCol < m_nColumns; currCol++)
CWnd::SetFont(&m_font, TRUE);
}
+ if (m_bUseColors)
+ m_pList->SetBkColor(m_cachedColors.clrDirMargin);
+
// Replace standard header with sort header
HWND hWnd = ListView_GetHeader(m_pList->m_hWnd);
if (hWnd != nullptr)
m_bExpandSubdirs = GetOptionsMgr()->GetBool(OPT_DIRVIEW_EXPAND_SUBDIRS);
Options::DirColors::Load(GetOptionsMgr(), m_cachedColors);
m_bUseColors = GetOptionsMgr()->GetBool(OPT_DIRCLR_USE_COLORS);
+ m_pList->SetBkColor(m_bUseColors ? m_cachedColors.clrDirMargin : GetSysColor(COLOR_WINDOW));
+ Invalidate();
}
/**
virtual String GetColumnName(int col) const = 0;
virtual String GetItemText(int row, int col) const = 0;
virtual void *GetItemData(int row) const = 0;
+ virtual int GetTextColor(int row) const = 0;
virtual int GetBackColor(int row) const = 0;
virtual bool IsSelectedItem(int sel) const = 0;
virtual int GetNextItem(int sel, bool selected = false, bool reverse = false) const = 0;
return (void *)lvi.lParam;\r
}\r
\r
+ int GetTextColor(int row) const override\r
+ {\r
+ NMLVCUSTOMDRAW nmlvcd = {0};\r
+ nmlvcd.nmcd.hdr.code = NM_CUSTOMDRAW;\r
+ nmlvcd.nmcd.hdr.idFrom = GetDlgCtrlID(m_hwndListCtrl);\r
+ nmlvcd.nmcd.hdr.hwndFrom = m_hwndListCtrl;\r
+ nmlvcd.nmcd.dwDrawStage = CDDS_ITEMPREPAINT | CDDS_SUBITEM;\r
+ nmlvcd.nmcd.dwItemSpec = row;\r
+ SendMessage(GetParent(m_hwndListCtrl), WM_NOTIFY, (WPARAM)m_hwndListCtrl, (LPARAM)&nmlvcd);\r
+ return nmlvcd.clrText;\r
+ }\r
+\r
int GetBackColor(int row) const override\r
{\r
NMLVCUSTOMDRAW nmlvcd = {0};\r
if (cmdInfo.m_bNoPrefs)
m_pOptions->SetSerializing(false); // Turn off serializing to registry.
+ Options::CopyHKLMValues();
Options::Init(m_pOptions.get()); // Implementation in OptionsInit.cpp
ApplyCommandLineConfigOptions(cmdInfo);
if (cmdInfo.m_sErrorMessages.size() > 0)
}
if (m_pSyntaxColors != nullptr)
- Options::SyntaxColors::Load(GetOptionsMgr(), m_pSyntaxColors.get());
+ Options::SyntaxColors::Init(GetOptionsMgr(), m_pSyntaxColors.get());
if (m_pMarkers != nullptr)
m_pMarkers->LoadFromRegistry();
PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14\r
END\r
\r
+IDD_PROPPAGE_COLOR_SCHEMES DIALOGEX 0, 0, 255, 196\r
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
+CAPTION "Colors"\r
+FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
+BEGIN\r
+ LTEXT "Color Scheme:",IDC_STATIC,7,10,230,10\r
+ COMBOBOX IDC_COLOR_SCHEMES,7,22,230,93,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
+END\r
+\r
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 255, 196\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Colors"\r
CONTROL "",IDC_SEL_WORDDIFF_DELETED_COLOR,"Button",BS_OWNERDRAW,174,189,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
CONTROL "",IDC_SEL_WORDDIFF_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX,204,189,10,14\r
CONTROL "",IDC_SEL_WORDDIFF_TEXT_COLOR,"Button",BS_OWNERDRAW,214,189,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
- PUSHBUTTON "GitHub/Bitbucket",IDC_COLORSCHEME_GITHUBBITBUCKET,89,208,70,14\r
- PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,161,208,70,14\r
END\r
\r
IDD_PROPPAGE_COLORS_DIR DIALOGEX 0, 0, 255, 196\r
RTEXT "Items filtered:",IDC_STATIC,4,109,152,20\r
CONTROL "",IDC_DIR_ITEM_FILTERED_COLOR,"Button",BS_OWNERDRAW,172,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
CONTROL "",IDC_DIR_ITEM_FILTERED_TEXT_COLOR,"Button",BS_OWNERDRAW,214,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
- PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,161,208,70,14\r
+ RTEXT "Margin:",IDC_STATIC,4,129,152,20\r
+ CONTROL "",IDC_DIR_MARGIN_COLOR,"Button",BS_OWNERDRAW,172,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
END\r
\r
IDD_PROPPAGE_SYSTEM DIALOGEX 0, 0, 255, 220\r
CONTROL "Bold",IDC_SCOLOR_USER1_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,160,55,10\r
CONTROL "",IDC_SCOLOR_USER2,"Button",BS_OWNERDRAW | WS_TABSTOP,83,179,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
CONTROL "Bold",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,180,55,10\r
- PUSHBUTTON "Defaults",IDC_SCOLORS_BDEFAULTS,162,198,70,14\r
END\r
\r
IDD_PROPPAGE_COLORS_MARKER DIALOGEX 0, 0, 255, 157\r
IDS_OPTIONSPG_COMPARE "Compare"\r
IDS_OPTIONSPG_EDITOR "Editor"\r
IDS_OPTIONSPG_COLORS "Colors"\r
+ IDS_OPTIONSPG_COLOR_SCHEMES "Color Schemes"\r
IDS_OPTIONSPG_TEXTCOLORS "Text"\r
IDS_OPTIONSPG_SYNTAXCOLORS "Syntax"\r
IDS_OPTIONSPG_MARKERCOLORS "Markers"\r
<ClCompile Include="PropArchive.cpp" />\r
<ClCompile Include="PropBackups.cpp" />\r
<ClCompile Include="PropCodepage.cpp" />\r
+ <ClCompile Include="PropColorSchemes.cpp" />\r
<ClCompile Include="PropMergeColors.cpp" />\r
<ClCompile Include="PropCompare.cpp" />\r
<ClCompile Include="PropCompareBinary.cpp" />\r
<ClInclude Include="PropArchive.h" />\r
<ClInclude Include="PropBackups.h" />\r
<ClInclude Include="PropCodepage.h" />\r
+ <ClInclude Include="PropColorSchemes.h" />\r
<ClInclude Include="PropMergeColors.h" />\r
<ClInclude Include="PropCompare.h" />\r
<ClInclude Include="PropCompareBinary.h" />\r
<ClCompile Include="PropMergeColors.cpp">\r
<Filter>MFCGui\PropertyPages\Source Files</Filter>\r
</ClCompile>\r
+ <ClCompile Include="PropColorSchemes.cpp">\r
+ <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ClInclude Include="charsets.h">\r
<ClInclude Include="PropMergeColors.h">\r
<Filter>MFCGui\PropertyPages\Header Files</Filter>\r
</ClInclude>\r
+ <ClInclude Include="PropColorSchemes.h">\r
+ <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+ </ClInclude>\r
</ItemGroup>\r
<ItemGroup>\r
<None Include="res\binarydiff.ico">\r
<ClCompile Include="PropArchive.cpp" />\r
<ClCompile Include="PropBackups.cpp" />\r
<ClCompile Include="PropCodepage.cpp" />\r
+ <ClCompile Include="PropColorSchemes.cpp" />\r
<ClCompile Include="PropMergeColors.cpp" />\r
<ClCompile Include="PropCompare.cpp" />\r
<ClCompile Include="PropCompareBinary.cpp" />\r
<ClInclude Include="PropArchive.h" />\r
<ClInclude Include="PropBackups.h" />\r
<ClInclude Include="PropCodepage.h" />\r
+ <ClInclude Include="PropColorSchemes.h" />\r
<ClInclude Include="PropMergeColors.h" />\r
<ClInclude Include="PropCompare.h" />\r
<ClInclude Include="PropCompareBinary.h" />\r
<ClCompile Include="PropMergeColors.cpp">\r
<Filter>MFCGui\PropertyPages\Source Files</Filter>\r
</ClCompile>\r
+ <ClCompile Include="PropColorSchemes.cpp">\r
+ <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+ </ClCompile>\r
</ItemGroup>\r
<ItemGroup>\r
<ClInclude Include="charsets.h">\r
<ClInclude Include="PropMergeColors.h">\r
<Filter>MFCGui\PropertyPages\Header Files</Filter>\r
</ClInclude>\r
+ <ClInclude Include="PropColorSchemes.h">\r
+ <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+ </ClInclude>\r
</ItemGroup>\r
<ItemGroup>\r
<None Include="res\binarydiff.ico">\r
_T("table {margin: 0; border: 1px solid #a0a0a0; box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.15);}\n")
_T("td,th {word-break: break-all; font-size: %dpt;padding: 0 3px;}\n")
_T("tr { vertical-align: top; }\n")
- _T(".ln {text-align: right; word-break: normal; background-color: lightgrey;}\n")
_T(".title {color: white; background-color: blue; vertical-align: top; padding: 4px 4px; background: linear-gradient(mediumblue, darkblue);}\n")
_T("%s")
_T("-->\n")
/** @brief Setting name for user-defined custom colors. */
const TCHAR Section[] = _T("Custom Colors");
-void Load(COptionsMgr *pOptionsMgr, COLORREF * colors)
+void SetDefaults(COptionsMgr *pOptionsMgr)
{
for (int i = 0; i < 16; i++)
{
String valuename = strutils::format(_T("%s/%d"), Section, i);
pOptionsMgr->InitOption(valuename, RGB(255, 255, 255), true);
+ }
+}
+
+void Load(COptionsMgr *pOptionsMgr, COLORREF * colors)
+{
+ for (int i = 0; i < 16; i++)
+ {
+ String valuename = strutils::format(_T("%s/%d"), Section, i);
colors[i] = pOptionsMgr->GetInt(valuename);
}
}
namespace Options { namespace CustomColors {
+void SetDefaults(COptionsMgr *pOptionsMgr);
void Load(COptionsMgr *pOptionsMgr, COLORREF * colors);
void Save(COptionsMgr *pOptionsMgr, const COLORREF * colors);
extern const String OPT_DIRCLR_ITEM_FILTERED OP("Settings/DirItemFilteredColor");
// The item filtered text color
extern const String OPT_DIRCLR_ITEM_FILTERED_TEXT OP("Settings/DirItemFilteredTextColor");
+// The background color
+extern const String OPT_DIRCLR_MARGIN OP("Settings/DirMarginColor");
// Use dir compare coloring?
extern const String OPT_DIRCLR_USE_COLORS OP("Settings/UseDirCompareColors");
+extern const String OPT_COLOR_SCHEME OP("Settings/ColorScheme");
+
// Compare options
extern const String OPT_CMP_IGNORE_WHITESPACE OP("Settings/IgnoreSpace");
extern const String OPT_CMP_IGNORE_BLANKLINES OP("Settings/IgnoreBlankLines");
pOptionsMgr->InitOption(OPT_DIRCLR_ITEM_NOT_EXIST_ALL_TEXT, defaultTextColor);
pOptionsMgr->InitOption(OPT_DIRCLR_ITEM_FILTERED, (int)RGB(250,245,215));
pOptionsMgr->InitOption(OPT_DIRCLR_ITEM_FILTERED_TEXT, defaultTextColor);
+ pOptionsMgr->InitOption(OPT_DIRCLR_MARGIN, (int)GetSysColor(COLOR_WINDOW));
pOptionsMgr->InitOption(OPT_DIRCLR_USE_COLORS, true);
}
colors.clrDirItemNotExistAllText = pOptionsMgr->GetInt(OPT_DIRCLR_ITEM_NOT_EXIST_ALL_TEXT);
colors.clrDirItemFiltered = pOptionsMgr->GetInt(OPT_DIRCLR_ITEM_FILTERED);
colors.clrDirItemFilteredText = pOptionsMgr->GetInt(OPT_DIRCLR_ITEM_FILTERED_TEXT);
+ colors.clrDirMargin = pOptionsMgr->GetInt(OPT_DIRCLR_MARGIN);
}
void Save(COptionsMgr *pOptionsMgr, const DIRCOLORSETTINGS& colors)
pOptionsMgr->SaveOption(OPT_DIRCLR_ITEM_NOT_EXIST_ALL_TEXT, (int)colors.clrDirItemNotExistAllText);
pOptionsMgr->SaveOption(OPT_DIRCLR_ITEM_FILTERED, (int)colors.clrDirItemFiltered);
pOptionsMgr->SaveOption(OPT_DIRCLR_ITEM_FILTERED_TEXT, (int)colors.clrDirItemFilteredText);
+ pOptionsMgr->SaveOption(OPT_DIRCLR_MARGIN, (int)colors.clrDirMargin);
}
}}
COLORREF clrDirItemNotExistAllText; /**< Item not-exist-all text color */
COLORREF clrDirItemFiltered; /**< Item filtered background color */
COLORREF clrDirItemFilteredText; /**< Item filtered text color */
+ COLORREF clrDirMargin; /**< Background color */
};
class COptionsMgr;
#include "OptionsDef.h"
#include "OptionsMgr.h"
#include "RegOptionsMgr.h"
+#include "OptionsCustomColors.h"
#include "OptionsDiffOptions.h"
#include "OptionsDiffColors.h"
#include "OptionsDirColors.h"
*/
void Init(COptionsMgr *pOptions)
{
- // Copy some values from HKLM to HKCU
- CopyHKLMValues();
-
static_cast<CRegOptionsMgr *>(pOptions)->SetRegRootKey(_T("Thingamahoochie\\WinMerge\\"));
LANGID LangId = GetUserDefaultLangID();
pOptions->InitOption(OPT_MRU_MAX, 9);
+ pOptions->InitOption(OPT_COLOR_SCHEME, _T("Default"));
+
+ Options::CustomColors::SetDefaults(pOptions);
Options::DiffOptions::SetDefaults(pOptions);
Options::DiffColors::SetDefaults(pOptions);
Options::DirColors::SetDefaults(pOptions);
Options::Font::SetDefaults(pOptions);
}
-}
-
/**
* @brief Copy some HKLM values to HKCU.
* The installer sets HKLM values for "all users". This function copies
* few of those values for "user" values. E.g. enabling ShellExtension
* initially for user is done by this function.
*/
-static void CopyHKLMValues()
+void CopyHKLMValues()
{
HKEY LMKey;
HKEY CUKey;
}
}
+}
+
/**
* @brief Open HKLM registry key.
* @param [out] key Pointer to open HKLM key.
namespace Options {\r
\r
void Init(COptionsMgr *pOptions);\r
+void CopyHKLMValues();\r
\r
}\r
namespace Options { namespace SyntaxColors {
-/**
- * @brief Load color values from storage
- * @param [out] pSyntaxColors pointer to SyntaxColors
- */
-void Load(COptionsMgr *pOptionsMgr, ::SyntaxColors *pSyntaxColors)
+void Init(COptionsMgr *pOptionsMgr, ::SyntaxColors *pSyntaxColors)
{
String valuename(DefColorsPath);
}
/**
+ * @brief Load color values from storage
+ * @param [out] pSyntaxColors pointer to SyntaxColors
+ */
+void Load(COptionsMgr *pOptionsMgr, ::SyntaxColors *pSyntaxColors)
+{
+ String valuename(DefColorsPath);
+
+ for (unsigned i = COLORINDEX_NONE; i < COLORINDEX_LAST; i++)
+ {
+ valuename = strutils::format(_T("%s/Color%02u"), DefColorsPath, i);
+ int color = pOptionsMgr->GetInt(valuename);
+ COLORREF ref = color;
+ pSyntaxColors->SetColor(i, ref);
+
+ valuename = strutils::format(_T("%s/Bold%02u"), DefColorsPath, i);
+ pSyntaxColors->SetBold(i, pOptionsMgr->GetBool(valuename));
+ }
+}
+
+/**
* @brief Save color values to storage
* @param [in] pSyntaxColors pointer to SyntaxColors
*/
namespace Options { namespace SyntaxColors {
+void Init(COptionsMgr *pOptionsMgr, ::SyntaxColors *pSyntaxColors);
void Load(COptionsMgr *pOptionsMgr, ::SyntaxColors *pSyntaxColors);
void Save(COptionsMgr *pOptionsMgr, const ::SyntaxColors *pSyntaxColors);
--- /dev/null
+/**
+ * @file PropColorSchemes.cpp
+ *
+ * @brief Implementation of PropColorSchemes propertysheet
+ */
+
+#include "stdafx.h"
+#include "PropColorSchemes.h"
+#include "OptionsDef.h"
+#include "OptionsInit.h"
+#include "OptionsMgr.h"
+#include "RegOptionsMgr.h"
+#include "OptionsPanel.h"
+#include "DirItem.h"
+#include "DirTravel.h"
+#include "paths.h"
+#include "Environment.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+/**
+ * @brief Default constructor.
+ */
+PropColorSchemes::PropColorSchemes(COptionsMgr *optionsMgr)
+ : OptionsPanel(optionsMgr, PropColorSchemes::IDD)
+{
+}
+
+void PropColorSchemes::DoDataExchange(CDataExchange* pDX)
+{
+ CDialog::DoDataExchange(pDX);
+ //{{AFX_DATA_MAP(PropColorSchemes)
+ //}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(PropColorSchemes, CDialog)
+ //{{AFX_MSG_MAP(PropColorSchemes)
+ ON_CBN_SELCHANGE(IDC_COLOR_SCHEMES, OnCbnSelchangeColorSchemes)
+ //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/**
+ * @brief Reads options values from storage to UI.
+ */
+void PropColorSchemes::ReadOptions()
+{
+ m_sColorScheme = GetOptionsMgr()->GetString(OPT_COLOR_SCHEME);
+}
+
+/**
+ * @brief Writes options values from UI to storage.
+ */
+void PropColorSchemes::WriteOptions()
+{
+ GetOptionsMgr()->SaveOption(OPT_COLOR_SCHEME, m_sColorScheme);
+}
+
+static String GetColorSchemesFolder()
+{
+ return paths::ConcatPath(env::GetProgPath(), _T("ColorSchemes"));
+}
+
+static std::vector<String> GetColorSchemeNames()
+{
+ DirItemArray dirs, files;
+ std::vector<String> names;
+
+ LoadAndSortFiles(GetColorSchemesFolder(), &dirs, &files, false);
+
+ for (DirItem& item : files)
+ {
+ String filename;
+ String ext;
+ paths::SplitFilename(item.filename, nullptr, &filename, &ext);
+ if (strutils::compare_nocase(ext, _T("ini")) == 0)
+ names.push_back(filename);
+ }
+
+ return names;
+}
+
+/**
+ * @brief Called before propertysheet is drawn.
+ */
+BOOL PropColorSchemes::OnInitDialog()
+{
+ CComboBox * combo = (CComboBox*) GetDlgItem(IDC_COLOR_SCHEMES);
+
+ for (auto& name : GetColorSchemeNames())
+ {
+ combo->AddString(name.c_str());
+ if (strutils::compare_nocase(name, m_sColorScheme) == 0)
+ combo->SetCurSel(combo->GetCount() - 1);
+ }
+ if (combo->GetCurSel() == -1 && combo->GetCount() > 0)
+ combo->SetCurSel(0);
+
+ OptionsPanel::OnInitDialog();
+ return TRUE; // return TRUE unless you set the focus to a control
+}
+
+void PropColorSchemes::OnCbnSelchangeColorSchemes()
+{
+ String sColorScheme;
+ GetDlgItemText(IDC_COLOR_SCHEMES, sColorScheme);
+ m_sColorScheme = sColorScheme;
+ WriteOptions();
+ String path = paths::ConcatPath(GetColorSchemesFolder(), sColorScheme + _T(".ini"));
+ if (GetOptionsMgr()->ImportOptions(path) != COption::OPT_OK)
+ {
+ LangMessageBox(IDS_OPT_IMPORT_ERR, MB_ICONWARNING);
+ return;
+ }
+ GetParent()->GetParent()->PostMessage(WM_APP + IDC_COLOR_SCHEMES);
+}
+
--- /dev/null
+/**
+ * @file PropColorSchemes.h
+ *
+ * @brief Declaration file for PropColorSchemes propertyheet
+ *
+ */
+#pragma once
+
+#include "OptionsPanel.h"
+#include <array>
+
+class COptionsMgr;
+class CPreferencesDlg;
+
+/** @brief Property page for colors options; used in options property sheet */
+class PropColorSchemes : public OptionsPanel
+{
+// Construction
+public:
+ explicit PropColorSchemes(COptionsMgr *optionsMgr);
+
+// Implement IOptionsPanel
+ virtual void ReadOptions() override;
+ virtual void WriteOptions() override;
+
+// Dialog Data
+private:
+ //{{AFX_DATA(PropColorSchemes)
+ enum { IDD = IDD_PROPPAGE_COLOR_SCHEMES };
+ String m_sColorScheme;
+ //}}AFX_DATA
+
+ // Overrides
+ // ClassWizard generated virtual function overrides
+ //{{AFX_VIRTUAL(PropColorSchemes)
+ protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+ //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+ // Generated message map functions
+ //{{AFX_MSG(PropColorSchemes)
+ afx_msg BOOL OnInitDialog() override;
+ afx_msg void OnCbnSelchangeColorSchemes();
+ //}}AFX_MSG
+ DECLARE_MESSAGE_MAP()
+};
DDX_Control(pDX, IDC_DIR_ITEM_NOTEXISTALL_TEXT_COLOR, m_cDirItemNotExistAllText);
DDX_Control(pDX, IDC_DIR_ITEM_FILTERED_COLOR, m_cDirItemFiltered);
DDX_Control(pDX, IDC_DIR_ITEM_FILTERED_TEXT_COLOR, m_cDirItemFilteredText);
+ DDX_Control(pDX, IDC_DIR_MARGIN_COLOR, m_cDirMargin);
//}}AFX_DATA_MAP
}
ON_BN_CLICKED(IDC_DIR_ITEM_NOTEXISTALL_TEXT_COLOR, OnDirItemNotExistAllTextColor)
ON_BN_CLICKED(IDC_DIR_ITEM_FILTERED_COLOR, OnDirItemFilteredColor)
ON_BN_CLICKED(IDC_DIR_ITEM_FILTERED_TEXT_COLOR, OnDirItemFilteredTextColor)
- ON_BN_CLICKED(IDC_COLORDEFAULTS_BTN, OnDefaults)
+ ON_BN_CLICKED(IDC_DIR_MARGIN_COLOR, OnDirMargniColor)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
BrowseColor(m_cDirItemFilteredText);
}
+/**
+ * @brief User wants to change background color
+ */
+void PropDirColors::OnDirMargniColor()
+{
+ BrowseColor(m_cDirMargin);
+}
+
void PropDirColors::SerializeColors(OPERATION op)
{
SerializeColor(op, m_cDirItemEqual, OPT_DIRCLR_ITEM_EQUAL);
SerializeColor(op, m_cDirItemFiltered, OPT_DIRCLR_ITEM_FILTERED);
SerializeColor(op, m_cDirItemFilteredText, OPT_DIRCLR_ITEM_FILTERED_TEXT);
+
+ SerializeColor(op, m_cDirMargin, OPT_DIRCLR_MARGIN);
}
void PropDirColors::SerializeColor(OPERATION op, CColorButton & btn, const String& optionName)
{
switch (op)
{
- case SET_DEFAULTS:
- btn.SetColor(GetOptionsMgr()->GetDefault<unsigned>(optionName));
- return;
-
case WRITE_OPTIONS:
GetOptionsMgr()->SaveOption(optionName, (unsigned)btn.GetColor());
return;
return;
}
}
-
-/**
- * @brief Resets colors to defaults
- */
-void PropDirColors::OnDefaults()
-{
- SerializeColors(SET_DEFAULTS);
-}
-
CColorButton m_cDirItemNotExistAllText;
CColorButton m_cDirItemFiltered;
CColorButton m_cDirItemFilteredText;
+ CColorButton m_cDirMargin;
bool m_bUseColors;
//}}AFX_DATA
protected:
static const COLORREF COLOR_NONE = 0xffffffff;
- typedef enum { SET_DEFAULTS, WRITE_OPTIONS, READ_OPTIONS } OPERATION;
+ typedef enum { WRITE_OPTIONS, READ_OPTIONS } OPERATION;
void BrowseColor(CColorButton & colorButton);
void SerializeColors(OPERATION op);
afx_msg void OnDirItemNotExistAllTextColor();
afx_msg void OnDirItemFilteredColor();
afx_msg void OnDirItemFilteredTextColor();
- afx_msg void OnDefaults();
+ afx_msg void OnDirMargniColor();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
ON_BN_CLICKED(IDC_SEL_DIFFERENCE_TEXT_COLOR, OnSelDifferenceTextColor)
ON_BN_CLICKED(IDC_TRIVIAL_DIFF_COLOR, OnTrivialDiffColor)
ON_BN_CLICKED(IDC_TRIVIAL_DIFF_DELETED_COLOR, OnTrivialDiffDeletedColor)
- ON_BN_CLICKED(IDC_COLORDEFAULTS_BTN, OnDefaults)
- ON_BN_CLICKED(IDC_COLORSCHEME_GITHUBBITBUCKET, OnColorSchemeButton<COLORSCHEME_GITHUBBITBUCKET>)
ON_BN_CLICKED(IDC_TRIVIAL_DIFF_USE_TEXT_COLOR, (OnUseTextColor<IDC_TRIVIAL_DIFF_USE_TEXT_COLOR, IDC_TRIVIAL_DIFF_TEXT_COLOR>))
ON_BN_CLICKED(IDC_TRIVIAL_DIFF_TEXT_COLOR, OnTrivialDiffTextColor)
ON_BN_CLICKED(IDC_MOVEDBLOCK_COLOR, OnMovedColor)
}
}
-void PropMergeColors::SetColorScheme(int scheme)
-{
- struct ColorScheme {
- CColorButton *button;
- COLORREF color;
- };
-
- ColorScheme github_bitbucket[] = {
- {&m_cDiff, RGB(221,255,221)},
- {&m_cDiffDeleted, RGB(224,224,255)},
- {&m_cDiffText, COLOR_NONE},
- {&m_cSelDiff, RGB(255,221,221)},
- {&m_cSelDiffDeleted, RGB(240, 192, 192)},
- {&m_cSelDiffText, COLOR_NONE},
- {&m_cTrivial, RGB(251,242,191)},
- {&m_cTrivialDeleted, RGB(233,233,233)},
- {&m_cTrivialText, COLOR_NONE},
- {&m_cMoved, RGB(240,216,192)},
- {&m_cMovedDeleted, RGB(192, 192, 192)},
- {&m_cMovedText, COLOR_NONE},
- {&m_cSelMoved, RGB(248,112,78)},
- {&m_cSelMovedDeleted, RGB(252, 181, 163)},
- {&m_cSelMovedText, COLOR_NONE},
- {&m_cSNP, RGB(251,250,223)},
- {&m_cSNPDeleted, RGB(233, 233, 233)},
- {&m_cSNPText, COLOR_NONE},
- {&m_cSelSNP, RGB(239,183,180)},
- {&m_cSelSNPDeleted, RGB(240, 224, 224)},
- {&m_cSelSNPText, COLOR_NONE},
- {&m_cWordDiff, RGB(170,255,170)},
- {&m_cWordDiffDeleted, RGB(160,230,160)},
- {&m_cWordDiffText, COLOR_NONE},
- {&m_cSelWordDiff, RGB(255,170,170)},
- {&m_cSelWordDiffDeleted, RGB(230,150,140)},
- {&m_cSelWordDiffText, COLOR_NONE},
- };
-
- if (scheme == COLORSCHEME_GITHUBBITBUCKET)
- {
- for (int i = 0; i < sizeof(github_bitbucket)/sizeof(github_bitbucket[0]); ++i)
- github_bitbucket[i].button->SetColor(github_bitbucket[i].color);
- }
-
- UpdateTextColorButtonsState();
-}
-
-template<int scheme>
-void PropMergeColors::OnColorSchemeButton()
-{
- SetColorScheme(scheme);
-}
-
-/**
- * @brief Resets colors to defaults
- */
-void PropMergeColors::OnDefaults()
-{
- SerializeColors(SET_DEFAULTS);
- UpdateTextColorButtonsState();
-}
static const COLORREF COLOR_NONE = 0xffffffff;
typedef enum { SET_DEFAULTS, WRITE_OPTIONS, READ_OPTIONS } OPERATION;
- typedef enum { COLORSCHEME_GITHUBBITBUCKET} COLORSCHEME;
void BrowseColor(CColorButton & colorButton);
void SerializeColors(OPERATION op);
void SerializeColor(OPERATION op, CColorButton & btn, const String& optionName);
void UpdateTextColorButtonState(int checkboxId, CColorButton &btn);
void UpdateTextColorButtonsState();
- void SetColorScheme(int scheme);
std::array<COLORREF, CustomColorsAmount> m_cCustColors;
afx_msg void OnSelWordDiffTextColor();
template<int checkbox_id, int colorbutton_id>
afx_msg void OnUseTextColor();
- template<int scheme>
- afx_msg void OnColorSchemeButton();
- afx_msg void OnDefaults();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
ON_BN_CLICKED(IDC_SCOLOR_PREPROCESSOR, OnBnClickedEcolor<COLORINDEX_PREPROCESSOR>)
ON_BN_CLICKED(IDC_SCOLOR_USER1, OnBnClickedEcolor<COLORINDEX_USER1>)
ON_BN_CLICKED(IDC_SCOLOR_USER2, OnBnClickedEcolor<COLORINDEX_USER2>)
- ON_BN_CLICKED(IDC_SCOLORS_BDEFAULTS, OnBnClickedEcolorsBdefaults)
ON_BN_CLICKED(IDC_SCOLOR_KEYWORDS_BOLD, (OnBnClickedBoldButton<IDC_SCOLOR_KEYWORDS_BOLD, COLORINDEX_KEYWORD>))
ON_BN_CLICKED(IDC_SCOLOR_FUNCTIONS_BOLD, (OnBnClickedBoldButton<IDC_SCOLOR_FUNCTIONS_BOLD, COLORINDEX_FUNCNAME>))
ON_BN_CLICKED(IDC_SCOLOR_COMMENTS_BOLD, (OnBnClickedBoldButton<IDC_SCOLOR_COMMENTS_BOLD, COLORINDEX_COMMENT>))
BrowseColorAndSave(colorIndex);
}
-void PropSyntaxColors::OnBnClickedEcolorsBdefaults()
-{
- m_pTempColors->SetDefaults();
- for (auto&& colorIndex : ColorIndices)
- {
- m_colorButtons[colorIndex].SetColor(m_pTempColors->GetColor(colorIndex));
- m_nBolds[colorIndex] = GetCheckVal(colorIndex);
- }
-
- UpdateData(FALSE);
-}
-
template <unsigned ctlId, unsigned colorIndex>
void PropSyntaxColors::OnBnClickedBoldButton()
{
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
template<unsigned colorIndex>
afx_msg void OnBnClickedEcolor();
- afx_msg void OnBnClickedEcolorsBdefaults();
template<unsigned ctlId, unsigned colorIndex>
afx_msg void OnBnClickedBoldButton();
#define IDD_EDIT_MARKER 245\r
#define IDD_PROPPAGE_COLORS_DIR 246\r
#define IDD_SELECT_FILES_OR_FOLDERS 247\r
+#define IDD_PROPPAGE_COLOR_SCHEMES 248\r
#define IDD_DIALOG_WINDOWSMANAGER 251\r
#define IDI_ROTATE2 302\r
#define IDR_LOGO 307\r
#define IDC_SCOLOR_NUMBERS 1184\r
#define IDC_SCOLOR_OPERATORS 1185\r
#define IDC_SCOLOR_STRINGS 1186\r
-#define IDC_SCOLORS_BDEFAULTS 1187\r
#define IDC_SCOLOR_PREPROCESSOR 1188\r
#define IDC_SCOLOR_USER1 1189\r
#define IDC_SCOLOR_USER2 1190\r
#define IDC_FIRST 1388\r
#define IDC_SECOND 1389\r
#define IDC_THIRD 1390\r
+#define IDC_COLOR_SCHEMES 1391\r
+#define IDC_DIR_MARGIN_COLOR 1392\r
#define IDC_EDIT_WHOLE_WORD 8603\r
#define IDC_EDIT_MATCH_CASE 8604\r
#define IDC_EDIT_FINDTEXT 8605\r
#define IDS_OPTIONSPG_IMAGECOMPARE 9057\r
#define IDS_OPTIONSPG_BINARYCOMPARE 9058\r
#define IDS_OPTIONSPG_DIRCOLORS 9059\r
+#define IDS_OPTIONSPG_COLOR_SCHEMES 9060\r
#define IDS_TO 16000\r
#define IDS_FROM_LEFT 16001\r
#define IDS_TO_LEFT 16002\r
#ifndef APSTUDIO_READONLY_SYMBOLS\r
#define _APS_3D_CONTROLS 1\r
#define _APS_NEXT_RESOURCE_VALUE 253\r
-#define _APS_NEXT_COMMAND_VALUE 33719\r
+#define _APS_NEXT_COMMAND_VALUE 33725\r
#define _APS_NEXT_CONTROL_VALUE 8831\r
#define _APS_NEXT_SYMED_VALUE 116\r
#endif\r
msgid "Colors"
msgstr "ألوان"
+msgid "Color Scheme:"
+msgstr ""
+
msgid "Background"
msgstr "الخلفية"
msgid "Selected Word Diff:"
msgstr "المقارنة على مستوى الكلمة المحددة:"
-msgid "Defaults"
-msgstr "الإعدادات الافتراضية"
-
msgid "&Use folder compare colors"
msgstr "استخدم الألوان في مقارنة المجلدات"
msgid "Items filtered:"
msgstr "العناصر التي تمت حصرها بالمرشح:"
+msgid "Margin:"
+msgstr "الهامش:"
+
msgid "System"
msgstr "النظام"
msgid "Open to e&xternal editor"
msgstr "فتح في المحرر الخارجي"
+msgid "Defaults"
+msgstr "الإعدادات الافتراضية"
+
msgid "Display Columns"
msgstr "عرض الأعمدة"
msgid "Selection:"
msgstr "التحديد:"
-msgid "Margin:"
-msgstr "الهامش:"
-
msgid "Backup Files"
msgstr "ملفات النسخ الاحتياطي"
"لإعادة تفعيل عرض الرسالة مجددا، قم بالضغط على زر إعادة التعيين من صفحة \"عام"
"\" في قائمة الخيارات."
+msgid "Color Schemes"
+msgstr ""
+
msgid "Syntax"
msgstr "اللغة"
msgid "Colors"
msgstr "Margoak"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Barrena"
msgid "Selected Word Diff:"
msgstr "Hautatutako Hitz Ezberd:"
-#, c-format
-msgid "Defaults"
-msgstr "Berezkoak"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Sistema"
msgstr "Ireki kan&poko editatzailean"
#, c-format
+msgid "Defaults"
+msgstr "Berezkoak"
+
+#, c-format
msgid "Display Columns"
msgstr "Erakutsi Zutabeak"
msgstr "Hautapena:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Babeskopia Agiriak"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Joskera"
msgid "Colors"
msgstr "Cores"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "2º Plano"
msgid "Selected Word Diff:"
msgstr "Diferença das Palavras Selecionadas:"
-#, c-format
-msgid "Defaults"
-msgstr "Padrões"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr "Margem:"
+
+#, c-format
msgid "System"
msgstr "Sistema"
msgstr "Abrir no e&ditor externo"
#, c-format
+msgid "Defaults"
+msgstr "Padrões"
+
+#, c-format
msgid "Display Columns"
msgstr "Exibir Colunas"
msgstr "Seleção:"
#, c-format
-msgid "Margin:"
-msgstr "Margem:"
-
-#, c-format
msgid "Backup Files"
msgstr "Arquivos de Backup"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "Pra tornar esta caixa de mensagem visível de novo pressione o botão Resetar na página Geral do diálogo das Opções."
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Sintaxe"
msgid "Colors"
msgstr "Цветове"
+msgid "Color Scheme:"
+msgstr ""
+
msgid "Background"
msgstr "Фон"
msgid "Selected Word Diff:"
msgstr "В избраните думи:"
-msgid "Defaults"
-msgstr "По подразбиране"
-
msgid "&Use folder compare colors"
msgstr ""
msgid "Items filtered:"
msgstr "Филтрирани елементи:"
+msgid "Margin:"
+msgstr ""
+
msgid "System"
msgstr "Системни"
msgid "Open to e&xternal editor"
msgstr "Отваряне с външе&н редактор"
+msgid "Defaults"
+msgstr "По подразбиране"
+
msgid "Display Columns"
msgstr "Видими колони"
msgid "Selection:"
msgstr "Избран:"
-msgid "Margin:"
-msgstr ""
-
msgid "Backup Files"
msgstr "Резервни файлове"
"За да видите отново това съобщение, натиснете бутона Отменяне на страницата "
"„Общи“ в Настройки."
+msgid "Color Schemes"
+msgstr ""
+
msgid "Syntax"
msgstr "Синтаксис"
msgid "Colors"
msgstr ""
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Fons"
msgid "Selected Word Diff:"
msgstr "Paraula diferent seleccionada:"
-#, c-format
-msgid "Defaults"
-msgstr "Predeterminats"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Sistema"
msgstr "Obre-ho en un &editor extern"
#, c-format
+msgid "Defaults"
+msgstr "Predeterminats"
+
+#, c-format
msgid "Display Columns"
msgstr "Visualització de columnes"
msgstr "Selecció:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Fitxers de còpia de seguretat"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr "颜色"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "背景"
msgid "Selected Word Diff:"
msgstr "选中的单词差异:"
-#, c-format
-msgid "Defaults"
-msgstr "默认"
-
msgid "&Use folder compare colors"
msgstr "使用文件夹比较颜色(&U)"
msgstr "过滤的项目:"
#, c-format
+msgid "Margin:"
+msgstr "边缘:"
+
+#, c-format
msgid "System"
msgstr "系统"
msgstr "用外部编辑器打开(&X)"
#, c-format
+msgid "Defaults"
+msgstr "默认"
+
+#, c-format
msgid "Display Columns"
msgstr "选择显示列"
msgstr "选中区域:"
#, c-format
-msgid "Margin:"
-msgstr "边缘:"
-
-#, c-format
msgid "Backup Files"
msgstr "备份文件"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "如需重新显示这些提示消息, 请在\"选项\"对话框中\"常规\"选项卡中点击\"重置\"按钮."
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "语法"
msgid "Colors"
msgstr "色彩"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "背景"
msgid "Selected Word Diff:"
msgstr "已選取的字的差異："
-#, c-format
-msgid "Defaults"
-msgstr "預設值"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr "邊距："
+
+#, c-format
msgid "System"
msgstr "系統"
msgstr "開啟外部編輯器(&X)"
#, c-format
+msgid "Defaults"
+msgstr "預設值"
+
+#, c-format
msgid "Display Columns"
msgstr "顯示欄位"
msgstr "選取："
#, c-format
-msgid "Margin:"
-msgstr "邊距："
-
-#, c-format
msgid "Backup Files"
msgstr "備份檔案"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "如果要再顯示這個訊息，請在選項對話視窗內的一般頁面點擊重設按鈕"
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "語法"
msgid "Colors"
msgstr "Boje"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Pozadina"
msgid "Selected Word Diff:"
msgstr "Razlike označene riječi:"
-#, c-format
-msgid "Defaults"
-msgstr "Predpodešeno"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Sistem"
msgstr "Otvori u vanjskom pregledniku."
#, c-format
+msgid "Defaults"
+msgstr "Predpodešeno"
+
+#, c-format
msgid "Display Columns"
msgstr "Prikaži kolone"
msgstr "Odabir:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Sigurnost"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr "Barvy"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Pozadí"
msgid "Selected Word Diff:"
msgstr "Vybrané rozdílné slovo:"
-#, c-format
-msgid "Defaults"
-msgstr "&Původní"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Systém"
msgstr "Otevřít v &externím editoru"
#, c-format
+msgid "Defaults"
+msgstr "&Původní"
+
+#, c-format
msgid "Display Columns"
msgstr "Zobrazit sloupce"
msgstr "Výběr:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Zálohování souborů"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Syntaxe"
msgid "Colors"
msgstr "Farver"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Baggrund"
msgid "Selected Word Diff:"
msgstr "Valgte ordforskelle:"
-#, c-format
-msgid "Defaults"
-msgstr "Standard"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "System"
msgstr "Åben i ekstern e&ditor"
#, c-format
+msgid "Defaults"
+msgstr "Standard"
+
+#, c-format
msgid "Display Columns"
msgstr "Vis søjler"
msgstr "Udvalgt:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Backup filer"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Syntaks"
msgid "Colors"
msgstr "Kleuren"
+msgid "Color Scheme:"
+msgstr ""
+
msgid "Background"
msgstr "Achtergrond"
msgid "Selected Word Diff:"
msgstr "Geselecteerd woordverschil:"
-msgid "Defaults"
-msgstr "Standaardwaarden"
-
msgid "&Use folder compare colors"
msgstr ""
msgid "Items filtered:"
msgstr ""
+msgid "Margin:"
+msgstr "Marge:"
+
msgid "System"
msgstr "Systeem"
msgid "Open to e&xternal editor"
msgstr "Openen met externe editor"
+msgid "Defaults"
+msgstr "Standaardwaarden"
+
msgid "Display Columns"
msgstr "Kolommen weergeven"
msgid "Selection:"
msgstr "Selectie:"
-msgid "Margin:"
-msgstr "Marge:"
-
msgid "Backup Files"
msgstr "Backupbestanden"
"Om dit berichtvenster opnieuw zichtbaar te maken, druk op de herstellen-knop"
" op de pagina \"algemeen\" van het venster \"opties\"."
+msgid "Color Schemes"
+msgstr ""
+
msgid "Syntax"
msgstr "Syntax"
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2020-01-19 21:36+0000\n"
+"POT-Creation-Date: 2020-03-28 08:32+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
msgid "Colors"
msgstr ""
+msgid "Color Scheme:"
+msgstr ""
+
msgid "Background"
msgstr ""
msgid "Selected Word Diff:"
msgstr ""
-msgid "Defaults"
-msgstr ""
-
msgid "&Use folder compare colors"
msgstr ""
msgid "Items filtered:"
msgstr ""
+msgid "Margin:"
+msgstr ""
+
msgid "System"
msgstr ""
msgid "Open to e&xternal editor"
msgstr ""
+msgid "Defaults"
+msgstr ""
+
msgid "Display Columns"
msgstr ""
msgid "Selection:"
msgstr ""
-msgid "Margin:"
-msgstr ""
-
msgid "Backup Files"
msgstr ""
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr "Värit"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Tausta"
msgid "Selected Word Diff:"
msgstr "Valittu sanaero:"
-#, c-format
-msgid "Defaults"
-msgstr "Oletukset"
-
msgid "&Use folder compare colors"
msgstr "Käytä kansiovertailun värejä"
msgstr "Suodatetut kohteet:"
#, c-format
+msgid "Margin:"
+msgstr "Marginaali:"
+
+#, c-format
msgid "System"
msgstr "Järjestelmä"
msgstr "Avaa ulkoiseen editoriin"
#, c-format
+msgid "Defaults"
+msgstr "Oletukset"
+
+#, c-format
msgid "Display Columns"
msgstr "Näytä sarakkeet"
msgstr "Valinta:"
#, c-format
-msgid "Margin:"
-msgstr "Marginaali:"
-
-#, c-format
msgid "Backup Files"
msgstr "Varmuuskopiot"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "Jos haluat, että tämä sanomaruutu on jälleen näkyvissä, paina Asetukset-ikkunan Yleiset-sivun Palauta-painiketta."
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Syntaksi"
msgid "Colors"
msgstr "Couleurs"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Fond"
msgid "Selected Word Diff:"
msgstr "Mot différent sélectionné :"
-#, c-format
-msgid "Defaults"
-msgstr "Défauts"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr "Marge :"
+
+#, c-format
msgid "System"
msgstr "Système"
msgstr "Ouvrir avec l'éditeur e&xterne"
#, c-format
+msgid "Defaults"
+msgstr "Défauts"
+
+#, c-format
msgid "Display Columns"
msgstr "Affichage des colonnes"
msgstr "Sélection :"
#, c-format
-msgid "Margin:"
-msgstr "Marge :"
-
-#, c-format
msgid "Backup Files"
msgstr "Fichiers d'archive"
"Pour que cette boîte de message soit à nouveau visible, appuyez sur le "
"bouton Réinitialiser de la page Général de la boîte de dialogue Options."
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Syntaxe"
msgid "Colors"
msgstr "Cores"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Fondo"
msgid "Selected Word Diff:"
msgstr "Diferenza de palabra seleccionada:"
-#, c-format
-msgid "Defaults"
-msgstr "Predeterminados"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Sistema"
msgstr "Abrir nun e&ditor externo"
#, c-format
+msgid "Defaults"
+msgstr "Predeterminados"
+
+#, c-format
msgid "Display Columns"
msgstr "Amosar columnas"
msgstr "Selección:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Copias de seguridade(backups)"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr "Farben"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Hintergrund"
msgid "Selected Word Diff:"
msgstr "Wortunterschied (markiert):"
-#, c-format
-msgid "Defaults"
-msgstr "Vorgaben"
-
msgid "&Use folder compare colors"
msgstr "&Ordnervergleichsfarben verwenden"
msgstr "Objekte gefiltert:"
#, c-format
+msgid "Margin:"
+msgstr "Rand:"
+
+#, c-format
msgid "System"
msgstr "System"
msgstr "Im e&xternen Editor öffnen"
#, c-format
+msgid "Defaults"
+msgstr "Vorgaben"
+
+#, c-format
msgid "Display Columns"
msgstr "Spalten anpassen"
msgstr "Auswahl:"
#, c-format
-msgid "Margin:"
-msgstr "Rand:"
-
-#, c-format
msgid "Backup Files"
msgstr "Sicherungsdateien"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "Um diese Meldung wieder sichtbar zu machen, drücken Sie 'Zurücksetzen' in Einstellungen/Allgemein."
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Syntax"
msgid "Colors"
msgstr "Χρώματα"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Φόντο"
msgid "Selected Word Diff:"
msgstr "Επιλεγμένη Διαφορά Λέξεως:"
-#, c-format
-msgid "Defaults"
-msgstr "&Αρχικές Ρυθμίσεις"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Σύστημα"
msgstr "Άν&οιγμα με άλλη εφαρμογή επεξεργασίας"
#, c-format
+msgid "Defaults"
+msgstr "&Αρχικές Ρυθμίσεις"
+
+#, c-format
msgid "Display Columns"
msgstr "Εμφάνιση Στηλών"
msgstr "Επιλογή:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Εφεδρικά Αρχεία"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr "Színek"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Háttér"
msgid "Selected Word Diff:"
msgstr "Kijelölt szó eltérés:"
-#, c-format
-msgid "Defaults"
-msgstr "Alapértékek"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Rendszer"
msgstr "Megnyitás a &Belső Szerkesztővel"
#, c-format
+msgid "Defaults"
+msgstr "Alapértékek"
+
+#, c-format
msgid "Display Columns"
msgstr "Oszlopok mutatása"
msgstr "Kijelölés:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Visszaállítási fájlok"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr "Colori"
+msgid "Color Scheme:"
+msgstr ""
+
msgid "Background"
msgstr "Sfondo"
msgid "Selected Word Diff:"
msgstr "Diff. parole selezionata:"
-msgid "Defaults"
-msgstr "Predefinito"
-
msgid "&Use folder compare colors"
msgstr "&Usa colori per confronto cartelle"
msgid "Items filtered:"
msgstr "Elementi filtrati:"
+msgid "Margin:"
+msgstr "Margine:"
+
msgid "System"
msgstr "Sistema"
msgid "Open to e&xternal editor"
msgstr "Apri in e&ditor esterno"
+msgid "Defaults"
+msgstr "Predefinito"
+
msgid "Display Columns"
msgstr "Scelta delle colonne"
msgid "Selection:"
msgstr "Selezione:"
-msgid "Margin:"
-msgstr "Margine:"
-
msgid "Backup Files"
msgstr "File di backup"
"Per visualizzare nuovamente questa finestra di dialogo seleziona il pulsante "
"'Ripristina' nella scheda Generale della finestra delle opzioni."
+msgid "Color Schemes"
+msgstr ""
+
msgid "Syntax"
msgstr "Sintassi"
msgid "Colors"
msgstr "色"
+msgid "Color Scheme:"
+msgstr "配色:"
+
msgid "Background"
msgstr "背景"
msgid "Selected Word Diff:"
msgstr "選択された単語の差異:"
-msgid "Defaults"
-msgstr "デフォルト"
-
msgid "&Use folder compare colors"
msgstr "フォルダー比較用の色を使用"
msgid "Items filtered:"
msgstr "無視された項目:"
+msgid "Margin:"
+msgstr "マージン:"
+
msgid "System"
msgstr "システム"
msgid "Open to e&xternal editor"
msgstr "外部エディタで開く(&X)"
+msgid "Defaults"
+msgstr "デフォルト"
+
msgid "Display Columns"
msgstr "列の表示"
msgid "Selection:"
msgstr "選択:"
-msgid "Margin:"
-msgstr "マージン:"
-
msgid "Backup Files"
msgstr "バックアップ ファイル"
"このメッセージボックスを再度表示させたい場合は、[オプション] ダイアログの一般"
"ページで [リセット] ボタンを押してください。"
+msgid "Color Schemes"
+msgstr "配色"
+
msgid "Syntax"
msgstr "シンタックス"
msgid "Colors"
msgstr "색상"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "배경색"
msgid "Selected Word Diff:"
msgstr "선택된 단어 차이점:"
-#, c-format
-msgid "Defaults"
-msgstr "기본값"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr "여백:"
+
+#, c-format
msgid "System"
msgstr "시스템"
msgstr "외부 편집기로 열기(&X)"
#, c-format
+msgid "Defaults"
+msgstr "기본값"
+
+#, c-format
msgid "Display Columns"
msgstr "열 표시하기"
msgstr "선택:"
#, c-format
-msgid "Margin:"
-msgstr "여백:"
-
-#, c-format
msgid "Backup Files"
msgstr "파일 백업"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "이 메시지 상자를 다시 표시하려면, 옵션 대화상자의 일반 페이지에서 초기화 버튼을 누르세요."
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "구문"
msgid "Colors"
msgstr "Spalvų"
+msgid "Color Scheme:"
+msgstr ""
+
msgid "Background"
msgstr "Fono"
msgid "Selected Word Diff:"
msgstr "Pažym. žodžio skirtumas:"
-msgid "Defaults"
-msgstr "Numat. reikšmės"
-
msgid "&Use folder compare colors"
msgstr "Na&udoti katalogų lyginimo spalvas"
msgid "Items filtered:"
msgstr "Elementai filtruoti:"
+msgid "Margin:"
+msgstr "Paraštė:"
+
msgid "System"
msgstr "Sistemos"
msgid "Open to e&xternal editor"
msgstr "Atverti &išoriniame redaktoriuje"
+msgid "Defaults"
+msgstr "Numat. reikšmės"
+
msgid "Display Columns"
msgstr "Rodyti stulpelius"
msgid "Selection:"
msgstr "Pažymėtas fragmentas:"
-msgid "Margin:"
-msgstr "Paraštė:"
-
msgid "Backup Files"
msgstr "Rezervinių failų kurimo"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "Kad šis pranešimas vėl būtų matomas, paspauskite Nuostatų ekrano dalyje „Bendros“ esantį mygtuką „Atkurti“."
+msgid "Color Schemes"
+msgstr ""
+
msgid "Syntax"
msgstr "Sintaksės"
msgid "Colors"
msgstr "Farger"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Bakgrunn"
msgid "Selected Word Diff:"
msgstr "Valgt ordforskjell:"
-#, c-format
-msgid "Defaults"
-msgstr "Standardverdier"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "System"
msgstr "Åpne i e&ksternt redigeringsprogram"
#, c-format
+msgid "Defaults"
+msgstr "Standardverdier"
+
+#, c-format
msgid "Display Columns"
msgstr "Visningskolonner"
msgstr "Markering:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Sikkerhetskopifiler"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr " رنگها "
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr " پس زمينه "
msgid "Selected Word Diff:"
msgstr " تفاوت واژه انتخابي : "
-#, c-format
-msgid "Defaults"
-msgstr " پيش فرضها "
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "سامانه"
msgstr "&x بازکردن با ويراستار خارجي "
#, c-format
+msgid "Defaults"
+msgstr " پيش فرضها "
+
+#, c-format
msgid "Display Columns"
msgstr " نمايش ستون ها "
msgstr " انتخاب : "
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "پرونده هاي پشتيبان "
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "نحو"
msgid "Colors"
msgstr "Kolory"
+msgid "Color Scheme:"
+msgstr ""
+
msgid "Background"
msgstr "Tło"
msgid "Selected Word Diff:"
msgstr "Wybrana różnica słowa:"
-msgid "Defaults"
-msgstr "Domyślne"
-
msgid "&Use folder compare colors"
msgstr "Użyj kolorów do porównania folderów"
msgid "Items filtered:"
msgstr "Przefiltrowane elementy:"
+msgid "Margin:"
+msgstr "Margines:"
+
msgid "System"
msgstr "System"
msgid "Open to e&xternal editor"
msgstr "Otwórz w zewnętrznym edytorze"
+msgid "Defaults"
+msgstr "Domyślne"
+
msgid "Display Columns"
msgstr "Wyświetl kolumny"
msgid "Selection:"
msgstr "Zaznaczenie:"
-msgid "Margin:"
-msgstr "Margines:"
-
msgid "Backup Files"
msgstr "Pliki kopii"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "Aby ponownie wyświetlić ten komunikat, naciśnij przycisk Resetuj na stronie Ogólne w oknie dialogowym Opcje."
+msgid "Color Schemes"
+msgstr ""
+
msgid "Syntax"
msgstr "Składnia"
msgid "Colors"
msgstr "Cores"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Fundo"
msgid "Selected Word Diff:"
msgstr "Diferença de Palavra Selecionada:"
-#, c-format
-msgid "Defaults"
-msgstr "Predefinição"
-
msgid "&Use folder compare colors"
msgstr "&Utilizar pasta de comparar cores"
msgstr "Itens filtrados:"
#, c-format
+msgid "Margin:"
+msgstr "Margem:"
+
+#, c-format
msgid "System"
msgstr "Sistema"
msgstr "Abrir em editor externo"
#, c-format
+msgid "Defaults"
+msgstr "Predefinição"
+
+#, c-format
msgid "Display Columns"
msgstr "Mostrar Colunas"
msgstr "Seleção:"
#, c-format
-msgid "Margin:"
-msgstr "Margem:"
-
-#, c-format
msgid "Backup Files"
msgstr "Cópia de ficheiros"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "Para tornar esta caixa de mensagem visível novamente, pressione o botão Redefinir na página Geral da caixa de diálogo Opções."
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Syntax"
msgid "Colors"
msgstr "Culori"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Fundal"
msgid "Selected Word Diff:"
msgstr "Diferenţă cuvânt selectată:"
-#, c-format
-msgid "Defaults"
-msgstr "Implicite"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Sistem"
msgstr "Deschide în editor e&xtern"
#, c-format
+msgid "Defaults"
+msgstr "Implicite"
+
+#, c-format
msgid "Display Columns"
msgstr "Afişează coloanele"
msgstr "Selecţie:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Copii de siguranţă"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr "Цвета"
+msgid "Color Scheme:"
+msgstr ""
+
msgid "Background"
msgstr "Фон"
msgid "Selected Word Diff:"
msgstr "Выбранное словарное отличие:"
-msgid "Defaults"
-msgstr "По умолчанию"
-
msgid "&Use folder compare colors"
msgstr "Использовать цвета сравнения папок"
msgid "Items filtered:"
msgstr "Элементы отфильтрованы:"
+msgid "Margin:"
+msgstr "Поле:"
+
msgid "System"
msgstr "Система"
msgid "Open to e&xternal editor"
msgstr "Открыть во внешнем редакторе"
+msgid "Defaults"
+msgstr "По умолчанию"
+
msgid "Display Columns"
msgstr "Отображать столбцы"
msgid "Selection:"
msgstr "Выбранный текст:"
-msgid "Margin:"
-msgstr "Поле:"
-
msgid "Backup Files"
msgstr "Резервные копии"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "Чтобы снова показывать это сообщение, нажмите кнопку Сброс на странице настроек Общие"
+msgid "Color Schemes"
+msgstr ""
+
msgid "Syntax"
msgstr "Синтаксис"
msgid "Colors"
msgstr "Боје"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Позадина"
msgid "Selected Word Diff:"
msgstr "Одабери различите речи:"
-#, c-format
-msgid "Defaults"
-msgstr "Подразумевано"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Систем"
msgstr "Отвори у другом уре&ђивачу"
#, c-format
+msgid "Defaults"
+msgstr "Подразумевано"
+
+#, c-format
msgid "Display Columns"
msgstr "Прикажи стубце"
msgstr "Изабери:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Резервне датотеке"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr "වර්ණ"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "පසුතලය"
msgid "Selected Word Diff:"
msgstr "තෝරාගත් වචන වෙනස:"
-#, fuzzy, c-format
-msgid "Defaults"
-msgstr "Defaults"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "පද්ධතිය"
msgid "Open to e&xternal editor"
msgstr "බාහිර සංස්කරණය සඳහා විවෘත කරන්න"
+#, fuzzy, c-format
+msgid "Defaults"
+msgstr "Defaults"
+
#, c-format
msgid "Display Columns"
msgstr "කොලම දර්ශනය කරන්න"
msgstr "තෝරා ගැනීම:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "රක්ෂිත ලිපි ගොනු"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr "Farby"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Pozadie"
msgid "Selected Word Diff:"
msgstr "Rozdiel vo vybranom slove:"
-#, c-format
-msgid "Defaults"
-msgstr "Predvolené"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Systém"
msgstr "Otvoriť v e&xternom editore"
#, c-format
+msgid "Defaults"
+msgstr "Predvolené"
+
+#, c-format
msgid "Display Columns"
msgstr "Zobrazovať stĺpce"
msgstr "Výber:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Záložné súbory"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
msgid "Colors"
msgstr "Barve"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Ozadje"
msgid "Selected Word Diff:"
msgstr "Izbrane razlike besed:"
-#, c-format
-msgid "Defaults"
-msgstr "Privzeto"
-
msgid "&Use folder compare colors"
msgstr "&Uporabi barve primerjav map"
msgid "Items filtered:"
msgstr "Filtriranih vnosov:"
+#, c-format
+msgid "Margin:"
+msgstr "Rob:"
+
msgid "System"
msgstr "Sistem"
msgstr "Odpri v zunanjem urejevalniku"
#, c-format
+msgid "Defaults"
+msgstr "Privzeto"
+
+#, c-format
msgid "Display Columns"
msgstr "Prikaži stolpce"
msgstr "Izbor:"
#, c-format
-msgid "Margin:"
-msgstr "Rob:"
-
-#, c-format
msgid "Backup Files"
msgstr "Datoteke varnostnih kopij"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "Za ponovni prikaz tega sporočila, pritisnite 'Ponastavi' na strani 'Splošno' pogovornega okna 'Možnosti'."
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Sintaksa"
msgid "Colors"
msgstr "Colores"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Fondo"
msgid "Selected Word Diff:"
msgstr "Dif. de palabra sel.:"
-#, c-format
-msgid "Defaults"
-msgstr "Predeterminada"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr "Elementos filtrados:"
#, c-format
+msgid "Margin:"
+msgstr "Margen:"
+
+#, c-format
msgid "System"
msgstr "Sistema"
msgstr "Abrir en editor e&xterno"
#, c-format
+msgid "Defaults"
+msgstr "Predeterminada"
+
+#, c-format
msgid "Display Columns"
msgstr "Mostrar Columnas"
msgstr "Selección:"
#, c-format
-msgid "Margin:"
-msgstr "Margen:"
-
-#, c-format
msgid "Backup Files"
msgstr "Archivos de seguridad"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Sintaxis"
msgid "Colors"
msgstr "Färger"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Bakgrund"
msgid "Selected Word Diff:"
msgstr "Vald Ordskillnad:"
-#, c-format
-msgid "Defaults"
-msgstr "Förval"
-
msgid "&Use folder compare colors"
msgstr "Använd MappJämföringsFärger"
msgstr "Objekt filtrerade:"
#, c-format
+msgid "Margin:"
+msgstr "Marginal:"
+
+#, c-format
msgid "System"
msgstr "System"
msgstr "Öppna i Extern redigerare"
#, c-format
+msgid "Defaults"
+msgstr "Förval"
+
+#, c-format
msgid "Display Columns"
msgstr "Visa Kolumner"
msgstr "Markering:"
#, c-format
-msgid "Margin:"
-msgstr "Marginal:"
-
-#, c-format
msgid "Backup Files"
msgstr "Reservkopierade Filer"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "För att återmöjliggöra denna MedelandeDialog så tryck på ''Återställ'' knappen i Allmänt i InställningsDialogen."
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Syntax"
msgid "Colors"
msgstr "Renkler"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Art Alan"
msgid "Selected Word Diff:"
msgstr "Seçilmiş Sözcük Farklılığı:"
-#, c-format
-msgid "Defaults"
-msgstr "Varsayılan Ayarlar"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr "Kenar Boşluğu:"
+
+#, c-format
msgid "System"
msgstr "Sistem"
msgstr "Dış Düzen&leyici ile Açılsın"
#, c-format
+msgid "Defaults"
+msgstr "Varsayılan Ayarlar"
+
+#, c-format
msgid "Display Columns"
msgstr "Sütunlar Görüntülensin"
msgstr "Seçim:"
#, c-format
-msgid "Margin:"
-msgstr "Kenar Boşluğu:"
-
-#, c-format
msgid "Backup Files"
msgstr "Yedekleme Dosyaları"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr "Bu ileti kutusunun yeniden görüntülenmesi için Ayarlar bölümündeki Genel Grubu altındaki Sıfırla düğmesine tıklayın."
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr "Söz Dizimi"
msgid "Colors"
msgstr "Кольори"
+msgid "Color Scheme:"
+msgstr ""
+
#, c-format
msgid "Background"
msgstr "Тло"
msgid "Selected Word Diff:"
msgstr "Відзначена словникова відмінність:"
-#, c-format
-msgid "Defaults"
-msgstr "Звичайні параметри"
-
msgid "&Use folder compare colors"
msgstr ""
msgstr ""
#, c-format
+msgid "Margin:"
+msgstr ""
+
+#, c-format
msgid "System"
msgstr "Система"
msgstr "Відкрити у зовнішньому редакторі"
#, c-format
+msgid "Defaults"
+msgstr "Звичайні параметри"
+
+#, c-format
msgid "Display Columns"
msgstr "Відображати стовпчики"
msgstr "Відзнач. текст:"
#, c-format
-msgid "Margin:"
-msgstr ""
-
-#, c-format
msgid "Backup Files"
msgstr "Резервні копії"
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
+msgid "Color Schemes"
+msgstr ""
+
#, c-format
msgid "Syntax"
msgstr ""
OSDN Git Service
