stash

Author: J-ZhengLi

locales/en-US.json

@@ -7,7 +7,10 @@
 	"ask_self_update": "a newer version of manager has been found: %{latest}\ncurrently running: %{current}\ndo you wish to update now?",
 	"ask_toolkit_update": "a newer version of toolkit has been found: %{latest}\ncurrently installed: %{current}\ndo you wish to update now?",
 	"ask_uninstall_option": "Choose an uninstall option",
+	"auto_check_manager_updates": "Auto-Check for Manager Updates",
+	"auto_check_toolkit_updates": "Auto-Check for Toolkit Updates",
 	"back": "Back",
+	"beta": "Beta",
 	"bin_crate": "binary crate",
 	"bin_crate_help": "binary crates are source code that can be compiled to executable binary, and can also be managed using `cargo` install or uninstall.",
 	"cancel": "Cancel",
@@ -55,6 +58,7 @@
 	"fetch_latest_toolkit_version_failed": "unable to retrieve information about the latest toolkit version",
 	"fetching": "fetching",
 	"finish": "Finish",
+	"general": "General",
 	"handling_extension_info": "%{op}ing extension '%{ext}' for program '%{program}'",
 	"insecure_download": "skipping SSL certificate verification (requested by `--insecure` flag)",
 	"insecure_http_override": "using 'http' schema to skip SSL certificate verification (requested by `--insecure` flag)",
@@ -84,13 +88,15 @@
 	"integers": "integers",
 	"invalid_components": "invalid component(s): %{list}",
 	"invalid_input": "Invalid input '%{actual}', expecting %{expect}, please try again",
+	"language": "Language",
 	"latest_manager_installed": "already running on the latest release version (%{version}), no need to update",
 	"latest_toolkit_installed": "already installed the latest toolkit (%{name}-%{version}), no need to update",
 	"license_agreement": "License Agreement",
 	"linux_source_hint": "Environment changes require restarting opened shells or run `%{cmd}` to take effect.",
 	"list_of_ids": "space separated integers less than %{bound}",
 	"list_option": "List component/toolkit",
 	"loading_archive_info": "extracting %{kind} archive '%{path}'",
+	"manager_update_channel": "Manager Update Channel",
 	"minimal": "Minimal",
 	"minimal_desc": "Contains only the required components sufficient to run Rust compiler, no other tools such as IDE are included",
 	"missing_restricted_source": "pacakge source of tool '%{name}' is restricted, which should be provided by user or has a default value, but none of those are presented",
@@ -171,6 +177,7 @@
 	"skip_version": "Skip This Version",
 	"source_configuration": "Source Configuration",
 	"space_separated_and": "space separated ",
+	"stable": "Stable",
 	"standalone_tool": "standalone tool",
 	"standalone_tool_help": "standalone tool has it's own `bin` directory, which contains a bunch of executables that will be automatically added to the PATH.",
 	"standard": "Standard",

locales/zh-CN.json

@@ -7,7 +7,10 @@
 	"ask_self_update": "检测到最新管理器版本: %{latest}\n当前运行版本: %{current}\n是否现在更新?",
 	"ask_toolkit_update": "检测到最新开发套件版本: %{latest}\n当前已安装: %{current}\n是否现在更新?",
 	"ask_uninstall_option": "卸载选项",
+	"auto_check_manager_updates": "自动检查此管理器更新",
+	"auto_check_toolkit_updates": "自动检查工具套件更新",
 	"back": "返回",
+	"beta": "Beta",
 	"bin_crate": "二进制crate",
 	"bin_crate_help": "二进制crate是可以编译成可执行二进制文件的源代码，也可以通过`cargo` install或uninstall进行管理。",
 	"cancel": "取消",
@@ -55,6 +58,7 @@
 	"fetch_latest_toolkit_version_failed": "无法获取最新工具套件版本",
 	"fetching": "正在获取",
 	"finish": "完成",
+	"general": "通用",
 	"handling_extension_info": "正在%{op} '%{program}' 的以下插件: '%{ext}'",
 	"insecure_download": "跳过 SSL 证书验证（根据命令行选项 'insecure' 的要求）",
 	"insecure_http_override": "使用 “http” 跳过 SSL 证书验证（根据命令行选项 'insecure' 的要求）",
