diff --git a/ecorexx/include/ecorexx/Application.h b/ecorexx/include/ecorexx/Application.h index f68e82c..ed46d53 100644 --- a/ecorexx/include/ecorexx/Application.h +++ b/ecorexx/include/ecorexx/Application.h @@ -19,7 +19,7 @@ #include #include -#define eApp Application::application() +//#define eApp Application::application() /** * C++ Wrapper for the Enlightenment Core Library (Ecore) @@ -55,7 +55,7 @@ public: Application( int argc, const char** argv, const std::string& name ); virtual ~Application(); - static Application* application(); + static Application* getInstance(); std::string getName() const; diff --git a/ecorexx/src/Application.cpp b/ecorexx/src/Application.cpp index 8048911..0651dd1 100644 --- a/ecorexx/src/Application.cpp +++ b/ecorexx/src/Application.cpp @@ -61,7 +61,7 @@ Application::~Application() ecore_shutdown(); } -Application* Application::application() +Application* Application::getInstance() { if ( !Application::_instance ) { diff --git a/ecorexx/src/EvasWindow.cpp b/ecorexx/src/EvasWindow.cpp index cdfd409..f5cc959 100644 --- a/ecorexx/src/EvasWindow.cpp +++ b/ecorexx/src/EvasWindow.cpp @@ -24,7 +24,7 @@ namespace Ecorexx { #define ECORE_EVAS_CALLBACK( name, func ) \ static void name( Ecore_Evas* ee ) \ { \ - eApp->getMainWindow()->func(); \ + Application::getInstance()->getMainWindow()->func(); \ } ECORE_EVAS_CALLBACK( callback_resize_dispatcher, resizeEvent ) @@ -141,7 +141,7 @@ void EvasWindow::hideEvent() void EvasWindow::deleteRequestEvent() { Dout( dc::notice, "EvasWindow::deleteRequestEvent()" ); - if ( canClose() ) eApp->quit(); + if ( canClose() ) Application::quit(); } void EvasWindow::destroyEvent() @@ -436,7 +436,7 @@ EvasWindowSoftwareX11::EvasWindowSoftwareX11( const Eflxx::Size &size, const cha :EvasWindow() { Dout( dc::notice, "EvasWindow::EvasWindowSoftwareX11" ); - Application::application()->setMainWindow( this ); + Application::getInstance()->setMainWindow( this ); /*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" ); 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 _ee = ecore_evas_software_x11_new( const_cast( 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 ); _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) ); @@ -475,7 +475,7 @@ EvasWindowGLX11::EvasWindowGLX11( const Eflxx::Size &size, const char* display ) :EvasWindow() { Dout( dc::notice, "EvasWindow::EvasWindowGL" ); - Application::application()->setMainWindow( this ); + Application::getInstance()->setMainWindow( this ); /*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" ); 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 _ee = ecore_evas_gl_x11_new( const_cast( 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 ); _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) ); @@ -515,7 +515,7 @@ EvasWindowXRenderX11::EvasWindowXRenderX11( const Eflxx::Size &size, const char* :EvasWindow() { Dout( dc::notice, "EvasWindow::EvasWindowGL" ); - Application::application()->setMainWindow( this ); + Application::getInstance()->setMainWindow( this ); /*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" ); 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 _ee = ecore_evas_xrender_x11_new( const_cast( 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 ); _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) ); @@ -555,7 +555,7 @@ EvasWindowFB::EvasWindowFB( const Eflxx::Size &size, const char* display, int ro :EvasWindow() { Dout( dc::notice, "EvasWindow::EvasWindowFB" ); - Application::application()->setMainWindow( this ); + Application::getInstance()->setMainWindow( this ); /*if ( ::getenv( "EFL_DISPLAY" ) ) display = ::getenv( "EFL_DISPLAY" ); 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 } - 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 ); _canvas = new Evasxx::Canvas( ecore_evas_get( _ee ) ); diff --git a/eetxx/include/eetxx/Chunk.h b/eetxx/include/eetxx/Chunk.h index a761eee..2d2f8e3 100644 --- a/eetxx/include/eetxx/Chunk.h +++ b/eetxx/include/eetxx/Chunk.h @@ -10,7 +10,7 @@ //! EFLxx includes #include "DataInformation.h" -namespace eet { +namespace Eetxx { /* forward declarations */ class Document; @@ -70,6 +70,6 @@ private: ptr_type _data; }; -} // end namespace eet +} // end namespace Eetxx #endif // EET_CHUNK_H diff --git a/eetxx/include/eetxx/ChunkIterator.h b/eetxx/include/eetxx/ChunkIterator.h index dd47458..17cb15c 100644 --- a/eetxx/include/eetxx/ChunkIterator.h +++ b/eetxx/include/eetxx/ChunkIterator.h @@ -4,7 +4,7 @@ /* EFLxx includes */ #include "Chunk.h" -namespace eet { +namespace Eetxx { /* forward declarations */ class Document; @@ -31,6 +31,6 @@ private: Document &_doc; }; -} // end namespace eet +} // end namespace Eetxx #endif // EET_CHUNK_ITERATOR_H diff --git a/eetxx/include/eetxx/DataInformation.h b/eetxx/include/eetxx/DataInformation.h index 552901f..219b05b 100644 --- a/eetxx/include/eetxx/DataInformation.h +++ b/eetxx/include/eetxx/DataInformation.h @@ -1,7 +1,7 @@ #ifndef EET_DATA_INFORMATION_H #define EET_DATA_INFORMATION_H -namespace eet { +namespace Eetxx { template class DataInformation @@ -35,6 +35,6 @@ make_data (_Ty *data, bool compress = false, unsigned int size = sizeof (_Ty)) return DataInformation<_Ty *> (data, compress, size); } -} // namespace eet +} // namespace Eetxx #endif // EET_DATA_INFORMATION_H diff --git a/eetxx/include/eetxx/Document.h b/eetxx/include/eetxx/Document.h index ec4ea96..5086b4c 100644 --- a/eetxx/include/eetxx/Document.h +++ b/eetxx/include/eetxx/Document.h @@ -14,7 +14,7 @@ * @author Jonathan Muller */ -namespace eet { +namespace Eetxx { class Document { @@ -37,6 +37,6 @@ private: Eet_File *_ef; }; -} // end namespace eet +} // end namespace Eetxx #endif //EET_DOCUMENT_H diff --git a/eetxx/include/eetxx/List.h b/eetxx/include/eetxx/List.h index b6c1bb5..5b46d2c 100644 --- a/eetxx/include/eetxx/List.h +++ b/eetxx/include/eetxx/List.h @@ -5,7 +5,7 @@ #include "Chunk.h" #include "ChunkIterator.h" -namespace eet { +namespace Eetxx { /* forward declarations */ class Document; @@ -31,6 +31,6 @@ private: int _nb_elems; }; -} // namespace eet +} // namespace Eetxx #endif // EET_LIST_H diff --git a/eetxx/src/Chunk.cpp b/eetxx/src/Chunk.cpp index 769f0b6..3b77c3e 100644 --- a/eetxx/src/Chunk.cpp +++ b/eetxx/src/Chunk.cpp @@ -4,7 +4,7 @@ #include "../include/eetxx/Chunk.h" -namespace eet { +namespace Eetxx { Chunk::Chunk (Eet_File *ef, const std::string &key_name) : _ef (ef), @@ -29,4 +29,4 @@ std::string Chunk::get_key () const return _key_name; } -} // end namespace eet +} // end namespace Eetxx diff --git a/eetxx/src/ChunkIterator.cpp b/eetxx/src/ChunkIterator.cpp index d0623ea..d4f314e 100644 --- a/eetxx/src/ChunkIterator.cpp +++ b/eetxx/src/ChunkIterator.cpp @@ -5,7 +5,7 @@ #include "../include/eetxx/ChunkIterator.h" #include "../include/eetxx/Document.h" -namespace eet { +namespace Eetxx { ChunkIterator::ChunkIterator (char **chunk, Document &doc) : the_chunk (chunk), @@ -40,4 +40,4 @@ ChunkIterator ChunkIterator::operator ++ (int) throw () return tem; } -} // end namespace eet +} // end namespace Eetxx diff --git a/eetxx/src/Document.cpp b/eetxx/src/Document.cpp index 22e40ba..85378c7 100644 --- a/eetxx/src/Document.cpp +++ b/eetxx/src/Document.cpp @@ -4,7 +4,7 @@ #include "../include/eetxx/Document.h" -namespace eet { +namespace Eetxx { void Document::init () { @@ -26,4 +26,4 @@ Eet_File *Document::get () return _ef; } -} // end namespace eet +} // end namespace Eetxx diff --git a/eetxx/src/List.cpp b/eetxx/src/List.cpp index 315087b..04860b6 100644 --- a/eetxx/src/List.cpp +++ b/eetxx/src/List.cpp @@ -5,7 +5,7 @@ #include "../include/eetxx/List.h" #include "../include/eetxx/Document.h" -namespace eet { +namespace Eetxx { List::List (Document& doc, const std::string &filter) : _doc (doc), @@ -40,4 +40,4 @@ Chunk List::operator [] (const std::string &key_name) return Chunk (_doc.get (), key_name); } -} // end namespace eet +} // end namespace Eetxx diff --git a/eflxx_examples/configure.ac b/eflxx_examples/configure.ac index cc019da..6eddfb4 100644 --- a/eflxx_examples/configure.ac +++ b/eflxx_examples/configure.ac @@ -97,7 +97,6 @@ AC_DEFINE_UNQUOTED(SYSTEM_PIXMAPS_DIR, "${packageprefix}/${systempixmapsdir}","" AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}","") -#PKG_CHECK_MODULES(ETKXX, etkxx) PKG_CHECK_MODULES(ESMARTXX_CONTAINER, esmartxx_container) PKG_CHECK_MODULES(ESMARTXX_GROUP, esmartxx_group) PKG_CHECK_MODULES(ESMARTXX_TEXTENTRY, esmartxx_textentry) @@ -105,7 +104,6 @@ PKG_CHECK_MODULES(EDJEXX, edjexx) PKG_CHECK_MODULES(EFL, eflxx) PKG_CHECK_MODULES(ECOREXX, ecorexx) PKG_CHECK_MODULES(EETXX, eetxx) -PKG_CHECK_MODULES(EWLXX, ewlxx) PKG_CHECK_MODULES(EMOTIONXX, emotionxx) PKG_CHECK_MODULES(ELEMENTARYXX, elementaryxx) AC_OUTPUT([ @@ -135,9 +133,6 @@ src/esmartxx/group/Makefile src/esmartxx/textentry/Makefile src/eetxx/Makefile src/eetxx/simple_write_read/Makefile -src/ewlxx/Makefile -src/ewlxx/embed/Makefile -src/ewlxx/simple/Makefile src/emotionxx/Makefile src/emotionxx/simple/Makefile src/elementaryxx/Makefile diff --git a/eflxx_examples/src/Makefile.am b/eflxx_examples/src/Makefile.am index 783f966..3361223 100644 --- a/eflxx_examples/src/Makefile.am +++ b/eflxx_examples/src/Makefile.am @@ -17,7 +17,6 @@ SUBDIRS = \ esmartxx \ ecorexx \ eetxx \ - ewlxx \ emotionxx \ debug \ signals \ diff --git a/eflxx_examples/src/debug/simple/main.cpp b/eflxx_examples/src/debug/simple/main.cpp index 37d13a8..40c434d 100644 --- a/eflxx_examples/src/debug/simple/main.cpp +++ b/eflxx_examples/src/debug/simple/main.cpp @@ -1,10 +1,10 @@ -#include -#include -#include +#include +#include +#include #include -using namespace efl; +using namespace Eflxx; using namespace std; class DebugGuard diff --git a/eflxx_examples/src/ecorexx/3dstars/main.cpp b/eflxx_examples/src/ecorexx/3dstars/main.cpp index 49f5994..a8792af 100644 --- a/eflxx_examples/src/ecorexx/3dstars/main.cpp +++ b/eflxx_examples/src/ecorexx/3dstars/main.cpp @@ -1,7 +1,5 @@ -#include -#include -#include -#include +#include +#include #include #include @@ -10,7 +8,7 @@ #include using namespace std; -using namespace efl; +using namespace Eflxx; const unsigned int WIDTH = 600; const unsigned int HEIGHT = 600; @@ -21,11 +19,11 @@ const double rotation = 0.0005; static int width = 0; static int height = 0; -class Star : public EvasLine +class Star : public Evasxx::Line { static double angle; public: - Star( EvasCanvas &evas ) : EvasLine( evas ) + Star( Evasxx::Canvas &evas ) : Evasxx::Line( evas ) { setLayer( 10 ); reset(); @@ -80,7 +78,7 @@ typedef list Starfield; typedef list::iterator StarfieldIterator; Starfield starfield; -void advance( EcoreTimer* e ) +void advance( Ecorexx::Timer* e ) { for (StarfieldIterator it = starfield.begin(); it != starfield.end(); ++it ) { @@ -91,15 +89,15 @@ void advance( EcoreTimer* e ) int main( int argc, const char **argv ) { - auto_ptr app (new EcoreApplication( argc, argv, "Ecore 3D Stars Test" )); - auto_ptr mw (new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) )); - EvasCanvas &evas = mw->getCanvas(); + auto_ptr app (new Ecorexx::Application( argc, argv, "Ecore 3D Stars Test" )); + auto_ptr mw (new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) )); + Evasxx::Canvas &evas = mw->getCanvas(); Rect bg = evas.getGeometry(); width = bg.width(); height = bg.height(); - auto_ptr r (new EvasRectangle( evas, evas.getGeometry() )); + auto_ptr r (new Evasxx::Rectangle( evas, evas.getGeometry() )); r->setColor( Color (0, 0, 0, 255) ); r->setLayer( 0 ); r->show(); @@ -113,7 +111,7 @@ int main( int argc, const char **argv ) // FIXME: Memory leak, but ok for this example // 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(); diff --git a/eflxx_examples/src/ecorexx/calibrate/calibrate.cpp b/eflxx_examples/src/ecorexx/calibrate/calibrate.cpp index 361c96b..31ce662 100644 --- a/eflxx_examples/src/ecorexx/calibrate/calibrate.cpp +++ b/eflxx_examples/src/ecorexx/calibrate/calibrate.cpp @@ -2,8 +2,8 @@ #include #endif -#include -#include +#include +#include #include #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 ) - :EvasRectangle( evas, rect), Trackable( "CalibrationRectangle" ) +CalibrationRectangle::CalibrationRectangle( Evasxx::Canvas &evas, const Rect &rect ) + :Evasxx::Rectangle( evas, rect), Trackable( "CalibrationRectangle" ) { setLayer( 255 ); 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[Center].set( s.width()/2, s.height()/2 ); - switch ( eApp->getMainWindow()->rotation() ) + switch ( Ecorexx::Application::getInstance()->getMainWindow()->rotation() ) { case 0: cout << "ROT 0" << endl; @@ -109,13 +109,13 @@ CalibrationRectangle::CalibrationRectangle( EvasCanvas &evas, const Rect &rect ) } // 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->setColor( Color (0, 0, 0, 255) ); floor->show(); // 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->setAngle( angle = 13 ); background->addColorStop( Color (255, 255, 255, 255), 10 ); @@ -125,26 +125,26 @@ CalibrationRectangle::CalibrationRectangle( EvasCanvas &evas, const Rect &rect ) //background->show(); //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->setColor( Color (255, 255, 255, 255) ); t1->setLayer( 10 ); 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->setLayer( 15 ); t2->show(); // 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->setLayer( 22 ); text->setText( "Click on crosshair to calibrate screen" ); text->show(); #if 0 - EvasImage* image = new EvasImage( evas, searchPixmapFile ("angstrom.png") ); + Evasxx::Image* image = new Evasxx::Image( evas, searchPixmapFile ("angstrom.png") ); image->rresize( 0.6 ); Rect geom = image->getGeometry(); 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->show(); #endif - EcoreAnimator::setFrameTime( 0.004 ); + Ecorexx::Animator::setFrameTime( 0.004 ); // setup crosshair - crosshair = new EvasImage( evas, searchPixmapFile ("crosshair.png") ); + crosshair = new Evasxx::Image( evas, searchPixmapFile ("crosshair.png") ); crosshair->setLayer( 23 ); - crosshairShadow = new EvasImage( evas, searchPixmapFile ("crosshair.png") ); + crosshairShadow = new Evasxx::Image( evas, searchPixmapFile ("crosshair.png") ); crosshairShadow->setLayer( 22 ); crosshairShadow->setColor( Color (150, 150, 150, 50) ); - crosshairhorz = new EvasLine( evas ); - crosshairvert = new EvasLine( evas ); + crosshairhorz = new Evasxx::Line( evas ); + crosshairvert = new Evasxx::Line( evas ); crosshairhorz->setLayer( 23 ); crosshairvert->setLayer( 23 ); crosshairhorz->setColor( Color (0, 0, 0, 255) ); @@ -194,7 +194,7 @@ bool CalibrationRectangle::handleShow() return true; } -bool CalibrationRectangle::handleMouseUp( const EvasMouseUpEvent& e ) +bool CalibrationRectangle::handleMouseUp( const Evasxx::MouseUpEvent& e ) { 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 ); calibrate(); done.emit(); - eApp->quit(); + Ecorexx::Application::quit(); } } @@ -355,8 +355,8 @@ bool CalibrationRectangle::calibrate() return true; } -CalibrationAnimator::CalibrationAnimator( CAtype t, EvasObject* o, int x, int y ) - :EcoreAnimator(), _t( t ), _o( o ), _x( x ), _y( y ) +CalibrationAnimator::CalibrationAnimator( CAtype t, Evasxx::Object* o, int x, int y ) + :Ecorexx::Animator(), _t( t ), _o( o ), _x( x ), _y( y ) { } @@ -396,11 +396,11 @@ bool CalibrationAnimator::tick() _o->move( Point (newx, newy) ); return true; case angle: - newx = static_cast( _o )->getAngle(); + newx = static_cast( _o )->getAngle(); if ( newx == _x ) return false; if ( newx > _x ) newx--; if ( newx < _x ) newx++; - static_cast( _o )->setAngle( newx ); + static_cast( _o )->setAngle( newx ); return true; case alpha: c = _o->getColor(); diff --git a/eflxx_examples/src/ecorexx/calibrate/calibrate.h b/eflxx_examples/src/ecorexx/calibrate/calibrate.h index fa4828d..a9159f9 100644 --- a/eflxx_examples/src/ecorexx/calibrate/calibrate.h +++ b/eflxx_examples/src/ecorexx/calibrate/calibrate.h @@ -1,11 +1,10 @@ #ifndef CALIBRATE_H #define CALIBRATE_H -#include -#include +#include #include -using namespace efl; +using namespace Eflxx; enum { @@ -25,10 +24,10 @@ public: Point canvasPoints[5]; // rotated, scaled }; -class CalibrationRectangle : public EvasRectangle, public Trackable +class CalibrationRectangle : public Evasxx::Rectangle, public Trackable { public: - CalibrationRectangle( EvasCanvas &evas, const Rect &rect ); + CalibrationRectangle( Evasxx::Canvas &evas, const Rect &rect ); virtual ~CalibrationRectangle(); Signal done; @@ -38,34 +37,34 @@ public: void timerEvent(); protected: - virtual bool handleMouseUp( const EvasMouseUpEvent& ); + virtual bool handleMouseUp( const Evasxx::MouseUpEvent& ); virtual bool handleShow(); void moveCrossHair(); private: CalibrationData cd; unsigned int position; - EvasGradient* background; - EvasImage* crosshair; - EvasImage* crosshairShadow; - EvasLine* crosshairhorz; - EvasLine* crosshairvert; - EvasText* text; + Evasxx::Gradient* background; + Evasxx::Image* crosshair; + Evasxx::Image* crosshairShadow; + Evasxx::Line* crosshairhorz; + Evasxx::Line* crosshairvert; + Evasxx::Text* text; int angle; }; -class CalibrationAnimator : public EcoreAnimator +class CalibrationAnimator : public Ecorexx::Animator { public: enum CAtype { position, size, angle, alpha }; - CalibrationAnimator( CAtype, EvasObject* o, int x, int y ); + CalibrationAnimator( CAtype, Evasxx::Object* o, int x, int y ); ~CalibrationAnimator(); virtual bool tick(); private: CAtype _t; - EvasObject* _o; + Evasxx::Object* _o; int _x; int _y; }; diff --git a/eflxx_examples/src/ecorexx/calibrate/main.cpp b/eflxx_examples/src/ecorexx/calibrate/main.cpp index 306ae80..4af5472 100644 --- a/eflxx_examples/src/ecorexx/calibrate/main.cpp +++ b/eflxx_examples/src/ecorexx/calibrate/main.cpp @@ -1,18 +1,18 @@ -#include +#include #include -#include +#include #include "calibrate.h" -using namespace efl; +using namespace Eflxx; #define WIDTH 240 #define HEIGHT 320 int main( int argc, const char **argv ) { - EcoreApplication app( argc, argv, "Ecore Calibration Example" ); - EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); - EvasCanvas &evas = mw->getCanvas(); + Ecorexx::Application app( argc, argv, "Ecore Calibration Example" ); + Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); + Evasxx::Canvas &evas = mw->getCanvas(); Size s = evas.getSize(); CalibrationRectangle* r = new CalibrationRectangle( evas, Rect (0, 0, s.width(), s.height()) ); diff --git a/eflxx_examples/src/ecorexx/callbacks/main.cpp b/eflxx_examples/src/ecorexx/callbacks/main.cpp index a7030c8..1d5c549 100644 --- a/eflxx_examples/src/ecorexx/callbacks/main.cpp +++ b/eflxx_examples/src/ecorexx/callbacks/main.cpp @@ -1,12 +1,12 @@ #include -#include +#include #include "../../common/searchFile.h" #include #include using namespace std; -using namespace efl; +using namespace Eflxx; const int WIDTH = 320; const int HEIGHT = 320; @@ -16,40 +16,40 @@ const unsigned int BALLSIZE = 50; const unsigned int BALLWIDTH = WIDTH-BALLSIZE; const unsigned int BALLHEIGHT = HEIGHT-BALLSIZE; -class TimerApp : public EcoreApplication +class TimerApp : public Ecorexx::Application { 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 ), xstep( 2*PI/360 ), ystep( 2*PI/360 ), size( BALLSIZE ), direction( -1 ), alpha( 0 ), alphadirection( 1 ), xaddfactor( 1 ), yaddfactor( 1 ) { - EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( size ); - EvasCanvas &evas = mw->getCanvas(); + Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( size ); + Evasxx::Canvas &evas = mw->getCanvas(); const Size size (WIDTH, HEIGHT); - image = new EvasImage( evas, searchPixmapFile ("panel.png") ); + image = new Evasxx::Image( evas, searchPixmapFile ("panel.png") ); image->resize( size ); image->setFill( Rect (0, 0, WIDTH, HEIGHT) ); image->show(); - shadow = new EvasImage( evas, searchPixmapFile ("panel_shadow.png" )); + shadow = new Evasxx::Image( evas, searchPixmapFile ("panel_shadow.png" )); shadow->resize( size ); shadow->setFill( Rect (0, 0, WIDTH, HEIGHT) ); shadow->show(); 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->show(); 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]->setColor( Color (255, 255, 255, 240) ); balls[i]->show(); @@ -60,8 +60,8 @@ public: mw->show(); } - EvasImage* image, *shadow, *logo; - EvasImage* balls[NUMBALLS]; + Evasxx::Image* image, *shadow, *logo; + Evasxx::Image* balls[NUMBALLS]; double xoffset; double yoffset; double xstep; diff --git a/eflxx_examples/src/ecorexx/config/main.cpp b/eflxx_examples/src/ecorexx/config/main.cpp index f1a1885..df281bc 100644 --- a/eflxx_examples/src/ecorexx/config/main.cpp +++ b/eflxx_examples/src/ecorexx/config/main.cpp @@ -1,7 +1,6 @@ -#include -#include +#include -using namespace efl; +using namespace Eflxx; #include using namespace std; @@ -9,7 +8,7 @@ using namespace std; int main( int argc, const char **argv ) { // using the EcoreConfigClass directly - EcoreConfig c( "test" ); + Ecorexx::Config c( "test" ); c.setValue( "aString", string( "foo" ) ); c.setValue( "anInt", 42 ); 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; // 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 ); cout << "this application runs for the " << ++runcount << "th time" << endl; app.getConfig()->setValue( "runcount", runcount ); diff --git a/eflxx_examples/src/ecorexx/list/main.cpp b/eflxx_examples/src/ecorexx/list/main.cpp index 3e343ce..914cece 100644 --- a/eflxx_examples/src/ecorexx/list/main.cpp +++ b/eflxx_examples/src/ecorexx/list/main.cpp @@ -1,15 +1,13 @@ -#include -#include -#include +#include #include using namespace std; -using namespace efl; +using namespace Eflxx; int main( int argc, const char **argv ) { // int* test - EcoreList numberList; + Ecorexx::List numberList; int n[6] = {10,11,12,13,14,15}; @@ -29,7 +27,7 @@ int main( int argc, const char **argv ) } // char* test - EcoreList strList; + Ecorexx::List strList; char first[] = "First"; char second[] = "Second"; diff --git a/eflxx_examples/src/ecorexx/paint/main.cpp b/eflxx_examples/src/ecorexx/paint/main.cpp index d739ca7..615585b 100644 --- a/eflxx_examples/src/ecorexx/paint/main.cpp +++ b/eflxx_examples/src/ecorexx/paint/main.cpp @@ -1,9 +1,9 @@ -#include -#include +#include +#include #include -#include +#include -using namespace efl; +using namespace Eflxx; #include #include @@ -14,11 +14,11 @@ using namespace std; #define DOTSIZE 2 -class PaintArea : public EvasRectangle +class PaintArea : public Evasxx::Rectangle { public: - PaintArea( EvasCanvas &evas ) : - EvasRectangle( evas ), + PaintArea( Evasxx::Canvas &evas ) : + Evasxx::Rectangle( evas ), mouseDown( false ), mEvas (evas) { @@ -33,21 +33,21 @@ public: } virtual ~PaintArea() { }; - virtual void handleMouseUp( const EvasMouseUpEvent& e ) + virtual void handleMouseUp( const Evasxx::MouseUpEvent& e ) { cout << "PA::mouseUp" << endl; mouseDown = false; } - virtual void handleMouseDown( const EvasMouseDownEvent& e ) + virtual void handleMouseDown( const Evasxx::MouseDownEvent& e ) { cout << "PA::mouseDown" << endl; 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)); l->setColor( Color (b, b, b, 255) ); l->show(); } - virtual void handleMouseMove( const EvasMouseMoveEvent& e ) + virtual void handleMouseMove( const Evasxx::MouseMoveEvent& e ) { cout << "PA::mouseMove" << endl; if ( mouseDown ) @@ -55,61 +55,61 @@ public: 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 ); 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)); l->setColor( Color (b, b, b, 255) ); l->show(); } } - virtual void handleKeyUp( const EvasKeyUpEvent& e ) + virtual void handleKeyUp( const Evasxx::KeyUpEvent& e ) { cout << "PA:::keyUp - released '" << e.data->keyname << "'" << endl; if ( strcmp( e.data->keyname, "Escape" ) == 0 ) { - eApp->quit(); + Ecorexx::Application::quit(); } if ( strcmp( e.data->keyname, "0x5b" ) == 0 ) { - int rot = eApp->getMainWindow()->rotation(); + int rot = Ecorexx::Application::getInstance()->getMainWindow()->rotation(); rot = rot ? 0: 270; - eApp->getMainWindow()->setRotation( rot ); + Ecorexx::Application::getInstance()->getMainWindow()->setRotation( rot ); //eApp->mainWindow()->resize( } if ( strcmp( e.data->keyname, "j" ) == 0 ) { - Rect vp = eApp->getMainWindow()->getCanvas().getViewport(); - eApp->getMainWindow()->getCanvas().setViewport( Rect (vp.x()+10, vp.y()+10, vp.width()-10, vp.height()-10) ); + Rect vp = Ecorexx::Application::getInstance()->getMainWindow()->getCanvas().getViewport(); + 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 ) { - Rect vp = eApp->getMainWindow()->getCanvas().getViewport(); - eApp->getMainWindow()->getCanvas().setViewport( Rect (vp.x()-10, vp.y()-10, vp.width()+10, vp.height()+10) ); + Rect vp = Ecorexx::Application::getInstance()->getMainWindow()->getCanvas().getViewport(); + Ecorexx::Application::getInstance()->getMainWindow()->getCanvas().setViewport( Rect (vp.x()-10, vp.y()-10, vp.width()+10, vp.height()+10) ); } } private: bool mouseDown; - EvasCanvas &mEvas; + Evasxx::Canvas &mEvas; }; int main( int argc, const char **argv ) { /* 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 */ - EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); + Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); mw->setAlpha (true); mw->show (); /* Create some objects on the canvas */ - EvasCanvas &evas = mw->getCanvas(); + Evasxx::Canvas &evas = mw->getCanvas(); Size s = evas.getSize(); 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->setLayer( 0 ); bg->show(); diff --git a/eflxx_examples/src/ecorexx/simple/main.cpp b/eflxx_examples/src/ecorexx/simple/main.cpp index d8eaadb..25d7ee3 100644 --- a/eflxx_examples/src/ecorexx/simple/main.cpp +++ b/eflxx_examples/src/ecorexx/simple/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "../../common/searchFile.h" @@ -8,20 +8,20 @@ #include using namespace std; -using namespace efl; +using namespace Eflxx; int main( int argc, const char **argv ) { /* 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 */ - EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); + Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); /* 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->resize( evas.getSize() ); image->setFill( image->getImageSize() ); // FIXME @@ -32,19 +32,19 @@ int main( int argc, const char **argv ) cout << "Image size: " << image->getImageSize() << 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); shadow->resize( evas.getSize() ); shadow->setFill( image->getImageSize() ); // FIXME 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); logo->resize( logo->getImageSize() ); logo->setFill( logo->getImageSize() ); // FIXME 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->setLayer( 5 ); text->show(); diff --git a/eflxx_examples/src/ecorexx/stars/main.cpp b/eflxx_examples/src/ecorexx/stars/main.cpp index 3d08c1b..5dcbdac 100644 --- a/eflxx_examples/src/ecorexx/stars/main.cpp +++ b/eflxx_examples/src/ecorexx/stars/main.cpp @@ -1,18 +1,17 @@ -#include -#include +#include #include #include #include #include -using namespace efl; +using namespace Eflxx; using namespace std; #define WIDTH 320 #define HEIGHT 240 -typedef pair Star; +typedef pair Star; typedef list Starfield; typedef list::iterator StarfieldIterator; @@ -20,12 +19,12 @@ Starfield starfield; int width = 0; -void advance( EcoreTimer* e ) +void advance( Ecorexx::Timer* e ) { for (StarfieldIterator it = starfield.begin(); it != starfield.end(); ++it ) { Star* star = *it; - EvasLine* line = star->first; + Evasxx::Line* line = star->first; int speed = star->second; Rect g = line->getGeometry(); 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 ) { - EcoreApplication* app = new EcoreApplication( argc, argv, "Ecore Stars Test" ); - EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); - EvasCanvas &evas = mw->getCanvas(); + Ecorexx::Application* app = new Ecorexx::Application( argc, argv, "Ecore Stars Test" ); + Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); + Evasxx::Canvas &evas = mw->getCanvas(); Rect bg = evas.getGeometry(); 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->setLayer( 0 ); r->show(); @@ -50,7 +49,7 @@ int main( int argc, const char **argv ) { int xpos = (int) ((double)bg.width()*rand()/(RAND_MAX)); 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->setLayer( 10 ); line->show(); @@ -58,7 +57,7 @@ int main( int argc, const char **argv ) 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 (); diff --git a/eflxx_examples/src/ecorexx/timers/main.cpp b/eflxx_examples/src/ecorexx/timers/main.cpp index f637326..90d2358 100644 --- a/eflxx_examples/src/ecorexx/timers/main.cpp +++ b/eflxx_examples/src/ecorexx/timers/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "../../common/searchFile.h" @@ -6,7 +6,7 @@ #include using namespace std; -using namespace efl; +using namespace Eflxx; const int WIDTH = 320; const int HEIGHT = 320; @@ -16,39 +16,39 @@ const unsigned int BALLSIZE = 50; const unsigned int BALLWIDTH = WIDTH-BALLSIZE; const unsigned int BALLHEIGHT = HEIGHT-BALLSIZE; -class TimerApp : public EcoreApplication +class TimerApp : public Ecorexx::Application { public: TimerApp( int argc, const char** argv ) - : EcoreApplication( argc, argv, "Ecore Timer Test" ), + : Ecorexx::Application( argc, argv, "Ecore Timer Test" ), xoffset( 0 ), yoffset( PI/3 ), xstep( 2*PI/360 ), ystep( 2*PI/360 ), size( BALLSIZE ), direction( -1 ), alpha( 0 ), alphadirection( 1 ), xaddfactor( 1 ), yaddfactor( 1 ) { - EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); - EvasCanvas &evas = mw->getCanvas(); + Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); + 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->setFill( 0, 0, image->trueSize() ); //FIXME image->show(); - shadow = new EvasImage( evas, searchPixmapFile ("panel_shadow.png") ); + shadow = new Evasxx::Image( evas, searchPixmapFile ("panel_shadow.png") ); shadow->resize( evas.getSize() ); //shadow->setFill( 0, 0, evas.size() ); //FIXME shadow->show(); 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->show(); 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]->setColor( Color (255, 255, 255, 240) ); balls[i]->show(); @@ -59,8 +59,8 @@ public: mw->show(); } - EvasImage* image, *shadow, *logo; - EvasImage* balls[NUMBALLS]; + Evasxx::Image* image, *shadow, *logo; + Evasxx::Image* balls[NUMBALLS]; double xoffset; double yoffset; diff --git a/eflxx_examples/src/ecorexx/x/main.cpp b/eflxx_examples/src/ecorexx/x/main.cpp index fd01009..ccbf792 100644 --- a/eflxx_examples/src/ecorexx/x/main.cpp +++ b/eflxx_examples/src/ecorexx/x/main.cpp @@ -1,5 +1,4 @@ -#include -#include +#include #include #include "../../common/searchFile.h" @@ -8,41 +7,41 @@ #include using namespace std; -using namespace efl; +using namespace Eflxx; int main( int argc, const char **argv ) { /* 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 */ - EcoreEvasWindowSoftwareX11* mw = new EcoreEvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); + Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) ); // Open this window as 'Utility' window - EcoreXWindow *exwin = mw->getXWindow(); - exwin->setNetWMWindowType ( EcoreXWindow::Utility ); + Ecorexx::XWindow *exwin = mw->getXWindow(); + exwin->setNetWMWindowType ( Ecorexx::XWindow::Utility ); delete exwin; /* 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->setFill( image->getImageSize() ); image->show(); 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->setFill( image->getImageSize() ); 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->setFill( logo->getImageSize() ); 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->setLayer( 5 ); text->show(); diff --git a/eflxx_examples/src/edjexx/simple/main.cpp b/eflxx_examples/src/edjexx/simple/main.cpp index 3f2a8b5..50b6254 100644 --- a/eflxx_examples/src/edjexx/simple/main.cpp +++ b/eflxx_examples/src/edjexx/simple/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include "../../common/searchFile.h" @@ -8,27 +8,27 @@ #define WIDTH 240 #define HEIGHT 320 -using namespace efl; +using namespace Eflxx; using namespace std; int main( int argc, const char **argv ) { // Create the application object - EcoreApplication app (argc, argv, "Simple Edje Test"); + Ecorexx::Application app (argc, argv, "Simple Edje Test"); Size s (WIDTH, HEIGHT); // 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" ); // Add some objects to the canvas 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 ); diff --git a/eflxx_examples/src/eetxx/simple_write_read/read_eet.cpp b/eflxx_examples/src/eetxx/simple_write_read/read_eet.cpp index 8a974c1..bac52e1 100644 --- a/eflxx_examples/src/eetxx/simple_write_read/read_eet.cpp +++ b/eflxx_examples/src/eetxx/simple_write_read/read_eet.cpp @@ -4,7 +4,6 @@ #include using namespace std; -using namespace efl; struct A { @@ -19,7 +18,7 @@ ostream& operator<< (ostream& os, const A& a) return os; } -ostream& operator<< (ostream& os, const EetChunk& chunk) +ostream& operator<< (ostream& os, const Eetxx::Chunk& chunk) { void *data = chunk.get (); os << chunk.get_key () << " "; @@ -38,7 +37,7 @@ ostream& operator<< (ostream& os, const EetChunk& chunk) struct display_eet_file_content { - void operator () (const EetChunk &chunk) + void operator () (const Eetxx::Chunk &chunk) { cout << chunk << endl; } @@ -46,10 +45,10 @@ struct display_eet_file_content int main(int argc, char **argv) { - EetDocument::init (); + Eetxx::Document::init (); - EetDocument doc("writing_test.eet", EET_FILE_MODE_READ); - EetList my_list (doc); + Eetxx::Document doc("writing_test.eet", EET_FILE_MODE_READ); + Eetxx::List my_list (doc); //A *a = reinterpret_cast (my_list["A"]. get ()); diff --git a/eflxx_examples/src/eetxx/simple_write_read/write_eet.cpp b/eflxx_examples/src/eetxx/simple_write_read/write_eet.cpp index e3bdd4a..a95024a 100644 --- a/eflxx_examples/src/eetxx/simple_write_read/write_eet.cpp +++ b/eflxx_examples/src/eetxx/simple_write_read/write_eet.cpp @@ -5,7 +5,6 @@ #include using namespace std; -using namespace efl; struct A { @@ -17,10 +16,10 @@ struct A int main(int argc, char **argv) { - EetDocument::init (); + Eetxx::Document::init (); - EetDocument doc("writing_test.eet", EET_FILE_MODE_WRITE); - EetList my_list (doc); + Eetxx::Document doc("writing_test.eet", EET_FILE_MODE_WRITE); + Eetxx::List my_list (doc); int x = 2; cout << "Set x" << endl; @@ -34,23 +33,23 @@ int main(int argc, char **argv) memcpy(a.s, "john", 10); cout << "Set A" << endl; - my_list["A"] = make_data (a, true); + my_list["A"] = Eetxx::make_data (a, true); cout << "---------" << endl; cout << "Use intermediate object" << endl; const char *s = "first string"; - DataInformation d = make_data(s, false, strlen (s)+1); + Eetxx::DataInformation d = Eetxx::make_data(s, false, strlen (s)+1); my_list["my_string"] = d; cout << "---------" << endl; cout << "Use directly helper function" << endl; 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 << "Set B" << endl; - DataInformation t2 (2, true); + Eetxx::DataInformation t2 (2, true); my_list["B"] = t2; cout << "--------" << endl; diff --git a/eflxx_examples/src/elementaryxx/full/main.cpp b/eflxx_examples/src/elementaryxx/full/main.cpp index ed9ee68..d113a0d 100644 --- a/eflxx_examples/src/elementaryxx/full/main.cpp +++ b/eflxx_examples/src/elementaryxx/full/main.cpp @@ -4,6 +4,8 @@ #include "test.h" + + #ifndef ELM_LIB_QUICKLAUNCH static void my_win_del(Evas_Object *obj, void *event_info); 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); -ElmApplication *elmApp; +Application *elmApp; static void @@ -80,7 +82,7 @@ my_win_del(Evas_Object *obj, void *event_info) 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 * 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 * within this application (and all instances of the application). the * 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 */ win->setTitle ("Elementary Tests"); @@ -116,7 +118,7 @@ int main (int argc, char **argv) * comnpositor running this should fall back to using shaped windows * (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. */ - 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 */ bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); /* 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 (); /* 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 */ bx0->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); /* 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); bx0->show (); - ElmFrame *fr = ElmFrame::factory (*win); + Frame *fr = Frame::factory (*win); fr->setLabel ("Information"); bx0->packEnd (*fr); fr->show (); - ElmLabel *lb = ElmLabel::factory (*win); + Label *lb = Label::factory (*win); lb->setLabel("Please select a test from the list below
" "by clicking the test button to show the
" "test window."); fr->setContent (*lb); lb->show (); - ElmList *li = ElmList::factory (*win); + List *li = List::factory (*win); li->setAlwaysSelectMode (true); li->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); li->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/eflxx_examples/src/elementaryxx/full/test.h b/eflxx_examples/src/elementaryxx/full/test.h index 5db2cd5..37b95ae 100644 --- a/eflxx_examples/src/elementaryxx/full/test.h +++ b/eflxx_examples/src/elementaryxx/full/test.h @@ -5,7 +5,8 @@ #include "../../common/searchFile.h" using namespace std; -using namespace efl; +using namespace Eflxx; +using namespace Elmxx; static Size size160x160 (160, 160); static Size size320x320 (320, 320); diff --git a/eflxx_examples/src/elementaryxx/full/test_bg.cpp b/eflxx_examples/src/elementaryxx/full/test_bg.cpp index 6e6ccae..8dda370 100644 --- a/eflxx_examples/src/elementaryxx/full/test_bg.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_bg.cpp @@ -1,12 +1,14 @@ #include "test.h" + + 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->setAutoDel(true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); /* allow bg to expand in x & y */ bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 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) { - ElmWindow *win = ElmWindow::factory ("bg-image", ELM_WIN_BASIC); + Window *win = Window::factory ("bg-image", ELM_WIN_BASIC); win->setTitle ("Bg Image"); win->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); bg->setFile (searchPixmapFile ("elementaryxx/plant_01.jpg")); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); win->addObjectResize (*bg); diff --git a/eflxx_examples/src/elementaryxx/full/test_box.cpp b/eflxx_examples/src/elementaryxx/full/test_box.cpp index 75e0e0b..a7de333 100644 --- a/eflxx_examples/src/elementaryxx/full/test_box.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_box.cpp @@ -1,36 +1,38 @@ #include "test.h" + + 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->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); win->addObjectResize (*bx); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->show (); - ElmIcon *ic = ElmIcon::factory (*win); + Icon *ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setScale (false, false); ic->setAlignHintSize (0.5, 0.5); bx->packEnd (*ic); ic->show (); - ElmIcon *ic2 = ElmIcon::factory (*win); + Icon *ic2 = Icon::factory (*win); ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic2->setScale (false, false); ic2->setAlignHintSize (0.0, 0.5); bx->packEnd (*ic2); ic2->show (); - ElmIcon *ic3 = ElmIcon::factory (*win); + Icon *ic3 = Icon::factory (*win); ic3->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic3->setScale (false, false); 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) { - ElmWindow *win = ElmWindow::factory ("box-horiz", ELM_WIN_BASIC); + Window *win = Window::factory ("box-horiz", ELM_WIN_BASIC); win->setTitle ("Box Horiz"); win->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); - bx->setOrientation (ElmBox::Horizontal); + Box *bx = Box::factory (*win); + bx->setOrientation (Box::Horizontal); win->addObjectResize (*bx); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->show (); - ElmIcon *ic = ElmIcon::factory (*win); + Icon *ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setScale (false, false); ic->setAlignHintSize (0.5, 0.5); bx->packEnd (*ic); ic->show (); - ElmIcon *ic2 = ElmIcon::factory (*win); + Icon *ic2 = Icon::factory (*win); ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic2->setScale (false, false); ic2->setAlignHintSize (0.5, 0.0); bx->packEnd (*ic2); ic2->show (); - ElmIcon *ic3 = ElmIcon::factory (*win); + Icon *ic3 = Icon::factory (*win); ic3->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic3->setScale (false, false); ic3->setAlignHintSize (0.0, EVAS_HINT_EXPAND); diff --git a/eflxx_examples/src/elementaryxx/full/test_button.cpp b/eflxx_examples/src/elementaryxx/full/test_button.cpp index 6ce65a4..e95ce05 100644 --- a/eflxx_examples/src/elementaryxx/full/test_button.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_button.cpp @@ -2,37 +2,37 @@ void test_button (void *data, Evas_Object *obj, void *event_info) { - ElmIcon *ic = NULL; - ElmButton *bt = NULL; + Icon *ic = NULL; + Button *bt = NULL; - ElmWindow *win = ElmWindow::factory ("buttons", ELM_WIN_BASIC); + Window *win = Window::factory ("buttons", ELM_WIN_BASIC); win->setTitle ("Buttons"); win->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); win->addObjectResize (*bx); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Icon sized to button"); bt->setIcon (*ic); bx->packEnd (*bt); bt->show (); ic->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Disabled Button"); bt->setIcon (*ic); bt->setDisabled (true); @@ -40,25 +40,25 @@ void test_button (void *data, Evas_Object *obj, void *event_info) bt->show (); ic->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setScale (false, false); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Icon no scale"); bt->setIcon (*ic); bx->packEnd (*bt); bt->show (); ic->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Label Only"); bx->packEnd (*bt); bt->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setScale (false, false); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Icon no scale"); bt->setIcon (*ic); bx->packEnd (*bt); diff --git a/eflxx_examples/src/elementaryxx/full/test_check.cpp b/eflxx_examples/src/elementaryxx/full/test_check.cpp index 8e66a26..7e39f26 100644 --- a/eflxx_examples/src/elementaryxx/full/test_check.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_check.cpp @@ -2,27 +2,27 @@ void test_check (void *data, Evas_Object *obj, void *event_info) { - ElmIcon *ic = NULL; - ElmCheck *ck = NULL; + Icon *ic = NULL; + Check *ck = NULL; - ElmWindow *win = ElmWindow::factory ("check", ELM_WIN_BASIC); + Window *win = Window::factory ("check", ELM_WIN_BASIC); win->setTitle ("Checks"); win->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); win->addObjectResize (*bx); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); 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->setAlignHintSize (EVAS_HINT_FILL, 0.5); ck->setLabel ("Icon sized to check"); @@ -32,25 +32,25 @@ void test_check (void *data, Evas_Object *obj, void *event_info) ck->show (); ic->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setScale (false, false); - ck = ElmCheck::factory (*win); + ck = Check::factory (*win); ck->setLabel ("Icon no scale"); ck->setIcon (*ic); bx->packEnd (*ck); ck->show (); ic->show (); - ck = ElmCheck::factory (*win); + ck = Check::factory (*win); ck->setLabel ("Label Only"); bx->packEnd (*ck); ck->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); 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->setAlignHintSize (EVAS_HINT_FILL, 0.5); ck->setLabel ("Disabled check"); @@ -61,10 +61,10 @@ void test_check (void *data, Evas_Object *obj, void *event_info) ck->show (); ic->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setScale (false, false); - ck = ElmCheck::factory (*win); + ck = Check::factory (*win); ck->setIcon (*ic); bx->packEnd (*ck); ck->show (); diff --git a/eflxx_examples/src/elementaryxx/full/test_clock.cpp b/eflxx_examples/src/elementaryxx/full/test_clock.cpp index 98527b3..763e4c0 100644 --- a/eflxx_examples/src/elementaryxx/full/test_clock.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_clock.cpp @@ -2,45 +2,45 @@ 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->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); win->addObjectResize (*bx); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->show (); - ElmClock *ck = ElmClock::factory (*win); + Clock *ck = Clock::factory (*win); bx->packEnd (*ck); ck->show (); - ElmClock *ck2 = ElmClock::factory (*win); + Clock *ck2 = Clock::factory (*win); ck2->setShowAmPm (true); bx->packEnd (*ck2); ck2->show (); - ElmClock *ck3 = ElmClock::factory (*win); + Clock *ck3 = Clock::factory (*win); ck3->setShowSeconds (true); bx->packEnd (*ck3); ck3->show (); - ElmClock *ck4 = ElmClock::factory (*win); + Clock *ck4 = Clock::factory (*win); ck4->setShowSeconds (true); ck4->setShowAmPm (true); bx->packEnd (*ck4); ck4->show (); - ElmClock *ck5 = ElmClock::factory (*win); + Clock *ck5 = Clock::factory (*win); ck5->setEdit (true); ck5->setShowSeconds (true); ck5->setShowAmPm (true); - ck5->setTime (ElmClock::Time (10, 11, 12)); + ck5->setTime (Clock::Time (10, 11, 12)); bx->packEnd (*ck5); ck5->show (); diff --git a/eflxx_examples/src/elementaryxx/full/test_entry.cpp b/eflxx_examples/src/elementaryxx/full/test_entry.cpp index c27ee46..b6f2e6b 100644 --- a/eflxx_examples/src/elementaryxx/full/test_entry.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_entry.cpp @@ -1,46 +1,46 @@ #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 (""); } -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 (); 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 (); 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 BOLD text"); } 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->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); win->addObjectResize (*bx); bx->show (); - ElmEntry *en = ElmEntry::factory (*win); + Entry *en = Entry::factory (*win); en->setLineWrap (false); en->setText ("This is an entry widget in this window that
" "uses markup like this for styling and
" @@ -55,12 +55,12 @@ void test_entry (void *data, Evas_Object *obj, void *event_info) bx->packEnd (*en); en->show (); - ElmBox *bx2 = ElmBox::factory (*win); - bx2->setOrientation (ElmBox::Horizontal); + Box *bx2 = Box::factory (*win); + bx2->setOrientation (Box::Horizontal); bx2->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); bx2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Clear"); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_1), en)); 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); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Print"); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_2), en)); 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); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Selection"); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_3), en)); 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); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Insert"); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_4), en)); 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) { - ElmButton *bt = NULL; - ElmEntry *en = NULL; - ElmScroller *sc = NULL; + Button *bt = NULL; + Entry *en = 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->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); win->addObjectResize (*bx); bx->show (); - sc = ElmScroller::factory (*win); + sc = Scroller::factory (*win); sc->limitMinContent (false, true); sc->setPolicy (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); sc->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); sc->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bx->packEnd (*sc); - en = ElmEntry::factory (*win); + en = Entry::factory (*win); en->setSingleLine (true); en->setText ("This is a single line"); 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 = ElmScroller::factory (*win); + sc = Scroller::factory (*win); sc->limitMinContent (false, true); sc->setPolicy (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); sc->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); sc->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bx->packEnd (*sc); - en = ElmEntry::factory (*win); + en = Entry::factory (*win); en->setPassword (true); en->setText ("Password here"); 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 = ElmScroller::factory (*win); + sc = Scroller::factory (*win); sc->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); sc->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); sc->setPolicy (ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON); bx->packEnd (*sc); - en = ElmEntry::factory (*win); + en = Entry::factory (*win); en->setText ("This is an entry widget in this window that
" "uses markup like this for styling and
" "formatting like this, as well as
" @@ -177,13 +177,13 @@ void test_entry_scolled (void *data, Evas_Object *obj, void *event_info) sc->show (); - ElmBox *bx2 = ElmBox::factory (*win); - bx2->setOrientation (ElmBox::Horizontal); + Box *bx2 = Box::factory (*win); + bx2->setOrientation (Box::Horizontal); bx2->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); bx2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Clear"); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_1), en)); 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); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Print"); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_2), en)); 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); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Selection"); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_3), en)); 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); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Insert"); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_entry_bt_4), en)); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/eflxx_examples/src/elementaryxx/full/test_hover.cpp b/eflxx_examples/src/elementaryxx/full/test_hover.cpp index 5b14245..f34dea0 100644 --- a/eflxx_examples/src/elementaryxx/full/test_hover.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_hover.cpp @@ -1,32 +1,34 @@ #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 (); } void test_hover (void *data, Evas_Object *obj, void *event_info) { - ElmButton *bt = NULL; - ElmBox *bx = NULL; + Button *bt = NULL; + Box *bx = NULL; - ElmWindow *win = ElmWindow::factory ("hover", ELM_WIN_BASIC); + Window *win = Window::factory ("hover", ELM_WIN_BASIC); win->setTitle ("Hover"); win->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - bx = ElmBox::factory (*win); + bx = Box::factory (*win); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); win->addObjectResize (*bx); bx->show (); - ElmHover *hv = ElmHover::factory (*win); + Hover *hv = Hover::factory (*win); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Button"); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_hover_bt), hv)); bx->packEnd (*bt); @@ -34,30 +36,30 @@ void test_hover (void *data, Evas_Object *obj, void *event_info) hv->setParent (*win); hv->setTarget (*bt); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Popup"); hv->setContent ("middle", *bt); 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->setScale (false, false); bx->packEnd (*ic); ic->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Top 1"); bx->packEnd (*bt); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Top 2"); bx->packEnd (*bt); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Top 3"); bx->packEnd (*bt); bt->show (); @@ -66,17 +68,17 @@ void test_hover (void *data, Evas_Object *obj, void *event_info) hv->setContent ("top", *bx); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Bottom"); hv->setContent ("bottom", *bt); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Left"); hv->setContent ("left", *bt); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Right"); hv->setContent ("right", *bt); 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) { - ElmBox *bx = NULL; - ElmButton *bt = NULL; + Box *bx = 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->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - bx = ElmBox::factory (*win); + bx = Box::factory (*win); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); win->addObjectResize (*bx); bx->show (); - ElmHover *hv = ElmHover::factory (*win); + Hover *hv = Hover::factory (*win); hv->setStyle ("popout"); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Button"); bt->getEventSignal ("clicked")->connect (sigc::bind (sigc::ptr_fun (&my_hover_bt), hv)); bx->packEnd (*bt); @@ -117,30 +119,30 @@ void test_hover2 (void *data, Evas_Object *obj, void *event_info) hv->setParent (*win); hv->setTarget (*bt); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Popup"); hv->setContent ("middle", *bt); 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->setScale (false, false); bx->packEnd (*ic); ic->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Top 1"); bx->packEnd (*bt); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Top 2"); bx->packEnd (*bt); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Top 3"); bx->packEnd (*bt); bt->show (); @@ -149,17 +151,17 @@ void test_hover2 (void *data, Evas_Object *obj, void *event_info) hv->setContent ("top", *bx); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Bot"); hv->setContent ("bottom", *bt); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Left"); hv->setContent ("left", *bt); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Right"); hv->setContent ("right", *bt); bt->show (); diff --git a/eflxx_examples/src/elementaryxx/full/test_icon.cpp b/eflxx_examples/src/elementaryxx/full/test_icon.cpp index 1741d98..bae3a15 100644 --- a/eflxx_examples/src/elementaryxx/full/test_icon.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_icon.cpp @@ -1,5 +1,7 @@ #include "test.h" + + static void icon_clicked (Evas_Object *obj, void *event_info) { 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) { - ElmWindow *win = ElmWindow::factory ("icon-transparent", ELM_WIN_BASIC); + Window *win = Window::factory ("icon-transparent", ELM_WIN_BASIC); win->setTitle ("Icon Transparent"); win->setAutoDel (true); win->setAlpha (true); - ElmIcon *ic = ElmIcon::factory (*win); + Icon *ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo.png")); ic->setScale (false, false); win->addObjectResize (*ic); diff --git a/eflxx_examples/src/elementaryxx/full/test_layout.cpp b/eflxx_examples/src/elementaryxx/full/test_layout.cpp index 7d770aa..ec8e7d6 100644 --- a/eflxx_examples/src/elementaryxx/full/test_layout.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_layout.cpp @@ -1,33 +1,35 @@ #include "test.h" + + 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->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmLayout *ly = ElmLayout::factory (*win); + Layout *ly = Layout::factory (*win); ly->setFile (searchEdjeFile ("elementaryxx-test.edj"), "layout"); ly->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); win->addObjectResize (*ly); ly->show (); - ElmButton *bt = ElmButton::factory (*win); + Button *bt = Button::factory (*win); bt->setLabel ("Button 1"); ly->setContent ("element1", *bt); bt->show (); - ElmButton *bt2 = ElmButton::factory (*win); + Button *bt2 = Button::factory (*win); bt2->setLabel ("Button 2"); ly->setContent ("element2", *bt2); bt2->show (); - ElmButton *bt3 = ElmButton::factory (*win); + Button *bt3 = Button::factory (*win); bt3->setLabel ("Button 3"); ly->setContent ("element3", *bt3); bt3->show (); diff --git a/eflxx_examples/src/elementaryxx/full/test_notepad.cpp b/eflxx_examples/src/elementaryxx/full/test_notepad.cpp index 23c9a62..e5ba664 100644 --- a/eflxx_examples/src/elementaryxx/full/test_notepad.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_notepad.cpp @@ -1,54 +1,56 @@ #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 } -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 } -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 } void test_notepad (void *data, Evas_Object *obj, void *event_info) { - ElmButton *bt = NULL; - ElmIcon *ic = NULL; + Button *bt = NULL; + Icon *ic = NULL; - ElmWindow *win = ElmWindow::factory ("notepad", ELM_WIN_BASIC); + Window *win = Window::factory ("notepad", ELM_WIN_BASIC); win->setTitle ("Notepad"); win->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); win->addObjectResize (*bx); bx->show (); - ElmNotepad *np = ElmNotepad::factory (*win); + Notepad *np = Notepad::factory (*win); np->setFile ("note.txt", ELM_TEXT_FORMAT_PLAIN_UTF8); np->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); np->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bx->packEnd (*np); np->show (); - ElmBox *bx2 = ElmBox::factory (*win); - bx2->setOrientation (ElmBox::Horizontal); + Box *bx2 = Box::factory (*win); + bx2->setOrientation (Box::Horizontal); bx2->setHomogenous (true); bx2->setWeightHintSize (EVAS_HINT_EXPAND, 0.0); bx2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); - bt = ElmButton::factory (*win); - ic = ElmIcon::factory (*win); + bt = Button::factory (*win); + ic = Icon::factory (*win); ic->setStandard ("arrow_left"); ic->setScale (true, false); bt->setIcon (*ic); @@ -59,8 +61,8 @@ void test_notepad (void *data, Evas_Object *obj, void *event_info) bx2->packEnd (*bt); bt->show (); - bt = ElmButton::factory (*win); - ic = ElmIcon::factory (*win); + bt = Button::factory (*win); + ic = Icon::factory (*win); ic->setStandard ("close"); ic->setScale (true, false); bt->setIcon (*ic); @@ -71,8 +73,8 @@ void test_notepad (void *data, Evas_Object *obj, void *event_info) bx2->packEnd (*bt); bt->show (); - bt = ElmButton::factory (*win); - ic = ElmIcon::factory (*win); + bt = Button::factory (*win); + ic = Icon::factory (*win); ic->setStandard ("arrow_right"); ic->setScale (true, false); bt->setIcon (*ic); diff --git a/eflxx_examples/src/elementaryxx/full/test_panel.cpp b/eflxx_examples/src/elementaryxx/full/test_panel.cpp index a0fb44f..2137f1d 100644 --- a/eflxx_examples/src/elementaryxx/full/test_panel.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_panel.cpp @@ -2,16 +2,16 @@ 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->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmPanel *panel = ElmPanel::factory (*win); + Panel *panel = Panel::factory (*win); panel->setOrientation (ELM_PANEL_ORIENT_LEFT); panel->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); panel->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/eflxx_examples/src/elementaryxx/full/test_progressbar.cpp b/eflxx_examples/src/elementaryxx/full/test_progressbar.cpp index 52194da..33a1540 100644 --- a/eflxx_examples/src/elementaryxx/full/test_progressbar.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_progressbar.cpp @@ -2,22 +2,22 @@ #include -typedef struct Progressbar +typedef struct _MyProgressbar { - ElmProgressbar *pb1; - ElmProgressbar *pb2; - ElmProgressbar *pb3; - ElmProgressbar *pb4; - ElmProgressbar *pb5; - ElmProgressbar *pb6; - ElmProgressbar *pb7; + Progressbar *pb1; + Progressbar *pb2; + Progressbar *pb3; + Progressbar *pb4; + Progressbar *pb5; + Progressbar *pb6; + Progressbar *pb7; bool run; - EcoreTimer *timer; -} Progressbar; + Ecorexx::Timer *timer; +} 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; @@ -52,7 +52,7 @@ static void my_progressbar_test_start (Evas_Object *obj, void *event_info) 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.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) { - ElmProgressbar *pb = NULL; - ElmIcon *ic1 = NULL; - ElmIcon *ic2 = NULL; - ElmButton *bt = NULL; + Progressbar *pb = NULL; + Icon *ic1 = NULL; + Icon *ic2 = NULL; + Button *bt = NULL; // start in stop mode _test_progressbar.run = false; - ElmWindow *win = ElmWindow::factory ("progressbar", ELM_WIN_BASIC); + Window *win = Window::factory ("progressbar", ELM_WIN_BASIC); win->setTitle ("Progressbar"); win->getEventSignal ("delete,request")->connect (sigc::ptr_fun (&my_progressbar_destroy)); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); win->addObjectResize (*bx); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->show (); - pb = ElmProgressbar::factory (*win); + pb = Progressbar::factory (*win); pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); pb->setAlignHintSize (EVAS_HINT_FILL, 0.5); bx->packEnd (*pb); pb->show (); _test_progressbar.pb1 = pb; - pb = ElmProgressbar::factory (*win); + pb = Progressbar::factory (*win); pb->setAlignHintSize (EVAS_HINT_FILL, 0.5); pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); pb->setLabel ("Infinite bounce"); @@ -117,11 +117,11 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info) pb->show (); _test_progressbar.pb2 = pb; - ic1 = ElmIcon::factory (*win); + ic1 = Icon::factory (*win); ic1->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic1->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); - pb = ElmProgressbar::factory (*win); + pb = Progressbar::factory (*win); pb->setLabel ("Label"); pb->setIcon (*ic1); pb->setInverted (true); @@ -134,15 +134,15 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info) pb->show (); _test_progressbar.pb3 = pb; - ElmBox *hbx = ElmBox::factory (*win); - hbx->setOrientation (ElmBox::Horizontal); + Box *hbx = Box::factory (*win); + hbx->setOrientation (Box::Horizontal); hbx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); hbx->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); bx->packEnd (*hbx); hbx->show (); - pb = ElmProgressbar::factory (*win); - pb->setOrientation (ElmProgressbar::Vertical); + pb = Progressbar::factory (*win); + pb->setOrientation (Progressbar::Vertical); pb->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); hbx->packEnd (*pb); @@ -151,8 +151,8 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info) pb->show (); _test_progressbar.pb4 = pb; - pb = ElmProgressbar::factory (*win); - pb->setOrientation (ElmProgressbar::Vertical); + pb = Progressbar::factory (*win); + pb->setOrientation (Progressbar::Vertical); pb->setAlignHintSize (EVAS_HINT_FILL, 0.5); pb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); pb->setSpanSize (80); @@ -162,12 +162,12 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info) pb->show (); _test_progressbar.pb5 = pb; - ic2 = ElmIcon::factory (*win); + ic2 = Icon::factory (*win); ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic2->setAspectHintSize (EVAS_ASPECT_CONTROL_HORIZONTAL, Size (1, 1)); - pb = ElmProgressbar::factory (*win); - pb->setOrientation (ElmProgressbar::Vertical); + pb = Progressbar::factory (*win); + pb->setOrientation (Progressbar::Vertical); pb->setLabel ("Label"); pb->setIcon (*ic2); pb->setInverted (true); @@ -179,7 +179,7 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info) pb->show (); _test_progressbar.pb6 = pb; - pb = ElmProgressbar::factory (*win); + pb = Progressbar::factory (*win); pb->setStyle ("wheel"); pb->setLabel ("Style: wheel"); pb->setAlignHintSize (EVAS_HINT_FILL, 0.5); @@ -188,19 +188,19 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info) pb->show (); _test_progressbar.pb7 = pb; - ElmBox *bt_bx = ElmBox::factory (*win); - bt_bx->setOrientation (ElmBox::Horizontal); + Box *bt_bx = Box::factory (*win); + bt_bx->setOrientation (Box::Horizontal); bt_bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->packEnd (*bt_bx); bt_bx->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Start"); bt->getEventSignal ("clicked")->connect (sigc::ptr_fun (&my_progressbar_test_start)); bt_bx->packEnd (*bt); bt->show (); - bt = ElmButton::factory (*win); + bt = Button::factory (*win); bt->setLabel ("Stop"); bt->getEventSignal ("clicked")->connect (sigc::ptr_fun (&my_progressbar_test_stop)); bt_bx->packEnd (*bt); diff --git a/eflxx_examples/src/elementaryxx/full/test_radio.cpp b/eflxx_examples/src/elementaryxx/full/test_radio.cpp index 39a9df3..0a5fec7 100644 --- a/eflxx_examples/src/elementaryxx/full/test_radio.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_radio.cpp @@ -2,28 +2,28 @@ void test_radio (void *data, Evas_Object *obj, void *event_info) { - ElmRadio *rd = NULL; - ElmRadio *rdg = NULL; - ElmIcon *ic = NULL; + Radio *rd = NULL; + Radio *rdg = NULL; + Icon *ic = NULL; - ElmWindow *win = ElmWindow::factory ("radio", ELM_WIN_BASIC); + Window *win = Window::factory ("radio", ELM_WIN_BASIC); win->setTitle ("Radios"); win->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); win->addObjectResize (*bx); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); 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->setAlignHintSize (EVAS_HINT_FILL, 0.5); rd->setLabel ("Icon sized to radio"); @@ -33,10 +33,10 @@ void test_radio (void *data, Evas_Object *obj, void *event_info) ic->show (); rdg = rd; - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setScale (false, false); - rd = ElmRadio::factory (*win); + rd = Radio::factory (*win); rd->setStateValue (1); rd->addGroup (*rdg); rd->setLabel ("Icon no scale"); @@ -45,14 +45,14 @@ void test_radio (void *data, Evas_Object *obj, void *event_info) rd->show (); ic->show (); - rd = ElmRadio::factory (*win); + rd = Radio::factory (*win); rd->setStateValue (2); rd->addGroup (*rdg); rd->setLabel ("Label Only"); bx->packEnd (*rd); rd->show (); - rd = ElmRadio::factory (*win); + rd = Radio::factory (*win); rd->setStateValue (3); rd->addGroup (*rdg); rd->setLabel ("Disabled"); @@ -60,10 +60,10 @@ void test_radio (void *data, Evas_Object *obj, void *event_info) bx->packEnd (*rd); rd->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setScale (false, false); - rd = ElmRadio::factory (*win); + rd = Radio::factory (*win); rd->setStateValue (4); rd->addGroup (*rdg); rd->setIcon (*ic); @@ -71,10 +71,10 @@ void test_radio (void *data, Evas_Object *obj, void *event_info) rd->show (); ic->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setScale (false, false); - rd = ElmRadio::factory (*win); + rd = Radio::factory (*win); rd->setStateValue (5); rd->addGroup (*rdg); rd->setIcon (*ic); diff --git a/eflxx_examples/src/elementaryxx/full/test_slider.cpp b/eflxx_examples/src/elementaryxx/full/test_slider.cpp index 91bdf37..aec1625 100644 --- a/eflxx_examples/src/elementaryxx/full/test_slider.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_slider.cpp @@ -2,29 +2,29 @@ void test_slider (void *data, Evas_Object *obj, void *event_info) { - ElmIcon *ic = NULL; - ElmSlider *sl = NULL; + Icon *ic = NULL; + Slider *sl = NULL; - ElmWindow *win = ElmWindow::factory ("slider", ELM_WIN_BASIC); + Window *win = Window::factory ("slider", ELM_WIN_BASIC); win->setTitle ("Slider"); win->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); win->addObjectResize (*bx); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Size (1, 1)); ic->show (); - sl = ElmSlider::factory (*win); + sl = Slider::factory (*win); sl->setLabel ("Label"); sl->setIcon (*ic); sl->setUnitFormat ("%1.1f units"); @@ -34,7 +34,7 @@ void test_slider (void *data, Evas_Object *obj, void *event_info) bx->packEnd (*sl); sl->show (); - sl = ElmSlider::factory (*win); + sl = Slider::factory (*win); sl->setLabel ("Label 2"); sl->setSpanSize (80); sl->setIndicatorFormat ("%3.0f"); @@ -46,7 +46,7 @@ void test_slider (void *data, Evas_Object *obj, void *event_info) bx->packEnd (*sl); sl->show (); - sl = ElmSlider::factory (*win); + sl = Slider::factory (*win); sl->setLabel ("Label 3"); sl->setUnitFormat ("units"); sl->setSpanSize (40); @@ -60,12 +60,12 @@ void test_slider (void *data, Evas_Object *obj, void *event_info) bx->packEnd (*sl); sl->show (); - ic = ElmIcon::factory (*win); + ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic->setAspectHintSize (EVAS_ASPECT_CONTROL_HORIZONTAL, Size (1, 1)); ic->show (); - sl = ElmSlider::factory (*win); + sl = Slider::factory (*win); sl->setLabel ("Label 4"); sl->setIcon (*ic); sl->setUnitFormat ("units"); @@ -75,7 +75,7 @@ void test_slider (void *data, Evas_Object *obj, void *event_info) sl->setIndicatorFormat ("%1.1f"); sl->setValue (0.2); sl->setScale (1.0); - sl->setOrientation (ElmSlider::Vertical); + sl->setOrientation (Slider::Vertical); bx->packEnd (*sl); sl->show (); diff --git a/eflxx_examples/src/elementaryxx/full/test_spinner.cpp b/eflxx_examples/src/elementaryxx/full/test_spinner.cpp index 358f593..a1b1723 100644 --- a/eflxx_examples/src/elementaryxx/full/test_spinner.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_spinner.cpp @@ -2,23 +2,23 @@ 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->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); win->addObjectResize (*bx); bx->show (); - sp = ElmSpinner::factory (*win); + sp = Spinner::factory (*win); sp->setLabelFormat ("%1.1f units"); sp->setStep (1.3); sp->setWrap (true); @@ -28,7 +28,7 @@ void test_spinner(void *data, Evas_Object *obj, void *event_info) bx->packEnd (*sp); sp->show (); - sp = ElmSpinner::factory (*win); + sp = Spinner::factory (*win); sp->setLabelFormat ("%1.1f units"); sp->setStep (1.3); sp->setWrap (true); @@ -39,7 +39,7 @@ void test_spinner(void *data, Evas_Object *obj, void *event_info) bx->packEnd (*sp); sp->show (); - sp = ElmSpinner::factory (*win); + sp = Spinner::factory (*win); sp->setLabelFormat ("Disabled %.0f"); sp->setDisabled (true); sp->setMinMax (-50.0, 250.0); diff --git a/eflxx_examples/src/elementaryxx/full/test_table.cpp b/eflxx_examples/src/elementaryxx/full/test_table.cpp index ae8de23..420aa4b 100644 --- a/eflxx_examples/src/elementaryxx/full/test_table.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_table.cpp @@ -1,57 +1,59 @@ #include "test.h" + + 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->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmTable *tb = ElmTable::factory (*win); + Table *tb = Table::factory (*win); win->addObjectResize (*tb); tb->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); tb->show (); - ElmButton *bt = ElmButton::factory (*win); + Button *bt = Button::factory (*win); bt->setLabel ("Button 1"); bt->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); tb->pack (*bt, Rect (0, 0, 1, 1)); bt->show (); - ElmButton *bt2 = ElmButton::factory (*win); + Button *bt2 = Button::factory (*win); bt2->setLabel ("Button 2"); bt2->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt2->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); tb->pack (*bt2, Rect (1, 0, 1, 1)); bt2->show (); - ElmButton *bt3 = ElmButton::factory (*win); + Button *bt3 = Button::factory (*win); bt3->setLabel ("Button 3"); bt3->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt3->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); tb->pack (*bt3, Rect (2, 0, 1, 1)); bt3->show (); - ElmButton *bt4 = ElmButton::factory (*win); + Button *bt4 = Button::factory (*win); bt4->setLabel ("Button 4"); bt4->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt4->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); tb->pack (*bt4, Rect (0, 1, 2, 1)); bt4->show (); - ElmButton *bt5 = ElmButton::factory (*win); + Button *bt5 = Button::factory (*win); bt5->setLabel ("Button 5"); bt5->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt5->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); tb->pack (*bt5, Rect (2, 1, 1, 3)); bt5->show (); - ElmButton *bt6 = ElmButton::factory (*win); + Button *bt6 = Button::factory (*win); bt6->setLabel ("Button 6"); bt6->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bt6->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/eflxx_examples/src/elementaryxx/full/test_toggle.cpp b/eflxx_examples/src/elementaryxx/full/test_toggle.cpp index 95a3ad8..c9bb59b 100644 --- a/eflxx_examples/src/elementaryxx/full/test_toggle.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_toggle.cpp @@ -1,25 +1,27 @@ #include "test.h" + + 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->setAutoDel (true); - ElmBackground *bg = ElmBackground::factory (*win); + Background *bg = Background::factory (*win); win->addObjectResize (*bg); bg->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bg->show (); - ElmBox *bx = ElmBox::factory (*win); + Box *bx = Box::factory (*win); win->addObjectResize (*bx); bx->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); bx->show (); - ElmIcon *ic = ElmIcon::factory (*win); + Icon *ic = Icon::factory (*win); ic->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); 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->setAlignHintSize (EVAS_HINT_FILL, 0.5); tg->setLabel ("Icon sized to toggle"); @@ -30,26 +32,26 @@ void test_toggle (void *data, Evas_Object *obj, void *event_info) tg->show (); ic->show (); - ElmIcon *ic2 = ElmIcon::factory (*win); + Icon *ic2 = Icon::factory (*win); ic2->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic2->setScale (false, false); - ElmToggle *tg2 = ElmToggle::factory (*win); + Toggle *tg2 = Toggle::factory (*win); tg2->setLabel ("Icon no scale"); tg2->setIcon (*ic2); bx->packEnd (*tg2); tg2->show (); ic2->show (); - ElmToggle *tg3 = ElmToggle::factory (*win); + Toggle *tg3 = Toggle::factory (*win); tg3->setLabel ("Label Only"); tg3->setLabelsStates ("Big long fun times label", "Small long happy fun label"); bx->packEnd (*tg3); tg3->show (); - ElmIcon *ic3 = ElmIcon::factory (*win); + Icon *ic3 = Icon::factory (*win); ic3->setFile (searchPixmapFile ("elementaryxx/logo_small.png")); ic3->setScale (false, false); - ElmToggle *tg4 = ElmToggle::factory (*win); + Toggle *tg4 = Toggle::factory (*win); tg4->setIcon (*ic3); bx->packEnd (*tg4); tg4->show (); diff --git a/eflxx_examples/src/elementaryxx/simple/main.cpp b/eflxx_examples/src/elementaryxx/simple/main.cpp index 0641679..570a57a 100644 --- a/eflxx_examples/src/elementaryxx/simple/main.cpp +++ b/eflxx_examples/src/elementaryxx/simple/main.cpp @@ -7,14 +7,15 @@ #include "../../common/searchFile.h" using namespace std; -using namespace efl; +using namespace Eflxx; +using namespace Elmxx; static void my_win_del(Evas_Object *obj, void *event_info) { // TODO /* 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) @@ -24,29 +25,29 @@ static void testFunc (Evas_Object *obj, void *event_info) 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)); - ElmBackground *bg = ElmBackground::factory (*elmWin); + Background *bg = Background::factory (*elmWin); 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.setGeometry (Rect (100,100, 100, 100)); ei.show (); - ElmButton *elmButton = ElmButton::factory (*elmWin); - ElmClock *elmClock = ElmClock::factory (*elmWin); + Button *elmButton = Button::factory (*elmWin); + Clock *elmClock = Clock::factory (*elmWin); elmWin->addMember (ei); - ElmToggle *elmToggle = ElmToggle::factory (*elmWin); - ElmScroller *elmScroller = ElmScroller::factory (*elmWin); - ElmEntry *elmEntry = ElmEntry::factory (*elmWin); - ElmSlider *elmSlider = ElmSlider::factory (*elmWin); + Toggle *elmToggle = Toggle::factory (*elmWin); + Scroller *elmScroller = Scroller::factory (*elmWin); + Entry *elmEntry = Entry::factory (*elmWin); + Slider *elmSlider = Slider::factory (*elmWin); bg->setWeightHintSize (1.0, 1.0); elmWin->addObjectResize (*bg); diff --git a/eflxx_examples/src/emotionxx/simple/main.cpp b/eflxx_examples/src/emotionxx/simple/main.cpp index abfe4f0..e81c570 100644 --- a/eflxx_examples/src/emotionxx/simple/main.cpp +++ b/eflxx_examples/src/emotionxx/simple/main.cpp @@ -1,10 +1,10 @@ -#include +#include #include #include -#include +#include #include "../../common/searchFile.h" -using namespace efl; +using namespace Eflxx; #define WIDTH 320 #define HEIGHT 240 @@ -17,19 +17,19 @@ using namespace std; int main( int argc, const char **argv ) { /* 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 ) { cerr << "Usage: " << argv[0] << "