Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f42d6a1
Change Toggle on/off string to hardcode text
onesounds Dec 11, 2021
b2184c3
Change Hardcoded toggle on/off label to string
onesounds Dec 11, 2021
261fdd0
Change Toggle Switch Width to responsive
onesounds Dec 11, 2021
d08f47f
Change Lastquery Combobox to responsive
onesounds Dec 14, 2021
405a33c
Fix Shell Plugin Checkbox
onesounds Dec 14, 2021
0b5c77e
Change Button Sizes in Explorer Setting Panel
onesounds Dec 14, 2021
6095d0b
- Change Hardcoded text to string
onesounds Dec 14, 2021
3f1f23b
Change Bookmark layout to responsive
onesounds Dec 14, 2021
564349c
Change Actionkeyword hardcoded tooltip to string
onesounds Dec 14, 2021
baeb454
Change Plugin Author Width to responsive
onesounds Dec 15, 2021
213396b
Change Plugin Information area to responsive
onesounds Dec 15, 2021
5a75f76
Change Default Browser Area to responsive
onesounds Dec 15, 2021
bf6fbf7
Adjust Layout in CustomBrowserSetting in Bookmark Plugin
onesounds Dec 15, 2021
968315a
Adjust Layout custombrowsersetting in bookmark plugin
onesounds Dec 15, 2021
f279c20
Adjust File Manager Window
onesounds Dec 15, 2021
c82306f
Add Default Browser Setting Strings in Portugee
onesounds Dec 15, 2021
3b5b3ab
Add BookmarkData Window Title String in portugee
onesounds Dec 15, 2021
9965063
Adjust Color Scheme Button Size
onesounds Dec 15, 2021
979c89d
Adjust Calculator layout to responsive
onesounds Dec 15, 2021
70e48af
Update Korean language
onesounds Dec 15, 2021
21ddf4c
Add Korean Strings
onesounds Dec 15, 2021
155156f
Add String in ContextMenu
onesounds Dec 15, 2021
2ce5260
Adjust Korean String in WindowsSetting
onesounds Dec 15, 2021
70e4414
Merge branch 'dev' into HotfixToggleSwitch
onesounds Dec 15, 2021
d7d567e
Change Searchsource Window layout to responsive (in WebSearch Plugin)
onesounds Dec 15, 2021
48ef53f
Change CustomQueryHotkeyWindow to Responsive
onesounds Dec 15, 2021
f63f221
Change CustomHotkey/Install Buttons in Setting windows to responsive
onesounds Dec 15, 2021
f8eafb4
Adjust Shell plugin layout
onesounds Dec 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions Flow.Launcher/CustomQueryHotkeySetting.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,18 @@
</StackPanel>

<StackPanel Margin="0,20,0,0" Orientation="Horizontal">
<Grid>
<Grid Width="470">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Row="0"
Grid.Column="0"
Width="Auto"
MinWidth="110"
Margin="10"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Expand All @@ -106,7 +104,7 @@
x:Name="ctlHotkey"
Grid.Column="1"
Width="200"
Height="34"
Height="36"
Margin="10,0,10,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Expand All @@ -123,29 +121,27 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Width="Auto"
MinWidth="110"
Margin="10"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="14"
Text="{DynamicResource customQuery}" />
<StackPanel
<DockPanel
Grid.Row="1"
Grid.Column="1"
Orientation="Horizontal">
<TextBox
x:Name="tbAction"
MinWidth="220"
Margin="10"
HorizontalAlignment="Left"
VerticalAlignment="Center" />
LastChildFill="True">
<Button
x:Name="btnTestActionKeyword"
Padding="10,5,10,5"
Click="BtnTestActionKeyword_OnClick"
Content="{DynamicResource preview}" />
</StackPanel>
Content="{DynamicResource preview}"
DockPanel.Dock="Right" />
<TextBox
x:Name="tbAction"
Margin="10"
HorizontalAlignment="Stretch"
VerticalAlignment="Center" />
</DockPanel>
</Grid>
</StackPanel>
</StackPanel>
Expand All @@ -159,15 +155,13 @@
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<Button
x:Name="btnCancel"
Width="100"
Height="32"
MinWidth="140"
Margin="10,0,5,0"
Click="BtnCancel_OnClick"
Content="{DynamicResource cancel}" />
<Button
x:Name="btnAdd"
Width="100"
Height="32"
MinWidth="140"
Margin="5,0,10,0"
Click="btnAdd_OnClick"
Style="{StaticResource AccentButtonStyle}">
Expand Down
4 changes: 4 additions & 0 deletions Flow.Launcher/Languages/en.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<system:String x:Key="iconTrayAbout">About</system:String>
<system:String x:Key="iconTrayExit">Exit</system:String>
<system:String x:Key="closeWindow">Close</system:String>
<system:String x:Key="copy">Copy</system:String>
<system:String x:Key="cut">Cut</system:String>
<system:String x:Key="paste">Paste</system:String>
<system:String x:Key="GameMode">Game Mode</system:String>
<system:String x:Key="GameModeToolTip">Suspend the use of Hotkeys.</system:String>

