Skip to content

Commit

Permalink
Merge pull request #20990 from arnova/to_inhibit_or_to_inhibited
Browse files Browse the repository at this point in the history 
changed: Rename ambiguous IsInhibit-builtin to IdleShutdownInhibited
  • Loading branch information
@arnova
arnova committed Mar 1, 2022
2 parents 17903d8 + 786dfbb commit fca7647
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 81 deletions.
4 changes: 2 additions & 2 deletions addons/skin.estuary/xml/DialogButtonMenu.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@
<item>
<label>$LOCALIZE[13017]</label>
<onclick>InhibitIdleShutdown(true)</onclick>
<visible>System.HasShutdown +!System.IsInhibit</visible>
<visible>System.HasShutdown +!System.IdleShutdownInhibited</visible>
</item>
<item>
<label>$LOCALIZE[13018]</label>
<onclick>InhibitIdleShutdown(false)</onclick>
<visible>System.HasShutdown + System.IsInhibit</visible>
<visible>System.HasShutdown + System.IdleShutdownInhibited</visible>
</item>
</content>
</control>
Expand Down
157 changes: 80 additions & 77 deletions xbmc/GUIInfoManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1364,16 +1364,16 @@ const infomap weather[] = {{ "isfetched", WEATHER_IS_FETCHED },
/// @return **True** if ScreenSaver is active.
/// <p>
/// }
/// \table_row3{ <b>`System.IsInhibit`</b>,
/// \anchor System_IsInhibit
/// \table_row3{ <b>`System.IdleShutdownInhibited`</b>,
/// \anchor System_IdleShutdownInhibited
/// _boolean_,
/// @return **True** when shutdown on idle is disabled.
/// <p>
/// }
/// \table_row3{ <b>`System.HasShutdown`</b>,
/// \anchor System_HasShutdown
/// _boolean_,
/// @return **True** when shutdown on idle is enabled.
/// @return **True** if Kodi can shutdown the system.
/// <p>
/// }
/// \table_row3{ <b>`System.Time`</b>,
Expand Down Expand Up @@ -1793,80 +1793,83 @@ const infomap weather[] = {{ "isfetched", WEATHER_IS_FETCHED },
/// @return **True** when screensaver on idle is disabled.
/// <p>
/// }
const infomap system_labels[] = {{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE},
{"hasmediadvd", SYSTEM_MEDIA_DVD},
{"hasmediaaudiocd", SYSTEM_MEDIA_AUDIO_CD},
{"dvdready", SYSTEM_DVDREADY},
{"trayopen", SYSTEM_TRAYOPEN},
{"haslocks", SYSTEM_HASLOCKS},
{"hashiddeninput", SYSTEM_HAS_INPUT_HIDDEN},
{"hasloginscreen", SYSTEM_HAS_LOGINSCREEN},
{"hasactivemodaldialog", SYSTEM_HAS_ACTIVE_MODAL_DIALOG},
{"hasvisiblemodaldialog", SYSTEM_HAS_VISIBLE_MODAL_DIALOG},
{"ismaster", SYSTEM_ISMASTER},
{"isfullscreen", SYSTEM_ISFULLSCREEN},
{"isstandalone", SYSTEM_ISSTANDALONE},
{"loggedon", SYSTEM_LOGGEDON},
{"showexitbutton", SYSTEM_SHOW_EXIT_BUTTON},
{"canpowerdown", SYSTEM_CAN_POWERDOWN},
{"cansuspend", SYSTEM_CAN_SUSPEND},
{"canhibernate", SYSTEM_CAN_HIBERNATE},
{"canreboot", SYSTEM_CAN_REBOOT},
{"screensaveractive", SYSTEM_SCREENSAVER_ACTIVE},
{"dpmsactive", SYSTEM_DPMS_ACTIVE},
{"cputemperature", SYSTEM_CPU_TEMPERATURE}, // labels from here
{"cpuusage", SYSTEM_CPU_USAGE},
{"gputemperature", SYSTEM_GPU_TEMPERATURE},
{"fanspeed", SYSTEM_FAN_SPEED},
{"freespace", SYSTEM_FREE_SPACE},
{"usedspace", SYSTEM_USED_SPACE},
{"totalspace", SYSTEM_TOTAL_SPACE},
{"usedspacepercent", SYSTEM_USED_SPACE_PERCENT},
{"freespacepercent", SYSTEM_FREE_SPACE_PERCENT},
{"buildversion", SYSTEM_BUILD_VERSION},
{"buildversionshort", SYSTEM_BUILD_VERSION_SHORT},
{"buildversioncode", SYSTEM_BUILD_VERSION_CODE},
{"buildversiongit", SYSTEM_BUILD_VERSION_GIT},
{"builddate", SYSTEM_BUILD_DATE},
{"fps", SYSTEM_FPS},
{"freememory", SYSTEM_FREE_MEMORY},
{"language", SYSTEM_LANGUAGE},
{"temperatureunits", SYSTEM_TEMPERATURE_UNITS},
{"screenmode", SYSTEM_SCREEN_MODE},
{"screenwidth", SYSTEM_SCREEN_WIDTH},
{"screenheight", SYSTEM_SCREEN_HEIGHT},
{"currentwindow", SYSTEM_CURRENT_WINDOW},
{"currentcontrol", SYSTEM_CURRENT_CONTROL},
{"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
{"dvdlabel", SYSTEM_DVD_LABEL},
{"internetstate", SYSTEM_INTERNET_STATE},
{"osversioninfo", SYSTEM_OS_VERSION_INFO},
{"kernelversion", SYSTEM_OS_VERSION_INFO}, // old, not correct name
{"uptime", SYSTEM_UPTIME},
{"totaluptime", SYSTEM_TOTALUPTIME},
{"cpufrequency", SYSTEM_CPUFREQUENCY},
{"screenresolution", SYSTEM_SCREEN_RESOLUTION},
{"videoencoderinfo", SYSTEM_VIDEO_ENCODER_INFO},
{"profilename", SYSTEM_PROFILENAME},
{"profilethumb", SYSTEM_PROFILETHUMB},
{"profilecount", SYSTEM_PROFILECOUNT},
{"profileautologin", SYSTEM_PROFILEAUTOLOGIN},
{"progressbar", SYSTEM_PROGRESS_BAR},
{"batterylevel", SYSTEM_BATTERY_LEVEL},
{"friendlyname", SYSTEM_FRIENDLY_NAME},
{"alarmpos", SYSTEM_ALARM_POS},
{"isinhibit", SYSTEM_ISINHIBIT},
{"hasshutdown", SYSTEM_HAS_SHUTDOWN},
{"haspvr", SYSTEM_HAS_PVR},
{"startupwindow", SYSTEM_STARTUP_WINDOW},
{"stereoscopicmode", SYSTEM_STEREOSCOPIC_MODE},
{"hascms", SYSTEM_HAS_CMS},
{"privacypolicy", SYSTEM_PRIVACY_POLICY},
{"haspvraddon", SYSTEM_HAS_PVR_ADDON},
{"addonupdatecount", SYSTEM_ADDON_UPDATE_COUNT},
{"supportscpuusage", SYSTEM_SUPPORTS_CPU_USAGE},
{"supportedhdrtypes", SYSTEM_SUPPORTED_HDR_TYPES},
{"isscreensaverinhibited", SYSTEM_IS_SCREENSAVER_INHIBITED}};
const infomap system_labels[] = {
{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE},
{"hasmediadvd", SYSTEM_MEDIA_DVD},
{"hasmediaaudiocd", SYSTEM_MEDIA_AUDIO_CD},
{"dvdready", SYSTEM_DVDREADY},
{"trayopen", SYSTEM_TRAYOPEN},
{"haslocks", SYSTEM_HASLOCKS},
{"hashiddeninput", SYSTEM_HAS_INPUT_HIDDEN},
{"hasloginscreen", SYSTEM_HAS_LOGINSCREEN},
{"hasactivemodaldialog", SYSTEM_HAS_ACTIVE_MODAL_DIALOG},
{"hasvisiblemodaldialog", SYSTEM_HAS_VISIBLE_MODAL_DIALOG},
{"ismaster", SYSTEM_ISMASTER},
{"isfullscreen", SYSTEM_ISFULLSCREEN},
{"isstandalone", SYSTEM_ISSTANDALONE},
{"loggedon", SYSTEM_LOGGEDON},
{"showexitbutton", SYSTEM_SHOW_EXIT_BUTTON},
{"canpowerdown", SYSTEM_CAN_POWERDOWN},
{"cansuspend", SYSTEM_CAN_SUSPEND},
{"canhibernate", SYSTEM_CAN_HIBERNATE},
{"canreboot", SYSTEM_CAN_REBOOT},
{"screensaveractive", SYSTEM_SCREENSAVER_ACTIVE},
{"dpmsactive", SYSTEM_DPMS_ACTIVE},
{"cputemperature", SYSTEM_CPU_TEMPERATURE}, // labels from here
{"cpuusage", SYSTEM_CPU_USAGE},
{"gputemperature", SYSTEM_GPU_TEMPERATURE},
{"fanspeed", SYSTEM_FAN_SPEED},
{"freespace", SYSTEM_FREE_SPACE},
{"usedspace", SYSTEM_USED_SPACE},
{"totalspace", SYSTEM_TOTAL_SPACE},
{"usedspacepercent", SYSTEM_USED_SPACE_PERCENT},
{"freespacepercent", SYSTEM_FREE_SPACE_PERCENT},
{"buildversion", SYSTEM_BUILD_VERSION},
{"buildversionshort", SYSTEM_BUILD_VERSION_SHORT},
{"buildversioncode", SYSTEM_BUILD_VERSION_CODE},
{"buildversiongit", SYSTEM_BUILD_VERSION_GIT},
{"builddate", SYSTEM_BUILD_DATE},
{"fps", SYSTEM_FPS},
{"freememory", SYSTEM_FREE_MEMORY},
{"language", SYSTEM_LANGUAGE},
{"temperatureunits", SYSTEM_TEMPERATURE_UNITS},
{"screenmode", SYSTEM_SCREEN_MODE},
{"screenwidth", SYSTEM_SCREEN_WIDTH},
{"screenheight", SYSTEM_SCREEN_HEIGHT},
{"currentwindow", SYSTEM_CURRENT_WINDOW},
{"currentcontrol", SYSTEM_CURRENT_CONTROL},
{"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
{"dvdlabel", SYSTEM_DVD_LABEL},
{"internetstate", SYSTEM_INTERNET_STATE},
{"osversioninfo", SYSTEM_OS_VERSION_INFO},
{"kernelversion", SYSTEM_OS_VERSION_INFO}, // old, not correct name
{"uptime", SYSTEM_UPTIME},
{"totaluptime", SYSTEM_TOTALUPTIME},
{"cpufrequency", SYSTEM_CPUFREQUENCY},
{"screenresolution", SYSTEM_SCREEN_RESOLUTION},
{"videoencoderinfo", SYSTEM_VIDEO_ENCODER_INFO},
{"profilename", SYSTEM_PROFILENAME},
{"profilethumb", SYSTEM_PROFILETHUMB},
{"profilecount", SYSTEM_PROFILECOUNT},
{"profileautologin", SYSTEM_PROFILEAUTOLOGIN},
{"progressbar", SYSTEM_PROGRESS_BAR},
{"batterylevel", SYSTEM_BATTERY_LEVEL},
{"friendlyname", SYSTEM_FRIENDLY_NAME},
{"alarmpos", SYSTEM_ALARM_POS},
{"isinhibit",
SYSTEM_IDLE_SHUTDOWN_INHIBITED}, // Deprecated, replaced by "idleshutdowninhibited"
{"idleshutdowninhibited", SYSTEM_IDLE_SHUTDOWN_INHIBITED},
{"hasshutdown", SYSTEM_HAS_SHUTDOWN},
{"haspvr", SYSTEM_HAS_PVR},
{"startupwindow", SYSTEM_STARTUP_WINDOW},
{"stereoscopicmode", SYSTEM_STEREOSCOPIC_MODE},
{"hascms", SYSTEM_HAS_CMS},
{"privacypolicy", SYSTEM_PRIVACY_POLICY},
{"haspvraddon", SYSTEM_HAS_PVR_ADDON},
{"addonupdatecount", SYSTEM_ADDON_UPDATE_COUNT},
{"supportscpuusage", SYSTEM_SUPPORTS_CPU_USAGE},
{"supportedhdrtypes", SYSTEM_SUPPORTED_HDR_TYPES},
{"isscreensaverinhibited", SYSTEM_IS_SCREENSAVER_INHIBITED}};

/// \page modules__infolabels_boolean_conditions
/// \table_row3{ <b>`System.HasAddon(id)`</b>,
Expand Down
2 changes: 1 addition & 1 deletion xbmc/guilib/guiinfo/GUIInfoLabels.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
#define SYSTEM_PROFILECOUNT 181
#define SYSTEM_ISFULLSCREEN 182
#define SYSTEM_ISSTANDALONE 183
#define SYSTEM_ISINHIBIT 184
#define SYSTEM_IDLE_SHUTDOWN_INHIBITED 184
#define SYSTEM_HAS_SHUTDOWN 185
#define SYSTEM_HAS_PVR 186
#define SYSTEM_STARTUP_WINDOW 187
Expand Down
2 changes: 1 addition & 1 deletion xbmc/guilib/guiinfo/SystemGUIInfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ bool CSystemGUIInfo::GetBool(bool& value, const CGUIListItem *gitem, int context
case SYSTEM_ISSTANDALONE:
value = g_application.IsStandAlone();
return true;
case SYSTEM_ISINHIBIT:
case SYSTEM_IDLE_SHUTDOWN_INHIBITED:
value = g_application.IsIdleShutdownInhibited();
return true;
case SYSTEM_HAS_SHUTDOWN:
Expand Down

0 comments on commit fca7647

Please sign in to comment.