WIP

WinMerge · Feb 26, 2025 · a1d4153 · a1d4153
1 parent 2ffb122
commit a1d4153
Show file tree

Hide file tree

Showing 44 changed files with 151 additions and 139 deletions.
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
@@ -425,14 +425,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 		return -1;
 
 	Logger::Get().SetOutputFunction([this](Logger::LogLevel level, const std::chrono::system_clock::time_point& tp, const String& msg)
-		{
-			LogMessage* p = new LogMessage(level, tp, msg);
-			PostMessage(WM_USER + 2, reinterpret_cast<WPARAM>(p), 0);
-		});
-
-	RootLogger::Info(_T("test"));
-	RootLogger::Warn(_T("test2"));
-	RootLogger::Error(_T("test3"));
+		{ OutputLog(level, tp, msg, level == Logger::LogLevel::ERR); } );
 
 	m_wndMDIClient.SubclassWindow(m_hWndMDIClient);
 
@@ -489,6 +482,11 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 	m_wndMDIClient.ModifyStyleEx(WS_EX_CLIENTEDGE, 0);
 
+	if (GetOptionsMgr()->GetBool(OPT_SHOW_OUTPUTBAR))
+	{
+		ShowOutputPane(true);
+	}
+
 	UpdateSystemMenu();
 
 	return 0;
@@ -2259,6 +2257,7 @@ void CMainFrame::OnUpdateViewMenuBar(CCmdUI* pCmdUI)
 void CMainFrame::OnViewOutputBar()
 {
 	const bool visible = m_wndOutputBar.m_hWnd != nullptr && !!m_wndOutputBar.IsVisible();
+	GetOptionsMgr()->SaveOption(OPT_SHOW_OUTPUTBAR, !visible);
 	ShowOutputPane(!visible);
 }
 
@@ -2408,7 +2407,7 @@ LRESULT CMainFrame::OnUser1(WPARAM wParam, LPARAM lParam)
 LRESULT CMainFrame::OnUser2(WPARAM wParam, LPARAM lParam)
 {
 	LogMessage* pLogMessage = reinterpret_cast<LogMessage*>(wParam);
-	if (pLogMessage->level >= Logger::LogLevel::ERR && m_wndOutputBar.m_hWnd == nullptr)
+	if (lParam != 0 && m_wndOutputBar.m_hWnd == nullptr)
 		ShowOutputPane(true);
 
 	if (!m_pOutputDoc)
@@ -3690,6 +3689,13 @@ void CMainFrame::WaitAndDoMessageLoop(bool& completed, int ms)
 	}
 }
 
