enlightenment
/
eflxx
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more API changes 

now all examples should compile again


SVN revision: 44074
This commit is contained in:
Andreas Volz 2009-11-30 23:31:37 +00:00
parent c97f9972df
commit 66d39ffc17
57 changed files with 543 additions and 539 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ecorexx/include/ecorexx/Application.h
View File

@ -19,7 +19,7 @@
#include <string> #include <string>
#include <list> #include <list>
#define eApp Application::application() //#define eApp Application::application()
/** /**
* C++ Wrapper for the Enlightenment Core Library (Ecore) * C++ Wrapper for the Enlightenment Core Library (Ecore)
@ -55,7 +55,7 @@ public:
Application( int argc, const char** argv, const std::string& name ); Application( int argc, const char** argv, const std::string& name );
virtual ~Application(); virtual ~Application();
static Application* application(); static Application* getInstance();
std::string getName() const; std::string getName() const;

2
ecorexx/src/Application.cpp
View File

@ -61,7 +61,7 @@ Application::~Application()
ecore_shutdown(); ecore_shutdown();
} }
Application* Application::application() Application* Application::getInstance()
{ {
if ( !Application::_instance ) if ( !Application::_instance )
{ {

20
ecorexx/src/EvasWindow.cpp
View File

@ -24,7 +24,7 @@ namespace Ecorexx {
#define ECORE_EVAS_CALLBACK( name, func ) \ #define ECORE_EVAS_CALLBACK( name, func ) \
static void name( Ecore_Evas* ee ) \ static void name( Ecore_Evas* ee ) \
{ \ { \
eApp->getMainWindow()->func(); \ Application::getInstance()->getMainWindow()->func(); \
} }
ECORE_EVAS_CALLBACK( callback_resize_dispatcher, resizeEvent ) ECORE_EVAS_CALLBACK( callback_resize_dispatcher, resizeEvent )
@ -141,7 +141,7 @@ void EvasWindow::hideEvent()
void EvasWindow::deleteRequestEvent() void EvasWindow::deleteRequestEvent()
{ {
Dout( dc::notice, "EvasWindow::deleteRequestEvent()" ); Dout( dc::notice, "EvasWindow::deleteRequestEvent()" );
if ( canClose() ) eApp->quit(); if ( canClose() ) Application::quit();
} }
void EvasWindow::destroyEvent() void EvasWindow::destroyEvent()
@ -436,7 +436,7 @@ EvasWindowSoftwareX11::EvasWindowSoftwareX11( const Eflxx::Size &size, const cha
:EvasWindow() :EvasWindow()
{ {
Dout( dc::notice, "EvasWindow::EvasWindowSoftwareX11" ); Dout( dc::notice, "EvasWindow::EvasWindowSoftwareX11" );
Application::application()->setMainWindow( this ); Application::getInstance()->setMainWindow( this );
/*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" ); /*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" );
if ( ::getenv( "EFL_WIDTH" ) ) size.width (atoi( ::getenv( "EFL_WIDTH" ) )); if ( ::getenv( "EFL_WIDTH" ) ) size.width (atoi( ::getenv( "EFL_WIDTH" ) ));
@ -446,7 +446,7 @@ EvasWindowSoftwareX11::EvasWindowSoftwareX11( const Eflxx::Size &size, const cha
//FIXME: Should we care about positioning? 0, 0 for now //FIXME: Should we care about positioning? 0, 0 for now
_ee = ecore_evas_software_x11_new( const_cast<char*>( display ), 0, 0, 0, size.width (), size.height () ); _ee = ecore_evas_software_x11_new( const_cast<char*>( display ), 0, 0, 0, size.width (), size.height () );
ecore_evas_title_set( _ee, eApp->getName().c_str() ); ecore_evas_title_set( _ee, Application::getInstance()->getName().c_str() );
ecore_evas_borderless_set( _ee, 0 ); ecore_evas_borderless_set( _ee, 0 );
_canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) ); _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) );
@ -475,7 +475,7 @@ EvasWindowGLX11::EvasWindowGLX11( const Eflxx::Size &size, const char* display )
:EvasWindow() :EvasWindow()
{ {
Dout( dc::notice, "EvasWindow::EvasWindowGL" ); Dout( dc::notice, "EvasWindow::EvasWindowGL" );
Application::application()->setMainWindow( this ); Application::getInstance()->setMainWindow( this );
/*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" ); /*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" );
if ( ::getenv( "EFL_WIDTH" ) ) size.width (atoi( ::getenv( "EFL_WIDTH" ) )); if ( ::getenv( "EFL_WIDTH" ) ) size.width (atoi( ::getenv( "EFL_WIDTH" ) ));
@ -485,7 +485,7 @@ EvasWindowGLX11::EvasWindowGLX11( const Eflxx::Size &size, const char* display )
//FIXME: Should we care about positioning? 0, 0 for now //FIXME: Should we care about positioning? 0, 0 for now
_ee = ecore_evas_gl_x11_new( const_cast<char*>( display ), 0, 0, 0, size.width (), size.height () ); _ee = ecore_evas_gl_x11_new( const_cast<char*>( display ), 0, 0, 0, size.width (), size.height () );
ecore_evas_title_set( _ee, eApp->getName().c_str() ); ecore_evas_title_set( _ee, Application::getInstance()->getName().c_str() );
ecore_evas_borderless_set( _ee, 0 ); ecore_evas_borderless_set( _ee, 0 );
_canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) ); _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) );
@ -515,7 +515,7 @@ EvasWindowXRenderX11::EvasWindowXRenderX11( const Eflxx::Size &size, const char*
:EvasWindow() :EvasWindow()
{ {
Dout( dc::notice, "EvasWindow::EvasWindowGL" ); Dout( dc::notice, "EvasWindow::EvasWindowGL" );
Application::application()->setMainWindow( this ); Application::getInstance()->setMainWindow( this );
/*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" ); /*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" );
if ( ::getenv( "EFL_WIDTH" ) ) size.width (atoi( ::getenv( "EFL_WIDTH" ) )); if ( ::getenv( "EFL_WIDTH" ) ) size.width (atoi( ::getenv( "EFL_WIDTH" ) ));
@ -525,7 +525,7 @@ EvasWindowXRenderX11::EvasWindowXRenderX11( const Eflxx::Size &size, const char*
//FIXME: Should we care about positioning? 0, 0 for now //FIXME: Should we care about positioning? 0, 0 for now
_ee = ecore_evas_xrender_x11_new( const_cast<char*>( display ), 0, 0, 0, size.width (), size.height () ); _ee = ecore_evas_xrender_x11_new( const_cast<char*>( display ), 0, 0, 0, size.width (), size.height () );
ecore_evas_title_set( _ee, eApp->getName().c_str() ); ecore_evas_title_set( _ee, Application::getInstance()->getName().c_str() );
ecore_evas_borderless_set( _ee, 0 ); ecore_evas_borderless_set( _ee, 0 );
_canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) ); _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) );
@ -555,7 +555,7 @@ EvasWindowFB::EvasWindowFB( const Eflxx::Size &size, const char* display, int ro
:EvasWindow() :EvasWindow()
{ {
Dout( dc::notice, "EvasWindow::EvasWindowFB" ); Dout( dc::notice, "EvasWindow::EvasWindowFB" );
Application::application()->setMainWindow( this ); Application::getInstance()->setMainWindow( this );
/*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" ); /*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" );
if ( ::getenv( "EFL_WIDTH" ) ) size.width (atoi( ::getenv( "EFL_WIDTH" ) )); if ( ::getenv( "EFL_WIDTH" ) ) size.width (atoi( ::getenv( "EFL_WIDTH" ) ));
@ -606,7 +606,7 @@ EvasWindowFB::EvasWindowFB( const Eflxx::Size &size, const char* display, int ro
#endif #endif
} }
ecore_evas_title_set( _ee, eApp->getName().c_str() ); ecore_evas_title_set( _ee, Application::getInstance()->getName().c_str() );
ecore_evas_borderless_set( _ee, 0 ); ecore_evas_borderless_set( _ee, 0 );
_canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) ); _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) );

4
eetxx/include/eetxx/Chunk.h
View File

@ -10,7 +10,7 @@
//! EFLxx includes //! EFLxx includes
#include "DataInformation.h" #include "DataInformation.h"
namespace eet { namespace Eetxx {
/* forward declarations */ /* forward declarations */
class Document; class Document;
@ -70,6 +70,6 @@ private:
ptr_type _data; ptr_type _data;
}; };
} // end namespace eet } // end namespace Eetxx
#endif // EET_CHUNK_H #endif // EET_CHUNK_H

4
eetxx/include/eetxx/ChunkIterator.h
View File

@ -4,7 +4,7 @@
/* EFLxx includes */ /* EFLxx includes */
#include "Chunk.h" #include "Chunk.h"
namespace eet { namespace Eetxx {
/* forward declarations */ /* forward declarations */
class Document; class Document;
@ -31,6 +31,6 @@ private:
Document &_doc; Document &_doc;
}; };
} // end namespace eet } // end namespace Eetxx
#endif // EET_CHUNK_ITERATOR_H #endif // EET_CHUNK_ITERATOR_H

4
eetxx/include/eetxx/DataInformation.h
View File

@ -1,7 +1,7 @@
#ifndef EET_DATA_INFORMATION_H #ifndef EET_DATA_INFORMATION_H
#define EET_DATA_INFORMATION_H #define EET_DATA_INFORMATION_H
namespace eet { namespace Eetxx {
template <typename _Ty> template <typename _Ty>
class DataInformation class DataInformation
@ -35,6 +35,6 @@ make_data (_Ty *data, bool compress = false, unsigned int size = sizeof (_Ty))
return DataInformation<_Ty *> (data, compress, size); return DataInformation<_Ty *> (data, compress, size);
} }
} // namespace eet } // namespace Eetxx
#endif // EET_DATA_INFORMATION_H #endif // EET_DATA_INFORMATION_H

4
eetxx/include/eetxx/Document.h
View File

@ -14,7 +14,7 @@
* @author Jonathan Muller <jonathan.muller@drylm.org> * @author Jonathan Muller <jonathan.muller@drylm.org>
*/ */
namespace eet { namespace Eetxx {
class Document class Document
{ {
@ -37,6 +37,6 @@ private:
Eet_File *_ef; Eet_File *_ef;
}; };
} // end namespace eet } // end namespace Eetxx
#endif //EET_DOCUMENT_H #endif //EET_DOCUMENT_H

4
eetxx/include/eetxx/List.h
View File

@ -5,7 +5,7 @@
#include "Chunk.h" #include "Chunk.h"
#include "ChunkIterator.h" #include "ChunkIterator.h"
namespace eet { namespace Eetxx {
/* forward declarations */ /* forward declarations */
class Document; class Document;
@ -31,6 +31,6 @@ private:
int _nb_elems; int _nb_elems;
}; };
} // namespace eet } // namespace Eetxx
#endif // EET_LIST_H #endif // EET_LIST_H

4
eetxx/src/Chunk.cpp
View File

@ -4,7 +4,7 @@
#include "../include/eetxx/Chunk.h" #include "../include/eetxx/Chunk.h"
namespace eet { namespace Eetxx {
Chunk::Chunk (Eet_File *ef, const std::string &key_name) Chunk::Chunk (Eet_File *ef, const std::string &key_name)
: _ef (ef), : _ef (ef),
@ -29,4 +29,4 @@ std::string Chunk::get_key () const
return _key_name; return _key_name;
} }
} // end namespace eet } // end namespace Eetxx

4
eetxx/src/ChunkIterator.cpp
View File

@ -5,7 +5,7 @@
#include "../include/eetxx/ChunkIterator.h" #include "../include/eetxx/ChunkIterator.h"
#include "../include/eetxx/Document.h" #include "../include/eetxx/Document.h"
namespace eet { namespace Eetxx {
ChunkIterator::ChunkIterator (char **chunk, Document &doc) ChunkIterator::ChunkIterator (char **chunk, Document &doc)
: the_chunk (chunk), : the_chunk (chunk),
@ -40,4 +40,4 @@ ChunkIterator ChunkIterator::operator ++ (int) throw ()
return tem; return tem;
} }
} // end namespace eet } // end namespace Eetxx

4
eetxx/src/Document.cpp
View File

@ -4,7 +4,7 @@
#include "../include/eetxx/Document.h" #include "../include/eetxx/Document.h"
namespace eet { namespace Eetxx {
void Document::init () void Document::init ()
{ {
@ -26,4 +26,4 @@ Eet_File *Document::get ()
return _ef; return _ef;
} }
} // end namespace eet } // end namespace Eetxx

4
eetxx/src/List.cpp
View File

@ -5,7 +5,7 @@
#include "../include/eetxx/List.h" #include "../include/eetxx/List.h"
#include "../include/eetxx/Document.h" #include "../include/eetxx/Document.h"
namespace eet { namespace Eetxx {
List::List (Document& doc, const std::string &filter) List::List (Document& doc, const std::string &filter)
: _doc (doc), : _doc (doc),
@ -40,4 +40,4 @@ Chunk List::operator [] (const std::string &key_name)
return Chunk (_doc.get (), key_name); return Chunk (_doc.get (), key_name);
} }
} // end namespace eet } // end namespace Eetxx

5
eflxx_examples/configure.ac
View File

