refacing tab window model, support chrome like tab for #28.

Signed-off-by: Shawn <singlex@foxmail.com>
1Remote · Dec 6, 2020 · f33585d · f33585d
1 parent 484ebea
commit f33585d
Show file tree

Hide file tree

Showing 26 changed files with 1,316 additions and 356 deletions.
diff --git a/PRM.Core/Languages/en-us.json b/PRM.Core/Languages/en-us.json
@@ -64,22 +64,22 @@
 
   // system options
   "system_options_general_title": "General",
-  "system_options_general_item_language": "Language",
-  "system_options_general_item_start": "Startup",
-  "system_options_general_item_start_when_win_login": "Run automatically at OS startup",
-  "system_options_general_item_start_minimized": "Start minimized",
-  "system_options_general_item_server_order_by": "Server order by",
-  "system_options_general_item_server_order_by_name": "Server name",
-  "system_options_general_item_server_order_by_protocol": "Protocol",
-  "system_options_general_item_server_order_by_add_time_asc": "Add time asc",
-  "system_options_general_item_server_order_by_add_time_desc": "Add time desc",
-  "system_options_general_item_tab_mode": "Tab mode",
-  "system_options_general_item_tab_mode_new_to_latest": "Show new connection to latest tab",
-  "system_options_general_item_tab_mode_new_to_group": "Show new connection by group",
-  "system_options_general_item_tab_mode_new_to_protocol": "Show new connection by protocol",
-  "system_options_general_item_log_file_path": "Log file",
-  "system_options_general_item_icons_folder_path": "Custom icons",
-  "system_options_general_item_icons_folder_path_description": "Put your own server icons here",
+  "system_options_general_language": "Language",
+  "system_options_general_start": "Startup",
+  "system_options_general_start_when_win_login": "Run automatically at OS startup",
+  "system_options_general_start_minimized": "Start minimized",
+  "system_options_general_server_order_by": "Server order by",
+  "system_options_general_server_order_by_name": "Server name",
+  "system_options_general_server_order_by_protocol": "Protocol",
+  "system_options_general_server_order_by_add_time_asc": "Add time asc",
+  "system_options_general_server_order_by_add_time_desc": "Add time desc",
+  "system_options_general_tab_mode": "Tab mode",
+  "system_options_general_tab_mode_new_to_latest": "Show new connection to latest tab",
+  "system_options_general_tab_mode_new_to_group": "Show new connection by group",
+  "system_options_general_tab_mode_new_to_protocol": "Show new connection by protocol",
+  "system_options_general_log_file_path": "Log file",
+  "system_options_general_icons_folder_path": "Custom icons",
+  "system_options_general_icons_folder_path_description": "Put your own server icons here",
 
   "system_options_quick_title": "Quick connect",
   "system_options_quick_description": "Quick connect allow you hang up a quick connect bar by hot key, then you can type the keyword and start connection by press enter key",
@@ -112,20 +112,23 @@
   "system_options_data_security_error_rsa_private_key_not_found": "Can't find the RSA private key!",
   "system_options_data_security_error_rsa_private_key_not_match": "RSA private key not match the public key!",
 
-  "system_options_data_theme_title": "Theme",
-  "system_options_data_theme_prm_title": "Color Theme",
-  "system_options_data_theme_prm_theme": "Theme",
-  "system_options_data_theme_prm_reset": "Reset",
-  "system_options_data_theme_prm_main_color": "Color1",
-  "system_options_data_theme_prm_secondary_color": "Color2",
-  "system_options_data_theme_prm_background_color": "Background",
-  "system_options_data_theme_prm_color_normal": "Normal",
-  "system_options_data_theme_prm_color_lighter": "Lighter",
-  "system_options_data_theme_prm_color_darker": "Darker",
-  "system_options_data_theme_prm_color_foreground": "Font",
-  "system_options_data_theme_putty_title": "Putty",
-  "system_options_data_theme_putty_font_size": "Font Size",
-  "system_options_data_theme_putty_theme": "Color Themes",
+  "system_options_theme_title": "Theme",
+  "system_options_theme_prm_title": "Color Theme",
+  "system_options_theme_prm_theme": "Theme",
+  "system_options_theme_prm_reset": "Reset",
+  "system_options_theme_prm_main_color": "Color1",
+  "system_options_theme_prm_secondary_color": "Color2",
+  "system_options_theme_prm_background_color": "Background",
+  "system_options_theme_prm_color_normal": "Normal",
+  "system_options_theme_prm_color_lighter": "Lighter",
+  "system_options_theme_prm_color_darker": "Darker",
+  "system_options_theme_prm_color_foreground": "Font",
+  "system_options_theme_putty_title": "Putty",
+  "system_options_theme_putty_font_size": "Font Size",
+  "system_options_theme_putty_theme": "Color Themes",
+  "system_options_theme_tab_ui": "Tab UI",
+  "system_options_theme_tab_ui_chrome": "Chrome",
+  "system_options_theme_tab_ui_classical": "Classical",
 
 
   // server card operate

