Commit graph

2443 commits

Author SHA1 Message Date
Vic
9b0cf20184 update text 2023-02-14 16:35:34 +08:00
Vic
39c4a2be2e Auto reload bookmarks when editing checkboxes 2023-02-14 16:35:06 +08:00
Vic
ab0d6245df Auto reload all bookmarks when finish editing 2023-02-12 01:58:53 +08:00
Vic
dd61d195e2 Update desc 2023-02-12 01:27:31 +08:00
dependabot[bot]
43b5c06c47
Bump SharpZipLib from 1.4.1 to 1.4.2 (#1882) 2023-02-11 16:41:44 +00:00
Hongtao Zhang
083527e603
add option for everything search in full path (default true) 2023-02-11 10:35:26 -06:00
DB p
b2b22dc4cf Fix UseWindowsForms in csproj 2023-02-11 14:14:42 +09:00
DB p
c240f1e2e0 - Added Guide Texts in CustomBrowsePopup
- Added 'Edit' Button, It will be disable when non-select situation
- Added Browse Button in Path Select Textbox
2023-02-11 07:37:18 +09:00
DB P
ef16484957
Merge branch 'dev' into SelectBrowserCore 2023-02-10 11:06:09 +09:00
Vic
46c8dd8070 Fix translation 2023-02-09 12:25:59 +08:00
Jeremy
2c124f7768 bump plugin version from .Net upgrade 2023-02-07 08:19:26 +11:00
Jeremy Wu
88feed0aa2
Merge pull request #1878 from VictoriousRaptor/PluginInstallNotification1
Show plugin names in download success notification
2023-02-07 07:52:19 +11:00
Jeremy Wu
aa4f3a9350
Merge pull request #1745 from Flow-Launcher/net7.0
Update to .Net 7
2023-02-07 07:33:11 +11:00
VictoriousRaptor
90a48ee5f2
Merge pull request #1864 from TheBestPessimist/program_plugin_search_in_start_menu
Read the list of programs from `Start Menu` folder instead of `Start Menu/Programs`
2023-02-07 01:46:34 +08:00
Vic
0c963045ba Show plugin names in download success notification 2023-02-07 01:37:21 +08:00
Vic
30b73e5488 Revert "version"
This reverts commit 43cf3ded87.
2023-02-07 01:26:30 +08:00
Vic
a6d3aafe9b Add Browser Engine header 2023-02-06 12:57:55 +08:00
Hongtao Zhang
704c26ca3d
Merge branch 'dev' of github.com:Flow-Launcher/Flow.Launcher into net7.0 2023-02-04 11:52:15 -06:00
Vic
b7e7217b2e Fix folder path 2023-02-03 17:29:51 +08:00
Vic
c7f3283e3a Add UI to select browser engine 2023-02-03 17:07:33 +08:00
Vic
fe5da58378 Use switch expression for loader 2023-02-03 16:23:14 +08:00
VictoriousRaptor
824f61d3aa
Merge pull request #1874 from VictoriousRaptor/bugfix
Fix 1861 and 1863
2023-02-03 13:37:50 +08:00
Vic
196c359819 Add custom firefox browser location 2023-02-03 13:07:46 +08:00
Vic
fbd12eb96b Add missing translation 2023-02-03 12:21:25 +08:00
TheBestPessimist
2e0923d25b more whitespace 2023-01-30 14:51:41 +02:00
TheBestPessimist
43cf3ded87 version 2023-01-30 14:48:15 +02:00
TheBestPessimist
e89d8b3577 Read list of programs from Start Menu instead of Start Menu/Programs 2023-01-30 14:47:27 +02:00
TheBestPessimist
9e11b0cd9d whitespace 2023-01-30 14:44:48 +02:00
dependabot[bot]
51c909800f
Bump SharpZipLib from 1.3.3 to 1.4.1 (#1833) 2023-01-28 16:08:55 +00:00
dependabot[bot]
892f1b8ed2
Bump System.Data.OleDb from 5.0.0 to 7.0.0 (#1808) 2023-01-28 16:08:35 +00:00
Kevin Zhang
c99790b049
Merge pull request #1848 from TheBestPessimist/#1800_Everything_search_full_path
Everything Search: Match Path
2023-01-28 10:07:29 -06:00
DB P
0bdea7c0db
Merge pull request #1847 from TheBestPessimist/Change_the_default_shortcut_for_Plugin_Indicator_to__
Change the default shortcut for Plugin Indicator to `?` #1825
2023-01-27 16:11:45 +09:00
TheBestPessimist
18d1bb5668 Cleanup unused properties 2023-01-26 09:19:42 +02:00
TheBestPessimist
1b9a879d48 Use EverythingSearchOption flag to set up FullPathSearch instead of hardcoding it 2023-01-26 08:58:41 +02:00
TheBestPessimist
2b6c92c48c question to the FL developers 2023-01-26 08:50:42 +02:00
TheBestPessimist
1482637cf1 Everything.MatchPath = true 2023-01-26 08:50:42 +02:00
Lasith Manujitha
7fc704558d
Fix autocomplete on Program plugin (#1850)
* Fix autocomplete on Program plugin

* Code refactor
2023-01-26 12:31:40 +08:00
TheBestPessimist
89fb78f3cd Change the default shortcut for Plugin Indicator to ? #1825 2023-01-25 13:20:30 +02:00
Jeremy Wu
d16a249e36 version bump plugins 2023-01-23 08:51:36 +11:00
Vic
f5cc792ce9 Return empty when operation canceled 2023-01-21 16:57:41 +08:00
Vic
71a2f996db Set environment var dict in LoadEnvironmentStringPaths() 2023-01-20 15:27:19 +08:00
Vic
966d3e752e Fix environment variable expansion logic 2023-01-20 15:22:54 +08:00
Vic
4d267fe71e Fix incorrect %homepath% parsing
Parse environment variables before checking path existence
2023-01-20 14:31:01 +08:00
Vic
504fb4ae05 Display environment vars in upper case 2023-01-20 14:02:04 +08:00
VictoriousRaptor
768ed4f80a
Update wording
Co-authored-by: Jeremy Wu <jeremy24wu@gmail.com>
2023-01-20 12:13:02 +08:00
Vic
4bea50d4cf Add unit test for PathEqualityComparator 2023-01-19 23:17:04 +08:00
Vic
beb144956c Rename method and add option to allow equality 2023-01-19 21:33:09 +08:00
Vic
ac92b93f66 Move IsSubPathOf to SharedCommands 2023-01-19 20:29:25 +08:00
Vic
32268890b9 Remove TranslateEnvironmentVariablePath 2023-01-19 20:23:33 +08:00
Vic
2c36692052 Use case-insensitve comparator for path 2023-01-19 16:21:24 +08:00
Vic
a6b7c5898b Fix subpath check 2023-01-19 16:21:24 +08:00
Vic
383298a46b Fix null subtitle when creating disk result 2023-01-19 16:21:23 +08:00
Vic
51f5d8a410 Add new constructor for EngineNotAvailableException 2023-01-19 16:21:23 +08:00
Vic
52e72992c2 Change context and settings to non static 2023-01-19 16:21:23 +08:00
Vic
009ee3dc5c Simplify environment variable detection 2023-01-19 16:21:23 +08:00
Vic
983f0aafc4 Use a static dictionary for environment vars 2023-01-19 16:21:23 +08:00
Vic
6efa9d1731 Only expand environment var when path starts with % 2023-01-19 16:21:23 +08:00
Vic
2e4127c63b Catch specifc exception 2023-01-19 16:21:23 +08:00
Jeremy Wu
c5cc4ed279
Merge pull request #1781 from VictoriousRaptor/ShowProgramDesc
Always show/search description in program results if enabled
2023-01-16 21:21:09 +11:00
Vic
ce8c3f9288 Fix typo 2023-01-13 15:12:45 +08:00
Hongtao Zhang
f07cff7742
fix explorer setting UseLocationAsWorkingDir 2023-01-12 15:29:58 -06:00
Vic
8208af4d1a Always show/search desc in result if enabled 2023-01-10 14:18:12 +08:00
Kevin Zhang
8d9501b496
Merge branch 'dev' into net7.0 2023-01-07 13:27:31 -06:00
Jeremy Wu
e215c3ffbb
New Crowdin updates (#1754)
* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (French)
[ci skip]

* New translations en.xaml (Danish)
[ci skip]

* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (Spanish, Latin America)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Chinese Simplified)
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (French)
[ci skip]

* New translations en.xaml (Danish)
[ci skip]

* New translations en.xaml (German)
[ci skip]

* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (Japanese)
[ci skip]

* New translations en.xaml (Korean)
[ci skip]

* New translations en.xaml (Dutch)
[ci skip]

* New translations en.xaml (Polish)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Russian)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Turkish)
[ci skip]

* New translations en.xaml (Ukrainian)
[ci skip]

* New translations en.xaml (Chinese Simplified)
[ci skip]

* New translations en.xaml (Chinese Traditional)
[ci skip]

* New translations en.xaml (Portuguese, Brazilian)
[ci skip]

* New translations en.xaml (Norwegian Bokmal)
[ci skip]

* New translations en.xaml (Serbian (Latin))
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Spanish, Latin America)
[ci skip]

* New translations en.xaml (French)
[ci skip]

* New translations en.xaml (Danish)
[ci skip]

* New translations en.xaml (German)
[ci skip]

* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (Japanese)
[ci skip]

* New translations en.xaml (Korean)
[ci skip]

* New translations en.xaml (Dutch)
[ci skip]

* New translations en.xaml (Polish)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Russian)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Turkish)
[ci skip]

