From 196c359819b06a48348b2dbace1888e4ad4cb577 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 3 Feb 2023 13:07:46 +0800 Subject: [PATCH 01/30] Add custom firefox browser location --- .../Commands/BookmarkLoader.cs | 12 +++++-- .../CustomFirefoxBookmarkLoader.cs | 30 ++++++++++++++++++ .../FirefoxBookmarkLoader.cs | 31 +++++++++++++------ .../Models/CustomBrowser.cs | 21 ++++++++++++- 4 files changed, 81 insertions(+), 13 deletions(-) create mode 100644 Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs index 77d9c64a0..bfb611cf7 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs @@ -44,11 +44,19 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Commands foreach (var browser in setting.CustomChromiumBrowsers) { - var loader = new CustomChromiumBookmarkLoader(browser); + IBookmarkLoader loader; + if (browser.BrowserType == BrowserType.Chromium) + { + loader = new CustomChromiumBookmarkLoader(browser); + } + else + { + loader = new CustomFirefoxBookmarkLoader(browser); + } allBookmarks.AddRange(loader.GetBookmarks()); } return allBookmarks.Distinct().ToList(); } } -} \ No newline at end of file +} diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs new file mode 100644 index 000000000..26e62df5e --- /dev/null +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Flow.Launcher.Plugin.BrowserBookmark.Models; + +namespace Flow.Launcher.Plugin.BrowserBookmark +{ + public class CustomFirefoxBookmarkLoader : FirefoxBookmarkLoaderBase + { + public CustomFirefoxBookmarkLoader(CustomBrowser browser) + { + BrowserName = browser.Name; + BrowserDataPath = browser.DataDirectoryPath; + } + + /// + /// Path to places.sqlite + /// + public string BrowserDataPath { get; init; } + + public string BrowserName { get; init; } + + public override List GetBookmarks() + { + return GetBookmarksFromPath(BrowserDataPath); + } + } +} diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs index fc58e40df..022f28144 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs @@ -7,8 +7,10 @@ using System.Linq; namespace Flow.Launcher.Plugin.BrowserBookmark { - public class FirefoxBookmarkLoader : IBookmarkLoader + public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader { + public abstract List GetBookmarks(); + private const string queryAllBookmarks = @"SELECT moz_places.url, moz_bookmarks.title FROM moz_places INNER JOIN moz_bookmarks ON ( @@ -19,21 +21,18 @@ namespace Flow.Launcher.Plugin.BrowserBookmark private const string dbPathFormat = "Data Source ={0};Version=3;New=False;Compress=True;"; - /// - /// Searches the places.sqlite db and returns all bookmarks - /// - public List GetBookmarks() + protected static List GetBookmarksFromPath(string placesPath) { // Return empty list if the places.sqlite file cannot be found - if (string.IsNullOrEmpty(PlacesPath) || !File.Exists(PlacesPath)) + if (string.IsNullOrEmpty(placesPath) || !File.Exists(placesPath)) return new List(); var bookmarkList = new List(); - - Main.RegisterBookmarkFile(PlacesPath); + + Main.RegisterBookmarkFile(placesPath); // create the connection string and init the connection - string dbPath = string.Format(dbPathFormat, PlacesPath); + string dbPath = string.Format(dbPathFormat, placesPath); using var dbConnection = new SQLiteConnection(dbPath); // Open connection to the database file and execute the query dbConnection.Open(); @@ -41,13 +40,25 @@ namespace Flow.Launcher.Plugin.BrowserBookmark // return results in List format bookmarkList = reader.Select( - x => new Bookmark(x["title"] is DBNull ? string.Empty : x["title"].ToString(), + x => new Bookmark(x["title"] is DBNull ? string.Empty : x["title"].ToString(), x["url"].ToString()) ).ToList(); return bookmarkList; } + } + + public class FirefoxBookmarkLoader : FirefoxBookmarkLoaderBase + { + /// + /// Searches the places.sqlite db and returns all bookmarks + /// + public override List GetBookmarks() + { + return GetBookmarksFromPath(PlacesPath); + } + /// /// Path to places.sqlite /// diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/CustomBrowser.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/CustomBrowser.cs index c19de08a4..69bb56e48 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/CustomBrowser.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/CustomBrowser.cs @@ -4,6 +4,8 @@ { private string _name; private string _dataDirectoryPath; + private BrowserType browserType = BrowserType.Chromium; + public string Name { get => _name; @@ -13,6 +15,7 @@ OnPropertyChanged(nameof(Name)); } } + public string DataDirectoryPath { get => _dataDirectoryPath; @@ -22,5 +25,21 @@ OnPropertyChanged(nameof(DataDirectoryPath)); } } + + public BrowserType BrowserType + { + get => browserType; + set + { + browserType = value; + OnPropertyChanged(nameof(BrowserType)); + } + } } -} \ No newline at end of file + + public enum BrowserType + { + Chromium, + Firefox, + } +} From fe5da58378d3a7f733220fe3ed0cefebcb513760 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 3 Feb 2023 16:23:14 +0800 Subject: [PATCH 02/30] Use switch expression for loader --- .../Commands/BookmarkLoader.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs index bfb611cf7..d08c05b6b 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs @@ -44,15 +44,12 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Commands foreach (var browser in setting.CustomChromiumBrowsers) { - IBookmarkLoader loader; - if (browser.BrowserType == BrowserType.Chromium) + IBookmarkLoader loader = browser.BrowserType switch { - loader = new CustomChromiumBookmarkLoader(browser); - } - else - { - loader = new CustomFirefoxBookmarkLoader(browser); - } + BrowserType.Chromium => new CustomChromiumBookmarkLoader(browser), + BrowserType.Firefox => new CustomFirefoxBookmarkLoader(browser), + _ => new CustomChromiumBookmarkLoader(browser), + }; allBookmarks.AddRange(loader.GetBookmarks()); } From c7f3283e3a674b3b6787fe43ed07b55baa692f6d Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 3 Feb 2023 17:07:33 +0800 Subject: [PATCH 03/30] Add UI to select browser engine --- .../CustomFirefoxBookmarkLoader.cs | 6 +---- .../Languages/en.xaml | 1 + .../Views/CustomBrowserSetting.xaml | 23 ++++++++++++++++++- .../Views/CustomBrowserSetting.xaml.cs | 17 ++++---------- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs index 26e62df5e..c79cf86cb 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Flow.Launcher.Plugin.BrowserBookmark.Models; namespace Flow.Launcher.Plugin.BrowserBookmark diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml index 7c88708f5..5dbe925c1 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml @@ -22,4 +22,5 @@ Add Delete Others + Browser Engine \ No newline at end of file diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml index aff850728..499d22834 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Flow.Launcher.Plugin.BrowserBookmark.Models" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="clr-namespace:Flow.Launcher.Infrastructure.UI;assembly=Flow.Launcher.Infrastructure" Title="{DynamicResource flowlauncher_plugin_browserbookmark_bookmarkDataSetting}" Width="520" Background="{DynamicResource PopuBGColor}" @@ -79,6 +80,7 @@ + + + + Date: Fri, 3 Feb 2023 17:29:51 +0800 Subject: [PATCH 04/30] Fix folder path --- .../CustomFirefoxBookmarkLoader.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs index c79cf86cb..82bdc29f5 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/CustomFirefoxBookmarkLoader.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.IO; using Flow.Launcher.Plugin.BrowserBookmark.Models; namespace Flow.Launcher.Plugin.BrowserBookmark @@ -20,7 +21,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark public override List GetBookmarks() { - return GetBookmarksFromPath(BrowserDataPath); + return GetBookmarksFromPath(Path.Combine(BrowserDataPath, "places.sqlite")); } } } From a6d3aafe9be695cd76eedc5610bb28b4c508bec0 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 6 Feb 2023 12:57:55 +0800 Subject: [PATCH 05/30] Add Browser Engine header --- .../Views/SettingsControl.xaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml index 12a84cb5a..628a9417b 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml @@ -46,6 +46,8 @@ Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}"/> + From 46c8dd8070e693831bde35a3bc150ba40a4e466f Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Thu, 9 Feb 2023 12:25:59 +0800 Subject: [PATCH 06/30] Fix translation --- Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs index 4cbe01c97..f5733bbb5 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs @@ -177,7 +177,7 @@ namespace Flow.Launcher.Plugin.Explorer try { if (MessageBox.Show( - Context.API.GetTranslation("plugin_explorer_deletefilefolderconfirm"), + string.Format(Context.API.GetTranslation("plugin_explorer_delete_folder_link"), record.FullPath), string.Empty, MessageBoxButton.YesNo, MessageBoxIcon.Warning) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml index 15456079a..82029e8c5 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml @@ -7,7 +7,6 @@ Please make a selection first Please select a folder link Are you sure you want to delete {0}? - Are you sure you want to permanently delete this folder? Are you sure you want to permanently delete this file? Are you sure you want to permanently delete this file/folder? Deletion successful From 69f496085fadab9c8467ccb87636b3853457164a Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 10 Feb 2023 13:06:29 +0900 Subject: [PATCH 07/30] - Change Singular Hotkey/Plugin title area to Plural (Hotkeys/Plugins) - Added Plural key for other langues --- Flow.Launcher/Languages/da.xaml | 9 ++++++-- Flow.Launcher/Languages/de.xaml | 9 ++++++-- Flow.Launcher/Languages/en.xaml | 8 ++++--- Flow.Launcher/Languages/es-419.xaml | 9 ++++++-- Flow.Launcher/Languages/es.xaml | 9 ++++++-- Flow.Launcher/Languages/fr.xaml | 9 ++++++-- Flow.Launcher/Languages/it.xaml | 13 +++++++---- Flow.Launcher/Languages/ja.xaml | 2 ++ Flow.Launcher/Languages/ko.xaml | 9 ++++++-- Flow.Launcher/Languages/nb-NO.xaml | 35 ++++++++++++++++------------- Flow.Launcher/Languages/nb.xaml | 9 ++++++-- Flow.Launcher/Languages/nl.xaml | 9 ++++++-- Flow.Launcher/Languages/pl.xaml | 9 ++++++-- Flow.Launcher/Languages/pt-br.xaml | 9 ++++++-- Flow.Launcher/Languages/pt-pt.xaml | 11 ++++++--- Flow.Launcher/Languages/ru.xaml | 9 ++++++-- Flow.Launcher/Languages/sk.xaml | 11 ++++++--- Flow.Launcher/Languages/sr.xaml | 11 ++++++--- Flow.Launcher/Languages/tr.xaml | 9 ++++++-- Flow.Launcher/Languages/uk-UA.xaml | 9 ++++++-- Flow.Launcher/Languages/zh-cn.xaml | 11 ++++++--- Flow.Launcher/Languages/zh-tw.xaml | 9 ++++++-- Flow.Launcher/SettingWindow.xaml | 8 +++---- 23 files changed, 169 insertions(+), 67 deletions(-) diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml index f8db8420d..e42b32cdf 100644 --- a/Flow.Launcher/Languages/da.xaml +++ b/Flow.Launcher/Languages/da.xaml @@ -1,5 +1,8 @@ - - + + Kunne ikke registrere genvejstast: {0} Kunne ikke starte {0} @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Find flere plugins On Deaktiver @@ -152,6 +156,7 @@ Genvejstast + Genvejstast Flow Launcher genvejstast Enter shortcut to show/hide Flow Launcher. Preview Hotkey diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml index 09b800f71..eef15512d 100644 --- a/Flow.Launcher/Languages/de.xaml +++ b/Flow.Launcher/Languages/de.xaml @@ -1,5 +1,8 @@ - - + + Tastenkombinationregistrierung: {0} fehlgeschlagen Kann {0} nicht starten @@ -80,6 +83,7 @@ No results found Please try a different search. Erweiterung + Erweiterung Suche nach weiteren Plugins Aktivieren Deaktivieren @@ -152,6 +156,7 @@ Tastenkombination + Tastenkombination Flow Launcher Tastenkombination Verknüpfung eingeben, um Flow Launcher anzuzeigen/auszublenden. Preview Hotkey diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 49c603dc8..cfed3ad07 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -82,6 +82,7 @@ No results found Please try a different search. Plugin + Plugins Find more plugins On Off @@ -154,6 +155,7 @@ Hotkey + Hotkeys Flow Launcher Hotkey Enter shortcut to show/hide Flow Launcher. Preview Hotkey @@ -162,9 +164,9 @@ Select a modifier key to open selected result via keyboard. Show Hotkey Show result selection hotkey with results. - Custom Query Hotkey - Custom Query Shortcut - Built-in Shortcut + Custom Query Hotkeys + Custom Query Shortcuts + Built-in Shortcuts Query Shortcut Expansion diff --git a/Flow.Launcher/Languages/es-419.xaml b/Flow.Launcher/Languages/es-419.xaml index 85da44045..ec50ef7af 100644 --- a/Flow.Launcher/Languages/es-419.xaml +++ b/Flow.Launcher/Languages/es-419.xaml @@ -1,5 +1,8 @@ - - + + Error al registrar la tecla de acceso directo: {0} No se pudo iniciar {0} @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Encontrar más plugins Activado Desactivado @@ -152,6 +156,7 @@ Tecla Rápida + Tecla Rápida Tecla de acceso a Flow Launcher Introduzca el acceso directo para mostrar/ocultar Flow Launcher. Preview Hotkey diff --git a/Flow.Launcher/Languages/es.xaml b/Flow.Launcher/Languages/es.xaml index aa2874399..a989fed03 100644 --- a/Flow.Launcher/Languages/es.xaml +++ b/Flow.Launcher/Languages/es.xaml @@ -1,5 +1,8 @@ - - + + No se ha podido registrar el atajo de teclado: {0} No se ha podido iniciar {0} @@ -80,6 +83,7 @@ No se han encontrado resultados Por favor, intente una búsqueda diferente. Complementos + Complementos Buscar más complementos Activado Desactivado @@ -152,6 +156,7 @@ Atajos de teclado + Atajos de teclado Atajo de teclado de Flow Launcher Introduzca el atajo de teclado para mostrar/ocultar Flow Launcher. Atajo de teclado para vista previa diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml index c700ecaad..b292b3e3d 100644 --- a/Flow.Launcher/Languages/fr.xaml +++ b/Flow.Launcher/Languages/fr.xaml @@ -1,5 +1,8 @@ - - + + Impossible d'enregistrer le raccourci clavier : {0} Impossible de lancer {0} @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Trouver plus de modules On Désactivé @@ -152,6 +156,7 @@ Raccourcis + Raccourcis Ouvrir Flow Launcher Enter shortcut to show/hide Flow Launcher. Preview Hotkey diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml index 8fc179093..24fcdc70d 100644 --- a/Flow.Launcher/Languages/it.xaml +++ b/Flow.Launcher/Languages/it.xaml @@ -1,5 +1,8 @@ - - + + Impossibile salvare il tasto di scelta rapida: {0} Avvio fallito {0} @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Cerca altri plugins Attivo Disabilita @@ -152,6 +156,7 @@ Tasti scelta rapida + Tasti scelta rapida Tasto scelta rapida Flow Launcher Immettere la scorciatoia per mostrare/nascondere Flow Launcher. Preview Hotkey @@ -211,8 +216,8 @@ Una nuova versione {0} è disponibile, riavvia Flow Launcher per favore. Ricerca aggiornamenti fallita, per favore controlla la tua connessione e le eventuali impostazioni proxy per api.github.com. - Download degli aggiornamenti fallito, per favore controlla la tua connessione ed eventuali impostazioni proxy per github-cloud.s3.amazonaws.com, - oppure vai su https://github.com/Flow-Launcher/Flow.Launcher/releases per scaricare gli aggiornamenti manualmente. + Download degli aggiornamenti fallito, per favore controlla la tua connessione ed eventuali impostazioni proxy per github-cloud.s3.amazonaws.com, + oppure vai su https://github.com/Flow-Launcher/Flow.Launcher/releases per scaricare gli aggiornamenti manualmente. Note di rilascio Usage Tips diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml index 20295f3e1..750e61fa2 100644 --- a/Flow.Launcher/Languages/ja.xaml +++ b/Flow.Launcher/Languages/ja.xaml @@ -80,6 +80,7 @@ No results found Please try a different search. Plugin + Plugins プラグインを探す 有効 無効 @@ -152,6 +153,7 @@ ホットキー + ホットキー Flow Launcher ホットキー Enter shortcut to show/hide Flow Launcher. Preview Hotkey diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index e69e29c8c..50641dd0f 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -1,5 +1,8 @@ - - + + 단축키 등록 실패: {0} {0}을 실행할 수 없습니다. @@ -80,6 +83,7 @@ 검색 결과를 찾을 수 없습니다. 다른 검색어를 시도해주세요. 플러그인 + 플러그인 플러그인 더 찾아보기 켬 끔 @@ -152,6 +156,7 @@ 단축키 + 단축키 Flow Launcher 단축키 Flow Launcher를 열 때 사용할 단축키를 입력하세요. 미리보기 단축키 diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml index c8b1e4456..888fccc69 100644 --- a/Flow.Launcher/Languages/nb-NO.xaml +++ b/Flow.Launcher/Languages/nb-NO.xaml @@ -1,7 +1,8 @@ - - + + Kunne ikke registrere hurtigtast: {0} Kunne ikke starte {0} Ugyldig filformat for Flow Launcher-utvidelse @@ -14,7 +15,7 @@ Om Avslutt - + Flow Launcher-innstillinger Generelt Start Flow Launcher ved systemstart @@ -32,8 +33,9 @@ Velg Skjul Flow Launcher ved oppstart - + Utvidelse + Utvidelse Finn flere utvidelser Deaktiver Handlingsnøkkelord @@ -42,7 +44,7 @@ Oppstartstid: Spørringstid: - + Tema Finn flere temaer Font for spørringsboks @@ -50,8 +52,9 @@ Vindusmodus Gjennomsiktighet - + Hurtigtast + Hurtigtast Flow Launcher-hurtigtast Åpne resultatmodifiserere Egendefinerd spørringshurtigtast @@ -62,7 +65,7 @@ Vennligst velg et element Er du sikker på at du vil slette utvidelserhurtigtasten for {0}? - + HTTP-proxy Aktiver HTTP-proxy HTTP-server @@ -78,7 +81,7 @@ Proxy konfigurert riktig Proxy-tilkobling feilet - + Om Netside Versjon @@ -87,12 +90,12 @@ Ny versjon {0} er tilgjengelig, vennligst start Flow Launcher på nytt. Oppdateringssjekk feilet, vennligst sjekk tilkoblingen og proxy-innstillene for api.github.com. - Nedlastning av oppdateringer feilet, vennligst sjekk tilkoblingen og proxy-innstillene for github-cloud.s3.amazonaws.com, + Nedlastning av oppdateringer feilet, vennligst sjekk tilkoblingen og proxy-innstillene for github-cloud.s3.amazonaws.com, eller gå til https://github.com/Flow-Launcher/Flow.Launcher/releases for å laste ned oppdateringer manuelt. Versjonsmerknader: - + Gammelt handlingsnøkkelord Nytt handlingsnøkkelord Avbryt @@ -103,16 +106,16 @@ Vellykket Bruk * hvis du ikke ønsker å angi et handlingsnøkkelord - + Forhåndsvis Hurtigtasten er ikke tilgjengelig, vennligst velg en ny hurtigtast Ugyldig hurtigtast for utvidelse Oppdater - + Hurtigtast utilgjengelig - + Versjon Tid Fortell oss hvordan programmet krasjet, så vi kan fikse det @@ -128,7 +131,7 @@ Kunne ikke sende rapport Flow Launcher møtte på en feil - + Versjon {0} av Flow Launcher er nå tilgjengelig En feil oppstod under installasjon av programvareoppdateringer Oppdater diff --git a/Flow.Launcher/Languages/nb.xaml b/Flow.Launcher/Languages/nb.xaml index 629624f5e..1a00c6dc2 100644 --- a/Flow.Launcher/Languages/nb.xaml +++ b/Flow.Launcher/Languages/nb.xaml @@ -1,5 +1,8 @@ - - + + Failed to register hotkey: {0} Could not start {0} @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Find more plugins On Off @@ -152,6 +156,7 @@ Hotkey + Hotkeys Flow Launcher Hotkey Enter shortcut to show/hide Flow Launcher. Preview Hotkey diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml index 4b1c9bb84..64ddfa838 100644 --- a/Flow.Launcher/Languages/nl.xaml +++ b/Flow.Launcher/Languages/nl.xaml @@ -1,5 +1,8 @@ - - + + Sneltoets registratie: {0} mislukt Kan {0} niet starten @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Zoek meer plugins Aan Disable @@ -152,6 +156,7 @@ Sneltoets + Sneltoets Flow Launcher Sneltoets Voer snelkoppeling in om Flow Launcher te tonen/verbergen. Preview Hotkey diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml index 2a9052ca3..6bc081207 100644 --- a/Flow.Launcher/Languages/pl.xaml +++ b/Flow.Launcher/Languages/pl.xaml @@ -1,5 +1,8 @@ - - + + Nie udało się ustawić skrótu klawiszowego: {0} Nie udało się uruchomić: {0} @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Znajdź więcej wtyczek On Wyłącz @@ -152,6 +156,7 @@ Skrót klawiszowy + Skrót klawiszowy Skrót klawiszowy Flow Launcher Enter shortcut to show/hide Flow Launcher. Preview Hotkey diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml index 496aea4f3..4d44eda89 100644 --- a/Flow.Launcher/Languages/pt-br.xaml +++ b/Flow.Launcher/Languages/pt-br.xaml @@ -1,5 +1,8 @@ - - + + Falha ao registrar atalho: {0} Não foi possível iniciar {0} @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Encontrar mais plugins On Desabilitar @@ -152,6 +156,7 @@ Atalho + Atalho Atalho do Flow Launcher Enter shortcut to show/hide Flow Launcher. Preview Hotkey diff --git a/Flow.Launcher/Languages/pt-pt.xaml b/Flow.Launcher/Languages/pt-pt.xaml index ed2760857..a21a6cca2 100644 --- a/Flow.Launcher/Languages/pt-pt.xaml +++ b/Flow.Launcher/Languages/pt-pt.xaml @@ -1,5 +1,8 @@ - - + + Falha ao registar tecla de atalho: {0} Não foi possível iniciar {0} @@ -80,6 +83,7 @@ Não existem resultados Experimente outro termo de pesquisa. Plugin + Plugins Mais plugins Ativo Inativo @@ -152,6 +156,7 @@ Tecla de atalho + Tecla de atalho Tecla de atalho Flow Launcher Introduza o atalho para mostrar/ocultar Flow Launcher Preview Hotkey @@ -302,7 +307,7 @@ A atualizar... 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} Nova atualização Está disponível a versão {0} do Flow Launcher diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml index 6369fec8a..8d1da4d3e 100644 --- a/Flow.Launcher/Languages/ru.xaml +++ b/Flow.Launcher/Languages/ru.xaml @@ -1,5 +1,8 @@ - - + + Регистрация хоткея {0} не удалась Не удалось запустить {0} @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Найти больше плагинов On Отключить @@ -152,6 +156,7 @@ Горячая клавиша + Горячая клавиша Горячая клавиша Flow Launcher Enter shortcut to show/hide Flow Launcher. Preview Hotkey diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml index fc2df1e19..50cff689e 100644 --- a/Flow.Launcher/Languages/sk.xaml +++ b/Flow.Launcher/Languages/sk.xaml @@ -1,5 +1,8 @@ - - + + Nepodarilo sa registrovať klávesovú skratku {0} Nepodarilo sa spustiť {0} @@ -80,6 +83,7 @@ Nenašli sa žiadne výsledky Skúste použiť iné vyhľadávanie. Pluginy + Pluginy Nájsť ďalšie pluginy Zapnuté Vypnuté @@ -152,6 +156,7 @@ Klávesové skratky + Klávesové skratky Klávesová skratka pre Flow Launcher Zadajte skratku na zobrazenie/skrytie Flow Launchera. Klávesová skratka pre náhľad @@ -303,7 +308,7 @@ Aktualizuje sa... Flow Launcher nedokázal presunúť používateľské údaje do aktualizovanej verzie. - Prosím, presuňte profilový priečinok data z {0} do {1} + Prosím, presuňte profilový priečinok data z {0} do {1} Nová aktualizácia Je dostupná nová verzia Flow Launchera {0} diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml index d747f630b..ad0854a3e 100644 --- a/Flow.Launcher/Languages/sr.xaml +++ b/Flow.Launcher/Languages/sr.xaml @@ -1,5 +1,8 @@ - - + + Neuspešno registrovana prečica: {0} Neuspešno pokretanje {0} @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Nađi još plugin-a On Onemogući @@ -152,6 +156,7 @@ Prečica + Prečica Flow Launcher prečica Enter shortcut to show/hide Flow Launcher. Preview Hotkey @@ -211,7 +216,7 @@ Nove verzija {0} je dostupna, molim Vas ponovo pokrenite Flow Launcher. Neuspešna provera ažuriranja, molim Vas proverite vašu vezu i podešavanja za proksi prema api.github.com. - Neuspešno preuzimanje ažuriranja, molim Vas proverite vašu vezu i podešavanja za proksi prema github-cloud.s3.amazonaws.com, + Neuspešno preuzimanje ažuriranja, molim Vas proverite vašu vezu i podešavanja za proksi prema github-cloud.s3.amazonaws.com, ili posetite https://github.com/Flow-Launcher/Flow.Launcher/releases da preuzmete ažuriranja ručno. U novoj verziji diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml index 2bda02604..4d941094b 100644 --- a/Flow.Launcher/Languages/tr.xaml +++ b/Flow.Launcher/Languages/tr.xaml @@ -1,5 +1,8 @@ - - + + Kısayol tuşu ataması başarısız oldu: {0} {0} başlatılamıyor @@ -80,6 +83,7 @@ No results found Please try a different search. Eklenti + Eklenti Daha fazla eklenti bul Açık Devre Dışı @@ -152,6 +156,7 @@ Kısayol Tuşu + Kısayol Tuşu Flow Launcher Kısayolu Enter shortcut to show/hide Flow Launcher. Preview Hotkey diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml index 761396f11..0a8ee1372 100644 --- a/Flow.Launcher/Languages/uk-UA.xaml +++ b/Flow.Launcher/Languages/uk-UA.xaml @@ -1,5 +1,8 @@ - - + + Реєстрація хоткея {0} не вдалася Не вдалося запустити {0} @@ -80,6 +83,7 @@ No results found Please try a different search. Plugin + Plugins Знайти більше плагінів Увімкнено Відключити @@ -152,6 +156,7 @@ Гаряча клавіша + Гаряча клавіша Гаряча клавіша Flow Launcher Введіть ярлик для відображення/приховання потокового запуску. Preview Hotkey diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml index 8604bbb1a..d5c5432ae 100644 --- a/Flow.Launcher/Languages/zh-cn.xaml +++ b/Flow.Launcher/Languages/zh-cn.xaml @@ -1,5 +1,8 @@ - - + + 注册热键：{0} 失败 启动命令 {0} 失败 @@ -80,6 +83,7 @@ 未找到结果 请尝试搜索不同的内容。 插件 + 插件 浏览更多插件 启用 禁用 @@ -152,6 +156,7 @@ 热键 + 热键 Flow Launcher 激活热键 输入显示/隐藏 Flow Launcher 的快捷键。 预览快捷键 @@ -211,7 +216,7 @@ 发现新版本 {0}, 请重启 Flow Launcher 下载更新失败，请检查您与 api.github.com 的连接状态或检查代理设置 - 下载更新失败，请检查您与 github-cloud.s3.amazonaws.com 的连接状态或检查代理设置， + 下载更新失败，请检查您与 github-cloud.s3.amazonaws.com 的连接状态或检查代理设置， 或访问 https://github.com/Flow-Launcher/Flow.Launcher/releases 手动下载更新 更新说明 diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml index b0a75be14..337acb144 100644 --- a/Flow.Launcher/Languages/zh-tw.xaml +++ b/Flow.Launcher/Languages/zh-tw.xaml @@ -1,5 +1,8 @@ - - + + 登錄快捷鍵：{0} 失敗 啟動命令 {0} 失敗 @@ -80,6 +83,7 @@ No results found Please try a different search. 插件 + 插件 瀏覽更多外掛 啟用 停用 @@ -152,6 +156,7 @@ 快捷鍵 + 快捷鍵 Flow Launcher 快捷鍵 執行快捷鍵以顯示 / 隱藏 Flow Launcher。 Preview Hotkey diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index daf8ec608..13c767701 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1027,7 +1027,7 @@ + Text="{DynamicResource plugins}" /> @@ -1049,7 +1049,7 @@ DockPanel.Dock="Left" FontSize="30" Style="{StaticResource PageTitle}" - Text="{DynamicResource plugin}" + Text="{DynamicResource plugins}" TextAlignment="Left" /> + Text="{DynamicResource hotkeys}" /> From a2fc7aaa11b5b107fce5dd83eda61b7496e23ba9 Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 10 Feb 2023 13:27:23 +0900 Subject: [PATCH 08/30] - Change Theme (Sidebar and page title) to Appearance - Added New key for apperance --- Flow.Launcher/Languages/da.xaml | 1 + Flow.Launcher/Languages/de.xaml | 1 + Flow.Launcher/Languages/en.xaml | 1 + Flow.Launcher/Languages/es-419.xaml | 1 + Flow.Launcher/Languages/es.xaml | 1 + Flow.Launcher/Languages/fr.xaml | 1 + Flow.Launcher/Languages/it.xaml | 1 + Flow.Launcher/Languages/ja.xaml | 10 +++++++--- Flow.Launcher/Languages/ko.xaml | 1 + Flow.Launcher/Languages/nb-NO.xaml | 1 + Flow.Launcher/Languages/nb.xaml | 1 + Flow.Launcher/Languages/nl.xaml | 1 + Flow.Launcher/Languages/pl.xaml | 1 + Flow.Launcher/Languages/pt-br.xaml | 1 + Flow.Launcher/Languages/pt-pt.xaml | 1 + Flow.Launcher/Languages/ru.xaml | 1 + Flow.Launcher/Languages/sk.xaml | 1 + Flow.Launcher/Languages/sr.xaml | 1 + Flow.Launcher/Languages/tr.xaml | 1 + Flow.Launcher/Languages/uk-UA.xaml | 1 + Flow.Launcher/Languages/zh-cn.xaml | 1 + Flow.Launcher/Languages/zh-tw.xaml | 1 + Flow.Launcher/SettingWindow.xaml | 4 ++-- 23 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml index e42b32cdf..39c1d669a 100644 --- a/Flow.Launcher/Languages/da.xaml +++ b/Flow.Launcher/Languages/da.xaml @@ -124,6 +124,7 @@ Tema + Appearance Søg efter flere temaer How to create a theme Hi There diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml index eef15512d..f72e31952 100644 --- a/Flow.Launcher/Languages/de.xaml +++ b/Flow.Launcher/Languages/de.xaml @@ -124,6 +124,7 @@ Design + Appearance Suche nach weiteren Themes Wie man ein Design erstellt Hallo! diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index cfed3ad07..9e86d9305 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -123,6 +123,7 @@ Theme + Appearance Theme Gallery How to create a theme Hi There diff --git a/Flow.Launcher/Languages/es-419.xaml b/Flow.Launcher/Languages/es-419.xaml index ec50ef7af..080facbf0 100644 --- a/Flow.Launcher/Languages/es-419.xaml +++ b/Flow.Launcher/Languages/es-419.xaml @@ -124,6 +124,7 @@ Tema + Appearance Galería de Temas Cómo crear un tema Hola diff --git a/Flow.Launcher/Languages/es.xaml b/Flow.Launcher/Languages/es.xaml index a989fed03..77a64df7e 100644 --- a/Flow.Launcher/Languages/es.xaml +++ b/Flow.Launcher/Languages/es.xaml @@ -124,6 +124,7 @@ Tema + Appearance Galería de temas Cómo crear un tema Hola diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml index b292b3e3d..01423ea65 100644 --- a/Flow.Launcher/Languages/fr.xaml +++ b/Flow.Launcher/Languages/fr.xaml @@ -124,6 +124,7 @@ Thèmes + Appearance Trouver plus de thèmes How to create a theme Hi There diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml index 24fcdc70d..01809089a 100644 --- a/Flow.Launcher/Languages/it.xaml +++ b/Flow.Launcher/Languages/it.xaml @@ -124,6 +124,7 @@ Tema + Appearance Sfoglia per altri temi Come creare un tema Ciao diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml index 750e61fa2..6d7a09add 100644 --- a/Flow.Launcher/Languages/ja.xaml +++ b/Flow.Launcher/Languages/ja.xaml @@ -1,5 +1,8 @@ - - + + ホットキー「{0}」の登録に失敗しました {0}の起動に失敗しました @@ -121,6 +124,7 @@ テーマ + Appearance テーマを探す How to create a theme Hi There @@ -263,7 +267,7 @@ アクションキーボードを指定しない場合、* を使用してください - + Press a custom hotkey to open Flow Launcher and input the specified query automatically. プレビュー ホットキーは使用できません。新しいホットキーを選択してください diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml index 50641dd0f..ff4703d1c 100644 --- a/Flow.Launcher/Languages/ko.xaml +++ b/Flow.Launcher/Languages/ko.xaml @@ -124,6 +124,7 @@ 테마 + 외관 테마 갤러리 테마 제작 안내 안녕하세요! diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml index 888fccc69..4391dc23a 100644 --- a/Flow.Launcher/Languages/nb-NO.xaml +++ b/Flow.Launcher/Languages/nb-NO.xaml @@ -46,6 +46,7 @@ Tema + Appearance Finn flere temaer Font for spørringsboks Font for resultat diff --git a/Flow.Launcher/Languages/nb.xaml b/Flow.Launcher/Languages/nb.xaml index 1a00c6dc2..d51d372ea 100644 --- a/Flow.Launcher/Languages/nb.xaml +++ b/Flow.Launcher/Languages/nb.xaml @@ -124,6 +124,7 @@ Theme + Appearance Theme Gallery How to create a theme Hi There diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml index 64ddfa838..8c0c657f1 100644 --- a/Flow.Launcher/Languages/nl.xaml +++ b/Flow.Launcher/Languages/nl.xaml @@ -124,6 +124,7 @@ Thema + Appearance Zoek meer thema´s Hoe maak je een thema Hallo daar diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml index 6bc081207..523e9709e 100644 --- a/Flow.Launcher/Languages/pl.xaml +++ b/Flow.Launcher/Languages/pl.xaml @@ -124,6 +124,7 @@ Skórka + Appearance Znajdź więcej skórek How to create a theme Hi There diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml index 4d44eda89..34d15ce24 100644 --- a/Flow.Launcher/Languages/pt-br.xaml +++ b/Flow.Launcher/Languages/pt-br.xaml @@ -124,6 +124,7 @@ Tema + Appearance Ver mais temas How to create a theme Hi There diff --git a/Flow.Launcher/Languages/pt-pt.xaml b/Flow.Launcher/Languages/pt-pt.xaml index a21a6cca2..f6c6d3be5 100644 --- a/Flow.Launcher/Languages/pt-pt.xaml +++ b/Flow.Launcher/Languages/pt-pt.xaml @@ -124,6 +124,7 @@ Tema + Appearance Galeria de temas Como criar um tema Olá diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml index 8d1da4d3e..c01a09dfc 100644 --- a/Flow.Launcher/Languages/ru.xaml +++ b/Flow.Launcher/Languages/ru.xaml @@ -124,6 +124,7 @@ Тема + Appearance Найти больше тем How to create a theme Hi There diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml index 50cff689e..820c6d992 100644 --- a/Flow.Launcher/Languages/sk.xaml +++ b/Flow.Launcher/Languages/sk.xaml @@ -124,6 +124,7 @@ Motív + Appearance Galéria motívov Ako vytvoriť motív Ahojte diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml index ad0854a3e..eaebf0634 100644 --- a/Flow.Launcher/Languages/sr.xaml +++ b/Flow.Launcher/Languages/sr.xaml @@ -124,6 +124,7 @@ Tema + Appearance Pretražite još tema How to create a theme Hi There diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml index 4d941094b..67f45e5d7 100644 --- a/Flow.Launcher/Languages/tr.xaml +++ b/Flow.Launcher/Languages/tr.xaml @@ -124,6 +124,7 @@ Temalar + Appearance Daha fazla tema bul Nasıl bir tema yaratılır Merhaba diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml index 0a8ee1372..bb608bdbd 100644 --- a/Flow.Launcher/Languages/uk-UA.xaml +++ b/Flow.Launcher/Languages/uk-UA.xaml @@ -124,6 +124,7 @@ Тема + Appearance Знайти більше тем Як створити тему Привіт усім diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml index d5c5432ae..b34f85c69 100644 --- a/Flow.Launcher/Languages/zh-cn.xaml +++ b/Flow.Launcher/Languages/zh-cn.xaml @@ -124,6 +124,7 @@ 主题 + Appearance 浏览更多主题 如何创建一个主题 你好！ diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml index 337acb144..55d64b3d3 100644 --- a/Flow.Launcher/Languages/zh-tw.xaml +++ b/Flow.Launcher/Languages/zh-tw.xaml @@ -124,6 +124,7 @@ 主題 + Appearance 瀏覽更多主題 如何創建一個主題 你好呀 diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 13c767701..4e292283c 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1769,7 +1769,7 @@ + Text="{DynamicResource appearance}" /> @@ -1792,7 +1792,7 @@ Margin="0,5,0,5" FontSize="30" Style="{StaticResource PageTitle}" - Text="{DynamicResource theme}" + Text="{DynamicResource appearance}" TextAlignment="left" /> From c240f1e2e03fcb1eedc5ae6d8a7266184b21d40d Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 11 Feb 2023 07:37:18 +0900 Subject: [PATCH 09/30] - Added Guide Texts in CustomBrowsePopup - Added 'Edit' Button, It will be disable when non-select situation - Added Browse Button in Path Select Textbox --- ...low.Launcher.Plugin.BrowserBookmark.csproj | 14 ++- .../Languages/en.xaml | 5 + .../Views/CustomBrowserSetting.xaml | 73 +++++++++--- .../Views/CustomBrowserSetting.xaml.cs | 15 ++- .../Views/SettingsControl.xaml | 108 ++++++++++-------- .../Views/SettingsControl.xaml.cs | 9 ++ 6 files changed, 153 insertions(+), 71 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj index c42378a9a..253a53f1e 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj @@ -64,14 +64,16 @@ + + + ..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Windows.Forms.dll + + + - - + + diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml index 5dbe925c1..427b538ff 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml @@ -20,7 +20,12 @@ Browser Name Data Directory Path Add + Edit Delete + Browse Others Browser Engine + If you are using a special browser such as Brave or Librewolf, or a portable version, you must add the bookmarks data directory (not file) and engine type in order for this plugin to work. + For example: Brave's engine is Chromium; and its default bookmark data location is: "C:\Users\username\AppData\Local\BraveSoftware\Brave-Browser\UserData". + After changing these values, close all setting windows and press F5 when Flow Launcher is open to reload the plug-in. \ No newline at end of file diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml index 499d22834..a8ecb54f9 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml @@ -7,7 +7,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ui="clr-namespace:Flow.Launcher.Infrastructure.UI;assembly=Flow.Launcher.Infrastructure" Title="{DynamicResource flowlauncher_plugin_browserbookmark_bookmarkDataSetting}" - Width="520" + Width="550" Background="{DynamicResource PopuBGColor}" Foreground="{DynamicResource PopupTextColor}" KeyDown="WindowKeyDown" @@ -71,8 +71,8 @@ TextAlignment="Left" /> - - + + @@ -81,17 +81,45 @@ + - + + + + + - + SelectedItem="{Binding BrowserType}" /> - + LastChildFill="True"> + + diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs index 0ac219962..816029182 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs @@ -1,10 +1,8 @@ using Flow.Launcher.Plugin.BrowserBookmark.Models; -using Microsoft.Win32; -using System; using System.Windows; -using System.Windows.Controls; using System.Windows.Input; using System.Windows.Forms; +using System.Threading.Tasks; namespace Flow.Launcher.Plugin.BrowserBookmark.Views { @@ -25,20 +23,19 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views BrowserType = browser.BrowserType, }; } - - private void ConfirmCancelEditCustomBrowser(object sender, RoutedEventArgs e) + + private void ConfirmEditCustomBrowser(object sender, RoutedEventArgs e) { - if (DataContext is CustomBrowser editBrowser && e.Source is System.Windows.Controls.Button button) - { - if (button.Name == "btnConfirm") - { - currentCustomBrowser.Name = editBrowser.Name; - currentCustomBrowser.DataDirectoryPath = editBrowser.DataDirectoryPath; - currentCustomBrowser.BrowserType = editBrowser.BrowserType; - Close(); - } - } + CustomBrowser editBrowser = (CustomBrowser)DataContext; + currentCustomBrowser.Name = editBrowser.Name; + currentCustomBrowser.DataDirectoryPath = editBrowser.DataDirectoryPath; + currentCustomBrowser.BrowserType = editBrowser.BrowserType; + _ = Task.Run(() => Main.ReloadAllBookmarks()); + Close(); + } + private void CancelEditCustomBrowser(object sender, RoutedEventArgs e) + { Close(); } @@ -46,7 +43,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views { if (e.Key == Key.Enter) { - ConfirmCancelEditCustomBrowser(sender, e); + ConfirmEditCustomBrowser(sender, e); } } @@ -54,8 +51,8 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views { var dialog = new FolderBrowserDialog(); dialog.ShowDialog(); - PathTextBox.Text = dialog.SelectedPath; - string folder = dialog.SelectedPath; + CustomBrowser editBrowser = (CustomBrowser)DataContext; + editBrowser.DataDirectoryPath = dialog.SelectedPath; } } } From 2677c6eb0841d62b41f2d5f3247642a1bd94098b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 22:37:32 +0000 Subject: [PATCH 16/30] Bump vedantmgoyal2009/winget-releaser from 1 to 2 Bumps [vedantmgoyal2009/winget-releaser](https://github.com/vedantmgoyal2009/winget-releaser) from 1 to 2. - [Release notes](https://github.com/vedantmgoyal2009/winget-releaser/releases) - [Commits](https://github.com/vedantmgoyal2009/winget-releaser/compare/v1...v2) --- updated-dependencies: - dependency-name: vedantmgoyal2009/winget-releaser dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/winget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml index fe1b5a5fc..b1d289091 100644 --- a/.github/workflows/winget.yml +++ b/.github/workflows/winget.yml @@ -9,7 +9,7 @@ jobs: # Action can only be run on windows runs-on: windows-latest steps: - - uses: vedantmgoyal2009/winget-releaser@v1 + - uses: vedantmgoyal2009/winget-releaser@v2 with: identifier: Flow-Launcher.Flow-Launcher token: ${{ secrets.WINGET_TOKEN }} From 39c4a2be2ea4bf55e2e2b8aa42058e4b8709e434 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:35:06 +0800 Subject: [PATCH 17/30] Auto reload bookmarks when editing checkboxes --- .../Views/CustomBrowserSetting.xaml.cs | 3 +- .../Views/SettingsControl.xaml | 6 +- .../Views/SettingsControl.xaml.cs | 57 ++++++++++++++++--- 3 files changed, 52 insertions(+), 14 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs index 816029182..bdef5bf0f 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs @@ -2,7 +2,6 @@ using System.Windows; using System.Windows.Input; using System.Windows.Forms; -using System.Threading.Tasks; namespace Flow.Launcher.Plugin.BrowserBookmark.Views { @@ -30,7 +29,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views currentCustomBrowser.Name = editBrowser.Name; currentCustomBrowser.DataDirectoryPath = editBrowser.DataDirectoryPath; currentCustomBrowser.BrowserType = editBrowser.BrowserType; - _ = Task.Run(() => Main.ReloadAllBookmarks()); + DialogResult = true; Close(); } diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml index 408256f45..014deff03 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml @@ -18,15 +18,15 @@ + IsChecked="{Binding LoadChromeBookmark}" /> + IsChecked="{Binding LoadEdgeBookmark}" /> + IsChecked="{Binding LoadFirefoxBookmark}" />