Skip to content

Commit 5d2368a

Browse files
jjw24jjw24
authored
Merge pull request #895 from onesounds/HotfixToggleSwitch
Hotfix toggle switch & Fix Strings
2 parents df97be7 + f8eafb4 commit 5d2368a

File tree

21 files changed

+419
-368
lines changed

21 files changed

+419
-368
lines changed

‎Flow.Launcher/CustomQueryHotkeySetting.xaml

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,18 @@
7979
</StackPanel>
8080

8181
<StackPanel Margin="0,20,0,0" Orientation="Horizontal">
82-
<Grid>
82+
<Grid Width="470">
8383
<Grid.RowDefinitions>
8484
<RowDefinition />
8585
<RowDefinition />
8686
</Grid.RowDefinitions>
8787
<Grid.ColumnDefinitions>
88-
<ColumnDefinition />
89-
<ColumnDefinition />
88+
<ColumnDefinition Width="Auto" />
89+
<ColumnDefinition Width="*" />
9090
</Grid.ColumnDefinitions>
9191
<TextBlock
9292
Grid.Row="0"
9393
Grid.Column="0"
94-
Width="Auto"
95-
MinWidth="110"
9694
Margin="10"
9795
HorizontalAlignment="Left"
9896
VerticalAlignment="Center"
@@ -106,7 +104,7 @@
106104
x:Name="ctlHotkey"
107105
Grid.Column="1"
108106
Width="200"
109-
Height="34"
107+
Height="36"
110108
Margin="10,0,10,0"
111109
HorizontalAlignment="Left"
112110
VerticalAlignment="Center"
@@ -123,29 +121,27 @@
123121
<TextBlock
124122
Grid.Row="1"
125123
Grid.Column="0"
126-
Width="Auto"
127-
MinWidth="110"
128124
Margin="10"
129125
HorizontalAlignment="Left"
130126
VerticalAlignment="Center"
131127
FontSize="14"
132128
Text="{DynamicResource customQuery}" />
133-
<StackPanel
129+
<DockPanel
134130
Grid.Row="1"
135131
Grid.Column="1"
136-
Orientation="Horizontal">
137-
<TextBox
138-
x:Name="tbAction"
139-
MinWidth="220"
140-
Margin="10"
141-
HorizontalAlignment="Left"
142-
VerticalAlignment="Center" />
132+
LastChildFill="True">
143133
<Button
144134
x:Name="btnTestActionKeyword"
145135
Padding="10,5,10,5"
146136
Click="BtnTestActionKeyword_OnClick"
147-
Content="{DynamicResource preview}" />
148-
</StackPanel>
137+
Content="{DynamicResource preview}"
138+
DockPanel.Dock="Right" />
139+
<TextBox
140+
x:Name="tbAction"
141+
Margin="10"
142+
HorizontalAlignment="Stretch"
143+
VerticalAlignment="Center" />
144+
</DockPanel>
149145
</Grid>
150146
</StackPanel>
151147
</StackPanel>
@@ -159,15 +155,13 @@
159155
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
160156
<Button
161157
x:Name="btnCancel"
162-
Width="100"
163-
Height="32"
158+
MinWidth="140"
164159
Margin="10,0,5,0"
165160
Click="BtnCancel_OnClick"
166161
Content="{DynamicResource cancel}" />
167162
<Button
168163
x:Name="btnAdd"
169-
Width="100"
170-
Height="32"
164+
MinWidth="140"
171165
Margin="5,0,10,0"
172166
Click="btnAdd_OnClick"
173167
Style="{StaticResource AccentButtonStyle}">

‎Flow.Launcher/Languages/en.xaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<system:String x:Key="iconTrayAbout">About</system:String>
1616
<system:String x:Key="iconTrayExit">Exit</system:String>
1717
<system:String x:Key="closeWindow">Close</system:String>
18+
<system:String x:Key="copy">Copy</system:String>
19+
<system:String x:Key="cut">Cut</system:String>
20+
<system:String x:Key="paste">Paste</system:String>
1821
<system:String x:Key="GameMode">Game Mode</system:String>
1922
<system:String x:Key="GameModeToolTip">Suspend the use of Hotkeys.</system:String>
2023

