Skip to content

Commit

Permalink
[Removed] The "Retrieving..." text.
Browse files Browse the repository at this point in the history
  • Loading branch information
SaberAkiyama committed Jul 26, 2023
1 parent c8a41cb commit b746f9e
Show file tree
Hide file tree
Showing 17 changed files with 60 additions and 97 deletions.
4 changes: 2 additions & 2 deletions @Resources/Measures/Weather Variables.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

[Variables]

Latitude=40.74844637
Latitude=40.74841244

Longitude=-73.985663658
Longitude=-73.98568118

TypeUnits=e

Expand Down
27 changes: 27 additions & 0 deletions @Resources/Scripts/User Agent.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--; ==================================================
--; Lua User Agent
--; ==================================================

function finishUserAgent()
SKIN:Bang('!Log "#RetrievingCurrentText#"')

SKIN:Bang('!UnpauseMeasureGroup WeatherCurrentMeasure')
SKIN:Bang('!UnpauseMeasureGroup WeatherCurrentSlimMeasure')
SKIN:Bang('!UnpauseMeasureGroup WeatherCurrentExtraSlimMeasure')
SKIN:Bang('!UnpauseMeasureGroup WeatherOneHourMeasure')
SKIN:Bang('!UnpauseMeasureGroup WeatherSixHourMeasure')
SKIN:Bang('!UnpauseMeasure MeasureWeatherCore')
SKIN:Bang('!UpdateMeasure MeasureWeatherCore')

end

function finishTendayUserAgent()
SKIN:Bang('!Log "#RetrievingTendayText#"')

SKIN:Bang('!UnpauseMeasureGroup WeatherOneDayMeasure')
SKIN:Bang('!UnpauseMeasureGroup WeatherOneDaySlimMeasure')
SKIN:Bang('!UnpauseMeasureGroup WeatherSevenDayMeasure')
SKIN:Bang('!UnpauseMeasure MeasureWeatherTendayCore')
SKIN:Bang('!UpdateMeasure MeasureWeatherTendayCore')

end
4 changes: 0 additions & 4 deletions @Resources/Scripts/Weather Daily Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

function updateDaily()
SKIN:Bang('!UpdateMeasure MeasureWeatherCore')
SKIN:Bang('!ShowMeter MeterWeatherRetrieve')
SKIN:Bang('!HideMeterGroup WeatherCurrentMeter')
SKIN:Bang('!HideMeterGroup WeatherCurrentSlimMeter')
SKIN:Bang('!HideMeterGroup WeatherCurrentExtraSlimMeter')
Expand All @@ -28,7 +27,6 @@ end
function updateHourly()
SKIN:Bang('!UpdateMeasure MeasureWeatherCore')

SKIN:Bang('!ShowMeter MeterWeatherRetrieve')
SKIN:Bang('!HideMeterGroup WeatherOneHourMeter')
SKIN:Bang('!HideMeterGroup WeatherSixHourMeter')
SKIN:Bang('!DisableMeasureGroup WeatherOneHourMeasure')
Expand All @@ -41,7 +39,6 @@ end
function finishCurrent()
SKIN:Bang('!Log "#RetrievedCurrentText#"')

SKIN:Bang('!HideMeter MeterWeatherRetrieve')
SKIN:Bang('!ShowMeterGroup WeatherCurrentMeter')
SKIN:Bang('!ShowMeterGroup WeatherCurrentSlimMeter')
SKIN:Bang('!ShowMeterGroup WeatherCurrentExtraSlimMeter')
Expand All @@ -60,7 +57,6 @@ end
--; ==================================================

function finishHourly()
SKIN:Bang('!HideMeter MeterWeatherRetrieve')
SKIN:Bang('!ShowMeterGroup WeatherOneHourMeter')
SKIN:Bang('!ShowMeterGroup WeatherSixHourMeter')
SKIN:Bang('!EnableMeasureGroup WeatherOneHourMeasure')
Expand Down
Binary file modified @Resources/Scripts/Weather Tenday Core.lua
Binary file not shown.
2 changes: 0 additions & 2 deletions @Resources/Scripts/Weather Update.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

function netErrorDaily()
SKIN:Bang('!Log "#RetryText#" Warning')
SKIN:Bang('!ShowMeter MeterWeatherRetrieve')
SKIN:Bang('!HideMeterGroup WeatherCurrentMeter')
SKIN:Bang('!HideMeterGroup WeatherCurrentSlimMeter')
SKIN:Bang('!HideMeterGroup WeatherCurrentExtraSlimMeter')
Expand All @@ -26,7 +25,6 @@ end

function netErrorTenDay()
SKIN:Bang('!Log "#RetryText#" Warning')
SKIN:Bang('!ShowMeter MeterWeatherRetrieveDaily')
SKIN:Bang('!HideMeterGroup WeatherOneDayMeter')
SKIN:Bang('!HideMeterGroup WeatherOneDaySlimMeter')
SKIN:Bang('!HideMeterGroup WeatherSevenDayMeter')
Expand Down
2 changes: 1 addition & 1 deletion @Resources/Variables.inc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Variables]
Page=Info
HiddenLineInfo=0
HiddenLineInfo=1
TypeFace=Roboto
ColorCode=255,255,255
Expand Down
Binary file modified Current/Current Extra Slim.ini
Binary file not shown.
Binary file modified Current/Current Slim.ini
Binary file not shown.
Binary file modified Current/Current Super Slim.ini
Binary file not shown.
Binary file modified Current/Current.ini
Binary file not shown.
Binary file modified Daily/One Day Slim.ini
Binary file not shown.
Binary file modified Daily/One Day.ini
Binary file not shown.
Binary file modified Daily/Seven Day.ini
Binary file not shown.
Binary file modified Hourly/One Hour.ini
Binary file not shown.
Binary file modified Hourly/Six Hour.ini
Binary file not shown.
118 changes: 30 additions & 88 deletions Settings.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,14 @@ Group=WeatherSetting
AccurateText=1
DynamicWindowSize=1