* New translations en.xaml (Ukrainian)
[ci skip]

* New translations en.xaml (Chinese Simplified)
[ci skip]

* New translations en.xaml (Chinese Traditional)
[ci skip]

* New translations en.xaml (Portuguese, Brazilian)
[ci skip]

* New translations en.xaml (Norwegian Bokmal)
[ci skip]

* New translations en.xaml (Serbian (Latin))
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Spanish, Latin America)
[ci skip]

* New translations en.xaml (French)
[ci skip]

* New translations en.xaml (Danish)
[ci skip]

* New translations en.xaml (German)
[ci skip]

* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (Japanese)
[ci skip]

* New translations en.xaml (Korean)
[ci skip]

* New translations en.xaml (Dutch)
[ci skip]

* New translations en.xaml (Polish)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Russian)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Turkish)
[ci skip]

* New translations en.xaml (Ukrainian)
[ci skip]

* New translations en.xaml (Chinese Simplified)
[ci skip]

* New translations en.xaml (Chinese Traditional)
[ci skip]

* New translations en.xaml (Portuguese, Brazilian)
[ci skip]

* New translations en.xaml (Norwegian Bokmal)
[ci skip]

* New translations en.xaml (Serbian (Latin))
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Spanish, Latin America)
[ci skip]

* New translations en.xaml (Turkish)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations Resources.resx (Turkish)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Korean)
[ci skip]

* New translations en.xaml (Chinese Simplified)
[ci skip]