@ -97,7 +97,6 @@ AC_DEFINE_UNQUOTED(SYSTEM_PIXMAPS_DIR, "${packageprefix}/${systempixmapsdir}",""
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}","") AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}","")
#PKG_CHECK_MODULES(ETKXX, etkxx)
PKG_CHECK_MODULES(ESMARTXX_CONTAINER, esmartxx_container) PKG_CHECK_MODULES(ESMARTXX_CONTAINER, esmartxx_container)
PKG_CHECK_MODULES(ESMARTXX_GROUP, esmartxx_group) PKG_CHECK_MODULES(ESMARTXX_GROUP, esmartxx_group)
PKG_CHECK_MODULES(ESMARTXX_TEXTENTRY, esmartxx_textentry) PKG_CHECK_MODULES(ESMARTXX_TEXTENTRY, esmartxx_textentry)
@ -105,7 +104,6 @@ PKG_CHECK_MODULES(EDJEXX, edjexx)
PKG_CHECK_MODULES(EFL, eflxx) PKG_CHECK_MODULES(EFL, eflxx)
PKG_CHECK_MODULES(ECOREXX, ecorexx) PKG_CHECK_MODULES(ECOREXX, ecorexx)
PKG_CHECK_MODULES(EETXX, eetxx) PKG_CHECK_MODULES(EETXX, eetxx)
PKG_CHECK_MODULES(EWLXX, ewlxx)
PKG_CHECK_MODULES(EMOTIONXX, emotionxx) PKG_CHECK_MODULES(EMOTIONXX, emotionxx)
PKG_CHECK_MODULES(ELEMENTARYXX, elementaryxx) PKG_CHECK_MODULES(ELEMENTARYXX, elementaryxx)
AC_OUTPUT([ AC_OUTPUT([
@ -135,9 +133,6 @@ src/esmartxx/group/Makefile
src/esmartxx/textentry/Makefile src/esmartxx/textentry/Makefile
src/eetxx/Makefile src/eetxx/Makefile
src/eetxx/simple_write_read/Makefile src/eetxx/simple_write_read/Makefile
src/ewlxx/Makefile
src/ewlxx/embed/Makefile
src/ewlxx/simple/Makefile
src/emotionxx/Makefile src/emotionxx/Makefile
src/emotionxx/simple/Makefile src/emotionxx/simple/Makefile
src/elementaryxx/Makefile src/elementaryxx/Makefile

1
eflxx_examples/src/Makefile.am
View File

@ -17,7 +17,6 @@ SUBDIRS = \
esmartxx \ esmartxx \
ecorexx \ ecorexx \
eetxx \ eetxx \
ewlxx \
emotionxx \ emotionxx \
debug \ debug \
signals \ signals \

8
eflxx_examples/src/debug/simple/main.cpp
View File

@ -1,10 +1,10 @@
#include <eflxx/eflpp_sys.h> #include <eflxx/System.h>
#include <eflxx/eflpp_common.h> #include <eflxx/Common.h>
#include <eflxx/eflpp_debug.h> #include <eflxx/Debug.h>
#include <iostream> #include <iostream>
using namespace efl; using namespace Eflxx;
using namespace std; using namespace std;
class DebugGuard class DebugGuard

24
eflxx_examples/src/ecorexx/3dstars/main.cpp
View File

@ -1,7 +1,5 @@
#include <eflxx/eflpp_sys.h> #include <eflxx/Eflxx.h>
#include <eflxx/eflpp_debug.h> #include <ecorexx/Ecorexx.h>
#include <ecorexx/EcoreApplication.h>
#include <ecorexx/EcoreTimer.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
@ -10,7 +8,7 @@
#include <memory> #include <memory>
using namespace std; using namespace std;
using namespace efl; using namespace Eflxx;
const unsigned int WIDTH = 600; const unsigned int WIDTH = 600;
const unsigned int HEIGHT = 600; const unsigned int HEIGHT = 600;
@ -21,11 +19,11 @@ const double rotation = 0.0005;
static int width = 0; static int width = 0;
static int height = 0; static int height = 0;
class Star : public EvasLine class Star : public Evasxx::Line
{ {
static double angle; static double angle;
public: public:
Star( EvasCanvas &evas ) : EvasLine( evas ) Star( Evasxx::Canvas &evas ) : Evasxx::Line( evas )
{ {
setLayer( 10 ); setLayer( 10 );
reset(); reset();
@ -80,7 +78,7 @@ typedef list<Star*> Starfield;
typedef list<Star*>::iterator StarfieldIterator; typedef list<Star*>::iterator StarfieldIterator;
Starfield starfield; Starfield starfield;
void advance( EcoreTimer* e ) void advance( Ecorexx::Timer* e )
{ {
for (StarfieldIterator it = starfield.begin(); it != starfield.end(); ++it ) for (StarfieldIterator it = starfield.begin(); it != starfield.end(); ++it )
{ {
@ -91,15 +89,15 @@ void advance( EcoreTimer* e )
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
auto_ptr <EcoreApplication> app (new EcoreApplication( argc, argv, "Ecore 3D Stars Test" )); auto_ptr <Ecorexx::Application> app (new Ecorexx::Application( argc, argv, "Ecore 3D Stars Test" ));
auto_ptr <EcoreEvasWindowSoftwareX11> mw (new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) )); auto_ptr <Ecorexx::EvasWindowSoftwareX11> mw (new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ));
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
Rect bg = evas.getGeometry(); Rect bg = evas.getGeometry();
width = bg.width(); width = bg.width();
height = bg.height(); height = bg.height();
auto_ptr <EvasRectangle> r (new EvasRectangle( evas, evas.getGeometry() )); auto_ptr <Evasxx::Rectangle> r (new Evasxx::Rectangle( evas, evas.getGeometry() ));
r->setColor( Color (0, 0, 0, 255) ); r->setColor( Color (0, 0, 0, 255) );
r->setLayer( 0 ); r->setLayer( 0 );
r->show(); r->show();
@ -113,7 +111,7 @@ int main( int argc, const char **argv )
// FIXME: Memory leak, but ok for this example // FIXME: Memory leak, but ok for this example
// better use CountedPtr or delete it at the end // better use CountedPtr or delete it at the end
(new EcoreTimer( 0.05 ) )->timeout.connect( sigc::ptr_fun( ::advance ) ); (new Ecorexx::Timer( 0.05 ) )->timeout.connect( sigc::ptr_fun( ::advance ) );
mw->show(); mw->show();

44
eflxx_examples/src/ecorexx/calibrate/calibrate.cpp
View File

@ -2,8 +2,8 @@
#include <config.h> #include <config.h>
#endif #endif
#include <eflxx/eflpp_sys.h> #include <eflxx/System.h>
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
@ -58,8 +58,8 @@ static void calibration_event_filter_end( void* data, void *loop_data )
{ {
} }
CalibrationRectangle::CalibrationRectangle( EvasCanvas &evas, const Rect &rect ) CalibrationRectangle::CalibrationRectangle( Evasxx::Canvas &evas, const Rect &rect )
:EvasRectangle( evas, rect), Trackable( "CalibrationRectangle" ) :Evasxx::Rectangle( evas, rect), Trackable( "CalibrationRectangle" )
{ {
setLayer( 255 ); setLayer( 255 );
setColor( Color (255, 255, 255, 0) ); // white, fully transparent setColor( Color (255, 255, 255, 0) ); // white, fully transparent
@ -72,7 +72,7 @@ CalibrationRectangle::CalibrationRectangle( EvasCanvas &evas, const Rect &rect )
cd.canvasPoints[TopRight].set( s.width()-offset, offset ); cd.canvasPoints[TopRight].set( s.width()-offset, offset );
cd.canvasPoints[Center].set( s.width()/2, s.height()/2 ); cd.canvasPoints[Center].set( s.width()/2, s.height()/2 );
switch ( eApp->getMainWindow()->rotation() ) switch ( Ecorexx::Application::getInstance()->getMainWindow()->rotation() )
{ {
case 0: case 0:
cout << "ROT 0" << endl; cout << "ROT 0" << endl;
@ -109,13 +109,13 @@ CalibrationRectangle::CalibrationRectangle( EvasCanvas &evas, const Rect &rect )
} }
// setup floor // setup floor
EvasRectangle* floor = new EvasRectangle( evas, Rect (0, 0, s.width(), s.height()) ); Evasxx::Rectangle* floor = new Evasxx::Rectangle( evas, Rect (0, 0, s.width(), s.height()) );
floor->setLayer( 0 ); floor->setLayer( 0 );
floor->setColor( Color (0, 0, 0, 255) ); floor->setColor( Color (0, 0, 0, 255) );
floor->show(); floor->show();
// setup background // setup background
background = new EvasGradient( evas, Rect (0, 0, s.width(), s.height()) ); background = new Evasxx::Gradient( evas, Rect (0, 0, s.width(), s.height()) );
background->setLayer( 5 ); background->setLayer( 5 );
background->setAngle( angle = 13 ); background->setAngle( angle = 13 );
background->addColorStop( Color (255, 255, 255, 255), 10 ); background->addColorStop( Color (255, 255, 255, 255), 10 );
@ -125,26 +125,26 @@ CalibrationRectangle::CalibrationRectangle( EvasCanvas &evas, const Rect &rect )
//background->show(); //background->show();
//new CalibrationAnimator( CalibrationAnimator::alpha, background, 255, 0 ); //new CalibrationAnimator( CalibrationAnimator::alpha, background, 255, 0 );
EvasImage* t1 = new EvasImage( evas, searchPixmapFile ("panel.png") ); Evasxx::Image* t1 = new Evasxx::Image( evas, searchPixmapFile ("panel.png") );
t1->setGeometry( Rect (0, 0, s.width(), s.height()) ); t1->setGeometry( Rect (0, 0, s.width(), s.height()) );
t1->setColor( Color (255, 255, 255, 255) ); t1->setColor( Color (255, 255, 255, 255) );
t1->setLayer( 10 ); t1->setLayer( 10 );
t1->show(); t1->show();
EvasImage* t2 = new EvasImage( evas, searchPixmapFile ("shadow.png") ); Evasxx::Image* t2 = new Evasxx::Image( evas, searchPixmapFile ("shadow.png") );
t2->setGeometry( Rect (0, 0, s.width(), s.height()) ); t2->setGeometry( Rect (0, 0, s.width(), s.height()) );
t2->setLayer( 15 ); t2->setLayer( 15 );
t2->show(); t2->show();
// setup text // setup text
text = new EvasText( evas, searchFontFile ("Vera.ttf"), 12, Point (5, s.height()/2.5), "foo" ); text = new Evasxx::Text( evas, searchFontFile ("Vera.ttf"), 12, Point (5, s.height()/2.5), "foo" );
text->setColor( Color (0, 0, 0, 255) ); text->setColor( Color (0, 0, 0, 255) );
text->setLayer( 22 ); text->setLayer( 22 );
text->setText( "Click on crosshair to calibrate screen" ); text->setText( "Click on crosshair to calibrate screen" );
text->show(); text->show();
#if 0 #if 0
EvasImage* image = new EvasImage( evas, searchPixmapFile ("angstrom.png") ); Evasxx::Image* image = new Evasxx::Image( evas, searchPixmapFile ("angstrom.png") );
image->rresize( 0.6 ); image->rresize( 0.6 );
Rect geom = image->getGeometry(); Rect geom = image->getGeometry();
cout << "Image size = " << image->getSize() << ", imageSize = " << image->getImageSize() << ", geometry = " << image->getGeometry() << endl; cout << "Image size = " << image->getSize() << ", imageSize = " << image->getImageSize() << ", geometry = " << image->getGeometry() << endl;
@ -153,17 +153,17 @@ CalibrationRectangle::CalibrationRectangle( EvasCanvas &evas, const Rect &rect )
image->setLayer( 15 ); image->setLayer( 15 );
image->show(); image->show();
#endif #endif
EcoreAnimator::setFrameTime( 0.004 ); Ecorexx::Animator::setFrameTime( 0.004 );
// setup crosshair // setup crosshair
crosshair = new EvasImage( evas, searchPixmapFile ("crosshair.png") ); crosshair = new Evasxx::Image( evas, searchPixmapFile ("crosshair.png") );
crosshair->setLayer( 23 ); crosshair->setLayer( 23 );
crosshairShadow = new EvasImage( evas, searchPixmapFile ("crosshair.png") ); crosshairShadow = new Evasxx::Image( evas, searchPixmapFile ("crosshair.png") );
crosshairShadow->setLayer( 22 ); crosshairShadow->setLayer( 22 );
crosshairShadow->setColor( Color (150, 150, 150, 50) ); crosshairShadow->setColor( Color (150, 150, 150, 50) );
crosshairhorz = new EvasLine( evas ); crosshairhorz = new Evasxx::Line( evas );
crosshairvert = new EvasLine( evas ); crosshairvert = new Evasxx::Line( evas );
crosshairhorz->setLayer( 23 ); crosshairhorz->setLayer( 23 );
crosshairvert->setLayer( 23 ); crosshairvert->setLayer( 23 );
crosshairhorz->setColor( Color (0, 0, 0, 255) ); crosshairhorz->setColor( Color (0, 0, 0, 255) );
@ -194,7 +194,7 @@ bool CalibrationRectangle::handleShow()
return true; return true;
} }
bool CalibrationRectangle::handleMouseUp( const EvasMouseUpEvent& e ) bool CalibrationRectangle::handleMouseUp( const Evasxx::MouseUpEvent& e )
{ {
nextPoint( e.data->canvas.x, e.data->canvas.y ); nextPoint( e.data->canvas.x, e.data->canvas.y );
@ -225,7 +225,7 @@ void CalibrationRectangle::nextPoint( int x, int y )
ecore_event_filter_del( filter ); ecore_event_filter_del( filter );
calibrate(); calibrate();
done.emit(); done.emit();
eApp->quit(); Ecorexx::Application::quit();
} }
} }
@ -355,8 +355,8 @@ bool CalibrationRectangle::calibrate()
return true; return true;
} }
CalibrationAnimator::CalibrationAnimator( CAtype t, EvasObject* o, int x, int y ) CalibrationAnimator::CalibrationAnimator( CAtype t, Evasxx::Object* o, int x, int y )
:EcoreAnimator(), _t( t ), _o( o ), _x( x ), _y( y ) :Ecorexx::Animator(), _t( t ), _o( o ), _x( x ), _y( y )
{ {
} }
@ -396,11 +396,11 @@ bool CalibrationAnimator::tick()
_o->move( Point (newx, newy) ); _o->move( Point (newx, newy) );
return true; return true;
case angle: case angle:
newx = static_cast<EvasGradient*>( _o )->getAngle(); newx = static_cast<Evasxx::Gradient*>( _o )->getAngle();
if ( newx == _x ) return false; if ( newx == _x ) return false;
if ( newx > _x ) newx--; if ( newx > _x ) newx--;
if ( newx < _x ) newx++; if ( newx < _x ) newx++;
static_cast<EvasGradient*>( _o )->setAngle( newx ); static_cast<Evasxx::Gradient*>( _o )->setAngle( newx );
return true; return true;
case alpha: case alpha:
c = _o->getColor(); c = _o->getColor();

29
eflxx_examples/src/ecorexx/calibrate/calibrate.h
View File

@ -1,11 +1,10 @@
#ifndef CALIBRATE_H #ifndef CALIBRATE_H
#define CALIBRATE_H #define CALIBRATE_H
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <ecorexx/EcoreAnimator.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
using namespace efl; using namespace Eflxx;
enum enum
{ {
@ -25,10 +24,10 @@ public:
Point canvasPoints[5]; // rotated, scaled Point canvasPoints[5]; // rotated, scaled
}; };
class CalibrationRectangle : public EvasRectangle, public Trackable class CalibrationRectangle : public Evasxx::Rectangle, public Trackable
{ {
public: public:
CalibrationRectangle( EvasCanvas &evas, const Rect &rect ); CalibrationRectangle( Evasxx::Canvas &evas, const Rect &rect );
virtual ~CalibrationRectangle(); virtual ~CalibrationRectangle();
Signal done; Signal done;
@ -38,34 +37,34 @@ public:
void timerEvent(); void timerEvent();
protected: protected:
virtual bool handleMouseUp( const EvasMouseUpEvent& ); virtual bool handleMouseUp( const Evasxx::MouseUpEvent& );
virtual bool handleShow(); virtual bool handleShow();
void moveCrossHair(); void moveCrossHair();
private: private:
CalibrationData cd; CalibrationData cd;
unsigned int position; unsigned int position;
EvasGradient* background; Evasxx::Gradient* background;
EvasImage* crosshair; Evasxx::Image* crosshair;
EvasImage* crosshairShadow; Evasxx::Image* crosshairShadow;
EvasLine* crosshairhorz; Evasxx::Line* crosshairhorz;
EvasLine* crosshairvert; Evasxx::Line* crosshairvert;
EvasText* text; Evasxx::Text* text;
int angle; int angle;
}; };
class CalibrationAnimator : public EcoreAnimator class CalibrationAnimator : public Ecorexx::Animator
{ {
public: public:
enum CAtype { position, size, angle, alpha }; enum CAtype { position, size, angle, alpha };
CalibrationAnimator( CAtype, EvasObject* o, int x, int y ); CalibrationAnimator( CAtype, Evasxx::Object* o, int x, int y );
~CalibrationAnimator(); ~CalibrationAnimator();
virtual bool tick(); virtual bool tick();
private: private:
CAtype _t; CAtype _t;
EvasObject* _o; Evasxx::Object* _o;
int _x; int _x;
int _y; int _y;
}; };

12
eflxx_examples/src/ecorexx/calibrate/main.cpp
View File

@ -1,18 +1,18 @@
#include <eflxx/eflpp_sys.h> #include <eflxx/System.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include "calibrate.h" #include "calibrate.h"
using namespace efl; using namespace Eflxx;
#define WIDTH 240 #define WIDTH 240
#define HEIGHT 320 #define HEIGHT 320
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
EcoreApplication app( argc, argv, "Ecore Calibration Example" ); Ecorexx::Application app( argc, argv, "Ecore Calibration Example" );
EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) );
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
Size s = evas.getSize(); Size s = evas.getSize();
CalibrationRectangle* r = new CalibrationRectangle( evas, Rect (0, 0, s.width(), s.height()) ); CalibrationRectangle* r = new CalibrationRectangle( evas, Rect (0, 0, s.width(), s.height()) );

24
eflxx_examples/src/ecorexx/callbacks/main.cpp
View File

@ -1,12 +1,12 @@
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>
using namespace std; using namespace std;
using namespace efl; using namespace Eflxx;
const int WIDTH = 320; const int WIDTH = 320;
const int HEIGHT = 320; const int HEIGHT = 320;
@ -16,40 +16,40 @@ const unsigned int BALLSIZE = 50;
const unsigned int BALLWIDTH = WIDTH-BALLSIZE; const unsigned int BALLWIDTH = WIDTH-BALLSIZE;
const unsigned int BALLHEIGHT = HEIGHT-BALLSIZE; const unsigned int BALLHEIGHT = HEIGHT-BALLSIZE;
class TimerApp : public EcoreApplication class TimerApp : public Ecorexx::Application
{ {
public: public:
TimerApp( int argc, const char** argv ) : EcoreApplication( argc, argv, "Ecore Timer Test" ), TimerApp( int argc, const char** argv ) : Ecorexx::Application( argc, argv, "Ecore Timer Test" ),
xoffset( 0 ), yoffset( PI/3 ), xoffset( 0 ), yoffset( PI/3 ),
xstep( 2*PI/360 ), ystep( 2*PI/360 ), xstep( 2*PI/360 ), ystep( 2*PI/360 ),
size( BALLSIZE ), direction( -1 ), size( BALLSIZE ), direction( -1 ),
alpha( 0 ), alphadirection( 1 ), alpha( 0 ), alphadirection( 1 ),
xaddfactor( 1 ), yaddfactor( 1 ) xaddfactor( 1 ), yaddfactor( 1 )
{ {
EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( size ); Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( size );
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
const Size size (WIDTH, HEIGHT); const Size size (WIDTH, HEIGHT);
image = new EvasImage( evas, searchPixmapFile ("panel.png") ); image = new Evasxx::Image( evas, searchPixmapFile ("panel.png") );
image->resize( size ); image->resize( size );
image->setFill( Rect (0, 0, WIDTH, HEIGHT) ); image->setFill( Rect (0, 0, WIDTH, HEIGHT) );
image->show(); image->show();
shadow = new EvasImage( evas, searchPixmapFile ("panel_shadow.png" )); shadow = new Evasxx::Image( evas, searchPixmapFile ("panel_shadow.png" ));
shadow->resize( size ); shadow->resize( size );
shadow->setFill( Rect (0, 0, WIDTH, HEIGHT) ); shadow->setFill( Rect (0, 0, WIDTH, HEIGHT) );
shadow->show(); shadow->show();
shadow->setFocus( true ); shadow->setFocus( true );
logo = new EvasImage( evas, searchPixmapFile ("e_logo.png") ); logo = new Evasxx::Image( evas, searchPixmapFile ("e_logo.png") );
logo->setColor( Color (255, 255, 255, 0) ); logo->setColor( Color (255, 255, 255, 0) );
logo->show(); logo->show();
for ( unsigned int i = 0; i < NUMBALLS; ++i ) for ( unsigned int i = 0; i < NUMBALLS; ++i )
{ {
balls[i] = new EvasImage( evas, Point (20*i, 20*i), searchPixmapFile ("boing-shadow.png") ); balls[i] = new Evasxx::Image( evas, Point (20*i, 20*i), searchPixmapFile ("boing-shadow.png") );
balls[i]->resize( Size (BALLSIZE, BALLSIZE), true ); balls[i]->resize( Size (BALLSIZE, BALLSIZE), true );
balls[i]->setColor( Color (255, 255, 255, 240) ); balls[i]->setColor( Color (255, 255, 255, 240) );
balls[i]->show(); balls[i]->show();
@ -60,8 +60,8 @@ public:
mw->show(); mw->show();
} }
EvasImage* image, *shadow, *logo; Evasxx::Image* image, *shadow, *logo;
EvasImage* balls[NUMBALLS]; Evasxx::Image* balls[NUMBALLS];
double xoffset; double xoffset;
double yoffset; double yoffset;
double xstep; double xstep;

9
eflxx_examples/src/ecorexx/config/main.cpp
View File

@ -1,7 +1,6 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <ecorexx/EcoreConfig.h>
using namespace efl; using namespace Eflxx;
#include <iostream> #include <iostream>
using namespace std; using namespace std;
@ -9,7 +8,7 @@ using namespace std;
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
// using the EcoreConfigClass directly // using the EcoreConfigClass directly
EcoreConfig c( "test" ); Ecorexx::Config c( "test" );
c.setValue( "aString", string( "foo" ) ); c.setValue( "aString", string( "foo" ) );
c.setValue( "anInt", 42 ); c.setValue( "anInt", 42 );
c.setValue( "aBool", true ); c.setValue( "aBool", true );
@ -21,7 +20,7 @@ int main( int argc, const char **argv )
cout << "something not there is = " << c.getString( "not here", "not here" ) << endl; cout << "something not there is = " << c.getString( "not here", "not here" ) << endl;
// using the application ecore config class // using the application ecore config class
EcoreApplication app( argc, argv, "This is my Application" ); Ecorexx::Application app( argc, argv, "This is my Application" );
int runcount = app.getConfig()->getInt( "runcount", 0 ); int runcount = app.getConfig()->getInt( "runcount", 0 );
cout << "this application runs for the " << ++runcount << "th time" << endl; cout << "this application runs for the " << ++runcount << "th time" << endl;
app.getConfig()->setValue( "runcount", runcount ); app.getConfig()->setValue( "runcount", runcount );

10
eflxx_examples/src/ecorexx/list/main.cpp
View File

@ -1,15 +1,13 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <ecorexx/EcoreConfig.h>
#include <ecorexx/EcoreList.h>
#include <iostream> #include <iostream>
using namespace std; using namespace std;
using namespace efl; using namespace Eflxx;
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
// int* test // int* test
EcoreList <int> numberList; Ecorexx::List <int> numberList;
int n[6] = {10,11,12,13,14,15}; int n[6] = {10,11,12,13,14,15};
@ -29,7 +27,7 @@ int main( int argc, const char **argv )
} }
// char* test // char* test
EcoreList <char> strList; Ecorexx::List <char> strList;
char first[] = "First"; char first[] = "First";
char second[] = "Second"; char second[] = "Second";

50
eflxx_examples/src/ecorexx/paint/main.cpp
View File

@ -1,9 +1,9 @@
#include <eflxx/eflpp_sys.h> #include <eflxx/System.h>
#include <eflxx/eflpp_debug.h> #include <eflxx/Debug.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
using namespace efl; using namespace Eflxx;
#include <iostream> #include <iostream>
#include <cstring> #include <cstring>
@ -14,11 +14,11 @@ using namespace std;
#define DOTSIZE 2 #define DOTSIZE 2
class PaintArea : public EvasRectangle class PaintArea : public Evasxx::Rectangle
{ {
public: public:
PaintArea( EvasCanvas &evas ) : PaintArea( Evasxx::Canvas &evas ) :
EvasRectangle( evas ), Evasxx::Rectangle( evas ),
mouseDown( false ), mouseDown( false ),
mEvas (evas) mEvas (evas)
{ {
@ -33,21 +33,21 @@ public:
} }
virtual ~PaintArea() { }; virtual ~PaintArea() { };
virtual void handleMouseUp( const EvasMouseUpEvent& e ) virtual void handleMouseUp( const Evasxx::MouseUpEvent& e )
{ {
cout << "PA::mouseUp" << endl; cout << "PA::mouseUp" << endl;
mouseDown = false; mouseDown = false;
} }
virtual void handleMouseDown( const EvasMouseDownEvent& e ) virtual void handleMouseDown( const Evasxx::MouseDownEvent& e )
{ {
cout << "PA::mouseDown" << endl; cout << "PA::mouseDown" << endl;
mouseDown = true; mouseDown = true;
EvasObject* l = new EvasRectangle( mEvas, Rect (e.data->canvas.x, e.data->canvas.y, 2, 2) ); Evasxx::Object* l = new Evasxx::Rectangle( mEvas, Rect (e.data->canvas.x, e.data->canvas.y, 2, 2) );
int b=200+(int) (55.0*rand()/(RAND_MAX+1.0)); int b=200+(int) (55.0*rand()/(RAND_MAX+1.0));
l->setColor( Color (b, b, b, 255) ); l->setColor( Color (b, b, b, 255) );
l->show(); l->show();
} }
virtual void handleMouseMove( const EvasMouseMoveEvent& e ) virtual void handleMouseMove( const Evasxx::MouseMoveEvent& e )
{ {
cout << "PA::mouseMove" << endl; cout << "PA::mouseMove" << endl;
if ( mouseDown ) if ( mouseDown )
@ -55,61 +55,61 @@ public:
int width = 2 + abs( e.data->cur.canvas.x - e.data->prev.canvas.x ); int width = 2 + abs( e.data->cur.canvas.x - e.data->prev.canvas.x );
int height = 2 + abs( e.data->cur.canvas.y - e.data->prev.canvas.y ); int height = 2 + abs( e.data->cur.canvas.y - e.data->prev.canvas.y );
cout << "width = " << width << ", height = " << height << endl; cout << "width = " << width << ", height = " << height << endl;
EvasObject* l = new EvasRectangle( mEvas, Rect (e.data->cur.canvas.x - width/2, e.data->cur.canvas.y - height/2, width, height) ); Evasxx::Object* l = new Evasxx::Rectangle( mEvas, Rect (e.data->cur.canvas.x - width/2, e.data->cur.canvas.y - height/2, width, height) );
int b=200+(int) (55.0*rand()/(RAND_MAX+1.0)); int b=200+(int) (55.0*rand()/(RAND_MAX+1.0));
l->setColor( Color (b, b, b, 255) ); l->setColor( Color (b, b, b, 255) );
l->show(); l->show();
} }
} }
virtual void handleKeyUp( const EvasKeyUpEvent& e ) virtual void handleKeyUp( const Evasxx::KeyUpEvent& e )
{ {
cout << "PA:::keyUp - released '" << e.data->keyname << "'" << endl; cout << "PA:::keyUp - released '" << e.data->keyname << "'" << endl;
if ( strcmp( e.data->keyname, "Escape" ) == 0 ) if ( strcmp( e.data->keyname, "Escape" ) == 0 )
{ {
eApp->quit(); Ecorexx::Application::quit();
} }
if ( strcmp( e.data->keyname, "0x5b" ) == 0 ) if ( strcmp( e.data->keyname, "0x5b" ) == 0 )
{ {
int rot = eApp->getMainWindow()->rotation(); int rot = Ecorexx::Application::getInstance()->getMainWindow()->rotation();
rot = rot ? 0: 270; rot = rot ? 0: 270;
eApp->getMainWindow()->setRotation( rot ); Ecorexx::Application::getInstance()->getMainWindow()->setRotation( rot );
//eApp->mainWindow()->resize( //eApp->mainWindow()->resize(
} }
if ( strcmp( e.data->keyname, "j" ) == 0 ) if ( strcmp( e.data->keyname, "j" ) == 0 )
{ {
Rect vp = eApp->getMainWindow()->getCanvas().getViewport(); Rect vp = Ecorexx::Application::getInstance()->getMainWindow()->getCanvas().getViewport();
eApp->getMainWindow()->getCanvas().setViewport( Rect (vp.x()+10, vp.y()+10, vp.width()-10, vp.height()-10) ); Ecorexx::Application::getInstance()->getMainWindow()->getCanvas().setViewport( Rect (vp.x()+10, vp.y()+10, vp.width()-10, vp.height()-10) );
} }
if ( strcmp( e.data->keyname, "k" ) == 0 ) if ( strcmp( e.data->keyname, "k" ) == 0 )
{ {
Rect vp = eApp->getMainWindow()->getCanvas().getViewport(); Rect vp = Ecorexx::Application::getInstance()->getMainWindow()->getCanvas().getViewport();
eApp->getMainWindow()->getCanvas().setViewport( Rect (vp.x()-10, vp.y()-10, vp.width()+10, vp.height()+10) ); Ecorexx::Application::getInstance()->getMainWindow()->getCanvas().setViewport( Rect (vp.x()-10, vp.y()-10, vp.width()+10, vp.height()+10) );
} }
} }
private: private:
bool mouseDown; bool mouseDown;
EvasCanvas &mEvas; Evasxx::Canvas &mEvas;
}; };
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
/* Create the application object */ /* Create the application object */
EcoreApplication* app = new EcoreApplication( argc, argv, "Ecore Paint Example" ); Ecorexx::Application* app = new Ecorexx::Application( argc, argv, "Ecore Paint Example" );
/* Create the main window, a window with an embedded canvas */ /* Create the main window, a window with an embedded canvas */
EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) );
mw->setAlpha (true); mw->setAlpha (true);
mw->show (); mw->show ();
/* Create some objects on the canvas */ /* Create some objects on the canvas */
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
Size s = evas.getSize(); Size s = evas.getSize();
cout << "PA: Size = " << s << endl; cout << "PA: Size = " << s << endl;
EvasRectangle* bg = new EvasRectangle( evas, s ); Evasxx::Rectangle* bg = new Evasxx::Rectangle( evas, s );
bg->setColor( Color (50, 50, 50, 128) ); bg->setColor( Color (50, 50, 50, 128) );
bg->setLayer( 0 ); bg->setLayer( 0 );
bg->show(); bg->show();

18
eflxx_examples/src/ecorexx/simple/main.cpp
View File

@ -1,4 +1,4 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
@ -8,20 +8,20 @@
#include <iostream> #include <iostream>
using namespace std; using namespace std;
using namespace efl; using namespace Eflxx;
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
/* Create the application object */ /* Create the application object */
EcoreApplication* app = new EcoreApplication( argc, argv, "Simple Ecore Test" ); Ecorexx::Application* app = new Ecorexx::Application( argc, argv, "Simple Ecore Test" );
/* Create the main window, a window with an embedded canvas */ /* Create the main window, a window with an embedded canvas */
EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) );
/* Create some objects on the canvas */ /* Create some objects on the canvas */
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
EvasImage* image = new EvasImage( evas, searchPixmapFile ("panel.png") ); Evasxx::Image* image = new Evasxx::Image( evas, searchPixmapFile ("panel.png") );
//image->setFilled (true); //image->setFilled (true);
image->resize( evas.getSize() ); image->resize( evas.getSize() );
image->setFill( image->getImageSize() ); // FIXME image->setFill( image->getImageSize() ); // FIXME
@ -32,19 +32,19 @@ int main( int argc, const char **argv )
cout << "Image size: " << image->getImageSize() << endl; cout << "Image size: " << image->getImageSize() << endl;
cout << "Object size: " << image->getSize() << endl; cout << "Object size: " << image->getSize() << endl;
EvasImage* shadow = new EvasImage( evas, searchPixmapFile ("panel_shadow.png") ); Evasxx::Image* shadow = new Evasxx::Image( evas, searchPixmapFile ("panel_shadow.png") );
//image->setFilled (true); //image->setFilled (true);
shadow->resize( evas.getSize() ); shadow->resize( evas.getSize() );
shadow->setFill( image->getImageSize() ); // FIXME shadow->setFill( image->getImageSize() ); // FIXME
shadow->show(); shadow->show();
EvasImage* logo = new EvasImage( evas, Point (50, 50), searchPixmapFile ("boing-shadow.png") ); Evasxx::Image* logo = new Evasxx::Image( evas, Point (50, 50), searchPixmapFile ("boing-shadow.png") );
//image->setFilled (true); //image->setFilled (true);
logo->resize( logo->getImageSize() ); logo->resize( logo->getImageSize() );
logo->setFill( logo->getImageSize() ); // FIXME logo->setFill( logo->getImageSize() ); // FIXME
logo->show(); logo->show();
EvasText* text = new EvasText( evas, searchFontFile ("Gentium.ttf"), 20, Point (10, 10), "" ); Evasxx::Text* text = new Evasxx::Text( evas, searchFontFile ("Gentium.ttf"), 20, Point (10, 10), "" );
text->setText( "Commodore AMIGA rulez ..." ); text->setText( "Commodore AMIGA rulez ..." );
text->setLayer( 5 ); text->setLayer( 5 );
text->show(); text->show();

