Add Medium size (24px) option to Toolbar icons

WinMerge · Oct 26, 2024 · 5420fcd · 5420fcd
1 parent 312ab2f
commit 5420fcd
Show file tree

Hide file tree

Showing 41 changed files with 130 additions and 12 deletions.
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
@@ -2610,8 +2610,8 @@ BOOL CMainFrame::CreateToolbar()
 /** @brief Load toolbar images from the resource. */
 void CMainFrame::LoadToolbarImages()
 {
-	const int toolbarNewImgSize = MulDiv(16, GetSystemMetrics(SM_CXSMICON), 16) * 
-		(1 + std::clamp(GetOptionsMgr()->GetInt(OPT_TOOLBAR_SIZE), 0, ID_TOOLBAR_HUGE - ID_TOOLBAR_SMALL));
+	const int toolbarNewImgSize = MulDiv(8, GetSystemMetrics(SM_CXSMICON), 16) * 
+		(2 + std::clamp(GetOptionsMgr()->GetInt(OPT_TOOLBAR_SIZE), 0, ID_TOOLBAR_HUGE - ID_TOOLBAR_SMALL));
 	const int toolbarOrgImgSize = toolbarNewImgSize <= 20 ? 16 : 32;
 	CToolBarCtrl& BarCtrl = m_wndToolBar.GetToolBarCtrl();
 	CImageList imgEnabled, imgDisabled;

diff --git a/Src/Merge.rc b/Src/Merge.rc
@@ -357,6 +357,7 @@ BEGIN
         BEGIN
             MENUITEM "&None",                       ID_TOOLBAR_NONE
             MENUITEM "&Small",                      ID_TOOLBAR_SMALL
+            MENUITEM "&Medium",                     ID_TOOLBAR_MEDIUM
             MENUITEM "&Big",                        ID_TOOLBAR_BIG
             MENUITEM "&Huge",                       ID_TOOLBAR_HUGE
         END
@@ -502,6 +503,7 @@ BEGIN
         BEGIN
             MENUITEM "&None",                       ID_TOOLBAR_NONE
             MENUITEM "&Small",                      ID_TOOLBAR_SMALL
+            MENUITEM "&Medium",                     ID_TOOLBAR_MEDIUM
             MENUITEM "&Big",                        ID_TOOLBAR_BIG
             MENUITEM "&Huge",                       ID_TOOLBAR_HUGE
         END
@@ -742,6 +744,7 @@ BEGIN
         BEGIN
             MENUITEM "&None",                       ID_TOOLBAR_NONE
             MENUITEM "&Small",                      ID_TOOLBAR_SMALL
+            MENUITEM "&Medium",                     ID_TOOLBAR_MEDIUM
             MENUITEM "&Big",                        ID_TOOLBAR_BIG
             MENUITEM "&Huge",                       ID_TOOLBAR_HUGE
         END

diff --git a/Src/resource.h b/Src/resource.h
@@ -973,15 +973,16 @@
 #define ID_COLORSCHEME_LAST             33196
 #define ID_TOOLBAR_NONE                 33200
 #define ID_TOOLBAR_SMALL                33201
-#define ID_TOOLBAR_BIG                  33202
-#define ID_TOOLBAR_HUGE                 33203
-#define ID_VIEW_RESIZE_PANES            33204
-#define ID_VIEW_ZOOMIN                  33205
-#define ID_VIEW_ZOOMOUT                 33206
-#define ID_VIEW_ZOOMNORMAL              33207
-#define ID_PLUGINS_LIST                 33208
-#define ID_PREDIFFER_MANUAL             33209
-#define ID_PREDIFFER_AUTO               33210
+#define ID_TOOLBAR_MEDIUM               33202
+#define ID_TOOLBAR_BIG                  33203
+#define ID_TOOLBAR_HUGE                 33204
+#define ID_VIEW_RESIZE_PANES            33205
+#define ID_VIEW_ZOOMIN                  33206
+#define ID_VIEW_ZOOMOUT                 33207
+#define ID_VIEW_ZOOMNORMAL              33208
+#define ID_PLUGINS_LIST                 33209
+#define ID_PREDIFFER_MANUAL             33210
+#define ID_PREDIFFER_AUTO               33211
 #define ID_VIEW_DIFFCONTEXT_ALL         33218
 #define ID_VIEW_DIFFCONTEXT_0           33219
 #define ID_VIEW_DIFFCONTEXT_1           33220

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
@@ -374,6 +374,9 @@ msgstr "&شريط الأدوات"
 msgid "&Small"
 msgstr "&صغير"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&كبير"
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
@@ -420,6 +420,9 @@ msgstr "Tre&snabarra"
 msgid "&Small"
 msgstr "&Txikia"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "&Handia"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
@@ -373,6 +373,9 @@ msgstr "&Barra de ferramentas"
 msgid "&Small"
 msgstr "&Pequeno"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Grande"
 

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
@@ -370,6 +370,9 @@ msgstr "Лента с &инструменти"
 msgid "&Small"
 msgstr "&Малък"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Голям"
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
@@ -418,6 +418,9 @@ msgstr "Barra d'ei&nes"
 msgid "&Small"
 msgstr "&Petita"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "&Gran"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
@@ -377,6 +377,9 @@ msgstr "工具栏(&T)"
 msgid "&Small"
 msgstr "小(&S)"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "大(&B)"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
@@ -418,6 +418,9 @@ msgstr "工具列 (&T)"
 msgid "&Small"
 msgstr "小圖示 (&S)"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "大圖示 (&B)"

diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
@@ -375,6 +375,9 @@ msgstr "&Barra d’attrezzi"
 msgid "&Small"
 msgstr "&Chjuca"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Maiò"
 

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
@@ -417,6 +417,9 @@ msgstr "Traka &alata"
 msgid "&Small"
 msgstr "&Male ikone"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "&Velike ikone"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
@@ -417,6 +417,9 @@ msgstr "Panel &nástrojů"
 msgid "&Small"
 msgstr "&Malý"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "&Velký"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
@@ -418,6 +418,9 @@ msgstr "&Værktøjslinje"
 msgid "&Small"
 msgstr "&Lille"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "&Stor"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
@@ -371,6 +371,9 @@ msgstr "Werkbalk"
 msgid "&Small"
 msgstr "Klein"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "Groot"
 

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: 2024-10-16 08:43+0000\n"
+"POT-Creation-Date: 2024-10-26 14:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <[email protected]>\n"
@@ -367,6 +367,9 @@ msgstr ""
 msgid "&Small"
 msgstr ""
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
@@ -373,6 +373,9 @@ msgstr "Työkalurivi"
 msgid "&Small"
 msgstr "Pieni"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "Iso"
 

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
@@ -425,6 +425,9 @@ msgstr "Barre d'ou&tils"
 msgid "&Small"
 msgstr "&Petite"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "&Grande"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
@@ -374,6 +374,9 @@ msgstr "Barra de ferramen&tas"
 msgid "&Small"
 msgstr "&Pequena"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Grande"
 

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
@@ -420,6 +420,9 @@ msgstr "&Symbolleiste"
 msgid "&Small"
 msgstr "&Klein"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "&Groß"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
@@ -416,6 +416,9 @@ msgstr "Γραμμή Ε&ργαλείων"
 msgid "&Small"
 msgstr "Μι&κρή"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "Με&γάλη"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
@@ -419,6 +419,9 @@ msgstr "Eszköztár"
 msgid "&Small"
 msgstr "Kicsi"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "Nagy"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
@@ -374,6 +374,9 @@ msgstr "Barra s&trumenti"
 msgid "&Small"
 msgstr "&Piccola"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Grande"
 

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
@@ -372,6 +372,9 @@ msgstr "ツールバー(&T)"
 msgid "&Small"
 msgstr "小(&S)"
 
+msgid "&Medium"
+msgstr "中(&M)"
+
 msgid "&Big"
 msgstr "大(&B)"
 

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
@@ -426,6 +426,9 @@ msgstr "도구 모음(&T)"
 msgid "&Small"
 msgstr "작게(&S)"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "크게(&B)"

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
@@ -373,6 +373,9 @@ msgstr "Mygtukų juos&ta"
 msgid "&Small"
 msgstr "Maž&i mygtukai"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Dideli mygtukai"
 

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
@@ -372,6 +372,9 @@ msgstr "Verkt&øylinje"
 msgid "&Small"
 msgstr "&Liten"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Stor"
 

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
@@ -418,6 +418,9 @@ msgstr "&T ميله ابزار "
 msgid "&Small"
 msgstr "&S کوچک "
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "&B بزرگ"

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
@@ -374,6 +374,9 @@ msgstr "Pasek narzędzi"
 msgid "&Small"
 msgstr "Mały"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "Duży"
 

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
@@ -374,6 +374,9 @@ msgstr "&Barra de ferramentas"
 msgid "&Small"
 msgstr "&Pequena"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Grande"
 

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
@@ -372,6 +372,9 @@ msgstr "Bară de unel&te"
 msgid "&Small"
 msgstr "&Mic"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "Ma&re"
 

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
@@ -375,6 +375,9 @@ msgstr "Па&нель инструментов"
 msgid "&Small"
 msgstr "&Мелкие значки"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Крупные значки"
 

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
@@ -415,6 +415,9 @@ msgstr "&Трака алата"
 msgid "&Small"
 msgstr "&Мала"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "&Велика"

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
@@ -417,6 +417,9 @@ msgstr "මෙවලම් තීරය"
 msgid "&Small"
 msgstr "කුඩා"
 
+msgid "&Medium"
+msgstr ""
+
 #, c-format
 msgid "&Big"
 msgstr "විශාල"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
@@ -373,6 +373,9 @@ msgstr "Lišta &nástrojov"
 msgid "&Small"
 msgstr "&Malá"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Veľká"
 

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
@@ -373,6 +373,9 @@ msgstr "&Orodna vrstica"
 msgid "&Small"
 msgstr "&Male"
 
+msgid "&Medium"
+msgstr ""
+
 msgid "&Big"
 msgstr "&Velike"