From 1d1b1d4c834368f1916c21841588d2ff903977cd Mon Sep 17 00:00:00 2001 From: realcopacetic Date: Tue, 16 Jul 2024 13:24:29 +0100 Subject: [PATCH] time_widget wip --- 16x9/Colors.xml | 4 + 16x9/Components_Home.xml | 161 +++++++++++++++----- 16x9/Content_Settings.xml | 28 ++-- 16x9/Content_Settings_Sliders.xml | 19 +++ 16x9/DialogButtonMenu.xml | 4 +- 16x9/Home.xml | 5 +- 16x9/MyWeather.xml | 30 ++++ 16x9/Startup.xml | 1 + 16x9/Templates_Panels.xml | 3 + 16x9/Variables_Labels_Windows.xml | 7 + README.md | 6 +- language/resource.language.en_gb/strings.po | 36 ++++- 12 files changed, 247 insertions(+), 57 deletions(-) create mode 100644 16x9/MyWeather.xml diff --git a/16x9/Colors.xml b/16x9/Colors.xml index 08cea131..96f2ff67 100644 --- a/16x9/Colors.xml +++ b/16x9/Colors.xml @@ -448,6 +448,10 @@ $VAR[Light_Color] $VAR[Unfocused_Color] + + $VAR[Light_Color] + $VAR[Unfocused_Color] + $VAR[Light_Color] $VAR[Unfocused_Color] diff --git a/16x9/Components_Home.xml b/16x9/Components_Home.xml index 32f999a7..c6e5d006 100644 --- a/16x9/Components_Home.xml +++ b/16x9/Components_Home.xml @@ -338,6 +338,93 @@ + + + + + + + + + + + + + + + + + $PARAM[visible] + + + + + + + + + + + + + + + + + + !String.IsEqual(Weather.Conditions,$LOCALIZE[503]) + 33 + 33 + $INFO[Weather.ConditionsIcon] + + + !String.IsEmpty(Weather.Temperature) + MusicPlayer_Info + 33 + auto + + center + $PARAM[textcolor] + + + + + + + + + + + $PARAM[right] + 0 + 79 + 33 + horizontal + right + 10 + + MusicPlayer_Info + 100% + auto + + center + $PARAM[textcolor] + + + + + + MusicPlayer_Info + 100% + auto + + center + $PARAM[textcolor] + + + + + @@ -346,46 +433,42 @@ - ![$EXP[Music_Player_IsVisible] | $EXP[Music_Player_HasFocus] | Window.IsVisible(volumebar) | Window.IsVisible(notification) | Window.IsVisible(extendedprogressdialog)] | Window.IsVisible(shutdownmenu) - - - $PARAM[visible] - $PARAM[right] - 0 - $PARAM[size] - $PARAM[size] - - - views/white_100.png + $PARAM[visible] + $PARAM[right] + 0 + $PARAM[size] + $PARAM[size] + + + views/white_100.png + + + 15 + 15 + 50% + 48 + center + 3 + horizontal + true + + auto + 100% + Title_Breadcrumb_Label + right + center + $PARAM[textcolor] + - - 15 - 15 - 50% - 70 - center - 3 - horizontal - true - - auto - 70 - Main_Menu_Focused - right - center - $PARAM[textcolor] - - - - auto - 55 - 13 - Main_Menu_Unfocused - left - center - $PARAM[textcolor] - - + + auto + 33 + 13 + MusicPlayer_Info + left + center + $PARAM[textcolor] + diff --git a/16x9/Content_Settings.xml b/16x9/Content_Settings.xml index c283b964..ca7e8475 100644 --- a/16x9/Content_Settings.xml +++ b/16x9/Content_Settings.xml @@ -468,9 +468,9 @@ - Reset widgets + ControlGroup(9).HasFocus(11) + Skin.HasSetting(Widgets_Enabled) + System.AddonIsEnabled(script.copacetic.helper) RunScript(script.copacetic.helper,action=dialog_yesno,heading=$LOCALIZE[31430],message=$LOCALIZE[31431],yes_actions=SetFocus(4200)) - ControlGroup(9).HasFocus(11) + Skin.HasSetting(Widgets_Enabled) + System.AddonIsEnabled(script.copacetic.helper) Global search @@ -499,26 +499,34 @@ Enable screensaver + ControlGroup(9).HasFocus(11) Skin.ToggleSetting(Home_Screensaver_Enabled) Skin.HasSetting(Home_Screensaver_Enabled) - ControlGroup(9).HasFocus(11) - Show clearlogo + ControlGroup(9).HasFocus(11) + Skin.HasSetting(Home_Screensaver_Enabled) Skin.ToggleSetting(Home_Screensaver_Clearlogo_Enabled) Skin.HasSetting(Home_Screensaver_Clearlogo_Enabled) - ControlGroup(9).HasFocus(11) + Skin.HasSetting(Home_Screensaver_Enabled) - - Hide clock - - Skin.ToggleSetting(Hide_Home_Clock) - Skin.HasSetting(Hide_Home_Clock) - ControlGroup(9).HasFocus(11) + + + + + + + + + + + - Make persistent across homescreen + ControlGroup(9).HasFocus(11) + !Skin.String(Time_Widget,None) + + Skin.ToggleSetting(Time_Widget_Persistent) + Skin.HasSetting(Time_Widget_Persistent) - General diff --git a/16x9/Content_Settings_Sliders.xml b/16x9/Content_Settings_Sliders.xml index 54662ebe..60c6cf9c 100644 --- a/16x9/Content_Settings_Sliders.xml +++ b/16x9/Content_Settings_Sliders.xml @@ -415,6 +415,25 @@ Conditional + + Skin.SetString(Time_Widget,Date) + Skin.SetString(Time_Widget,Clock) + Skin.SetString(Time_Widget,None) + Skin.SetString(Time_Widget,Clock) + Skin.SetString(Time_Widget,Date) + Skin.SetString(Time_Widget,Weather) + + + Conditional + Conditional + Conditional + + + Conditional + Conditional + Conditional + + Skin.SetString(Infoscreen_Brightness,33) Skin.SetString(Infoscreen_Brightness,25) diff --git a/16x9/DialogButtonMenu.xml b/16x9/DialogButtonMenu.xml index da6e99c2..e0b233a6 100644 --- a/16x9/DialogButtonMenu.xml +++ b/16x9/DialogButtonMenu.xml @@ -10,9 +10,7 @@ - - - + false Close diff --git a/16x9/Home.xml b/16x9/Home.xml index 39069a87..15380d90 100644 --- a/16x9/Home.xml +++ b/16x9/Home.xml @@ -61,12 +61,11 @@ + - - - + diff --git a/16x9/MyWeather.xml b/16x9/MyWeather.xml new file mode 100644 index 00000000..7e102673 --- /dev/null +++ b/16x9/MyWeather.xml @@ -0,0 +1,30 @@ + + + + $VAR[Dark_Color] + 2 + + + 0 + 50% + + + + + 0 + 50% + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/16x9/Startup.xml b/16x9/Startup.xml index 48fb2352..3269c928 100644 --- a/16x9/Startup.xml +++ b/16x9/Startup.xml @@ -13,6 +13,7 @@ Skin.SetString(Multiart_Interval,4) Skin.SetString(OSD_Background_Brightness,25) Skin.SetString(Trailer_Autoplay_Interval,3) + Skin.SetString(Time_Widget,Clock) Skin.SetString(script-upnext_Artwork,Fanart) Skin.SetString(visualisation_Layout,Small) Skin.SetBool(Preferred_Rating_BBFC) diff --git a/16x9/Templates_Panels.xml b/16x9/Templates_Panels.xml index 8a81bec5..8d4a6bb1 100644 --- a/16x9/Templates_Panels.xml +++ b/16x9/Templates_Panels.xml @@ -73,6 +73,9 @@ + + + diff --git a/16x9/Variables_Labels_Windows.xml b/16x9/Variables_Labels_Windows.xml index e7d9c6ed..1991a090 100644 --- a/16x9/Variables_Labels_Windows.xml +++ b/16x9/Variables_Labels_Windows.xml @@ -201,6 +201,7 @@ $LOCALIZE[31542] $LOCALIZE[31543] $LOCALIZE[31533] + $LOCALIZE[31544] $LOCALIZE[31541] $LOCALIZE[31598] @@ -298,6 +299,12 @@ $LOCALIZE[31483] $LOCALIZE[31482] + + $LOCALIZE[31727] + $LOCALIZE[31726] + $LOCALIZE[31725] + $LOCALIZE[31724] + $INFO[Container(211).ListItem.Property(backgroundPlaylist)] diff --git a/README.md b/README.md index 3eef5c6e..a0af275e 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,12 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc - Added progress bar and remaining movies indicator for sets that aren't fully watched using a script.copacetic.helper script. - Improved accuracy and efficiency of conditional animations for the progress bar unwatched episodes/movies indicator. - Added ability to speed up animations and window transitions (Settings > Copacetic > General > Speed up animations and window transitions). This feature is currently in beta so further refinement may be necessary following wider testing. When enabled, there is a secondary option to 'Disable all viewtype scroll animations', which will further speed up the main media views by setting scrolltime to 0 https://github.com/realcopacetic/skin.copacetic/issues/73 -- Fix for glitch in widget spotlight auto scroll function, which could cause widgets to momentarily disappear +- Fix for glitch in widget spotlight auto scroll function, which could cause widgets to momentarily disappear - Fix for bug where secondary list was sometimes showing Poster art even when 'Prefer keyart' was selected for the specified view and vice versa https://github.com/realcopacetic/skin.copacetic/issues/174 +- Added horizontal layouts for Gridview. In Settings > Copacetic > Views > Grid, you can now choose item layout. The options are 'Vertical small', 'Vertical large' and 'Horizontal' https://github.com/realcopacetic/skin.copacetic/issues/180 +- Fixed bug where square widgets were showing fanart even when a thumbnail was available https://github.com/realcopacetic/skin.copacetic/issues/179 +- Added new Time widget replacing the Clock. Now in Settings > Copacetic > Home > General, you can choose the furniture to include (None / Clock / Clock and Date / Clock, Date and Weather). Note: For weather to be displayed, you must install a weather addon and make sure it's enabled under Settings > Services > Weather https://github.com/realcopacetic/skin.copacetic/issues/177 + Still to do: ---- Infoscreen transitions diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index deee8600..78d77e70 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -1036,9 +1036,43 @@ msgstr "" #/16x9/Content_Settings.xml msgctxt "#31444" -msgid "Hide clock" +msgid "Furniture to include" msgstr "" +#/16x9/Content_Settings.xml +msgctxt "#31544" +msgid "Choose the furniture you wish to show in the top-right corner of the home screen." +msgstr "" + +#: NEW +#/16x9/Content_Settings.xml +msgctxt "#31724" +msgid "Clock" +msgstr "" + +#: NEW +#/16x9/Content_Settings.xml +msgctxt "#31725" +msgid "None" +msgstr "" + +#: NEW +#/16x9/Content_Settings.xml +msgctxt "#31726" +msgid "Clock and date" +msgstr "" + +#: NEW +#/16x9/Content_Settings.xml +msgctxt "#31727" +msgid "Clock, date and weather" +msgstr "" + +#: NEW +#/16x9/Content_Settings.xml +msgctxt "#31728" +msgid "Make persistent across home screen widgets" +msgstr ""