Skip to content

Commit dd0f42e

Browse files
jjw24jjw24
authored
Merge branch 'dev' into fix_shell_and_change_query
2 parents 3338a41 + 4153aa9 commit dd0f42e

File tree

47 files changed

+492
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+492
-240
lines changed

‎Flow.Launcher.Core/Plugin/JsonRPCConfigurationModel.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23

34
namespace Flow.Launcher.Core.Plugin
45
{
@@ -26,6 +27,8 @@ public class FieldAttributes
2627
public string Name { get; set; }
2728
public string Label { get; set; }
2829
public string Description { get; set; }
30+
public string urlLabel { get; set; }
31+
public Uri url { get; set; }
2932
public bool Validation { get; set; }
3033
public List<string> Options { get; set; }
3134
public string DefaultValue { get; set; }
@@ -40,4 +43,4 @@ public void Deconstruct(out string Name, out string Label, out string Descriptio
4043
DefaultValue = this.DefaultValue;
4144
}
4245
}
43-
}
46+
}

‎Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs‎

Lines changed: 174 additions & 26 deletions
Large diffs are not rendered by default.

‎Flow.Launcher/Images/Browser.png‎

3.96 KB
Loading

‎Flow.Launcher/Images/app_missing_img.png‎

667 Bytes
Loading

‎Flow.Launcher/Languages/da.xaml‎

Lines changed: 6 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">Kunne ikke registrere genvejstast: {0}</system:String>
58
<system:String x:Key="couldnotStartCmd">Kunne ikke starte {0}</system:String>
@@ -87,7 +90,7 @@
8790
<system:String x:Key="author">af</system:String>
8891
<system:String x:Key="plugin_init_time">Initaliseringstid:</system:String>
8992
<system:String x:Key="plugin_query_time">Søgetid:</system:String>
90-
<system:String x:Key="plugin_query_version">| Version</system:String>
93+
<system:String x:Key="plugin_query_version">Version</system:String>
9194
<system:String x:Key="plugin_query_web">Website</system:String>
9295
<system:String x:Key="plugin_uninstall">Uninstall</system:String>
9396

‎Flow.Launcher/Languages/en.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<system:String x:Key="author">by</system:String>
9292
<system:String x:Key="plugin_init_time">Init time:</system:String>
9393
<system:String x:Key="plugin_query_time">Query time:</system:String>
94-
<system:String x:Key="plugin_query_version">| Version</system:String>
94+
<system:String x:Key="plugin_query_version">Version</system:String>
9595
<system:String x:Key="plugin_query_web">Website</system:String>
9696
<system:String x:Key="plugin_uninstall">Uninstall</system:String>
9797

‎Flow.Launcher/Languages/es-419.xaml‎

Lines changed: 6 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">Error al registrar la tecla de acceso directo: {0}</system:String>
58
<system:String x:Key="couldnotStartCmd">No se pudo iniciar {0}</system:String>
@@ -87,7 +90,7 @@
8790
<system:String x:Key="author">por</system:String>
8891
<system:String x:Key="plugin_init_time">Tiempo de inicio:</system:String>
8992
<system:String x:Key="plugin_query_time">Tiempo de consulta:</system:String>
90-
<system:String x:Key="plugin_query_version">| Versión</system:String>
93+
<system:String x:Key="plugin_query_version">Versión</system:String>
9194
<system:String x:Key="plugin_query_web">Sitio web</system:String>
9295
<system:String x:Key="plugin_uninstall">Uninstall</system:String>
9396

‎Flow.Launcher/Languages/es.xaml‎

Lines changed: 6 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">No se ha podido registrar el atajo de teclado: {0}</system:String>
58
<system:String x:Key="couldnotStartCmd">No se ha podido iniciar {0}</system:String>
@@ -87,7 +90,7 @@
8790
<system:String x:Key="author">por</system:String>
8891
<system:String x:Key="plugin_init_time">Tiempo de inicio:</system:String>
8992
<system:String x:Key="plugin_query_time">Tiempo de consulta:</system:String>
90-
<system:String x:Key="plugin_query_version">| Versión</system:String>
93+
<system:String x:Key="plugin_query_version">Versión</system:String>
9194
<system:String x:Key="plugin_query_web">Sitio web</system:String>
9295
<system:String x:Key="plugin_uninstall">Desinstalar</system:String>
9396

‎Flow.Launcher/Languages/fr.xaml‎

Lines changed: 6 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">Impossible d'enregistrer le raccourci clavier : {0}</system:String>
58
<system:String x:Key="couldnotStartCmd">Impossible de lancer {0}</system:String>
@@ -87,7 +90,7 @@
8790
<system:String x:Key="author">by</system:String>
8891
<system:String x:Key="plugin_init_time">Chargement :</system:String>
8992
<system:String x:Key="plugin_query_time">Utilisation :</system:String>
90-
<system:String x:Key="plugin_query_version">| Version</system:String>
93+
<system:String x:Key="plugin_query_version">Version</system:String>
9194
<system:String x:Key="plugin_query_web">Website</system:String>
9295
<system:String x:Key="plugin_uninstall">Désinstaller</system:String>
9396

‎Flow.Launcher/Languages/it.xaml‎

Lines changed: 8 additions & 5 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">Impossibile salvare il tasto di scelta rapida: {0}</system:String>
58
<system:String x:Key="couldnotStartCmd">Avvio fallito {0}</system:String>
@@ -87,7 +90,7 @@
8790
<system:String x:Key="author">da</system:String>
8891
<system:String x:Key="plugin_init_time">Tempo di avvio:</system:String>
8992
<system:String x:Key="plugin_query_time">Tempo ricerca:</system:String>
90-
<system:String x:Key="plugin_query_version">| Versione</system:String>
93+
<system:String x:Key="plugin_query_version">Versione</system:String>
9194
<system:String x:Key="plugin_query_web">Sito Web</system:String>
9295
<system:String x:Key="plugin_uninstall">Disinstalla</system:String>
9396

@@ -200,8 +203,8 @@
200203
<system:String x:Key="newVersionTips">Una nuova versione {0} è disponibile, riavvia Flow Launcher per favore.</system:String>
201204
<system:String x:Key="checkUpdatesFailed">Ricerca aggiornamenti fallita, per favore controlla la tua connessione e le eventuali impostazioni proxy per api.github.com.</system:String>
202205
<system:String x:Key="downloadUpdatesFailed">
203-
Download degli aggiornamenti fallito, per favore controlla la tua connessione ed eventuali impostazioni proxy per github-cloud.s3.amazonaws.com,
204-
oppure vai su https://github.com/Flow-Launcher/Flow.Launcher/releases per scaricare gli aggiornamenti manualmente.
206+
Download degli aggiornamenti fallito, per favore controlla la tua connessione ed eventuali impostazioni proxy per github-cloud.s3.amazonaws.com,
207+
oppure vai su https://github.com/Flow-Launcher/Flow.Launcher/releases per scaricare gli aggiornamenti manualmente.
205208
</system:String>
206209
<system:String x:Key="releaseNotes">Note di rilascio</system:String>
207210
<system:String x:Key="documentation">Usage Tips</system:String>

0 commit comments

Comments
 (0)