Expand Down Expand Up @@ -60,6 +63,7 @@
<system:String x:Key="actionKeywords">Action keyword</system:String>
<system:String x:Key="currentActionKeywords">Current action keyword</system:String>
<system:String x:Key="newActionKeyword">New action keyword</system:String>
<system:String x:Key="actionKeywordsTooltip">Change Action Keywords</system:String>
<system:String x:Key="currentPriority">Current Priority</system:String>
<system:String x:Key="newPriority">New Priority</system:String>
<system:String x:Key="priority">Priority</system:String>
Expand Down
15 changes: 15 additions & 0 deletions Flow.Launcher/Languages/ko.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<system:String x:Key="iconTrayAbout">정보</system:String>
<system:String x:Key="iconTrayExit">종료</system:String>
<system:String x:Key="closeWindow">닫기</system:String>
<system:String x:Key="copy">복사</system:String>
<system:String x:Key="cut">잘라내기</system:String>
<system:String x:Key="paste">붙여넣기</system:String>
<system:String x:Key="GameMode">게임 모드</system:String>
<system:String x:Key="GameModeToolTip">단축키 사용을 일시중단합니다.</system:String>

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

<!-- DefaultBrowser Setting Dialog -->
<system:String x:Key="defaultBrowserTitle">기본 웹 브라우저r</system:String>
<system:String x:Key="defaultBrowser_tips">기본 설정은 OS의 브라우저 설정을 따릅니다. 별도 설정시 Flow Launcher가 해당 브라우저를 사용합니다.</system:String>
<system:String x:Key="defaultBrowser_name">브라우저</system:String>
<system:String x:Key="defaultBrowser_profile_name">브라우저 이름</system:String>
<system:String x:Key="defaultBrowser_path">브라우저 경로</system:String>
<system:String x:Key="defaultBrowser_newtab">새 창</system:String>
<system:String x:Key="defaultBrowser_newWindow">새 탭</system:String>
<system:String x:Key="defaultBrowser_parameter">프라이빗 모드</system:String>

<!-- Priority Setting Dialog -->
<system:String x:Key="changePriorityWindow">중요도 변경</system:String>
<system:String x:Key="priority_tips">높은 수를 넣을수록 상위 결과에 표시됩니다. 5를 시도해보세요. 다른 플러그인 보다 결과를 낮춰 표시하고 싶다면, 그보다 낮은 수를 입력하세요.</system:String>
Expand Down
21 changes: 18 additions & 3 deletions Flow.Launcher/Languages/pt-pt.xaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<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">
<?xml version="1.0" ?>
<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">
<!-- MainWindow -->
<system:String x:Key="registerHotkeyFailed">Falha ao registar tecla de atalho: {0}</system:String>
<system:String x:Key="couldnotStartCmd">Não foi possível iniciar {0}</system:String>
Expand Down Expand Up @@ -36,6 +39,8 @@
<system:String x:Key="ignoreHotkeysOnFullscreenToolTip">Desativar ativação do Flow Launcher se alguma aplicação estiver em ecrã completo (recomendado para jogos)</system:String>
<system:String x:Key="defaultFileManager">Gestor de ficheiros padrão</system:String>
<system:String x:Key="defaultFileManagerToolTip">Selecione o gestor de ficheiros utilizado para abrir a página</system:String>
<system:String x:Key="defaultBrowser">Default Web Browser</system:String>
<system:String x:Key="defaultBrowserToolTip">Setting for New Tab, New Window, Private Mode.</system:String>
<system:String x:Key="pythonDirectory">Diretório Python</system:String>
<system:String x:Key="autoUpdates">Atualização automática</system:String>
<system:String x:Key="selectPythonDirectory">Selecionar</system:String>
Expand Down Expand Up @@ -160,6 +165,16 @@
<system:String x:Key="fileManager_directory_arg">Argumento para pasta</system:String>
<system:String x:Key="fileManager_file_arg">Argumento para ficheiro</system:String>

