|
From: <enl...@li...> - 2002-03-31 17:15:47
|
Enlightenment CVS committal
Author : cpk
Project : e17
Module : apps/essence
Dir : e17/apps/essence/src
Modified Files:
Tag: SPLIT
Essence.h EssenceFile.h EssenceFileType.h
EssenceFileTypeRepository.h EssenceViewItem.h
essence_design.dia
Added Files:
Tag: SPLIT
EssenceIconDataRepository.h
Log Message:
- Added an EssenceIconDataRepository
- Removed the 1:1 association between EssenceFileTypes and
EssenceIconData. Not every file type that has handler apps etc
necessarily has its own icon data and vice versa.
- Added EssenceIconData to EssenceViewItems, I think that's where they
should be.
- Marked the repositories as singletons.
- Added an EssenceFileType to every EssenceFile, that probably
makes sense.
- updated UML accordingly.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/essence/src/Attic/Essence.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- Essence.h 29 Mar 2002 22:51:27 -0000 1.1.2.1
+++ Essence.h 31 Mar 2002 17:15:46 -0000 1.1.2.2
@@ -1,6 +1,9 @@
#ifndef ESSENCE_H
#define ESSENCE_H
+#include "EssenceFileTypeRepository.h"
+#include "EssenceIconDataRepository.h"
+
// The main class for Essence, which sets everything up,
// runs the eventloop etc.
class Essence
@@ -15,6 +18,11 @@
bool checkArguments();
void init();
void mainLoop();
+
+private:
+
+ EssenceFileTypeRepository::ptr _fileTypeRepo;
+ EssenceIconDataRepository::ptr _iconDataRepo;
};
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/essence/src/Attic/EssenceFile.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -3 -r1.1.2.3 -r1.1.2.4
--- EssenceFile.h 29 Mar 2002 22:51:27 -0000 1.1.2.3
+++ EssenceFile.h 31 Mar 2002 17:15:46 -0000 1.1.2.4
@@ -54,13 +54,16 @@
protected:
// The path of the file
- string _file;
+ string _file;
- struct stat _stat;
+ struct stat _stat;
// A template for the way e.g. files are passed to the app
- string _params_template;
+ string _params_template;
+ // Seems to make sense to associate file types with files.
+ // Not sure how/where/when to set these.
+ EssenceFileType::ptr _type;
};
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/essence/src/Attic/EssenceFileType.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- EssenceFileType.h 29 Mar 2002 22:51:27 -0000 1.1.2.1
+++ EssenceFileType.h 31 Mar 2002 17:15:46 -0000 1.1.2.2
@@ -47,11 +47,6 @@
// for example. Related to a TeX file would be gv, dvips etc.
list<EssenceFile::ptr> _relatedApps;
- // Every file type has related icon data (the file that contains
- // images for the default, selected, clicked etc states). The
- // actual icons are constructed from this raw data.
- EssenceIconData::ptr _iconData;
-
};
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/essence/src/Attic/EssenceFileTypeRepository.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- EssenceFileTypeRepository.h 29 Mar 2002 22:51:27 -0000 1.1.2.1
+++ EssenceFileTypeRepository.h 31 Mar 2002 17:15:46 -0000 1.1.2.2
@@ -35,6 +35,7 @@
{
public:
+ // Fixme: needs to be a singleton
EssenceFileTypeRepository();
EssenceFileType::ptr findFileType(string fileType);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/essence/src/Attic/EssenceViewItem.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- EssenceViewItem.h 29 Mar 2002 22:51:27 -0000 1.1.2.1
+++ EssenceViewItem.h 31 Mar 2002 17:15:46 -0000 1.1.2.2
@@ -48,11 +48,19 @@
virtual void setName(const string& name);
virtual string getName(void);
+ virtual EssenceIconData::ptr getIconData();
+
protected:
// Every view item belongs to a view, given at creation time.
EssenceView::ptr _view;
string _name;
+
+ // Every view item has related icon data (the file that contains
+ // images for the default, selected, clicked etc states). The
+ // actual icons are constructed from this raw data through the
+ // icon factories that can access this icon data through getIconData().
+ EssenceIconData::ptr _iconData;
};
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/essence/src/Attic/essence_design.dia,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
Binary files /tmp/cvs9WwmLc and /tmp/cvsmJxPnf differ
|