diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index dbb47fd8e..9ea71f683 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -10,6 +10,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
public class Settings : BaseModel
{
public string Hotkey { get; set; } = "Alt + Space";
+ public string OpenResultModifiers { get; set; } = "Alt";
public string Language { get; set; } = "en";
public string Theme { get; set; } = "Dark";
public string QueryBoxFont { get; set; } = FontFamily.GenericSansSerif.Name;
diff --git a/Flow.Launcher/Converters/OrdinalConverter.cs b/Flow.Launcher/Converters/OrdinalConverter.cs
new file mode 100644
index 000000000..970ed183c
--- /dev/null
+++ b/Flow.Launcher/Converters/OrdinalConverter.cs
@@ -0,0 +1,22 @@
+using System.Globalization;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Flow.Launcher.Converters
+{
+ public class OrdinalConverter : IValueConverter
+ {
+ public object Convert(object value, System.Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value is ListBoxItem listBoxItem)
+ {
+ ListBox listBox = ItemsControl.ItemsControlFromItemContainer(listBoxItem) as ListBox;
+ return listBox.ItemContainerGenerator.IndexFromContainer(listBoxItem) + 1;
+ }
+
+ return 0;
+ }
+
+ public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException();
+ }
+}
diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml
index 4c3d4bd85..49d3ef37b 100644
--- a/Flow.Launcher/Languages/da.xaml
+++ b/Flow.Launcher/Languages/da.xaml
@@ -51,6 +51,7 @@
Genvejstast
Flow Launcher genvejstast
+ Åbn resultatmodifikatorer
Tilpasset søgegenvejstast
Slet
Rediger
diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml
index d1eae3124..67e33cab4 100644
--- a/Flow.Launcher/Languages/de.xaml
+++ b/Flow.Launcher/Languages/de.xaml
@@ -51,6 +51,7 @@
Tastenkombination
Flow Launcher Tastenkombination
+ Öffnen Sie die Ergebnismodifikatoren
Benutzerdefinierte Abfrage Tastenkombination
Löschen
Bearbeiten
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 46519f058..7d5baa424 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -60,6 +60,7 @@
Hotkey
Flow Launcher Hotkey
+ Open Result Modifiers
Custom Query Hotkey
Delete
Edit
diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml
index 4ceb06249..39ee0c74d 100644
--- a/Flow.Launcher/Languages/fr.xaml
+++ b/Flow.Launcher/Languages/fr.xaml
@@ -55,6 +55,7 @@
Raccourcis
Ouvrir Flow Launcher
+ Modificateurs de résultats ouverts
Requêtes personnalisées
Supprimer
Modifier
diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml
index 381864f8a..18795ed62 100644
--- a/Flow.Launcher/Languages/it.xaml
+++ b/Flow.Launcher/Languages/it.xaml
@@ -55,6 +55,7 @@
Tasti scelta rapida
Tasto scelta rapida Flow Launcher
+ Apri modificatori di risultato
Tasti scelta rapida per ricerche personalizzate
Cancella
Modifica
diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml
index 0fd5e3e79..eb18ac3fa 100644
--- a/Flow.Launcher/Languages/ja.xaml
+++ b/Flow.Launcher/Languages/ja.xaml
@@ -58,6 +58,7 @@
ホットキー
Flow Launcher ホットキー
+ 結果修飾子を開く
カスタムクエリ ホットキー
削除
編集
diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
index 2f7d538dc..4fca622e4 100644
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@@ -55,6 +55,7 @@
핫키
Flow Launcher 핫키
+ 결과 수정 자 열기
사용자지정 쿼리 핫키
삭제
편집
diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml
index 035b0cbdf..dc87a58ec 100644
--- a/Flow.Launcher/Languages/nb-NO.xaml
+++ b/Flow.Launcher/Languages/nb-NO.xaml
@@ -55,6 +55,7 @@
Hurtigtast
Flow Launcher-hurtigtast
+ Åpne resultatmodifiserere
Egendefinerd spørringshurtigtast
Slett
Rediger
diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml
index be18beb9c..ed2a52e9d 100644
--- a/Flow.Launcher/Languages/nl.xaml
+++ b/Flow.Launcher/Languages/nl.xaml
@@ -51,6 +51,7 @@
Sneltoets
Flow Launcher Sneltoets
+ Open resultaatmodificatoren
Custom Query Sneltoets
Verwijder
Bewerken
diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml
index 249878ed3..d94ff5295 100644
--- a/Flow.Launcher/Languages/pl.xaml
+++ b/Flow.Launcher/Languages/pl.xaml
@@ -51,6 +51,7 @@
Skrót klawiszowy
Skrót klawiszowy Flow Launcher
+ Modyfikatory klawiszów otwierających wyniki
Skrót klawiszowy niestandardowych zapytań
Usuń
Edytuj
diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml
index 2036744e8..b22ed05ea 100644
--- a/Flow.Launcher/Languages/pt-br.xaml
+++ b/Flow.Launcher/Languages/pt-br.xaml
@@ -55,6 +55,7 @@
Atalho
Atalho do Flow Launcher
+ Modificadores de resultado aberto
Atalho de Consulta Personalizada
Apagar
Editar
diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml
index 66a463dcb..93d1f476a 100644
--- a/Flow.Launcher/Languages/ru.xaml
+++ b/Flow.Launcher/Languages/ru.xaml
@@ -51,6 +51,7 @@
Горячие клавиши
Горячая клавиша Flow Launcher
+ Модификаторы открытого результата
Задаваемые горячие клавиши для запросов
Удалить
Изменить
diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml
index 824096c4c..76450f5d8 100644
--- a/Flow.Launcher/Languages/sk.xaml
+++ b/Flow.Launcher/Languages/sk.xaml
@@ -56,6 +56,7 @@
Klávesová skratka
Klávesová skratka pre Flow Launcher
+ Otvorte modifikátory výsledkov
Vlastná klávesová skratka pre dopyt
Odstrániť
Upraviť
diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml
index 22aabb37f..bfae4917f 100644
--- a/Flow.Launcher/Languages/sr.xaml
+++ b/Flow.Launcher/Languages/sr.xaml
@@ -55,6 +55,7 @@
Prečica
Flow Launcher prečica
+ Отворите модификаторе резултата
prečica za ručno dodat upit
Obriši
Izmeni
diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml
index cc287f372..da61d1c5d 100644
--- a/Flow.Launcher/Languages/tr.xaml
+++ b/Flow.Launcher/Languages/tr.xaml
@@ -59,6 +59,7 @@
Kısayol Tuşu
Flow Launcher Kısayolu
+ Açık Sonuç Değiştiricileri
Özel Sorgu Kısayolları
Sil
Düzenle
diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml
index c7e84c231..baad144a7 100644
--- a/Flow.Launcher/Languages/uk-UA.xaml
+++ b/Flow.Launcher/Languages/uk-UA.xaml
@@ -51,6 +51,7 @@
Гарячі клавіші
Гаряча клавіша Flow Launcher
+ Відкриті модифікатори результатів
Задані гарячі клавіші для запитів
Видалити
Змінити
diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml
index 5801b678a..b5d03b858 100644
--- a/Flow.Launcher/Languages/zh-cn.xaml
+++ b/Flow.Launcher/Languages/zh-cn.xaml
@@ -58,6 +58,7 @@
热键
Flow Launcher激活热键
+ 开放结果修饰符
自定义查询热键
删除
编辑
diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml
index f1df1a6d5..81277ae3e 100644
--- a/Flow.Launcher/Languages/zh-tw.xaml
+++ b/Flow.Launcher/Languages/zh-tw.xaml
@@ -51,6 +51,7 @@
熱鍵
Flow Launcher 執行熱鍵
+ 開放結果修飾符
自定義熱鍵查詢
刪除
編輯
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 74185fcbd..485f58b47 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -48,15 +48,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index c9ca658f2..c79ba40dd 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -33,6 +33,7 @@
Cursor="Hand" UseLayoutRounding="False">
+
@@ -46,6 +47,8 @@
+
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index be87e4f52..cd56332d7 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -287,9 +287,10 @@
+
-
+
-
+
+
+
+
+ Margin="0 5 0 0" Grid.Row="3">
@@ -322,7 +330,7 @@
-
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index c677d7c71..c34bbade1 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -26,6 +26,8 @@ namespace Flow.Launcher.ViewModel
{
#region Private Fields
+ private const string DefaultOpenResultModifiers = "Alt";
+
private bool _isQueryRunning;
private Query _lastQuery;
private string _queryTextBeforeLeaveResults;
@@ -74,6 +76,7 @@ namespace Flow.Launcher.ViewModel
SetHotkey(_settings.Hotkey, OnHotkey);
SetCustomPluginHotkey();
+ SetOpenResultModifiers();
}
private void RegisterResultsUpdatedEvent()
@@ -277,6 +280,8 @@ namespace Flow.Launcher.ViewModel
public ICommand LoadHistoryCommand { get; set; }
public ICommand OpenResultCommand { get; set; }
+ public string OpenResultCommandModifiers { get; private set; }
+
#endregion
public void Query()
@@ -594,6 +599,11 @@ namespace Flow.Launcher.ViewModel
}
}
+ private void SetOpenResultModifiers()
+ {
+ OpenResultCommandModifiers = _settings.OpenResultModifiers ?? DefaultOpenResultModifiers;
+ }
+
private void OnHotkey(object sender, HotkeyEventArgs e)
{
if (!ShouldIgnoreHotkeys())
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 1a5d91a49..bafbdf0cc 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -139,6 +139,7 @@ namespace Flow.Launcher.ViewModel
}
}
+ public List OpenResultModifiersList => new List { "Alt", "Ctrl", "Ctrl+Alt" };
private Internationalization _translater => InternationalizationManager.Instance;
public List Languages => _translater.LoadAvailableLanguages();
public IEnumerable MaxResultsRange => Enumerable.Range(2, 16);