@@ -60,6 +63,7 @@
6063
<system:String x:Key="actionKeywords">Action keyword</system:String>
6164
<system:String x:Key="currentActionKeywords">Current action keyword</system:String>
6265
<system:String x:Key="newActionKeyword">New action keyword</system:String>
66+
<system:String x:Key="actionKeywordsTooltip">Change Action Keywords</system:String>
6367
<system:String x:Key="currentPriority">Current Priority</system:String>
6468
<system:String x:Key="newPriority">New Priority</system:String>
6569
<system:String x:Key="priority">Priority</system:String>

‎Flow.Launcher/Languages/ko.xaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<system:String x:Key="iconTrayAbout">정보</system:String>
1616
<system:String x:Key="iconTrayExit">종료</system:String>
1717
<system:String x:Key="closeWindow">닫기</system:String>
18+
<system:String x:Key="copy">복사</system:String>
19+
<system:String x:Key="cut">잘라내기</system:String>
20+
<system:String x:Key="paste">붙여넣기</system:String>
1821
<system:String x:Key="GameMode">게임 모드</system:String>
1922
<system:String x:Key="GameModeToolTip">단축키 사용을 일시중단합니다.</system:String>
2023

@@ -38,6 +41,8 @@
3841
<system:String x:Key="ignoreHotkeysOnFullscreenToolTip">게이머라면 켜는 것을 추천합니다.</system:String>
3942
<system:String x:Key="defaultFileManager">기본 파일관리자</system:String>
4043
<system:String x:Key="defaultFileManagerToolTip">폴더를 열 때 사용할 파일관리자를 선택하세요.</system:String>
44+
<system:String x:Key="defaultBrowser">기본 웹 브라우저</system:String>
45+
<system:String x:Key="defaultBrowserToolTip">새 탭, 새 창, 프라이빗 모드 설정</system:String>
4146
<system:String x:Key="pythonDirectory">Python 디렉토리</system:String>
4247
<system:String x:Key="autoUpdates">자동 업데이트</system:String>
4348
<system:String x:Key="selectPythonDirectory">선택</system:String>
@@ -164,6 +169,16 @@
164169
<system:String x:Key="fileManager_directory_arg">폴더경로 인수</system:String>
165170
<system:String x:Key="fileManager_file_arg">파일경로 인수</system:String>
166171

172+
<!-- DefaultBrowser Setting Dialog -->
173+
<system:String x:Key="defaultBrowserTitle">기본 웹 브라우저r</system:String>
174+
<system:String x:Key="defaultBrowser_tips">기본 설정은 OS의 브라우저 설정을 따릅니다. 별도 설정시 Flow Launcher가 해당 브라우저를 사용합니다.</system:String>
175+
<system:String x:Key="defaultBrowser_name">브라우저</system:String>
176+
<system:String x:Key="defaultBrowser_profile_name">브라우저 이름</system:String>
177+
<system:String x:Key="defaultBrowser_path">브라우저 경로</system:String>
178+
<system:String x:Key="defaultBrowser_newtab">새 창</system:String>
179+
<system:String x:Key="defaultBrowser_newWindow">새 탭</system:String>
180+
<system:String x:Key="defaultBrowser_parameter">프라이빗 모드</system:String>
181+
167182
<!-- Priority Setting Dialog -->
168183
<system:String x:Key="changePriorityWindow">중요도 변경</system:String>
169184
<system:String x:Key="priority_tips">높은 수를 넣을수록 상위 결과에 표시됩니다. 5를 시도해보세요. 다른 플러그인 보다 결과를 낮춰 표시하고 싶다면, 그보다 낮은 수를 입력하세요.</system:String>

