|
From: <enl...@li...> - 2002-04-06 12:17:49
|
Enlightenment CVS committal
Author : tillsan
Project : e17
Module : apps/essence
Dir : e17/apps/essence/src
Modified Files:
Tag: SPLIT
EssenceDirViewModel.h EssenceViewModel.h EssenceWindow.h
essence_design.dia
Added Files:
Tag: SPLIT
EssenceWindowDesktop.h
Log Message:
a few minor cleanups and an added class EssenceWindowDesktop, derived from
EssenceWindow. Still thinking about this one, maybe you all have ideas.
Updated uml accordingly.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/essence/src/Attic/EssenceDirViewModel.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- EssenceDirViewModel.h 3 Apr 2002 01:00:48 -0000 1.1.2.2
+++ EssenceDirViewModel.h 6 Apr 2002 12:17:41 -0000 1.1.2.3
@@ -8,15 +8,15 @@
public:
- typedef boost::shared_ptr<EssenceFSViewModel> ptr;
+ typedef boost::shared_ptr<EssenceDirViewModel> ptr;
- EssenceFSViewModel(EssenceDir::ptr dir)
+ EssenceDirViewModel(EssenceDir::ptr dir)
: EssenceViewModel(dir->getPath()),
_dir(dir)
{}
- virtual ~EssenceViewModel()
+ virtual ~EssenceDirViewModel()
{}
virtual void registerView(EssenceView::ptr view);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/essence/src/Attic/EssenceViewModel.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- EssenceViewModel.h 3 Apr 2002 01:00:48 -0000 1.1.2.2
+++ EssenceViewModel.h 6 Apr 2002 12:17:42 -0000 1.1.2.3
@@ -27,7 +27,6 @@
string _name;
vector<EssenceViewItem::ptr> _items;
-
};
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/essence/src/Attic/EssenceWindow.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- EssenceWindow.h 29 Mar 2002 22:51:27 -0000 1.1.2.2
+++ EssenceWindow.h 6 Apr 2002 12:17:42 -0000 1.1.2.3
@@ -1,5 +1,6 @@
#ifndef ESSENCE_WINDOW_H
#define ESSENCE_WINDOW_H
+#include <Ecore.h>
#include "boost/shared_ptr.hpp"
class EssenceWindow
@@ -10,34 +11,23 @@
EssenceWindow(int x, int y, int w, int h)
: _x(x), _y(y), _w(w), _h(h)
- {
- // No implementations yet, people :)
-
- this->_win = ecore_window_new(0, _x, _y, _w, _h);
- ecore_window_set_delete_inform(this->_win);
- ecore_window_set_events(this->_win,
- XEV_VISIBILITY | XEV_CONFIGURE |
- XEV_PROPERTY | XEV_FOCUS);
- }
+ {}
- ~EssenceWindow()
+ virtual ~EssenceWindow()
{}
- void setView (EssenceView::ptr view)
- {
- _view = view;
- }
+ virtual void setView (EssenceView::ptr view)
+ :_view(view)
+ {}
- EssenceView::ptr getView ()
+ virtual EssenceView::ptr getView ()
{
return _view;
}
- void show()
- {
- ecore_window_show(_win);
- }
-
+ virtual void show();
+
+
protected:
Window _win;
@@ -48,6 +38,10 @@
int _w;
int _h;
+ // react to events
+ virtual void close();
+ virtual void resize(int w, int h);
+ virtual void moveTo(int x, int y);
};
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/essence/src/Attic/essence_design.dia,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
Binary files /tmp/cvsVi8rVe and /tmp/cvs3KAH4f differ
|