Co-authored-by: Kevin Zhang <45326534+taooceros@users.noreply.github.com>
2023-01-07 17:44:11 +02:00
VictoriousRaptor
a8d4f5daf7
Merge pull request #1736 from VictoriousRaptor/LocalizedLnkName
Use localized name for shell link programs
2023-01-04 14:04:13 +08:00
Hongtao Zhang
804a5d54dc
simplify logic 2023-01-03 13:47:25 -05:00
Vic
181b020b31 Add glyph for open with editor/shell 2023-01-03 01:37:01 +08:00
VictoriousRaptor
ad25879335
Merge branch 'dev' into LocalizedLnkName 2023-01-02 14:56:37 +08:00
VictoriousRaptor
9e5d27f44b
Merge branch 'dev' into fix_pluginindicator_search 2023-01-01 13:16:05 +08:00
Jeremy Wu
1d1af7263a fix typos 2023-01-01 12:36:03 +09:30
Jeremy Wu
1d02f231a6 update to use score from fuzzy search 2023-01-01 12:27:27 +09:30
Kevin Zhang
ae7c413e07
Merge branch 'dev' into net7.0 2022-12-31 21:36:00 -05:00
Hongtao Zhang
f7f82a746e
fix more spelling 2022-12-31 17:12:52 -05:00
Vic
1ae1752b3f Merge branch 'LocalizedLnkName' of https://github.com/VictoriousRaptor/Flow.Launcher into LocalizedLnkName 2023-01-01 00:24:48 +08:00
Vic
3992990ccb Remove redundant extension check 2023-01-01 00:24:36 +08:00
Hongtao Zhang
35529a0386
fix some spelling 2022-12-31 10:43:07 -05:00
VictoriousRaptor
86a0a6c0dc
Merge branch 'dev' into LocalizedLnkName 2022-12-31 21:53:21 +08:00
Vic
ff4290c192 fix typo 2022-12-31 21:34:49 +08:00
Vic
4dbfe2d6a0 Rename variables for readability 2022-12-31 21:25:12 +08:00
Vic
186f5f826e Fix error message 2022-12-31 21:24:50 +08:00
Vic
c5c6ae7b68 Fix exception message argument 2022-12-31 21:18:20 +08:00
Vic
617183b14a Refactor result matching logic 2022-12-31 21:09:57 +08:00
Vic
e6b8a0dde2 Catch exception in ShellLinkHelper 2022-12-31 21:09:57 +08:00
Vic
207b29f816 Update comments 2022-12-31 21:09:57 +08:00
Vic
c6ff0a5113 Fix .lnk description logic 2022-12-31 20:43:53 +08:00
Jeremy Wu
f19d1d624d allow plugin name to be searchable by Plugin Indicator 2022-12-31 17:23:45 +09:30
Lasith Manujitha
148951e886 Add prompt for Log Off command 2022-12-31 09:24:55 +05:30
Hongtao Zhang
db354a23a5
Update to .Net 7 2022-12-30 19:12:11 -05:00
Vic
44438de7df Fix typo 2022-12-31 01:49:30 +08:00
Vic
fdc7da2f71 Fix typo in file name 2022-12-31 00:54:56 +08:00
Jeremy Wu
bb41da6fb8
New Crowdin updates (#1734) 2022-12-30 22:04:56 +09:00
Vic
9b05174a97 Use localized name for shell link programs 2022-12-30 20:56:30 +08:00
Jeremy Wu
4849e26aca
New Crowdin updates (#1733) 2022-12-30 18:40:06 +09:00
Jeremy Wu
e23ec178fc
Merge pull request #1723 from Flow-Launcher/version_bumps
Release 1.11.0 version bumps
2022-12-30 12:31:54 +09:30
VictoriousRaptor
9aab01dd72
Fix typo 2022-12-27 14:53:42 +08:00
Jeremy Wu
78b8e5b3df update Explorer plugin description 2022-12-27 16:04:55 +09:30
Jeremy Wu
b3702be59b version bump plugins 2022-12-27 14:15:51 +09:30
Lasith Manujitha
8a60fb18a0 WindowsSettings plugin - command updated for diskmgmt 2022-12-26 10:43:10 +05:30
Jeremy Wu
6607acbcce
Merge pull request #1706 from Flow-Launcher/fix_quickaccess_autocomplete
Fix quick access path search and autocomplete text
2022-12-25 16:53:12 +11:00
Jeremy
ae8f2d2ee8 fix wrong Everything service warning displayed when not available 2022-12-25 06:01:17 +11:00
Jeremy
9f8b205b35 Merge remote-tracking branch 'origin/dev' into fix_quickaccess_autocomplete 2022-12-25 05:00:15 +11:00
Jeremy
3f2b741dcc add unit tests for get autocomplete result 2022-12-25 04:58:37 +11:00
Jeremy
f64ebdca95 simplify get path method 2022-12-24 22:51:18 +11:00
VictoriousRaptor
552786bff5
Merge branch 'dev' into Fix1705 2022-12-23 15:16:58 +08:00
Vic
ccac84c0f3 Fix hardcoded strings 2022-12-23 15:15:11 +08:00
Vic
599bdc42fa Remove quotation marks 2022-12-23 13:20:10 +08:00
Vic
f97c9fe249 Update wording for consistency 2022-12-23 13:16:04 +08:00
DB p
e11c7a7c12 Remove Duplicated Key 2022-12-23 13:22:41 +09:00
Jeremy
2174fc24ce update directory navigation with same action keyword 2022-12-22 23:20:37 +11:00
Jeremy
fc9805f29e add GetAutoCompleteText method 2022-12-22 22:57:37 +11:00
Jeremy
5c1cc79751 update GetPathWithActionKeyword 2022-12-22 22:39:24 +11:00
Jeremy
f0b7898f89 fix quick access path search and autocomplete text 2022-12-22 22:04:39 +11:00
VictoriousRaptor
bade0fcf59
Merge pull request #1669 from VictoriousRaptor/DisablePATHByDefault
Add option to enable/disable UWP indexing
2022-12-22 13:17:05 +08:00
Jeremy Wu
b3f5dc0ed7
Merge pull request #1698 from onesounds/StringEnabled2
Change Status Label to Enabled
2022-12-22 13:23:58 +11:00
Jeremy Wu
9ae5d9b716
Fix search source typo 2022-12-22 13:16:10 +11:00
Kevin Zhang
e4c9e1c36c
fix a typo 2022-12-21 13:14:17 -06:00
Filip Horvat
277b8e94a6 Adds option to display open with code for Volume results 2022-12-21 18:55:23 +01:00
Filip Horvat
d2970a1f35
Merge branch 'dev' into folder-editor 2022-12-21 09:10:38 -08:00
DB p
5ad0e79577 - Change Status Label to Enabled
- Adjust Korean Language
2022-12-21 20:25:45 +09:00
DB p
b74a8d0362 Adjust Korean 2022-12-21 19:25:03 +09:00
DB p
2dabc38a75 - Change Default Context menu header to translatable
- Add Undo Command and icons in context menu items
- Applied Contextmenu to textboxes
2022-12-21 19:06:00 +09:00
Vic
137cda459e Merge branch 'FixText' of https://github.com/VictoriousRaptor/Flow.Launcher into FixText 2022-12-21 15:52:04 +08:00
Vic
230e4fbcbb Fix translation of action keywords 2022-12-21 15:51:53 +08:00
Vic
b30ace993a Fix namespace of LocalizationConverter 2022-12-21 15:51:17 +08:00
DB p
43e3b1f430 Adjust Korean Texts 2022-12-21 16:19:51 +09:00
DB p
ae1ea5950d Merge branch 'FixText' of https://github.com/VictoriousRaptor/Flow.Launcher into pr/1695 2022-12-21 16:15:32 +09:00
DB p
812a920058 Adjust Little String / Add Korean Translations 2022-12-21 16:15:26 +09:00
Vic
5696caf0e5 update wording 2022-12-21 15:02:10 +08:00
Vic
7c5c1e8740 remove redundant texts 2022-12-21 14:08:32 +08:00
Vic
8fbf3a3f92 make file/folder translatble 2022-12-21 14:01:09 +08:00
Vic
3b6c8b882b Add translatble text 2022-12-21 13:30:49 +08:00
VictoriousRaptor
2d32b33eb0
Merge branch 'dev' into DisablePATHByDefault 2022-12-21 12:57:19 +08:00
Vic
8625fb985b Use case-insensitive path comparison 2022-12-20 20:58:58 +08:00
Vic
3dac240a40 Add open with shell context menu for non-Windows indexed folders 2022-12-20 20:16:17 +08:00
Vic
b92181f6c6 Remove logic that modifies settings 2022-12-20 19:48:10 +08:00
Jeremy Wu
d0b5a5a37b
version bump Program plugin 2022-12-20 21:05:00 +11:00
Filip Horvat
56d6433db0 Improve folder editor experience 2022-12-19 21:38:45 +01:00
Vic
d3bae93a47 Revert "Disable PATH by default" 2022-12-18 13:35:38 +08:00
Vic
13eba18ac5 Disable PATH programs by default 2022-12-18 13:28:30 +08:00
Kevin Zhang
68bc6fb139
Merge branch 'dev' into DisablePATHByDefault 2022-12-17 19:37:24 -06:00
Jeremy Wu
314cd0aa3d
Merge pull request #1657 from Flow-Launcher/fix_win_index_search
Add exception handling when Windows Search service not available
2022-12-18 12:00:52 +11:00
Jeremy Wu
09e72e316e
New Crowdin updates (#1627) 2022-12-18 02:16:19 +02:00
Hongtao Zhang
42725f289c
Make the behavior more like 1.9.5- 2022-12-17 10:50:23 -06:00
Hongtao Zhang
9da322f840
Handle Search Exception more carefully 2022-12-17 10:43:17 -06:00
Vic
bf91bd2492 Fix double click on header 2022-12-17 22:27:36 +08:00
Vic
1d77d45fe2 Add an option to enable/dsiable UWP indexing 2022-12-17 22:20:49 +08:00
Vic
5373cd3736 Disable PATH programs by default 2022-12-17 21:29:25 +08:00
Jeremy Wu
00c229d82c add exception handling when Windows Search service not available 2022-12-15 22:03:54 +11:00
Jeremy Wu
85783e725f
bump Explorer plugin version 2022-12-14 08:27:18 +11:00
Vic
14ae012949 Use ArgumentList 2022-12-14 01:21:07 +08:00
VictoriousRaptor
eb6d040180
Merge branch 'dev' into FixOpenWithEditorSpace 2022-12-13 19:55:18 +08:00
Vic
fb77d42395 Make error message translatable 2022-12-13 19:47:05 +08:00
Vic
0227b9591c Fix open with editor for files of which path contains blank 2022-12-13 19:02:27 +08:00
Jeremy Wu
f66f7d8ed3
New Crowdin updates (#1624) 2022-12-13 03:36:02 +02:00
Hongtao Zhang
ae8955bf41
fix path not changed in the textbox 2022-12-12 14:40:52 -06:00
Jeremy Wu
21c5c776c6
Merge branch 'dev' into FixProgramSource 2022-12-13 05:35:15 +11:00
Vic
fe66cad624 Merge remote-tracking branch 'upstream/dev' into FixProgramSource 2022-12-12 18:32:51 +08:00
Jeremy Wu
dd0f42eaac
Merge branch 'dev' into fix_shell_and_change_query 2022-12-12 20:09:52 +11:00
Jeremy Wu
4153aa9a69
Merge pull request #1612 from onesounds/FixBoolToTranslation
Translatable Bool in List view
2022-12-12 20:07:04 +11:00
Jeremy Wu
50b5a0e35b
Merge pull request #1613 from onesounds/FixCustomSettingPanelPadding
Adjust Setting Panel Layout (System & JsonRPC)
2022-12-12 20:05:29 +11:00
Jeremy Wu
84ca747d07
Merge pull request #1622 from onesounds/ChangeIcons
Icon changed & Fix non-glyph context menus
2022-12-12 19:58:12 +11:00
VictoriousRaptor
48629502f7
Merge branch 'dev' into fix_dup_results_explorer 2022-12-12 14:29:37 +08:00
DB p
4b0781dccb Added Glyph Icons 2022-12-12 13:08:22 +09:00
DB p
50957097f1 Change Some Icons 2022-12-12 12:45:44 +09:00
Jeremy Wu
45a81a90a9 fix action keyword missing when traversing paths or using autocomplete 2022-12-12 14:07:04 +11:00
Jeremy Wu
3b8e7866ac fix duplicate Quick Access results from CreateOpenCurrentFolderResult 2022-12-12 13:14:37 +11:00
Kevin Zhang
3338a417da
Merge branch 'dev' into fix_shell_and_change_query 2022-12-11 15:06:39 -06:00
Vic
25e4b501cb Use default binding mode 2022-12-11 18:16:15 +08:00
DB p
00e88bc871 Adjust Buttons Margin 2022-12-09 17:58:58 +09:00
DB p
b1768b5abf - Adjust JsonRPCplugin Panel Layout
- Adjust System Plugin Setting Panel Margin
2022-12-09 17:46:35 +09:00
DB p
12fae66b92 Adjust WebSearch Plugin Setting Panel Layout 2022-12-09 15:13:01 +09:00
DB p
c89ad0cad2 Merge branch 'FixBoolToTranslation' of https://github.com/onesounds/Flow.Launcher into FixBoolToTranslation 2022-12-09 14:45:28 +09:00
DB p
fead578b41 Change 'Search Description' Tooltip 2022-12-09 14:45:25 +09:00
Jeremy Wu
78124316a1
Merge pull request #1611 from onesounds/FIxTrueFalseInList
Fix Program Plugin Buttons Size
2022-12-09 13:11:39 +11:00
DB P
f199167c27
Merge branch 'dev' into FixBoolToTranslation 2022-12-09 10:54:16 +09:00
DB p
056dcb3888 Change Header 'Enabled' to 'Status' 2022-12-09 10:48:56 +09:00
DB p
2dc508aa75 Bool To Translation by style in websearch plugin 2022-12-09 10:33:23 +09:00
DB p
df27a21df7 Fixed TextboxWidth 2022-12-09 10:19:08 +09:00
DB p
8498883cd9 - Add BoolToTranslation Logic by Style in Program
- Add Responsive Width for Removing horizon scrollbar
2022-12-09 10:15:14 +09:00
DB p
711b5b6110 Fix Buttons Size 2022-12-09 09:09:39 +09:00
Jeremy
824fe10816 bump plugin versions after .Net 6 upgrade 2022-12-09 07:33:25 +11:00
Hongtao Zhang
c5056a7a5c
Merge branch 'dev' of github.com:Flow-Launcher/Flow.Launcher into fix_shell_and_change_query 2022-12-07 22:07:56 -06:00
Hongtao Zhang
e5e393f911
Wrap some call with Dispatcher and let shell use Task.Run to show the window and change the query (which is semislow) 2022-12-07 21:13:07 -06:00
Vic
59f0b49d7d Fix typo 2022-12-07 22:24:04 +08:00
Vic
0231c32031 Use square44x44logo for preview to avoid big margin 2022-12-07 16:33:24 +08:00
Vic
219ca53127 revert 2022-12-07 14:56:34 +08:00
Vic
f509f56304 Fix file extension case sensitive issue 2022-12-07 14:25:16 +08:00
Vic
0afcf7eafe Use auto deconstructor and rename return value 2022-12-07 14:01:12 +08:00
Vic
e720e4facd mark modified in setters 2022-12-07 13:58:20 +08:00
DB p
fd395c13b0 Adjust non-media icon sizes 2022-12-07 03:29:52 +09:00
DB p
d52496b9f4 Merge branch 'ImagePreview' of https://github.com/onesounds/Flow.Launcher into ImagePreview 2022-12-07 03:04:51 +09:00
DB p
46f8d42ec6 - Changed UWP preview target image 2022-12-07 03:04:41 +09:00
Vic
05dca1aebc Merge branch 'ImagePreview' of https://github.com/onesounds/Flow.Launcher into pr/1360 2022-12-07 01:18:57 +08:00
Vic
7362bd26cf Remove LocationConverter 2022-12-07 01:09:26 +08:00
Vic
7bc4cfb964 Hide Browse Button when editing win32 or uwp 2022-12-07 00:48:42 +08:00
Vic
1990226c71 Fix item can't be unselected after editing Location 2022-12-07 00:35:41 +08:00
Vic
cca10ca5a0 Move show msgbox to view 2022-12-06 22:57:43 +08:00
Vic
bfb29e384d Fix Hashcode 2022-12-06 22:47:27 +08:00
Vic
66dee47edc Refactor AddProgramSource dialog 2022-12-06 20:34:40 +08:00
DB P
fa84f4481c
Merge branch 'dev' into ImagePreview 2022-12-06 06:17:07 +09:00
Jeremy Wu
51595ad7b9
New Crowdin updates (#1578)
* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (French)
[ci skip]

* New translations en.xaml (Danish)
[ci skip]

* New translations en.xaml (Ukrainian)
[ci skip]

* New translations en.xaml (German)
[ci skip]

* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (Japanese)
[ci skip]

* New translations en.xaml (Korean)
[ci skip]

* New translations en.xaml (Dutch)
[ci skip]

* New translations en.xaml (Polish)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Russian)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Turkish)
[ci skip]

* New translations en.xaml (Chinese Simplified)
[ci skip]

* New translations en.xaml (Chinese Traditional)
[ci skip]

* New translations en.xaml (Portuguese, Brazilian)
[ci skip]

* New translations en.xaml (Norwegian Bokmal)
[ci skip]

* New translations en.xaml (Serbian (Latin))
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Spanish, Latin America)
[ci skip]

* New translations en.xaml (French)
[ci skip]

* New translations en.xaml (Turkish)
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Serbian (Latin))
[ci skip]

* New translations en.xaml (Norwegian Bokmal)
[ci skip]

* New translations en.xaml (Portuguese, Brazilian)
[ci skip]

* New translations en.xaml (Chinese Traditional)
[ci skip]

* New translations en.xaml (Chinese Simplified)
[ci skip]

* New translations en.xaml (Ukrainian)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Danish)
[ci skip]