diff --git a/PRM.Core/Languages/en-us.xaml b/PRM.Core/Languages/en-us.xaml
diff --git a/PRM.Core/Languages/zh-cn.json b/PRM.Core/Languages/zh-cn.json
@@ -64,22 +64,22 @@
 
   // system options
   "system_options_general_title": "常规",
-  "system_options_general_item_language": "语言",
-  "system_options_general_item_start": "启动",
-  "system_options_general_item_start_when_win_login": "开机自启动",
-  "system_options_general_item_start_minimized": "启动时最小化到托盘",
-  "system_options_general_item_server_order_by": "服务器排序",
-  "system_options_general_item_server_order_by_name": "按名称",
-  "system_options_general_item_server_order_by_protocol": "按协议",
-  "system_options_general_item_server_order_by_add_time_asc": "按添加顺序",
-  "system_options_general_item_server_order_by_add_time_desc": "按添加顺序（倒序）",
-  "system_options_general_item_tab_mode": "Tab管理",
-  "system_options_general_item_tab_mode_new_to_latest": "显示远程连接到最新的Tab",
-  "system_options_general_item_tab_mode_new_to_group": "Tab按组显示远程连接",
-  "system_options_general_item_tab_mode_new_to_protocol": "Tab按远程协议显示远程连接",
-  "system_options_general_item_log_file_path": "日志文件",
-  "system_options_general_item_icons_folder_path": "客制化图标",
-  "system_options_general_item_icons_folder_path_description": "在此放置客制化备选图标",
+  "system_options_general_language": "语言",
+  "system_options_general_start": "启动",
+  "system_options_general_start_when_win_login": "开机自启动",
+  "system_options_general_start_minimized": "启动时最小化到托盘",
+  "system_options_general_server_order_by": "服务器排序",
+  "system_options_general_server_order_by_name": "按名称",
+  "system_options_general_server_order_by_protocol": "按协议",
+  "system_options_general_server_order_by_add_time_asc": "按添加顺序",
+  "system_options_general_server_order_by_add_time_desc": "按添加顺序（倒序）",
+  "system_options_general_tab_mode": "Tab管理",
+  "system_options_general_tab_mode_new_to_latest": "显示远程连接到最新的Tab",
+  "system_options_general_tab_mode_new_to_group": "Tab按组显示远程连接",
+  "system_options_general_tab_mode_new_to_protocol": "Tab按远程协议显示远程连接",
+  "system_options_general_log_file_path": "日志文件",
+  "system_options_general_icons_folder_path": "客制化图标",
+  "system_options_general_icons_folder_path_description": "在此放置客制化备选图标",
 
   "system_options_quick_title": "快速连接",
   "system_options_quick_description": "快速连接允许用户在桌面任何位置，通过快捷键唤起快速连接搜索框，键入关键字筛选所要连接的服务器，并按下回车开启远程连接。",
@@ -112,20 +112,23 @@
   "system_options_data_security_error_rsa_private_key_not_found": "找不到 RSA 私钥文件！",
   "system_options_data_security_error_rsa_private_key_not_match": "RSA 私钥公钥不匹配！",
 
-  "system_options_data_theme_title": "外观",
-  "system_options_data_theme_prm_title": "配色主题",
-  "system_options_data_theme_prm_theme": "主题",
-  "system_options_data_theme_prm_reset": "重置",
-  "system_options_data_theme_prm_main_color": "主色",
-  "system_options_data_theme_prm_secondary_color": "副色",
-  "system_options_data_theme_prm_background_color": "背景色",
-  "system_options_data_theme_prm_color_normal": "常规",
-  "system_options_data_theme_prm_color_lighter": "亮色",
-  "system_options_data_theme_prm_color_darker": "暗色",
-  "system_options_data_theme_prm_color_foreground": "字体",
-  "system_options_data_theme_putty_title": "Putty",
-  "system_options_data_theme_putty_font_size": "字体大小",
-  "system_options_data_theme_putty_theme": "主题",
+  "system_options_theme_title": "外观",
+  "system_options_theme_prm_title": "配色主题",
+  "system_options_theme_prm_theme": "主题",
+  "system_options_theme_prm_reset": "重置",
+  "system_options_theme_prm_main_color": "主色",
+  "system_options_theme_prm_secondary_color": "副色",
+  "system_options_theme_prm_background_color": "背景色",
+  "system_options_theme_prm_color_normal": "常规",
+  "system_options_theme_prm_color_lighter": "亮色",
+  "system_options_theme_prm_color_darker": "暗色",
+  "system_options_theme_prm_color_foreground": "字体",
+  "system_options_theme_putty_title": "Putty",
+  "system_options_theme_putty_font_size": "字体大小",
+  "system_options_theme_putty_theme": "主题",
+  "system_options_theme_tab_ui": "Tab外观",
+  "system_options_theme_tab_ui_chrome": "Chrome风格",
+  "system_options_theme_tab_ui_classical": "经典",
 
 
   // server card operate