23
eflxx_examples/src/ecorexx/stars/main.cpp
View File

@ -1,18 +1,17 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <ecorexx/EcoreTimer.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <iostream> #include <iostream>
#include <list> #include <list>
using namespace efl; using namespace Eflxx;
using namespace std; using namespace std;
#define WIDTH 320 #define WIDTH 320
#define HEIGHT 240 #define HEIGHT 240
typedef pair<EvasLine*, int> Star; typedef pair<Evasxx::Line*, int> Star;
typedef list<Star*> Starfield; typedef list<Star*> Starfield;
typedef list<Star*>::iterator StarfieldIterator; typedef list<Star*>::iterator StarfieldIterator;
@ -20,12 +19,12 @@ Starfield starfield;
int width = 0; int width = 0;
void advance( EcoreTimer* e ) void advance( Ecorexx::Timer* e )
{ {
for (StarfieldIterator it = starfield.begin(); it != starfield.end(); ++it ) for (StarfieldIterator it = starfield.begin(); it != starfield.end(); ++it )
{ {
Star* star = *it; Star* star = *it;
EvasLine* line = star->first; Evasxx::Line* line = star->first;
int speed = star->second; int speed = star->second;
Rect g = line->getGeometry(); Rect g = line->getGeometry();
line->setGeometry( Rect ((g.x()+speed ) % width, g.y(), 1, 0) ); line->setGeometry( Rect ((g.x()+speed ) % width, g.y(), 1, 0) );
@ -34,14 +33,14 @@ void advance( EcoreTimer* e )
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
EcoreApplication* app = new EcoreApplication( argc, argv, "Ecore Stars Test" ); Ecorexx::Application* app = new Ecorexx::Application( argc, argv, "Ecore Stars Test" );
EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) );
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
Rect bg = evas.getGeometry(); Rect bg = evas.getGeometry();
width = bg.width(); width = bg.width();
EvasRectangle* r = new EvasRectangle( evas, bg ); Evasxx::Rectangle* r = new Evasxx::Rectangle( evas, bg );
r->setColor( Color (0, 0, 0, 255) ); r->setColor( Color (0, 0, 0, 255) );
r->setLayer( 0 ); r->setLayer( 0 );
r->show(); r->show();
@ -50,7 +49,7 @@ int main( int argc, const char **argv )
{ {
int xpos = (int) ((double)bg.width()*rand()/(RAND_MAX)); int xpos = (int) ((double)bg.width()*rand()/(RAND_MAX));
int speed = 1+(int) (10.0*rand()/(RAND_MAX+1.0)); int speed = 1+(int) (10.0*rand()/(RAND_MAX+1.0));
EvasLine* line = new EvasLine( evas, Point (xpos, scanline), Point (xpos+1, scanline) ); Evasxx::Line* line = new Evasxx::Line( evas, Point (xpos, scanline), Point (xpos+1, scanline) );
line->setColor( Color (50+speed*16, 50+speed*18, 50+speed*17, 255) ); line->setColor( Color (50+speed*16, 50+speed*18, 50+speed*17, 255) );
line->setLayer( 10 ); line->setLayer( 10 );
line->show(); line->show();
@ -58,7 +57,7 @@ int main( int argc, const char **argv )
starfield.push_back( new Star( line, speed ) ); starfield.push_back( new Star( line, speed ) );
} }
( new EcoreTimer( 0.08 ) )->timeout.connect( sigc::ptr_fun( ::advance ) ); ( new Ecorexx::Timer( 0.08 ) )->timeout.connect( sigc::ptr_fun( ::advance ) );
mw->show (); mw->show ();

24
eflxx_examples/src/ecorexx/timers/main.cpp
View File

@ -1,4 +1,4 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
@ -6,7 +6,7 @@
#include <iostream> #include <iostream>
using namespace std; using namespace std;
using namespace efl; using namespace Eflxx;
const int WIDTH = 320; const int WIDTH = 320;
const int HEIGHT = 320; const int HEIGHT = 320;
@ -16,39 +16,39 @@ const unsigned int BALLSIZE = 50;
const unsigned int BALLWIDTH = WIDTH-BALLSIZE; const unsigned int BALLWIDTH = WIDTH-BALLSIZE;
const unsigned int BALLHEIGHT = HEIGHT-BALLSIZE; const unsigned int BALLHEIGHT = HEIGHT-BALLSIZE;
class TimerApp : public EcoreApplication class TimerApp : public Ecorexx::Application
{ {
public: public:
TimerApp( int argc, const char** argv ) TimerApp( int argc, const char** argv )
: EcoreApplication( argc, argv, "Ecore Timer Test" ), : Ecorexx::Application( argc, argv, "Ecore Timer Test" ),
xoffset( 0 ), yoffset( PI/3 ), xoffset( 0 ), yoffset( PI/3 ),
xstep( 2*PI/360 ), ystep( 2*PI/360 ), xstep( 2*PI/360 ), ystep( 2*PI/360 ),
size( BALLSIZE ), direction( -1 ), size( BALLSIZE ), direction( -1 ),
alpha( 0 ), alphadirection( 1 ), alpha( 0 ), alphadirection( 1 ),
xaddfactor( 1 ), yaddfactor( 1 ) xaddfactor( 1 ), yaddfactor( 1 )
{ {
EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) );
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
image = new EvasImage( evas, searchPixmapFile ("panel.png") ); image = new Evasxx::Image( evas, searchPixmapFile ("panel.png") );
image->resize( evas.getSize() ); image->resize( evas.getSize() );
//image->setFill( 0, 0, image->trueSize() ); //FIXME //image->setFill( 0, 0, image->trueSize() ); //FIXME
image->show(); image->show();
shadow = new EvasImage( evas, searchPixmapFile ("panel_shadow.png") ); shadow = new Evasxx::Image( evas, searchPixmapFile ("panel_shadow.png") );
shadow->resize( evas.getSize() ); shadow->resize( evas.getSize() );
//shadow->setFill( 0, 0, evas.size() ); //FIXME //shadow->setFill( 0, 0, evas.size() ); //FIXME
shadow->show(); shadow->show();
shadow->setFocus( true ); shadow->setFocus( true );
logo = new EvasImage( evas, Point (40, 20), searchPixmapFile ("e_logo.png") ); logo = new Evasxx::Image( evas, Point (40, 20), searchPixmapFile ("e_logo.png") );
logo->setColor( Color (255, 255, 255, 0) ); logo->setColor( Color (255, 255, 255, 0) );
logo->show(); logo->show();
for ( unsigned int i = 0; i < NUMBALLS; ++i ) for ( unsigned int i = 0; i < NUMBALLS; ++i )
{ {
balls[i] = new EvasImage( evas, Point (20*i, 20*i), searchPixmapFile ("boing-shadow.png") ); balls[i] = new Evasxx::Image( evas, Point (20*i, 20*i), searchPixmapFile ("boing-shadow.png") );
balls[i]->resize( Size (BALLSIZE, BALLSIZE), true ); balls[i]->resize( Size (BALLSIZE, BALLSIZE), true );
balls[i]->setColor( Color (255, 255, 255, 240) ); balls[i]->setColor( Color (255, 255, 255, 240) );
balls[i]->show(); balls[i]->show();
@ -59,8 +59,8 @@ public:
mw->show(); mw->show();
} }
EvasImage* image, *shadow, *logo; Evasxx::Image* image, *shadow, *logo;
EvasImage* balls[NUMBALLS]; Evasxx::Image* balls[NUMBALLS];
double xoffset; double xoffset;
double yoffset; double yoffset;

23
eflxx_examples/src/ecorexx/x/main.cpp
View File

@ -1,5 +1,4 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <ecorexx/EcoreXWindow.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
@ -8,41 +7,41 @@
#include <iostream> #include <iostream>
using namespace std; using namespace std;
using namespace efl; using namespace Eflxx;
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
/* Create the application object */ /* Create the application object */
EcoreApplication* app = new EcoreApplication( argc, argv, "Simple Ecore Test" ); Ecorexx::Application* app = new Ecorexx::Application( argc, argv, "Simple Ecore Test" );
/* Create the main window, a window with an embedded canvas */ /* Create the main window, a window with an embedded canvas */
EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) );
// Open this window as 'Utility' window // Open this window as 'Utility' window
EcoreXWindow *exwin = mw->getXWindow(); Ecorexx::XWindow *exwin = mw->getXWindow();
exwin->setNetWMWindowType ( EcoreXWindow::Utility ); exwin->setNetWMWindowType ( Ecorexx::XWindow::Utility );
delete exwin; delete exwin;
/* Create some objects on the canvas */ /* Create some objects on the canvas */
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
EvasImage* image = new EvasImage( evas, searchPixmapFile ("panel.png") ); Evasxx::Image* image = new Evasxx::Image( evas, searchPixmapFile ("panel.png") );
image->resize( evas.getSize() ); image->resize( evas.getSize() );
image->setFill( image->getImageSize() ); image->setFill( image->getImageSize() );
image->show(); image->show();
image->setFocus( true ); image->setFocus( true );
EvasImage* shadow = new EvasImage( evas, searchPixmapFile ("panel_shadow.png") ); Evasxx::Image* shadow = new Evasxx::Image( evas, searchPixmapFile ("panel_shadow.png") );
shadow->resize( evas.getSize() ); shadow->resize( evas.getSize() );
shadow->setFill( image->getImageSize() ); shadow->setFill( image->getImageSize() );
shadow->show(); shadow->show();
EvasImage* logo = new EvasImage(evas, Point (50, 50), searchPixmapFile ("boing-shadow.png") ); Evasxx::Image* logo = new Evasxx::Image(evas, Point (50, 50), searchPixmapFile ("boing-shadow.png") );
logo->resize( logo->getImageSize() ); logo->resize( logo->getImageSize() );
logo->setFill( logo->getImageSize() ); logo->setFill( logo->getImageSize() );
logo->show(); logo->show();
EvasText* text = new EvasText( evas, searchFontFile ("Gentium.ttf"), 20, Point (10, 10), "" ); Evasxx::Text* text = new Evasxx::Text( evas, searchFontFile ("Gentium.ttf"), 20, Point (10, 10), "" );
text->setText( "Commodore AMIGA rulez ..." ); text->setText( "Commodore AMIGA rulez ..." );
text->setLayer( 5 ); text->setLayer( 5 );
text->show(); text->show();

12
eflxx_examples/src/edjexx/simple/main.cpp
View File

@ -1,4 +1,4 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include <edjexx/Edjexx.h> #include <edjexx/Edjexx.h>
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
@ -8,27 +8,27 @@
#define WIDTH 240 #define WIDTH 240
#define HEIGHT 320 #define HEIGHT 320
using namespace efl; using namespace Eflxx;
using namespace std; using namespace std;
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
// Create the application object // Create the application object
EcoreApplication app (argc, argv, "Simple Edje Test"); Ecorexx::Application app (argc, argv, "Simple Edje Test");
Size s (WIDTH, HEIGHT); Size s (WIDTH, HEIGHT);
// Create the main window, a window with an embedded canvas // Create the main window, a window with an embedded canvas
EcoreEvasWindowSoftwareX11 mw (s); Ecorexx::EvasWindowSoftwareX11 mw (s);
EvasCanvas &evas = mw.getCanvas(); Evasxx::Canvas &evas = mw.getCanvas();
evas.appendFontPath( searchDataDir () + "/fonts" ); evas.appendFontPath( searchDataDir () + "/fonts" );
// Add some objects to the canvas // Add some objects to the canvas
cout << "edje: " << searchEdjeFile ("simple.edj") << endl; cout << "edje: " << searchEdjeFile ("simple.edj") << endl;
EdjeObject edje (evas, Point (0, 0), searchEdjeFile ("simple.edj"), "test"); Edjexx::Object edje (evas, Point (0, 0), searchEdjeFile ("simple.edj"), "test");
edje.resize( s ); edje.resize( s );

11
eflxx_examples/src/eetxx/simple_write_read/read_eet.cpp
View File

@ -4,7 +4,6 @@
#include <algorithm> #include <algorithm>
using namespace std; using namespace std;
using namespace efl;
struct A struct A
{ {
@ -19,7 +18,7 @@ ostream& operator<< (ostream& os, const A& a)
return os; return os;
} }
ostream& operator<< (ostream& os, const EetChunk& chunk) ostream& operator<< (ostream& os, const Eetxx::Chunk& chunk)
{ {
void *data = chunk.get (); void *data = chunk.get ();
os << chunk.get_key () << " "; os << chunk.get_key () << " ";
@ -38,7 +37,7 @@ ostream& operator<< (ostream& os, const EetChunk& chunk)
struct display_eet_file_content struct display_eet_file_content
{ {
void operator () (const EetChunk &chunk) void operator () (const Eetxx::Chunk &chunk)
{ {
cout << chunk << endl; cout << chunk << endl;
} }
@ -46,10 +45,10 @@ struct display_eet_file_content
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
EetDocument::init (); Eetxx::Document::init ();
EetDocument doc("writing_test.eet", EET_FILE_MODE_READ); Eetxx::Document doc("writing_test.eet", EET_FILE_MODE_READ);
EetList my_list (doc); Eetxx::List my_list (doc);
//A *a = reinterpret_cast<A *> (my_list["A"]. get ()); //A *a = reinterpret_cast<A *> (my_list["A"]. get ());

15
eflxx_examples/src/eetxx/simple_write_read/write_eet.cpp
View File

@ -5,7 +5,6 @@
#include <cstring> #include <cstring>
using namespace std; using namespace std;
using namespace efl;
struct A struct A
{ {
@ -17,10 +16,10 @@ struct A
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
EetDocument::init (); Eetxx::Document::init ();
EetDocument doc("writing_test.eet", EET_FILE_MODE_WRITE); Eetxx::Document doc("writing_test.eet", EET_FILE_MODE_WRITE);
EetList my_list (doc); Eetxx::List my_list (doc);
int x = 2; int x = 2;
cout << "Set x" << endl; cout << "Set x" << endl;
@ -34,23 +33,23 @@ int main(int argc, char **argv)
memcpy(a.s, "john", 10); memcpy(a.s, "john", 10);
cout << "Set A" << endl; cout << "Set A" << endl;
my_list["A"] = make_data (a, true); my_list["A"] = Eetxx::make_data (a, true);
cout << "---------" << endl; cout << "---------" << endl;
cout << "Use intermediate object" << endl; cout << "Use intermediate object" << endl;
const char *s = "first string"; const char *s = "first string";
DataInformation<const char *> d = make_data(s, false, strlen (s)+1); Eetxx::DataInformation<const char *> d = Eetxx::make_data(s, false, strlen (s)+1);
my_list["my_string"] = d; my_list["my_string"] = d;
cout << "---------" << endl; cout << "---------" << endl;
cout << "Use directly helper function" << endl; cout << "Use directly helper function" << endl;
const char *s2 = "second string"; const char *s2 = "second string";
my_list["my_string2"] = make_data (s2, false, strlen (s)+1); my_list["my_string2"] = Eetxx::make_data (s2, false, strlen (s)+1);
cout << "--------" << endl; cout << "--------" << endl;
cout << "Set B" << endl; cout << "Set B" << endl;
DataInformation<int> t2 (2, true); Eetxx::DataInformation<int> t2 (2, true);
my_list["B"] = t2; my_list["B"] = t2;
cout << "--------" << endl; cout << "--------" << endl;

18
eflxx_examples/src/elementaryxx/full/main.cpp
View File

@ -4,6 +4,8 @@
#include "test.h" #include "test.h"
#ifndef ELM_LIB_QUICKLAUNCH #ifndef ELM_LIB_QUICKLAUNCH
static void my_win_del(Evas_Object *obj, void *event_info); static void my_win_del(Evas_Object *obj, void *event_info);
static void my_win_main(void); static void my_win_main(void);
@ -65,7 +67,7 @@ void test_menu(void *data, Evas_Object *obj, void *event_info);
*/ */
void test_panel (void *data, Evas_Object *obj, void *event_info); void test_panel (void *data, Evas_Object *obj, void *event_info);
ElmApplication *elmApp; Application *elmApp;
static void static void
@ -80,7 +82,7 @@ my_win_del(Evas_Object *obj, void *event_info)
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
elmApp = new ElmApplication (argc, argv); elmApp = new Application (argc, argv);
/* 1 create an elm window - it returns an evas object. this is a little /* 1 create an elm window - it returns an evas object. this is a little
* special as the object lives in the canvas that is inside the window * special as the object lives in the canvas that is inside the window
@ -95,7 +97,7 @@ int main (int argc, char **argv)
* manager for identifying the window uniquely amongst all the windows * manager for identifying the window uniquely amongst all the windows
* within this application (and all instances of the application). the * within this application (and all instances of the application). the
* type is a basic window (the final parameter) */ * type is a basic window (the final parameter) */
ElmWindow *win = ElmWindow::factory ("main", ELM_WIN_BASIC); Window *win = Window::factory ("main", ELM_WIN_BASIC);
/* set the title of the window - this is in the titlebar */ /* set the title of the window - this is in the titlebar */
win->setTitle ("Elementary Tests"); win->setTitle ("Elementary Tests");
@ -116,7 +118,7 @@ int main (int argc, char **argv)
* comnpositor running this should fall back to using shaped windows * comnpositor running this should fall back to using shaped windows
* (which have a mask). both these features will be slow and rely on * (which have a mask). both these features will be slow and rely on
* a lot more resources, so only use it if you need it. */ * a lot more resources, so only use it if you need it. */
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
/* set weight to 1.0 x 1.0 == expand in both x and y direction */ /* set weight to 1.0 x 1.0 == expand in both x and y direction */
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
/* tell the window that this object is to be resized along with the window. /* tell the window that this object is to be resized along with the window.
@ -127,7 +129,7 @@ int main (int argc, char **argv)
bg->show (); bg->show ();
/* add a box layout widget to the window */ /* add a box layout widget to the window */
ElmBox *bx0 = ElmBox::factory (*win); Box *bx0 = Box::factory (*win);
/* allow base box (bx0) to expand in x and y */ /* allow base box (bx0) to expand in x and y */
bx0->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx0->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
/* tell the window that the box affects window size and also will be /* tell the window that the box affects window size and also will be
@ -135,19 +137,19 @@ int main (int argc, char **argv)
win->addObjectResize (*bx0); win->addObjectResize (*bx0);
bx0->show (); bx0->show ();
ElmFrame *fr = ElmFrame::factory (*win); Frame *fr = Frame::factory (*win);
fr->setLabel ("Information"); fr->setLabel ("Information");
bx0->packEnd (*fr); bx0->packEnd (*fr);
fr->show (); fr->show ();
ElmLabel *lb = ElmLabel::factory (*win); Label *lb = Label::factory (*win);
lb->setLabel("Please select a test from the list below<br>" lb->setLabel("Please select a test from the list below<br>"
"by clicking the test button to show the<br>" "by clicking the test button to show the<br>"
"test window."); "test window.");
fr->setContent (*lb); fr->setContent (*lb);
lb->show (); lb->show ();
ElmList *li = ElmList::factory (*win); List *li = List::factory (*win);
li->setAlwaysSelectMode (true); li->setAlwaysSelectMode (true);
li->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); li->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
li->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); li->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);

3
eflxx_examples/src/elementaryxx/full/test.h
View File

@ -5,7 +5,8 @@
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
using namespace std; using namespace std;
using namespace efl; using namespace Eflxx;
using namespace Elmxx;
static Size size160x160 (160, 160); static Size size160x160 (160, 160);
static Size size320x320 (320, 320); static Size size320x320 (320, 320);

10
eflxx_examples/src/elementaryxx/full/test_bg.cpp
View File

@ -1,12 +1,14 @@
#include "test.h" #include "test.h"
void test_bg_plain (void *data, Evas_Object *obj, void *event_info) void test_bg_plain (void *data, Evas_Object *obj, void *event_info)
{ {
ElmWindow *win = ElmWindow::factory ("bg-plain", ELM_WIN_BASIC); Window *win = Window::factory ("bg-plain", ELM_WIN_BASIC);
win->setTitle ("Bg Plain"); win->setTitle ("Bg Plain");
win->setAutoDel(true); win->setAutoDel(true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
/* allow bg to expand in x & y */ /* allow bg to expand in x & y */
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bg); win->addObjectResize (*bg);
@ -29,11 +31,11 @@ void test_bg_plain (void *data, Evas_Object *obj, void *event_info)
void test_bg_image (void *data, Evas_Object *obj, void *event_info) void test_bg_image (void *data, Evas_Object *obj, void *event_info)
{ {
ElmWindow *win = ElmWindow::factory ("bg-image", ELM_WIN_BASIC); Window *win = Window::factory ("bg-image", ELM_WIN_BASIC);
win->setTitle ("Bg Image"); win->setTitle ("Bg Image");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
bg->setFile (searchPixmapFile ("elementaryxx/plant_01.jpg")); bg->setFile (searchPixmapFile ("elementaryxx/plant_01.jpg"));
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bg); win->addObjectResize (*bg);

28
eflxx_examples/src/elementaryxx/full/test_box.cpp
View File

@ -1,36 +1,38 @@
#include "test.h" #include "test.h"
void test_box_vert (void *data, Evas_Object *obj, void *event_info) void test_box_vert (void *data, Evas_Object *obj, void *event_info)
{ {
ElmWindow *win = ElmWindow::factory ("box-vert", ELM_WIN_BASIC); Window *win = Window::factory ("box-vert", ELM_WIN_BASIC);
win->setTitle ("Box Vert"); win->setTitle ("Box Vert");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show (); bx->show ();
ElmIcon *ic = ElmIcon::factory (*win); Icon *ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
ic->setAlignHintSize (0.5, 0.5); ic->setAlignHintSize (0.5, 0.5);
bx->packEnd (*ic); bx->packEnd (*ic);
ic->show (); ic->show ();
ElmIcon *ic2 = ElmIcon::factory (*win); Icon *ic2 = Icon::factory (*win);
ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic2->setScale (false, false); ic2->setScale (false, false);
ic2->setAlignHintSize (0.0, 0.5); ic2->setAlignHintSize (0.0, 0.5);
bx->packEnd (*ic2); bx->packEnd (*ic2);
ic2->show (); ic2->show ();
ElmIcon *ic3 = ElmIcon::factory (*win); Icon *ic3 = Icon::factory (*win);
ic3->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic3->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic3->setScale (false, false); ic3->setScale (false, false);
ic3->setAlignHintSize (EVAS_HINT_EXPAND, 0.5); ic3->setAlignHintSize (EVAS_HINT_EXPAND, 0.5);
@ -42,36 +44,36 @@ void test_box_vert (void *data, Evas_Object *obj, void *event_info)
void test_box_horiz (void *data, Evas_Object *obj, void *event_info) void test_box_horiz (void *data, Evas_Object *obj, void *event_info)
{ {
ElmWindow *win = ElmWindow::factory ("box-horiz", ELM_WIN_BASIC); Window *win = Window::factory ("box-horiz", ELM_WIN_BASIC);
win->setTitle ("Box Horiz"); win->setTitle ("Box Horiz");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
bx->setOrientation (ElmBox::Horizontal); bx->setOrientation (Box::Horizontal);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show (); bx->show ();
ElmIcon *ic = ElmIcon::factory (*win); Icon *ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
ic->setAlignHintSize (0.5, 0.5); ic->setAlignHintSize (0.5, 0.5);
bx->packEnd (*ic); bx->packEnd (*ic);
ic->show (); ic->show ();
ElmIcon *ic2 = ElmIcon::factory (*win); Icon *ic2 = Icon::factory (*win);
ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic2->setScale (false, false); ic2->setScale (false, false);
ic2->setAlignHintSize (0.5, 0.0); ic2->setAlignHintSize (0.5, 0.0);
bx->packEnd (*ic2); bx->packEnd (*ic2);
ic2->show (); ic2->show ();
ElmIcon *ic3 = ElmIcon::factory (*win); Icon *ic3 = Icon::factory (*win);
ic3->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic3->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic3->setScale (false, false); ic3->setScale (false, false);
ic3->setAlignHintSize (0.0, EVAS_HINT_EXPAND); ic3->setAlignHintSize (0.0, EVAS_HINT_EXPAND);

28
eflxx_examples/src/elementaryxx/full/test_button.cpp
View File

@ -2,37 +2,37 @@
void test_button (void *data, Evas_Object *obj, void *event_info) void test_button (void *data, Evas_Object *obj, void *event_info)
{ {
ElmIcon *ic = NULL; Icon *ic = NULL;
ElmButton *bt = NULL; Button *bt = NULL;
ElmWindow *win = ElmWindow::factory ("buttons", ELM_WIN_BASIC); Window *win = Window::factory ("buttons", ELM_WIN_BASIC);
win->setTitle ("Buttons"); win->setTitle ("Buttons");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show (); bx->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1));
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Icon sized to button"); bt->setLabel ("Icon sized to button");
bt->setIcon (*ic); bt->setIcon (*ic);
bx->packEnd (*bt); bx->packEnd (*bt);
bt->show (); bt->show ();
ic->show (); ic->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1));
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Disabled Button"); bt->setLabel ("Disabled Button");
bt->setIcon (*ic); bt->setIcon (*ic);
bt->setDisabled (true); bt->setDisabled (true);
@ -40,25 +40,25 @@ void test_button (void *data, Evas_Object *obj, void *event_info)
bt->show (); bt->show ();
ic->show (); ic->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Icon no scale"); bt->setLabel ("Icon no scale");
bt->setIcon (*ic); bt->setIcon (*ic);
bx->packEnd (*bt); bx->packEnd (*bt);
bt->show (); bt->show ();
ic->show (); ic->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Label Only"); bt->setLabel ("Label Only");
bx->packEnd (*bt); bx->packEnd (*bt);
bt->show (); bt->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Icon no scale"); bt->setLabel ("Icon no scale");
bt->setIcon (*ic); bt->setIcon (*ic);
bx->packEnd (*bt); bx->packEnd (*bt);

28
eflxx_examples/src/elementaryxx/full/test_check.cpp
View File

@ -2,27 +2,27 @@
void test_check (void *data, Evas_Object *obj, void *event_info) void test_check (void *data, Evas_Object *obj, void *event_info)
{ {
ElmIcon *ic = NULL; Icon *ic = NULL;
ElmCheck *ck = NULL; Check *ck = NULL;
ElmWindow *win = ElmWindow::factory ("check", ELM_WIN_BASIC); Window *win = Window::factory ("check", ELM_WIN_BASIC);
win->setTitle ("Checks"); win->setTitle ("Checks");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show (); bx->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1));
ck = ElmCheck::factory (*win); ck = Check::factory (*win);
ck->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); ck->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ck->setAlignHintSize (EVAS_HINT_FILL, 0.5); ck->setAlignHintSize (EVAS_HINT_FILL, 0.5);
ck->setLabel ("Icon sized to check"); ck->setLabel ("Icon sized to check");
@ -32,25 +32,25 @@ void test_check (void *data, Evas_Object *obj, void *event_info)
ck->show (); ck->show ();
ic->show (); ic->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
ck = ElmCheck::factory (*win); ck = Check::factory (*win);
ck->setLabel ("Icon no scale"); ck->setLabel ("Icon no scale");
ck->setIcon (*ic); ck->setIcon (*ic);
bx->packEnd (*ck); bx->packEnd (*ck);
ck->show (); ck->show ();
ic->show (); ic->show ();
ck = ElmCheck::factory (*win); ck = Check::factory (*win);
ck->setLabel ("Label Only"); ck->setLabel ("Label Only");
bx->packEnd (*ck); bx->packEnd (*ck);
ck->show (); ck->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1));
ck = ElmCheck::factory (*win); ck = Check::factory (*win);
ck->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); ck->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ck->setAlignHintSize (EVAS_HINT_FILL, 0.5); ck->setAlignHintSize (EVAS_HINT_FILL, 0.5);
ck->setLabel ("Disabled check"); ck->setLabel ("Disabled check");
@ -61,10 +61,10 @@ void test_check (void *data, Evas_Object *obj, void *event_info)
ck->show (); ck->show ();
ic->show (); ic->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
ck = ElmCheck::factory (*win); ck = Check::factory (*win);
ck->setIcon (*ic); ck->setIcon (*ic);
bx->packEnd (*ck); bx->packEnd (*ck);
ck->show (); ck->show ();

18
eflxx_examples/src/elementaryxx/full/test_clock.cpp
View File

@ -2,45 +2,45 @@
void test_clock (void *data, Evas_Object *obj, void *event_info) void test_clock (void *data, Evas_Object *obj, void *event_info)
{ {
ElmWindow *win = ElmWindow::factory ("clock", ELM_WIN_BASIC); Window *win = Window::factory ("clock", ELM_WIN_BASIC);
win->setTitle ("Clock"); win->setTitle ("Clock");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show (); bx->show ();
ElmClock *ck = ElmClock::factory (*win); Clock *ck = Clock::factory (*win);
bx->packEnd (*ck); bx->packEnd (*ck);
ck->show (); ck->show ();
ElmClock *ck2 = ElmClock::factory (*win); Clock *ck2 = Clock::factory (*win);
ck2->setShowAmPm (true); ck2->setShowAmPm (true);
bx->packEnd (*ck2); bx->packEnd (*ck2);
ck2->show (); ck2->show ();
ElmClock *ck3 = ElmClock::factory (*win); Clock *ck3 = Clock::factory (*win);
ck3->setShowSeconds (true); ck3->setShowSeconds (true);
bx->packEnd (*ck3); bx->packEnd (*ck3);
ck3->show (); ck3->show ();
ElmClock *ck4 = ElmClock::factory (*win); Clock *ck4 = Clock::factory (*win);
ck4->setShowSeconds (true); ck4->setShowSeconds (true);
ck4->setShowAmPm (true); ck4->setShowAmPm (true);
bx->packEnd (*ck4); bx->packEnd (*ck4);
ck4->show (); ck4->show ();
ElmClock *ck5 = ElmClock::factory (*win); Clock *ck5 = Clock::factory (*win);
ck5->setEdit (true); ck5->setEdit (true);
ck5->setShowSeconds (true); ck5->setShowSeconds (true);
ck5->setShowAmPm (true); ck5->setShowAmPm (true);
ck5->setTime (ElmClock::Time (10, 11, 12)); ck5->setTime (Clock::Time (10, 11, 12));
bx->packEnd (*ck5); bx->packEnd (*ck5);
ck5->show (); ck5->show ();

66
eflxx_examples/src/elementaryxx/full/test_entry.cpp
View File

@ -1,46 +1,46 @@
#include "test.h" #include "test.h"
static void my_entry_bt_1 (Evas_Object *obj, void *event_info, ElmEntry *en) static void my_entry_bt_1 (Evas_Object *obj, void *event_info, Entry *en)
{ {
en->setText (""); en->setText ("");
} }
static void my_entry_bt_2 (Evas_Object *obj, void *event_info, ElmEntry *en) static void my_entry_bt_2 (Evas_Object *obj, void *event_info, Entry *en)
{ {
const string s = en->getText (); const string s = en->getText ();
cout << "ENTRY: " << s << endl; cout << "ENTRY: " << s << endl;
} }
static void my_entry_bt_3 (Evas_Object *obj, void *event_info, ElmEntry *en) static void my_entry_bt_3 (Evas_Object *obj, void *event_info, Entry *en)
{ {
const string s = en->getSelection (); const string s = en->getSelection ();
cout << "SELECTION: " << s << endl; cout << "SELECTION: " << s << endl;
} }
static void my_entry_bt_4 (Evas_Object *obj, void *event_info, ElmEntry *en) static void my_entry_bt_4 (Evas_Object *obj, void *event_info, Entry *en)
{ {
en->insertText ("Insert some <b>BOLD</> text"); en->insertText ("Insert some <b>BOLD</> text");
} }
void test_entry (void *data, Evas_Object *obj, void *event_info) void test_entry (void *data, Evas_Object *obj, void *event_info)
{ {
ElmButton *bt = NULL; Button *bt = NULL;
ElmWindow *win = ElmWindow::factory ("entry", ELM_WIN_BASIC); Window *win = Window::factory ("entry", ELM_WIN_BASIC);
win->setTitle ("Entry"); win->setTitle ("Entry");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->show (); bx->show ();
ElmEntry *en = ElmEntry::factory (*win); Entry *en = Entry::factory (*win);
en->setLineWrap (false); en->setLineWrap (false);
en->setText ("This is an entry widget in this window that<br>" en->setText ("This is an entry widget in this window that<br>"
"uses markup <b>like this</> for styling and<br>" "uses markup <b>like this</> for styling and<br>"
@ -55,12 +55,12 @@ void test_entry (void *data, Evas_Object *obj, void *event_info)
bx->packEnd (*en); bx->packEnd (*en);
en->show (); en->show ();
ElmBox *bx2 = ElmBox::factory (*win); Box *bx2 = Box::factory (*win);
bx2->setOrientation (ElmBox::Horizontal); bx2->setOrientation (Box::Horizontal);
bx2->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); bx2->setWeightHintSize (EVAS_HINT_EXPAND, 0.0);
bx2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bx2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Clear"); bt->setLabel ("Clear");
bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_1), en)); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_1), en));
bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -68,7 +68,7 @@ void test_entry (void *data, Evas_Object *obj, void *event_info)
bx2->packEnd (*bt); bx2->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Print"); bt->setLabel ("Print");
bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_2), en)); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_2), en));
bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -76,7 +76,7 @@ void test_entry (void *data, Evas_Object *obj, void *event_info)
bx2->packEnd (*bt); bx2->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Selection"); bt->setLabel ("Selection");
bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_3), en)); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_3), en));
bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -84,7 +84,7 @@ void test_entry (void *data, Evas_Object *obj, void *event_info)
bx2->packEnd (*bt); bx2->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Insert"); bt->setLabel ("Insert");
bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_4), en)); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_4), en));
bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -101,32 +101,32 @@ void test_entry (void *data, Evas_Object *obj, void *event_info)
void test_entry_scolled (void *data, Evas_Object *obj, void *event_info) void test_entry_scolled (void *data, Evas_Object *obj, void *event_info)
{ {
ElmButton *bt = NULL; Button *bt = NULL;
ElmEntry *en = NULL; Entry *en = NULL;
ElmScroller *sc = NULL; Scroller *sc = NULL;
ElmWindow *win = ElmWindow::factory ("entry-scrolled", ELM_WIN_BASIC); Window *win = Window::factory ("entry-scrolled", ELM_WIN_BASIC);
win->setTitle ("Entry Scrolled"); win->setTitle ("Entry Scrolled");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->show (); bx->show ();
sc = ElmScroller::factory (*win); sc = Scroller::factory (*win);
sc->limitMinContent (false, true); sc->limitMinContent (false, true);
sc->setPolicy (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); sc->setPolicy (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
sc->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); sc->setWeightHintSize (EVAS_HINT_EXPAND, 0.0);
sc->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); sc->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
bx->packEnd (*sc); bx->packEnd (*sc);
en = ElmEntry::factory (*win); en = Entry::factory (*win);
en->setSingleLine (true); en->setSingleLine (true);
en->setText ("This is a single line"); en->setText ("This is a single line");
en->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); en->setWeightHintSize (EVAS_HINT_EXPAND, 0.0);
@ -137,14 +137,14 @@ void test_entry_scolled (void *data, Evas_Object *obj, void *event_info)
sc->show (); sc->show ();
sc = ElmScroller::factory (*win); sc = Scroller::factory (*win);
sc->limitMinContent (false, true); sc->limitMinContent (false, true);
sc->setPolicy (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); sc->setPolicy (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
sc->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); sc->setWeightHintSize (EVAS_HINT_EXPAND, 0.0);
sc->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); sc->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
bx->packEnd (*sc); bx->packEnd (*sc);
en = ElmEntry::factory (*win); en = Entry::factory (*win);
en->setPassword (true); en->setPassword (true);
en->setText ("Password here"); en->setText ("Password here");
en->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); en->setWeightHintSize (EVAS_HINT_EXPAND, 0.0);
@ -155,13 +155,13 @@ void test_entry_scolled (void *data, Evas_Object *obj, void *event_info)
sc->show (); sc->show ();
sc = ElmScroller::factory (*win); sc = Scroller::factory (*win);
sc->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); sc->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
sc->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); sc->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
sc->setPolicy (ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON); sc->setPolicy (ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON);
bx->packEnd (*sc); bx->packEnd (*sc);
en = ElmEntry::factory (*win); en = Entry::factory (*win);
en->setText ("This is an entry widget in this window that<br>" en->setText ("This is an entry widget in this window that<br>"
"uses markup <b>like this</> for styling and<br>" "uses markup <b>like this</> for styling and<br>"
"formatting <em>like this</>, as well as<br>" "formatting <em>like this</>, as well as<br>"
@ -177,13 +177,13 @@ void test_entry_scolled (void *data, Evas_Object *obj, void *event_info)
sc->show (); sc->show ();
ElmBox *bx2 = ElmBox::factory (*win); Box *bx2 = Box::factory (*win);
bx2->setOrientation (ElmBox::Horizontal); bx2->setOrientation (Box::Horizontal);
bx2->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); bx2->setWeightHintSize (EVAS_HINT_EXPAND, 0.0);
bx2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bx2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Clear"); bt->setLabel ("Clear");
bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_1), en)); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_1), en));
bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -191,7 +191,7 @@ void test_entry_scolled (void *data, Evas_Object *obj, void *event_info)
bx2->packEnd (*bt); bx2->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Print"); bt->setLabel ("Print");
bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_2), en)); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_2), en));
bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -199,7 +199,7 @@ void test_entry_scolled (void *data, Evas_Object *obj, void *event_info)
bx2->packEnd (*bt); bx2->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Selection"); bt->setLabel ("Selection");
bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_3), en)); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_3), en));
bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -207,7 +207,7 @@ void test_entry_scolled (void *data, Evas_Object *obj, void *event_info)
bx2->packEnd (*bt); bx2->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Insert"); bt->setLabel ("Insert");
bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_4), en)); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_4), en));
bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);

