atria-soft/gale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update new etk Uri API

Browse Source
This commit is contained in:
Edouard DUPIN 2018-10-23 22:19:31 +02:00
parent 961cf3e007
commit 41952bf140
7 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/src/org/gale/GaleSurfaceViewGL.java
View File

@ -35,6 +35,12 @@ public class GaleSurfaceViewGL extends GLSurfaceView implements GaleConstants {
m_galeNative = _galeInstance; m_galeNative = _galeInstance;
/* /*
List of the Android API : List of the Android API :
Android 9.0 28 Pie
Android 8.0 - 8.1 26 Oreo
Android 7.0 - 7.1.2 24 Nougat
Android 6.0 - 6.0.1 23 Marshmallow
Android 5.0 - 5.1.1 21 LOLIPOP
Android 4.4 - 4.4.4 19 KIT-KAT
Android 4.1, 4.1.1 16 JELLY_BEAN Platform Highlights Android 4.1, 4.1.1 16 JELLY_BEAN Platform Highlights
Android 4.0.3, 4.0.4 15 ICE_CREAM_SANDWICH_MR1 Platform Highlights Android 4.0.3, 4.0.4 15 ICE_CREAM_SANDWICH_MR1 Platform Highlights
Android 4.0, 4.0.1, 4.0.2 14 ICE_CREAM_SANDWICH Android 4.0, 4.0.1, 4.0.2 14 ICE_CREAM_SANDWICH

4
gale/Application.cpp
View File

@ -131,13 +131,13 @@ etk::String gale::Application::getTitle() {
return m_title; return m_title;
} }
void gale::Application::setIcon(const etk::String& _iconFile) { void gale::Application::setIcon(const etk::Uri& _iconFile) {
m_iconName = _iconFile; m_iconName = _iconFile;
gale::Context& context = gale::getContext(); gale::Context& context = gale::getContext();
context.setIcon(m_iconName); context.setIcon(m_iconName);
} }
etk::String gale::Application::getIcon() { const etk::Uri& gale::Application::getIcon() {
return m_iconName; return m_iconName;
} }

7
gale/Application.hpp
View File

@ -7,6 +7,7 @@
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
#include <etk/types.hpp> #include <etk/types.hpp>
#include <etk/uri/uri.hpp>
#include <etk/math/Vector2D.hpp> #include <etk/math/Vector2D.hpp>
#include <gale/orientation.hpp> #include <gale/orientation.hpp>
#include <gale/key/status.hpp> #include <gale/key/status.hpp>
@ -158,18 +159,18 @@ namespace gale {
*/ */
virtual etk::String getTitle(); virtual etk::String getTitle();
private: private:
etk::String m_iconName; etk::Uri m_iconName;
public: public:
/** /**
* @brief set the Icon of the application. * @brief set the Icon of the application.
* @param[in] _iconFile File name icon (.bmp/.png). * @param[in] _iconFile File name icon (.bmp/.png).
*/ */
virtual void setIcon(const etk::String& _iconFile); virtual void setIcon(const etk::Uri& _iconFile);
/** /**
* @brief Get the current filename of the application. * @brief Get the current filename of the application.
* @return Filename of the icon. * @return Filename of the icon.
*/ */
virtual etk::String getIcon(); virtual const etk::Uri& getIcon();
private: private:
enum gale::context::cursor m_cursor; enum gale::context::cursor m_cursor;
public: public:

2
gale/context/Context.hpp
View File

@ -263,7 +263,7 @@ namespace gale {
* @brief set the Icon of the program * @brief set the Icon of the program
* @param[in] _inputFile new filename icon of the curent program. * @param[in] _inputFile new filename icon of the curent program.
*/ */
virtual void setIcon(const etk::String& _inputFile) { }; virtual void setIcon(const etk::Uri& _inputFile) { };
/** /**
* @brief Enable or Disable the decoration on the Windows (availlable only on Desktop) * @brief Enable or Disable the decoration on the Windows (availlable only on Desktop)
* @param[in] _status "true" to enable decoration / false otherwise * @param[in] _status "true" to enable decoration / false otherwise

2
gale/context/X11/Context.cpp
View File

@ -1269,7 +1269,7 @@ class X11Interface : public gale::Context {
return true; return true;
} }
/****************************************************************************************/ /****************************************************************************************/
void setIcon(const etk::String& _inputFile) { void setIcon(const etk::Uri& _inputFile) {
X11_FUNC(); X11_FUNC();
#if defined(GALE_BUILD_EGAMI) \ #if defined(GALE_BUILD_EGAMI) \
&& !defined(__TARGET_OS__Web) && !defined(__TARGET_OS__Web)

2
gale/resource/Program.hpp
View File

@ -63,7 +63,7 @@ namespace gale {
Program(); Program();
void init(const etk::Uri& _uri); void init(const etk::Uri& _uri);
public: public:
DECLARE_RESOURCE_NAMED_FACTORY(Program); DECLARE_RESOURCE_URI_FACTORY(Program);
/** /**
* @brief Destructor, remove the current Program. * @brief Destructor, remove the current Program.
*/ */

2
gale/resource/Shader.hpp
View File

@ -30,7 +30,7 @@ namespace gale {
Shader(); Shader();
public: public:
void init(const etk::Uri& _uri); void init(const etk::Uri& _uri);
DECLARE_RESOURCE_NAMED_FACTORY(Shader); DECLARE_RESOURCE_URI_FACTORY(Shader);
/** /**
* @brief Destructor, remove the current Shader * @brief Destructor, remove the current Shader
*/ */