diff options
| author | est31 <MTest31@outlook.com> | 2015-06-06 05:35:38 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-06-06 05:57:33 +0200 |
| commit | c5338fd6c40d08472b680809cfa04d47826bdcf5 (patch) | |
| tree | d9cbdebd87b97616e0cbd52e46ad6887f01d90e1 /core | |
| parent | 803069886ebca492c0d5f47133ccf7833c716e5a (diff) | |
Add OS.get_time_zone_info function
The returned dictionary maps "name" to the
name of the current time zone, and "bias" to
a bias from UTC in minutes.
Diffstat (limited to 'core')
| -rw-r--r-- | core/bind/core_bind.cpp | 10 | ||||
| -rw-r--r-- | core/bind/core_bind.h | 1 | ||||
| -rw-r--r-- | core/os/os.h | 8 |
3 files changed, 18 insertions, 1 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 700856ab6f..26b1dac6f1 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -480,6 +480,15 @@ Dictionary _OS::get_time(bool utc) const { return timed; } + +Dictionary _OS::get_time_zone_info() const { + OS::TimeZoneInfo info = OS::get_singleton()->get_time_zone_info(); + Dictionary infod; + infod["bias"] = info.bias; + infod["name"] = info.name; + return infod; +} + uint64_t _OS::get_unix_time() const { return OS::get_singleton()->get_unix_time(); @@ -776,6 +785,7 @@ void _OS::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_date","utc"),&_OS::get_date,DEFVAL(false)); ObjectTypeDB::bind_method(_MD("get_time","utc"),&_OS::get_time,DEFVAL(false)); + ObjectTypeDB::bind_method(_MD("get_time_zone_info"),&_OS::get_time_zone_info); ObjectTypeDB::bind_method(_MD("get_unix_time"),&_OS::get_unix_time); ObjectTypeDB::bind_method(_MD("set_icon"),&_OS::set_icon); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 2400ba3fd4..74f29c23e8 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -206,6 +206,7 @@ public: void set_icon(const Image& p_icon); Dictionary get_date(bool utc) const; Dictionary get_time(bool utc) const; + Dictionary get_time_zone_info() const; uint64_t get_unix_time() const; int get_static_memory_usage() const; diff --git a/core/os/os.h b/core/os/os.h index 75a0a4eea7..0230a75ca0 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -244,9 +244,15 @@ public: int min; int sec; }; - + + struct TimeZoneInfo { + int bias; + String name; + }; + virtual Date get_date(bool local=false) const=0; virtual Time get_time(bool local=false) const=0; + virtual TimeZoneInfo get_time_zone_info() const=0; virtual uint64_t get_unix_time() const; virtual void delay_usec(uint32_t p_usec) const=0; |