68
eflxx_examples/src/elementaryxx/full/test_hover.cpp
View File

@ -1,32 +1,34 @@
#include "test.h" #include "test.h"
static void my_hover_bt (Evas_Object *obj, void *event_info, ElmHover *hv)
static void my_hover_bt (Evas_Object *obj, void *event_info, Hover *hv)
{ {
hv->show (); hv->show ();
} }
void test_hover (void *data, Evas_Object *obj, void *event_info) void test_hover (void *data, Evas_Object *obj, void *event_info)
{ {
ElmButton *bt = NULL; Button *bt = NULL;
ElmBox *bx = NULL; Box *bx = NULL;
ElmWindow *win = ElmWindow::factory ("hover", ELM_WIN_BASIC); Window *win = Window::factory ("hover", ELM_WIN_BASIC);
win->setTitle ("Hover"); win->setTitle ("Hover");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
bx = ElmBox::factory (*win); bx = Box::factory (*win);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->show (); bx->show ();
ElmHover *hv = ElmHover::factory (*win); Hover *hv = Hover::factory (*win);
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Button"); bt->setLabel ("Button");
bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_hover_bt), hv)); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_hover_bt), hv));
bx->packEnd (*bt); bx->packEnd (*bt);
@ -34,30 +36,30 @@ void test_hover (void *data, Evas_Object *obj, void *event_info)
hv->setParent (*win); hv->setParent (*win);
hv->setTarget (*bt); hv->setTarget (*bt);
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Popup"); bt->setLabel ("Popup");
hv->setContent ("middle", *bt); hv->setContent ("middle", *bt);
bt->show (); bt->show ();
bx = ElmBox::factory (*win); bx = Box::factory (*win);
ElmIcon *ic = ElmIcon::factory (*win); Icon *ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
bx->packEnd (*ic); bx->packEnd (*ic);
ic->show (); ic->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Top 1"); bt->setLabel ("Top 1");
bx->packEnd (*bt); bx->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Top 2"); bt->setLabel ("Top 2");
bx->packEnd (*bt); bx->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Top 3"); bt->setLabel ("Top 3");
bx->packEnd (*bt); bx->packEnd (*bt);
bt->show (); bt->show ();
@ -66,17 +68,17 @@ void test_hover (void *data, Evas_Object *obj, void *event_info)
hv->setContent ("top", *bx); hv->setContent ("top", *bx);
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Bottom"); bt->setLabel ("Bottom");
hv->setContent ("bottom", *bt); hv->setContent ("bottom", *bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Left"); bt->setLabel ("Left");
hv->setContent ("left", *bt); hv->setContent ("left", *bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Right"); bt->setLabel ("Right");
hv->setContent ("right", *bt); hv->setContent ("right", *bt);
bt->show (); bt->show ();
@ -89,27 +91,27 @@ void test_hover (void *data, Evas_Object *obj, void *event_info)
void test_hover2 (void *data, Evas_Object *obj, void *event_info) void test_hover2 (void *data, Evas_Object *obj, void *event_info)
{ {
ElmBox *bx = NULL; Box *bx = NULL;
ElmButton *bt = NULL; Button *bt = NULL;
ElmWindow *win = ElmWindow::factory ("hover2", ELM_WIN_BASIC); Window *win = Window::factory ("hover2", ELM_WIN_BASIC);
win->setTitle ("Hover 2"); win->setTitle ("Hover 2");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
bx = ElmBox::factory (*win); bx = Box::factory (*win);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->show (); bx->show ();
ElmHover *hv = ElmHover::factory (*win); Hover *hv = Hover::factory (*win);
hv->setStyle ("popout"); hv->setStyle ("popout");
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Button"); bt->setLabel ("Button");
bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_hover_bt), hv)); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_hover_bt), hv));
bx->packEnd (*bt); bx->packEnd (*bt);
@ -117,30 +119,30 @@ void test_hover2 (void *data, Evas_Object *obj, void *event_info)
hv->setParent (*win); hv->setParent (*win);
hv->setTarget (*bt); hv->setTarget (*bt);
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Popup"); bt->setLabel ("Popup");
hv->setContent ("middle", *bt); hv->setContent ("middle", *bt);
bt->show (); bt->show ();
bx = ElmBox::factory (*win); bx = Box::factory (*win);
ElmIcon *ic = ElmIcon::factory (*win); Icon *ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
bx->packEnd (*ic); bx->packEnd (*ic);
ic->show (); ic->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Top 1"); bt->setLabel ("Top 1");
bx->packEnd (*bt); bx->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Top 2"); bt->setLabel ("Top 2");
bx->packEnd (*bt); bx->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Top 3"); bt->setLabel ("Top 3");
bx->packEnd (*bt); bx->packEnd (*bt);
bt->show (); bt->show ();
@ -149,17 +151,17 @@ void test_hover2 (void *data, Evas_Object *obj, void *event_info)
hv->setContent ("top", *bx); hv->setContent ("top", *bx);
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Bot"); bt->setLabel ("Bot");
hv->setContent ("bottom", *bt); hv->setContent ("bottom", *bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Left"); bt->setLabel ("Left");
hv->setContent ("left", *bt); hv->setContent ("left", *bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Right"); bt->setLabel ("Right");
hv->setContent ("right", *bt); hv->setContent ("right", *bt);
bt->show (); bt->show ();

6
eflxx_examples/src/elementaryxx/full/test_icon.cpp
View File

@ -1,5 +1,7 @@
#include "test.h" #include "test.h"
static void icon_clicked (Evas_Object *obj, void *event_info) static void icon_clicked (Evas_Object *obj, void *event_info)
{ {
cout << "clicked!" << endl; cout << "clicked!" << endl;
@ -7,12 +9,12 @@ static void icon_clicked (Evas_Object *obj, void *event_info)
void test_icon (void *data, Evas_Object *obj, void *event_info) void test_icon (void *data, Evas_Object *obj, void *event_info)
{ {
ElmWindow *win = ElmWindow::factory ("icon-transparent", ELM_WIN_BASIC); Window *win = Window::factory ("icon-transparent", ELM_WIN_BASIC);
win->setTitle ("Icon Transparent"); win->setTitle ("Icon Transparent");
win->setAutoDel (true); win->setAutoDel (true);
win->setAlpha (true); win->setAlpha (true);
ElmIcon *ic = ElmIcon::factory (*win); Icon *ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo.png"));
ic->setScale (false, false); ic->setScale (false, false);
win->addObjectResize (*ic); win->addObjectResize (*ic);

14
eflxx_examples/src/elementaryxx/full/test_layout.cpp
View File

@ -1,33 +1,35 @@
#include "test.h" #include "test.h"
void test_layout (void *data, Evas_Object *obj, void *event_info) void test_layout (void *data, Evas_Object *obj, void *event_info)
{ {
ElmWindow *win = ElmWindow::factory ("layout", ELM_WIN_BASIC); Window *win = Window::factory ("layout", ELM_WIN_BASIC);
win->setTitle ("Layout"); win->setTitle ("Layout");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmLayout *ly = ElmLayout::factory (*win); Layout *ly = Layout::factory (*win);
ly->setFile (searchEdjeFile ("elementaryxx-test.edj"), "layout"); ly->setFile (searchEdjeFile ("elementaryxx-test.edj"), "layout");
ly->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); ly->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*ly); win->addObjectResize (*ly);
ly->show (); ly->show ();
ElmButton *bt = ElmButton::factory (*win); Button *bt = Button::factory (*win);
bt->setLabel ("Button 1"); bt->setLabel ("Button 1");
ly->setContent ("element1", *bt); ly->setContent ("element1", *bt);
bt->show (); bt->show ();
ElmButton *bt2 = ElmButton::factory (*win); Button *bt2 = Button::factory (*win);
bt2->setLabel ("Button 2"); bt2->setLabel ("Button 2");
ly->setContent ("element2", *bt2); ly->setContent ("element2", *bt2);
bt2->show (); bt2->show ();
ElmButton *bt3 = ElmButton::factory (*win); Button *bt3 = Button::factory (*win);
bt3->setLabel ("Button 3"); bt3->setLabel ("Button 3");
ly->setContent ("element3", *bt3); ly->setContent ("element3", *bt3);
bt3->show (); bt3->show ();

36
eflxx_examples/src/elementaryxx/full/test_notepad.cpp
View File

@ -1,54 +1,56 @@
#include "test.h" #include "test.h"
static void my_notepad_bt_1 (Evas_Object *obj, void *event_info, ElmNotepad *np)
static void my_notepad_bt_1 (Evas_Object *obj, void *event_info, Notepad *np)
{ {
// TODO // TODO
} }
static void my_notepad_bt_2 (Evas_Object *obj, void *event_info, ElmNotepad *np) static void my_notepad_bt_2 (Evas_Object *obj, void *event_info, Notepad *np)
{ {
// TODO // TODO
} }
static void my_notepad_bt_3 (Evas_Object *obj, void *event_info, ElmNotepad *np) static void my_notepad_bt_3 (Evas_Object *obj, void *event_info, Notepad *np)
{ {
// TODO // TODO
} }
void test_notepad (void *data, Evas_Object *obj, void *event_info) void test_notepad (void *data, Evas_Object *obj, void *event_info)
{ {
ElmButton *bt = NULL; Button *bt = NULL;
ElmIcon *ic = NULL; Icon *ic = NULL;
ElmWindow *win = ElmWindow::factory ("notepad", ELM_WIN_BASIC); Window *win = Window::factory ("notepad", ELM_WIN_BASIC);
win->setTitle ("Notepad"); win->setTitle ("Notepad");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->show (); bx->show ();
ElmNotepad *np = ElmNotepad::factory (*win); Notepad *np = Notepad::factory (*win);
np->setFile ("note.txt", ELM_TEXT_FORMAT_PLAIN_UTF8); np->setFile ("note.txt", ELM_TEXT_FORMAT_PLAIN_UTF8);
np->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); np->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
np->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); np->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
bx->packEnd (*np); bx->packEnd (*np);
np->show (); np->show ();
ElmBox *bx2 = ElmBox::factory (*win); Box *bx2 = Box::factory (*win);
bx2->setOrientation (ElmBox::Horizontal); bx2->setOrientation (Box::Horizontal);
bx2->setHomogenous (true); bx2->setHomogenous (true);
bx2->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); bx2->setWeightHintSize (EVAS_HINT_EXPAND, 0.0);
bx2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bx2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
bt = ElmButton::factory (*win); bt = Button::factory (*win);
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setStandard ("arrow_left"); ic->setStandard ("arrow_left");
ic->setScale (true, false); ic->setScale (true, false);
bt->setIcon (*ic); bt->setIcon (*ic);
@ -59,8 +61,8 @@ void test_notepad (void *data, Evas_Object *obj, void *event_info)
bx2->packEnd (*bt); bx2->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setStandard ("close"); ic->setStandard ("close");
ic->setScale (true, false); ic->setScale (true, false);
bt->setIcon (*ic); bt->setIcon (*ic);
@ -71,8 +73,8 @@ void test_notepad (void *data, Evas_Object *obj, void *event_info)
bx2->packEnd (*bt); bx2->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setStandard ("arrow_right"); ic->setStandard ("arrow_right");
ic->setScale (true, false); ic->setScale (true, false);
bt->setIcon (*ic); bt->setIcon (*ic);

6
eflxx_examples/src/elementaryxx/full/test_panel.cpp
View File

@ -2,16 +2,16 @@
void test_panel (void *data, Evas_Object *obj, void *event_info) void test_panel (void *data, Evas_Object *obj, void *event_info)
{ {
ElmWindow *win = ElmWindow::factory ("panel", ELM_WIN_BASIC); Window *win = Window::factory ("panel", ELM_WIN_BASIC);
win->setTitle ("Panel"); win->setTitle ("Panel");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmPanel *panel = ElmPanel::factory (*win); Panel *panel = Panel::factory (*win);
panel->setOrientation (ELM_PANEL_ORIENT_LEFT); panel->setOrientation (ELM_PANEL_ORIENT_LEFT);
panel->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); panel->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
panel->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); panel->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);

76
eflxx_examples/src/elementaryxx/full/test_progressbar.cpp
View File

@ -2,22 +2,22 @@
#include <ecorexx/Ecorexx.h> #include <ecorexx/Ecorexx.h>
typedef struct Progressbar typedef struct _MyProgressbar
{ {
ElmProgressbar *pb1; Progressbar *pb1;
ElmProgressbar *pb2; Progressbar *pb2;
ElmProgressbar *pb3; Progressbar *pb3;
ElmProgressbar *pb4; Progressbar *pb4;
ElmProgressbar *pb5; Progressbar *pb5;
ElmProgressbar *pb6; Progressbar *pb6;
ElmProgressbar *pb7; Progressbar *pb7;
bool run; bool run;
EcoreTimer *timer; Ecorexx::Timer *timer;
} Progressbar; } MyProgressbar;
static Progressbar _test_progressbar; static MyProgressbar _test_progressbar;
static void _my_progressbar_value_set (EcoreTimer *timer) static void _my_progressbar_value_set (Ecorexx::Timer *timer)
{ {
double progress; double progress;
@ -52,7 +52,7 @@ static void my_progressbar_test_start (Evas_Object *obj, void *event_info)
if (!_test_progressbar.run) if (!_test_progressbar.run)
{ {
_test_progressbar.timer = new EcoreTimer (0.1); _test_progressbar.timer = new Ecorexx::Timer (0.1);
_test_progressbar.timer->timeout.connect (sigc::ptr_fun (&_my_progressbar_value_set)); _test_progressbar.timer->timeout.connect (sigc::ptr_fun (&_my_progressbar_value_set));
_test_progressbar.run = true; _test_progressbar.run = true;
} }
@ -79,36 +79,36 @@ static void my_progressbar_destroy (Evas_Object *obj, void *event_info)
void test_progressbar(void *data, Evas_Object *obj, void *event_info) void test_progressbar(void *data, Evas_Object *obj, void *event_info)
{ {
ElmProgressbar *pb = NULL; Progressbar *pb = NULL;
ElmIcon *ic1 = NULL; Icon *ic1 = NULL;
ElmIcon *ic2 = NULL; Icon *ic2 = NULL;
ElmButton *bt = NULL; Button *bt = NULL;
// start in stop mode // start in stop mode
_test_progressbar.run = false; _test_progressbar.run = false;
ElmWindow *win = ElmWindow::factory ("progressbar", ELM_WIN_BASIC); Window *win = Window::factory ("progressbar", ELM_WIN_BASIC);
win->setTitle ("Progressbar"); win->setTitle ("Progressbar");
win->getEventSignal ("delete,request")->connect (sigc::ptr_fun (&my_progressbar_destroy)); win->getEventSignal ("delete,request")->connect (sigc::ptr_fun (&my_progressbar_destroy));
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show (); bx->show ();
pb = ElmProgressbar::factory (*win); pb = Progressbar::factory (*win);
pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
pb->setAlignHintSize (EVAS_HINT_FILL, 0.5); pb->setAlignHintSize (EVAS_HINT_FILL, 0.5);
bx->packEnd (*pb); bx->packEnd (*pb);
pb->show (); pb->show ();
_test_progressbar.pb1 = pb; _test_progressbar.pb1 = pb;
pb = ElmProgressbar::factory (*win); pb = Progressbar::factory (*win);
pb->setAlignHintSize (EVAS_HINT_FILL, 0.5); pb->setAlignHintSize (EVAS_HINT_FILL, 0.5);
pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
pb->setLabel ("Infinite bounce"); pb->setLabel ("Infinite bounce");
@ -117,11 +117,11 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info)
pb->show (); pb->show ();
_test_progressbar.pb2 = pb; _test_progressbar.pb2 = pb;
ic1 = ElmIcon::factory (*win); ic1 = Icon::factory (*win);
ic1->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic1->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic1->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); ic1->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1));
pb = ElmProgressbar::factory (*win); pb = Progressbar::factory (*win);
pb->setLabel ("Label"); pb->setLabel ("Label");
pb->setIcon (*ic1); pb->setIcon (*ic1);
pb->setInverted (true); pb->setInverted (true);
@ -134,15 +134,15 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info)
pb->show (); pb->show ();
_test_progressbar.pb3 = pb; _test_progressbar.pb3 = pb;
ElmBox *hbx = ElmBox::factory (*win); Box *hbx = Box::factory (*win);
hbx->setOrientation (ElmBox::Horizontal); hbx->setOrientation (Box::Horizontal);
hbx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); hbx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
hbx->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); hbx->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
bx->packEnd (*hbx); bx->packEnd (*hbx);
hbx->show (); hbx->show ();
pb = ElmProgressbar::factory (*win); pb = Progressbar::factory (*win);
pb->setOrientation (ElmProgressbar::Vertical); pb->setOrientation (Progressbar::Vertical);
pb->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); pb->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
hbx->packEnd (*pb); hbx->packEnd (*pb);
@ -151,8 +151,8 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info)
pb->show (); pb->show ();
_test_progressbar.pb4 = pb; _test_progressbar.pb4 = pb;
pb = ElmProgressbar::factory (*win); pb = Progressbar::factory (*win);
pb->setOrientation (ElmProgressbar::Vertical); pb->setOrientation (Progressbar::Vertical);
pb->setAlignHintSize (EVAS_HINT_FILL, 0.5); pb->setAlignHintSize (EVAS_HINT_FILL, 0.5);
pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
pb->setSpanSize (80); pb->setSpanSize (80);
@ -162,12 +162,12 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info)
pb->show (); pb->show ();
_test_progressbar.pb5 = pb; _test_progressbar.pb5 = pb;
ic2 = ElmIcon::factory (*win); ic2 = Icon::factory (*win);
ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic2->setAspectHintSize (EVAS_ASPECT_CONTROL_HORIZONTAL, Size (1, 1)); ic2->setAspectHintSize (EVAS_ASPECT_CONTROL_HORIZONTAL, Size (1, 1));
pb = ElmProgressbar::factory (*win); pb = Progressbar::factory (*win);
pb->setOrientation (ElmProgressbar::Vertical); pb->setOrientation (Progressbar::Vertical);
pb->setLabel ("Label"); pb->setLabel ("Label");
pb->setIcon (*ic2); pb->setIcon (*ic2);
pb->setInverted (true); pb->setInverted (true);
@ -179,7 +179,7 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info)
pb->show (); pb->show ();
_test_progressbar.pb6 = pb; _test_progressbar.pb6 = pb;
pb = ElmProgressbar::factory (*win); pb = Progressbar::factory (*win);
pb->setStyle ("wheel"); pb->setStyle ("wheel");
pb->setLabel ("Style: wheel"); pb->setLabel ("Style: wheel");
pb->setAlignHintSize (EVAS_HINT_FILL, 0.5); pb->setAlignHintSize (EVAS_HINT_FILL, 0.5);
@ -188,19 +188,19 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info)
pb->show (); pb->show ();
_test_progressbar.pb7 = pb; _test_progressbar.pb7 = pb;
ElmBox *bt_bx = ElmBox::factory (*win); Box *bt_bx = Box::factory (*win);
bt_bx->setOrientation (ElmBox::Horizontal); bt_bx->setOrientation (Box::Horizontal);
bt_bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt_bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->packEnd (*bt_bx); bx->packEnd (*bt_bx);
bt_bx->show (); bt_bx->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Start"); bt->setLabel ("Start");
bt->getEventSignal ("clicked")->connect (sigc::ptr_fun (&my_progressbar_test_start)); bt->getEventSignal ("clicked")->connect (sigc::ptr_fun (&my_progressbar_test_start));
bt_bx->packEnd (*bt); bt_bx->packEnd (*bt);
bt->show (); bt->show ();
bt = ElmButton::factory (*win); bt = Button::factory (*win);
bt->setLabel ("Stop"); bt->setLabel ("Stop");
bt->getEventSignal ("clicked")->connect (sigc::ptr_fun (&my_progressbar_test_stop)); bt->getEventSignal ("clicked")->connect (sigc::ptr_fun (&my_progressbar_test_stop));
bt_bx->packEnd (*bt); bt_bx->packEnd (*bt);