* New translations en.xaml (Russian)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Polish)
[ci skip]

* New translations en.xaml (Dutch)
[ci skip]

* New translations en.xaml (Korean)
[ci skip]

* New translations en.xaml (Japanese)
[ci skip]

* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (German)
[ci skip]

* New translations en.xaml (Spanish, Latin America)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Danish)
[ci skip]

* New translations en.xaml (Turkish)
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Serbian (Latin))
[ci skip]

* New translations en.xaml (Norwegian Bokmal)
[ci skip]

* New translations en.xaml (Portuguese, Brazilian)
[ci skip]

* New translations en.xaml (Chinese Traditional)
[ci skip]

* New translations en.xaml (Chinese Simplified)
[ci skip]

* New translations en.xaml (Ukrainian)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (German)
[ci skip]

* New translations en.xaml (Russian)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Polish)
[ci skip]

* New translations en.xaml (Dutch)
[ci skip]

* New translations en.xaml (Korean)
[ci skip]

* New translations en.xaml (Japanese)
[ci skip]

* New translations en.xaml (French)
[ci skip]

* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (Spanish, Latin America)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations Resources.resx (Portuguese)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (French)
[ci skip]

* New translations en.xaml (Turkish)
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Serbian (Latin))
[ci skip]

* New translations en.xaml (Norwegian Bokmal)
[ci skip]

