Fixing weather and week forecasting

WP7/@Resources/Common/Weather/WeatherComVariables.inc

@@ -1,43 +1,15 @@
-[Variables]
-
-; Getting and setting your LocationCode can be done one of several ways.
-; 
-; Go to https://weather.com/
-; Search for your city by name.
-; Use the long number at the end of the resulting URL, for example:
-; https://weather.com/weather/today/l/1665d9e3052c3448be48dafc1587318a27ee85516e97e0b5376043cd41a4f0e8
-; The LocationCode would be 1665d9e3052c3448be48dafc1587318a27ee85516e97e0b5376043cd41a4f0e8
-; Copy and enter that as the value for LocationCode below.
-; LocationCode=1665d9e3052c3448be48dafc1587318a27ee85516e97e0b5376043cd41a4f0e8
-;
-; You can also use the location code used in earlier skins using wxdata as the source.
-; LocationCode=USVA0944
-;
-; Alternatively, in the USA, you can simply use your ZipCode as the LocationCode.
-; LocationCode=22308
-
-LocationCode=GMXX0040
-
-; If another language or unit(s) of measures are desired, simply go to https://weather.com/
-; Using the controls at the top of the page, set your country and units of measure as desired.
-; Copy and enter the Language from the resulting URL.
-
-; For example, French would be Language=fr-FR
-; The unit(s) of measure are automatic, based on the language.
-; For instance, you cannot have the language be French, but the units be F imperial.
-
-; Note however, that simply changing from imperial F to metric C units of measure while keeping the 
-; langage as English can be done by using en-GB as the Language.
-
-Language=en-GB
-
-; How often to update the weather information. Default is 600 or 10 minutes.
-
-UpdateRate=1200
-
-; Don't change these.
-
-LanguagePath=/#Language#
-URLcurrent=https://weather.com/#Language#/weather/today/l/#LocationCode#
-URLforecast=https://weather.com/#Language#/weather/tenday/l/#LocationCode#
-URLhourly=https://weather.com/#Language#/weather/hourbyhour/l/#LocationCode#
+[Variables]
+
+;open yahoo.com/news/weather and copy your location
+;e.g: "saudi-arabia/riyadh/riyadh-22725955"
+;and put it in the locationCode underneath :)
+
+LocationCode=saudi-arabia/riyadh/riyadh-22725955
+
+
+;I know what you're thinking about but sadly you can't currently change 
+;the source website which is currently "yahoo.com", so pls to keep your
+;skin working correctly leave the section bellow the line:)
+
+___________________________DON'T TOUCH__________________________
+URL=https://www.yahoo.com/news/weather/#LocationCode#

WP7/Panels/Weather/Item4.ini

@@ -1,19 +1,18 @@
 [Rainmeter]
 DragGroup=WP7Panel
-Group=Panel
+Group=Panel | Weather
 Author=Xyrfo and fediaFedia
 
 
-MouseActionCursor=0
-MiddleMouseUpAction=!DeactivateConfig
-Update=2000
+
+Update=600
 Blur=#globalblurenable#
 BlurRegion=#blurtype#,(5-#Padding#),(5-#Padding#),((#Height#*#TypeW#*#ScaleDpi#+#PaddingW#+(#Padding#))),((#Height#*#TypeH#*#ScaleDpi#+#PaddingH#+(#Padding#))),#blurcornerradius#
 
 
 RightMouseUpAction=[!SkinCustomMenu]
 ContextTitle=#Settings#