<!-- DefaultBrowser Setting Dialog -->
<system:String x:Key="defaultBrowserTitle">Default Web Browser</system:String>
<system:String x:Key="defaultBrowser_tips">The default setting follows the OS default browser setting. If specified separately, flow uses that browser.</system:String>
<system:String x:Key="defaultBrowser_name">Browser</system:String>
<system:String x:Key="defaultBrowser_profile_name">Browser Name</system:String>
<system:String x:Key="defaultBrowser_path">Browser Path</system:String>
<system:String x:Key="defaultBrowser_newtab">New Window</system:String>
<system:String x:Key="defaultBrowser_newWindow">New Tab</system:String>
<system:String x:Key="defaultBrowser_parameter">Priviate Mode</system:String>

<!-- Priority Setting Dialog -->
<system:String x:Key="changePriorityWindow">Alterar prioridade</system:String>
<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>
Expand Down Expand Up @@ -214,7 +229,7 @@
<system:String x:Key="update_flowlauncher_updating">A atualizar...</system:String>
<system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">
Flow Launcher não conseguiu mover o seu perfil de dados para a nova versão.
Queira por favor mover a pasta do seu perfil de {0} para {1}
Queira por favor mover a pasta do seu perfil de {0} para {1}
</system:String>
<system:String x:Key="update_flowlauncher_new_update">Nova atualização</system:String>
<system:String x:Key="update_flowlauncher_update_new_version_available">Está disponível a versão {0} do Flow Launcher</system:String>
Expand Down
10 changes: 4 additions & 6 deletions Flow.Launcher/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@
<KeyBinding Key="Escape" Command="{Binding EscCommand}" />
<KeyBinding Key="F1" Command="{Binding StartHelpCommand}" />
<KeyBinding Key="F5" Command="{Binding ReloadPluginDataCommand}" />
<KeyBinding
Key="Tab"
Command="{Binding AutocompleteQueryCommand}"/>
<KeyBinding Key="Tab" Command="{Binding AutocompleteQueryCommand}" />
<KeyBinding
Key="Tab"
Command="{Binding AutocompleteQueryCommand}"
Expand Down Expand Up @@ -179,9 +177,9 @@
Visibility="Visible">
<TextBox.ContextMenu>
<ContextMenu>
<MenuItem Command="ApplicationCommands.Cut" />
<MenuItem Command="ApplicationCommands.Copy" />
<MenuItem Command="ApplicationCommands.Paste" />
<MenuItem Command="ApplicationCommands.Cut" Header="{DynamicResource cut}" />
<MenuItem Command="ApplicationCommands.Copy" Header="{DynamicResource copy}" />
<MenuItem Command="ApplicationCommands.Paste" Header="{DynamicResource paste}" />
<Separator
Margin="0"
Padding="0,4,0,4"
Expand Down
1 change: 0 additions & 1 deletion Flow.Launcher/Resources/CustomControlTemplate.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -1830,7 +1830,6 @@
</Style>

<Style BasedOn="{StaticResource DefaultToggleSwitch}" TargetType="{x:Type ui:ToggleSwitch}" />

<!--#region Expander for Setting Window-->
<Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
<Setter Property="Template">
Expand Down
33 changes: 16 additions & 17 deletions Flow.Launcher/SelectBrowserWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
Text="{DynamicResource defaultBrowser_name}" />
<ComboBox
Name="comboBox"
Width="200"
Height="35"
MinWidth="200"
Margin="14,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Expand Down Expand Up @@ -121,8 +121,8 @@
Orientation="Horizontal">
<Grid Width="480">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150" />
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="2*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
Expand All @@ -133,7 +133,7 @@
<TextBlock
Grid.Row="0"
Grid.Column="0"
Margin="14,5,0,0"
Margin="14,5,10,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="14"
Expand All @@ -143,7 +143,7 @@
Grid.Row="0"
Grid.Column="1"
Width="Auto"
Margin="10,5,15,0"
Margin="10,5,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
IsEnabled="{Binding Editable}"
Expand All @@ -156,21 +156,13 @@
VerticalAlignment="Center"
FontSize="14"
Text="{DynamicResource defaultBrowser_path}" />
<StackPanel
<DockPanel
Grid.Row="1"
Grid.Column="1"
Orientation="Horizontal">
<TextBox
x:Name="PathTextBox"
Width="220"
Margin="10,10,5,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
IsEnabled="{Binding Editable}"
Text="{Binding Path}" />
HorizontalAlignment="Stretch"
LastChildFill="True">
<Button
Name="btnBrowseFile"
Width="80"
Margin="0,10,0,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Expand All @@ -187,7 +179,14 @@
</Style>
</Button.Style>
</Button>
</StackPanel>
<TextBox
x:Name="PathTextBox"
Margin="10,10,5,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
IsEnabled="{Binding Editable}"
Text="{Binding Path}" />
</DockPanel>

<StackPanel
Grid.Row="2"
Expand Down
Loading