v 1.0.1 - weather fix

@Resources/Languages/en/Settings/Language.inc

@@ -2,6 +2,6 @@
 tLanguage=Language
 tTemperature=Temperature
 
-tMetric=Celsius
-tImperial=Fahrenheit
-tStandard=Kelvin
+tCelsius=Celsius
+tFahrenheit=Fahrenheit
+tKelvin=Kelvin

Widgets/Weather/Settings.ini

@@ -57,77 +57,36 @@ W=(#WidgetWidth# * 0.35)
 H=(#WidgetHeight# * 0.06)
 StringAlign=Center
 DynamicVariables=1
-Command1=[!SetVariable CityInput "$UserInput$"][!CommandMeasure UpdateCity "Update"]
+FocusDismiss=0
+Command1=[!SetVariable City "$UserInput$"][!SetOption Option1Value Text "Updating..."][!UpdateMeter Option1Value][!Redraw][!CommandMeasure UpdateCity "Update"][!CommandMeasure UpdateCityDebug "Update"]
 
-[Option2Title]
-Meter=String
-Text=#tWeatherAPIKey#
-FontFace=#FontFace#
-FontSize=(#WidgetWidth# * 0.035)
-FontColor=#ForegroundColor#
-FontWeight=500
-AntiAlias=1
-X=(#WidgetPadding# + #WidgetWidth# * 0.05)
-Y=(#WidgetPadding# + #WidgetHeight# * 0.43)
-W=(#WidgetWidth# * 0.5)
-ClipString=2
+[UpdateCity]
+Measure=WebParser
 DynamicVariables=1
+URL=https://geocoding-api.open-meteo.com/v1/search?name=#City#&count=1&language=#Language#
+RegExp=(?U)"name":"(.*)",.*"latitude":(.*),.*"longitude":(.*),.*
+OnConnectErrorAction=[!SetOption Option1Value Text "Connection error"][!UpdateMeter Option1Value][!Redraw]
+OnRegExpErrorAction=[!SetOption Option1Value Text "City not found"][!UpdateMeter Option1Value][!Redraw]
+FinishAction=[!WriteKeyValue Variables Latitude [Latitude] "#@#Variables\Weather.inc"][!WriteKeyValue Variables Longitude [Longitude] "#@#Variables\Weather.inc"][!WriteKeyValue Variables City [City] "#@#Variables\Weather.inc"][!SetOption Option1Value Text [City]][!UpdateMeter Option1Value][!Redraw]
 
-[Option2Value]
-Meter=String
-Text=#APIKey#
-FontFace=Consolas
-FontSize=(#WidgetWidth# * 0.03)
-FontColor=#ForegroundColor#
-DynamicVariables=1
-FontWeight=300
-AntiAlias=1
-StringAlign=Center
-X=(#WidgetPadding# + #WidgetWidth# * 0.75)
-Y=(#WidgetPadding# + #WidgetHeight# * 0.43)
-H=(#WidgetHeight# * 0.05)
-W=(#WidgetWidth# * 0.33)
-SolidColor=#GrayColor#
-ClipString=1
-Padding=2,2,2,2
-LeftMouseUpAction=[!CommandMeasure "Option2Input" "ExecuteBatch ALL"]
-
-[Option2Input]
-Measure=Plugin
-Plugin=InputText
-DefaultValue=#APIKey#
-FontFace=Consolas
-FontSize=(#WidgetWidth# * 0.03)
-FontColor=#ForegroundColor#
-SolidColor=#BackgroundColor#
-X=(#WidgetPadding# + #WidgetWidth# * 0.58)
-Y=(#WidgetPadding# + #WidgetHeight# * 0.43)
-W=(#WidgetWidth# * 0.35)
-H=(#WidgetHeight# * 0.1)
-StringAlign=Center
+[UpdateCityDebug]
+Measure=WebParser
 DynamicVariables=1
-Command1=[!WriteKeyValue Variables APIKey "$UserInput$" "#@#Variables\Weather.inc"][!Refresh]
+URL=https://geocoding-api.open-meteo.com/v1/search?name=#City#&count=1&language=#Language#
+RegExp=.*
+FinishAction=[!Log "[GEOCODING DATA]: [&UpdateCityDebug]"]
 
-[UpdateCity]
+[City]
 Measure=WebParser
-DynamicVariables=1
-URL=http://api.openweathermap.org/geo/1.0/direct?q=#CityInput#&limit=1&appid=#APIKey#
-RegExp=(?siU).*"#Language#":"(.*)".*"lat":(.*),.*"lon":(.*),.*
+URL=[UpdateCity]
+StringIndex=1
 
 [Latitude]
 Measure=WebParser
 URL=[UpdateCity]
 StringIndex=2
-OnChangeAction=[!WriteKeyValue Variables Latitude [Latitude] "#@#Variables\Weather.inc"]
 
 [Longitude]
 Measure=WebParser
 URL=[UpdateCity]
 StringIndex=3
-OnChangeAction=[!WriteKeyValue Variables Longitude [Longitude] "#@#Variables\Weather.inc"]
-
-[City]
-Measure=WebParser
-URL=[UpdateCity]
-StringIndex=1
-OnChangeAction=[!WriteKeyValue Variables City [City] "#@#Variables\Weather.inc"][!Refresh]