Compare commits
	
		
			No commits in common. "c58238831749be4415abe035748dbb85962edef2" and "7e2281add12b3b1f936937df6960d579e9b5455f" have entirely different histories.
		
	
	
		
			c582388317
			...
			7e2281add1
		
	
		
| @ -188,6 +188,11 @@ class CommandBar extends Component<IMixinSettingProps & IMixinStatusProps, IComm | |||||||
|                         this.props.status ? this.props.status.newLabel() : undefined; |                         this.props.status ? this.props.status.newLabel() : undefined; | ||||||
|                     }} |                     }} | ||||||
|                 /> |                 /> | ||||||
|  | 
 | ||||||
|  |                 <CommandButton | ||||||
|  |                     iconName="Camera" | ||||||
|  |                     i18NKey="Command.Bar.Camera.Info" | ||||||
|  |                 /> | ||||||
|             </div> |             </div> | ||||||
|             <div> |             <div> | ||||||
|                 <CommandButton |                 <CommandButton | ||||||
|  | |||||||
| @ -3,6 +3,4 @@ | |||||||
| div.setting-popup { | div.setting-popup { | ||||||
| 	width: 100%; | 	width: 100%; | ||||||
| 	height: 100%; | 	height: 100%; | ||||||
| 	box-sizing: border-box; |  | ||||||
| 	padding: 10px; |  | ||||||
| } | } | ||||||
| @ -2,11 +2,8 @@ import { Component, ReactNode } from "react"; | |||||||
| import { Popup } from "@Context/Popups"; | import { Popup } from "@Context/Popups"; | ||||||
| import { Theme } from "@Component/Theme/Theme"; | import { Theme } from "@Component/Theme/Theme"; | ||||||
| import { Localization } from "@Component/Localization/Localization"; | import { Localization } from "@Component/Localization/Localization"; | ||||||
| import { useSettingWithEvent, IMixinSettingProps, Themes } from "@Context/Setting"; |  | ||||||
| import { ComboInput } from "@Input/ComboInput/ComboInput"; |  | ||||||
| import "./SettingPopup.scss"; | import "./SettingPopup.scss"; | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| interface ISettingPopupProps { | interface ISettingPopupProps { | ||||||
| 
 | 
 | ||||||
| } | } | ||||||
| @ -27,42 +24,10 @@ class SettingPopup extends Popup<ISettingPopupProps> { | |||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @useSettingWithEvent("themes", "language") | class SettingPopupComponent extends Component<ISettingPopupProps> { | ||||||
| class SettingPopupComponent extends Component<ISettingPopupProps & IMixinSettingProps> { |  | ||||||
| 
 | 
 | ||||||
| 	public render(): ReactNode { | 	public render(): ReactNode { | ||||||
| 		return <Theme className="setting-popup"> | 		return <Theme className="setting-popup"></Theme> | ||||||
| 
 |  | ||||||
| 			<ComboInput |  | ||||||
| 				keyI18n="Language" |  | ||||||
| 				allOption={[ |  | ||||||
| 					{ key: "EN_US", i18n: "EN_US" }, |  | ||||||
| 					{ key: "ZH_CN", i18n: "ZH_CN" } |  | ||||||
| 				]} |  | ||||||
| 				value={{ |  | ||||||
| 					key: this.props.setting?.language ?? "EN_US", |  | ||||||
| 					i18n: this.props.setting?.language ?? "EN_US" |  | ||||||
| 				}} |  | ||||||
| 				valueChange={(data) => { |  | ||||||
| 					this.props.setting?.setProps("language", data.key as any); |  | ||||||
| 				}} |  | ||||||
| 			/> |  | ||||||
| 
 |  | ||||||
| 			<ComboInput |  | ||||||
| 				keyI18n="Themes" |  | ||||||
| 				allOption={[ |  | ||||||
| 					{ key: Themes.dark as any, i18n: "Themes.Dark" }, |  | ||||||
| 					{ key: Themes.light as any, i18n: "Themes.Light" } |  | ||||||
| 				]} |  | ||||||
| 				value={{ |  | ||||||
| 					key: this.props.setting?.themes ?? Themes.dark as any, |  | ||||||
| 					i18n: this.props.setting?.themes === Themes.dark ? "Themes.Dark" : "Themes.Light" |  | ||||||
| 				}} |  | ||||||
| 				valueChange={(data) => { |  | ||||||
| 					this.props.setting?.setProps("themes", parseInt(data.key)); |  | ||||||
| 				}} |  | ||||||
| 			/> |  | ||||||
| 		</Theme> |  | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,10 +1,6 @@ | |||||||
| const EN_US = { | const EN_US = { | ||||||
|     "Language": "Language", |  | ||||||
|     "EN_US": "English (US)", |     "EN_US": "English (US)", | ||||||
|     "ZH_CN": "Chinese (Simplified)", |     "ZH_CN": "Chinese (Simplified)", | ||||||
|     "Themes": "Themes", |  | ||||||
|     "Themes.Dark": "Dark", |  | ||||||
|     "Themes.Light": "Light", |  | ||||||
|     "Header.Bar.Title": "Living Together | Emulator", |     "Header.Bar.Title": "Living Together | Emulator", | ||||||
|     "Header.Bar.Title.Info": "Group Behavior Research Emulator", |     "Header.Bar.Title.Info": "Group Behavior Research Emulator", | ||||||
|     "Header.Bar.File.Name.Info": "{file} ({status})", |     "Header.Bar.File.Name.Info": "{file} ({status})", | ||||||
|  | |||||||
| @ -1,10 +1,6 @@ | |||||||
| const ZH_CN = { | const ZH_CN = { | ||||||
|     "Language": "语言", |  | ||||||
|     "EN_US": "英语 (美国)", |     "EN_US": "英语 (美国)", | ||||||
|     "ZH_CN": "中文 (简体)", |     "ZH_CN": "中文 (简体)", | ||||||
|     "Themes": "主题", |  | ||||||
|     "Themes.Dark": "黑暗", |  | ||||||
|     "Themes.Light": "亮色", |  | ||||||
|     "Header.Bar.Title": "群生共进 | 仿真器", |     "Header.Bar.Title": "群生共进 | 仿真器", | ||||||
|     "Header.Bar.Title.Info": "群体行为研究仿真器", |     "Header.Bar.Title.Info": "群体行为研究仿真器", | ||||||
|     "Header.Bar.File.Name.Info": "{file} ({status})", |     "Header.Bar.File.Name.Info": "{file} ({status})", | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user