Skip to content

Commit 0357b32

Browse files
jjw24jjw24
committed
Merge remote-tracking branch 'onesounds/dev' into clock
2 parents cd6140d + 73335dd commit 0357b32

27 files changed

+309
-99
lines changed

‎Flow.Launcher.Core/ExternalPlugins/UserPlugin.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace Flow.Launcher.Core.ExternalPlugins
1+
using System;
2+
3+
namespace Flow.Launcher.Core.ExternalPlugins
24
{
35
public record UserPlugin
46
{
@@ -12,5 +14,8 @@ public record UserPlugin
1214
public string UrlDownload { get; set; }
1315
public string UrlSourceCode { get; set; }
1416
public string IcoPath { get; set; }
17+
public DateTime LatestReleaseDate { get; set; }
18+
public DateTime DateAdded { get; set; }
19+
1520
}
1621
}

‎Flow.Launcher/Converters/BoolToVisibilityConverter.cs

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Globalization;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
using System.Windows;
8+
using System.Windows.Controls;
9+
using System.Windows.Data;
10+
11+
namespace Flow.Launcher.Converters
12+
{
13+
public class BoolToVisibilityConverter : IValueConverter
14+
{
15+
public object Convert(object value, System.Type targetType, object parameter, CultureInfo culture)
16+
{
17+
if (parameter != null)
18+
{
19+
if (value is true)
20+
{
21+
return Visibility.Collapsed;
22+
}
23+
24+
else
25+
{
26+
return Visibility.Visible;
27+
}
28+
}
29+
else {
30+
if (value is true)
31+
{
32+
return Visibility.Visible;
33+
}
34+
35+
else {
36+
return Visibility.Collapsed;
37+
}
38+
}
39+
}
40+
41+
public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException();
42+
}
43+
}

‎Flow.Launcher/Converters/TextConverter.cs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
using System;
2+
using System.Globalization;
3+
using System.Windows.Data;
4+
using Flow.Launcher.Core.Resource;
5+
using Flow.Launcher.ViewModel;
6+
7+
namespace Flow.Launcher.Converters
8+
{
9+
public class TextConverter : IValueConverter
10+
{
11+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
12+
{
13+
var ID = value.ToString();
14+
switch(ID)
15+
{
16+
case PluginStoreItemViewModel.NewRelease:
17+
return InternationalizationManager.Instance.GetTranslation("pluginStore_NewRelease");
18+
case PluginStoreItemViewModel.RecentlyUpdated:
19+
return InternationalizationManager.Instance.GetTranslation("pluginStore_RecentlyUpdated");
20+
case PluginStoreItemViewModel.None:
21+
return InternationalizationManager.Instance.GetTranslation("pluginStore_None");
22+
case PluginStoreItemViewModel.Installed:
23+
return InternationalizationManager.Instance.GetTranslation("pluginStore_Installed");
24+
default:
25+
return ID;
26+
}
27+
28+
}
29+
30+
public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException();
31+
}
32+
}

‎Flow.Launcher/Languages/da.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<system:String x:Key="plugin_query_time">Søgetid:</system:String>
7878
<system:String x:Key="plugin_query_version">| Version</system:String>
7979
<system:String x:Key="plugin_query_web">Website</system:String>
80-
<system:String x:Key="plugin_uninstall">Uninstall</system:String>
80+
<system:String x:Key="uninstallbtn">Uninstall</system:String>
8181

8282

8383
<!-- Setting Plugin Store -->
8484
<system:String x:Key="pluginStore">Plugin Store</system:String>
8585
<system:String x:Key="refresh">Refresh</system:String>
86-
<system:String x:Key="install">Install</system:String>
86+
<system:String x:Key="installbtn">Install</system:String>
8787

8888
<!-- Setting Theme -->
8989
<system:String x:Key="theme">Tema</system:String>

‎Flow.Launcher/Languages/de.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<system:String x:Key="plugin_query_time">Abfragezeit:</system:String>
7878
<system:String x:Key="plugin_query_version">Version</system:String>
7979
<system:String x:Key="plugin_query_web">Webseite</system:String>
80-
<system:String x:Key="plugin_uninstall">Deinstallieren</system:String>
80+
<system:String x:Key="uninstallbtn">Deinstallieren</system:String>
8181

8282

8383
<!-- Setting Plugin Store -->
8484
<system:String x:Key="pluginStore">Erweiterungen laden</system:String>
8585
<system:String x:Key="refresh">Aktualisieren</system:String>
86-
<system:String x:Key="install">Installieren</system:String>
86+
<system:String x:Key="installbtn">Installieren</system:String>
8787

8888
<!-- Setting Theme -->
8989
<system:String x:Key="theme">Design</system:String>

‎Flow.Launcher/Languages/en.xaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,24 @@
9292
<system:String x:Key="plugin_query_time">Query time:</system:String>
9393
<system:String x:Key="plugin_query_version">| Version</system:String>
9494
<system:String x:Key="plugin_query_web">Website</system:String>
95-
<system:String x:Key="plugin_uninstall">Uninstall</system:String>
9695