@@ -84,13 +88,15 @@
 	"integers": "整数",
 	"invalid_components": "无效组件: %{list}",
 	"invalid_input": "无效的输入 '%{actual}'，正确格式应为%{expect}，请重试",
+	"language": "语言",
 	"latest_manager_installed": "当前管理工具已经是最新版本 (%{version}), 无需更新",
 	"latest_toolkit_installed": "已安装最新版本工具套件 (%{name}-%{version}), 无需更新",
 	"license_agreement": "许可协议",
 	"linux_source_hint": "环境变量更改后需要重启已打开的 Shell 或运行 `%{cmd}` 命令才能生效。",
 	"list_of_ids": "小于 %{bound} 的空格分隔整数序列",
 	"list_option": "显示组件/套件列表",
 	"loading_archive_info": "正在提取 %{kind} 压缩包 '%{path}'",
+	"manager_update_channel": "管理器更新频道",
 	"minimal": "精简版",
 	"minimal_desc": "仅包含运行 Rust 编译器所需的最基础组件，不包含集成开发环境等非必需工具",
 	"missing_restricted_source": "工具 '%{name}' 的安装包来源受限制，必须由用户明确提供或应具有默认值，但目前既未提供来源，也未设置默认值。",
@@ -171,6 +177,7 @@
 	"skip_version": "跳过此版本",
 	"source_configuration": "下载源配置",
 	"space_separated_and": "使用空格分隔并且",
+	"stable": "稳定版",
 	"standalone_tool": "独立工具",
 	"standalone_tool_help": "独立工具拥有自己的`bin`目录，其中包含一系列可执行文件，这些文件将自动添加到PATH环境变量中。",
 	"standard": "标准版",

rim_common/src/types/configuration.rs

@@ -64,7 +64,7 @@ impl Configuration {
     setter!(set_language(self.language, Option<Language>));
 }
 