‎Flow.Launcher/Languages/pt-pt.xaml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
<?xml version="1.0"?>
2-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
1+
<?xml version="1.0" ?>
2+
<ResourceDictionary
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:system="clr-namespace:System;assembly=mscorlib">
36
<!-- MainWindow -->
47
<system:String x:Key="registerHotkeyFailed">Falha ao registar tecla de atalho: {0}</system:String>
58
<system:String x:Key="couldnotStartCmd">Não foi possível iniciar {0}</system:String>
@@ -36,6 +39,8 @@
3639
<system:String x:Key="ignoreHotkeysOnFullscreenToolTip">Desativar ativação do Flow Launcher se alguma aplicação estiver em ecrã completo (recomendado para jogos)</system:String>
3740
<system:String x:Key="defaultFileManager">Gestor de ficheiros padrão</system:String>
3841
<system:String x:Key="defaultFileManagerToolTip">Selecione o gestor de ficheiros utilizado para abrir a página</system:String>
42+
<system:String x:Key="defaultBrowser">Default Web Browser</system:String>
43+
<system:String x:Key="defaultBrowserToolTip">Setting for New Tab, New Window, Private Mode.</system:String>
3944
<system:String x:Key="pythonDirectory">Diretório Python</system:String>
4045
<system:String x:Key="autoUpdates">Atualização automática</system:String>
4146
<system:String x:Key="selectPythonDirectory">Selecionar</system:String>
@@ -160,6 +165,16 @@
160165
<system:String x:Key="fileManager_directory_arg">Argumento para pasta</system:String>
161166
<system:String x:Key="fileManager_file_arg">Argumento para ficheiro</system:String>
162167

168+
<!-- DefaultBrowser Setting Dialog -->
169+
<system:String x:Key="defaultBrowserTitle">Default Web Browser</system:String>
170+
<system:String x:Key="defaultBrowser_tips">The default setting follows the OS default browser setting. If specified separately, flow uses that browser.</system:String>
171+
<system:String x:Key="defaultBrowser_name">Browser</system:String>
172+
<system:String x:Key="defaultBrowser_profile_name">Browser Name</system:String>
173+
<system:String x:Key="defaultBrowser_path">Browser Path</system:String>
174+
<system:String x:Key="defaultBrowser_newtab">New Window</system:String>
175+
<system:String x:Key="defaultBrowser_newWindow">New Tab</system:String>
176+
<system:String x:Key="defaultBrowser_parameter">Priviate Mode</system:String>
177+
163178
<!-- Priority Setting Dialog -->
164179
<system:String x:Key="changePriorityWindow">Alterar prioridade</system:String>
165180
<system:String x:Key="priority_tips">Quanto maior for o número, melhor avaliação terá o resultado. Experimente com o número 5. Se quiser que os resultados sejam inferiores aos dos outros plugins, indique um número negativo.</system:String>
@@ -214,7 +229,7 @@
214229
<system:String x:Key="update_flowlauncher_updating">A atualizar...</system:String>
215230
<system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">
216231
Flow Launcher não conseguiu mover o seu perfil de dados para a nova versão.
217-
Queira por favor mover a pasta do seu perfil de {0} para {1}
232+
Queira por favor mover a pasta do seu perfil de {0} para {1}
218233
</system:String>
219234
<system:String x:Key="update_flowlauncher_new_update">Nova atualização</system:String>
220235
<system:String x:Key="update_flowlauncher_update_new_version_available">Está disponível a versão {0} do Flow Launcher</system:String>

‎Flow.Launcher/MainWindow.xaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
<KeyBinding Key="Escape" Command="{Binding EscCommand}" />
4242
<KeyBinding Key="F1" Command="{Binding StartHelpCommand}" />
4343
<KeyBinding Key="F5" Command="{Binding ReloadPluginDataCommand}" />
44-
<KeyBinding
45-
Key="Tab"
46-
Command="{Binding AutocompleteQueryCommand}"/>
44+
<KeyBinding Key="Tab" Command="{Binding AutocompleteQueryCommand}" />
4745
<KeyBinding
4846
Key="Tab"
4947
Command="{Binding AutocompleteQueryCommand}"
@@ -179,9 +177,9 @@
179177
Visibility="Visible">
180178
<TextBox.ContextMenu>
181179
<ContextMenu>
182-
<MenuItem Command="ApplicationCommands.Cut" />
183-
<MenuItem Command="ApplicationCommands.Copy" />
184-
<MenuItem Command="ApplicationCommands.Paste" />
180+
<MenuItem Command="ApplicationCommands.Cut" Header="{DynamicResource cut}" />
181+
<MenuItem Command="ApplicationCommands.Copy" Header="{DynamicResource copy}" />
182+
<MenuItem Command="ApplicationCommands.Paste" Header="{DynamicResource paste}" />
185183
<Separator
186184
Margin="0"
187185
Padding="0,4,0,4"