9796

9897
<!-- Setting Plugin Store -->
9998
<system:String x:Key="pluginStore">Plugin Store</system:String>
99+
<system:String x:Key="pluginStore_NewRelease">New Release</system:String>
100+
<system:String x:Key="pluginStore_RecentlyUpdated">Recently Updated</system:String>
101+
<system:String x:Key="pluginStore_None">Plugins</system:String>
102+
<system:String x:Key="pluginStore_Installed">Installed</system:String>
100103
<system:String x:Key="refresh">Refresh</system:String>
101-
<system:String x:Key="install">Install</system:String>
104+
<system:String x:Key="installbtn">Install</system:String>
105+
<system:String x:Key="uninstallbtn">Uninstall</system:String>
106+
<system:String x:Key="updatebtn">Update</system:String>
107+
<system:String x:Key="LabelInstalledToolTip">Plug-in already installed</system:String>
108+
<system:String x:Key="LabelNew">New Version</system:String>
109+
<system:String x:Key="LabelNewToolTip">This plug-in has been updated within the last 7 days</system:String>
110+
<system:String x:Key="LabelUpdateToolTip">New Update is Available</system:String>
111+
112+
102113

103114
<!-- Setting Theme -->
104115
<system:String x:Key="theme">Theme</system:String>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<system:String x:Key="plugin_query_time">Tiempo de consulta:</system:String>
7878
<system:String x:Key="plugin_query_version">| Versión</system:String>
7979
<system:String x:Key="plugin_query_web">Sitio web</system:String>
80-
<system:String x:Key="plugin_uninstall">Uninstall</system:String>
80+
<system:String x:Key="uninstallbtn">Uninstall</system:String>
8181

8282

8383
<!-- Setting Plugin Store -->
8484
<system:String x:Key="pluginStore">Tienda de Plugins</system:String>
8585
<system:String x:Key="refresh">Recargar</system:String>
86-
<system:String x:Key="install">Instalar</system:String>
86+
<system:String x:Key="installbtn">Instalar</system:String>
8787

8888
<!-- Setting Theme -->
8989
<system:String x:Key="theme">Tema</system:String>

‎Flow.Launcher/Languages/fr.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<system:String x:Key="plugin_query_time">Utilisation :</system:String>
7878
<system:String x:Key="plugin_query_version">| Version</system:String>
7979
<system:String x:Key="plugin_query_web">Website</system:String>
80-
<system:String x:Key="plugin_uninstall">Désinstaller</system:String>
80+
<system:String x:Key="uninstallbtn">Désinstaller</system:String>
8181

8282

8383
<!-- Setting Plugin Store -->
8484
<system:String x:Key="pluginStore">Plugin Store</system:String>
8585
<system:String x:Key="refresh">Refresh</system:String>
86-
<system:String x:Key="install">Install</system:String>
86+
<system:String x:Key="installbtn">Install</system:String>
8787

8888
<!-- Setting Theme -->
8989
<system:String x:Key="theme">Thèmes</system:String>

‎Flow.Launcher/Languages/it.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<system:String x:Key="plugin_query_time">Tempo ricerca:</system:String>
7878
<system:String x:Key="plugin_query_version">| Versione</system:String>
7979
<system:String x:Key="plugin_query_web">Sito Web</system:String>
80-
<system:String x:Key="plugin_uninstall">Disinstalla</system:String>
80+
<system:String x:Key="uninstallbtn">Disinstalla</system:String>
8181

8282

8383
<!-- Setting Plugin Store -->
8484
<system:String x:Key="pluginStore">Negozio dei Plugin</system:String>
8585
<system:String x:Key="refresh">Aggiorna</system:String>
86-
<system:String x:Key="install">Installa</system:String>
86+
<system:String x:Key="installbtn">Installa</system:String>
8787

8888
<!-- Setting Theme -->
8989
<system:String x:Key="theme">Tema</system:String>

‎Flow.Launcher/Languages/ja.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<system:String x:Key="plugin_query_time">クエリ時間:</system:String>
7878
<system:String x:Key="plugin_query_version">| バージョン</system:String>
7979
<system:String x:Key="plugin_query_web">ウェブサイト</system:String>
80-
<system:String x:Key="plugin_uninstall">アンインストール</system:String>
80+
<system:String x:Key="uninstallbtn">アンインストール</system:String>
8181

8282

8383
<!-- Setting Plugin Store -->
8484
<system:String x:Key="pluginStore">プラグインストア</system:String>
8585
<system:String x:Key="refresh">Refresh</system:String>
86-
<system:String x:Key="install">Install</system:String>
86+
<system:String x:Key="installbtn">Install</system:String>
8787

8888
<!-- Setting Theme -->
8989
<system:String x:Key="theme">テーマ</system:String>

0 commit comments

Comments
 (0)