andreas pushed a commit to branch master. http://git.enlightenment.org/bindings/cxx/eflxx.git/commit/?id=36d22d50fce81e6bb7afc1440bb98790190ab313
commit 36d22d50fce81e6bb7afc1440bb98790190ab313 Author: Andreas Volz <andreas.v...@tux-style.com> Date: Sun Feb 14 11:37:08 2016 +0100 access part param (I don't like the interface, but it works for my application until I write something better) --- edjexx/include/edjexx/ExternalParam.h | 8 ++++- edjexx/include/edjexx/Part.h | 6 +++- edjexx/src/ExternalParam.cpp | 10 ++++++ edjexx/src/Part.cpp | 10 ++++++ elementaryxx/doc/Doxyfile | 4 +-- elementaryxx/doc/foot.html | 19 ----------- elementaryxx/doc/head.html | 64 ----------------------------------- 7 files changed, 34 insertions(+), 87 deletions(-) diff --git a/edjexx/include/edjexx/ExternalParam.h b/edjexx/include/edjexx/ExternalParam.h index f6fd61f..ef850f5 100644 --- a/edjexx/include/edjexx/ExternalParam.h +++ b/edjexx/include/edjexx/ExternalParam.h @@ -23,11 +23,17 @@ public: ExternalParam (const std::string &name, const char *c); ExternalParam (const std::string &name, const std::string &s); + static ExternalParam* wrap (Edje_External_Param *param); + + Edje_External_Param mParam; + protected: Edje_External_Param *getRaw (); private: - Edje_External_Param mParam; + ExternalParam (Edje_External_Param *param); + + std::string mName; std::string mStr; }; diff --git a/edjexx/include/edjexx/Part.h b/edjexx/include/edjexx/Part.h index 7ee980c..7f53c6b 100644 --- a/edjexx/include/edjexx/Part.h +++ b/edjexx/include/edjexx/Part.h @@ -50,9 +50,13 @@ public: Evasxx::Object &getExternalContent (const std::string &content); - // TODO: wrap Param? + bool setParam (Edjexx::ExternalParam *param); + bool getParam (Edjexx::ExternalParam &inOutparam); + + Edje_External_Param_Type getParamType (const std::string ¶m); + //const Evasxx::Object* getObject ( const char* name ); private: diff --git a/edjexx/src/ExternalParam.cpp b/edjexx/src/ExternalParam.cpp index 8d5b1df..deda8c5 100644 --- a/edjexx/src/ExternalParam.cpp +++ b/edjexx/src/ExternalParam.cpp @@ -61,4 +61,14 @@ Edje_External_Param *ExternalParam::getRaw () return &mParam; } +ExternalParam::ExternalParam (Edje_External_Param *param) +{ + mParam = *param; +} + +ExternalParam* ExternalParam::wrap (Edje_External_Param *param) +{ + return new ExternalParam (param); +} + } // end namespace Edjexx diff --git a/edjexx/src/Part.cpp b/edjexx/src/Part.cpp index 0808ce3..ee7ef3a 100644 --- a/edjexx/src/Part.cpp +++ b/edjexx/src/Part.cpp @@ -111,6 +111,16 @@ bool Part::setParam (Edjexx::ExternalParam *param) return edje_object_part_external_param_set (mParent->obj (), mPartname.c_str (), param->getRaw ()); } +bool Part::getParam (Edjexx::ExternalParam &inOutparam) +{ + return edje_object_part_external_param_get (mParent->obj (), mPartname.c_str (), inOutparam.getRaw()); +} + +Edje_External_Param_Type Part::getParamType (const std::string ¶m) +{ + return edje_object_part_external_param_type_get (mParent->obj (), mPartname.c_str (), param.c_str ()); +} + /*const Evasxx::Object* Part::getObject ( const char* name ) { return Evasxx::Object::objectLink( edje_object_part_object_get( static_cast <const Evas_Object*> (mParent->obj()), name ) ); diff --git a/elementaryxx/doc/Doxyfile b/elementaryxx/doc/Doxyfile index 07235de..0beae80 100644 --- a/elementaryxx/doc/Doxyfile +++ b/elementaryxx/doc/Doxyfile @@ -734,13 +734,13 @@ HTML_FILE_EXTENSION = .html # each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = head.html +HTML_HEADER = # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = foot.html +HTML_FOOTER = # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to diff --git a/elementaryxx/doc/foot.html b/elementaryxx/doc/foot.html deleted file mode 100644 index 78ef911..0000000 --- a/elementaryxx/doc/foot.html +++ /dev/null @@ -1,19 +0,0 @@ - - <div id="push"></div> - </div> <!-- #content --> - </div> <!-- .layout --> - - </div> <!-- #container --> - - - <div id="footer"> - <table><tr> - <td class="poweredby"><img src="doxygen.png"></td> - <td class="copyright">Copyright ©$year Enlightenment</td> - <td class="generated">Docs generated $datetime</td> - </tr></table> - </div> - - -</body> -</html> diff --git a/elementaryxx/doc/head.html b/elementaryxx/doc/head.html deleted file mode 100644 index 44a5551..0000000 --- a/elementaryxx/doc/head.html +++ /dev/null @@ -1,64 +0,0 @@ -<html> -<head> - <title>$title</title> - <meta http-equiv="content-type" content="text/html;charset=UTF-8"> - <meta name="author" content="Andres Blanc" > - - <link rel="icon" href="img/favicon.png" type="image/x-icon"> - <link rel="shortcut icon" href="img/favicon.png" type="image/x-icon"> - <link rel="icon" href="img/favicon.png" type="image/ico"> - <link rel="shortcut icon" href="img/favicon.png" type="image/ico"> - - <link rel="stylesheet" type="text/css" media="screen" href="e.css"> - <link rel="stylesheet" type="text/css" media="screen" href="edoxy.css"> -</head> - -<body> - -<div id="container"> - -<div id="header"> -<div class="layout"> - - <h1><span>Enlightenment</span></h1> - <h2><span>Beauty at your fingertips</span></h2> - - <div class="menu-container"> - <div class="menu"> - <ul> - <li class="current"><a href="http://web.enlightenment.org/p.php?p=docs">Docs</a></li> - <li><a href="http://trac.enlightenment.org/e">Tracker</a></li> - <li><a href="http://www.enlightenment.org/p.php?p=contact">Contact</a></li> - <li><a href="http://www.enlightenment.org/p.php?p=contribute">Contribute</a></li> - <li><a href="http://www.enlightenment.org/p.php?p=support">Support</a></li> - <li><a href="http://www.enlightenment.org/p.php?p=download">Download</a></li> - <li><a href="http://www.enlightenment.org/p.php?p=about">About</a></li> - <li><a href="http://www.enlightenment.org/p.php?p=news">News</a></li> - <li><a href="http://www.enlightenment.org/">Home</a></li> - </ul> - </div> - </div> - - <div class="doxytitle"> - $projectname Documentation <small>at $date</small> - </div> - - <div class="menu-container"> - <div class="submenu"> - <ul class="current"> - <li><a href="pages.html">Tutorials</a></li> -<!-- <li><a href="globals.html">Globals</a></li>--> -<!-- <li><a href="files.html">Files</a></li>--> - <li><a href="modules.html">Modules</a></li> - <li class="current"><a href="index.html">Main Page</a></li> - </ul> - </div> - </div> - - - <div class="clear"></div> -</div> -</div> - -<div id="content"> -<div class="layout"> --