‎Flow.Launcher/Resources/CustomControlTemplate.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,6 @@
18301830
</Style>
18311831

18321832
<Style BasedOn="{StaticResource DefaultToggleSwitch}" TargetType="{x:Type ui:ToggleSwitch}" />
1833-
18341833
<!--#region Expander for Setting Window-->
18351834
<Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
18361835
<Setter Property="Template">

‎Flow.Launcher/SelectBrowserWindow.xaml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
Text="{DynamicResource defaultBrowser_name}" />
8787
<ComboBox
8888
Name="comboBox"
89-
Width="200"
9089
Height="35"
90+
MinWidth="200"
9191
Margin="14,0,0,0"
9292
HorizontalAlignment="Left"
9393
VerticalAlignment="Center"
@@ -121,8 +121,8 @@
121121
Orientation="Horizontal">
122122
<Grid Width="480">
123123
<Grid.ColumnDefinitions>
124-
<ColumnDefinition Width="150" />
125-
<ColumnDefinition />
124+
<ColumnDefinition Width="Auto" />
125+
<ColumnDefinition Width="2*" />
126126
</Grid.ColumnDefinitions>
127127
<Grid.RowDefinitions>
128128
<RowDefinition />
@@ -133,7 +133,7 @@
133133
<TextBlock
134134
Grid.Row="0"
135135
Grid.Column="0"
136-
Margin="14,5,0,0"
136+
Margin="14,5,10,0"
137137
HorizontalAlignment="Left"
138138
VerticalAlignment="Center"
139139
FontSize="14"
@@ -143,7 +143,7 @@
143143
Grid.Row="0"
144144
Grid.Column="1"
145145
Width="Auto"
146-
Margin="10,5,15,0"
146+
Margin="10,5,0,0"
147147
HorizontalAlignment="Stretch"
148148
VerticalAlignment="Center"
149149
IsEnabled="{Binding Editable}"
@@ -156,21 +156,13 @@
156156
VerticalAlignment="Center"
157157
FontSize="14"
158158
Text="{DynamicResource defaultBrowser_path}" />
159-
<StackPanel
159+
<DockPanel
160160
Grid.Row="1"
161161
Grid.Column="1"
162-
Orientation="Horizontal">
163-
<TextBox
164-
x:Name="PathTextBox"
165-
Width="220"
166-
Margin="10,10,5,0"
167-
HorizontalAlignment="Stretch"
168-
VerticalAlignment="Center"
169-
IsEnabled="{Binding Editable}"
170-
Text="{Binding Path}" />
162+
HorizontalAlignment="Stretch"
163+
LastChildFill="True">
171164
<Button
172165
Name="btnBrowseFile"
173-
Width="80"
174166
Margin="0,10,0,0"
175167
HorizontalAlignment="Right"
176168
VerticalAlignment="Center"
@@ -187,7 +179,14 @@
187179
</Style>
188180
</Button.Style>
189181
</Button>
190-
</StackPanel>
182+
<TextBox
183+
x:Name="PathTextBox"
184+
Margin="10,10,5,0"
185+
HorizontalAlignment="Stretch"
186+
VerticalAlignment="Center"
187+
IsEnabled="{Binding Editable}"
188+
Text="{Binding Path}" />
189+
</DockPanel>
191190

192191
<StackPanel
193192
Grid.Row="2"

0 commit comments

Comments
 (0)