-#[derive(Debug, Deserialize, Serialize, Default, PartialEq, Eq)]
+#[derive(Debug, Deserialize, Serialize, Default, PartialEq, Eq, Clone, Copy)]
 #[non_exhaustive]
 pub enum Language {
     CN,

rim_common/src/utils/mod.rs

@@ -19,7 +19,6 @@ pub use progress_bar::*;
 use std::{
     ffi::OsStr,
     path::{Path, PathBuf},
-    str::FromStr,
     sync::{LazyLock, Mutex},
     time::Duration,
 };
@@ -29,7 +28,7 @@ use url::Url;
 
 use crate::types::{Configuration, Language};
 
-static CURRENT_LOCALE: LazyLock<Mutex<String>> = LazyLock::new(|| Mutex::new(String::new()));
+static CURRENT_LOCALE: LazyLock<Mutex<Language>> = LazyLock::new(|| Mutex::new(Language::EN));
 
 /// Insert a `.exe` postfix to given input.
 ///
@@ -193,42 +192,43 @@ pub fn to_string_lossy<S: AsRef<OsStr>>(s: S) -> String {
 
 /// Use configured locale or detect system's current locale.
 pub fn use_current_locale() {
-    set_locale(&get_locale());
+    set_locale(get_locale());
 }
 
 /// Getting the current locale by:
 /// 1. Checking RIM configuration file, return the configured language if has.
 /// 2. Check system's current locale using [`sys_locale`] crate.
 /// 3. Fallback to english locale.
-pub fn get_locale() -> String {
+pub fn get_locale() -> Language {
     Configuration::try_load_from_config_dir()
         .and_then(|c| c.language)
-        .map(|lang| lang.locale_str().to_string())
-        .or_else(|| sys_locale::get_locale())
-        .unwrap_or_else(|| Language::EN.locale_str().to_string())
+        .or_else(|| sys_locale::get_locale().and_then(|s| s.parse().ok()))
+        .unwrap_or_default()
 }
 
-pub fn set_locale(loc: &str) {
+pub fn set_locale(lang: Language) {
+    let loc = lang.locale_str();
     rust_i18n::set_locale(loc);
 
     // update the current locale
-    *CURRENT_LOCALE.lock().unwrap() = loc.to_string();
-    // update persistant locale config, but don't fail the program,
+    *CURRENT_LOCALE.lock().unwrap() = lang;
+    // update persistent locale config, but don't fail the program,
     // because locale setting is not that critical.
     let set_locale_inner_ = || -> Result<()> {
         Configuration::load_from_config_dir()
-            .set_language(Some(Language::from_str(loc)?))
+            .set_language(Some(lang))
             .write()
     };
     if let Err(e) = set_locale_inner_() {
         error!("unable to save locale settings after changing to '{loc}': {e}");
     }
+    debug!("locale successfully set to: {loc}");
 }
 
 /// Get the configured locale string from `configuration.toml`
 pub fn build_cfg_locale(key: &str) -> &str {
     let cur_locale = &*CURRENT_LOCALE.lock().unwrap();
-    crate::cfg_locale!(cur_locale, key)
+    crate::cfg_locale!(cur_locale.locale_str(), key)
 }
 
 /// Waits until `duration` has elapsed.

rim_gui/src-tauri/src/common.rs

@@ -192,14 +192,13 @@ pub(crate) fn supported_languages() -> Vec<Language> {
 
 #[tauri::command]
 pub(crate) fn set_locale(language: String) -> Result<()> {
-    let lang: DisplayLanguage = language.parse()?;
-    utils::set_locale(lang.locale_str());
+    utils::set_locale(language.parse()?);
     Ok(())
 }
 
 #[tauri::command]
 pub(crate) fn get_locale() -> String {
-    utils::get_locale()
+    utils::get_locale().locale_str().into()
 }
 
 #[tauri::command]

rim_gui/src/components/BaseCard.vue

@@ -20,7 +20,7 @@ const props = defineProps({
     background: rgba(255, 255, 255, .1);
     border: 2px solid transparent;
     box-shadow: 0 0 0 2px rgba(255, 255, 255, .6), 0 16px 32px rgba(0, 0, 0, .12);
-    backdrop-filter: url(#frosted);
+    backdrop-filter: blur(25px);
     -webkit-backdrop-filter: blur(25px);
     outline: 0;
 }

rim_gui/src/components/BaseCheckBox.vue

@@ -1,11 +1,12 @@
 <script setup lang="ts">
-const { title, hint, disabled, isGroup, labelComponent, labelComponentProps } = defineProps<{
+const { title, hint, disabled, isGroup, labelComponent, labelComponentProps, labelAlignment } = defineProps<{
   title?: string;
   hint?: string;
   disabled?: boolean;
   isGroup?: boolean;
   labelComponent?: Object;
   labelComponentProps?: Object;
+  labelAlignment?: 'right' | 'left';
 }>();
 
 const emit = defineEmits(['titleClick']);
@@ -22,48 +23,77 @@ const toggleCheck = () => {
 </script>
 
 <template>
-  <label flex="inline items-center" :class="disabled ? 'c-disabled' : 'c-regular'" :title="hint || title" cursor-pointer>
-    <span class="checkbox"
-      :class="{
-        'c-active': isGroup,
-        'bg-active border-active': isChecked,
-        'bg-disabled-bg': disabled,
-        'hover:b-active': !disabled,
-        'cursor-not-allowed': disabled,
-      }" @click="toggleCheck">
-      <slot name="icon">
-        <i class="i-mdi:check" v-if="isChecked" c="active" />
-      </slot>
-    </span>
-    <span @click="emit('titleClick')" whitespace-nowrap>
-      <slot>
-        <component v-if="labelComponent" :is="labelComponent" v-bind="labelComponentProps" />
-        <span :class="isGroup ? 'cb-label-group' : 'cb-label'" v-else>{{ title }}</span>
-      </slot>
-    </span>
+  <label class="checkbox-wrapper" :class="disabled ? 'c-disabled' : 'c-regular'" :title="hint || title">
+    <template v-if="labelAlignment === 'left'">
+      <span @click="emit('titleClick')" whitespace-nowrap>
+        <slot>
+          <component v-if="labelComponent" :is="labelComponent" v-bind="labelComponentProps" />
+          <span :class="isGroup ? 'cb-label-group' : 'cb-label'" v-else>{{ title }}</span>
+        </slot>
+      </span>
+      <span class="checkbox"
+        :class="{
+          'c-active': isGroup,
+          'bg-active border-active': isChecked,
+          'bg-disabled-bg': disabled,
+          'hover:b-active': !disabled,
+          'cursor-not-allowed': disabled,
+        }" @click="toggleCheck">
+        <slot name="icon">
+          <i class="i-mdi:check" v-if="isChecked" c="active" />
+        </slot>
+      </span>
+    </template>
+
+    <template v-else>
+      <span class="checkbox"
+        :class="{
+          'c-active': isGroup,
+          'bg-active border-active': isChecked,
+          'bg-disabled-bg': disabled,
+          'hover:b-active': !disabled,
+          'cursor-not-allowed': disabled,
+        }" @click="toggleCheck">
+        <slot name="icon">
+          <i class="i-mdi:check" v-if="isChecked" c="active" />
+        </slot>
+      </span>
+      <span @click="emit('titleClick')" whitespace-nowrap>
+        <slot>
+          <component v-if="labelComponent" :is="labelComponent" v-bind="labelComponentProps" />
+          <span :class="isGroup ? 'cb-label-group' : 'cb-label'" v-else>{{ title }}</span>
+        </slot>
+      </span>
+    </template>
   </label>
 </template>
 
 <style lang="css" scoped>
+.checkbox-wrapper {
+  display: flex;
+  align-items: center;
+  gap: clamp(6px, 4%, 2rem);
+}
+
 .checkbox {
-  /** flex="~ items-center justify-center" h="1rem" w="1rem" b="1px solid base" shrink="0" rounded="3px" bg="white" */
   display: flex;
   align-items: center;
   justify-content: center;
-  min-width: 1rem;
-  min-height: 1rem;
+  min-width: 1.5vw;
+  min-height: 1.5vw;
+  margin-block: 0.5vh;
   background: white;
   border: 2px solid rgb(204, 204, 204);
   border-radius: 3px;
-  margin-right: clamp(6px, 4%, 2rem);
+  cursor: pointer;
 }
 .cb-label {
   font-weight: 500;
-  font-size: clamp(0.5rem, 2.6vh, 1.5rem);
+  font-size: clamp(0.5rem, 2.5vh, 1.5rem);
 }
 .cb-label-group {
   --uno: 'c-active';
   font-weight: bold;
-  font-size: clamp(0.5rem, 2.7vh, 1.5rem);
+  font-size: clamp(0.5rem, 2.6vh, 1.5rem);
 }
 </style>

rim_gui/src/components/BasePanel.vue

@@ -37,11 +37,12 @@ const emit = defineEmits(['close']);
     left: 0;
     width: 100vw;
     height: 100vh;
-    backdrop-filter: url(#frosted);
+    backdrop-filter: blur(25px);
     -webkit-backdrop-filter: blur(25px);
     display: flex;
     justify-content: center;
     align-items: center;
+    z-index: 999;
 }
 
 .panel-content {

rim_gui/src/components/BaseProgress.vue

@@ -29,7 +29,7 @@ function progressFormat(value: number) {
   overflow: hidden;
   background: rgba(255, 255, 255, .4);
   box-shadow: 0 0 0 2px rgba(255, 255, 255, .6), 0 16px 32px rgba(0, 0, 0, .12);
-  backdrop-filter: url(#frosted);
+  backdrop-filter: blur(25px);
   -webkit-backdrop-filter: blur(25px);
   outline: 0;
 }

rim_gui/src/components/BaseRadioGroup.vue

@@ -87,7 +87,7 @@ const alignmentClass = computed(() => `align-${props.alignment}`);
     border-radius: 4px;
     font-size: 12px;
     white-space: nowrap;
-    z-index: 100;
+    z-index: 999;
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
     pointer-events: none;
 }