Browse Source

New + amended theme, tweaked Advanced Options text (#848)

dcog989 5 months ago
parent
commit
da904d7693
3 changed files with 67 additions and 51 deletions
  1. 33 0
      Debug/Themes/MonoDark.xml
  2. 31 48
      Debug/Themes/Monolight.xml
  3. 3 3
      src/AdvGeneral.cpp

+ 33 - 0
Debug/Themes/MonoDark.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Ditto_Theme_File Version="3" Author="dcog989" Notes="MonoDark">
+	<CaptionLeft>RGB(85,85,85)</CaptionLeft>
+	<CaptionRight>RGB(68,68,68)</CaptionRight>
+	<CaptionLeftTopMost>RGB(85,85,85)</CaptionLeftTopMost>
+	<CaptionRightTopMost>RGB(51,51,51)</CaptionRightTopMost>
+	<CaptionLeftNotConnected>RGB(237,94,94)</CaptionLeftNotConnected>
+	<CaptionRightNotConnected>RGB(237,94,94)</CaptionRightNotConnected>
+	<CaptionTextColor>RGB(170,170,170)</CaptionTextColor>
+	<ListBoxOddRowsBG>RGB(51,51,51)</ListBoxOddRowsBG>
+	<ListBoxEvenRowsBG>RGB(44,44,44)</ListBoxEvenRowsBG>
+	<ListBoxOddRowsText>RGB(238,238,238)</ListBoxOddRowsText>
+	<ListBoxEvenRowsText>RGB(238,238,238)</ListBoxEvenRowsText>
+	<ListBoxSelectedBG>RGB(62,78,102)</ListBoxSelectedBG>
+	<ListBoxSelectedNoFocusBG>RGB(84,111,135)</ListBoxSelectedNoFocusBG>
+	<ListBoxSelectedText>RGB(238,238,238)</ListBoxSelectedText>
+	<ListBoxSelectedNoFocusText>RGB(238,238,238)</ListBoxSelectedNoFocusText>
+	<ClipPastedColor>RGB(245,226,169)</ClipPastedColor>
+	<MainWindowBG>RGB(68,68,68)</MainWindowBG>
+	<SearchTextBoxFocusBG>RGB(102,102,102)</SearchTextBoxFocusBG>
+	<SearchTextBoxFocusText>RGB(238,238,238)</SearchTextBoxFocusText>
+	<SearchTextBoxFocusBorder>RGB(51,51,51)</SearchTextBoxFocusBorder>
+	<SearchTextHighlight>RGB(132,240,153)</SearchTextHighlight>
+	<Border>RGB(119,119,119)</Border>
+	<BorderTopMost>RGB(34,34,34)</BorderTopMost>
+	<BorderNotConnected>RGB(237,94,94)</BorderNotConnected>
+	<GroupTreeBG>RGB(51,51,51)</GroupTreeBG>
+	<GroupTreeText>RGB(238,238,238)</GroupTreeText>
+	<CaptionSize>26</CaptionSize>
+	<CaptionFontSize>13</CaptionFontSize>
+	<DescriptionWindowBG>RGB(34,34,34)</DescriptionWindowBG>
+	<DescriptionWindowText>RGB(221,221,221)</DescriptionWindowText>
+</Ditto_Theme_File>

+ 31 - 48
Debug/Themes/Monolight.xml

@@ -1,50 +1,33 @@
-<Ditto_Theme_File Version="3" Author="dcog989" Notes="Monolight">
-
-	<CaptionLeft>RGB(107,114,125)</CaptionLeft>
-	<CaptionRight>RGB(144,151,163)</CaptionRight>
-
-	<CaptionLeftTopMost>RGB(107,114,125)</CaptionLeftTopMost>
-	<CaptionRightTopMost>RGB(174,177,181)</CaptionRightTopMost>
-
-	<CaptionLeftNotConnected>RGB(74,40,40)</CaptionLeftNotConnected>
-	<CaptionRightNotConnected>RGB(209,180,180)</CaptionRightNotConnected>
-
-	<CaptionTextColor>RGB(191,196,203)</CaptionTextColor>
-
-	<ListBoxOddRowsBG>RGB(227,232,240)</ListBoxOddRowsBG>
-	<ListBoxEvenRowsBG>RGB(211,218,227)</ListBoxEvenRowsBG>
-
-	<ListBoxOddRowsText>RGB(50,61,73)</ListBoxOddRowsText>
-	<ListBoxEvenRowsText>RGB(50,61,73)</ListBoxEvenRowsText>
-
-	<ListBoxSelectedBG>RGB(245,239,203)</ListBoxSelectedBG>
-	<ListBoxSelectedNoFocusBG>RGB(237,236,226)</ListBoxSelectedNoFocusBG>
-
-	<ListBoxSelectedText>RGB(44,47,50)</ListBoxSelectedText>
-	<ListBoxSelectedNoFocusText>RGB(44,47,50)</ListBoxSelectedNoFocusText>
-
-	<ClipPastedColor>RGB(144,151,163)</ClipPastedColor>
-
-	<MainWindowBG>RGB(191,196,203)</MainWindowBG>
-
-	<SearchTextBoxFocusBG>RGB(215,219,226)</SearchTextBoxFocusBG>
-	<SearchTextBoxFocusText>RGB(44,47,50)</SearchTextBoxFocusText>
-
-	<SearchTextBoxFocusBorder>RGB(77,82,90)</SearchTextBoxFocusBorder>
-	<SearchTextHighlight>RGB(74,40,40)</SearchTextHighlight>
-
-	<Border>RGB(144,151,163)</Border>
-
-	<BorderTopMost>RGB(77,82,90)</BorderTopMost>
-	<BorderNotConnected>RGB(44,47,50)</BorderNotConnected>
-
-	<GroupTreeBG>RGB(241,238,225)</GroupTreeBG>
-	<GroupTreeText>RGB(70,67,55)</GroupTreeText>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<Ditto_Theme_File Version="3" Author="dcog989" Notes="MonoLight">
+	<CaptionLeft>RGB(136,136,136)</CaptionLeft>
+	<CaptionRight>RGB(170,170,170)</CaptionRight>
+	<CaptionLeftTopMost>RGB(136,136,136)</CaptionLeftTopMost>
+	<CaptionRightTopMost>RGB(85,85,85)</CaptionRightTopMost>
+	<CaptionLeftNotConnected>RGB(119,13,13)</CaptionLeftNotConnected>
+	<CaptionRightNotConnected>RGB(119,13,13)</CaptionRightNotConnected>
+	<CaptionTextColor>RGB(204,204,204)</CaptionTextColor>
+	<ListBoxOddRowsBG>RGB(238,238,238)</ListBoxOddRowsBG>
+	<ListBoxEvenRowsBG>RGB(221,221,221)</ListBoxEvenRowsBG>
+	<ListBoxOddRowsText>RGB(34,34,34)</ListBoxOddRowsText>
+	<ListBoxEvenRowsText>RGB(34,34,34)</ListBoxEvenRowsText>
+	<ListBoxSelectedBG>RGB(185,200,221)</ListBoxSelectedBG>
+	<ListBoxSelectedNoFocusBG>RGB(160,170,209)</ListBoxSelectedNoFocusBG>
+	<ListBoxSelectedText>RGB(34,34,34)</ListBoxSelectedText>
+	<ListBoxSelectedNoFocusText>RGB(34,34,34)</ListBoxSelectedNoFocusText>
+	<ClipPastedColor>RGB(112,125,182)</ClipPastedColor>
+	<MainWindowBG>RGB(187,187,187)</MainWindowBG>
+	<SearchTextBoxFocusBG>RGB(221,221,221)</SearchTextBoxFocusBG>
+	<SearchTextBoxFocusText>RGB(34,34,34)</SearchTextBoxFocusText>
+	<SearchTextBoxFocusBorder>RGB(68,68,68)</SearchTextBoxFocusBorder>
+	<SearchTextHighlight>RGB(3,146,24)</SearchTextHighlight>
+	<Border>RGB(153,153,153)</Border>
+	<BorderTopMost>RGB(68,68,68)</BorderTopMost>
+	<BorderNotConnected>RGB(119,13,13)</BorderNotConnected>
+	<GroupTreeBG>RGB(221,221,221)</GroupTreeBG>
+	<GroupTreeText>RGB(51,51,51)</GroupTreeText>
 	<CaptionSize>26</CaptionSize>
 	<CaptionFontSize>13</CaptionFontSize>
-
-	<DescriptionWindowBG>RGB(190,193,197)</DescriptionWindowBG>
-	<DescriptionWindowText>RGB(44,47,50)</DescriptionWindowText>
-
-</Ditto_Theme_File>
+	<DescriptionWindowBG>RGB(187,187,187)</DescriptionWindowBG>
+	<DescriptionWindowText>RGB(34,34,34)</DescriptionWindowText>
+</Ditto_Theme_File>

+ 3 - 3
src/AdvGeneral.cpp

@@ -224,7 +224,7 @@ BOOL CAdvGeneral::OnInitDialog()
 
 	pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("Double shortcut keystroke timeout)"), (long)CGetSetOptions::GetDoubleKeyStrokeTimeout(), _T(""), SETTING_DOUBLE_KEYSTROKE_TIMEOUT));
 
