From: Enlightenment S. <no-...@en...> - 2009-07-17 16:50:01
|
Log: changed delete design: - not longer possible to delete a C++ object. - now it needs to be freed woth the destroy() member function or auto deleted by the parent - not complete tested, but the best way to adopt the suicide C design in C++ Author: andreas Date: 2009-07-17 09:49:55 -0700 (Fri, 17 Jul 2009) New Revision: 41403 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmApplication.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBackground.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBox.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBubble.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmButton.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmCheck.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmClock.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmEntry.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmFrame.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmIcon.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmImage.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmLabel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmList.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmRadio.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmScroller.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmSlider.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmTable.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmToggle.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWidget.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWindow.h trunk/BINDINGS/cxx/elementaryxx/src/ElmBackground.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmBox.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmBubble.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmButton.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmCheck.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmClock.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmEntry.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmFrame.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmIcon.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmImage.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmLabel.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmList.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmListItem.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmRadio.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmScroller.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmSlider.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmTable.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmToggle.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmWidget.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmWindow.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmApplication.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmApplication.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmApplication.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -14,8 +14,8 @@ ElmApplication (int argc, char **argv); virtual ~ElmApplication (); - void run (); - void exit (); + static void run (); + static void exit (); }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBackground.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBackground.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBackground.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,8 +15,6 @@ class ElmBackground : public ElmWidget { public: - virtual ~ElmBackground (); - static ElmBackground *factory (EvasObject &parent); void setFile (const std::string &file); @@ -31,6 +29,7 @@ ElmBackground (); // forbid standard constructor ElmBackground (const ElmBackground&); // forbid copy constructor ElmBackground (EvasObject &parent); // private construction -> use factory () + ~ElmBackground (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBox.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBox.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBox.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,8 +15,6 @@ class ElmBox : public ElmWidget { public: - virtual ~ElmBox (); - static ElmBox *factory (EvasObject &parent); void setHorizontal (bool horizontal); @@ -35,6 +33,7 @@ ElmBox (); // forbid standard constructor ElmBox (const ElmBox&); // forbid copy constructor ElmBox (EvasObject &parent); // private construction -> use factory () + ~ElmBox (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBubble.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBubble.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBubble.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,8 +15,6 @@ class ElmBubble : public ElmWidget { public: - virtual ~ElmBubble (); - static ElmBubble *factory (EvasObject &parent); void setLabel (const std::string &label); @@ -33,6 +31,7 @@ ElmBubble (); // forbid standard constructor ElmBubble (const ElmBubble&); // forbid copy constructor ElmBubble (EvasObject &parent); // private construction -> use factory () + ~ElmBubble (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmButton.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmButton.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmButton.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -18,9 +18,7 @@ */ class ElmButton : public ElmWidget { -public: - virtual ~ElmButton (); - +public: static ElmButton *factory (EvasObject &parent); void setLabel (const std::string &label); @@ -39,6 +37,7 @@ ElmButton (); // forbid standard constructor ElmButton (const ElmButton&); // forbid copy constructor ElmButton (EvasObject &parent); // private construction -> use factory () + ~ElmButton (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmCheck.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmCheck.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmCheck.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -19,8 +19,6 @@ class ElmCheck : public ElmWidget { public: - virtual ~ElmCheck (); - static ElmCheck *factory (EvasObject &parent); void setLabel (const std::string &label); @@ -35,6 +33,7 @@ ElmCheck (); // forbid standard constructor ElmCheck (const ElmCheck&); // forbid copy constructor ElmCheck (EvasObject &parent); // private construction -> use factory () + ~ElmCheck (); // forbid direct delete -> use ElmWidget::destroy() }; #if 0 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmClock.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmClock.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmClock.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -19,8 +19,6 @@ class ElmClock : public ElmWidget { public: - virtual ~ElmClock (); - static ElmClock *factory (EvasObject &parent); void setTime (int hrs, int min, int sec); // TODO @@ -37,6 +35,7 @@ ElmClock (); // forbid standard constructor ElmClock (const ElmClock&); // forbid copy constructor ElmClock (EvasObject &parent); // private construction -> use factory () + ~ElmClock (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmEntry.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmEntry.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmEntry.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -28,8 +28,6 @@ class ElmEntry : public ElmWidget { public: - virtual ~ElmEntry (); - static ElmEntry *factory (EvasObject &parent); void setSingleLine (bool singleLine); @@ -60,6 +58,7 @@ ElmEntry (); // forbid standard constructor ElmEntry (const ElmEntry&); // forbid copy constructor ElmEntry (EvasObject &parent); // private construction -> use factory () + ~ElmEntry (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmFrame.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmFrame.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmFrame.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,8 +15,6 @@ class ElmFrame : public ElmWidget { public: - virtual ~ElmFrame (); - static ElmFrame *factory (EvasObject &parent); void setLabel (const std::string &label); @@ -39,6 +37,7 @@ ElmFrame (); // forbid standard constructor ElmFrame (const ElmFrame&); // forbid copy constructor ElmFrame (EvasObject &parent); // private construction -> use factory () + ~ElmFrame (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmIcon.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmIcon.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmIcon.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -19,8 +19,6 @@ class ElmIcon : public ElmWidget { public: - virtual ~ElmIcon (); - static ElmIcon *factory (EvasObject &parent); bool setFile (const std::string &file); @@ -43,6 +41,7 @@ ElmIcon (); // forbid standard constructor ElmIcon (const ElmIcon&); // forbid copy constructor ElmIcon (EvasObject &parent); // private construction -> use factory () + ~ElmIcon (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmImage.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmImage.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmImage.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -19,8 +19,6 @@ class ElmImage : public ElmWidget { public: - virtual ~ElmImage (); - static ElmImage *factory (EvasObject &parent); bool setFile (const std::string &file, const std::string &group); @@ -41,6 +39,7 @@ ElmImage (); // forbid standard constructor ElmImage (const ElmImage&); // forbid copy constructor ElmImage (EvasObject &parent); // private construction -> use factory () + ~ElmImage (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmLabel.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmLabel.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmLabel.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,8 +15,6 @@ class ElmLabel : public ElmWidget { public: - virtual ~ElmLabel (); - static ElmLabel *factory (EvasObject &parent); void setLabel (const std::string &label); @@ -25,6 +23,7 @@ ElmLabel (); // forbid standard constructor ElmLabel (const ElmLabel&); // forbid copy constructor ElmLabel (EvasObject &parent); // private construction -> use factory () + ~ElmLabel (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmList.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmList.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -20,9 +20,7 @@ */ class ElmList : public ElmWidget { -public: - virtual ~ElmList (); - +public: static ElmList *factory (EvasObject &parent); void clear (); @@ -49,6 +47,7 @@ ElmList (); // forbid standard constructor ElmList (const ElmList&); // forbid copy constructor ElmList (EvasObject &parent); // private construction -> use factory () + ~ElmList (); // forbid direct delete -> use ElmWidget::destroy() }; #if 0 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmRadio.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmRadio.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmRadio.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -18,9 +18,7 @@ */ class ElmRadio : public ElmWidget { -public: - virtual ~ElmRadio (); - +public: static ElmRadio *factory (EvasObject &parent); void setLabel (const std::string &label); @@ -39,6 +37,7 @@ ElmRadio (); // forbid standard constructor ElmRadio (const ElmRadio&); // forbid copy constructor ElmRadio (EvasObject &parent); // private construction -> use factory () + ~ElmRadio (); // forbid direct delete -> use ElmWidget::destroy() }; #if 0 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmScroller.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmScroller.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmScroller.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -23,8 +23,6 @@ class ElmScroller : public ElmWidget { public: - virtual ~ElmScroller (); - static ElmScroller *factory (EvasObject &parent); void setContent (EvasObject &child); @@ -45,6 +43,7 @@ ElmScroller (); // forbid standard constructor ElmScroller (const ElmScroller&); // forbid copy constructor ElmScroller (EvasObject &parent); // private construction -> use factory () + ~ElmScroller (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmSlider.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmSlider.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmSlider.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -22,8 +22,6 @@ class ElmSlider : public ElmWidget { public: - virtual ~ElmSlider (); - static ElmSlider *factory (EvasObject &parent); void setLabel (const std::string &label); @@ -50,6 +48,7 @@ ElmSlider (); // forbid standard constructor ElmSlider (const ElmSlider&); // forbid copy constructor ElmSlider (EvasObject &parent); // private construction -> use factory () + ~ElmSlider (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmTable.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmTable.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmTable.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,8 +15,6 @@ class ElmTable : public ElmWidget { public: - virtual ~ElmTable (); - static ElmTable *factory (EvasObject &parent); void setHomogenous (bool homogenous); @@ -27,6 +25,7 @@ ElmTable (); // forbid standard constructor ElmTable (const ElmTable&); // forbid copy constructor ElmTable (EvasObject &parent); // private construction -> use factory () + ~ElmTable (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmToggle.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmToggle.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmToggle.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -18,9 +18,7 @@ */ class ElmToggle : public ElmWidget { -public: - virtual ~ElmToggle (); - +public: static ElmToggle *factory (EvasObject &parent); void setLabel (const std::string &label); @@ -40,14 +38,9 @@ ElmToggle (); // forbid standard constructor ElmToggle (const ElmToggle&); // forbid copy constructor ElmToggle (EvasObject &parent); // private construction -> use factory () + ~ElmToggle (); // forbid direct delete -> use ElmWidget::destroy() }; -#if 0 - -; - -#endif - } // end namespace efl #endif // ELM_TOGGLE_H Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWidget.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWidget.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWidget.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -14,15 +14,18 @@ class ElmWidget : public EvasSmart { public: - virtual ~ElmWidget (); protected: ElmWidget (); // allow only construction for child classes + virtual ~ElmWidget (); // forbid direct delete -> use destroy() void elmInit (); + + void destroy (); private: ElmWidget (const ElmWidget&); // forbid copy constructor + void freeSignalHandler (); }; Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWindow.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWindow.h 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWindow.h 2009-07-17 16:49:55 UTC (rev 41403) @@ -20,9 +20,7 @@ */ class ElmWindow : public ElmWidget { -public: - virtual ~ElmWindow (); - +public: static ElmWindow* factory (const std::string &name, Elm_Win_Type type); /*! @@ -77,6 +75,7 @@ // private construction -> use factory () ElmWindow (const std::string &name, Elm_Win_Type type); ElmWindow (EvasObject &parent, const std::string &name, Elm_Win_Type type); + ~ElmWindow (); // forbid direct delete -> use ElmWidget::destroy() }; } // end namespace efl Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmBackground.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmBackground.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmBackground.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmBackground::~ElmBackground () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmBackground::~ElmBackground () {} ElmBackground *ElmBackground::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmBox.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmBox.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmBox.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmBox::~ElmBox () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmBox::~ElmBox () {} ElmBox *ElmBox::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmBubble.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmBubble.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmBubble.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,10 +15,7 @@ elmInit (); } -ElmBubble::~ElmBubble () -{ - evas_object_del (o); -} +ElmBubble::~ElmBubble () {} ElmBubble *ElmBubble::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmButton.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmButton.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmButton.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmButton::~ElmButton () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmButton::~ElmButton () {} ElmButton *ElmButton::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmCheck.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmCheck.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmCheck.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmCheck::~ElmCheck () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmCheck::~ElmCheck () {} ElmCheck *ElmCheck::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmClock.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmClock.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmClock.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmClock::~ElmClock () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmClock::~ElmClock () {} ElmClock *ElmClock::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmEntry.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmEntry.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmEntry.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmEntry::~ElmEntry () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmEntry::~ElmEntry () {} ElmEntry *ElmEntry::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmFrame.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmFrame.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmFrame.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmFrame::~ElmFrame () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmFrame::~ElmFrame () {} ElmFrame *ElmFrame::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmIcon.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmIcon.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmIcon.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmIcon::~ElmIcon () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmIcon::~ElmIcon () {} ElmIcon *ElmIcon::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmImage.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmImage.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmImage.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmImage::~ElmImage () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmImage::~ElmImage () {} ElmImage *ElmImage::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmLabel.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmLabel.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmLabel.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmLabel::~ElmLabel () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmLabel::~ElmLabel () {} ElmLabel *ElmLabel::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmList.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmList.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmList::~ElmList () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmList::~ElmList () {} ElmList *ElmList::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmListItem.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmListItem.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmListItem.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -13,10 +13,7 @@ } -ElmListItem::~ElmListItem () -{ - // delete? -} +ElmListItem::~ElmListItem () {} ElmListItem *ElmListItem::factory () { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmRadio.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmRadio.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmRadio.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmRadio::~ElmRadio () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmRadio::~ElmRadio () {} ElmRadio *ElmRadio::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmScroller.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmScroller.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmScroller.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmScroller::~ElmScroller () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmScroller::~ElmScroller () {} ElmScroller *ElmScroller::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmSlider.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmSlider.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmSlider.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmSlider::~ElmSlider () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmSlider::~ElmSlider () {} ElmSlider *ElmSlider::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmTable.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmTable.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmTable.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmTable::~ElmTable () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmTable::~ElmTable () {} ElmTable *ElmTable::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmToggle.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmToggle.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmToggle.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -15,13 +15,7 @@ elmInit (); } -ElmToggle::~ElmToggle () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmToggle::~ElmToggle () {} ElmToggle *ElmToggle::factory (EvasObject &parent) { Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmWidget.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmWidget.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmWidget.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -8,15 +8,10 @@ namespace efl { -ElmWidget::ElmWidget () -{ +ElmWidget::ElmWidget () {} -} +ElmWidget::~ElmWidget () {} -ElmWidget::~ElmWidget () -{ -} - void ElmWidget::elmInit () { init (); // call init() from EvasObject @@ -24,10 +19,18 @@ signalHandleFree.connect (sigc::mem_fun (this, &ElmWidget::freeSignalHandler)); } +void ElmWidget::destroy () +{ + evas_object_del (o); + + // do a suicide as the delete operator isn't public available + // the reason is that the C design below is a suicide design :-( + delete (this); +} + void ElmWidget::freeSignalHandler () { //cout << "freeSignalHandler()" << endl; - mFree = false; // don't delete the C object. In this case it's yet deleted. delete (this); // !!!ATTENTION!!! // suicide for a C++ object is dangerous, but allowed Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmWindow.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmWindow.cpp 2009-07-17 15:33:49 UTC (rev 41402) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmWindow.cpp 2009-07-17 16:49:55 UTC (rev 41403) @@ -32,13 +32,7 @@ elmInit (); } -ElmWindow::~ElmWindow () -{ - if (mFree) - { - evas_object_del (o); - } -} +ElmWindow::~ElmWindow () {} void ElmWindow::setTitle (const std::string &title) { |
From: Enlightenment S. <no-...@en...> - 2009-08-01 13:18:52
|
Log: Layout C++ wrapper Author: andreas Date: 2009-08-01 06:18:38 -0700 (Sat, 01 Aug 2009) New Revision: 41556 Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmLayout.h trunk/BINDINGS/cxx/elementaryxx/src/ElmLayout.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBackground.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmTable.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWidget.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2009-07-31 17:06:11 UTC (rev 41555) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2009-08-01 13:18:38 UTC (rev 41556) @@ -27,6 +27,7 @@ #include "ElmList.h" #include "ElmListItem.h" #include "ElmTable.h" +#include "ElmLayout.h" #endif // ELEMENTARYXX_H Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBackground.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBackground.h 2009-07-31 17:06:11 UTC (rev 41555) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBackground.h 2009-08-01 13:18:38 UTC (rev 41556) @@ -4,9 +4,6 @@ /* STL */ #include <string> -/* EFL */ -#include <Elementary.h> - /* ELFxx */ #include "ElmWidget.h" Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmLayout.h Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmTable.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmTable.h 2009-07-31 17:06:11 UTC (rev 41555) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmTable.h 2009-08-01 13:18:38 UTC (rev 41556) @@ -4,9 +4,6 @@ /* STL */ #include <string> -/* EFL */ -#include <Elementary.h> - /* ELFxx */ #include "ElmWidget.h" Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWidget.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWidget.h 2009-07-31 17:06:11 UTC (rev 41555) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWidget.h 2009-08-01 13:18:38 UTC (rev 41556) @@ -5,6 +5,7 @@ #include <string> /* EFL */ +#include <Elementary.h> /* ELFxx */ #include <evasxx/EvasSmart.h> Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-07-31 17:06:11 UTC (rev 41555) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-08-01 13:18:38 UTC (rev 41556) @@ -21,7 +21,8 @@ ElmList.h \ ElmListItem.h \ ElmTable.h \ - ElmWidget.h + ElmWidget.h \ + ElmLayout.h libelementaryxxdir = \ $(pkgincludedir) Added: trunk/BINDINGS/cxx/elementaryxx/src/ElmLayout.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-07-31 17:06:11 UTC (rev 41555) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-08-01 13:18:38 UTC (rev 41556) @@ -37,5 +37,6 @@ ElmList.cpp \ ElmListItem.cpp \ ElmTable.cpp \ - ElmWidget.cpp + ElmWidget.cpp \ + ElmLayout.cpp |
From: Enlightenment S. <no-...@en...> - 2009-08-01 16:34:11
|
Log: added hover wrapper Author: andreas Date: 2009-08-01 09:34:01 -0700 (Sat, 01 Aug 2009) New Revision: 41559 Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmHover.h trunk/BINDINGS/cxx/elementaryxx/src/ElmHover.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2009-08-01 13:21:54 UTC (rev 41558) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2009-08-01 16:34:01 UTC (rev 41559) @@ -28,6 +28,7 @@ #include "ElmListItem.h" #include "ElmTable.h" #include "ElmLayout.h" +#include "ElmHover.h" #endif // ELEMENTARYXX_H Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmHover.h Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-08-01 13:21:54 UTC (rev 41558) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-08-01 16:34:01 UTC (rev 41559) @@ -22,7 +22,8 @@ ElmListItem.h \ ElmTable.h \ ElmWidget.h \ - ElmLayout.h + ElmLayout.h \ + ElmHover.h libelementaryxxdir = \ $(pkgincludedir) Added: trunk/BINDINGS/cxx/elementaryxx/src/ElmHover.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-08-01 13:21:54 UTC (rev 41558) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-08-01 16:34:01 UTC (rev 41559) @@ -38,5 +38,6 @@ ElmListItem.cpp \ ElmTable.cpp \ ElmWidget.cpp \ - ElmLayout.cpp + ElmLayout.cpp \ + ElmHover.cpp |
From: Enlightenment S. <no-...@en...> - 2009-11-12 21:13:44
|
Log: implemented anchorview/block wrapper Author: andreas Date: 2009-11-12 13:03:34 -0800 (Thu, 12 Nov 2009) New Revision: 43646 Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmAnchorblock.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmAnchorview.h trunk/BINDINGS/cxx/elementaryxx/src/ElmAnchorblock.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmAnchorview.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2009-11-12 20:48:40 UTC (rev 43645) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2009-11-12 21:03:34 UTC (rev 43646) @@ -31,6 +31,8 @@ #include "ElmHover.h" #include "ElmNotepad.h" #include "ElmCheck.h" +#include "ElmAnchorview.h" +#include "ElmAnchorblock.h" #endif // ELEMENTARYXX_H Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-11-12 20:48:40 UTC (rev 43645) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-11-12 21:03:34 UTC (rev 43646) @@ -24,7 +24,9 @@ ElmObject.h \ ElmLayout.h \ ElmHover.h \ - ElmNotepad.h + ElmNotepad.h \ + ElmAnchorblock.h \ + ElmAnchorview.h libelementaryxxdir = \ $(pkgincludedir) Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-11-12 20:48:40 UTC (rev 43645) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-11-12 21:03:34 UTC (rev 43646) @@ -40,5 +40,7 @@ ElmObject.cpp \ ElmLayout.cpp \ ElmHover.cpp \ - ElmNotepad.cpp + ElmNotepad.cpp \ + ElmAnchorblock.cpp \ + ElmAnchorview.cpp |
From: Enlightenment S. <no-...@en...> - 2009-11-12 21:46:11
|
Log: added ElmSpinner Author: andreas Date: 2009-11-12 13:46:00 -0800 (Thu, 12 Nov 2009) New Revision: 43648 Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmSpinner.h trunk/BINDINGS/cxx/elementaryxx/src/ElmSpinner.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-11-12 21:17:23 UTC (rev 43647) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-11-12 21:46:00 UTC (rev 43648) @@ -26,7 +26,8 @@ ElmHover.h \ ElmNotepad.h \ ElmAnchorblock.h \ - ElmAnchorview.h + ElmAnchorview.h \ + ElmSpinner.h libelementaryxxdir = \ $(pkgincludedir) Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-11-12 21:17:23 UTC (rev 43647) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-11-12 21:46:00 UTC (rev 43648) @@ -42,5 +42,6 @@ ElmHover.cpp \ ElmNotepad.cpp \ ElmAnchorblock.cpp \ - ElmAnchorview.cpp + ElmAnchorview.cpp \ + ElmSpinner.cpp |
From: Enlightenment S. <no-...@en...> - 2009-11-15 12:50:08
|
Log: new wrapper for ElmProgressbar and ElmPanel Author: andreas Date: 2009-11-15 04:49:55 -0800 (Sun, 15 Nov 2009) New Revision: 43702 Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmPanel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmProgressbar.h trunk/BINDINGS/cxx/elementaryxx/src/ElmPanel.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmProgressbar.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2009-11-15 10:36:42 UTC (rev 43701) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2009-11-15 12:49:55 UTC (rev 43702) @@ -34,6 +34,8 @@ #include "ElmAnchorview.h" #include "ElmAnchorblock.h" #include "ElmSpinner.h" +#include "ElmProgressbar.h" +#include "ElmPanel.h" #endif // ELEMENTARYXX_H Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-11-15 10:36:42 UTC (rev 43701) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-11-15 12:49:55 UTC (rev 43702) @@ -27,7 +27,9 @@ ElmNotepad.h \ ElmAnchorblock.h \ ElmAnchorview.h \ - ElmSpinner.h + ElmSpinner.h \ + ElmProgressbar.h \ + ElmPanel.h libelementaryxxdir = \ $(pkgincludedir) Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-11-15 10:36:42 UTC (rev 43701) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-11-15 12:49:55 UTC (rev 43702) @@ -43,5 +43,7 @@ ElmNotepad.cpp \ ElmAnchorblock.cpp \ ElmAnchorview.cpp \ - ElmSpinner.cpp + ElmSpinner.cpp \ + ElmProgressbar.cpp \ + ElmPanel.cpp |
From: Enlightenment S. <no-...@en...> - 2009-11-15 22:06:14
|
Log: implement hideFormat extra Author: andreas Date: 2009-11-15 14:06:00 -0800 (Sun, 15 Nov 2009) New Revision: 43720 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmProgressbar.h trunk/BINDINGS/cxx/elementaryxx/src/ElmProgressbar.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmProgressbar.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmProgressbar.h 2009-11-15 21:54:31 UTC (rev 43719) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmProgressbar.h 2009-11-15 22:06:00 UTC (rev 43720) @@ -35,7 +35,26 @@ void setInverted (bool inverted); void setPulse (bool pulse); void pulse (bool state); + + /*! + * Set the format string of the unit area + * + * Sets the format string for the unit text. The unit text is provided a + * floating point value, so the unit text can display up to 1 floating point + * falue. Note that this is optional. Use a format string such as + * "%1.2f meters" for example. + * + * @param format The format string for the units display + * + * @ingroup Progressbar + */ void setUnitFormat (const std::string &format); + + /* + * Hide the unit area display + */ + void hideUnitFormat (); + void setValue (double val); double getValue (); }; Modified: trunk/BINDINGS/cxx/elementaryxx/src/ElmProgressbar.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/ElmProgressbar.cpp 2009-11-15 21:54:31 UTC (rev 43719) +++ trunk/BINDINGS/cxx/elementaryxx/src/ElmProgressbar.cpp 2009-11-15 22:06:00 UTC (rev 43720) @@ -62,6 +62,11 @@ elm_progressbar_unit_format_set (o, format.c_str ()); } +void ElmProgressbar::hideUnitFormat () +{ + elm_progressbar_unit_format_set (o, NULL); +} + void ElmProgressbar::setValue (double val) { elm_progressbar_value_set (o, val); |
From: Enlightenment S. <no-...@en...> - 2009-11-29 22:22:44
|
Log: new elementaryxx API with more namespaces Author: andreas Date: 2009-11-29 14:22:30 -0800 (Sun, 29 Nov 2009) New Revision: 44049 Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Anchorblock.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Anchorview.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Application.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Background.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Box.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Bubble.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Button.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Check.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Clock.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Entry.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Frame.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Hover.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Icon.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Image.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Label.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Layout.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/List.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ListItem.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Notepad.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Object.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Panel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Progressbar.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Radio.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Scroller.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Separator.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Slider.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Spinner.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Table.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Window.h trunk/BINDINGS/cxx/elementaryxx/src/Anchorblock.cpp trunk/BINDINGS/cxx/elementaryxx/src/Anchorview.cpp trunk/BINDINGS/cxx/elementaryxx/src/Application.cpp trunk/BINDINGS/cxx/elementaryxx/src/Background.cpp trunk/BINDINGS/cxx/elementaryxx/src/Box.cpp trunk/BINDINGS/cxx/elementaryxx/src/Bubble.cpp trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp trunk/BINDINGS/cxx/elementaryxx/src/Check.cpp trunk/BINDINGS/cxx/elementaryxx/src/Clock.cpp trunk/BINDINGS/cxx/elementaryxx/src/Entry.cpp trunk/BINDINGS/cxx/elementaryxx/src/Frame.cpp trunk/BINDINGS/cxx/elementaryxx/src/Hover.cpp trunk/BINDINGS/cxx/elementaryxx/src/Icon.cpp trunk/BINDINGS/cxx/elementaryxx/src/Image.cpp trunk/BINDINGS/cxx/elementaryxx/src/Label.cpp trunk/BINDINGS/cxx/elementaryxx/src/Layout.cpp trunk/BINDINGS/cxx/elementaryxx/src/List.cpp trunk/BINDINGS/cxx/elementaryxx/src/ListItem.cpp trunk/BINDINGS/cxx/elementaryxx/src/Notepad.cpp trunk/BINDINGS/cxx/elementaryxx/src/Object.cpp trunk/BINDINGS/cxx/elementaryxx/src/Panel.cpp trunk/BINDINGS/cxx/elementaryxx/src/Progressbar.cpp trunk/BINDINGS/cxx/elementaryxx/src/Radio.cpp trunk/BINDINGS/cxx/elementaryxx/src/Scroller.cpp trunk/BINDINGS/cxx/elementaryxx/src/Separator.cpp trunk/BINDINGS/cxx/elementaryxx/src/Slider.cpp trunk/BINDINGS/cxx/elementaryxx/src/Spinner.cpp trunk/BINDINGS/cxx/elementaryxx/src/Table.cpp trunk/BINDINGS/cxx/elementaryxx/src/Toggle.cpp trunk/BINDINGS/cxx/elementaryxx/src/Window.cpp Removed: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmAnchorblock.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmAnchorview.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmApplication.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBackground.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBox.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmBubble.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmButton.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmCheck.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmClock.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmEntry.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmFrame.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmHover.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmIcon.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmImage.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmLabel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmLayout.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmList.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmListItem.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmNotepad.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmObject.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmPanel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmProgressbar.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmRadio.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmScroller.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmSeparator.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmSlider.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmSpinner.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmTable.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ElmWindow.h trunk/BINDINGS/cxx/elementaryxx/src/ElmAnchorblock.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmAnchorview.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmApplication.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmBackground.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmBox.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmBubble.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmButton.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmCheck.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmClock.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmEntry.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmFrame.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmHover.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmIcon.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmImage.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmLabel.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmLayout.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmList.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmListItem.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmNotepad.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmObject.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmPanel.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmProgressbar.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmRadio.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmScroller.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmSeparator.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmSlider.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmSpinner.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmTable.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmToggle.cpp trunk/BINDINGS/cxx/elementaryxx/src/ElmWindow.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Anchorblock.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Anchorview.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Application.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Background.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Box.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Bubble.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Button.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Check.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Clock.h ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2009-11-29 21:40:46 UTC (rev 44048) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2009-11-29 22:22:30 UTC (rev 44049) @@ -7,35 +7,35 @@ * #include "Elementaryxx.h". */ -#include "ElmApplication.h" -#include "ElmObject.h" -#include "ElmWindow.h" -#include "ElmButton.h" -#include "ElmClock.h" -#include "ElmScroller.h" -#include "ElmToggle.h" -#include "ElmEntry.h" -#include "ElmSlider.h" -#include "ElmLabel.h" -#include "ElmBackground.h" -#include "ElmRadio.h" -#include "ElmImage.h" -#include "ElmIcon.h" -#include "ElmBubble.h" -#include "ElmBox.h" -#include "ElmFrame.h" -#include "ElmList.h" -#include "ElmListItem.h" -#include "ElmTable.h" -#include "ElmLayout.h" -#include "ElmHover.h" -#include "ElmNotepad.h" -#include "ElmCheck.h" -#include "ElmAnchorview.h" -#include "ElmAnchorblock.h" -#include "ElmSpinner.h" -#include "ElmProgressbar.h" -#include "ElmPanel.h" +#include "Application.h" +#include "Object.h" +#include "Window.h" +#include "Button.h" +#include "Clock.h" +#include "Scroller.h" +#include "Toggle.h" +#include "Entry.h" +#include "Slider.h" +#include "Label.h" +#include "Background.h" +#include "Radio.h" +#include "Image.h" +#include "Icon.h" +#include "Bubble.h" +#include "Box.h" +#include "Frame.h" +#include "List.h" +#include "ListItem.h" +#include "Table.h" +#include "Layout.h" +#include "Hover.h" +#include "Notepad.h" +#include "Check.h" +#include "Anchorview.h" +#include "Anchorblock.h" +#include "Spinner.h" +#include "Progressbar.h" +#include "Panel.h" #endif // ELEMENTARYXX_H Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Entry.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Frame.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Hover.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Icon.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Image.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Label.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Layout.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/List.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ListItem.h ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-11-29 21:40:46 UTC (rev 44048) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2009-11-29 22:22:30 UTC (rev 44049) @@ -1,36 +1,36 @@ libelementaryxx_HEADERS = \ - ElmApplication.h \ - ElmWindow.h \ + Application.h \ + Window.h \ Elementaryxx.h \ - ElmButton.h \ - ElmClock.h \ - ElmScroller.h \ - ElmToggle.h \ - ElmEntry.h \ - ElmCheck.h \ - ElmIcon.h \ - ElmImage.h \ - ElmRadio.h \ - ElmSlider.h \ - ElmBubble.h \ - ElmLabel.h \ - ElmBackground.h \ - ElmBox.h \ - ElmFrame.h \ - ElmList.h \ - ElmListItem.h \ - ElmTable.h \ - ElmObject.h \ - ElmLayout.h \ - ElmHover.h \ - ElmNotepad.h \ - ElmAnchorblock.h \ - ElmAnchorview.h \ - ElmSpinner.h \ - ElmProgressbar.h \ - ElmPanel.h \ - ElmSeparator.h + Button.h \ + Clock.h \ + Scroller.h \ + Toggle.h \ + Entry.h \ + Check.h \ + Icon.h \ + Image.h \ + Radio.h \ + Slider.h \ + Bubble.h \ + Label.h \ + Background.h \ + Box.h \ + Frame.h \ + List.h \ + ListItem.h \ + Table.h \ + Object.h \ + Layout.h \ + Hover.h \ + Notepad.h \ + Anchorblock.h \ + Anchorview.h \ + Spinner.h \ + Progressbar.h \ + Panel.h \ + Separator.h libelementaryxxdir = \ $(pkgincludedir) Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Notepad.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Panel.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Progressbar.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Radio.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Scroller.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Separator.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Slider.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Spinner.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Table.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Window.h ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Anchorblock.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Anchorview.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Application.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Background.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Box.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Bubble.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Check.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Clock.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Entry.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Frame.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Hover.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Icon.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Image.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Label.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Layout.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/List.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/ListItem.cpp ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-11-29 21:40:46 UTC (rev 44048) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2009-11-29 22:22:30 UTC (rev 44049) @@ -17,34 +17,34 @@ libelementaryxx.la libelementaryxx_la_SOURCES = \ - ElmApplication.cpp \ - ElmWindow.cpp \ - ElmButton.cpp \ - ElmClock.cpp \ - ElmScroller.cpp \ - ElmToggle.cpp \ - ElmEntry.cpp \ - ElmCheck.cpp \ - ElmIcon.cpp \ - ElmImage.cpp \ - ElmRadio.cpp \ - ElmSlider.cpp \ - ElmBubble.cpp \ - ElmLabel.cpp \ - ElmBackground.cpp \ - ElmBox.cpp \ - ElmFrame.cpp \ - ElmList.cpp \ - ElmListItem.cpp \ - ElmTable.cpp \ - ElmObject.cpp \ - ElmLayout.cpp \ - ElmHover.cpp \ - ElmNotepad.cpp \ - ElmAnchorblock.cpp \ - ElmAnchorview.cpp \ - ElmSpinner.cpp \ - ElmProgressbar.cpp \ - ElmPanel.cpp \ - ElmSeparator.cpp + Application.cpp \ + Window.cpp \ + Button.cpp \ + Clock.cpp \ + Scroller.cpp \ + Toggle.cpp \ + Entry.cpp \ + Check.cpp \ + Icon.cpp \ + Image.cpp \ + Radio.cpp \ + Slider.cpp \ + Bubble.cpp \ + Label.cpp \ + Background.cpp \ + Box.cpp \ + Frame.cpp \ + List.cpp \ + ListItem.cpp \ + Table.cpp \ + Object.cpp \ + Layout.cpp \ + Hover.cpp \ + Notepad.cpp \ + Anchorblock.cpp \ + Anchorview.cpp \ + Spinner.cpp \ + Progressbar.cpp \ + Panel.cpp \ + Separator.cpp Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Notepad.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Panel.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Progressbar.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Radio.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Scroller.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Separator.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Slider.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Spinner.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Table.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Toggle.cpp ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: trunk/BINDINGS/cxx/elementaryxx/src/Window.cpp ___________________________________________________________________ Added: svn:mergeinfo + |
From: Enlightenment S. <no-...@en...> - 2010-05-02 20:41:45
|
Log: start of genlist wrapper Author: andreas Date: 2010-05-02 13:41:38 -0700 (Sun, 02 May 2010) New Revision: 48565 Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2010-05-02 20:40:21 UTC (rev 48564) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2010-05-02 20:41:38 UTC (rev 48565) @@ -30,7 +30,8 @@ Spinner.h \ Progressbar.h \ Panel.h \ - Separator.h + Separator.h \ + GenList.h libelementaryxxdir = \ $(pkgincludedir) Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2010-05-02 20:40:21 UTC (rev 48564) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2010-05-02 20:41:38 UTC (rev 48565) @@ -46,5 +46,6 @@ Spinner.cpp \ Progressbar.cpp \ Panel.cpp \ - Separator.cpp + Separator.cpp \ + GenList.cpp |
From: Enlightenment S. <no-...@en...> - 2010-05-08 20:53:51
|
Log: some work for GenList Author: andreas Date: 2010-05-08 13:53:44 -0700 (Sat, 08 May 2010) New Revision: 48691 Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ListItem.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Object.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2010-05-08 20:37:20 UTC (rev 48690) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2010-05-08 20:53:44 UTC (rev 48691) @@ -37,6 +37,7 @@ #include "Progressbar.h" #include "Panel.h" #include "GenList.h" +#include "GenListDataModel.h" #endif // ELEMENTARYXX_H Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-05-08 20:37:20 UTC (rev 48690) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-05-08 20:53:44 UTC (rev 48691) @@ -9,6 +9,7 @@ /* ELFxx */ #include "Object.h" +#include "GenListDataModel.h" namespace Elmxx { @@ -16,6 +17,7 @@ * smart callbacks called: */ + class GenList : public Object { public: @@ -55,19 +57,49 @@ int getBlockCound (); + void setDataModel (GenListDataModel &model); + + /* operations to add items */ + + /*! + * Append item to the end of the genlist + * + * This appends the given item to the end of the list or the end of the + * children if the parent is given. + * + * @param obj The genlist object + * @param itc The item class for the item + * @param data The item data + * @param parent The parent item, or NULL if none + * @param flags Item flags + * @param func Convenience function called when item selected + * @param func_data Data passed to @p func above. + * @return A handle to the item added or NULL if not possible + * + * @ingroup Genlist + */ + void append (); + private: GenList (); // forbid standard constructor GenList (const GenList&); // forbid copy constructor GenList (Evasxx::Object &parent); // private construction -> use factory () ~GenList (); // forbid direct delete -> use Object::destroy() + + static void gl_sel (void *data, Evas_Object *obj, void *event_info); + + GenListDataModel *mModel; }; #if 0 /* operations to add items */ - EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); + EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, + const void *data, Elm_Genlist_Item *parent, + Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, + const void *func_data); EAPI Elm_Genlist_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ListItem.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ListItem.h 2010-05-08 20:37:20 UTC (rev 48690) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/ListItem.h 2010-05-08 20:53:44 UTC (rev 48691) @@ -1,5 +1,5 @@ -#ifndef ELMXX_LISTITEM_H -#define ELMXX_LISTITEM_H +#ifndef ELMXX_LIST_ITEM_H +#define ELMXX_LIST_ITEM_H /* STL */ #include <string> @@ -64,4 +64,4 @@ } // end namespace Elmxx -#endif // ELMXX_LISTITEM_H +#endif // ELMXX_LIST_ITEM_H Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2010-05-08 20:37:20 UTC (rev 48690) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2010-05-08 20:53:44 UTC (rev 48691) @@ -31,7 +31,9 @@ Progressbar.h \ Panel.h \ Separator.h \ - GenList.h + GenList.h \ + GenListItem.h \ + GenListDataModel.h libelementaryxxdir = \ $(pkgincludedir) Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-05-08 20:37:20 UTC (rev 48690) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-05-08 20:53:44 UTC (rev 48691) @@ -2,8 +2,12 @@ #include <config.h> #endif +/* Project */ #include "../include/elementaryxx/GenList.h" +/* STD */ +#include <cassert> + using namespace std; namespace Elmxx { @@ -110,4 +114,34 @@ return elm_genlist_block_count_get (o); } +void GenList::setDataModel (GenListDataModel &model) +{ + mModel = &model; +} + +void GenList::gl_sel (void *data, Evas_Object *obj, void *event_info) +{ + // TODO: sigc + printf("sel item data [%p] on genlist obj [%p], item pointer [%p]\n", data, obj, event_info); +} + +/* operations to add items */ + +void GenList::append () +{ + assert (mModel); + + Elm_Genlist_Item *gli; + + int i = 99; + + gli = elm_genlist_item_append (o, &mModel->mGLIC, + mModel /* item data */, + NULL/* parent */, + ELM_GENLIST_ITEM_NONE, + GenList::gl_sel/* func */, + (void *)(i * 10)/* func data */); + +} + } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2010-05-08 20:37:20 UTC (rev 48690) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2010-05-08 20:53:44 UTC (rev 48691) @@ -47,5 +47,7 @@ Progressbar.cpp \ Panel.cpp \ Separator.cpp \ - GenList.cpp + GenList.cpp \ + GenListItem.cpp \ + GenListDataModel.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/src/Object.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Object.cpp 2010-05-08 20:37:20 UTC (rev 48690) +++ trunk/BINDINGS/cxx/elementaryxx/src/Object.cpp 2010-05-08 20:53:44 UTC (rev 48691) @@ -40,7 +40,7 @@ delete (this); // !!!ATTENTION!!! // suicide for a C++ object is dangerous, but allowed - // the simple rule is that no member functions or member variables are allowed to access + // the simple rule is that no member functions or member variables are allowed to access after this point! } void Object::setScale (double scale) |
From: Enlightenment S. <no-...@en...> - 2010-05-26 21:01:43
|
Log: added more GenList API wrapper Author: andreas Date: 2010-05-26 14:01:36 -0700 (Wed, 26 May 2010) New Revision: 49215 Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListColumnConstructor.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListColumnSelector.h trunk/BINDINGS/cxx/elementaryxx/src/GenListColumnConstructor.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListColumnSelector.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-05-26 21:01:30 UTC (rev 49214) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-05-26 21:01:36 UTC (rev 49215) @@ -13,11 +13,247 @@ namespace Elmxx { +/* forward declarations */ +class GenListItem; +class GenListColumnConstructor; +class GenListColumnSelector; + /*! - * smart callbacks called: - + * @defgroup Genlist Genlist + * + * The aim was to have more expansive list that the simple list in + * Elementary that could have more flexible items and allow many more entries + * while still being fast and low on memory usage. At the same time it was + * also made to be able to do tree structures. But the price to pay is more + * complexity when it comes to usage. If all you want is a simple list with + * icons and a single label, use the normal List object. + * + * Signals that you can add callbacks for are: + * + * clicked - This is called when a user has double-clicked an item. The + * event_info parameter is the genlist item that was double-clicked. + * + * selected - This is called when a user has made an item selected. The + * event_info parameter is the genlist item that was selected. + * + * unselected - This is called when a user has made an item unselected. The + * event_info parameter is the genlist item that was unselected. + * + * expanded - This is called when elm_genlist_item_expanded_set() is called + * and the item is now meant to be expanded. The event_info parameter is the + * genlist item that was indicated to expand. It is the job of this callback + * to then fill in the child items. + * + * contracted - This is called when elm_genlist_item_expanded_set() is called + * and the item is now meant to be contracted. The event_info parameter is + * the genlist item that was indicated to contract. It is the job of this + * callback to then delete the child items + * + * expand,request - This is called when a user has indicated they want to + * expand a tree branch item. The callback should decide if the item can + * expand (has any children) and then call elm_genlist_item_expanded_set() + * appropriately to set the state. The event_info parameter is the genlist + * item that was indicated to expand. + * + * contract,request - This is called when a user has indicated they want to + * contract a tree branch item. The callback should decide if the item can + * contract (has any children) and then call elm_genlist_item_expanded_set() + * appropriately to set the state. The event_info parameter is the genlist + * item that was indicated to contract. + * + * realized - This is called when the item in the list is created as a real + * evas object. event_info parameter is the genlist item that was created. + * The object may be deleted at any time, so it is up to the caller to + * not use the object pointer from elm_genlist_item_object_get() in a way + * where it may point to freed objects. + * + * drag,start,up - This is called when the item in the list has been dragged + * (not scrolled) up. + * + * drag,start,down - This is called when the item in the list has been dragged + * (not scrolled) down. + * + * drag,start,left - This is called when the item in the list has been dragged + * (not scrolled) left. + * + * drag,start,right - This is called when the item in the list has been dragged + * (not scrolled) right. + * + * drag,stop - This is called when the item in the list has stopped being + * dragged. + * + * drag - This is called when the item in the list is being dragged. + * + * Genlist has a fairly large API, mostly because it's relatively complex, + * trying to be both expansive, powerful and efficient. First we will begin + * an overview o the theory behind genlist. + * + * Evas tracks every object you create. Every time it processes an event + * (mouse move, down, up etc.) it needs to walk through objects and find out + * what event that affects. Even worse every time it renders display updates, + * in order to just calculate what to re-draw, it needs to walk through many + * many many objects. Thus, the more objects you keep active, the more + * overhead Evas has in just doing its work. It is advisable to keep your + * active objects to the minimum working set you need. Also remember that + * object creation and deletion carries an overhead, so there is a + * middle-ground, which is not easily determined. But don't keep massive lists + * of objects you can't see or use. Genlist does this with list objects. It + * creates and destroys them dynamically as you scroll around. It groups them + * into blocks so it can determine the visibility etc. of a whole block at + * once as opposed to having to walk the whole list. This 2-level list allows + * for very large numbers of items to be in the list (tests have used up to + * 2,000,000 items). Also genlist employs a queue for adding items. As items + * may be different sizes, every item added needs to be calculated as to its + * size and thus this presents a lot of overhead on populating the list, this + * genlist employs a queue. Any item added is queued and spooled off over + * time, actually appearing some time later, so if your list has many members + * you may find it takes a while for them to all appear, with your process + * consuming a lot of CPU while it is busy spooling. + * + * Genlist also implements a tree structure, but it does so with callbacks to + * the application, with the application filling in tree structures when + * requested (allowing for efficient building of a very deep tree that could + * even be used for file-management). See the above smart signal callbacks for + * details. + * + * An item in the genlist world can have 0 or more text labels (they can be + * regular text or textblock – that's up to the style to determine), 0 or + * more icons (which are simply objects swallowed into the genlist item) and + * 0 or more boolean states that can be used for check, radio or other + * indicators by the edje theme style. An item may be one of several styles + * (Elementary provides 2 by default - “default” and “double_label”, but this + * can be extended by system or application custom themes/overlays/extensions). + * + * In order to implement the ability to add and delete items on the fly, + * Genlist implements a class/callback system where the application provides + * a structure with information about that type of item (genlist may contain + * multiple different items with different classes, states and styles). + * Genlist will call the functions in this struct (methods) when an item is + * “realized” (that is created dynamically while scrolling). All objects will + * simply be deleted when no longer needed with evas_object_del(). The + * Elm_Genlist_Item_Class structure contains the following members: + * + * item_style - This is a constant string and simply defines the name of the + * item style. It must be specified and the default should be “default”. + * + * func.label_get - This function is called when an actual item object is + * created. The data parameter is the data parameter passed to + * elm_genlist_item_append() and related item creation functions. The obj + * parameter is the genlist object and the part parameter is the string name + * of the text part in the edje design that is listed as one of the possible + * labels that can be set. This function must return a strudup()'ed string as + * the caller will free() it when done. + * + * func.icon_get - This function is called when an actual item object is + * created. The data parameter is the data parameter passed to + * elm_genlist_item_append() and related item creation functions. The obj + * parameter is the genlist object and the part parameter is the string name + * of the icon part in the edje design that is listed as one of the possible + * icons that can be set. This must return NULL for no object or a valid + * object. The object will be deleted by genlist on shutdown or when the item + * its unrealized. + * + * func.state_get - This function is called when an actual item object is + * created. The data parameter is the data parameter passed to + * elm_genlist_item_append() and related item creation functions. The obj + * parameter is the genlist object and the part parameter is the string name + * of the state part in the edje design that is listed as one of the possible + * states that can be set. Return 0 for false or 1 for true. Genlist will + * emit a signal to the edje object with “elm,state,XXX,active” “elm” when + * true (the default is false), where XXX is the name of the part. + * + * func.del - This is called when elm_genlist_item_del() is called on an + * item, elm_genlist_clear() is called on the genlist, or + * elm_genlist_item_subitems_clear() is called to clear sub-items. This is + * intended for use when actual genlist items are deleted, so any backing + * data attached to the item (e.g. its data parameter on creation) can be + * deleted. + * + * Items can be added by several calls. All of them return a Elm_Genlist_Item + * handle that is an internal member inside the genlist. They all take a data + * parameter that is meant to be used for a handle to the applications + * internal data (eg the struct with the original item data). The parent + * parameter is the parent genlist item this belongs to if it is a tree, and + * NULL if there is no parent. The flags can be a bitmask of + * ELM_GENLIST_ITEM_NONE and ELM_GENLIST_ITEM_SUBITEMS. If + * ELM_GENLIST_ITEM_SUBITEMS is set then this item is displayed as a item + * that is able to expand and have child items. The func parameter is a + * convenience callback that is called when the item is selected and the data + * parameter will be the func_data parameter, obj be the genlist object and + * vent_info will be the genlist item. + * + * elm_genlist_item_append() appends an item to the end of the list, or if + * there is a parent, to the end of all the child items of the parent. + * elm_genlist_item_prepend() is the same but prepends to the beginning of + * the list or children list. elm_genlist_item_insert_before() inserts at + * item before another item and elm_genlist_item_insert_after() inserts after + * the indicated item. + * + * The application can clear the list with elm_genlist_clear() which deletes + * all the items in the list and elm_genlist_item_del() will delete a specific + * item. elm_genlist_item_subitems_clear() will clear all items that are + * children of the indicated parent item. + * + * If the application wants multiple items to be able to be selected, + * elm_genlist_multi_select_set() can enable this. If the list is + * single-selection only (the default), then elm_genlist_selected_item_get() + * will return the selected item, if any, or NULL I none is selected. If the + * list is multi-select then elm_genlist_selected_items_get() will return a + * list (that is only valid as long as no items are modified (added, deleted, + * selected or unselected). + * + * To help inspect list items you can jump to the item at the top of the list + * with elm_genlist_first_item_get() which will return the item pointer, and + * similarly elm_genlist_last_item_get() gets the item at the end of the list. + * elm_genlist_item_next_get() and elm_genlist_item_prev_get() get the next + * and previous items respectively relative to the indicated item. Using + * these calls you can walk the entire item list/tree. Note that as a tree + * the items are flattened in the list, so elm_genlist_item_parent_get() will + * let you know which item is the parent (and thus know how to skip them if + * wanted). + * + * There are also convenience functions. elm_genlist_item_genlist_get() will + * return the genlist object the item belongs to. elm_genlist_item_show() + * will make the scroller scroll to show that specific item so its visible. + * elm_genlist_item_data_get() returns the data pointer set by the item + * creation functions. + * + * If an item changes (state of boolean changes, label or icons change), + * then use elm_genlist_item_update() to have genlist update the item with + * the new state. Genlist will re-realize the item thus call the functions + * in the _Elm_Genlist_Item_Class for that item. + * + * To programmatically (un)select an item use elm_genlist_item_selected_set(). + * To get its selected state use elm_genlist_item_selected_get(). Similarly + * to expand/contract and item and get its expanded state, use + * elm_genlist_item_expanded_set() and elm_genlist_item_expanded_get(). And + * again to make an item disabled (unable to be selected and appear + * differently) use elm_genlist_item_disabled_set() to set this and + * elm_genlist_item_disabled_get() to get the disabled state. + * + * In general to indicate how the genlist should expand items horizontally to + * fill the list area, use elm_genlist_horizontal_mode_set(). Valid modes are + * ELM_LIST_LIMIT and ELM_LIST_SCROLL . The default is ELM_LIST_SCROLL. This + * mode means that if items are too wide to fit, the scroller will scroll + * horizontally. Otherwise items are expanded to fill the width of the + * viewport of the scroller. If it is ELM_LIST_LIMIT, Items will be expanded + * to the viewport width and limited to that size. This can be combined with + * a different style that uses edjes' ellipsis feature (cutting text off like + * this: “tex...”). + * + * Items will only call their selection func and callback when first becoming + * selected. Any further clicks will do nothing, unless you enable always + * select with elm_genlist_always_select_mode_set(). This means even if + * selected, every click will make the selected callbacks be called. + * elm_genlist_no_select_mode_set() will turn off the ability to select + * items entirely and they will neither appear selected nor call selected + * callback functions. + * + * Remember that you can create new styles and add you own theme augmentation + * per application with elm_theme_extension_add(). If you absolutely must + * have a specific style that overrides any theme the user or system sets up + * you can use elm_theme_overlay_add() to add such a file. */ - class GenList : public Object { public: @@ -78,9 +314,17 @@ * * @ingroup Genlist */ + + //EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, + // const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, + // Evas_Smart_Cb func, const void *func_data); - void append (); + void append (GenListColumnConstructor *construction, GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + + // TODO: which type is event_info here instead of void*? + sigc::signal <void, const Evasxx::Object&, void*> signalSelect; + private: GenList (); // forbid standard constructor GenList (const GenList&); // forbid copy constructor Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h 2010-05-26 21:01:30 UTC (rev 49214) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h 2010-05-26 21:01:36 UTC (rev 49215) @@ -12,7 +12,11 @@ /* forward declarations */ class GenList; - +class Icon; +class Window; +class Object; +class GenListColumnConstructor; + class GenListDataModel { public: @@ -20,7 +24,15 @@ GenListDataModel (); - std::string getLabel (Evasxx::Object &obj, const std::string &part) const; + // TODO: implement these 4 functions pure virtual? + + std::string getLabel (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) const; + + Elmxx::Object *getIcon (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part); + + bool getState (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part); + + void del (GenListColumnConstructor *construction, Evasxx::Object &obj); private: static char *gl_label_get (const void *data, Evas_Object *obj, const char *part); Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h 2010-05-26 21:01:30 UTC (rev 49214) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h 2010-05-26 21:01:36 UTC (rev 49215) @@ -6,9 +6,13 @@ namespace Elmxx { +/* forward declarations */ +class GenList; + class GenListItem { public: + friend class GenList; private: Elm_Genlist_Item *mItem; Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2010-05-26 21:01:30 UTC (rev 49214) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2010-05-26 21:01:36 UTC (rev 49215) @@ -33,7 +33,9 @@ Separator.h \ GenList.h \ GenListItem.h \ - GenListDataModel.h + GenListDataModel.h \ + GenListColumnConstructor.h \ + GenListColumnSelector.h libelementaryxxdir = \ $(pkgincludedir) Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-05-26 21:01:30 UTC (rev 49214) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-05-26 21:01:36 UTC (rev 49215) @@ -4,6 +4,9 @@ /* Project */ #include "../include/elementaryxx/GenList.h" +#include "../include/elementaryxx/GenListItem.h" +#include "../include/elementaryxx/GenListColumnConstructor.h" +#include "../include/elementaryxx/GenListColumnSelector.h" /* STD */ #include <cassert> @@ -121,27 +124,56 @@ void GenList::gl_sel (void *data, Evas_Object *obj, void *event_info) { - // TODO: sigc - printf("sel item data [%p] on genlist obj [%p], item pointer [%p]\n", data, obj, event_info); + GenListColumnSelector *selection = (GenListColumnSelector*) data; + GenList *gl = selection->mGenList; + Evasxx::Object *eo = Evasxx::Object::objectLink (obj); + gl->signalSelect.emit (*eo, event_info); } /* operations to add items */ -void GenList::append () +void GenList::append (GenListColumnConstructor *construction, GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) { assert (mModel); Elm_Genlist_Item *gli; - - int i = 99; + bool internalConstruction = false; + bool internalSelection = false; + + if (!construction) + { + // create internal construction object if construction==NULL was given and delete if after adding + // this is needed to provide the user an easy API to add type save data to item append callbacks + internalConstruction = true; + construction = new GenListColumnConstructor (); + } + + if (!selection) + { + // create internal construction object if construction==NULL was given and delete if after adding + // this is needed to provide the user an easy API to add type save data to item append callbacks + internalSelection = true; + selection = new GenListColumnSelector (); + } + + construction->mDataModel = mModel; + selection->mGenList = this; gli = elm_genlist_item_append (o, &mModel->mGLIC, - mModel /* item data */, - NULL/* parent */, - ELM_GENLIST_ITEM_NONE, + construction /* item data */, + parent ? parent->mItem : NULL /* parent */, + flags, GenList::gl_sel/* func */, - (void *)(i * 10)/* func data */); + selection /* func data */); + if (internalConstruction) + { + delete construction; + } + if (internalSelection) + { + delete selection; + } } } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp 2010-05-26 21:01:30 UTC (rev 49214) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp 2010-05-26 21:01:36 UTC (rev 49215) @@ -1,5 +1,8 @@ /* Project */ #include "../include/elementaryxx/GenListDataModel.h" +#include "../include/elementaryxx/Icon.h" +#include "../include/elementaryxx/Window.h" +#include "../include/elementaryxx/GenListColumnConstructor.h" /* STD */ #include <iostream> @@ -17,43 +20,78 @@ mGLIC.func.del = GenListDataModel::gl_del; } -std::string GenListDataModel::getLabel (Evasxx::Object &obj, const std::string &part) const +std::string GenListDataModel::getLabel (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) const { cout << "GenListDataModel::getLabel" << endl; return "Item"; } +Elmxx::Object *GenListDataModel::getIcon (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) +{ + Window *win = static_cast <Window*> (&obj); + Icon *ic = Icon::factory (*win); + ic->setFile ("/home/andreas/Bilder/e_penguin/penguin.png"); + ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Eflxx::Size (1, 1)); + + //part: elm.swallow.icon + //part: elm.swallow.end + + return ic; +} + +bool GenListDataModel::getState (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) +{ + return true; +} + +void GenListDataModel::del (GenListColumnConstructor *construction, Evasxx::Object &obj) +{ + +} + /* wrappers */ char *GenListDataModel::gl_label_get (const void *data, Evas_Object *obj, const char *part) { cout << "gl_label_get" << endl; - - GenListDataModel *model = (GenListDataModel*) data; - Evasxx::Object *objWrap = Evasxx::Object::wrap (obj); - - std::string label = model->getLabel (*objWrap, part); - - // FIXME: from logic this should be deleted, but results in a segfault. no idea why... - //delete objWrap; - - return strdup (label.c_str ()); + + GenListColumnConstructor *construction = (GenListColumnConstructor*) data; + GenListDataModel *model = construction->mDataModel; + Evasxx::Object *objWrap = Evasxx::Object::objectLink (obj); + + const std::string &label = model->getLabel (construction, *objWrap, part); + + return (!label.empty ()) ? strdup (label.c_str ()) : NULL; } Evas_Object *GenListDataModel::gl_icon_get (const void *data, Evas_Object *obj, const char *part) { - return NULL; + GenListColumnConstructor *construction = (GenListColumnConstructor*) data; + GenListDataModel *model = construction->mDataModel; + Evasxx::Object *objWrap = Evasxx::Object::objectLink (obj); + + Object *objxx = model->getIcon (construction, *objWrap, part); + + return objxx ? objxx->obj () : NULL; } Eina_Bool GenListDataModel::gl_state_get (const void *data, Evas_Object *obj, const char *part) { - return true; + GenListColumnConstructor *construction = (GenListColumnConstructor*) data; + GenListDataModel *model = construction->mDataModel; + Evasxx::Object *objWrap = Evasxx::Object::objectLink (obj); + + return model->getState (construction, *objWrap, part); } void GenListDataModel::gl_del(const void *data, Evas_Object *obj) { - printf ("del\n"); + GenListColumnConstructor *construction = (GenListColumnConstructor*) data; + GenListDataModel *model = construction->mDataModel; + Evasxx::Object *objWrap = Evasxx::Object::objectLink (obj); + + return model->del (construction, *objWrap); } } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2010-05-26 21:01:30 UTC (rev 49214) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2010-05-26 21:01:36 UTC (rev 49215) @@ -49,5 +49,7 @@ Separator.cpp \ GenList.cpp \ GenListItem.cpp \ - GenListDataModel.cpp + GenListDataModel.cpp \ + GenListColumnConstructor.cpp \ + GenListColumnSelector.cpp |
From: Enlightenment S. <no-...@en...> - 2010-05-27 20:30:45
|
Log: Fixed the crash at list element selection Author: andreas Date: 2010-05-27 13:30:39 -0700 (Thu, 27 May 2010) New Revision: 49238 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-05-27 20:30:31 UTC (rev 49237) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-05-27 20:30:39 UTC (rev 49238) @@ -332,8 +332,12 @@ ~GenList (); // forbid direct delete -> use Object::destroy() static void gl_sel (void *data, Evas_Object *obj, void *event_info); + + void glSelected (Evasxx::Object &eo, void *event_info); GenListDataModel *mModel; + + std::list <GenListColumnSelector*> mInternalSelList; }; #if 0 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h 2010-05-27 20:30:31 UTC (rev 49237) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h 2010-05-27 20:30:39 UTC (rev 49238) @@ -22,16 +22,15 @@ public: friend class GenList; - GenListDataModel (); - - // TODO: implement these 4 functions pure virtual? - + GenListDataModel (const std::string &style); + + // TODO: empty default implementation for these 4 as virtuals leads into nullpointer exception. why? std::string getLabel (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) const; - + Elmxx::Object *getIcon (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part); - + bool getState (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part); - + void del (GenListColumnConstructor *construction, Evasxx::Object &obj); private: @@ -41,6 +40,7 @@ static void gl_del (const void *data, Evas_Object *obj); Elm_Genlist_Item_Class mGLIC; + std::string mStyle; }; } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-05-27 20:30:31 UTC (rev 49237) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-05-27 20:30:39 UTC (rev 49238) @@ -7,6 +7,7 @@ #include "../include/elementaryxx/GenListItem.h" #include "../include/elementaryxx/GenListColumnConstructor.h" #include "../include/elementaryxx/GenListColumnSelector.h" +#include "localUtil.h" /* STD */ #include <cassert> @@ -22,7 +23,10 @@ elmInit (); } -GenList::~GenList () {} +GenList::~GenList () +{ + delete_stl_container <std::list <GenListColumnSelector*>, GenListColumnSelector*> (mInternalSelList); +} GenList *GenList::factory (Evasxx::Object &parent) { @@ -125,11 +129,21 @@ void GenList::gl_sel (void *data, Evas_Object *obj, void *event_info) { GenListColumnSelector *selection = (GenListColumnSelector*) data; + assert (selection); GenList *gl = selection->mGenList; + assert (gl); Evasxx::Object *eo = Evasxx::Object::objectLink (obj); - gl->signalSelect.emit (*eo, event_info); + assert (eo); + gl->glSelected (*eo, event_info); } +void GenList::glSelected (Evasxx::Object &eo, void *event_info) +{ + cout << "GenList::glSelected" << endl; + // FIXME: this call seems to segfault after the list is constructed after 2 or 3 seconds + //signalSelect.emit (eo, event_info); +} + /* operations to add items */ void GenList::append (GenListColumnConstructor *construction, GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) @@ -150,7 +164,7 @@ if (!selection) { - // create internal construction object if construction==NULL was given and delete if after adding + // create internal construction object if selection==NULL was given and delete if after adding // this is needed to provide the user an easy API to add type save data to item append callbacks internalSelection = true; selection = new GenListColumnSelector (); @@ -172,8 +186,8 @@ } if (internalSelection) { - delete selection; - } + mInternalSelList.push_back (selection); + } } } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp 2010-05-27 20:30:31 UTC (rev 49237) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp 2010-05-27 20:30:39 UTC (rev 49238) @@ -11,9 +11,11 @@ namespace Elmxx { -GenListDataModel::GenListDataModel () +GenListDataModel::GenListDataModel (const std::string &style) : + mStyle (style) { - mGLIC.item_style = "default"; + cout << "creating GenListDataModel with style = " << mStyle << endl; + mGLIC.item_style = mStyle.c_str (); mGLIC.func.label_get = GenListDataModel::gl_label_get; mGLIC.func.icon_get = GenListDataModel::gl_icon_get; mGLIC.func.state_get = GenListDataModel::gl_state_get; @@ -61,6 +63,9 @@ Evasxx::Object *objWrap = Evasxx::Object::objectLink (obj); const std::string &label = model->getLabel (construction, *objWrap, part); + static int counter = 0; + ++counter; + cout << "label: " << label << " ," << counter << endl; return (!label.empty ()) ? strdup (label.c_str ()) : NULL; } Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2010-05-27 20:30:31 UTC (rev 49237) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2010-05-27 20:30:39 UTC (rev 49238) @@ -51,5 +51,7 @@ GenListItem.cpp \ GenListDataModel.cpp \ GenListColumnConstructor.cpp \ - GenListColumnSelector.cpp + GenListColumnSelector.cpp \ + localUtil.cpp \ + localUtil.h |
From: Enlightenment S. <no-...@en...> - 2010-05-30 22:27:59
|
Log: fixed some bugs and interface better now Author: andreas Date: 2010-05-30 15:27:52 -0700 (Sun, 30 May 2010) New Revision: 49338 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2010-05-30 22:07:24 UTC (rev 49337) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2010-05-30 22:27:52 UTC (rev 49338) @@ -38,6 +38,9 @@ #include "Panel.h" #include "GenList.h" #include "GenListDataModel.h" +#include "GenListColumnSelector.h" +#include "GenListColumnConstructor.h" +#include "GenListItem.h" #endif // ELEMENTARYXX_H Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-05-30 22:07:24 UTC (rev 49337) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-05-30 22:27:52 UTC (rev 49338) @@ -338,6 +338,7 @@ GenListDataModel *mModel; std::list <GenListColumnSelector*> mInternalSelList; + std::list <GenListColumnConstructor*> mInternalConstructList; }; #if 0 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h 2010-05-30 22:07:24 UTC (rev 49337) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h 2010-05-30 22:27:52 UTC (rev 49338) @@ -23,16 +23,16 @@ friend class GenList; GenListDataModel (const std::string &style); + virtual ~GenListDataModel () {} - // TODO: empty default implementation for these 4 as virtuals leads into nullpointer exception. why? - std::string getLabel (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) const; + virtual std::string getLabel (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) const = 0; - Elmxx::Object *getIcon (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part); + virtual Elmxx::Object *getIcon (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) = 0; - bool getState (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part); + virtual bool getState (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) = 0; + + virtual void del (GenListColumnConstructor *construction, Evasxx::Object &obj) = 0; - void del (GenListColumnConstructor *construction, Evasxx::Object &obj); - private: static char *gl_label_get (const void *data, Evas_Object *obj, const char *part); static Evas_Object *gl_icon_get (const void *data, Evas_Object *obj, const char *part); Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-05-30 22:07:24 UTC (rev 49337) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-05-30 22:27:52 UTC (rev 49338) @@ -26,6 +26,7 @@ GenList::~GenList () { delete_stl_container <std::list <GenListColumnSelector*>, GenListColumnSelector*> (mInternalSelList); + delete_stl_container <std::list <GenListColumnConstructor*>, GenListColumnConstructor*> (mInternalConstructList); } GenList *GenList::factory (Evasxx::Object &parent) @@ -128,7 +129,7 @@ void GenList::gl_sel (void *data, Evas_Object *obj, void *event_info) { - GenListColumnSelector *selection = (GenListColumnSelector*) data; + GenListColumnSelector *selection = static_cast <GenListColumnSelector*> (data); assert (selection); GenList *gl = selection->mGenList; assert (gl); @@ -139,9 +140,7 @@ void GenList::glSelected (Evasxx::Object &eo, void *event_info) { - cout << "GenList::glSelected" << endl; - // FIXME: this call seems to segfault after the list is constructed after 2 or 3 seconds - //signalSelect.emit (eo, event_info); + signalSelect.emit (eo, event_info); } /* operations to add items */ @@ -182,11 +181,11 @@ if (internalConstruction) { - delete construction; + mInternalConstructList.push_back (construction); } if (internalSelection) { - mInternalSelList.push_back (selection); + mInternalSelList.push_back (selection); } } Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp 2010-05-30 22:07:24 UTC (rev 49337) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp 2010-05-30 22:27:52 UTC (rev 49338) @@ -22,47 +22,19 @@ mGLIC.func.del = GenListDataModel::gl_del; } -std::string GenListDataModel::getLabel (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) const -{ - cout << "GenListDataModel::getLabel" << endl; - - return "Item"; -} - -Elmxx::Object *GenListDataModel::getIcon (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) -{ - Window *win = static_cast <Window*> (&obj); - Icon *ic = Icon::factory (*win); - ic->setFile ("/home/andreas/Bilder/e_penguin/penguin.png"); - ic->setAspectHintSize (EVAS_ASPECT_CONTROL_VERTICAL, Eflxx::Size (1, 1)); - - //part: elm.swallow.icon - //part: elm.swallow.end - - return ic; -} - -bool GenListDataModel::getState (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) -{ - return true; -} - -void GenListDataModel::del (GenListColumnConstructor *construction, Evasxx::Object &obj) -{ - -} - /* wrappers */ char *GenListDataModel::gl_label_get (const void *data, Evas_Object *obj, const char *part) { cout << "gl_label_get" << endl; - GenListColumnConstructor *construction = (GenListColumnConstructor*) data; + GenListColumnConstructor *construction = static_cast <GenListColumnConstructor*> ( + const_cast <void*> (data)); GenListDataModel *model = construction->mDataModel; Evasxx::Object *objWrap = Evasxx::Object::objectLink (obj); - const std::string &label = model->getLabel (construction, *objWrap, part); + const std::string label = model->getLabel (construction, *objWrap, part); + static int counter = 0; ++counter; cout << "label: " << label << " ," << counter << endl; @@ -72,7 +44,8 @@ Evas_Object *GenListDataModel::gl_icon_get (const void *data, Evas_Object *obj, const char *part) { - GenListColumnConstructor *construction = (GenListColumnConstructor*) data; + GenListColumnConstructor *construction = static_cast <GenListColumnConstructor*> ( + const_cast <void*> (data)); GenListDataModel *model = construction->mDataModel; Evasxx::Object *objWrap = Evasxx::Object::objectLink (obj); @@ -83,7 +56,8 @@ Eina_Bool GenListDataModel::gl_state_get (const void *data, Evas_Object *obj, const char *part) { - GenListColumnConstructor *construction = (GenListColumnConstructor*) data; + GenListColumnConstructor *construction = static_cast <GenListColumnConstructor*> ( + const_cast <void*> (data)); GenListDataModel *model = construction->mDataModel; Evasxx::Object *objWrap = Evasxx::Object::objectLink (obj); @@ -92,7 +66,8 @@ void GenListDataModel::gl_del(const void *data, Evas_Object *obj) { - GenListColumnConstructor *construction = (GenListColumnConstructor*) data; + GenListColumnConstructor *construction = static_cast <GenListColumnConstructor*> ( + const_cast <void*> (data)); GenListDataModel *model = construction->mDataModel; Evasxx::Object *objWrap = Evasxx::Object::objectLink (obj); |
From: Enlightenment S. <no-...@en...> - 2010-05-31 21:34:41
|
Log: add select class as parameter Author: andreas Date: 2010-05-31 14:34:34 -0700 (Mon, 31 May 2010) New Revision: 49361 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-05-31 21:33:50 UTC (rev 49360) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-05-31 21:34:34 UTC (rev 49361) @@ -323,7 +323,7 @@ void append (GenListColumnConstructor *construction, GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); // TODO: which type is event_info here instead of void*? - sigc::signal <void, const Evasxx::Object&, void*> signalSelect; + sigc::signal <void, GenListColumnSelector&, const Evasxx::Object&, void*> signalSelect; private: GenList (); // forbid standard constructor @@ -333,7 +333,7 @@ static void gl_sel (void *data, Evas_Object *obj, void *event_info); - void glSelected (Evasxx::Object &eo, void *event_info); + void glSelected (GenListColumnSelector &selection, const Evasxx::Object &eo, void *event_info); GenListDataModel *mModel; Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-05-31 21:33:50 UTC (rev 49360) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-05-31 21:34:34 UTC (rev 49361) @@ -135,12 +135,12 @@ assert (gl); Evasxx::Object *eo = Evasxx::Object::objectLink (obj); assert (eo); - gl->glSelected (*eo, event_info); + gl->glSelected (*selection, *eo, event_info); } -void GenList::glSelected (Evasxx::Object &eo, void *event_info) +void GenList::glSelected (GenListColumnSelector &selection, const Evasxx::Object &eo, void *event_info) { - signalSelect.emit (eo, event_info); + signalSelect.emit (selection, eo, event_info); } /* operations to add items */ |
From: Enlightenment S. <no-...@en...> - 2010-06-02 21:28:00
|
Log: GenList work Author: andreas Date: 2010-06-02 14:27:50 -0700 (Wed, 02 Jun 2010) New Revision: 49400 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-06-02 21:27:33 UTC (rev 49399) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-06-02 21:27:50 UTC (rev 49400) @@ -312,15 +312,9 @@ * @param func_data Data passed to @p func above. * @return A handle to the item added or NULL if not possible * - * @ingroup Genlist */ - - //EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, - // const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, - // Evas_Smart_Cb func, const void *func_data); - - void append (GenListColumnConstructor *construction, GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); // TODO: which type is event_info here instead of void*? sigc::signal <void, GenListColumnSelector&, const Evasxx::Object&, void*> signalSelect; @@ -342,13 +336,7 @@ }; #if 0 - - /* operations to add items */ - EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, - const void *data, Elm_Genlist_Item *parent, - Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, - const void *func_data); EAPI Elm_Genlist_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); @@ -366,32 +354,7 @@ * icon_top_text_bottom */ - /* Genlist Item operation */ - EAPI Elm_Genlist_Item *elm_genlist_item_next_get(const Elm_Genlist_Item *item); - EAPI Elm_Genlist_Item *elm_genlist_item_prev_get(const Elm_Genlist_Item *item); - EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Genlist_Item *item); - EAPI Elm_Genlist_Item *elm_genlist_item_parent_get(const Elm_Genlist_Item *it); - EAPI void elm_genlist_item_subitems_clear(Elm_Genlist_Item *item); - EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Eina_Bool selected); - EAPI Eina_Bool elm_genlist_item_selected_get(const Elm_Genlist_Item *item); - EAPI void elm_genlist_item_expanded_set(Elm_Genlist_Item *item, Eina_Bool expanded); - EAPI Eina_Bool elm_genlist_item_expanded_get(const Elm_Genlist_Item *item); - EAPI void elm_genlist_item_disabled_set(Elm_Genlist_Item *item, Eina_Bool disabled); - EAPI Eina_Bool elm_genlist_item_disabled_get(const Elm_Genlist_Item *item); - EAPI void elm_genlist_item_display_only_set(Elm_Genlist_Item *it, Eina_Bool display_only); - EAPI Eina_Bool elm_genlist_item_display_only_get(const Elm_Genlist_Item *it); - EAPI void elm_genlist_item_show(Elm_Genlist_Item *item); - EAPI void elm_genlist_item_bring_in(Elm_Genlist_Item *item); - EAPI void elm_genlist_item_top_show(Elm_Genlist_Item *item); - EAPI void elm_genlist_item_top_bring_in(Elm_Genlist_Item *item); - EAPI void elm_genlist_item_middle_show(Elm_Genlist_Item *it); - EAPI void elm_genlist_item_middle_bring_in(Elm_Genlist_Item *it); - EAPI void elm_genlist_item_del(Elm_Genlist_Item *item); - EAPI const void *elm_genlist_item_data_get(const Elm_Genlist_Item *item); - EAPI void elm_genlist_item_data_set(Elm_Genlist_Item *it, const void *data); - EAPI const Evas_Object *elm_genlist_item_object_get(const Elm_Genlist_Item *it); - EAPI void elm_genlist_item_update(Elm_Genlist_Item *item); - + #endif // 0 } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h 2010-06-02 21:27:33 UTC (rev 49399) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h 2010-06-02 21:27:50 UTC (rev 49400) @@ -4,6 +4,9 @@ /* EFL */ #include <Elementary.h> +/* EFLxx */ +#include <evasxx/Evasxx.h> + namespace Elmxx { /* forward declarations */ @@ -13,8 +16,43 @@ { public: friend class GenList; + + virtual ~GenListItem (); + +#if 0 + /* Genlist Item operation */ + EAPI Elm_Genlist_Item *elm_genlist_item_next_get(const Elm_Genlist_Item *item); + EAPI Elm_Genlist_Item *elm_genlist_item_prev_get(const Elm_Genlist_Item *item); + EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Genlist_Item *item); + EAPI Elm_Genlist_Item *elm_genlist_item_parent_get(const Elm_Genlist_Item *it); +#endif + void clearSubItems (); + void setSelected (bool selected); + bool getSelected () const; + void setExpanded (bool expanded); + bool getExpanded () const; + void setDisabled (bool disabled); + bool getDisabled () const; + void setDisplayOnly (bool displayOnly); + bool getDisplayOnly () const; + void show (); + void bringIn (); + void showTop (); + void bringInTop (); + void showMiddle (); + void bringInMiddle (); + void update (); + + const Evasxx::Object *getEvasObject (); + + static GenListItem *wrap (const Elm_Genlist_Item *item); + + static GenListItem *objectLink (const Elm_Genlist_Item *item); + private: + GenListItem (const Elm_Genlist_Item *item); + Elm_Genlist_Item *mItem; }; Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-06-02 21:27:33 UTC (rev 49399) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-06-02 21:27:50 UTC (rev 49400) @@ -145,7 +145,7 @@ /* operations to add items */ -void GenList::append (GenListColumnConstructor *construction, GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) { assert (mModel); @@ -187,6 +187,8 @@ { mInternalSelList.push_back (selection); } + + return GenListItem::wrap (gli); } } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp 2010-06-02 21:27:33 UTC (rev 49399) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp 2010-06-02 21:27:50 UTC (rev 49400) @@ -2,8 +2,122 @@ #include <config.h> #endif +/* Project */ #include "../include/elementaryxx/GenListItem.h" +/* STD */ +#include <cassert> + namespace Elmxx { + +GenListItem::GenListItem (const Elm_Genlist_Item *item) : + mItem (const_cast <Elm_Genlist_Item*> (item)) +{ + elm_genlist_item_data_set (mItem, this); +} +GenListItem::~GenListItem () +{ + elm_genlist_item_del (mItem); +} + +void GenListItem::clearSubItems () +{ + elm_genlist_item_subitems_clear (mItem); + +} + +void GenListItem::setSelected (bool selected) +{ + elm_genlist_item_selected_set (mItem, selected); +} + +bool GenListItem::getSelected () const +{ + return elm_genlist_item_selected_get (mItem); +} + +void GenListItem::setExpanded (bool expanded) +{ + elm_genlist_item_expanded_set (mItem, expanded); +} + +bool GenListItem::getExpanded () const +{ + return elm_genlist_item_expanded_get (mItem); +} + +void GenListItem::setDisabled (bool disabled) +{ + elm_genlist_item_disabled_set (mItem, disabled); +} + +bool GenListItem::getDisabled () const +{ + return elm_genlist_item_disabled_get (mItem); +} + +void GenListItem::setDisplayOnly (bool displayOnly) +{ + elm_genlist_item_display_only_set (mItem, displayOnly); +} + +bool GenListItem::getDisplayOnly () const +{ + return elm_genlist_item_display_only_get (mItem); +} + +void GenListItem::show () +{ + elm_genlist_item_show (mItem); +} + +void GenListItem::bringIn () +{ + elm_genlist_item_bring_in (mItem); +} + +void GenListItem::showTop () +{ + elm_genlist_item_top_show (mItem); +} + +void GenListItem::bringInTop () +{ + elm_genlist_item_top_bring_in (mItem); +} + +void GenListItem::showMiddle () +{ + elm_genlist_item_middle_show (mItem); +} + +void GenListItem::bringInMiddle () +{ + elm_genlist_item_middle_bring_in (mItem); +} + +void GenListItem::update () +{ + elm_genlist_item_update (mItem); +} + +const Evasxx::Object *GenListItem::getEvasObject () +{ + const Evas_Object *obj = elm_genlist_item_object_get (mItem); + return Evasxx::Object::objectLink (obj); +} + +GenListItem *GenListItem::wrap (const Elm_Genlist_Item *item) +{ + return new GenListItem (item); +} + +GenListItem *GenListItem::objectLink (const Elm_Genlist_Item *item) +{ + GenListItem *item2 = static_cast <GenListItem*> (const_cast <void*> (elm_genlist_item_data_get(item))); + assert (item2); + return item2; +} + } // end namespace Elmxx |
From: Enlightenment S. <no-...@en...> - 2010-06-03 22:18:42
|
Log: del handler (but not working at all) Author: andreas Date: 2010-06-03 15:18:34 -0700 (Thu, 03 Jun 2010) New Revision: 49422 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h 2010-06-03 19:33:12 UTC (rev 49421) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h 2010-06-03 22:18:34 UTC (rev 49422) @@ -31,7 +31,7 @@ virtual bool getState (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) = 0; - virtual void del (GenListColumnConstructor *construction, Evasxx::Object &obj) = 0; + sigc::signal <void, GenListColumnConstructor&, const Evasxx::Object&> signalDel; private: static char *gl_label_get (const void *data, Evas_Object *obj, const char *part); Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h 2010-06-03 19:33:12 UTC (rev 49421) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h 2010-06-03 22:18:34 UTC (rev 49422) @@ -6,11 +6,13 @@ /* EFLxx */ #include <evasxx/Evasxx.h> +#include "GenListColumnConstructor.h" namespace Elmxx { /* forward declarations */ class GenList; +class GenListDataModel; class GenListItem { @@ -46,14 +48,17 @@ const Evasxx::Object *getEvasObject (); - static GenListItem *wrap (const Elm_Genlist_Item *item); + static GenListItem *wrap (Elm_Genlist_Item &item, GenListDataModel &model); static GenListItem *objectLink (const Elm_Genlist_Item *item); private: - GenListItem (const Elm_Genlist_Item *item); + GenListItem (Elm_Genlist_Item *item); + + void destroy (GenListColumnConstructor &construction, const Evasxx::Object &obj); Elm_Genlist_Item *mItem; + GenListDataModel *mDataModel; }; } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-06-03 19:33:12 UTC (rev 49421) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-06-03 22:18:34 UTC (rev 49422) @@ -187,8 +187,10 @@ { mInternalSelList.push_back (selection); } - - return GenListItem::wrap (gli); + + GenListItem *item = GenListItem::wrap (*gli, *mModel); + + return item; } } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp 2010-06-03 19:33:12 UTC (rev 49421) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp 2010-06-03 22:18:34 UTC (rev 49422) @@ -6,6 +6,7 @@ /* STD */ #include <iostream> +#include <cassert> using namespace std; @@ -70,8 +71,13 @@ const_cast <void*> (data)); GenListDataModel *model = construction->mDataModel; Evasxx::Object *objWrap = Evasxx::Object::objectLink (obj); - - return model->del (construction, *objWrap); + assert (model); + assert (objWrap); + + cout << "+del" << endl; + // FIXME: for some reason emit isn't working. and never returns and emit() is called infinite?? + //model->signalDel.emit (*construction, *objWrap); + cout << "-del" << endl; } } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp 2010-06-03 19:33:12 UTC (rev 49421) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp 2010-06-03 22:18:34 UTC (rev 49422) @@ -4,16 +4,19 @@ /* Project */ #include "../include/elementaryxx/GenListItem.h" +#include "../include/elementaryxx/GenListDataModel.h" /* STD */ #include <cassert> +using namespace std; + namespace Elmxx { -GenListItem::GenListItem (const Elm_Genlist_Item *item) : - mItem (const_cast <Elm_Genlist_Item*> (item)) +GenListItem::GenListItem (Elm_Genlist_Item *item) : + mItem (item) { - elm_genlist_item_data_set (mItem, this); + //elm_genlist_item_data_set (mItem, this); } GenListItem::~GenListItem () @@ -24,7 +27,6 @@ void GenListItem::clearSubItems () { elm_genlist_item_subitems_clear (mItem); - } void GenListItem::setSelected (bool selected) @@ -108,16 +110,25 @@ return Evasxx::Object::objectLink (obj); } -GenListItem *GenListItem::wrap (const Elm_Genlist_Item *item) +GenListItem *GenListItem::wrap (Elm_Genlist_Item &item, GenListDataModel &model) { - return new GenListItem (item); + GenListItem *genItem = new GenListItem (&item); + genItem->mDataModel = &model; + model.signalDel.connect (sigc::mem_fun (genItem, &GenListItem::destroy)); + + return genItem; } GenListItem *GenListItem::objectLink (const Elm_Genlist_Item *item) { - GenListItem *item2 = static_cast <GenListItem*> (const_cast <void*> (elm_genlist_item_data_get(item))); - assert (item2); - return item2; + //GenListItem *item2 = static_cast <GenListItem*> (const_cast <void*> (elm_genlist_item_data_get(item))); + //assert (item2); + return NULL;//item2; } + +void GenListItem::destroy (GenListColumnConstructor &construction, const Evasxx::Object &obj) +{ + cout << "destroy" << endl; +} } // end namespace Elmxx |
From: Enlightenment S. <no-...@en...> - 2010-06-09 21:34:05
|
Log: raw working GenList C++ wrapper implementation, but data isn't yet complete deleted at the end... Author: andreas Date: 2010-06-09 14:33:57 -0700 (Wed, 09 Jun 2010) New Revision: 49598 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListColumnConstructor.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListColumnConstructor.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-06-09 21:08:12 UTC (rev 49597) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-06-09 21:33:57 UTC (rev 49598) @@ -299,6 +299,7 @@ /*! * Append item to the end of the genlist + * TODO: C++ comment! * * This appends the given item to the end of the list or the end of the * children if the parent is given. @@ -313,8 +314,35 @@ * @return A handle to the item added or NULL if not possible * */ + GenListItem *append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); - GenListItem *append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *getItemSelected () const; + + /*! + * Get the item that is at the x, y canvas coords + * TODO: C++ comment! + * + * This returns the item at the given coordinates (which are canvas relative + * not object-relative). If an item is at that coordinate, that item handle + * is returned, and if @p posret is not NULL, the integer pointed to is set + * to a value of -1, 0 or 1, depending if the coordinate is on the upper + * portion of that item (-1), on the middle section (0) or on the lower part + * (1). If NULL is returned as an item (no item found there), then posret + * may indicate -1 or 1 based if the coordinate is above or below all items + * respectively in the genlist. + * + * @param it The item + * @param x The input x coordinate + * @param y The input y coordinate + * @param posret The position relative to the item returned here + * @return The item at the coordinates or NULL if none + * + */ + GenListItem *getItemAtXY (const Eflxx::Point &pos, int &posret) const; + + GenListItem *getItemFirst () const; + + GenListItem *getItemLast () const; // TODO: which type is event_info here instead of void*? sigc::signal <void, GenListColumnSelector&, const Evasxx::Object&, void*> signalSelect; @@ -341,12 +369,11 @@ EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); /* operations to retrieve existing items */ - EAPI Elm_Genlist_Item *elm_genlist_selected_item_get(const Evas_Object *obj); + + EAPI const Eina_List *elm_genlist_selected_items_get(const Evas_Object *obj); EAPI Eina_List *elm_genlist_realized_items_get(const Evas_Object *obj); - EAPI Elm_Genlist_Item *elm_genlist_at_xy_item_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *posret); - EAPI Elm_Genlist_Item *elm_genlist_first_item_get(const Evas_Object *obj); - EAPI Elm_Genlist_Item *elm_genlist_last_item_get(const Evas_Object *obj); + /* available item styles: * default * default_style - The text part is a textblock Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListColumnConstructor.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListColumnConstructor.h 2010-06-09 21:08:12 UTC (rev 49597) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListColumnConstructor.h 2010-06-09 21:33:57 UTC (rev 49598) @@ -9,15 +9,19 @@ /* forward declarations */ class GenList; class GenListDataModel; +class GenListItem; class GenListColumnConstructor { public: friend class GenList; friend class GenListDataModel; + + GenListColumnConstructor (); private: GenListDataModel *mDataModel; + GenListItem *mGenListItem; }; } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h 2010-06-09 21:08:12 UTC (rev 49597) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h 2010-06-09 21:33:57 UTC (rev 49598) @@ -31,8 +31,6 @@ virtual bool getState (GenListColumnConstructor *construction, Evasxx::Object &obj, const std::string &part) = 0; - sigc::signal <void, GenListColumnConstructor&, const Evasxx::Object&> signalDel; - private: static char *gl_label_get (const void *data, Evas_Object *obj, const char *part); static Evas_Object *gl_icon_get (const void *data, Evas_Object *obj, const char *part); Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h 2010-06-09 21:08:12 UTC (rev 49597) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h 2010-06-09 21:33:57 UTC (rev 49598) @@ -45,7 +45,7 @@ void showMiddle (); void bringInMiddle (); void update (); - + const Evasxx::Object *getEvasObject (); static GenListItem *wrap (Elm_Genlist_Item &item, GenListDataModel &model); @@ -55,7 +55,8 @@ private: GenListItem (Elm_Genlist_Item *item); - void destroy (GenListColumnConstructor &construction, const Evasxx::Object &obj); + const void *getData (); + void setData (const void *data); Elm_Genlist_Item *mItem; GenListDataModel *mDataModel; Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-06-09 21:08:12 UTC (rev 49597) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-06-09 21:33:57 UTC (rev 49598) @@ -179,6 +179,15 @@ GenList::gl_sel/* func */, selection /* func data */); + GenListItem *item = GenListItem::wrap (*gli, *mModel); + + construction->mGenListItem = item; + + //EAPI const void * + //elm_genlist_item_data_get(const Elm_Genlist_Item *it) + // -> returns: GenListColumnConstructor *construction + // 1. add GenListItem* to construction + if (internalConstruction) { mInternalConstructList.push_back (construction); @@ -188,9 +197,46 @@ mInternalSelList.push_back (selection); } - GenListItem *item = GenListItem::wrap (*gli, *mModel); - return item; } +GenListItem *GenList::getItemSelected () const +{ + Elm_Genlist_Item *item = elm_genlist_selected_item_get (o); + + const GenListColumnConstructor *construction = static_cast <const GenListColumnConstructor*> (elm_genlist_item_data_get (item)); + + return construction->mGenListItem; +} + +GenListItem *GenList::getItemAtXY (const Eflxx::Point &pos, int &posret) const +{ + Elm_Genlist_Item *item = elm_genlist_at_xy_item_get (o, pos.x (), pos.y (), &posret); + + if (!item) + return NULL; + + const GenListColumnConstructor *construction = static_cast <const GenListColumnConstructor*> (elm_genlist_item_data_get (item)); + + return construction->mGenListItem; +} + +GenListItem *GenList::getItemFirst () const +{ + Elm_Genlist_Item *item = elm_genlist_first_item_get (o); + + const GenListColumnConstructor *construction = static_cast <const GenListColumnConstructor*> (elm_genlist_item_data_get (item)); + + return construction->mGenListItem; +} + +GenListItem *GenList::getItemLast () const +{ + Elm_Genlist_Item *item = elm_genlist_last_item_get (o); + + const GenListColumnConstructor *construction = static_cast <const GenListColumnConstructor*> (elm_genlist_item_data_get (item)); + + return construction->mGenListItem; +} + } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListColumnConstructor.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListColumnConstructor.cpp 2010-06-09 21:08:12 UTC (rev 49597) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListColumnConstructor.cpp 2010-06-09 21:33:57 UTC (rev 49598) @@ -1,4 +1,14 @@ /* Project */ #include "../include/elementaryxx/GenListColumnConstructor.h" -using namespace std; \ No newline at end of file +using namespace std; + +namespace Elmxx { + +GenListColumnConstructor::GenListColumnConstructor () : + mGenListItem (NULL) +{ + +} + +} // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp 2010-06-09 21:08:12 UTC (rev 49597) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp 2010-06-09 21:33:57 UTC (rev 49598) @@ -74,10 +74,7 @@ assert (model); assert (objWrap); - cout << "+del" << endl; - // FIXME: for some reason emit isn't working. and never returns and emit() is called infinite?? - //model->signalDel.emit (*construction, *objWrap); - cout << "-del" << endl; + // TODO: delete all allocated menuitem/construction data } } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp 2010-06-09 21:08:12 UTC (rev 49597) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp 2010-06-09 21:33:57 UTC (rev 49598) @@ -7,6 +7,7 @@ #include "../include/elementaryxx/GenListDataModel.h" /* STD */ +#include <iostream> #include <cassert> using namespace std; @@ -16,11 +17,12 @@ GenListItem::GenListItem (Elm_Genlist_Item *item) : mItem (item) { - //elm_genlist_item_data_set (mItem, this); + } GenListItem::~GenListItem () { + cout << "GenListItem::~GenListItem" << endl; elm_genlist_item_del (mItem); } @@ -114,7 +116,7 @@ { GenListItem *genItem = new GenListItem (&item); genItem->mDataModel = &model; - model.signalDel.connect (sigc::mem_fun (genItem, &GenListItem::destroy)); + //model.signalDel.connect (sigc::mem_fun (genItem, &GenListItem::destroy)); return genItem; } @@ -126,9 +128,14 @@ return NULL;//item2; } -void GenListItem::destroy (GenListColumnConstructor &construction, const Evasxx::Object &obj) +const void *GenListItem::getData () { - cout << "destroy" << endl; + return elm_genlist_item_data_get (mItem); } + +void GenListItem::setData (const void *data) +{ + elm_genlist_item_data_set (mItem, data); +} } // end namespace Elmxx |
From: Enlightenment S. <no-...@en...> - 2010-07-09 20:23:18
|
Log: wrapped append,prepend,.. Author: andreas Date: 2010-07-09 13:23:12 -0700 (Fri, 09 Jul 2010) New Revision: 50164 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Application.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/src/Application.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Application.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Application.h 2010-07-09 16:44:33 UTC (rev 50163) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Application.h 2010-07-09 20:23:12 UTC (rev 50164) @@ -20,11 +20,16 @@ // EAPI void elm_need_efreet(void); // EAPI void elm_need_e_dbus(void); - double getScale (); - void setScale (double scale); + static double getScale (); + static void setScale (double scale); // EAPI Evas_Coord elm_finger_size_get(void); // EAPI void elm_finger_size_set(Evas_Coord size); + + /*! + * Flush all caches & dump all data that can be to lean down to use less memory + */ + static void flushAll (); }; } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-07-09 16:44:33 UTC (rev 50163) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2010-07-09 20:23:12 UTC (rev 50164) @@ -316,6 +316,14 @@ */ GenListItem *append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + + GenListItem *insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + + GenListItem *insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + + void del (GenListItem &item); + GenListItem *getItemSelected () const; /*! @@ -352,6 +360,16 @@ GenList (const GenList&); // forbid copy constructor GenList (Evasxx::Object &parent); // private construction -> use factory () ~GenList (); // forbid direct delete -> use Object::destroy() + + enum InsertOperation + { + Append, + Prepend, + InsertAfter, + InsertBefore + }; + + GenListItem *insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); static void gl_sel (void *data, Evas_Object *obj, void *event_info); Modified: trunk/BINDINGS/cxx/elementaryxx/src/Application.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Application.cpp 2010-07-09 16:44:33 UTC (rev 50163) +++ trunk/BINDINGS/cxx/elementaryxx/src/Application.cpp 2010-07-09 20:23:12 UTC (rev 50164) @@ -40,5 +40,10 @@ { elm_scale_set (scale); } + +void Application::flushAll () +{ + elm_all_flush (); +} } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-07-09 16:44:33 UTC (rev 50163) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2010-07-09 20:23:12 UTC (rev 50164) @@ -147,6 +147,26 @@ GenListItem *GenList::append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) { + insertInternal (construction, GenList::Append, parent, flags, selection); +} + +GenListItem *GenList::prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +{ + insertInternal (construction, GenList::Prepend, parent, flags, selection); +} + +GenListItem *GenList::insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +{ + insertInternal (construction, GenList::InsertBefore, parent, flags, selection); +} + +GenListItem *GenList::insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +{ + insertInternal (construction, GenList::InsertAfter, parent, flags, selection); +} + +GenListItem *GenList::insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +{ assert (mModel); Elm_Genlist_Item *gli; @@ -172,13 +192,45 @@ construction->mDataModel = mModel; selection->mGenList = this; - gli = elm_genlist_item_append (o, &mModel->mGLIC, - construction /* item data */, - parent ? parent->mItem : NULL /* parent */, - flags, - GenList::gl_sel/* func */, - selection /* func data */); + switch (op) + { + case Append: + gli = elm_genlist_item_append (o, &mModel->mGLIC, + construction /* item data */, + opItem ? opItem->mItem : NULL /* parent */, + flags, + GenList::gl_sel/* func */, + selection /* func data */); + break; + + case Prepend: + gli = elm_genlist_item_prepend (o, &mModel->mGLIC, + construction /* item data */, + opItem ? opItem->mItem : NULL /* parent */, + flags, + GenList::gl_sel/* func */, + selection /* func data */); + break; + + case InsertBefore: + gli = elm_genlist_item_insert_before (o, &mModel->mGLIC, + construction /* item data */, + opItem ? opItem->mItem : NULL /* parent */, + flags, + GenList::gl_sel/* func */, + selection /* func data */); + break; + case InsertAfter: + gli = elm_genlist_item_insert_after (o, &mModel->mGLIC, + construction /* item data */, + opItem ? opItem->mItem : NULL /* parent */, + flags, + GenList::gl_sel/* func */, + selection /* func data */); + break; + } + GenListItem *item = GenListItem::wrap (*gli, *mModel); construction->mGenListItem = item; @@ -200,6 +252,11 @@ return item; } +void GenList::del (GenListItem &item) +{ + elm_genlist_item_del (item.mItem); +} + GenListItem *GenList::getItemSelected () const { Elm_Genlist_Item *item = elm_genlist_selected_item_get (o); |
From: Enlightenment S. <no-...@en...> - 2010-07-09 21:31:01
|
Log: Label implementation wrapper Author: andreas Date: 2010-07-09 14:30:52 -0700 (Fri, 09 Jul 2010) New Revision: 50169 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Label.h trunk/BINDINGS/cxx/elementaryxx/src/Label.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Label.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Label.h 2010-07-09 21:30:05 UTC (rev 50168) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Label.h 2010-07-09 21:30:52 UTC (rev 50169) @@ -19,6 +19,16 @@ void setLabel (const std::string &label); + const std::string getLabel () const; + + void setLineWrap (bool wrap); + + bool getLineWrap () const; + + void setWrapWidth (Evas_Coord w); + + Evas_Coord getWrapWidth () const; + private: Label (); // forbid standard constructor Label (const Label&); // forbid copy constructor Modified: trunk/BINDINGS/cxx/elementaryxx/src/Label.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Label.cpp 2010-07-09 21:30:05 UTC (rev 50168) +++ trunk/BINDINGS/cxx/elementaryxx/src/Label.cpp 2010-07-09 21:30:52 UTC (rev 50169) @@ -27,4 +27,29 @@ elm_label_label_set (o, label.c_str ()); } +const std::string Label::getLabel () const +{ + return elm_label_label_get (o); +} + +void Label::setLineWrap (bool wrap) +{ + elm_label_line_wrap_set (o, wrap); +} + +bool Label::getLineWrap () const +{ + return elm_label_line_wrap_get (o); +} + +void Label::setWrapWidth (Evas_Coord w) +{ + elm_label_wrap_width_set (o, w); +} + +Evas_Coord Label::getWrapWidth () const +{ + return elm_label_wrap_width_get (o); +} + } // end namespace Elmxx |
From: Enlightenment S. <no-...@en...> - 2011-11-05 19:45:26
|
Log: follow C API Author: andreas Date: 2011-11-05 12:45:19 -0700 (Sat, 05 Nov 2011) New Revision: 64788 Trac: http://trac.enlightenment.org/e/changeset/64788 Added: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Gen.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenDataModel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenItem.h trunk/BINDINGS/cxx/elementaryxx/src/Gen.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenDataModel.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenItem.cpp Removed: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListDataModel.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h trunk/BINDINGS/cxx/elementaryxx/src/GenListDataModel.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListColumnConstructor.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListColumnConstructor.cpp trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2011-11-05 18:29:30 UTC (rev 64787) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Elementaryxx.h 2011-11-05 19:45:19 UTC (rev 64788) @@ -35,11 +35,12 @@ #include "Spinner.h" #include "Progressbar.h" #include "Panel.h" +#include "Gen.h" #include "GenList.h" -#include "GenListDataModel.h" +#include "GenDataModel.h" #include "GenListColumnSelector.h" #include "GenListColumnConstructor.h" -#include "GenListItem.h" +#include "GenItem.h" #endif // ELEMENTARYXX_H Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2011-11-05 18:29:30 UTC (rev 64787) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2011-11-05 19:45:19 UTC (rev 64788) @@ -9,15 +9,16 @@ /* ELFxx */ #include "Object.h" -#include "GenListDataModel.h" +#include "Gen.h" +#include "GenDataModel.h" namespace Elmxx { /* forward declarations */ -class GenListItem; +class GenItem; class GenListColumnConstructor; class GenListColumnSelector; - + /*! * @defgroup Genlist Genlist * @@ -254,37 +255,23 @@ * have a specific style that overrides any theme the user or system sets up * you can use elm_theme_overlay_add() to add such a file. */ -class GenList : public Object +class GenList : public Gen { public: static GenList *factory (Evasxx::Object &parent); - void clear (); - void setMultiSelect (bool multi); bool getMultiSelect (); - void setHorizontalMode (Elm_List_Mode mode); + void setHorizontal (Elm_List_Mode mode); - Elm_List_Mode getHorizontalMode (); + Elm_List_Mode getHorizontal (); - void setAlwaysSelectMode (bool alwaysSelect); - - bool getAlwaysSelectMode (); - - void setNoSelectMode (bool noSelect); - - bool getNoSelectMode (); - void setCompressMode (bool compress); bool getCompressMode (); - - void setBounce (bool hBounce, bool vBounce); - - void getBounce (bool &hBounceOut, bool &vBounceOut); - + void setHomogeneous (bool homogeneous); bool getHomogeneous (); @@ -293,7 +280,7 @@ int getBlockCound (); - void setDataModel (GenListDataModel &model); + void setDataModel (GenDataModel &model); /* operations to add items */ @@ -314,17 +301,17 @@ * @return A handle to the item added or NULL if not possible * */ - GenListItem *append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenItem *append (GenListColumnConstructor *construction, const GenItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); - GenListItem *prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenItem *prepend (GenListColumnConstructor *construction, const GenItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); - GenListItem *insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenItem *insertBefore (GenListColumnConstructor *construction, const GenItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); - GenListItem *insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenItem *insertAfter (GenListColumnConstructor *construction, const GenItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); - void del (GenListItem &item); + void del (GenItem &item); - GenListItem *getItemSelected () const; + GenItem *getItemSelected () const; /*! * Get the item that is at the x, y canvas coords @@ -346,11 +333,11 @@ * @return The item at the coordinates or NULL if none * */ - GenListItem *getItemAtXY (const Eflxx::Point &pos, int &posret) const; + GenItem *getItemAtXY (const Eflxx::Point &pos, int &posret) const; - GenListItem *getItemFirst () const; + GenItem *getItemFirst () const; - GenListItem *getItemLast () const; + GenItem *getItemLast () const; // TODO: which type is event_info here instead of void*? sigc::signal <void, GenListColumnSelector&, const Evasxx::Object&, void*> signalSelect; @@ -369,13 +356,13 @@ InsertBefore }; - GenListItem *insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenItem *insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenItem *opItem, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); static void gl_sel (void *data, Evas_Object *obj, void *event_info); void glSelected (GenListColumnSelector &selection, const Evasxx::Object &eo, void *event_info); - GenListDataModel *mModel; + GenDataModel *mModel; std::list <GenListColumnSelector*> mInternalSelList; std::list <GenListColumnConstructor*> mInternalConstructList; Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListColumnConstructor.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListColumnConstructor.h 2011-11-05 18:29:30 UTC (rev 64787) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListColumnConstructor.h 2011-11-05 19:45:19 UTC (rev 64788) @@ -8,20 +8,20 @@ /* forward declarations */ class GenList; -class GenListDataModel; -class GenListItem; +class GenDataModel; +class GenItem; class GenListColumnConstructor { public: friend class GenList; - friend class GenListDataModel; + friend class GenDataModel; GenListColumnConstructor (); private: - GenListDataModel *mDataModel; - GenListItem *mGenListItem; + GenDataModel *mDataModel; + GenItem *mGenItem; }; } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2011-11-05 18:29:30 UTC (rev 64787) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2011-11-05 19:45:19 UTC (rev 64788) @@ -31,10 +31,11 @@ Panel.h \ Separator.h \ GenList.h \ - GenListItem.h \ - GenListDataModel.h \ + GenDataModel.h \ GenListColumnConstructor.h \ - GenListColumnSelector.h + GenListColumnSelector.h \ + Gen.h \ + GenItem.h libelementaryxxdir = \ $(pkgincludedir) Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2011-11-05 18:29:30 UTC (rev 64787) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2011-11-05 19:45:19 UTC (rev 64788) @@ -4,7 +4,7 @@ /* Project */ #include "../include/elementaryxx/GenList.h" -#include "../include/elementaryxx/GenListItem.h" +#include "../include/elementaryxx/GenItem.h" #include "../include/elementaryxx/GenListColumnConstructor.h" #include "../include/elementaryxx/GenListColumnSelector.h" #include "localUtil.h" @@ -34,11 +34,6 @@ return new GenList (parent); } -void GenList::clear () -{ - elm_genlist_clear (o); -} - void GenList::setMultiSelect (bool multi) { elm_genlist_multi_select_set (o, multi); @@ -49,36 +44,16 @@ return elm_genlist_multi_select_get (o); } -void GenList::setHorizontalMode (Elm_List_Mode mode) +void GenList::setHorizontal (Elm_List_Mode mode) { - elm_genlist_horizontal_mode_set (o, mode); + elm_genlist_horizontal_set (o, mode); } -Elm_List_Mode GenList::getHorizontalMode () +Elm_List_Mode GenList::getHorizontal () { - return elm_genlist_horizontal_mode_get (o); + return elm_genlist_horizontal_get (o); } -void GenList::setAlwaysSelectMode (bool alwaysSelect) -{ - elm_genlist_always_select_mode_set (o, alwaysSelect); -} - -bool GenList::getAlwaysSelectMode () -{ - return elm_genlist_always_select_mode_get (o); -} - -void GenList::setNoSelectMode (bool noSelect) -{ - elm_genlist_no_select_mode_set (o, noSelect); -} - -bool GenList::getNoSelectMode () -{ - return elm_genlist_no_select_mode_get (o); -} - void GenList::setCompressMode (bool compress) { elm_genlist_compress_mode_set (o, compress); @@ -89,19 +64,6 @@ return elm_genlist_compress_mode_get (o); } -void GenList::setBounce (bool hBounce, bool vBounce) -{ - elm_genlist_bounce_set (o, hBounce, vBounce); -} - -void GenList::getBounce (bool &hBounceOut, bool &vBounceOut) -{ - Eina_Bool h, v; - elm_genlist_bounce_get (o, &h, &v); - hBounceOut = h; - vBounceOut = v; -} - void GenList::setHomogeneous (bool homogeneous) { elm_genlist_homogeneous_set (o, homogeneous); @@ -122,7 +84,7 @@ return elm_genlist_block_count_get (o); } -void GenList::setDataModel (GenListDataModel &model) +void GenList::setDataModel (GenDataModel &model) { mModel = &model; } @@ -145,27 +107,27 @@ /* operations to add items */ -GenListItem *GenList::append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenItem *GenList::append (GenListColumnConstructor *construction, const GenItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) { insertInternal (construction, GenList::Append, parent, flags, selection); } -GenListItem *GenList::prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenItem *GenList::prepend (GenListColumnConstructor *construction, const GenItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) { insertInternal (construction, GenList::Prepend, parent, flags, selection); } -GenListItem *GenList::insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenItem *GenList::insertBefore (GenListColumnConstructor *construction, const GenItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) { insertInternal (construction, GenList::InsertBefore, parent, flags, selection); } -GenListItem *GenList::insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenItem *GenList::insertAfter (GenListColumnConstructor *construction, const GenItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) { insertInternal (construction, GenList::InsertAfter, parent, flags, selection); } -GenListItem *GenList::insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenItem *GenList::insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenItem *opItem, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) { assert (mModel); @@ -233,14 +195,14 @@ break; } - GenListItem *item = GenListItem::wrap (*gli, *mModel); + GenItem *item = GenItem::wrap (*gli, *mModel); - construction->mGenListItem = item; + construction->mGenItem = item; //EAPI const void * //elm_genlist_item_data_get(const Elm_Genlist_Item *it) // -> returns: GenListColumnConstructor *construction - // 1. add GenListItem* to construction + // 1. add GenItem* to construction if (internalConstruction) { @@ -254,12 +216,12 @@ return item; } -void GenList::del (GenListItem &item) +void GenList::del (GenItem &item) { elm_genlist_item_del (item.mItem); } -GenListItem *GenList::getItemSelected () const +GenItem *GenList::getItemSelected () const { Elm_Genlist_Item *item = elm_genlist_selected_item_get (o); @@ -268,10 +230,10 @@ const GenListColumnConstructor *construction = static_cast <const GenListColumnConstructor*> (elm_genlist_item_data_get (item)); - return construction->mGenListItem; + return construction->mGenItem; } -GenListItem *GenList::getItemAtXY (const Eflxx::Point &pos, int &posret) const +GenItem *GenList::getItemAtXY (const Eflxx::Point &pos, int &posret) const { Elm_Genlist_Item *item = elm_genlist_at_xy_item_get (o, pos.x (), pos.y (), &posret); @@ -280,10 +242,10 @@ const GenListColumnConstructor *construction = static_cast <const GenListColumnConstructor*> (elm_genlist_item_data_get (item)); - return construction->mGenListItem; + return construction->mGenItem; } -GenListItem *GenList::getItemFirst () const +GenItem *GenList::getItemFirst () const { Elm_Genlist_Item *item = elm_genlist_first_item_get (o); @@ -292,10 +254,10 @@ const GenListColumnConstructor *construction = static_cast <const GenListColumnConstructor*> (elm_genlist_item_data_get (item)); - return construction->mGenListItem; + return construction->mGenItem; } -GenListItem *GenList::getItemLast () const +GenItem *GenList::getItemLast () const { Elm_Genlist_Item *item = elm_genlist_last_item_get (o); @@ -304,7 +266,7 @@ const GenListColumnConstructor *construction = static_cast <const GenListColumnConstructor*> (elm_genlist_item_data_get (item)); - return construction->mGenListItem; + return construction->mGenItem; } } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListColumnConstructor.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListColumnConstructor.cpp 2011-11-05 18:29:30 UTC (rev 64787) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListColumnConstructor.cpp 2011-11-05 19:45:19 UTC (rev 64788) @@ -6,7 +6,7 @@ namespace Elmxx { GenListColumnConstructor::GenListColumnConstructor () : - mGenListItem (NULL) + mGenItem (NULL) { } Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2011-11-05 18:29:30 UTC (rev 64787) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2011-11-05 19:45:19 UTC (rev 64788) @@ -47,10 +47,11 @@ Panel.cpp \ Separator.cpp \ GenList.cpp \ - GenListItem.cpp \ - GenListDataModel.cpp \ + GenDataModel.cpp \ GenListColumnConstructor.cpp \ GenListColumnSelector.cpp \ localUtil.cpp \ - localUtil.h + localUtil.h \ + Gen.cpp \ + GenItem.cpp |
From: Enlightenment S. <no-...@en...> - 2011-11-05 20:16:34
|
Log: compiles with new API and new classes - not yet tested... Author: andreas Date: 2011-11-05 13:16:28 -0700 (Sat, 05 Nov 2011) New Revision: 64790 Trac: http://trac.enlightenment.org/e/changeset/64790 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenItem.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Gen.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenItem.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenItem.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenItem.h 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenItem.h 2011-11-05 20:16:28 UTC (rev 64790) @@ -14,7 +14,6 @@ class Gen; class GenDataModel; -// TODO: currently this has many genlist functions inside. I'll fix this correct after the C API is finished! class GenItem { public: @@ -23,37 +22,14 @@ virtual ~GenItem (); - void clearSubItems (); void setSelected (bool selected); bool getSelected () const; - void setExpanded (bool expanded); - bool getExpanded () const; - void setDisabled (bool disabled); - bool getDisabled () const; - void setDisplayOnly (bool displayOnly); - bool getDisplayOnly () const; - void show (); - void bringIn (); - void showTop (); - void bringInTop (); - void showMiddle (); - void bringInMiddle (); - void update (); - - const Evasxx::Object *getEvasObject (); - static GenItem *wrap (Elm_Genlist_Item &item, GenDataModel &model); - - static GenItem *objectLink (const Elm_Genlist_Item *item); - -private: - GenItem (Elm_Genlist_Item *item); - - const void *getData (); - void setData (const void *data); - +protected: + GenItem (); Elm_Gen_Item *mItem; GenDataModel *mDataModel; + }; } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2011-11-05 20:16:28 UTC (rev 64790) @@ -35,7 +35,8 @@ GenListColumnConstructor.h \ GenListColumnSelector.h \ Gen.h \ - GenItem.h + GenItem.h \ + GenListItem.h libelementaryxxdir = \ $(pkgincludedir) Modified: trunk/BINDINGS/cxx/elementaryxx/src/Gen.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Gen.cpp 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/src/Gen.cpp 2011-11-05 20:16:28 UTC (rev 64790) @@ -13,6 +13,10 @@ namespace Elmxx { +Gen::Gen () {} + +Gen::~Gen () {} + void Gen::clear () { elm_gen_clear (o); Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenItem.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenItem.cpp 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenItem.cpp 2011-11-05 20:16:28 UTC (rev 64790) @@ -14,128 +14,14 @@ namespace Elmxx { -GenItem::GenItem (Elm_Genlist_Item *item) : - mItem (item) +GenItem::GenItem () { } GenItem::~GenItem () { - cout << "GenItem::~GenItem" << endl; - elm_genlist_item_del (mItem); } -void GenItem::clearSubItems () -{ - elm_genlist_item_subitems_clear (mItem); -} - -void GenItem::setSelected (bool selected) -{ - elm_gen_item_selected_set (mItem, selected); -} - -bool GenItem::getSelected () const -{ - return elm_gen_item_selected_get (mItem); -} - -void GenItem::setExpanded (bool expanded) -{ - elm_genlist_item_expanded_set (mItem, expanded); -} - -bool GenItem::getExpanded () const -{ - return elm_genlist_item_expanded_get (mItem); -} - -void GenItem::setDisabled (bool disabled) -{ - elm_genlist_item_disabled_set (mItem, disabled); -} - -bool GenItem::getDisabled () const -{ - return elm_genlist_item_disabled_get (mItem); -} - -void GenItem::setDisplayOnly (bool displayOnly) -{ - elm_genlist_item_display_only_set (mItem, displayOnly); -} - -bool GenItem::getDisplayOnly () const -{ - return elm_genlist_item_display_only_get (mItem); -} - -void GenItem::show () -{ - elm_genlist_item_show (mItem); -} - -void GenItem::bringIn () -{ - elm_genlist_item_bring_in (mItem); -} - -void GenItem::showTop () -{ - elm_genlist_item_top_show (mItem); -} - -void GenItem::bringInTop () -{ - elm_genlist_item_top_bring_in (mItem); -} - -void GenItem::showMiddle () -{ - elm_genlist_item_middle_show (mItem); -} - -void GenItem::bringInMiddle () -{ - elm_genlist_item_middle_bring_in (mItem); -} - -void GenItem::update () -{ - elm_genlist_item_update (mItem); -} - -const Evasxx::Object *GenItem::getEvasObject () -{ - const Evas_Object *obj = elm_genlist_item_object_get (mItem); - return Evasxx::Object::objectLink (obj); -} - -GenItem *GenItem::wrap (Elm_Genlist_Item &item, GenDataModel &model) -{ - GenItem *genItem = new GenItem (&item); - genItem->mDataModel = &model; - //model.signalDel.connect (sigc::mem_fun (genItem, &GenItem::destroy)); - - return genItem; -} - -GenItem *GenItem::objectLink (const Elm_Genlist_Item *item) -{ - //GenItem *item2 = static_cast <GenItem*> (const_cast <void*> (elm_genlist_item_data_get(item))); - //assert (item2); - return NULL;//item2; -} - -const void *GenItem::getData () -{ - return elm_genlist_item_data_get (mItem); -} - -void GenItem::setData (const void *data) -{ - elm_genlist_item_data_set (mItem, data); -} } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2011-11-05 20:16:28 UTC (rev 64790) @@ -4,6 +4,7 @@ /* Project */ #include "../include/elementaryxx/GenList.h" +#include "../include/elementaryxx/GenListItem.h" #include "../include/elementaryxx/GenItem.h" #include "../include/elementaryxx/GenListColumnConstructor.h" #include "../include/elementaryxx/GenListColumnSelector.h" @@ -195,7 +196,7 @@ break; } - GenItem *item = GenItem::wrap (*gli, *mModel); + GenListItem *item = GenListItem::wrap (*gli, *mModel); // TODO: generic!! construction->mGenItem = item; Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2011-11-05 20:16:28 UTC (rev 64790) @@ -53,5 +53,6 @@ localUtil.cpp \ localUtil.h \ Gen.cpp \ - GenItem.cpp + GenItem.cpp \ + GenListItem.cpp |
From: Enlightenment S. <no-...@en...> - 2012-03-08 21:36:40
|
Log: removed things renamed in C API => need to fix this later! Author: andreas Date: 2012-03-08 13:36:33 -0800 (Thu, 08 Mar 2012) New Revision: 69071 Trac: http://trac.enlightenment.org/e/changeset/69071 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Application.h trunk/BINDINGS/cxx/elementaryxx/src/Application.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Application.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Application.h 2012-03-08 21:15:35 UTC (rev 69070) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Application.h 2012-03-08 21:36:33 UTC (rev 69071) @@ -20,8 +20,9 @@ // EAPI void elm_need_efreet(void); // EAPI void elm_need_e_dbus(void); - static double getScale (); - static void setScale (double scale); + // TODO: moved to elm_config.h => implement config class + //static double getScale (); + //static void setScale (double scale); // EAPI Evas_Coord elm_finger_size_get(void); // EAPI void elm_finger_size_set(Evas_Coord size); @@ -29,7 +30,8 @@ /*! * Flush all caches & dump all data that can be to lean down to use less memory */ - static void flushAll (); + // TODO 'void elm_all_flush()' is deprecated + //static void flushAll (); }; } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/Application.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Application.cpp 2012-03-08 21:15:35 UTC (rev 69070) +++ trunk/BINDINGS/cxx/elementaryxx/src/Application.cpp 2012-03-08 21:36:33 UTC (rev 69071) @@ -35,7 +35,7 @@ elm_exit (); } -double Application::getScale () +/*double Application::getScale () { return elm_scale_get (); } @@ -43,11 +43,11 @@ void Application::setScale (double scale) { elm_scale_set (scale); -} +}*/ -void Application::flushAll () +/*void Application::flushAll () { elm_all_flush (); -} +}*/ } // end namespace Elmxx |
From: Enlightenment S. <no-...@en...> - 2012-03-10 20:41:14
|
Log: compiles again after big changes in elementary C API. Need to repair much stuff, but will wait some more time until elementary is more API stable... Author: andreas Date: 2012-03-10 12:41:06 -0800 (Sat, 10 Mar 2012) New Revision: 69179 Trac: http://trac.enlightenment.org/e/changeset/69179 Removed: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Anchorblock.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Anchorview.h trunk/BINDINGS/cxx/elementaryxx/src/Anchorblock.cpp trunk/BINDINGS/cxx/elementaryxx/src/Anchorview.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Bubble.cpp trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp trunk/BINDINGS/cxx/elementaryxx/src/Check.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Progressbar.cpp trunk/BINDINGS/cxx/elementaryxx/src/Radio.cpp trunk/BINDINGS/cxx/elementaryxx/src/Slider.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2012-03-10 20:41:06 UTC (rev 69179) @@ -302,13 +302,13 @@ * @return A handle to the item added or NULL if not possible * */ - GenListItem *append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection); - GenListItem *prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection); - GenListItem *insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection); - GenListItem *insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection); void del (GenListItem &item); @@ -357,7 +357,7 @@ InsertBefore }; - GenListItem *insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Type type, GenListColumnSelector *selection); static void gl_sel (void *data, Evas_Object *obj, void *event_info); Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenListItem.h 2012-03-10 20:41:06 UTC (rev 69179) @@ -32,8 +32,8 @@ bool getDisabled () const; void setDisplayOnly (bool displayOnly); bool getDisplayOnly () const; - void show (); - void bringIn (); + void show (Elm_Genlist_Item_Scrollto_Type type); + void bringIn (Elm_Genlist_Item_Scrollto_Type type); void showTop (); void bringInTop (); void showMiddle (); @@ -51,7 +51,7 @@ GenListItem (Elm_Object_Item *item); const void *getData (); - void setData (const void *data); + void setData (void *data); Elm_Object_Item *mItem; GenDataModel *mDataModel; Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2012-03-10 20:41:06 UTC (rev 69179) @@ -24,8 +24,6 @@ Object.h \ Layout.h \ Hover.h \ - Anchorblock.h \ - Anchorview.h \ Spinner.h \ Progressbar.h \ Panel.h \ Modified: trunk/BINDINGS/cxx/elementaryxx/src/Bubble.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Bubble.cpp 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/src/Bubble.cpp 2012-03-10 20:41:06 UTC (rev 69179) @@ -29,7 +29,7 @@ void Bubble::setInfo (const std::string &info) { - elm_object_part_text_set (o, info.c_str ()); + elm_object_part_text_set (o, NULL, info.c_str ()); } void Bubble::setContent (const Evasxx::Object &content) @@ -39,7 +39,7 @@ void Bubble::setIcon (const Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } void Bubble::setCorner (const std::string &corner) Modified: trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp 2012-03-10 20:41:06 UTC (rev 69179) @@ -29,7 +29,7 @@ void Button::setIcon (const Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/Check.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Check.cpp 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/src/Check.cpp 2012-03-10 20:41:06 UTC (rev 69179) @@ -29,7 +29,7 @@ void Check::setIcon (const Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } void Check::setState (bool state) Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2012-03-10 20:41:06 UTC (rev 69179) @@ -108,27 +108,27 @@ /* operations to add items */ -GenListItem *GenList::append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection) { - insertInternal (construction, GenList::Append, parent, flags, selection); + insertInternal (construction, GenList::Append, parent, type, selection); } -GenListItem *GenList::prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection) { - insertInternal (construction, GenList::Prepend, parent, flags, selection); + insertInternal (construction, GenList::Prepend, parent, type, selection); } -GenListItem *GenList::insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection) { - insertInternal (construction, GenList::InsertBefore, parent, flags, selection); + insertInternal (construction, GenList::InsertBefore, parent, type, selection); } -GenListItem *GenList::insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection) { - insertInternal (construction, GenList::InsertAfter, parent, flags, selection); + insertInternal (construction, GenList::InsertAfter, parent, type, selection); } -GenListItem *GenList::insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Type type, GenListColumnSelector *selection) { assert (mModel); @@ -161,7 +161,7 @@ gli = elm_genlist_item_append (o, &mModel->mGLIC, construction /* item data */, opItem ? opItem->mItem : NULL /* parent */, - flags, + type, GenList::gl_sel/* func */, selection /* func data */); break; @@ -170,7 +170,7 @@ gli = elm_genlist_item_prepend (o, &mModel->mGLIC, construction /* item data */, opItem ? opItem->mItem : NULL /* parent */, - flags, + type, GenList::gl_sel/* func */, selection /* func data */); break; @@ -180,7 +180,7 @@ construction /* item data */, opItem ? opItem->mItem : NULL /* parent */, NULL, - flags, + type, GenList::gl_sel/* func */, selection /* func data */); break; @@ -190,7 +190,7 @@ construction /* item data */, opItem ? opItem->mItem : NULL /* parent */, NULL, - flags, + type, GenList::gl_sel/* func */, selection /* func data */); break; Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenListItem.cpp 2012-03-10 20:41:06 UTC (rev 69179) @@ -72,14 +72,14 @@ return elm_genlist_item_display_only_get (mItem); } -void GenListItem::show () +void GenListItem::show (Elm_Genlist_Item_Scrollto_Type type) { - elm_genlist_item_show (mItem); + elm_genlist_item_show (mItem, type); } -void GenListItem::bringIn () +void GenListItem::bringIn (Elm_Genlist_Item_Scrollto_Type type) { - elm_genlist_item_bring_in (mItem); + elm_genlist_item_bring_in (mItem, type); } void GenListItem::showTop () @@ -134,7 +134,7 @@ return elm_object_item_data_get (mItem); } -void GenListItem::setData (const void *data) +void GenListItem::setData (void *data) { elm_object_item_data_set (mItem, data); } Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2012-03-10 20:41:06 UTC (rev 69179) @@ -40,8 +40,6 @@ Object.cpp \ Layout.cpp \ Hover.cpp \ - Anchorblock.cpp \ - Anchorview.cpp \ Spinner.cpp \ Progressbar.cpp \ Panel.cpp \ Modified: trunk/BINDINGS/cxx/elementaryxx/src/Progressbar.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Progressbar.cpp 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/src/Progressbar.cpp 2012-03-10 20:41:06 UTC (rev 69179) @@ -29,7 +29,7 @@ void Progressbar::setIcon (Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } void Progressbar::setSpanSize (Evas_Coord size) Modified: trunk/BINDINGS/cxx/elementaryxx/src/Radio.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Radio.cpp 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/src/Radio.cpp 2012-03-10 20:41:06 UTC (rev 69179) @@ -30,7 +30,7 @@ void Radio::setIcon (const Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } void Radio::addGroup (const Evasxx::Object &group) Modified: trunk/BINDINGS/cxx/elementaryxx/src/Slider.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Slider.cpp 2012-03-10 18:03:48 UTC (rev 69178) +++ trunk/BINDINGS/cxx/elementaryxx/src/Slider.cpp 2012-03-10 20:41:06 UTC (rev 69179) @@ -29,7 +29,7 @@ void Slider::setIcon (const Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } void Slider::setSpanSize (Evas_Coord size) |
From: Enlightenment S. <no-...@en...> - 2012-03-14 22:03:57
|
Log: - use names in Object fitting to C API - save code by implementing functions correct in Object and removed from child classes Author: andreas Date: 2012-03-14 15:03:46 -0700 (Wed, 14 Mar 2012) New Revision: 69345 Trac: http://trac.enlightenment.org/e/changeset/69345 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Bubble.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Button.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Check.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Hover.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Label.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Object.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Radio.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Slider.h trunk/BINDINGS/cxx/elementaryxx/src/Bubble.cpp trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp trunk/BINDINGS/cxx/elementaryxx/src/Check.cpp trunk/BINDINGS/cxx/elementaryxx/src/Hover.cpp trunk/BINDINGS/cxx/elementaryxx/src/Label.cpp trunk/BINDINGS/cxx/elementaryxx/src/Object.cpp trunk/BINDINGS/cxx/elementaryxx/src/Radio.cpp trunk/BINDINGS/cxx/elementaryxx/src/Slider.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Bubble.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Bubble.h 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Bubble.h 2012-03-14 22:03:46 UTC (rev 69345) @@ -16,15 +16,7 @@ { public: static Bubble *factory (Evasxx::Object &parent); - - void setLabel (const std::string &label); - void setInfo (const std::string &info); - - void setContent (const Evasxx::Object &content); - - void setIcon (const Evasxx::Object &icon); - void setCorner (const std::string &corner); private: Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Button.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Button.h 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Button.h 2012-03-14 22:03:46 UTC (rev 69345) @@ -25,11 +25,7 @@ { public: static Button *factory (Evasxx::Object &parent); - - void setLabel (const std::string &label); - void setIcon (const Evasxx::Object &icon); - private: Button (); // forbid standard constructor Button (const Button&); // forbid copy constructor Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Check.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Check.h 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Check.h 2012-03-14 22:03:46 UTC (rev 69345) @@ -20,11 +20,7 @@ { public: static Check *factory (Evasxx::Object &parent); - - void setLabel (const std::string &label); - void setIcon (const Evasxx::Object &icon); - void setState (bool state); bool getState () const; Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Hover.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Hover.h 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Hover.h 2012-03-14 22:03:46 UTC (rev 69345) @@ -26,8 +26,6 @@ void setParent (const Evasxx::Object &parent); - void setContent (const std::string &swallow, const Evasxx::Object &content); - const string getBestContentLocation (Elm_Hover_Axis prefAxis) const; private: Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Label.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Label.h 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Label.h 2012-03-14 22:03:46 UTC (rev 69345) @@ -17,10 +17,6 @@ public: static Label *factory (Evasxx::Object &parent); - void setLabel (const std::string &label); - - const std::string getLabel () const; - void setLineWrap (Elm_Wrap_Type wrap); Elm_Wrap_Type getLineWrap () const; Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Object.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Object.h 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Object.h 2012-03-14 22:03:46 UTC (rev 69345) @@ -15,12 +15,12 @@ class Object : public Evasxx::Smart { public: - virtual void setScale (double scale); - virtual double getScale (); - virtual void setStyle (const std::string &style); - virtual const std::string getStyle (); - virtual void setDisabled (bool disabled); - virtual bool getDisabled (); + void setScale (double scale); + double getScale (); + void setStyle (const std::string &style); + const std::string getStyle (); + void setDisabled (bool disabled); + bool getDisabled (); virtual void focus (); @@ -44,11 +44,109 @@ */ const std::string getWidgetType (); - /*void elm_object_scroll_hold_push(Evas_Object *obj); - void elm_object_scroll_hold_pop(Evas_Object *obj); - void elm_object_scroll_freeze_push(Evas_Object *obj); - void elm_object_scroll_freeze_pop(Evas_Object *obj);*/ + /** + * Set a label of an object + * + * @param obj The Elementary object + * @param part The text part name to set (NULL for the default label) + * @param label The new text of the label + * + * @note Elementary objects may have many labels (e.g. Action Slider) + * + * @ingroup General + */ + void setTextPart (const std::string &label); + void setTextPart (const std::string &part, const std::string &label); + /** + * Get a label of an object + * + * @param obj The Elementary object + * @param part The text part name to get (NULL for the default label) + * @return text of the label or NULL for any error + * + * @note Elementary objects may have many labels (e.g. Action Slider) + * + * @ingroup General + */ + const std::string getTextPart (); + const std::string getTextPart (const std::string &part); + + /** + * Set a content of an object + * + * @param obj The Elementary object + * @param part The content part name to set (NULL for the default content) + * @param content The new content of the object + * + * @note Elementary objects may have many contents + * + * @ingroup General + */ + void setContentPart (const Evasxx::Object &content); + void setContentPart (const std::string &part, const Evasxx::Object &content); + + /** + * Get a content of an object + * + * @param obj The Elementary object + * @param part The content part name to get (NULL for the default content) + * @return content of the object or NULL for any error + * + * @note Elementary objects may have many contents + * + * @ingroup General + */ + Eflxx::CountedPtr <Evasxx::Object> getContentPart (); + Eflxx::CountedPtr <Evasxx::Object> getContentPart (const std::string &part); + + /** + * Unset a content of an object + * + * @param obj The Elementary object + * @param part The content part name to unset (NULL for the default content) + * + * @note Elementary objects may have many contents + * + * @ingroup General + */ + // TODO: if return value is used to report success the implement exception -> need to check in code! + void unsetContent(); + void unsetContent(const std::string &part); + + /** + * Get a named object from the children + * + * @param obj The parent object whose children to look at + * @param name The name of the child to find + * @param recurse Set to the maximum number of levels to recurse (0 == none, 1 is only look at 1 level of children etc.) + * @return The found object of that name, or NULL if none is found + * + * This function searches the children (or recursively children of + * children and so on) of the given @p obj object looking for a child with + * the name of @p name. If the child is found the object is returned, or + * NULL is returned. You can set the name of an object with + * evas_object_name_set(). If the name is not unique within the child + * objects (or the tree is @p recurse is greater than 0) then it is + * undefined as to which child of that name is returned, so ensure the name + * is unique amongst children. If recurse is set to -1 it will recurse + * without limit. + * + * @ingroup General + */ + Eflxx::CountedPtr <Evasxx::Object> findName(const std::string &name, int recurse); + + /** + * Set the text to read out when in accessibility mode + * + * @param obj The object which is to be described + * @param txt The text that describes the widget to people with poor or no vision + * + * @ingroup General + */ + void setInfoAccess(const std::string &txt); + + void destroy (); protected: Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Radio.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Radio.h 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Radio.h 2012-03-14 22:03:46 UTC (rev 69345) @@ -20,11 +20,7 @@ { public: static Radio *factory (Evasxx::Object &parent); - - void setLabel (const std::string &label); - void setIcon (const Evasxx::Object &icon); - void addGroup (const Evasxx::Object &group); void setStateValue (int value); Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Slider.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Slider.h 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Slider.h 2012-03-14 22:03:46 UTC (rev 69345) @@ -30,10 +30,6 @@ static Slider *factory (Evasxx::Object &parent); - void setLabel (const std::string &label); - - void setIcon (const Evasxx::Object &icon); - void setSpanSize (Evas_Coord size); void setUnitFormat (const std::string &format); Modified: trunk/BINDINGS/cxx/elementaryxx/src/Bubble.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Bubble.cpp 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/src/Bubble.cpp 2012-03-14 22:03:46 UTC (rev 69345) @@ -22,24 +22,4 @@ return new Bubble (parent); } -void Bubble::setLabel (const std::string &label) -{ - elm_object_text_set (o, label.c_str ()); -} - -void Bubble::setInfo (const std::string &info) -{ - elm_object_part_text_set (o, NULL, info.c_str ()); -} - -void Bubble::setContent (const Evasxx::Object &content) -{ - elm_object_content_set (o, content.obj ()); -} - -void Bubble::setIcon (const Evasxx::Object &icon) -{ - elm_object_part_content_set (o, NULL, icon.obj ()); -} - } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp 2012-03-14 22:03:46 UTC (rev 69345) @@ -22,14 +22,4 @@ return new Button (parent); } -void Button::setLabel (const std::string &label) -{ - elm_object_text_set (o, label.c_str ()); -} - -void Button::setIcon (const Evasxx::Object &icon) -{ - elm_object_part_content_set (o, NULL, icon.obj ()); -} - } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/Check.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Check.cpp 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/src/Check.cpp 2012-03-14 22:03:46 UTC (rev 69345) @@ -22,16 +22,6 @@ return new Check (parent); } -void Check::setLabel (const std::string &label) -{ - elm_object_text_set (o, label.c_str ()); -} - -void Check::setIcon (const Evasxx::Object &icon) -{ - elm_object_part_content_set (o, NULL, icon.obj ()); -} - void Check::setState (bool state) { elm_check_state_set (o, state); Modified: trunk/BINDINGS/cxx/elementaryxx/src/Hover.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Hover.cpp 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/src/Hover.cpp 2012-03-14 22:03:46 UTC (rev 69345) @@ -32,11 +32,6 @@ elm_hover_parent_set (o, parent.obj ()); } -void Hover::setContent (const std::string &swallow, const Evasxx::Object &content) -{ - elm_object_part_content_set (o, swallow.c_str (), content.obj ()); -} - const string Hover::getBestContentLocation (Elm_Hover_Axis prefAxis) const { return elm_hover_best_content_location_get (o, prefAxis); Modified: trunk/BINDINGS/cxx/elementaryxx/src/Label.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Label.cpp 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/src/Label.cpp 2012-03-14 22:03:46 UTC (rev 69345) @@ -22,16 +22,6 @@ return new Label (parent); } -void Label::setLabel (const std::string &label) -{ - elm_object_text_set (o, label.c_str ()); -} - -const std::string Label::getLabel () const -{ - return elm_object_text_get (o); -} - void Label::setLineWrap (Elm_Wrap_Type wrap) { elm_label_line_wrap_set (o, wrap); Modified: trunk/BINDINGS/cxx/elementaryxx/src/Object.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Object.cpp 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/src/Object.cpp 2012-03-14 22:03:46 UTC (rev 69345) @@ -108,4 +108,76 @@ return elm_object_widget_type_get (o); } +void Object::setTextPart (const std::string &label) +{ + elm_object_part_text_set(o, NULL, label.c_str()); +} + +void Object::setTextPart (const std::string &part, const std::string &label) +{ + elm_object_part_text_set(o, part.c_str(), label.c_str()); +} + +const std::string Object::getTextPart () +{ + return elm_object_part_text_get(o, NULL); +} + +const std::string Object::getTextPart (const std::string &part) +{ + return elm_object_part_text_get(o, part.c_str()); +} + +void Object::setContentPart (const Evasxx::Object &content) +{ + elm_object_part_content_set(o, NULL, content.obj()); +} + +void Object::setContentPart (const std::string &part, const Evasxx::Object &content) +{ + elm_object_part_content_set(o, part.c_str(), content.obj()); +} + +Eflxx::CountedPtr <Evasxx::Object> Object::getContentPart () +{ + Evas_Object *eo = elm_object_part_content_get(o, NULL); + + Evasxx::Object *ret_o = Evasxx::Object::wrap (eo); + + return Eflxx::CountedPtr <Evasxx::Object> (ret_o); +} + +Eflxx::CountedPtr <Evasxx::Object> Object::getContentPart (const std::string &part) +{ + Evas_Object *eo = elm_object_part_content_get(o, part.c_str()); + + Evasxx::Object *ret_o = Evasxx::Object::wrap (eo); + + return Eflxx::CountedPtr <Evasxx::Object> (ret_o); +} + +void Object::unsetContent() +{ + /* ignore return */ elm_object_part_content_unset(o, NULL); +} + +void Object::unsetContent(const std::string &part) +{ + /* ignore return */ elm_object_part_content_unset(o, part.c_str()); +} + +Eflxx::CountedPtr <Evasxx::Object> Object::findName(const std::string &name, int recurse) +{ + Evas_Object *eo = elm_object_name_find(o, name.c_str(), recurse); + + Evasxx::Object *ret_o = Evasxx::Object::wrap (eo); + + return Eflxx::CountedPtr <Evasxx::Object> (ret_o); +} + +void Object::setInfoAccess(const std::string &txt) +{ + elm_object_access_info_set(o, txt.c_str()); +} + } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/Radio.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Radio.cpp 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/src/Radio.cpp 2012-03-14 22:03:46 UTC (rev 69345) @@ -22,17 +22,6 @@ return new Radio (parent); } - -void Radio::setLabel (const std::string &label) -{ - elm_object_text_set (o, label.c_str ()); -} - -void Radio::setIcon (const Evasxx::Object &icon) -{ - elm_object_part_content_set (o, NULL, icon.obj ()); -} - void Radio::addGroup (const Evasxx::Object &group) { elm_radio_group_add (o, group.obj ()); Modified: trunk/BINDINGS/cxx/elementaryxx/src/Slider.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Slider.cpp 2012-03-14 20:38:43 UTC (rev 69344) +++ trunk/BINDINGS/cxx/elementaryxx/src/Slider.cpp 2012-03-14 22:03:46 UTC (rev 69345) @@ -22,16 +22,6 @@ return new Slider (parent); } -void Slider::setLabel (const std::string &label) -{ - elm_object_text_set (o, label.c_str ()); -} - -void Slider::setIcon (const Evasxx::Object &icon) -{ - elm_object_part_content_set (o, NULL, icon.obj ()); -} - void Slider::setSpanSize (Evas_Coord size) { elm_slider_span_size_set (o, size); |
From: Enlightenment S. <no-...@en...> - 2012-03-14 22:17:50
|
Log: remove deprecated functions Author: andreas Date: 2012-03-14 15:17:43 -0700 (Wed, 14 Mar 2012) New Revision: 69346 Trac: http://trac.enlightenment.org/e/changeset/69346 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2012-03-14 22:03:46 UTC (rev 69345) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenList.h 2012-03-14 22:17:43 UTC (rev 69346) @@ -269,10 +269,6 @@ Elm_List_Mode getHorizontal (); - void setCompressMode (bool compress); - - bool getCompressMode (); - void setHomogeneous (bool homogeneous); bool getHomogeneous (); Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2012-03-14 22:03:46 UTC (rev 69345) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2012-03-14 22:17:43 UTC (rev 69346) @@ -55,16 +55,6 @@ return elm_genlist_mode_get (o); } -void GenList::setCompressMode (bool compress) -{ - elm_genlist_compress_mode_set (o, compress); -} - -bool GenList::getCompressMode () -{ - return elm_genlist_compress_mode_get (o); -} - void GenList::setHomogeneous (bool homogeneous) { elm_genlist_homogeneous_set (o, homogeneous); |