+void CMainFrame::OutputLog(Logger::LogLevel level, const std::chrono::system_clock::time_point& tp, const String& msg, bool show)
+{
+	LogMessage * p = new LogMessage(level, tp, msg);
+	if (!PostMessage(WM_USER + 2, reinterpret_cast<WPARAM>(p), show))
+		delete p;
+}
+
 void CMainFrame::UpdateDocTitle()
 {
 	CDocManager* pDocManager = AfxGetApp()->m_pDocManager;

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
@@ -23,6 +23,7 @@
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
 #include "FileOpenFlags.h"
+#include "Logger.h"
 
 class BCMenu;
 class CDirView;
@@ -229,6 +230,7 @@ class CMainFrame : public CMDIFrameWnd
 	CMenuBar* GetMenuBar() { return &m_wndMenuBar; }
 	CToolBar* GetToolbar() { return &m_wndToolBar; }
 	static void WaitAndDoMessageLoop(bool& completed, int ms);
+	void OutputLog(Logger::LogLevel level, const std::chrono::system_clock::time_point& tp, const String& msg, bool show);
 
 // Overrides
 	virtual void GetMessageString(UINT nID, CString& rMessage) const;

diff --git a/Src/Merge.rc b/Src/Merge.rc
@@ -342,6 +342,7 @@ BEGIN
     END
     POPUP "&Edit"
     BEGIN
+        MENUITEM "&Copy\tCtrl+C",               ID_EDIT_COPY
         MENUITEM "&Paste\tCtrl+V",              ID_EDIT_PASTE
         MENUITEM SEPARATOR
         MENUITEM "&Options...",                 ID_OPTIONS

diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h
@@ -31,6 +31,7 @@ inline const String OPT_SHOW_MENUBAR {_T("Settings/ShowMenubar"s)};
 inline const String OPT_SHOW_TOOLBAR {_T("Settings/ShowToolbar"s)};
 inline const String OPT_SHOW_STATUSBAR {_T("Settings/ShowStatusbar"s)};
 inline const String OPT_SHOW_TABBAR {_T("Settings/ShowTabbar"s)};
+inline const String OPT_SHOW_OUTPUTBAR {_T("Settings/ShowOutputbar"s)};
 inline const String OPT_REBAR_STATE {_T("Settings/ReBarState"s)};
 inline const String OPT_TOOLBAR_SIZE {_T("Settings/ToolbarSize"s)};
 inline const String OPT_RESIZE_PANES {_T("Settings/AutoResizePanes"s)};

diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp
@@ -59,6 +59,7 @@ void Init(COptionsMgr *pOptions)
 	pOptions->InitOption(OPT_SHOW_TOOLBAR, true);
 	pOptions->InitOption(OPT_SHOW_STATUSBAR, true);
 	pOptions->InitOption(OPT_SHOW_TABBAR, true);
+	pOptions->InitOption(OPT_SHOW_OUTPUTBAR, false);
 	pOptions->InitOption(OPT_REBAR_STATE, _T(""));
 	pOptions->InitOption(OPT_TOOLBAR_SIZE, 0, 0, 2);
 	pOptions->InitOption(OPT_RESIZE_PANES, false);

diff --git a/Testing/GoogleTest/GUITests/ConfigTest.cpp b/Testing/GoogleTest/GUITests/ConfigTest.cpp
@@ -119,6 +119,7 @@ namespace
 		{ OPT_SHOW_TOOLBAR, varprop::VT_BOOL, {}, {} },
 		{ OPT_SHOW_STATUSBAR, varprop::VT_BOOL, {}, {} },
 		{ OPT_SHOW_TABBAR, varprop::VT_BOOL, {}, {} },
+		{ OPT_SHOW_OUTPUTBAR, varprop::VT_BOOL, {}, {} },
 		{ OPT_TOOLBAR_SIZE, varprop::VT_INT, {0, 1, 2}, {} },
 		{ OPT_RESIZE_PANES, varprop::VT_BOOL, {}, {} },
 		//

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
@@ -350,6 +350,9 @@ msgstr "&خروج\tCtrl+Q"
 msgid "&Edit"
 msgstr "&تحرير"
 
+msgid "&Copy\tCtrl+C"
+msgstr "&نسخ"
+
 msgid "&Paste\tCtrl+V"
 msgstr "&لصق"
 
@@ -668,9 +671,6 @@ msgstr "&إعادة الأمر"
 msgid "Cu&t\tCtrl+X"
 msgstr "&قص"
 
-msgid "&Copy\tCtrl+C"
-msgstr "&نسخ"
-
 msgid "F&ind...\tCtrl+F"
 msgstr "&بحث"
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
@@ -390,6 +390,10 @@ msgstr "Ir&ten\tCtrl+Q"
 msgid "&Edit"
 msgstr "&Editatu"
 
+#, c-format
+msgid "&Copy\tCtrl+C"
+msgstr "&Kopiatu\tCtrl+C"
+
 #, c-format
 msgid "&Paste\tCtrl+V"
 msgstr "&Itsatsi\tCtrl+V"
@@ -794,10 +798,6 @@ msgstr "Birre&gin\tCtrl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "&Ebaki\tCtrl+X"
 
-#, c-format
-msgid "&Copy\tCtrl+C"
-msgstr "&Kopiatu\tCtrl+C"
-
 #, c-format
 msgid "F&ind...\tCtrl+F"
 msgstr "&Bilatu...\tCtrl+F"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
@@ -349,6 +349,9 @@ msgstr "S&air\tCtrl+Q"
 msgid "&Edit"
 msgstr "&Editar"
 
+msgid "&Copy\tCtrl+C"
+msgstr "&Copiar\tCtrl+C"
+
 msgid "&Paste\tCtrl+V"
 msgstr "&Colar\tCtrl+V"
 
@@ -667,9 +670,6 @@ msgstr "&Refazer\tCtrl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "Co&rtar\tCtrl+X"
 
-msgid "&Copy\tCtrl+C"
-msgstr "&Copiar\tCtrl+C"
-
 msgid "F&ind...\tCtrl+F"
 msgstr "A&char...\tCtrl+F"
 

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
@@ -346,6 +346,9 @@ msgstr "&Изход\tCtrl+Q"
 msgid "&Edit"
 msgstr "П&роменяне"
 
+msgid "&Copy\tCtrl+C"
+msgstr "&Копиране\tCtrl+C"
+
 msgid "&Paste\tCtrl+V"
 msgstr "&Поставяне\tCtrl+V"
 
@@ -664,9 +667,6 @@ msgstr "По&вторение\tCtrl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "Из&рязване\tCtrl+X"
 
-msgid "&Copy\tCtrl+C"
-msgstr "&Копиране\tCtrl+C"
-
 msgid "F&ind...\tCtrl+F"
 msgstr "Търс&ене…\tCtrl+F"
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
@@ -388,6 +388,10 @@ msgstr "&Surt\tControl+Q"
 msgid "&Edit"
 msgstr "E&dita"
 
+#, c-format
+msgid "&Copy\tCtrl+C"
+msgstr "C&opia\tControl+C"
+
 #, c-format
 msgid "&Paste\tCtrl+V"
 msgstr "Engan&xa\tControl+V"
@@ -792,10 +796,6 @@ msgstr "Re&fés\tControl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "&Retalla\tControl+X"
 
-#, c-format
-msgid "&Copy\tCtrl+C"
-msgstr "C&opia\tControl+C"
-
 #, c-format
 msgid "F&ind...\tCtrl+F"
 msgstr "&Cerca...\tControl+F"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
@@ -353,6 +353,9 @@ msgstr "退出(&X)\tCtrl+Q"
 msgid "&Edit"
 msgstr "编辑(&E)"
 
+msgid "&Copy\tCtrl+C"
+msgstr "复制(&C)\tCtrl+C"
+
 msgid "&Paste\tCtrl+V"
 msgstr "粘贴(&P)\tCtrl+V"
 
@@ -671,9 +674,6 @@ msgstr "重作(&R)\tCtrl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "剪切(&T)\tCtrl+X"
 
-msgid "&Copy\tCtrl+C"
-msgstr "复制(&C)\tCtrl+C"
-
 msgid "F&ind...\tCtrl+F"
 msgstr "查找(&I)...\tCtrl+F"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
@@ -388,6 +388,10 @@ msgstr "結束 (&X)\tCtrl+Q"
 msgid "&Edit"
 msgstr "編輯 (&E)"
 
+#, c-format
+msgid "&Copy\tCtrl+C"
+msgstr "複製 (&C)\tCtrl+C"
+
 #, c-format
 msgid "&Paste\tCtrl+V"
 msgstr "貼上 (&P)\tCtrl+V"
@@ -794,10 +798,6 @@ msgstr "取消復原 (&R)\tCtrl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "剪下 (&U)\tCtrl+X"
 
-#, c-format
-msgid "&Copy\tCtrl+C"
-msgstr "複製 (&C)\tCtrl+C"
-
 #, c-format
 msgid "F&ind...\tCtrl+F"
 msgstr "尋找 (&I)...\tCtrl+F"

diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
@@ -351,6 +351,9 @@ msgstr "&Esce\tCtrl+Q"
 msgid "&Edit"
 msgstr "&Mudificà"
 
+msgid "&Copy\tCtrl+C"
+msgstr "&Cupià\tCtrl+C"
+
 msgid "&Paste\tCtrl+V"
 msgstr "&Incullà\tCtrl+V"
 
@@ -669,9 +672,6 @@ msgstr "&Rifà\tCtrl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "&Taglià\tCtrl+X"
 
-msgid "&Copy\tCtrl+C"
-msgstr "&Cupià\tCtrl+C"
-
 msgid "F&ind...\tCtrl+F"
 msgstr "Ri&cercà…\tCtrl+F"
 

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
@@ -387,6 +387,10 @@ msgstr "I&zlaz\tCtrl+Q"
 msgid "&Edit"
 msgstr "&Uređivanje"
 
+#, c-format
+msgid "&Copy\tCtrl+C"
+msgstr "&Kopiraj\tCtrl+C"
+
 #, c-format
 msgid "&Paste\tCtrl+V"
 msgstr "&Zalijepi\tCtrl+V"
@@ -791,10 +795,6 @@ msgstr "&Vrati\tCtrl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "Od&reži\tCtrl+X"
 
-#, c-format
-msgid "&Copy\tCtrl+C"
-msgstr "&Kopiraj\tCtrl+C"
-
 #, c-format
 msgid "F&ind...\tCtrl+F"
 msgstr "&Nađi...\tCtrl+F"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
@@ -387,6 +387,10 @@ msgstr "&Konec\tCtrl+Q"
 msgid "&Edit"
 msgstr "Úpr&avy"
 
+#, c-format
+msgid "&Copy\tCtrl+C"
+msgstr "&Kopírovat\tCtrl+C"
+
 #, c-format
 msgid "&Paste\tCtrl+V"
 msgstr "&Vložit\tCtrl+V"
@@ -791,10 +795,6 @@ msgstr "Znov&u\tCtrl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "Vyj&mout\tCtrl+X"
 
-#, c-format
-msgid "&Copy\tCtrl+C"
-msgstr "&Kopírovat\tCtrl+C"
-
 #, c-format
 msgid "F&ind...\tCtrl+F"
 msgstr "&Najít...\tCtrl+F"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
@@ -388,6 +388,10 @@ msgstr "&Afslut\tCtrl+Q"
 msgid "&Edit"
 msgstr "&Rediger"
 
+#, c-format
+msgid "&Copy\tCtrl+C"
+msgstr "Ko&pier\tCtrl+C"
+
 #, c-format
 msgid "&Paste\tCtrl+V"
 msgstr "&Indsæt\tCtrl+V"
@@ -792,10 +796,6 @@ msgstr "&Gendan\tCtrl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "&Klip\tCtrl+X"
 
-#, c-format
-msgid "&Copy\tCtrl+C"
-msgstr "Ko&pier\tCtrl+C"
-
 #, c-format
 msgid "F&ind...\tCtrl+F"
 msgstr "S&øg...\tCtrl+F"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
@@ -347,6 +347,9 @@ msgstr "Afsluiten\tCtrl+Q"
 msgid "&Edit"
 msgstr "Bewerken"
 
+msgid "&Copy\tCtrl+C"
+msgstr "Kopiëren\tCtrl+C"
+
 msgid "&Paste\tCtrl+V"
 msgstr "Plakken\tCtrl+V"
 
@@ -665,9 +668,6 @@ msgstr "Opnieuw\tCtrl+Y"
 msgid "Cu&t\tCtrl+X"
 msgstr "Knippen\tCtrl+X"
 
-msgid "&Copy\tCtrl+C"
-msgstr "Kopiëren\tCtrl+C"
-
 msgid "F&ind...\tCtrl+F"
 msgstr "Zoeken...\tCtrl+F"
 

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2025-02-11 11:34+0000\n"
+"POT-Creation-Date: 2025-02-26 20:33+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <[email protected]>\n"
@@ -343,6 +343,9 @@ msgstr ""
 msgid "&Edit"
 msgstr ""
 
+msgid "&Copy\tCtrl+C"
+msgstr ""
+
 msgid "&Paste\tCtrl+V"
 msgstr ""
 
@@ -661,9 +664,6 @@ msgstr ""
 msgid "Cu&t\tCtrl+X"
 msgstr ""
 
-msgid "&Copy\tCtrl+C"
-msgstr ""
-
 msgid "F&ind...\tCtrl+F"
 msgstr ""