* New translations en.xaml (Portuguese, Brazilian)
[ci skip]

* New translations en.xaml (Chinese Traditional)
[ci skip]

* New translations en.xaml (Chinese Simplified)
[ci skip]

* New translations en.xaml (Ukrainian)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Danish)
[ci skip]

* New translations en.xaml (Russian)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Polish)
[ci skip]

* New translations en.xaml (Dutch)
[ci skip]

* New translations en.xaml (Korean)
[ci skip]

* New translations en.xaml (Japanese)
[ci skip]

* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (German)
[ci skip]

* New translations en.xaml (Spanish, Latin America)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (French)
[ci skip]

* New translations en.xaml (Turkish)
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Serbian (Latin))
[ci skip]

* New translations en.xaml (Norwegian Bokmal)
[ci skip]

* New translations en.xaml (Portuguese, Brazilian)
[ci skip]

* New translations en.xaml (Chinese Traditional)
[ci skip]

* New translations en.xaml (Chinese Simplified)
[ci skip]

* New translations en.xaml (Ukrainian)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Danish)
[ci skip]

* New translations en.xaml (Russian)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Polish)
[ci skip]

* New translations en.xaml (Dutch)
[ci skip]

* New translations en.xaml (Korean)
[ci skip]

* New translations en.xaml (Japanese)
[ci skip]

