From 2397171cf3f2455ecddd1c32c3251c10fc3be337 Mon Sep 17 00:00:00 2001 From: Dylan Smith Date: Wed, 17 Feb 2010 14:19:36 -0500 Subject: [PATCH] wordpad: Added text colour toolbar button. --- programs/wordpad/Da.rc | 24 +++++++++++++ programs/wordpad/De.rc | 24 +++++++++++++ programs/wordpad/En.rc | 24 +++++++++++++ programs/wordpad/Fr.rc | 24 +++++++++++++ programs/wordpad/Hu.rc | 24 +++++++++++++ programs/wordpad/It.rc | 24 +++++++++++++ programs/wordpad/Ja.rc | 24 +++++++++++++ programs/wordpad/Ko.rc | 24 +++++++++++++ programs/wordpad/Lt.rc | 24 +++++++++++++ programs/wordpad/Nl.rc | 24 +++++++++++++ programs/wordpad/No.rc | 24 +++++++++++++ programs/wordpad/Pl.rc | 24 +++++++++++++ programs/wordpad/Pt.rc | 24 +++++++++++++ programs/wordpad/Ru.rc | 24 +++++++++++++ programs/wordpad/Si.rc | 24 +++++++++++++ programs/wordpad/Sv.rc | 24 +++++++++++++ programs/wordpad/Tr.rc | 24 +++++++++++++ programs/wordpad/Uk.rc | 24 +++++++++++++ programs/wordpad/Zh.rc | 24 +++++++++++++ programs/wordpad/formatbar.bmp | Bin 1014 -> 1142 bytes programs/wordpad/wordpad.c | 62 ++++++++++++++++++++++++++++++--- programs/wordpad/wordpad.h | 21 +++++++++++ 22 files changed, 534 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc index 8d035955bd2..3c411a791b0 100644 --- a/programs/wordpad/Da.rc +++ b/programs/wordpad/Da.rc @@ -106,6 +106,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Sort", ID_COLOR_BLACK + MENUITEM "Mrkerd", ID_COLOR_MAROON + MENUITEM "Grn", ID_COLOR_GREEN + MENUITEM "Oliven" ID_COLOR_OLIVE + MENUITEM "Navy" ID_COLOR_NAVY + MENUITEM "Lilla" ID_COLOR_PURPLE + MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Gr" ID_COLOR_GRAY + MENUITEM "Slv" ID_COLOR_SILVER + MENUITEM "Rd" ID_COLOR_RED + MENUITEM "Lime" ID_COLOR_LIME + MENUITEM "Gul" ID_COLOR_YELLOW + MENUITEM "Bl" ID_COLOR_BLUE + MENUITEM "Violet" ID_COLOR_FUCHSIA + MENUITEM "Cyan" ID_COLOR_AQUA + MENUITEM "Hvid" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dato og tid" diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index eb006be21a7..e251f0e8348 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -108,6 +108,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Schwarz" ID_COLOR_BLACK + MENUITEM "Kastanienbraun" ID_COLOR_MAROON + MENUITEM "Grün" ID_COLOR_GREEN + MENUITEM "Olivgrün" ID_COLOR_OLIVE + MENUITEM "Dunkelblau" ID_COLOR_NAVY + MENUITEM "Lila" ID_COLOR_PURPLE + MENUITEM "Blaugrün" ID_COLOR_TEAL + MENUITEM "Grau" ID_COLOR_GRAY + MENUITEM "Silber" ID_COLOR_SILVER + MENUITEM "Rot" ID_COLOR_RED + MENUITEM "Hellgrün" ID_COLOR_LIME + MENUITEM "Gelb" ID_COLOR_YELLOW + MENUITEM "Blau" ID_COLOR_BLUE + MENUITEM "Pink" ID_COLOR_FUCHSIA + MENUITEM "Aquamarin" ID_COLOR_AQUA + MENUITEM "Weiß" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Datum und Uhrzeit" diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 7af40bda4b8..f7073d98bca 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -106,6 +106,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Black", ID_COLOR_BLACK + MENUITEM "Maroon", ID_COLOR_MAROON + MENUITEM "Green", ID_COLOR_GREEN + MENUITEM "Olive" ID_COLOR_OLIVE + MENUITEM "Navy" ID_COLOR_NAVY + MENUITEM "Purple" ID_COLOR_PURPLE + MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Gray" ID_COLOR_GRAY + MENUITEM "Silver" ID_COLOR_SILVER + MENUITEM "Red" ID_COLOR_RED + MENUITEM "Lime" ID_COLOR_LIME + MENUITEM "Yellow" ID_COLOR_YELLOW + MENUITEM "Blue" ID_COLOR_BLUE + MENUITEM "Fuchsia" ID_COLOR_FUCHSIA + MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "White" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 376d605595a..6e2748c29df 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -109,6 +109,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Noir" ID_COLOR_BLACK + MENUITEM "Marron" ID_COLOR_MAROON + MENUITEM "Vert" ID_COLOR_GREEN + MENUITEM "Olive" ID_COLOR_OLIVE + MENUITEM "Bleu marine" ID_COLOR_NAVY + MENUITEM "Pourpre" ID_COLOR_PURPLE + MENUITEM "Sarcelle" ID_COLOR_TEAL + MENUITEM "Gris" ID_COLOR_GRAY + MENUITEM "Argent" ID_COLOR_SILVER + MENUITEM "Rouge" ID_COLOR_RED + MENUITEM "Citron vert" ID_COLOR_LIME + MENUITEM "Jaune" ID_COLOR_YELLOW + MENUITEM "Bleu" ID_COLOR_BLUE + MENUITEM "Fuchsia" ID_COLOR_FUCHSIA + MENUITEM "Eau" ID_COLOR_AQUA + MENUITEM "Blanc" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date et heure" diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 1eeede3c8aa..d44185b6542 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -106,6 +106,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Black", ID_COLOR_BLACK + MENUITEM "Maroon", ID_COLOR_MAROON + MENUITEM "Green", ID_COLOR_GREEN + MENUITEM "Olive" ID_COLOR_OLIVE + MENUITEM "Navy" ID_COLOR_NAVY + MENUITEM "Purple" ID_COLOR_PURPLE + MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Gray" ID_COLOR_GRAY + MENUITEM "Silver" ID_COLOR_SILVER + MENUITEM "Red" ID_COLOR_RED + MENUITEM "Lime" ID_COLOR_LIME + MENUITEM "Yellow" ID_COLOR_YELLOW + MENUITEM "Blue" ID_COLOR_BLUE + MENUITEM "Fuchsia" ID_COLOR_FUCHSIA + MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "White" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/It.rc b/programs/wordpad/It.rc index 5957e0f227c..4425a2f9559 100644 --- a/programs/wordpad/It.rc +++ b/programs/wordpad/It.rc @@ -110,6 +110,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Nero" ID_COLOR_BLACK + MENUITEM "Marrone rossiccio" ID_COLOR_MAROON + MENUITEM "Verde" ID_COLOR_GREEN + MENUITEM "Verde oliva" ID_COLOR_OLIVE + MENUITEM "Blu oltremare" ID_COLOR_NAVY + MENUITEM "Propora" ID_COLOR_PURPLE + MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Grigio" ID_COLOR_GRAY + MENUITEM "Argento" ID_COLOR_SILVER + MENUITEM "Rosso" ID_COLOR_RED + MENUITEM "Verde cedro" ID_COLOR_LIME + MENUITEM "Giallo" ID_COLOR_YELLOW + MENUITEM "Blu" ID_COLOR_BLUE + MENUITEM "Fucsia" ID_COLOR_FUCHSIA + MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "Bianco" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Data e ora" diff --git a/programs/wordpad/Ja.rc b/programs/wordpad/Ja.rc index 475d54f70d0..0ab2c72392f 100644 --- a/programs/wordpad/Ja.rc +++ b/programs/wordpad/Ja.rc @@ -109,6 +109,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "黒" ID_COLOR_BLACK + MENUITEM "茶色" ID_COLOR_MAROON + MENUITEM "緑" ID_COLOR_GREEN + MENUITEM "オリーブ" ID_COLOR_OLIVE + MENUITEM "紺" ID_COLOR_NAVY + MENUITEM "紫" ID_COLOR_PURPLE + MENUITEM "青緑" ID_COLOR_TEAL + MENUITEM "灰色" ID_COLOR_GRAY + MENUITEM "銀色" ID_COLOR_SILVER + MENUITEM "赤" ID_COLOR_RED + MENUITEM "黄緑" ID_COLOR_LIME + MENUITEM "黄" ID_COLOR_YELLOW + MENUITEM "青" ID_COLOR_BLUE + MENUITEM "赤紫" ID_COLOR_FUCHSIA + MENUITEM "水色" ID_COLOR_AQUA + MENUITEM "白" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "日付と時刻" diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 20928221c02..f3a7a752359 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -107,6 +107,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "" ID_COLOR_BLACK + MENUITEM "" ID_COLOR_MAROON + MENUITEM "" ID_COLOR_GREEN + MENUITEM "ø" ID_COLOR_OLIVE + MENUITEM "£ " ID_COLOR_NAVY + MENUITEM "ȫ" ID_COLOR_PURPLE + MENUITEM " " ID_COLOR_TEAL + MENUITEM "ȸ" ID_COLOR_GRAY + MENUITEM "" ID_COLOR_SILVER + MENUITEM "" ID_COLOR_RED + MENUITEM "ӻ" ID_COLOR_LIME + MENUITEM "" ID_COLOR_YELLOW + MENUITEM "Ķ" ID_COLOR_BLUE + MENUITEM "ȫ" ID_COLOR_FUCHSIA + MENUITEM "" ID_COLOR_AQUA + MENUITEM "Ͼ" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "¥ ð" diff --git a/programs/wordpad/Lt.rc b/programs/wordpad/Lt.rc index cbf9eb2551a..6c838a094b1 100644 --- a/programs/wordpad/Lt.rc +++ b/programs/wordpad/Lt.rc @@ -109,6 +109,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Juoda" ID_COLOR_BLACK + MENUITEM "Kaštoninė" ID_COLOR_MAROON + MENUITEM "Žalia" ID_COLOR_GREEN + MENUITEM "Alyvinė" ID_COLOR_OLIVE + MENUITEM "Ultramarinas" ID_COLOR_NAVY + MENUITEM "Purpurinė" ID_COLOR_PURPLE + MENUITEM "Neutrali ciano" ID_COLOR_TEAL + MENUITEM "Pilka" ID_COLOR_GRAY + MENUITEM "Sidabrinė" ID_COLOR_SILVER + MENUITEM "Raudona" ID_COLOR_RED + MENUITEM "Gelsvai žalsva" ID_COLOR_LIME + MENUITEM "Geltona" ID_COLOR_YELLOW + MENUITEM "Mėlyna" ID_COLOR_BLUE + MENUITEM "Fuksija" ID_COLOR_FUCHSIA + MENUITEM "Žydra" ID_COLOR_AQUA + MENUITEM "Balta" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Data ir laikas" diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 581855eec98..106f4224fbb 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -107,6 +107,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Zwart" ID_COLOR_BLACK + MENUITEM "Kastanjebruin" ID_COLOR_MAROON + MENUITEM "Groen" ID_COLOR_GREEN + MENUITEM "Olijfgroen" ID_COLOR_OLIVE + MENUITEM "Marineblauw" ID_COLOR_NAVY + MENUITEM "Paars" ID_COLOR_PURPLE + MENUITEM "Groenblauw" ID_COLOR_TEAL + MENUITEM "Grijs" ID_COLOR_GRAY + MENUITEM "Zilver" ID_COLOR_SILVER + MENUITEM "Rood" ID_COLOR_RED + MENUITEM "Lichtgroen" ID_COLOR_LIME + MENUITEM "Geel" ID_COLOR_YELLOW + MENUITEM "Blauw" ID_COLOR_BLUE + MENUITEM "Fuchsiapaars" ID_COLOR_FUCHSIA + MENUITEM "Zeeblauw" ID_COLOR_AQUA + MENUITEM "Wit" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Datum en tijd" diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 9b372bc0701..333a2921193 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -108,6 +108,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Svart" ID_COLOR_BLACK + MENUITEM "Rødbrun" ID_COLOR_MAROON + MENUITEM "Grønn" ID_COLOR_GREEN + MENUITEM "Oliven" ID_COLOR_OLIVE + MENUITEM "Marineblå" ID_COLOR_NAVY + MENUITEM "Purpur" ID_COLOR_PURPLE + MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Grå" ID_COLOR_GRAY + MENUITEM "Sølv" ID_COLOR_SILVER + MENUITEM "Rød" ID_COLOR_RED + MENUITEM "Lime-grønn" ID_COLOR_LIME + MENUITEM "Gul" ID_COLOR_YELLOW + MENUITEM "Blå" ID_COLOR_BLUE + MENUITEM "Fuchsia" ID_COLOR_FUCHSIA + MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "Hvit" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dato og klokkeslett" diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 97d7288bc4c..8d429127c77 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -107,6 +107,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Czarny" ID_COLOR_BLACK + MENUITEM "Kasztanowy" ID_COLOR_MAROON + MENUITEM "Zielony" ID_COLOR_GREEN + MENUITEM "Oliwkowy" ID_COLOR_OLIVE + MENUITEM "Granatowy" ID_COLOR_NAVY + MENUITEM "Purpurowy" ID_COLOR_PURPLE + MENUITEM "Zielonomodry" ID_COLOR_TEAL + MENUITEM "Szary" ID_COLOR_GRAY + MENUITEM "Srebrny" ID_COLOR_SILVER + MENUITEM "Czerwony" ID_COLOR_RED + MENUITEM "Limonowy" ID_COLOR_LIME + MENUITEM "ty" ID_COLOR_YELLOW + MENUITEM "Niebieski" ID_COLOR_BLUE + MENUITEM "Fuksja" ID_COLOR_FUCHSIA + MENUITEM "Akwamaryna" ID_COLOR_AQUA + MENUITEM "Biay" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Data i godzina" diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index d22f0625182..aeb69ee8004 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -110,6 +110,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Preto" ID_COLOR_BLACK + MENUITEM "Castanho" ID_COLOR_MAROON + MENUITEM "Verde" ID_COLOR_GREEN + MENUITEM "Verde-oliva" ID_COLOR_OLIVE + MENUITEM "Azul-marinho" ID_COLOR_NAVY + MENUITEM "Roxo" ID_COLOR_PURPLE + MENUITEM "Azul-petróleo" ID_COLOR_TEAL + MENUITEM "Cinza" ID_COLOR_GRAY + MENUITEM "Prateado" ID_COLOR_SILVER + MENUITEM "Vermelho" ID_COLOR_RED + MENUITEM "Verde-limão" ID_COLOR_LIME + MENUITEM "Amarelo" ID_COLOR_YELLOW + MENUITEM "Azul" ID_COLOR_BLUE + MENUITEM "Fúcsia" ID_COLOR_FUCHSIA + MENUITEM "Azul-piscina" ID_COLOR_AQUA + MENUITEM "Branco" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Data e hora" diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 61bf5551c03..2495f3f9758 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -109,6 +109,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Чёрный" ID_COLOR_BLACK + MENUITEM "Тёмно-бордовый" ID_COLOR_MAROON + MENUITEM "Зелёный" ID_COLOR_GREEN + MENUITEM "Оливковый" ID_COLOR_OLIVE + MENUITEM "Тёмно-синий" ID_COLOR_NAVY + MENUITEM "Пурпурный" ID_COLOR_PURPLE + MENUITEM "Морской волны" ID_COLOR_TEAL + MENUITEM "Серый" ID_COLOR_GRAY + MENUITEM "Серебряный" ID_COLOR_SILVER + MENUITEM "Красный" ID_COLOR_RED + MENUITEM "Лимонный" ID_COLOR_LIME + MENUITEM "Жёлтый" ID_COLOR_YELLOW + MENUITEM "Синий" ID_COLOR_BLUE + MENUITEM "Ярко-розовый" ID_COLOR_FUCHSIA + MENUITEM "Голубой" ID_COLOR_AQUA + MENUITEM "Белый" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Дата и время" diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index cd80537a147..0047b643cfd 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -108,6 +108,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Črna" ID_COLOR_BLACK + MENUITEM "Kostanjeva" ID_COLOR_MAROON + MENUITEM "Zelena" ID_COLOR_GREEN + MENUITEM "Olivna" ID_COLOR_OLIVE + MENUITEM "Mornariška" ID_COLOR_NAVY + MENUITEM "Vijolična" ID_COLOR_PURPLE + MENUITEM "Zelenomodra" ID_COLOR_TEAL + MENUITEM "Siva" ID_COLOR_GRAY + MENUITEM "Srebrna" ID_COLOR_SILVER + MENUITEM "Rdeča" ID_COLOR_RED + MENUITEM "Citronska" ID_COLOR_LIME + MENUITEM "Rumena" ID_COLOR_YELLOW + MENUITEM "Modra" ID_COLOR_BLUE + MENUITEM "Roza" ID_COLOR_FUCHSIA + MENUITEM "Akvamarin" ID_COLOR_AQUA + MENUITEM "Bela" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Datum in čas" diff --git a/programs/wordpad/Sv.rc b/programs/wordpad/Sv.rc index 51b19079246..5e5b0f13cf0 100644 --- a/programs/wordpad/Sv.rc +++ b/programs/wordpad/Sv.rc @@ -108,6 +108,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Svart" ID_COLOR_BLACK + MENUITEM "Rödbrun" ID_COLOR_MAROON + MENUITEM "Grön" ID_COLOR_GREEN + MENUITEM "Oliv" ID_COLOR_OLIVE + MENUITEM "Navy" ID_COLOR_NAVY + MENUITEM "Lila" ID_COLOR_PURPLE + MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Grå" ID_COLOR_GRAY + MENUITEM "Silver" ID_COLOR_SILVER + MENUITEM "Röd" ID_COLOR_RED + MENUITEM "Lime" ID_COLOR_LIME + MENUITEM "Gul" ID_COLOR_YELLOW + MENUITEM "Blå" ID_COLOR_BLUE + MENUITEM "Fuchsia" ID_COLOR_FUCHSIA + MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "Vit" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Datum och tid" diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index e8d9f982ffb..e0e9dd1ab64 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -108,6 +108,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Siyah" ID_COLOR_BLACK + MENUITEM "Koyu Krmz" ID_COLOR_MAROON + MENUITEM "Yeil" ID_COLOR_GREEN + MENUITEM "Koyu Sar" ID_COLOR_OLIVE + MENUITEM "Koyu Mavi" ID_COLOR_NAVY + MENUITEM "Mor" ID_COLOR_PURPLE + MENUITEM "Deniz Mavisi" ID_COLOR_TEAL + MENUITEM "Gri" ID_COLOR_GRAY + MENUITEM "Gm" ID_COLOR_SILVER + MENUITEM "Krmz" ID_COLOR_RED + MENUITEM "Parlak Yeil" ID_COLOR_LIME + MENUITEM "Sar" ID_COLOR_YELLOW + MENUITEM "Mavi" ID_COLOR_BLUE + MENUITEM "Pembe" ID_COLOR_FUCHSIA + MENUITEM "Turkuaz" ID_COLOR_AQUA + MENUITEM "Beyaz" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Date and time" diff --git a/programs/wordpad/Uk.rc b/programs/wordpad/Uk.rc index 5e507e1b8cc..de5588607be 100644 --- a/programs/wordpad/Uk.rc +++ b/programs/wordpad/Uk.rc @@ -113,6 +113,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "×îðíèé" ID_COLOR_BLACK + MENUITEM "Áðóíàòíèé" ID_COLOR_MAROON + MENUITEM "Çåëåíèé" ID_COLOR_GREEN + MENUITEM "Îëèâêîâèé" ID_COLOR_OLIVE + MENUITEM "Ñèí³é" ID_COLOR_NAVY + MENUITEM "Ïóðïóðíèé" ID_COLOR_PURPLE + MENUITEM "Çåëåíî-ñèí³é" ID_COLOR_TEAL + MENUITEM "ѳðèé" ID_COLOR_GRAY + MENUITEM "Ñð³áíèé" ID_COLOR_SILVER + MENUITEM "×åðâîíèé" ID_COLOR_RED + MENUITEM "Ñàëàòîâèé" ID_COLOR_LIME + MENUITEM "Æîâòèé" ID_COLOR_YELLOW + MENUITEM "Ãîëóáèé" ID_COLOR_BLUE + MENUITEM "Ô³îëåòîâèé" ID_COLOR_FUCHSIA + MENUITEM "Àêâàìàðèí" ID_COLOR_AQUA + MENUITEM "Á³ëèé" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Дата та час" diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 047f998c207..989bd23ac05 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -111,6 +111,30 @@ BEGIN END END +IDM_COLOR_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Black", ID_COLOR_BLACK + MENUITEM "Maroon", ID_COLOR_MAROON + MENUITEM "Green", ID_COLOR_GREEN + MENUITEM "Olive" ID_COLOR_OLIVE + MENUITEM "Navy" ID_COLOR_NAVY + MENUITEM "Purple" ID_COLOR_PURPLE + MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Gray" ID_COLOR_GRAY + MENUITEM "Silver" ID_COLOR_SILVER + MENUITEM "Red" ID_COLOR_RED + MENUITEM "Lime" ID_COLOR_LIME + MENUITEM "Yellow" ID_COLOR_YELLOW + MENUITEM "Blue" ID_COLOR_BLUE + MENUITEM "Fuchsia" ID_COLOR_FUCHSIA + MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "White" ID_COLOR_WHITE + MENUITEM "Automatic" ID_COLOR_AUTOMATIC + END +END + IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "日期和时间" diff --git a/programs/wordpad/formatbar.bmp b/programs/wordpad/formatbar.bmp index 9c643b11b9783be297bc99766d29b5e4d74a520e..310b596d92a7dfbca7ebad7815c1a289a3a526e5 100644 GIT binary patch delta 227 zcmeyy{*A-f$+wJ!0SwB3qy`W-0I>iNGcrIWfRqq71cSr{CK~rnoWL>h02^b&0;$j1rT@nSe~7C=*bW$#UW~vB~d%OmSwgf^uew$= ID_COLOR_FIRST && mid <= ID_COLOR_AUTOMATIC) + { + CHARFORMAT2W fmt; + + ZeroMemory(&fmt, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + SendMessageW(hwndEditor, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); + + fmt.dwMask = CFM_COLOR; + + if (mid < ID_COLOR_AUTOMATIC) { + fmt.crTextColor = textcolors[mid - ID_COLOR_FIRST]; + fmt.dwEffects &= ~CFE_AUTOCOLOR; + } else { + fmt.dwEffects |= CFE_AUTOCOLOR; + } + + SendMessageW(hwndEditor, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); + } + break; + } + case ID_EDIT_CUT: PostMessageW(hwndEditor, WM_CUT, 0, 0); break; @@ -2618,6 +2669,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar set_bar_states(); set_fileformat(SF_RTF); hPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_POPUP)); + hColorPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_COLOR_POPUP)); get_default_printer_opts(); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]); diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 269f3a291d7..5c70c3e500a 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -80,6 +80,7 @@ #define ID_FORMAT_BOLD 1400 #define ID_FORMAT_ITALIC 1401 #define ID_FORMAT_UNDERLINE 1402 +#define ID_FORMAT_COLOR 1403 #define ID_TOGGLE_TOOLBAR 1500 #define ID_TOGGLE_FORMATBAR 1501 @@ -133,6 +134,25 @@ #define ID_ABOUT 1603 #define ID_VIEWPROPERTIES 1604 +#define ID_COLOR_FIRST 1800 +#define ID_COLOR_BLACK 1800 +#define ID_COLOR_MAROON 1801 +#define ID_COLOR_GREEN 1802 +#define ID_COLOR_OLIVE 1803 +#define ID_COLOR_NAVY 1804 +#define ID_COLOR_PURPLE 1805 +#define ID_COLOR_TEAL 1806 +#define ID_COLOR_GRAY 1807 +#define ID_COLOR_SILVER 1808 +#define ID_COLOR_RED 1809 +#define ID_COLOR_LIME 1810 +#define ID_COLOR_YELLOW 1811 +#define ID_COLOR_BLUE 1812 +#define ID_COLOR_FUCHSIA 1813 +#define ID_COLOR_AQUA 1814 +#define ID_COLOR_WHITE 1815 +#define ID_COLOR_AUTOMATIC 1816 + #define IDC_STATUSBAR 2000 #define IDC_EDITOR 2001 #define IDC_TOOLBAR 2002 @@ -159,6 +179,7 @@ #define IDM_MAINMENU 2200 #define IDM_POPUP 2201 +#define IDM_COLOR_POPUP 2202 #define IDB_TOOLBAR 100 #define IDB_FORMATBAR 101