32
eflxx_examples/src/elementaryxx/full/test_radio.cpp
View File

@ -2,28 +2,28 @@
void test_radio (void *data, Evas_Object *obj, void *event_info) void test_radio (void *data, Evas_Object *obj, void *event_info)
{ {
ElmRadio *rd = NULL; Radio *rd = NULL;
ElmRadio *rdg = NULL; Radio *rdg = NULL;
ElmIcon *ic = NULL; Icon *ic = NULL;
ElmWindow *win = ElmWindow::factory ("radio", ELM_WIN_BASIC); Window *win = Window::factory ("radio", ELM_WIN_BASIC);
win->setTitle ("Radios"); win->setTitle ("Radios");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show (); bx->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1));
rd = ElmRadio::factory (*win); rd = Radio::factory (*win);
rd->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); rd->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
rd->setAlignHintSize (EVAS_HINT_FILL, 0.5); rd->setAlignHintSize (EVAS_HINT_FILL, 0.5);
rd->setLabel ("Icon sized to radio"); rd->setLabel ("Icon sized to radio");
@ -33,10 +33,10 @@ void test_radio (void *data, Evas_Object *obj, void *event_info)
ic->show (); ic->show ();
rdg = rd; rdg = rd;
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
rd = ElmRadio::factory (*win); rd = Radio::factory (*win);
rd->setStateValue (1); rd->setStateValue (1);
rd->addGroup (*rdg); rd->addGroup (*rdg);
rd->setLabel ("Icon no scale"); rd->setLabel ("Icon no scale");
@ -45,14 +45,14 @@ void test_radio (void *data, Evas_Object *obj, void *event_info)
rd->show (); rd->show ();
ic->show (); ic->show ();
rd = ElmRadio::factory (*win); rd = Radio::factory (*win);
rd->setStateValue (2); rd->setStateValue (2);
rd->addGroup (*rdg); rd->addGroup (*rdg);
rd->setLabel ("Label Only"); rd->setLabel ("Label Only");
bx->packEnd (*rd); bx->packEnd (*rd);
rd->show (); rd->show ();
rd = ElmRadio::factory (*win); rd = Radio::factory (*win);
rd->setStateValue (3); rd->setStateValue (3);
rd->addGroup (*rdg); rd->addGroup (*rdg);
rd->setLabel ("Disabled"); rd->setLabel ("Disabled");
@ -60,10 +60,10 @@ void test_radio (void *data, Evas_Object *obj, void *event_info)
bx->packEnd (*rd); bx->packEnd (*rd);
rd->show (); rd->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
rd = ElmRadio::factory (*win); rd = Radio::factory (*win);
rd->setStateValue (4); rd->setStateValue (4);
rd->addGroup (*rdg); rd->addGroup (*rdg);
rd->setIcon (*ic); rd->setIcon (*ic);
@ -71,10 +71,10 @@ void test_radio (void *data, Evas_Object *obj, void *event_info)
rd->show (); rd->show ();
ic->show (); ic->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setScale (false, false); ic->setScale (false, false);
rd = ElmRadio::factory (*win); rd = Radio::factory (*win);
rd->setStateValue (5); rd->setStateValue (5);
rd->addGroup (*rdg); rd->addGroup (*rdg);
rd->setIcon (*ic); rd->setIcon (*ic);

