More theme updates

Debug/Language/English.xml

@@ -407,6 +407,8 @@
 		<Item English_Text = "Hot Key" ID = "QPHotKey"></Item>
 		<Item English_Text = "Command" ID = "QPCommand"></Item>
 		
+		<Item English_Text = "[Top Most Window]" ID = "top_most"></Item>
+		
 				
 	</Ditto_String_Table>
 	<Ditto_Options_Sheet>

Debug/Themes/Classic.xml

@@ -1,19 +1,28 @@
-<Ditto_Theme_File Version = "2" Author = "Ditto" Notes = "Base theme file for future Ditto Themes">
+<Ditto_Theme_File Version = "3" Author = "Ditto" Notes = "">
+
 	<CaptionLeft>RGB(122, 150, 223)</CaptionLeft>
 	<CaptionRight>RGB(157, 185, 235)</CaptionRight>	
+	
 	<CaptionLeftTopMost>RGB(122, 150, 223)</CaptionLeftTopMost>
 	<CaptionRightTopMost>RGB(157, 185, 235)</CaptionRightTopMost>
-	<CaptionLeftNotConnected>RGB(157, 185, 235)</CaptionLeftNotConnected>
-	<CaptionRightNotConnected>RGB(157, 185, 235)</CaptionRightNotConnected>
+	
+	<CaptionLeftNotConnected>RGB(122, 150, 223)</CaptionLeftNotConnected>
+	<CaptionRightNotConnected>RGB(122, 150, 223)</CaptionRightNotConnected>
+	
 	<CaptionTextColor>RGB(255, 255, 255)</CaptionTextColor>
+	
 	<ListBoxOddRowsBG>RGB(255, 255, 255)</ListBoxOddRowsBG>
 	<ListBoxEvenRowsBG>RGB(240, 240, 240)</ListBoxEvenRowsBG>
+	
 	<ListBoxOddRowsText>RGB(0, 0, 0)</ListBoxOddRowsText>
 	<ListBoxEvenRowsText>RGB(0, 0, 0)</ListBoxEvenRowsText>
+	
 	<ListBoxSelectedBG>RGB(30, 116, 211)</ListBoxSelectedBG>
 	<ListBoxSelectedNoFocusBG>RGB(236, 233, 216)</ListBoxSelectedNoFocusBG>
+	
 	<ListBoxSelectedText>RGB(255, 255, 255)</ListBoxSelectedText>
 	<ListBoxSelectedNoFocusText>RGB(0, 0, 0)</ListBoxSelectedNoFocusText>	
+	
 	<Border>RGB(122, 150, 223)</Border>
 	<BorderTopMost>RGB(122, 150, 223)</BorderTopMost>
 	<BorderNotConnected>RGB(255, 0, 0)</BorderNotConnected>	
@@ -24,4 +33,12 @@
 	<CaptionSize>18</CaptionSize>
 	<CaptionFontSize>15</CaptionFontSize>
 
+	<DescriptionWindowBG>RGB(255, 255, 225)</DescriptionWindowBG>
+	<DescriptionWindowText></DescriptionWindowText>
+	
+	<MainWindowBG></MainWindowBG>
+	
+	<SearchTextBoxFocusBG></SearchTextBoxFocusBG>
+	<SearchTextBoxFocusText></SearchTextBoxFocusText>
+	
 </Ditto_Theme_File>

Debug/Themes/DarkerDitto.xml

@@ -1,12 +1,13 @@
 <Ditto_Theme_File Version="2" Author="Zigboom" Notes="DarkTheme">
+
 	<CaptionLeft>RGB(0,0,0)</CaptionLeft>
 	<CaptionRight>RGB(51,51,51)</CaptionRight>
 
 	<CaptionLeftTopMost>RGB(0,0,0)</CaptionLeftTopMost>
-	<CaptionRightTopMost>RGB(255,255,255)</CaptionRightTopMost>
+	<CaptionRightTopMost>RGB(51,51,51)</CaptionRightTopMost>
 
 	<CaptionLeftNotConnected>RGB(0,0,0)</CaptionLeftNotConnected>
-	<CaptionRightNotConnected>RGB(255,0,0)</CaptionRightNotConnected>
+	<CaptionRightNotConnected>RGB(51,51,51)</CaptionRightNotConnected>
 
 	<CaptionTextColor>RGB(127,127,127)</CaptionTextColor>
 
@@ -21,15 +22,10 @@
 
 	<ListBoxSelectedText>RGB(238,238,238)</ListBoxSelectedText>
 	<ListBoxSelectedNoFocusText>RGB(220,220,220)</ListBoxSelectedNoFocusText>
-
-	<MainWindowBG>RGB(0,0,0)</MainWindowBG>
-
-	<SearchTextBoxFocusBG>RGB(24,24,24)</SearchTextBoxFocusBG>
-	<SearchTextBoxFocusText>RGB(127,127,127)</SearchTextBoxFocusText>
-
+	
 	<Border>RGB(0,0,0)</Border>
 	<BorderTopMost>RGB(0,0,0)</BorderTopMost>
-	<BorderNotConnected>RGB(0,0,0)</BorderNotConnected>
+	<BorderNotConnected>RGB(255,0,0)</BorderNotConnected>
 
 	<GroupTreeBG>RGB(0,0,0)</GroupTreeBG>
 	<GroupTreeText>RGB(153,153,153)</GroupTreeText>