-ContextAction=["#@#Common\Config\config.exe" #PanelType# "#CURRENTCONFIG#" "#CURRENTFILE#" "#SETTINGSPATH#" "#SKINSPATH#"]
+ContextAction=["#@#Common\Config\config.exe" #PanelType# "#CURRENTCONFIG#" "#CURRENTFILE#" "#SETTINGSPATH#" "#SKINSPATH#" "#PROGRAMPATH#"]
 ContextTitle2=#Refresh#
 ContextAction2=[!Refresh #CurrentConfig#]
 ContextTitle3=#Alternative#
@@ -44,16 +43,15 @@ PanelType=double
 @include1=#@#Common\Variables\Languages\#MainLanguage#.inc
 @include2=#@#Common\color\color.inc
 @include3=#@#Config\Panels\Weather\UserVariables.inc
-@include4=#@#Structure\#PanelType#\Main.inc
+@include4=#@##Structure#\#PanelType#\Main.inc
 
 
 
 
 
 @Include5=#@#Common\Weather\WeatherComVariables.inc
 @Include6=#@#Common\Weather\WeatherComRegExp.inc
-@Include7=#@#Common\Weather\WeatherComCurrent.inc
-
+@Include7=#@#Common\Weather\WeatherMeasures.inc
 
 
 
@@ -62,10 +60,12 @@ PanelType=double
 [Text]
 Meter=String
 MeterStyle=TextStyle
+FontSize=16
 Text="%1� %2"
-MeasureName=@CurrentTemperature
-MeasureName2=@CurrentConditions
-
+MeasureName=@MeasureTempCelsius
+MeasureName2=@MeasureCond
+x=(24)*#scaledpi#
+Y=(125)*#scaledpi#
 
 
 [measurefunnythings]
@@ -75,30 +75,34 @@ Formula=-1*#IconStyle#+1
 [Icon]
 Meter=Image
 MeterStyle=IconStyle
-MeasureName=@CurrentIcon
-MeasureName2=@CurrentLocationName
-MeasureName3=@CurrentWind
-MeasureName4=@CurrentPressure
-MeasureName5=@CurrentHumidity
+MeasureName=@MeasureIcon
+W=125
+H=125
+MeasureName2=@MeasureCountry
+MeasureName3=@MeasureCity
+ToolTipText= %2, %3
 ImagePath="#@#Graphics\Icons\Weather\simple\"
-ImageTint=#textcolor2#
-MouseActionCursor=1
-LeftMouseUpAction=!Execute ["https://weather.com/weather/today/"]
-x=(#height#/5)*#scaledpi#
+ImageTint=255,255,255,#paneltitleopacity#
+LeftMouseUpAction=!Execute ["#URL#"]
+x=(#height#/8)*#scaledpi#
+Y=(#height#/20)*#scaledpi#
+
 Hidden=#IconStyle#
+
 [IconColor]
 Meter=Image
 MeterStyle=IconStyle
-MeasureName=@CurrentIcon
-MeasureName2=@CurrentLocationName
-MeasureName3=@CurrentWind
-MeasureName4=@CurrentPressure
-MeasureName5=@CurrentHumidity
+MeasureName=@MeasureIcon
+W=125
+H=125
+MeasureName2=@MeasureCountry
+MeasureName3=@MeasureCity
+ToolTipText= %2, %3
 ImagePath="#@#Graphics\Icons\Weather\icons\"
-MouseActionCursor=1
-LeftMouseUpAction=!Execute ["https://weather.com/weather/today/"]
-x=(#height#/5)*#scaledpi#
-DynamicVariables=1
+ImageTint=255,255,255,#paneltitleopacity#
+LeftMouseUpAction=!Execute ["#URL#"]
+x=(#height#/8)*#scaledpi#
+Y=(#height#/20)*#scaledpi#
 Hidden=[measurefunnythings]
 
 [ExtraInfo]
@@ -107,43 +111,50 @@ X=r
 Y=((#Height#/50)*#scaledpi#)R
 FontFace=#FontTypeWP#
 MeterStyle=DriveText
-FontColor=#TextColor2#
+FontColor=#textcolor2#,#paneltitleopacity#
 FontSize=(#Height#/15.5)*#scaledpi#
 
 
 [Wind]
 Meter=String
-MeasureName=@CurrentWind
-Text=#Humidity#: %1
+MeasureName=@MeasureWindSpeedKmh
+Text=#Wind#: %1 Km/h
 MeterStyle=ExtraInfo
 X=(#height#)*#scaledpi#
 Y=(#height#/6)*#scaledpi#
-
+FontSize=11
 
 [Humidty]
 Meter=String
-MeasureName=@CurrentHumidity
-Text=#Wind#: %1
+MeasureName=@MeasureHumid
+Text=#Humidity#: %1%
 MeterStyle=ExtraInfo
 FontColor=#TextColor2#,225
+FontSize=11
+
 [Pressure]
 Meter=String
-MeasureName=@CurrentPressure
+MeasureName=@MeasurePressMbar
 Text=#Pressure#: %1
 MeterStyle=ExtraInfo
 FontColor=#TextColor2#,200
+FontSize=11
+
 [UV]
 Meter=String
-MeasureName=@CurrentUVIndexText
-MeasureName2=@CurrentUVIndexTextValue
-Text=%1: %2
+MeasureName=@MeasureUV
+MeasureName2=@MeasureUVindex
+Text=UV index: %2 (%1)
 MeterStyle=ExtraInfo
 FontColor=#TextColor2#,175
+FontSize=11
 
 [Sun]
 Meter=String
-MeasureName=@CurrentSunrise
-MeasureName2=@CurrentSunset
+MeasureName=@MeasureSunrise24H
+MeasureName2=@MeasureSunset24H
 Text=%1 / %2
+ToolTipText=Sun Rise Time / Sun Set Time
 MeterStyle=ExtraInfo
 FontColor=#TextColor2#,150
+FontSize=11