-	AddTrueFalse(pGroupTest, _T("Draw copied color code (hex #RRGGBB or rgb(r,g,b)"), CGetSetOptions::GetDrawCopiedColorCode(), SETTING_DRAW_COPIED_COLOR_CODE);
+	AddTrueFalse(pGroupTest, _T("Draw swatch for hex, RGB, and HSL colors"), CGetSetOptions::GetDrawCopiedColorCode(), SETTING_DRAW_COPIED_COLOR_CODE);
 
 	AddTrueFalse(pGroupTest, _T("Draw RTF text in list (for RTF types) (could increase memory usage an display speed)"), CGetSetOptions::GetDrawRTF(), SETTING_DRAW_RTF);
 	pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("Editor default font size"), (long)CGetSetOptions::GetEditorDefaultFontSize(), _T(""), SETTING_EDITOR_FONT_SIZE));
@@ -232,7 +232,7 @@ BOOL CAdvGeneral::OnInitDialog()
 	AddTrueFalse(pGroupTest, _T("Ensure Ditto is always connected to the clipboard"), CGetSetOptions::GetEnsureConnectToClipboard(), SETTING_ENSURE_CONNECTED);
 	AddTrueFalse(pGroupTest, _T("Ensure entire window is visible"), CGetSetOptions::GetEnsureEntireWindowCanBeSeen(), SETTING_ENSURE_WINDOW_IS_VISIBLE);
 