24
eflxx_examples/src/elementaryxx/full/test_slider.cpp
View File

@ -2,29 +2,29 @@
void test_slider (void *data, Evas_Object *obj, void *event_info) void test_slider (void *data, Evas_Object *obj, void *event_info)
{ {
ElmIcon *ic = NULL; Icon *ic = NULL;
ElmSlider *sl = NULL; Slider *sl = NULL;
ElmWindow *win = ElmWindow::factory ("slider", ELM_WIN_BASIC); Window *win = Window::factory ("slider", ELM_WIN_BASIC);
win->setTitle ("Slider"); win->setTitle ("Slider");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show (); bx->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1));
ic->show (); ic->show ();
sl = ElmSlider::factory (*win); sl = Slider::factory (*win);
sl->setLabel ("Label"); sl->setLabel ("Label");
sl->setIcon (*ic); sl->setIcon (*ic);
sl->setUnitFormat ("%1.1f units"); sl->setUnitFormat ("%1.1f units");
@ -34,7 +34,7 @@ void test_slider (void *data, Evas_Object *obj, void *event_info)
bx->packEnd (*sl); bx->packEnd (*sl);
sl->show (); sl->show ();
sl = ElmSlider::factory (*win); sl = Slider::factory (*win);
sl->setLabel ("Label 2"); sl->setLabel ("Label 2");
sl->setSpanSize (80); sl->setSpanSize (80);
sl->setIndicatorFormat ("%3.0f"); sl->setIndicatorFormat ("%3.0f");
@ -46,7 +46,7 @@ void test_slider (void *data, Evas_Object *obj, void *event_info)
bx->packEnd (*sl); bx->packEnd (*sl);
sl->show (); sl->show ();
sl = ElmSlider::factory (*win); sl = Slider::factory (*win);
sl->setLabel ("Label 3"); sl->setLabel ("Label 3");
sl->setUnitFormat ("units"); sl->setUnitFormat ("units");
sl->setSpanSize (40); sl->setSpanSize (40);
@ -60,12 +60,12 @@ void test_slider (void *data, Evas_Object *obj, void *event_info)
bx->packEnd (*sl); bx->packEnd (*sl);
sl->show (); sl->show ();
ic = ElmIcon::factory (*win); ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setAspectHintSize (EVAS_ASPECT_CONTROL_HORIZONTAL, Size (1, 1)); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_HORIZONTAL, Size (1, 1));
ic->show (); ic->show ();
sl = ElmSlider::factory (*win); sl = Slider::factory (*win);
sl->setLabel ("Label 4"); sl->setLabel ("Label 4");
sl->setIcon (*ic); sl->setIcon (*ic);
sl->setUnitFormat ("units"); sl->setUnitFormat ("units");
@ -75,7 +75,7 @@ void test_slider (void *data, Evas_Object *obj, void *event_info)
sl->setIndicatorFormat ("%1.1f"); sl->setIndicatorFormat ("%1.1f");
sl->setValue (0.2); sl->setValue (0.2);
sl->setScale (1.0); sl->setScale (1.0);
sl->setOrientation (ElmSlider::Vertical); sl->setOrientation (Slider::Vertical);
bx->packEnd (*sl); bx->packEnd (*sl);
sl->show (); sl->show ();