* New translations en.xaml (Italian)
[ci skip]

* New translations en.xaml (German)
[ci skip]

* New translations en.xaml (Spanish, Latin America)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Slovak)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

* New translations en.xaml (Spanish (Modern))
[ci skip]

Co-authored-by: Kevin Zhang <45326534+taooceros@users.noreply.github.com>
Co-authored-by: Hongtao Zhang <hongtao_zhang@outlook.com>
2022-12-05 20:05:17 +02:00
Vic
6c54ad8589 refactor preview info 2022-12-05 16:01:20 +08:00
Vic
53b17816c7 Renaming method and property 2022-12-05 14:07:35 +08:00
Vic
2194e3c5ec Preview image for explorer 2022-12-05 13:59:24 +08:00
Vic
ce2948e1e0 Merge branch 'ImagePreview' of https://github.com/onesounds/Flow.Launcher into pr/1360 2022-12-05 13:40:41 +08:00
Vic
ccab608331 fix unnecessary using 2022-12-05 13:22:00 +08:00
VictoriousRaptor
e2a46ed8e3
Merge branch 'dev' into ImagePreview 2022-12-05 13:20:35 +08:00
Hongtao Zhang
ee9c53d2f9
Add CopyText in Explorer Result 2022-12-04 21:46:11 -06:00
Jeremy
bcc801321e remove IIndexProvider.cs removal section in project file 2022-12-05 09:29:44 +11:00
Jeremy
08b8cdadb2 remove duplicate Everything dll copy in project file 2022-12-05 09:19:15 +11:00
Jeremy
5c4b78507c remove unnecessary Everything installation during startup 2022-12-05 08:55:35 +11:00
Jeremy
74ea629c55 search window hides when prompted to install, remove threading 2022-12-05 08:46:19 +11:00
Jeremy
caf200b644 move System.Linq.Async to Explorer project 2022-12-05 08:45:44 +11:00
Jeremy
797464d356 remove unnecessary show Windows index state in context menu option 2022-12-05 07:06:20 +11:00
Jeremy
e1c4ee0208 fix Windows context menu Segoe Fluent Icon 2022-12-05 06:32:25 +11:00
Hongtao Zhang
af07c3835a
cleanup code 2022-12-04 11:39:53 -06:00
Hongtao Zhang
c6a47b0b9e
add membernotnull attribute and small refactor 2022-12-04 11:38:19 -06:00
Hongtao Zhang
281f4db5f8
fix enable not working at the first time (also refactor a little bit code) 2022-12-04 01:47:48 -06:00
Kevin Zhang
435144b440
Merge branch 'dev' into explorerMerge 2022-12-03 13:53:48 -06:00
Hongtao Zhang
e9d8579bbd
fix concurrency issue (really potentially) 2022-12-03 13:50:30 -06:00
Hongtao Zhang
4a0ee9b4fc
fix concurrency issue (potentially) 2022-12-03 13:44:43 -06:00
Vic
564721bd2f Set preview image for uwp apps 2022-12-03 13:01:51 +08:00
Jeremy
605db6095a add icon for Everything's content search warning 2022-12-02 09:04:13 +11:00
Jeremy
355035eefa re-add warning when Windows Index service is off as a search result 2022-12-01 23:03:18 +11:00
DB P
f54831020f
Merge branch 'dev' into ImagePreview 2022-12-01 16:34:25 +09:00
Jeremy Wu
b0297d31ad
Merge pull request #1581 from VictoriousRaptor/RefactorUWP
Refactor UWP class in Program plugin
2022-11-30 20:38:21 +11:00
Jeremy
5ac2366697 allow path to be searchable in quick access list 2022-11-30 08:21:47 +11:00
Jeremy
a8d6e8df64 only display quick access list when action keyword is used 2022-11-30 08:21:17 +11:00
Jeremy
9fdf220e09 trigger general search only when action keywords match 2022-11-30 07:42:59 +11:00
Hongtao Zhang
d74a635f46
use nint instead of ulong 2022-11-29 08:37:58 -06:00
Hongtao Zhang
b45b5fbcbd
use ulong instead of int to prevent overflow (if possible let's use nint but now we have some issue with it) 2022-11-29 08:26:10 -06:00
DB p
90f6176d1a Merge branch 'explorerMerge' of https://github.com/Flow-Launcher/Flow.Launcher into explorerMerge 2022-11-29 19:50:56 +09:00
DB p
c820bc139c Fix Context Menu Image Icon 2022-11-29 19:50:53 +09:00
Vic
ed0b3608ab Hide open windows index context menu when result is not from it 2022-11-29 18:46:37 +08:00
Vic
724160d2f0 Hide openwith editor when editor path is null or empty 2022-11-29 18:29:18 +08:00
Vic
592b838f3e Fix hard-coded translation 2022-11-29 18:13:55 +08:00
Vic
422307d507 formatting 2022-11-29 17:56:56 +08:00
Vic
416fcd1881 set desired size to 64x64 2022-11-29 17:50:49 +08:00
Vic
a2d57c14bf Fix xpath issue 2022-11-29 17:49:36 +08:00
Jeremy
a4ca486a6c formatting 2022-11-29 20:44:28 +11:00
Jeremy
0e555b5224 fix Windows Indexed Content search not triggering 2022-11-29 20:33:22 +11:00
Vic
713c586b9f Fix IDE0005 2022-11-29 14:40:50 +08:00
Vic
f9fbd08873 Delete unused file 2022-11-29 14:38:09 +08:00
Vic
2fd241d776 Use search pattern in Directory.EnumerateFiles 2022-11-29 14:34:15 +08:00
Vic
78bc3f4809 Prepare for preview panel 2022-11-29 12:30:36 +08:00
Vic
f40f41628d Comment legacy logo code 2022-11-29 12:12:09 +08:00
Vic
76f5c6c5ab Revert "Remove Uwp Icon's Backgorund color" to avoid conflict
This reverts commit 48c67c7ab7.
2022-11-29 11:55:21 +08:00
Hongtao Zhang
22bc292aa9
Add try catch to encounter dllnotfound issue and move warning string to resource 2022-11-28 21:38:27 -06:00
Hongtao Zhang
acc7d5171b
Remove legacy code and slightly refactor 2022-11-28 21:38:27 -06:00
Jeremy Wu
3acda2e165 remove compatibility code 2022-11-29 13:14:48 +11:00
Hongtao Zhang
8302ff8570
Rename path Enumeration Engine to Directory Recursive Search Engine 2022-11-28 18:41:35 -06:00
Hongtao Zhang
bec27f491d
Adjust naming and remove Use Index Search For Path Search option 2022-11-28 17:54:06 -06:00
Hongtao Zhang
158ee5fd38
Remove legacy initialization 2022-11-28 17:49:53 -06:00
Hongtao Zhang
f163ead486
Remove Launch Hidden feature 2022-11-28 17:49:06 -06:00
Kevin Zhang
718ed33321
Merge branch 'dev' into explorerMerge 2022-11-28 16:24:11 -06:00
Vic
7299833529 Formatting 2022-11-29 02:14:43 +08:00
Vic
da19788df1 Fix potential null reference 2022-11-29 02:06:11 +08:00
Vic
a9c271502a Reuse LogoPathFromUri() for preview image 2022-11-29 01:48:04 +08:00
Vic
202c660ee6 Log exceptions when initing apps 2022-11-29 01:46:48 +08:00
Vic
df30ec9742 Init apps after construction 2022-11-29 01:22:28 +08:00
Vic
b50f43ae7c Remove ApplicationActivationHelper 2022-11-29 01:02:53 +08:00
Vic
07a68ed192 Use imageloader to load icon 2022-11-28 22:55:10 +08:00
Vic
0374e9f56f set default values of fields 2022-11-28 22:13:55 +08:00
Vic
54f408aead comment unused 2022-11-28 22:09:55 +08:00
Vic
cd801e8ae7 Get uwp logo from xml 2022-11-28 22:01:16 +08:00
DB p
9ba7cb0794 Add 'Installing Plugin' string / Adjust Notification 2022-11-28 21:51:14 +09:00
Vic
a62ea0e989 Remove UWP member in Application 2022-11-28 19:06:16 +08:00
Vic
97d6b6e234 fix typo 2022-11-28 18:47:27 +08:00
Vic
e098426f5c Parse Appmanifest.xml 2022-11-28 18:46:48 +08:00
Vic
e4733207b3 Use AppListEntry to construct app 2022-11-28 18:43:56 +08:00
Vic
6fdf2f101b Avoid unnecessary logo finding 2022-11-28 17:48:27 +08:00
Vic
afc0946eda Use winRT api for uwp info and logo 2022-11-28 15:51:28 +08:00
Jeremy Wu
4d91e1086f
Merge pull request #1395 from onesounds/BookmarkSettingPanel
Loading bookmarks by browser
2022-11-28 13:32:56 +11:00
DB P
f59cfc0be2
Merge branch 'dev' into ImagePreview 2022-11-27 16:02:06 +09:00
Jeremy Wu
748e7f11ef
New Crowdin updates (#1577)
* New translations en.xaml (Spanish, Latin America)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

* New translations en.xaml (Portuguese)
[ci skip]

Co-authored-by: Kevin Zhang <45326534+taooceros@users.noreply.github.com>
2022-11-26 21:54:46 +02:00
DB p
48c67c7ab7 Remove Uwp Icon's Backgorund color 2022-11-27 03:28:25 +09:00
Jeremy Wu
553e5f2b1c
New Crowdin updates (#1573)
* New translations en.xaml (French)

* New translations en.xaml (German)

* New translations en.xaml (Italian)

* New translations en.xaml (Danish)

* New translations en.xaml (Japanese)

* New translations en.xaml (Dutch)

* New translations en.xaml (Polish)

* New translations en.xaml (Portuguese)

* New translations en.xaml (Russian)

* New translations en.xaml (Slovak)

* New translations en.xaml (Turkish)

* New translations en.xaml (Ukrainian)

* New translations en.xaml (Chinese Simplified)

* New translations en.xaml (Chinese Traditional)

* New translations en.xaml (Portuguese, Brazilian)

* New translations en.xaml (Norwegian Bokmal)

* New translations en.xaml (Serbian (Latin))

* New translations en.xaml (Spanish, Latin America)

* New translations en.xaml (Portuguese)

* New translations en.xaml (Spanish (Modern))

* New translations en.xaml (Korean)
2022-11-26 18:18:48 +02:00
DB P
ab54833bb5
Merge branch 'dev' into ImagePreview 2022-11-27 00:54:15 +09:00
Vic
c95c276ac7 fix typo 2022-11-26 11:43:35 +08:00
Hongtao Zhang
9267938018
Append Result for everything error and windows index error 2022-11-25 13:25:12 -06:00
DB p
14bb856639 Merge Dev 2022-11-25 21:30:17 +09:00
DB P
982783b800
Merge branch 'dev' into BookmarkSettingPanel 2022-11-25 19:28:41 +09:00
Jeremy Wu
63a05fc1d6
Merge pull request #1570 from onesounds/ChangeWindowSettingKeyword
Change Windows Settings plugin Keyword to s from *
2022-11-25 20:26:52 +11:00
DB p
289bdad33a keyword change to s from ws 2022-11-25 17:44:02 +09:00
Kevin Zhang
5b2990cbe9
Merge pull request #1568 from VictoriousRaptor/FixNewCultureInfo
[Dev] Fix new culture info
2022-11-24 23:49:13 -06:00
DB p
e38a3b0505 Change Keyword to ws from * 2022-11-25 14:08:37 +09:00
Vic
30987f9c95 Use DefaultThreadCurrentCulture for culture in app domain 2022-11-25 12:11:24 +08:00
Jeremy Wu
5bc6acff8b
Merge pull request #1351 from Flow-Launcher/handle-icon-urls
Allow plugins to use web URL's for icon paths
2022-11-25 13:50:30 +11:00
Hongtao Zhang
786e9427d9
Apply IndexSearchExcludedPaths to Index Search in a unified way 2022-11-24 17:06:22 -06:00
Hongtao Zhang
2da557c2db
fix path equality check 2022-11-24 16:46:33 -06:00
Hongtao Zhang
ec810865cc
Port Everything string 2022-11-24 15:09:02 -06:00
Hongtao Zhang
f3fe26bd55
Adjust ComboBox binding 2022-11-24 15:08:54 -06:00
Hongtao Zhang
5f9703ee88
Merge remote-tracking branch 'origin' into explorerMerge 2022-11-24 14:54:36 -06:00
Jeremy Wu
e5948a70c4 Merge branch 'dev' into handle-icon-urls 2022-11-22 20:06:47 +11:00
VictoriousRaptor
25e3825fa0
Merge branch 'dev' into ProgramIndexPATH 2022-11-21 19:39:24 +08:00
Vic
2b14d5b140 Distinguish .lnks by arguments 2022-11-21 19:36:11 +08:00
Jeremy Wu
9b9704cca7
Merge pull request #1562 from VictoriousRaptor/ProgramIndexPATH
[Dev] Use path of lnk file when launching proram
2022-11-21 22:08:16 +11:00
Vic
626e8b1f42 Eliminate warning 2022-11-21 18:11:53 +08:00
Vic
1b51a461dc Use path of lnk to execute program 2022-11-21 18:05:35 +08:00
DB p
cdb583cb59 Merge Dev 2022-11-19 00:08:10 +09:00