OnRefreshAction=[!CommandMeasure LuaSettings "setRefreshAction()"]
OnRefreshAction=[!CommandMeasure LuaSettings "setAutoRefresh()"]

[Metadata]
Name=SA Weather Cast (Settings)
Author=Saber Akiyama
Information=This skin can be used to change Weather for Weather Cast.
License=Creative Commons BY-NC-SA 4.0 International Public License
Version=1.1.2

; ===========================================================================
; LUA SCRIPTS
; ===========================================================================

[LuaSettings]
Measure=Script
ScriptFile=#@#Scripts\Settings\Settings.lua
UpdateDivider=5

; ===========================================================================
; VARIABLES
; ===========================================================================

[Variables]
@include=#@#Variables.inc
@include2=#@#Measures\Weather Variables.inc

Version=1.1.2
Version=2.0.1

; ===========================================================================
; BACKGROUND
Expand All @@ -58,17 +39,19 @@ UpdateDivider=-1
Meter=Shape
X=0
Y=0
Shape=Rectangle 0,0,1280,640 | Fill LinearGradient MyFillGradient | Stroke Color 0,0,0,1
MyFillGradient=116.5 | 0,0,0,128 ; 0.0 | 0,0,0,64 ; 1.0
Shape=Rectangle 0,0,1280,640 | Fill Color 0,0,0,160 | Stroke Color 0,0,0,1
DynamicVariables=1
UpdateDivider=-1

[MeterLine]
Meter=Shape
X=260
Y=50
Shape=Line 0,0,0,540 | Stroke Color 255,255,255,255
UpdateDivider=-1
; ===========================================================================
; VARIABLES
; ===========================================================================

[Variables]
@include=#@#Variables.inc
@include2=#@#Measures\Weather Variables.inc

Version=2.0.1

; ===========================================================================
; COMMON STYLES
Expand All @@ -81,74 +64,33 @@ UpdateDivider=-1
; ===========================================================================

@include4="#@#Page Config\Page #Page#.inc"
SetUpdateDivider=-1

[MeterLinePage]
Meter=Shape
X=255
Y=#PageLine#
Shape=Rectangle 0,0,10,40 | Fill Color 255,215,0,255 | Stroke Color 0,0,0,0
DynamicVariables=1
UpdateDivider=-1
; ===========================================================================
; LUA SCRIPTS
; ===========================================================================

[LuaPage]
[LuaSettings]
Measure=Script
ScriptFile=#@#Scripts\Settings\Lua #Page#.lua
ScriptFile=#@#Scripts\Settings\Settings.lua
UpdateDivider=5

; ===========================================================================
; PAGE SWITCH
; HIDDEN LINE
; ===========================================================================

[Page1]
Meter=String
MeterStyle=PageActive
Text=Info
X=210
Y=100
LeftMouseUpAction=!CommandMeasure LuaSettings "setSettings('Info')"
MouseOverAction=[!CommandMeasure LuaSettings "setSettingsInfo('Over')"]
MouseLeaveAction=[!CommandMeasure LuaSettings "setSettingsInfo('Leave')"]

[Page2]
Meter=String
MeterStyle=PageActive
Text=Skins
X=0r
Y=50r
LeftMouseUpAction=!CommandMeasure LuaSettings "setSettings('Skins')"
MouseOverAction=[!CommandMeasure LuaSettings "setSettingsSkins('Over')"]
MouseLeaveAction=[!CommandMeasure LuaSettings "setSettingsSkins('Leave')"]

[Page3]
Meter=String
MeterStyle=PageActive
X=r
Y=50r
Text="Weather"
LeftMouseUpAction=!CommandMeasure LuaSettings "setSettings('Weather')"
MouseOverAction=[!CommandMeasure LuaSettings "setSettingsWeather('Over')"]
MouseLeaveAction=[!CommandMeasure LuaSettings "setSettingsWeather('Leave')"]

[Page4]
Meter=String
MeterStyle=PageActive
X=r
Y=50r
Text="Language"
LeftMouseUpAction=!CommandMeasure LuaSettings "setSettings('Language')"
MouseOverAction=[!CommandMeasure LuaSettings "setSettingsLanguage('Over')"]
MouseLeaveAction=[!CommandMeasure LuaSettings "setSettingsLanguage('Leave')"]
[MeterLine]
Meter=Shape
X=640
Y=50
Shape=Line 0,0,0,540 | Stroke Color 255,255,255,255
AntiAlias=1
Hidden=#HiddenLineInfo#
UpdateDivider=-1

; ===========================================================================
; CLOSE BUTTON
; SLIDER BOX
; ===========================================================================

[MeterCloseButton]
Meter=String
MeterStyle=SettingActive
X=210
Y=560
Text=Close Settings
LeftMouseUpAction=!CommandMeasure LuaSettings "closeSettings()"
MouseOverAction=[!CommandMeasure LuaSettings "setSettingsClose('Over')"]
MouseLeaveAction=[!CommandMeasure LuaSettings "setSettingsClose('Leave')"]
[IncludeSlider]
@include6=#@#Slider Select.inc
Binary file modified Severity Alert [USA Only]/Severity Alert.ini
Binary file not shown.

0 comments on commit b746f9e

Please sign in to comment.