14
eflxx_examples/src/elementaryxx/full/test_spinner.cpp
View File

@ -2,23 +2,23 @@
void test_spinner(void *data, Evas_Object *obj, void *event_info) void test_spinner(void *data, Evas_Object *obj, void *event_info)
{ {
ElmSpinner *sp = NULL; Spinner *sp = NULL;
ElmWindow *win = ElmWindow::factory ("spinner", ELM_WIN_BASIC); Window *win = Window::factory ("spinner", ELM_WIN_BASIC);
win->setTitle ("Spinner"); win->setTitle ("Spinner");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->show (); bx->show ();
sp = ElmSpinner::factory (*win); sp = Spinner::factory (*win);
sp->setLabelFormat ("%1.1f units"); sp->setLabelFormat ("%1.1f units");
sp->setStep (1.3); sp->setStep (1.3);
sp->setWrap (true); sp->setWrap (true);
@ -28,7 +28,7 @@ void test_spinner(void *data, Evas_Object *obj, void *event_info)
bx->packEnd (*sp); bx->packEnd (*sp);
sp->show (); sp->show ();
sp = ElmSpinner::factory (*win); sp = Spinner::factory (*win);
sp->setLabelFormat ("%1.1f units"); sp->setLabelFormat ("%1.1f units");
sp->setStep (1.3); sp->setStep (1.3);
sp->setWrap (true); sp->setWrap (true);
@ -39,7 +39,7 @@ void test_spinner(void *data, Evas_Object *obj, void *event_info)
bx->packEnd (*sp); bx->packEnd (*sp);
sp->show (); sp->show ();
sp = ElmSpinner::factory (*win); sp = Spinner::factory (*win);
sp->setLabelFormat ("Disabled %.0f"); sp->setLabelFormat ("Disabled %.0f");
sp->setDisabled (true); sp->setDisabled (true);
sp->setMinMax (-50.0, 250.0); sp->setMinMax (-50.0, 250.0);

20
eflxx_examples/src/elementaryxx/full/test_table.cpp
View File

@ -1,57 +1,59 @@
#include "test.h" #include "test.h"
void test_table (void *data, Evas_Object *obj, void *event_info) void test_table (void *data, Evas_Object *obj, void *event_info)
{ {
ElmWindow *win = ElmWindow::factory ("table", ELM_WIN_BASIC); Window *win = Window::factory ("table", ELM_WIN_BASIC);
win->setTitle ("Table"); win->setTitle ("Table");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmTable *tb = ElmTable::factory (*win); Table *tb = Table::factory (*win);
win->addObjectResize (*tb); win->addObjectResize (*tb);
tb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); tb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
tb->show (); tb->show ();
ElmButton *bt = ElmButton::factory (*win); Button *bt = Button::factory (*win);
bt->setLabel ("Button 1"); bt->setLabel ("Button 1");
bt->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
tb->pack (*bt, Rect (0, 0, 1, 1)); tb->pack (*bt, Rect (0, 0, 1, 1));
bt->show (); bt->show ();
ElmButton *bt2 = ElmButton::factory (*win); Button *bt2 = Button::factory (*win);
bt2->setLabel ("Button 2"); bt2->setLabel ("Button 2");
bt2->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt2->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bt2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
tb->pack (*bt2, Rect (1, 0, 1, 1)); tb->pack (*bt2, Rect (1, 0, 1, 1));
bt2->show (); bt2->show ();
ElmButton *bt3 = ElmButton::factory (*win); Button *bt3 = Button::factory (*win);
bt3->setLabel ("Button 3"); bt3->setLabel ("Button 3");
bt3->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt3->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bt3->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt3->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
tb->pack (*bt3, Rect (2, 0, 1, 1)); tb->pack (*bt3, Rect (2, 0, 1, 1));
bt3->show (); bt3->show ();
ElmButton *bt4 = ElmButton::factory (*win); Button *bt4 = Button::factory (*win);
bt4->setLabel ("Button 4"); bt4->setLabel ("Button 4");
bt4->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt4->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bt4->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt4->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
tb->pack (*bt4, Rect (0, 1, 2, 1)); tb->pack (*bt4, Rect (0, 1, 2, 1));
bt4->show (); bt4->show ();
ElmButton *bt5 = ElmButton::factory (*win); Button *bt5 = Button::factory (*win);
bt5->setLabel ("Button 5"); bt5->setLabel ("Button 5");
bt5->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt5->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bt5->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt5->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);
tb->pack (*bt5, Rect (2, 1, 1, 3)); tb->pack (*bt5, Rect (2, 1, 1, 3));
bt5->show (); bt5->show ();
ElmButton *bt6 = ElmButton::factory (*win); Button *bt6 = Button::factory (*win);
bt6->setLabel ("Button 6"); bt6->setLabel ("Button 6");
bt6->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt6->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bt6->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bt6->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL);

22
eflxx_examples/src/elementaryxx/full/test_toggle.cpp
View File

@ -1,25 +1,27 @@
#include "test.h" #include "test.h"
void test_toggle (void *data, Evas_Object *obj, void *event_info) void test_toggle (void *data, Evas_Object *obj, void *event_info)
{ {
ElmWindow *win = ElmWindow::factory ("toggles", ELM_WIN_BASIC); Window *win = Window::factory ("toggles", ELM_WIN_BASIC);
win->setTitle ("Toggles"); win->setTitle ("Toggles");
win->setAutoDel (true); win->setAutoDel (true);
ElmBackground *bg = ElmBackground::factory (*win); Background *bg = Background::factory (*win);
win->addObjectResize (*bg); win->addObjectResize (*bg);
bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show (); bg->show ();
ElmBox *bx = ElmBox::factory (*win); Box *bx = Box::factory (*win);
win->addObjectResize (*bx); win->addObjectResize (*bx);
bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show (); bx->show ();
ElmIcon *ic = ElmIcon::factory (*win); Icon *ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1));
ElmToggle *tg = ElmToggle::factory (*win); Toggle *tg = Toggle::factory (*win);
tg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); tg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
tg->setAlignHintSize (EVAS_HINT_FILL, 0.5); tg->setAlignHintSize (EVAS_HINT_FILL, 0.5);
tg->setLabel ("Icon sized to toggle"); tg->setLabel ("Icon sized to toggle");
@ -30,26 +32,26 @@ void test_toggle (void *data, Evas_Object *obj, void *event_info)
tg->show (); tg->show ();
ic->show (); ic->show ();
ElmIcon *ic2 = ElmIcon::factory (*win); Icon *ic2 = Icon::factory (*win);
ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic2->setScale (false, false); ic2->setScale (false, false);
ElmToggle *tg2 = ElmToggle::factory (*win); Toggle *tg2 = Toggle::factory (*win);
tg2->setLabel ("Icon no scale"); tg2->setLabel ("Icon no scale");
tg2->setIcon (*ic2); tg2->setIcon (*ic2);
bx->packEnd (*tg2); bx->packEnd (*tg2);
tg2->show (); tg2->show ();
ic2->show (); ic2->show ();
ElmToggle *tg3 = ElmToggle::factory (*win); Toggle *tg3 = Toggle::factory (*win);
tg3->setLabel ("Label Only"); tg3->setLabel ("Label Only");
tg3->setLabelsStates ("Big long fun times label", "Small long happy fun label"); tg3->setLabelsStates ("Big long fun times label", "Small long happy fun label");
bx->packEnd (*tg3); bx->packEnd (*tg3);
tg3->show (); tg3->show ();
ElmIcon *ic3 = ElmIcon::factory (*win); Icon *ic3 = Icon::factory (*win);
ic3->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic3->setFile (searchPixmapFile ("elementaryxx/logo_small.png"));
ic3->setScale (false, false); ic3->setScale (false, false);
ElmToggle *tg4 = ElmToggle::factory (*win); Toggle *tg4 = Toggle::factory (*win);
tg4->setIcon (*ic3); tg4->setIcon (*ic3);
bx->packEnd (*tg4); bx->packEnd (*tg4);
tg4->show (); tg4->show ();

27
eflxx_examples/src/elementaryxx/simple/main.cpp
View File

@ -7,14 +7,15 @@
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
using namespace std; using namespace std;
using namespace efl; using namespace Eflxx;
using namespace Elmxx;
static void static void
my_win_del(Evas_Object *obj, void *event_info) my_win_del(Evas_Object *obj, void *event_info)
{ {
// TODO // TODO
/* called when my_win_main is requested to be deleted */ /* called when my_win_main is requested to be deleted */
ElmApplication::exit(); /* exit the program's main loop that runs in elm_run() */ Application::exit(); /* exit the program's main loop that runs in elm_run() */
} }
static void testFunc (Evas_Object *obj, void *event_info) static void testFunc (Evas_Object *obj, void *event_info)
@ -24,29 +25,29 @@ static void testFunc (Evas_Object *obj, void *event_info)
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
ElmApplication elmApp (argc, argv); Application elmApp (argc, argv);
ElmWindow *elmWin = ElmWindow::factory ("window1", ELM_WIN_BASIC); Window *elmWin = Window::factory ("window1", ELM_WIN_BASIC);
elmWin->getEventSignal ("delete-request")->connect (sigc::ptr_fun (&my_win_del)); elmWin->getEventSignal ("delete-request")->connect (sigc::ptr_fun (&my_win_del));
ElmBackground *bg = ElmBackground::factory (*elmWin); Background *bg = Background::factory (*elmWin);
Evas *e = evas_object_evas_get(bg->obj ()); Evas *e = evas_object_evas_get(bg->obj ());
EvasCanvas ec (e); Evasxx::Canvas ec (e);
EvasImage ei (ec); Evasxx::Image ei (ec);
ei.setFile (searchPixmapFile ("elementaryxx/plant_01.jpg")); ei.setFile (searchPixmapFile ("elementaryxx/plant_01.jpg"));
ei.setGeometry (Rect (100,100, 100, 100)); ei.setGeometry (Rect (100,100, 100, 100));
ei.show (); ei.show ();
ElmButton *elmButton = ElmButton::factory (*elmWin); Button *elmButton = Button::factory (*elmWin);
ElmClock *elmClock = ElmClock::factory (*elmWin); Clock *elmClock = Clock::factory (*elmWin);
elmWin->addMember (ei); elmWin->addMember (ei);
ElmToggle *elmToggle = ElmToggle::factory (*elmWin); Toggle *elmToggle = Toggle::factory (*elmWin);
ElmScroller *elmScroller = ElmScroller::factory (*elmWin); Scroller *elmScroller = Scroller::factory (*elmWin);
ElmEntry *elmEntry = ElmEntry::factory (*elmWin); Entry *elmEntry = Entry::factory (*elmWin);
ElmSlider *elmSlider = ElmSlider::factory (*elmWin); Slider *elmSlider = Slider::factory (*elmWin);
bg->setWeightHintSize (1.0, 1.0); bg->setWeightHintSize (1.0, 1.0);
elmWin->addObjectResize (*bg); elmWin->addObjectResize (*bg);

16
eflxx_examples/src/emotionxx/simple/main.cpp
View File

@ -1,10 +1,10 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include <edjexx/Edjexx.h> #include <edjexx/Edjexx.h>
#include <emotionxx/EvasEmotion.h> #include <emotionxx/Emotionxx.h>
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
using namespace efl; using namespace Eflxx;
#define WIDTH 320 #define WIDTH 320
#define HEIGHT 240 #define HEIGHT 240
@ -17,19 +17,19 @@ using namespace std;
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
/* Create the application object */ /* Create the application object */
EcoreApplication* app = new EcoreApplication( argc, argv, "Simple Emotion Test" ); Ecorexx::Application* app = new Ecorexx::Application( argc, argv, "Simple Emotion Test" );
if ( argc < 2 ) if ( argc < 2 )
{ {
cerr << "Usage: " << argv[0] << "<video file>" << endl; cerr << "Usage: " << argv[0] << "<video file>" << endl;
return 1; return 1;
} }
/* Create the main window, a window with an embedded canvas */ /* Create the main window, a window with an embedded canvas */
EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) );
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
evas.appendFontPath( searchDataDir () + "/fonts" ); evas.appendFontPath( searchDataDir () + "/fonts" );
/* Create EvasEmotion object using xine engine */ /* Create Emotionxx::Object object using xine engine */
EvasEmotion* emotion = new EvasEmotion( evas, Rect (0, 0, 320, 240), argv[1], "xine" ); Emotionxx::Object* emotion = new Emotionxx::Object( evas, Rect (0, 0, 320, 240), argv[1], "xine" );
emotion->setSmoothScale( 1 ); emotion->setSmoothScale( 1 );
emotion->setPlay( true ); emotion->setPlay( true );

24
eflxx_examples/src/esmartxx/container/main.cpp
View File

