31 Mar
2019
31 Mar
'19
6:08 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5b4570d239d636179ea1…
commit d5b4570d239d636179ea19ab2c28b4db9777e97e
Author: Baruch Rutman <peterooch(a)gmail.com>
AuthorDate: Thu Mar 28 23:06:46 2019 +0200
Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Mar 31 20:08:25 2019 +0200
[RAPPS] Add themes category
Add category string to the rest of rc files
Update README
---
base/applications/rapps/README.ENG | 3 ++-
base/applications/rapps/README.RUS | 3 ++-
base/applications/rapps/gui.cpp | 5 +++++
base/applications/rapps/include/defines.h | 1 +
base/applications/rapps/include/resource.h | 2 ++
base/applications/rapps/lang/bg-BG.rc | 1 +
base/applications/rapps/lang/cs-CZ.rc | 1 +
base/applications/rapps/lang/de-DE.rc | 1 +
base/applications/rapps/lang/en-US.rc | 1 +
base/applications/rapps/lang/es-ES.rc | 1 +
base/applications/rapps/lang/et-EE.rc | 1 +
base/applications/rapps/lang/fr-FR.rc | 1 +
base/applications/rapps/lang/he-IL.rc | 1 +
base/applications/rapps/lang/it-IT.rc | 1 +
base/applications/rapps/lang/ja-JP.rc | 1 +
base/applications/rapps/lang/no-NO.rc | 1 +
base/applications/rapps/lang/pl-PL.rc | 1 +
base/applications/rapps/lang/pt-BR.rc | 1 +
base/applications/rapps/lang/ro-RO.rc | 1 +
base/applications/rapps/lang/ru-RU.rc | 1 +
base/applications/rapps/lang/sk-SK.rc | 1 +
base/applications/rapps/lang/sq-AL.rc | 1 +
base/applications/rapps/lang/sv-SE.rc | 1 +
base/applications/rapps/lang/tr-TR.rc | 1 +
base/applications/rapps/lang/uk-UA.rc | 1 +
base/applications/rapps/lang/zh-CN.rc | 1 +
base/applications/rapps/lang/zh-TW.rc | 1 +
base/applications/rapps/rapps.rc | 1 +
base/applications/rapps/res/cats/themes.ico | Bin 0 -> 2462 bytes
29 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/base/applications/rapps/README.ENG b/base/applications/rapps/README.ENG
index 208f0cf493..9e35dae6d7 100644
--- a/base/applications/rapps/README.ENG
+++ b/base/applications/rapps/README.ENG
@@ -78,7 +78,8 @@ List of valid categories:
12 - Tools
13 - Drivers
14 - Libraries
-15 - Other
+15 - Themes
+16 - Other
The official list of downloadable programs is kept on a public ReactOS server
and synced every time RAPPS is launched for the first time.
diff --git a/base/applications/rapps/README.RUS b/base/applications/rapps/README.RUS
index e81dabdb76..28a43c041d 100644
--- a/base/applications/rapps/README.RUS
+++ b/base/applications/rapps/README.RUS
@@ -45,7 +45,8 @@ Description =
12 - Tools
13 - Drivers
14 - Libraries
-15 - Other
+15 - Themes
+16 - Other
������ �������� �������� �� ������� � ����������� ��� ������ ��������� �������������!
��� ��������� ����� ������ �������� (�������� CAB-������), ����������� �� ������� �����
diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp
index b85e5fa92e..852be19bf1 100644
--- a/base/applications/rapps/gui.cpp
+++ b/base/applications/rapps/gui.cpp
@@ -802,6 +802,7 @@ private:
AddCategory(hRootItemAvailable, IDS_CAT_TOOLS, IDI_CAT_TOOLS);
AddCategory(hRootItemAvailable, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS);
AddCategory(hRootItemAvailable, IDS_CAT_LIBS, IDI_CAT_LIBS);
+ AddCategory(hRootItemAvailable, IDS_CAT_THEMES, IDI_CAT_THEMES);
AddCategory(hRootItemAvailable, IDS_CAT_OTHER, IDI_CAT_OTHER);
m_TreeView->SetImageList();
@@ -1136,6 +1137,10 @@ private:
UpdateApplicationsList(ENUM_CAT_VIDEO);
break;
+ case IDS_CAT_THEMES:
+ UpdateApplicationsList(ENUM_CAT_THEMES);
+ break;
+
case IDS_SELECTEDFORINST:
UpdateApplicationsList(ENUM_CAT_SELECTED);
break;
diff --git a/base/applications/rapps/include/defines.h
b/base/applications/rapps/include/defines.h
index 921391c5c7..cee17f6fad 100644
--- a/base/applications/rapps/include/defines.h
+++ b/base/applications/rapps/include/defines.h
@@ -49,6 +49,7 @@ enum AppsCategories
ENUM_CAT_TOOLS,
ENUM_CAT_DRIVERS,
ENUM_CAT_LIBS,
+ ENUM_CAT_THEMES,
ENUM_CAT_OTHER,
ENUM_CAT_SELECTED,
ENUM_ALL_INSTALLED,
diff --git a/base/applications/rapps/include/resource.h
b/base/applications/rapps/include/resource.h
index fcd1502f1a..b06a53cde0 100644
--- a/base/applications/rapps/include/resource.h
+++ b/base/applications/rapps/include/resource.h
@@ -31,6 +31,7 @@
#define IDI_CAT_SCIENCE 62
#define IDI_CAT_TOOLS 63
#define IDI_CAT_VIDEO 64
+#define IDI_CAT_THEMES 65
/* Bitmaps */
@@ -176,6 +177,7 @@
#define IDS_CAT_SCIENCE 712
#define IDS_CAT_TOOLS 713
#define IDS_CAT_VIDEO 714
+#define IDS_CAT_THEMES 715
/* App installation status */
#define IDS_STATUS_INSTALLED 800
diff --git a/base/applications/rapps/lang/bg-BG.rc
b/base/applications/rapps/lang/bg-BG.rc
index 3fbb5f420b..93fe7d9f35 100644
--- a/base/applications/rapps/lang/bg-BG.rc
+++ b/base/applications/rapps/lang/bg-BG.rc
@@ -182,6 +182,7 @@ BEGIN
IDS_CAT_SCIENCE "Наука"
IDS_CAT_TOOLS "Средства"
IDS_CAT_VIDEO "Видео"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/cs-CZ.rc
b/base/applications/rapps/lang/cs-CZ.rc
index 21eef64d9a..35b3907f33 100644
--- a/base/applications/rapps/lang/cs-CZ.rc
+++ b/base/applications/rapps/lang/cs-CZ.rc
@@ -183,6 +183,7 @@ BEGIN
IDS_CAT_SCIENCE "Věda"
IDS_CAT_TOOLS "Nástroje"
IDS_CAT_VIDEO "Video"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/de-DE.rc
b/base/applications/rapps/lang/de-DE.rc
index 749f3eb64b..0f043c3d77 100644
--- a/base/applications/rapps/lang/de-DE.rc
+++ b/base/applications/rapps/lang/de-DE.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_CAT_SCIENCE "Wissenschaft"
IDS_CAT_TOOLS "Werkzeuge"
IDS_CAT_VIDEO "Video"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/en-US.rc
b/base/applications/rapps/lang/en-US.rc
index 50f2ab1e95..26b24a3807 100644
--- a/base/applications/rapps/lang/en-US.rc
+++ b/base/applications/rapps/lang/en-US.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_CAT_SCIENCE "Science"
IDS_CAT_TOOLS "Tools"
IDS_CAT_VIDEO "Video"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/es-ES.rc
b/base/applications/rapps/lang/es-ES.rc
index 1a2e5e0b7b..0b3acfd1cf 100644
--- a/base/applications/rapps/lang/es-ES.rc
+++ b/base/applications/rapps/lang/es-ES.rc
@@ -181,6 +181,7 @@ BEGIN
IDS_CAT_SCIENCE "Ciencia"
IDS_CAT_TOOLS "Herramientas"
IDS_CAT_VIDEO "Vídeo"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/et-EE.rc
b/base/applications/rapps/lang/et-EE.rc
index 91a99108ad..46325c9499 100644
--- a/base/applications/rapps/lang/et-EE.rc
+++ b/base/applications/rapps/lang/et-EE.rc
@@ -186,6 +186,7 @@ BEGIN
IDS_CAT_SCIENCE "Teadus"
IDS_CAT_TOOLS "Tööriistad"
IDS_CAT_VIDEO "Video"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/fr-FR.rc
b/base/applications/rapps/lang/fr-FR.rc
index 6ed35f5836..ca69b6a4fa 100644
--- a/base/applications/rapps/lang/fr-FR.rc
+++ b/base/applications/rapps/lang/fr-FR.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_CAT_SCIENCE "Sciences"
IDS_CAT_TOOLS "Outils"
IDS_CAT_VIDEO "Vidéo"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/he-IL.rc
b/base/applications/rapps/lang/he-IL.rc
index 6eb11e73b1..0d37d8253c 100644
--- a/base/applications/rapps/lang/he-IL.rc
+++ b/base/applications/rapps/lang/he-IL.rc
@@ -184,6 +184,7 @@ BEGIN
IDS_CAT_SCIENCE "מדע"
IDS_CAT_TOOLS "כלים"
IDS_CAT_VIDEO "וידאו"
+ IDS_CAT_THEMES "ערכות נושא"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/it-IT.rc
b/base/applications/rapps/lang/it-IT.rc
index 689efdfe46..792cd76b39 100644
--- a/base/applications/rapps/lang/it-IT.rc
+++ b/base/applications/rapps/lang/it-IT.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_CAT_SCIENCE "Scienza"
IDS_CAT_TOOLS "Strumenti"
IDS_CAT_VIDEO "Video"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/ja-JP.rc
b/base/applications/rapps/lang/ja-JP.rc
index 227e07f5e0..6e780ca649 100644
--- a/base/applications/rapps/lang/ja-JP.rc
+++ b/base/applications/rapps/lang/ja-JP.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_CAT_SCIENCE "科学"
IDS_CAT_TOOLS "ツール"
IDS_CAT_VIDEO "ビデオ"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/no-NO.rc
b/base/applications/rapps/lang/no-NO.rc
index 5294e62c7d..dd21e562d9 100644
--- a/base/applications/rapps/lang/no-NO.rc
+++ b/base/applications/rapps/lang/no-NO.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_CAT_SCIENCE "Vitenskap"
IDS_CAT_TOOLS "Verktøy"
IDS_CAT_VIDEO "Filmer"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/pl-PL.rc
b/base/applications/rapps/lang/pl-PL.rc
index 787e8e8375..06671805cc 100644
--- a/base/applications/rapps/lang/pl-PL.rc
+++ b/base/applications/rapps/lang/pl-PL.rc
@@ -186,6 +186,7 @@ BEGIN
IDS_CAT_SCIENCE "Nauka"
IDS_CAT_TOOLS "Narzędzia"
IDS_CAT_VIDEO "Wideo"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/pt-BR.rc
b/base/applications/rapps/lang/pt-BR.rc
index f4f1ffde91..e2a5f8f5cd 100644
--- a/base/applications/rapps/lang/pt-BR.rc
+++ b/base/applications/rapps/lang/pt-BR.rc
@@ -180,6 +180,7 @@ BEGIN
IDS_CAT_SCIENCE "Ciência"
IDS_CAT_TOOLS "Ferramentas"
IDS_CAT_VIDEO "Vídeo"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/ro-RO.rc
b/base/applications/rapps/lang/ro-RO.rc
index c8a0734cc6..45bdbf7bca 100644
--- a/base/applications/rapps/lang/ro-RO.rc
+++ b/base/applications/rapps/lang/ro-RO.rc
@@ -187,6 +187,7 @@ BEGIN
IDS_CAT_SCIENCE "Știință"
IDS_CAT_TOOLS "Instrumente"
IDS_CAT_VIDEO "Video"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/ru-RU.rc
b/base/applications/rapps/lang/ru-RU.rc
index 9a631a39d3..a112c1a003 100644
--- a/base/applications/rapps/lang/ru-RU.rc
+++ b/base/applications/rapps/lang/ru-RU.rc
@@ -178,6 +178,7 @@ BEGIN
IDS_CAT_SCIENCE "Наука"
IDS_CAT_TOOLS "Инструменты"
IDS_CAT_VIDEO "Видео"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/sk-SK.rc
b/base/applications/rapps/lang/sk-SK.rc
index 4eaa41a38b..941a2cef9b 100644
--- a/base/applications/rapps/lang/sk-SK.rc
+++ b/base/applications/rapps/lang/sk-SK.rc
@@ -183,6 +183,7 @@ BEGIN
IDS_CAT_SCIENCE "Vedecké" // Science
IDS_CAT_TOOLS "Nástroje" // Tools
IDS_CAT_VIDEO "Video"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/sq-AL.rc
b/base/applications/rapps/lang/sq-AL.rc
index 8e2e338d18..4638eef3f7 100644
--- a/base/applications/rapps/lang/sq-AL.rc
+++ b/base/applications/rapps/lang/sq-AL.rc
@@ -182,6 +182,7 @@ BEGIN
IDS_CAT_SCIENCE "Skenca"
IDS_CAT_TOOLS "Vegla"
IDS_CAT_VIDEO "Video"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/sv-SE.rc
b/base/applications/rapps/lang/sv-SE.rc
index 56f06fe7e6..0ef7567171 100644
--- a/base/applications/rapps/lang/sv-SE.rc
+++ b/base/applications/rapps/lang/sv-SE.rc
@@ -185,6 +185,7 @@ BEGIN
IDS_CAT_SCIENCE "Vetenskap"
IDS_CAT_TOOLS "Verktyg"
IDS_CAT_VIDEO "Video"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/tr-TR.rc
b/base/applications/rapps/lang/tr-TR.rc
index ea6ad35aef..2c0ad27d6a 100644
--- a/base/applications/rapps/lang/tr-TR.rc
+++ b/base/applications/rapps/lang/tr-TR.rc
@@ -180,6 +180,7 @@ BEGIN
IDS_CAT_SCIENCE "Bilim"
IDS_CAT_TOOLS "Araçlar"
IDS_CAT_VIDEO "Video"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/uk-UA.rc
b/base/applications/rapps/lang/uk-UA.rc
index 08788f7e8b..f42d362424 100644
--- a/base/applications/rapps/lang/uk-UA.rc
+++ b/base/applications/rapps/lang/uk-UA.rc
@@ -186,6 +186,7 @@ BEGIN
IDS_CAT_SCIENCE "Наука"
IDS_CAT_TOOLS "Інструменти"
IDS_CAT_VIDEO "Відео"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/zh-CN.rc
b/base/applications/rapps/lang/zh-CN.rc
index 40ec00756d..7707fd5587 100644
--- a/base/applications/rapps/lang/zh-CN.rc
+++ b/base/applications/rapps/lang/zh-CN.rc
@@ -180,6 +180,7 @@ BEGIN
IDS_CAT_SCIENCE "科学"
IDS_CAT_TOOLS "工具"
IDS_CAT_VIDEO "视频"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/lang/zh-TW.rc
b/base/applications/rapps/lang/zh-TW.rc
index 3aeeb8ceff..8429e31c7d 100644
--- a/base/applications/rapps/lang/zh-TW.rc
+++ b/base/applications/rapps/lang/zh-TW.rc
@@ -180,6 +180,7 @@ BEGIN
IDS_CAT_SCIENCE "科學"
IDS_CAT_TOOLS "工具"
IDS_CAT_VIDEO "視訊"
+ IDS_CAT_THEMES "Themes"
END
STRINGTABLE
diff --git a/base/applications/rapps/rapps.rc b/base/applications/rapps/rapps.rc
index 6d104fc6b1..0defb465e3 100644
--- a/base/applications/rapps/rapps.rc
+++ b/base/applications/rapps/rapps.rc
@@ -40,6 +40,7 @@ IDI_CAT_OTHER ICON "res/cats/other.ico"
IDI_CAT_SCIENCE ICON "res/cats/science.ico"
IDI_CAT_TOOLS ICON "res/cats/tools.ico"
IDI_CAT_VIDEO ICON "res/cats/video.ico"
+IDI_CAT_THEMES ICON "res/cats/themes.ico"
IDI_SELECTEDFORINST ICON "res/select.ico"
/* Accelerators -- key bindings */
diff --git a/base/applications/rapps/res/cats/themes.ico
b/base/applications/rapps/res/cats/themes.ico
new file mode 100644
index 0000000000..a9320d6abe
Binary files /dev/null and b/base/applications/rapps/res/cats/themes.ico differ
2095
days inactive
2095
days old
0 comments
1 participants
participants (1)
-
Baruch Rutman