|  | ffaa91ca9a | Merge remote-tracking branch 'origin/release-v1.1.12' into feature-I7XXVS # Conflicts:
#	src/main/java/module-info.java
#	src/main/java/org/jcnc/jnotepad/LunchApp.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/NewFile.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/RenameFile.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveFile.java
#	src/main/java/org/jcnc/jnotepad/root/RootBorderPane.java
#	src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVBox.java
#	src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java
#	src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVBox.java
#	src/main/java/org/jcnc/jnotepad/root/top/RootTopBorderPane.java
#	src/main/java/org/jcnc/jnotepad/tool/SingletonUtil.java
#	src/main/java/org/jcnc/jnotepad/tool/UiUtil.java
#	src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java | 2023-09-02 12:43:41 +08:00 |  | 
			
				
					|  | f7543c2a64 | 优化项目doc注释和符合规范 | 2023-09-02 01:08:38 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | 29c3a59b34 | ♻️ 重构代码 移除Ui单例于Ui工具类 | 2023-09-02 00:06:59 +08:00 |  | 
			
				
					|  | 7ff5233b9c | !62 fix: #I7XN52优化设置页面UI Merge pull request !62 from Luke/dev | 2023-08-31 18:29:49 +00:00 |  | 
			
				
					|  | e7fd2213e7 | 优化设置页面的样式 | 2023-09-01 02:24:08 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | d995b9c8af | refactor: #I7XMJG 工厂使用单例模式 | 2023-08-31 22:47:07 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | 03c2363b1e | ♻️ 重构代码 优化 文件选择对话框的创建逻辑 | 2023-08-31 22:09:53 +08:00 |  | 
			
				
					|  | 3bd945a2e6 | 重构ui代码 | 2023-08-31 01:42:05 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 757a0e233b | refactor: 封装保存为指定文件方法 | 2023-08-30 22:59:03 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 8853866742 | fix: 修复另存时可能保存失败的bug | 2023-08-30 22:46:52 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | 3a8b939cbe | ⚡️ 优化代码逻辑 | 2023-08-30 13:38:04 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | 4db5107d81 | Merge branch 'release-v1.1.12' of https://gitee.com/jcnc-org/JNotepad into develop # Conflicts:
#	src/main/java/org/jcnc/jnotepad/ui/setStage/SetStage.java | 2023-08-30 12:34:24 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | e1a058d891 | ⚡️ 优化代码逻辑 | 2023-08-30 12:31:52 +08:00 |  | 
			
				
					|  | a316425ab0 | 增加注释 | 2023-08-30 11:38:05 +08:00 |  | 
			
				
					|  | 3add6372ab | 移除了重复定义的 contentDisplay 变量。 | 2023-08-30 10:19:10 +08:00 |  | 
			
				
					|  | 442c7ebee6 | 增加设置页面 | 2023-08-30 05:24:24 +08:00 |  | 
			
				
					|  | dc7ead7d8d | 增加设置按钮 | 2023-08-30 04:15:56 +08:00 |  | 
			
				
					|  | 69922ea846 | 增加设置按钮 | 2023-08-30 04:12:49 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | 6164698dd7 | 🚩 添加重命名功能 | 2023-08-29 23:21:01 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | 5cda1ddf87 | 🚩 添加使用系统文件选择器时显示应用图标 | 2023-08-29 14:22:54 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | 8f4448bac2 | 💡 添加或修改源代码注释⚡️ 优化代码逻辑 | 2023-08-28 23:38:08 +08:00 |  | 
			
				
					|  | 7ea8630f2c | 修复输入框向下滑动的bug | 2023-08-28 00:08:48 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 6ff1af20dc | refactor: 解耦ResourceBundle和LocalizationController | 2023-08-27 22:07:14 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | feb364eae0 | refactor: 删除重复功能代码 | 2023-08-27 21:58:44 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 50aea7774e | refactor: 统一配置入口 | 2023-08-27 21:49:16 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | a9dd2e21c5 | ⚡️ 优化代码 🗑️ 清理无效的代码 | 2023-08-27 17:59:31 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 2f78ab6632 | refactor: #I7W8LM 国际化和本地化使用i18n | 2023-08-27 16:37:13 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | ab2030a0e2 | 🐛 修复 BUG 当切换语言时,下方状态栏无法切换的bug,⚡️ 优化 切换语言的逻辑 | 2023-08-27 09:41:07 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 20bf5e75f4 | fix: 修复读取json并修改的问题 | 2023-08-27 00:58:38 +08:00 |  | 
			
				
					|  | 815e2b01a8 | 实现对象化json | 2023-08-27 00:46:00 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | d26827075b | refactor: #I7W7AG 使用jackson替代json | 2023-08-27 00:14:50 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | d31772b3d5 | 🧵 添加并使用线程池管理项目中的异步操作 | 2023-08-26 22:25:20 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | 8c589d6133 | 🚩 添加语言切换功能 | 2023-08-26 18:18:36 +08:00 |  | 
			
				
					|  | c7d36438e1 | // todo 切换语言并将语言修改设置回本地, //  1.只更新json的language为english,没有保存 | 2023-08-26 15:18:01 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | 7ab6793179 | ⚰️ 删除无用代码 🐛 修复 BUG 当无打开文件时打开文件程序抛空指针异常问题 | 2023-08-26 13:49:35 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | eb7eb2552c | ➕ 添加置顶功能 ⚡️ 优化配置文件读取 | 2023-08-25 23:05:44 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | fbc1d020d9 | ➕ 添加置顶功能 | 2023-08-25 16:18:26 +08:00 |  | 
			
				
					|  | 597062153a | 修复换行bug | 2023-08-24 23:16:26 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | 97d8776a5e | 🚩 添加自定义配置文件功能 | 2023-08-24 17:30:22 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | ce9280134e | ⚡️ 优化:抽取项目中的文本放到常量类 | 2023-08-24 11:17:19 +08:00 |  | 
			
				
					|  | 80872b6511 | !25 fix: #I7VAM0 修复编码状态栏未更新的问题 Merge pull request !25 from songdragon/feature-I7VAM0 | 2023-08-23 18:02:59 +00:00 |  | 
			
				
					|  | 362e63d781 | 增加多语言配置文件 | 2023-08-24 01:49:13 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 834d5ac708 | fix: 修复切换tab编码没变更的问题 | 2023-08-24 01:40:40 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 8e4c35db29 | fix: 修复打开文件时,编码错误的问题 | 2023-08-24 01:38:42 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 73830bb306 | refactor: 删除行尾注释 | 2023-08-24 01:08:20 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 849161d237 | refactor: #I7VAM0 解决icu4j link失败的问题 | 2023-08-24 01:03:03 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 2410f6e213 | feat: 实现侦测文件内容编码,并使用侦测成功的编码打开 | 2023-08-24 00:46:51 +08:00 |  | 
			
				
					| 
							
							
								 gewuyou | f0731aa259 | 🚩 添加:添加保存功能 ⚡️ 优化:优化代码逻辑 | 2023-08-23 15:30:47 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 641081b0a5 | fix: #I7UJZL 修复自动换行不生效的问题 | 2023-08-22 13:08:43 +08:00 |  | 
			
				
					| 
							
							
								 songdragon | 65f8a50dd9 | refactor: 将菜单\菜单项\Tab提取到单独的类中,作为UI组件 | 2023-08-22 00:09:12 +08:00 |  |