diff --git a/RedPandaIDE/colorschemes/Inky_Code_Aurora.scheme b/RedPandaIDE/colorschemes/MoLo_CBLight.scheme similarity index 100% rename from RedPandaIDE/colorschemes/Inky_Code_Aurora.scheme rename to RedPandaIDE/colorschemes/MoLo_CBLight.scheme diff --git a/RedPandaIDE/colorschemes/Inky_Code.scheme b/RedPandaIDE/colorschemes/MoLo_CodeBlack.scheme similarity index 100% rename from RedPandaIDE/colorschemes/Inky_Code.scheme rename to RedPandaIDE/colorschemes/MoLo_CodeBlack.scheme diff --git a/RedPandaIDE/themes/contrast.json b/RedPandaIDE/themes/contrast.json index 3c339774..35a0ada8 100644 --- a/RedPandaIDE/themes/contrast.json +++ b/RedPandaIDE/themes/contrast.json @@ -1,17 +1,17 @@ { "name":"Contrast", "name_pt_BR": "Contraste", - "name_zh_CN": "高对比度主题", - "name_zh_TW": "高對比度主題", + "name_zh_CN": "高对比度", + "name_zh_TW": "高對比度", "useQtFusionStyle": true, "isDark": true, "default scheme": "Twilight", - "default iconset": "contrast", + "default iconset": "contrast", "palette": { "PaletteWindow":"#000000", "PaletteWindowText":"#FFFFFF", - "PaletteBase":"#0A0A0A", - "PaletteAlternateBase":"#0F0F0F", + "PaletteBase":"#141414", + "PaletteAlternateBase":"#191919", "PaletteButton": "#141414", "PaletteButtonDisabled": "#141414", "PaletteBrightText": "#ff0000", @@ -25,11 +25,11 @@ "PaletteToolTipText":"#ffe7e7e7", "PaletteLink":"#ff007af4", "PaletteLinkVisited":"#ffa57aff", - "PaletteWindowDisabled":"#9DA9B5", + "PaletteWindowDisabled":"#0A0A0A", "PaletteWindowTextDisabled":"#9DA9B5", "PaletteHighlightDisabled":"#9DA9B5", "PaletteHighlightedTextDisabled":"#9DA9B5", - "PaletteBaseDisabled":"#0A0A0A", + "PaletteBaseDisabled":"#000000", "PaletteTextDisabled":"#9DA9B5", "PaletteMid": "#FFFFFF", "PaletteLight": "#505050", diff --git a/RedPandaIDE/themes/contrast.lua b/RedPandaIDE/themes/contrast.lua index 744550ff..3852ef13 100644 --- a/RedPandaIDE/themes/contrast.lua +++ b/RedPandaIDE/themes/contrast.lua @@ -15,8 +15,8 @@ return { ["palette"] = { PaletteWindow = "#000000", PaletteWindowText = "#FFFFFF", - PaletteBase = "#0A0A0A", - PaletteAlternateBase = "#0F0F0F", + PaletteBase = "#141414", + PaletteAlternateBase = "#191919", PaletteButton = "#141414", PaletteButtonDisabled = "#141414", PaletteBrightText = "#ff0000", @@ -30,11 +30,11 @@ return { PaletteToolTipText = "#e7e7e7", PaletteLink = "#007af4", PaletteLinkVisited = "#a57aff", - PaletteWindowDisabled = "#9DA9B5", + PaletteWindowDisabled = "#0A0A0A", PaletteWindowTextDisabled = "#9DA9B5", PaletteHighlightDisabled = "#9DA9B5", PaletteHighlightedTextDisabled = "#9DA9B5", - PaletteBaseDisabled = "#0A0A0A", + PaletteBaseDisabled = "#000000", PaletteTextDisabled = "#9DA9B5", PaletteMid = "#FFFFFF", PaletteLight = "#505050", diff --git a/RedPandaIDE/themes/dark.json b/RedPandaIDE/themes/dark.json index 31ed34c6..a1121153 100644 --- a/RedPandaIDE/themes/dark.json +++ b/RedPandaIDE/themes/dark.json @@ -1,8 +1,8 @@ { "name":"Dark", "name_pt_BR": "Escura", - "name_zh_CN": "深色主题", - "name_zh_TW": "深色主題", + "name_zh_CN": "深色", + "name_zh_TW": "深色", "useQtFusionStyle": true, "isDark": true, "default scheme": "VS Code", diff --git a/RedPandaIDE/themes/default.json b/RedPandaIDE/themes/default.json index fc2cbf13..83dd4df8 100644 --- a/RedPandaIDE/themes/default.json +++ b/RedPandaIDE/themes/default.json @@ -1,8 +1,8 @@ { "name":"Light", "name_pt_BR": "Clara", - "name_zh_CN": "浅色主题", - "name_zh_TW": "淺色主題", + "name_zh_CN": "浅色", + "name_zh_TW": "淺色", "useQtFusionStyle": true, "isDark": false, "default scheme": "Intellij Classic", diff --git a/RedPandaIDE/themes/inky_dark.json b/RedPandaIDE/themes/molo.json similarity index 87% rename from RedPandaIDE/themes/inky_dark.json rename to RedPandaIDE/themes/molo.json index 3210f495..ac18ec1e 100644 --- a/RedPandaIDE/themes/inky_dark.json +++ b/RedPandaIDE/themes/molo.json @@ -1,11 +1,11 @@ { - "name":"Inky dark", - "name_pt_BR": "Escuro como tinta", - "name_zh_CN": "墨落主题", - "name_zh_TW": "墨落主題", + "name":"MoLo", + "name_pt_BR": "Molo", + "name_zh_CN": "墨落", + "name_zh_TW": "墨落", "useQtFusionStyle": true, "isDark": true, - "default scheme": "Inky Code", + "default scheme": "MoLo CodeBlack", "default iconset": "newlook", "palette": { "PaletteWindow":"#000000", diff --git a/RedPandaIDE/themes/inky_dark.lua b/RedPandaIDE/themes/molo.lua similarity index 93% rename from RedPandaIDE/themes/inky_dark.lua rename to RedPandaIDE/themes/molo.lua index add3c238..9e5e0fef 100644 --- a/RedPandaIDE/themes/inky_dark.lua +++ b/RedPandaIDE/themes/molo.lua @@ -1,6 +1,6 @@ local nameMap = { - en_US = "Inky dark", - pt_BR = "Escuro como tinta", + en_US = "MoLo", + pt_BR = "Molo", zh_CN = "墨落", zh_TW = "墨落" } @@ -10,7 +10,7 @@ local lang = C_Desktop.language() return { ["name"] = nameMap[lang] or nameMap.en_US, ["style"] = "RedPandaDarkFusion", - ["default scheme"] = "Inky Code", + ["default scheme"] = "MoLo CodeBlack", ["default iconset"] = "newlook", ["palette"] = { PaletteWindow = "#000000", diff --git a/RedPandaIDE/themes/system.json b/RedPandaIDE/themes/system.json index 28cf0780..a3dafec1 100644 --- a/RedPandaIDE/themes/system.json +++ b/RedPandaIDE/themes/system.json @@ -1,8 +1,8 @@ { - "name":"Auto (follow system style and color)", - "name_pt_BR": "Auto (seguir estilo e cor do sistema)", - "name_zh_CN":"自动(跟随系统样式和颜色)", - "name_zh_TW":"自動(跟隨系統樣式和顏色)", + "name":"System Style and Color", + "name_pt_BR": "Estilo e Cor do Sistema", + "name_zh_CN":"跟随系统样式和颜色", + "name_zh_TW":"跟隨系統樣式和顏色", "useQtFusionStyle": false, "isDark": false, "default scheme": "Adaptive", diff --git a/RedPandaIDE/themes/system.lua b/RedPandaIDE/themes/system.lua index cd866bff..2fd0173c 100644 --- a/RedPandaIDE/themes/system.lua +++ b/RedPandaIDE/themes/system.lua @@ -79,17 +79,17 @@ function getPalette() end local nameMap = { - en_US = "Auto (follow system style and color)", - pt_BR = "Auto (seguir estilo e cor do sistema)", - zh_CN = "自动(跟随系统样式和颜色)", - zh_TW = "自動(跟隨系統樣式和顏色)" + en_US = "System Style and Color", + pt_BR = "Estilo e Cor do Sistema", + zh_CN = "跟随系统样式和颜色", + zh_TW = "跟隨系統樣式和顏色" } local nameMapNoStyle = { - en_US = "Auto (follow system color)", - pt_BR = "Auto (seguir cor do sistema)", - zh_CN = "自动(跟随系统颜色)", - zh_TW = "自動(跟隨系統顏色)" + en_US = "System Color", + pt_BR = "Cor do Sistema", + zh_CN = "跟随系统颜色", + zh_TW = "跟隨系統顏色" } local lang = C_Desktop.language() diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index ac341853..c4a20cce 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -324,8 +324,8 @@ - Auto (follow system style and color) - Auto (seguir estilo e cor do sistema) + System Theme + Estilo e Cor do Sistema diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 977b991f..300038ea 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -426,8 +426,8 @@ p, li { white-space: pre-wrap; } - Auto (follow system style and color) - 自动(跟随系统样式和颜色) + System Theme + 跟随系统样式和颜色 diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index de4fd0cf..c1d05c7b 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -233,8 +233,8 @@ - Auto (follow system style and color) - 自動(跟隨系統樣式和顏色) + System Theme + 跟隨系統樣式和顏色 diff --git a/RedPandaIDE/widgets/choosethemedialog.ui b/RedPandaIDE/widgets/choosethemedialog.ui index 072596a1..c27eb8b7 100644 --- a/RedPandaIDE/widgets/choosethemedialog.ui +++ b/RedPandaIDE/widgets/choosethemedialog.ui @@ -69,7 +69,7 @@ - Auto (follow system style and color) + System Theme