@@ -37,7 +33,12 @@
 	<CaptionSize></CaptionSize>
 	<CaptionFontSize></CaptionFontSize>
 	
-	<DescriptionWindowBG></DescriptionWindowBG>
+	<DescriptionWindowBG>RGB(204,204,204)</DescriptionWindowBG>
 	<DescriptionWindowText></DescriptionWindowText>
 
+	<MainWindowBG>RGB(0,0,0)</MainWindowBG>
+
+	<SearchTextBoxFocusBG>RGB(24,24,24)</SearchTextBoxFocusBG>
+	<SearchTextBoxFocusText>RGB(127,127,127)</SearchTextBoxFocusText>
+	
 </Ditto_Theme_File>

QPasteWnd.cpp

@@ -1095,6 +1095,11 @@ void CQPasteWnd::UpdateStatus(bool bRepaintImmediately)
 {
     CString title = m_Title;    
 
+	if (g_Opt.m_bShowPersistent)
+	{
+		title = (StrF(_T("%s %s"), _T(QPASTE_TITLE), theApp.m_Language.GetString("top_window", "[Top Most Window]")));
+	}
+
     CString cs;
     cs.Format(_T(" - %d/%d"), m_lstHeader.GetSelectedCount(), m_lstHeader.GetItemCount());
     title += cs;
@@ -1134,8 +1139,15 @@ void CQPasteWnd::UpdateStatus(bool bRepaintImmediately)
     }
 
     SetToolTipText(title);
-		//SetCustomWindowTitle(title);
-        //RefreshNc();    
+
+	if (g_Opt.m_bShowPersistent)
+	{
+		SetCustomWindowTitle(StrF(_T("%s %s"), _T(QPASTE_TITLE), theApp.m_Language.GetString("top_window", "[Top Most Window]")));
+	}
+	else
+	{
+		SetCustomWindowTitle(_T(QPASTE_TITLE));
+	}
 }
 
 BOOL CQPasteWnd::FillList(CString csSQLSearch /*=""*/)
@@ -3281,6 +3293,7 @@ bool CQPasteWnd::DoActionToggleShowPersistant()
 
 	MoveControls();
 
+	UpdateStatus();
 	return true;
 }
 

Theme.cpp

@@ -26,13 +26,15 @@ void CTheme::LoadDefaults()
 	m_CaptionRight = RGB(204, 204, 204);
 
 	m_Border = RGB(204, 204, 204);
-	m_BorderTopMost = RGB(100, 100, 100);
-	m_BorderNotConnected = RGB(255, 0, 0);
+	m_BorderTopMost = RGB(204, 204, 204);
+	m_BorderNotConnected = RGB(204, 204, 204);
 
 	m_CaptionLeftTopMost = RGB(255, 255, 255);
 	m_CaptionRightTopMost = RGB(204, 204, 204);
+	
 	m_CaptionLeftNotConnected = RGB(255, 255, 255);
-	m_CaptionRightNotConnected = RGB(204, 204, 204);
+	m_CaptionRightNotConnected = RGB(255, 0, 0);
+
 	m_CaptionTextColor = RGB(191, 191, 191);
 	m_ListBoxOddRowsBG = RGB(255, 255, 255);
 	m_ListBoxEvenRowsBG = RGB(243, 243, 243);
@@ -51,7 +53,11 @@ void CTheme::LoadDefaults()
 	m_groupTreeBG = RGB(240, 240, 240);
 	m_groupTreeText = RGB(127, 127, 127);
 
-	m_descriptionWindowBG = RGB(240, 240, 240);// GetSysColor(COLOR_INFOBK);
+	m_descriptionWindowBG = RGB(240, 240, 240);// GetSysColor(COLOR_INFOBK);//RGB(240, 240, 240);//
+	/*int r = GetRValue(m_descriptionWindowBG);
+	int g = GetGValue(m_descriptionWindowBG);
+	int b = GetBValue(m_descriptionWindowBG);*/
+
 	m_descriptionWindowText = RGB(0, 0, 0);
 
 	m_captionSize = 25;

WndEx.cpp

@@ -389,4 +389,16 @@ void CWndEx::OnInitMenuPopup(CMenu *pPopupMenu, UINT nIndex, BOOL bSysMenu)
 void CWndEx::SetToolTipText(CString text)
 {
 	m_toolTip.UpdateTipText(text, this, 1);
+}
+
+void CWndEx::SetCustomWindowTitle(CString title)
+{
+	CString old = m_DittoWindow.m_customWindowTitle;
+	m_DittoWindow.m_customWindowTitle = title;
+	m_DittoWindow.m_useCustomWindowTitle = true;
+
+	if (old != m_DittoWindow.m_customWindowTitle)
+	{
+		this->InvalidateNc();
+	}
 }

WndEx.h

@@ -43,7 +43,7 @@ public:
 	void SetAutoMaxDelay(long lDelay)	{ m_lDelayMaxSeconds = lDelay; }
 	bool GetMinimized()	{ return m_DittoWindow.m_bMinimized; }
 
-	void SetCustomWindowTitle(CString title) { m_DittoWindow.m_customWindowTitle = title;  m_DittoWindow.m_useCustomWindowTitle = true; }
+	void SetCustomWindowTitle(CString title);
 
 	void SetToolTipText(CString text);