@ -1,6 +1,6 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include <container/EvasSmartContainer.h> #include <container/Container.h>
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
#include <memory> #include <memory>
@ -8,47 +8,47 @@
#define WIDTH 240 #define WIDTH 240
#define HEIGHT 320 #define HEIGHT 320
using namespace efl; using namespace Eflxx;
using namespace std; using namespace std;
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
/* Create the application object */ /* Create the application object */
auto_ptr <EcoreApplication> app (new EcoreApplication( argc, argv, "Esmart Container Test" )); auto_ptr <Ecorexx::Application> app (new Ecorexx::Application( argc, argv, "Esmart Container Test" ));
Size size (WIDTH, HEIGHT); Size size (WIDTH, HEIGHT);
/* Create the main window, a window with an embedded canvas */ /* Create the main window, a window with an embedded canvas */
auto_ptr <EcoreEvasWindowSoftwareX11> mw (new EcoreEvasWindowSoftwareX11( size )); auto_ptr <Ecorexx::EvasWindowSoftwareX11> mw (new Ecorexx::EvasWindowSoftwareX11( size ));
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
evas.appendFontPath( searchDataDir () + "/fonts" ); evas.appendFontPath( searchDataDir () + "/fonts" );
/* Add some objects to the canvas */ /* Add some objects to the canvas */
auto_ptr <EvasRectangle> rect (new EvasRectangle( evas, size )); auto_ptr <Evasxx::Rectangle> rect (new Evasxx::Rectangle( evas, size ));
rect->setColor( Color (200, 150, 100, 255) ); rect->setColor( Color (200, 150, 100, 255) );
rect->setLayer( 0 ); rect->setLayer( 0 );
rect->show(); rect->show();
auto_ptr <EvasRectangle> buttonbackground (new EvasRectangle( evas )); auto_ptr <Evasxx::Rectangle> buttonbackground (new Evasxx::Rectangle( evas ));
buttonbackground->setColor( Color (0, 0, 255, 255) ); buttonbackground->setColor( Color (0, 0, 255, 255) );
buttonbackground->setLayer( 10 ); buttonbackground->setLayer( 10 );
buttonbackground->setGeometry( Rect (10, 10, 20, 20) ); buttonbackground->setGeometry( Rect (10, 10, 20, 20) );
buttonbackground->show (); buttonbackground->show ();
auto_ptr <EvasText> buttontext (new EvasText( evas, "Vera", 14, "Click on this button" )); auto_ptr <Evasxx::Text> buttontext (new Evasxx::Text( evas, "Vera", 14, "Click on this button" ));
buttontext->setColor( Color (0, 255, 0, 255) ); buttontext->setColor( Color (0, 255, 0, 255) );
buttontext->setLayer( 11 ); buttontext->setLayer( 11 );
buttontext->show (); buttontext->show ();
auto_ptr <EvasSmartContainer> vbox (new EvasSmartContainer( evas, Point (50, 50), EvasSmartContainer::Vertical )); auto_ptr <Esmartxx::Container> vbox (new Esmartxx::Container( evas, Point (50, 50), Esmartxx::Container::Vertical ));
vbox->resize( Size (150, 100) ); vbox->resize( Size (150, 100) );
vbox->setLayer( 20 ); vbox->setLayer( 20 );
vbox->setAlignment( EvasSmartContainer::Right ); vbox->setAlignment( Esmartxx::Container::Right );
//vbox->setPadding( 10, 10, 10, 10 ); //vbox->setPadding( 10, 10, 10, 10 );
//vbox->setSpacing( 0 ); //vbox->setSpacing( 0 );
vbox->setFillPolicy( (EvasSmartContainer::FillPolicy) (EvasSmartContainer::None ) ); vbox->setFillPolicy( (Esmartxx::Container::FillPolicy) (Esmartxx::Container::None ) );
vbox->append( &(*buttonbackground) ); vbox->append( &(*buttonbackground) );
vbox->append( &(*buttontext) ); vbox->append( &(*buttontext) );
vbox->show(); vbox->show();

20
eflxx_examples/src/esmartxx/group/main.cpp
View File

@ -1,6 +1,6 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include <group/EvasSmartGroup.h> #include <group/Group.h>
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
#include <memory> #include <memory>
@ -8,38 +8,38 @@
#define WIDTH 240 #define WIDTH 240
#define HEIGHT 320 #define HEIGHT 320
using namespace efl; using namespace Eflxx;
using namespace std; using namespace std;
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
/* Create the application object */ /* Create the application object */
EcoreApplication app ( argc, argv, "Esmart Group Test"); Ecorexx::Application app ( argc, argv, "Esmart Group Test");
Size size (WIDTH, HEIGHT); Size size (WIDTH, HEIGHT);
/* Create the main window, a window with an embedded canvas */ /* Create the main window, a window with an embedded canvas */
EcoreEvasWindowSoftwareX11 mw ( size ); Ecorexx::EvasWindowSoftwareX11 mw ( size );
EvasCanvas &evas = mw.getCanvas(); Evasxx::Canvas &evas = mw.getCanvas();
evas.appendFontPath( searchDataDir () + "/fonts" ); evas.appendFontPath( searchDataDir () + "/fonts" );
/* Add some objects to the canvas */ /* Add some objects to the canvas */
EvasRectangle rect ( evas, size ); Evasxx::Rectangle rect ( evas, size );
rect.setColor( Color (200, 200, 200, 255) ); rect.setColor( Color (200, 200, 200, 255) );
rect.setLayer( 0 ); rect.setLayer( 0 );
rect.show(); rect.show();
EvasRectangle buttonbackground ( evas ); Evasxx::Rectangle buttonbackground ( evas );
buttonbackground.setColor( Color (255, 0, 0, 255) ); buttonbackground.setColor( Color (255, 0, 0, 255) );
buttonbackground.setLayer( 10 ); buttonbackground.setLayer( 10 );
buttonbackground.setGeometry( Rect (10, 10, 20, 20) ); buttonbackground.setGeometry( Rect (10, 10, 20, 20) );
EvasText buttontext ( evas, "Vera", 14, "Click on this button" ); Evasxx::Text buttontext ( evas, "Vera", 14, "Click on this button" );
buttontext.setColor( Color (0, 0, 0, 255) ); buttontext.setColor( Color (0, 0, 0, 255) );
buttontext.setLayer( 11 ); buttontext.setLayer( 11 );
EvasSmartGroup vbox (evas, Rect (50, 50, 200, 200) ); Esmartxx::Group vbox (evas, Rect (50, 50, 200, 200) );
//vbox->resize( 100, 100 ); //vbox->resize( 100, 100 );
//vbox->setLayer( 20 ); //vbox->setLayer( 20 );
vbox.append( &buttonbackground ); vbox.append( &buttonbackground );

18
eflxx_examples/src/esmartxx/textentry/main.cpp
View File

@ -1,39 +1,39 @@
#include <ecorexx/EcoreApplication.h> #include <ecorexx/Ecorexx.h>
#include <evasxx/Evasxx.h> #include <evasxx/Evasxx.h>
#include <edjexx/Edjexx.h> #include <edjexx/Edjexx.h>
#include <textentry/EvasSmartTextEntry.h> #include <textentry/TextEntry.h>
#include "../../common/searchFile.h" #include "../../common/searchFile.h"
#define WIDTH 300 #define WIDTH 300
#define HEIGHT 30 #define HEIGHT 30
using namespace efl; using namespace Eflxx;
int main( int argc, const char **argv ) int main( int argc, const char **argv )
{ {
/* Create the application object */ /* Create the application object */
EcoreApplication* app = new EcoreApplication( argc, argv, "Esmart Container Test" ); Ecorexx::Application* app = new Ecorexx::Application( argc, argv, "Esmart Container Test" );
/* Create the main window, a window with an embedded canvas */ /* Create the main window, a window with an embedded canvas */
EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) );
EvasCanvas &evas = mw->getCanvas(); Evasxx::Canvas &evas = mw->getCanvas();
evas.appendFontPath( searchDataDir () + "/fonts" ); evas.appendFontPath( searchDataDir () + "/fonts" );
/* Add some objects to the canvas */ /* Add some objects to the canvas */
EvasRectangle* rect = new EvasRectangle( evas, Rect (0, 0, WIDTH, HEIGHT) ); Evasxx::Rectangle* rect = new Evasxx::Rectangle( evas, Rect (0, 0, WIDTH, HEIGHT) );
rect->setColor( Color (200, 200, 200, 255) ); rect->setColor( Color (200, 200, 200, 255) );
rect->setLayer( 0 ); rect->setLayer( 0 );
rect->show(); rect->show();
EdjeObject* edje = new EdjeObject ( evas, searchEdjeFile ("esmart_text_entry_test.edj"), "text_entry" ); Edjexx::Object* edje = new Edjexx::Object ( evas, searchEdjeFile ("esmart_text_entry_test.edj"), "text_entry" );
edje->resize( Size (WIDTH, HEIGHT) ); edje->resize( Size (WIDTH, HEIGHT) );
edje->setLayer( 1 ); edje->setLayer( 1 );
edje->show(); edje->show();
EvasSmartTextEntry* passwd = new EvasSmartTextEntry( evas, Rect (0, 0, WIDTH, HEIGHT) ); Esmartxx::TextEntry* passwd = new Esmartxx::TextEntry( evas, Rect (0, 0, WIDTH, HEIGHT) );
passwd->setEdjePart (edje, "text"); passwd->setEdjePart (edje, "text");
passwd->setColor( Color (0, 0, 0, 255) ); passwd->setColor( Color (0, 0, 0, 255) );
passwd->setLayer( 0 ); passwd->setLayer( 0 );

24
evasxx/include/evasxx/Event.h
View File

@ -1,5 +1,5 @@
#ifndef EVAS_EVENT_H #ifndef EVASXX_EVENT_H
#define EVAS_EVENT_H #define EVASXX_EVENT_H
#include <Evas.h> #include <Evas.h>
@ -20,17 +20,17 @@ public:
T* data; T* data;
}; };
typedef ObjectEvent<Evas_Event_Mouse_In> EvasMouseInEvent; typedef ObjectEvent<Evas_Event_Mouse_In> MouseInEvent;
typedef ObjectEvent<Evas_Event_Mouse_Out> EvasMouseOutEvent; typedef ObjectEvent<Evas_Event_Mouse_Out> MouseOutEvent;
typedef ObjectEvent<Evas_Event_Mouse_Up> EvasMouseUpEvent; typedef ObjectEvent<Evas_Event_Mouse_Up> MouseUpEvent;
typedef ObjectEvent<Evas_Event_Mouse_Down> EvasMouseDownEvent; typedef ObjectEvent<Evas_Event_Mouse_Down> MouseDownEvent;
typedef ObjectEvent<Evas_Event_Mouse_Move> EvasMouseMoveEvent; typedef ObjectEvent<Evas_Event_Mouse_Move> MouseMoveEvent;
typedef ObjectEvent<Evas_Event_Mouse_Wheel> EvasMouseWheelEvent; typedef ObjectEvent<Evas_Event_Mouse_Wheel> MouseWheelEvent;
typedef ObjectEvent<Evas_Event_Key_Up> EvasKeyUpEvent; typedef ObjectEvent<Evas_Event_Key_Up> KeyUpEvent;
typedef ObjectEvent<Evas_Event_Key_Down> EvasKeyDownEvent; typedef ObjectEvent<Evas_Event_Key_Down> KeyDownEvent;
typedef ObjectEvent<Evas_Event_Hold> EvasEventHold; typedef ObjectEvent<Evas_Event_Hold> EventHold;
} // end namespace Evasxx } // end namespace Evasxx
#endif // EVAS_EVENT_H #endif // EVASXX_EVENT_H

16
evasxx/include/evasxx/Object.h
View File

@ -54,15 +54,15 @@ public:
}; };
/* event signals */ /* event signals */
sigc::signal <void, const EvasMouseInEvent&> signalHandleMouseIn; /**< Mouse In Event */ sigc::signal <void, const MouseInEvent&> signalHandleMouseIn; /**< Mouse In Event */
sigc::signal <void, const EvasMouseOutEvent&> signalHandleMouseOut; /**< Mouse Out Event */ sigc::signal <void, const MouseOutEvent&> signalHandleMouseOut; /**< Mouse Out Event */
sigc::signal <void, const EvasMouseDownEvent&> signalHandleMouseDown; /**< Mouse Button Down Event */ sigc::signal <void, const MouseDownEvent&> signalHandleMouseDown; /**< Mouse Button Down Event */
sigc::signal <void, const EvasMouseUpEvent&> signalHandleMouseUp; /**< Mouse Button Up Event */ sigc::signal <void, const MouseUpEvent&> signalHandleMouseUp; /**< Mouse Button Up Event */
sigc::signal <void, const EvasMouseMoveEvent&> signalHandleMouseMove; /**< Mouse Move Event */ sigc::signal <void, const MouseMoveEvent&> signalHandleMouseMove; /**< Mouse Move Event */
sigc::signal <void, const EvasMouseWheelEvent&> signalHandleMouseWheel; /**< Mouse Wheel Event */ sigc::signal <void, const MouseWheelEvent&> signalHandleMouseWheel; /**< Mouse Wheel Event */
sigc::signal <void> signalHandleFree; /**< Object Being Freed (Called after Del) */ sigc::signal <void> signalHandleFree; /**< Object Being Freed (Called after Del) */
sigc::signal <void, const EvasKeyDownEvent&> signalHandleKeyDown; /**< Key Press Event */ sigc::signal <void, const KeyDownEvent&> signalHandleKeyDown; /**< Key Press Event */
sigc::signal <void, const EvasKeyUpEvent&> signalHandleKeyUp; /**< Key Release Event */ sigc::signal <void, const KeyUpEvent&> signalHandleKeyUp; /**< Key Release Event */
sigc::signal <void> signalHandleFocusIn; /**< Focus In Event */ sigc::signal <void> signalHandleFocusIn; /**< Focus In Event */
sigc::signal <void> signalHandleFocusOut; /**< Focus Out Event */ sigc::signal <void> signalHandleFocusOut; /**< Focus Out Event */
sigc::signal <void> signalHandleShow; /**< Show Event */ sigc::signal <void> signalHandleShow; /**< Show Event */

16
evasxx/src/Object.cpp
View File

@ -381,49 +381,49 @@ void Object::dispatcher( void *data, Evas *evas, Evas_Object *evas_object, void
{ {
case EVAS_CALLBACK_MOUSE_IN: case EVAS_CALLBACK_MOUSE_IN:
{ {
const EvasMouseInEvent e( static_cast<Evas_Event_Mouse_In*>( event_info ) ); const MouseInEvent e( static_cast<Evas_Event_Mouse_In*>( event_info ) );
object->signalHandleMouseIn.emit( e ); object->signalHandleMouseIn.emit( e );
break; break;
} }
case EVAS_CALLBACK_MOUSE_OUT: case EVAS_CALLBACK_MOUSE_OUT:
{ {
const EvasMouseOutEvent e( static_cast<Evas_Event_Mouse_Out*>( event_info ) ); const MouseOutEvent e( static_cast<Evas_Event_Mouse_Out*>( event_info ) );
object->signalHandleMouseOut.emit( e ); object->signalHandleMouseOut.emit( e );
break; break;
} }
case EVAS_CALLBACK_MOUSE_DOWN: case EVAS_CALLBACK_MOUSE_DOWN:
{ {
const EvasMouseDownEvent e( static_cast<Evas_Event_Mouse_Down*>( event_info ) ); const MouseDownEvent e( static_cast<Evas_Event_Mouse_Down*>( event_info ) );
object->signalHandleMouseDown.emit( e ); object->signalHandleMouseDown.emit( e );
break; break;
} }
case EVAS_CALLBACK_MOUSE_UP: case EVAS_CALLBACK_MOUSE_UP:
{ {
const EvasMouseUpEvent e( static_cast<Evas_Event_Mouse_Up*>( event_info ) ); const MouseUpEvent e( static_cast<Evas_Event_Mouse_Up*>( event_info ) );
object->signalHandleMouseUp.emit( e ); object->signalHandleMouseUp.emit( e );
break; break;
} }
case EVAS_CALLBACK_MOUSE_MOVE: case EVAS_CALLBACK_MOUSE_MOVE:
{ {
const EvasMouseMoveEvent e( static_cast<Evas_Event_Mouse_Move*>( event_info ) ); const MouseMoveEvent e( static_cast<Evas_Event_Mouse_Move*>( event_info ) );
object->signalHandleMouseMove.emit( e ); object->signalHandleMouseMove.emit( e );
break; break;
} }
case EVAS_CALLBACK_MOUSE_WHEEL: case EVAS_CALLBACK_MOUSE_WHEEL:
{ {
const EvasMouseWheelEvent e( static_cast<Evas_Event_Mouse_Wheel*>( event_info ) ); const MouseWheelEvent e( static_cast<Evas_Event_Mouse_Wheel*>( event_info ) );
object->signalHandleMouseWheel.emit( e ); object->signalHandleMouseWheel.emit( e );
break; break;
} }
case EVAS_CALLBACK_KEY_DOWN: case EVAS_CALLBACK_KEY_DOWN:
{ {
const EvasKeyDownEvent e( static_cast<Evas_Event_Key_Down*>( event_info ) ); const KeyDownEvent e( static_cast<Evas_Event_Key_Down*>( event_info ) );
object->signalHandleKeyDown.emit( e ); object->signalHandleKeyDown.emit( e );
break; break;
} }
case EVAS_CALLBACK_KEY_UP: case EVAS_CALLBACK_KEY_UP:
{ {
const EvasKeyUpEvent e( static_cast<Evas_Event_Key_Up*>( event_info ) ); const KeyUpEvent e( static_cast<Evas_Event_Key_Up*>( event_info ) );
object->signalHandleKeyUp.emit( e ); object->signalHandleKeyUp.emit( e );
break; break;
} }