summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Volz <andreas.volz@tux-style.com>2016-02-14 11:37:08 +0100
committerAndreas Volz <andreas.volz@tux-style.com>2016-02-14 11:37:08 +0100
commit36d22d50fce81e6bb7afc1440bb98790190ab313 (patch)
tree9a604ec2d3afc3da24253df631e914051e9040a8
parentccdbccc64a522137b4abad0e61ba3bd3a0226840 (diff)
access part param (I don't like the interface, but it works for my application until I write something better)
-rw-r--r--edjexx/include/edjexx/ExternalParam.h8
-rw-r--r--edjexx/include/edjexx/Part.h6
-rw-r--r--edjexx/src/ExternalParam.cpp10
-rw-r--r--edjexx/src/Part.cpp10
-rw-r--r--elementaryxx/doc/Doxyfile4
-rw-r--r--elementaryxx/doc/foot.html19
-rw-r--r--elementaryxx/doc/head.html64
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:
23 ExternalParam (const std::string &name, const char *c); 23 ExternalParam (const std::string &name, const char *c);
24 ExternalParam (const std::string &name, const std::string &s); 24 ExternalParam (const std::string &name, const std::string &s);
25 25
26 static ExternalParam* wrap (Edje_External_Param *param);
27
28 Edje_External_Param mParam;
29
26protected: 30protected:
27 Edje_External_Param *getRaw (); 31 Edje_External_Param *getRaw ();
28 32
29private: 33private:
30 Edje_External_Param mParam; 34 ExternalParam (Edje_External_Param *param);
35
36
31 std::string mName; 37 std::string mName;
32 std::string mStr; 38 std::string mStr;
33}; 39};
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:
50 50
51 Evasxx::Object &getExternalContent (const std::string &content); 51 Evasxx::Object &getExternalContent (const std::string &content);
52 52
53 // TODO: wrap Param? 53
54 bool setParam (Edjexx::ExternalParam *param); 54 bool setParam (Edjexx::ExternalParam *param);
55 55
56 bool getParam (Edjexx::ExternalParam &inOutparam);
57
58 Edje_External_Param_Type getParamType (const std::string &param);
59
56 //const Evasxx::Object* getObject ( const char* name ); 60 //const Evasxx::Object* getObject ( const char* name );
57 61
58private: 62private:
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 ()
61 return &mParam; 61 return &mParam;
62} 62}
63 63
64ExternalParam::ExternalParam (Edje_External_Param *param)
65{
66 mParam = *param;
67}
68
69ExternalParam* ExternalParam::wrap (Edje_External_Param *param)
70{
71 return new ExternalParam (param);
72}
73
64} // end namespace Edjexx 74} // 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)
111 return edje_object_part_external_param_set (mParent->obj (), mPartname.c_str (), param->getRaw ()); 111 return edje_object_part_external_param_set (mParent->obj (), mPartname.c_str (), param->getRaw ());
112} 112}
113 113
114bool Part::getParam (Edjexx::ExternalParam &inOutparam)
115{
116 return edje_object_part_external_param_get (mParent->obj (), mPartname.c_str (), inOutparam.getRaw());
117}
118
119Edje_External_Param_Type Part::getParamType (const std::string &param)
120{
121 return edje_object_part_external_param_type_get (mParent->obj (), mPartname.c_str (), param.c_str ());
122}
123
114/*const Evasxx::Object* Part::getObject ( const char* name ) 124/*const Evasxx::Object* Part::getObject ( const char* name )
115{ 125{
116 return Evasxx::Object::objectLink( edje_object_part_object_get( static_cast <const Evas_Object*> (mParent->obj()), name ) ); 126 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
734# each generated HTML page. If it is left blank doxygen will generate a 734# each generated HTML page. If it is left blank doxygen will generate a
735# standard header. 735# standard header.
736 736
737HTML_HEADER = head.html 737HTML_HEADER =
738 738
739# The HTML_FOOTER tag can be used to specify a personal HTML footer for 739# The HTML_FOOTER tag can be used to specify a personal HTML footer for
740# each generated HTML page. If it is left blank doxygen will generate a 740# each generated HTML page. If it is left blank doxygen will generate a
741# standard footer. 741# standard footer.
742 742
743HTML_FOOTER = foot.html 743HTML_FOOTER =
744 744
745# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 745# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
746# style sheet that is used by each HTML page. It can be used to 746# 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 @@
1
2 <div id="push"></div>
3 </div> <!-- #content -->
4 </div> <!-- .layout -->
5
6 </div> <!-- #container -->
7
8
9 <div id="footer">
10 <table><tr>
11 <td class="poweredby"><img src="doxygen.png"></td>
12 <td class="copyright">Copyright &copy;$year Enlightenment</td>
13 <td class="generated">Docs generated $datetime</td>
14 </tr></table>
15 </div>
16
17
18</body>
19</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 @@
1<html>
2<head>
3 <title>$title</title>
4 <meta http-equiv="content-type" content="text/html;charset=UTF-8">
5 <meta name="author" content="Andres Blanc" >
6
7 <link rel="icon" href="img/favicon.png" type="image/x-icon">
8 <link rel="shortcut icon" href="img/favicon.png" type="image/x-icon">
9 <link rel="icon" href="img/favicon.png" type="image/ico">
10 <link rel="shortcut icon" href="img/favicon.png" type="image/ico">
11
12 <link rel="stylesheet" type="text/css" media="screen" href="e.css">
13 <link rel="stylesheet" type="text/css" media="screen" href="edoxy.css">
14</head>
15
16<body>
17
18<div id="container">
19
20<div id="header">
21<div class="layout">
22
23 <h1><span>Enlightenment</span></h1>
24 <h2><span>Beauty at your fingertips</span></h2>
25
26 <div class="menu-container">
27 <div class="menu">
28 <ul>
29 <li class="current"><a href="http://web.enlightenment.org/p.php?p=docs">Docs</a></li>
30 <li><a href="http://trac.enlightenment.org/e">Tracker</a></li>
31 <li><a href="http://www.enlightenment.org/p.php?p=contact">Contact</a></li>
32 <li><a href="http://www.enlightenment.org/p.php?p=contribute">Contribute</a></li>
33 <li><a href="http://www.enlightenment.org/p.php?p=support">Support</a></li>
34 <li><a href="http://www.enlightenment.org/p.php?p=download">Download</a></li>
35 <li><a href="http://www.enlightenment.org/p.php?p=about">About</a></li>
36 <li><a href="http://www.enlightenment.org/p.php?p=news">News</a></li>
37 <li><a href="http://www.enlightenment.org/">Home</a></li>
38 </ul>
39 </div>
40 </div>
41
42 <div class="doxytitle">
43 $projectname Documentation <small>at $date</small>
44 </div>
45
46 <div class="menu-container">
47 <div class="submenu">
48 <ul class="current">
49 <li><a href="pages.html">Tutorials</a></li>
50<!-- <li><a href="globals.html">Globals</a></li>-->
51<!-- <li><a href="files.html">Files</a></li>-->
52 <li><a href="modules.html">Modules</a></li>
53 <li class="current"><a href="index.html">Main Page</a></li>
54 </ul>
55 </div>
56 </div>
57
58
59 <div class="clear"></div>
60</div>
61</div>
62
63<div id="content">
64<div class="layout">