-	AddTrueFalse(pGroupTest, _T("Fast thumbnail mode (default: true means low quality but fast. false means high quality but slow)"), CGetSetOptions::GetFastThumbnailMode(), SETTING_FAST_THUMBNAIL_MODE);
+	AddTrueFalse(pGroupTest, _T("Fast thumbnails (True = fast / low quality (default). False = slow / high quality)"), CGetSetOptions::GetFastThumbnailMode(), SETTING_FAST_THUMBNAIL_MODE);
 
 	AddTrueFalse(pGroupTest, _T("Find as you type"), CGetSetOptions::GetFindAsYouType(), SETTING_FIND_AS_TYPE);
 
@@ -242,7 +242,7 @@ BOOL CAdvGeneral::OnInitDialog()
 	AddTrueFalse(pGroupTest, _T("Hide Ditto on hot key if Ditto is visible"), CGetSetOptions::GetHideDittoOnHotKeyIfAlreadyShown(), SETTING_HIDE_ON_HOTKEY_IF_VISIBLE);
 
 	pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("Ignore copies faster than (ms) (default: 500)"), (long)CGetSetOptions::GetSaveClipDelay(), _T(""), SETTING_IGNORE_FALSE_COPIES_DELAY));
-	pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("Ignore annoying CF_DIB when a clip is detected as text content"), CGetSetOptions::GetIgnoreAnnoyingCFDIB(), _T("Case insensitive. Recommended option is \"excel.exe; onenote.exe; powerpnt.exe\" "), SETTING_IGNORE_ANNOYING_CF_DIB));
+	pGroupTest->AddSubItem(new CMFCPropertyGridProperty(_T("Ignore CF_DIB when a clip is detected as text content"), CGetSetOptions::GetIgnoreAnnoyingCFDIB(), _T("Case insensitive. Recommended option is \"excel.exe; onenote.exe; powerpnt.exe\" "), SETTING_IGNORE_ANNOYING_CF_DIB));
 
 	static TCHAR BASED_CODE szImageEditorFilter[] = _T("Applications(*.exe)|*.exe||");
 	CMFCPropertyGridFileProperty* pImageEditorProp = new CMFCPropertyGridFileProperty(_T("Image editor path (empty for system mapping)"), TRUE, CGetSetOptions::GetImageEditorPath(), _T("exe"), 0, szImageEditorFilter, (LPCTSTR)0, SETTING_IMAGE_EDITOR_PATH);