--- a/edmain.h	Fri Oct 19 17:49:22 2012 +0300
+++ b/edmain.h	Fri Oct 19 21:52:16 2012 +0300
@@ -23,6 +23,7 @@
 #include "edview.h"
 #include "edwaveform.h"
 #include "edtimeline.h"
+#include "edres.h"
 #include <QDebug>
 #include <QFile>
 #include <QApplication>
@@ -70,14 +71,15 @@
     void actionTimelineChanged();
 
 private:
-    QTableView *effectTable;
     QAction *menuActUndo, *menuActRedo, *menuActOpen, *menuActSave, *menuActSaveAs;
 //    QAction *menuActCut, *menuActCopy, *menuActPaste, *menuActDelete;
     QActionGroup *actGroupControls;
     QScrollBar *timelineScrollBar;
-    QWaveTrackView *timelineAudioTrack;
-    QTimelineView *timelineView;
-    GLDemoView *demoView;
+    QTableView *resourceView;
+    QEDResourceModel *resourceModel;
+    QEDWaveTrackView *timelineAudioTrack;
+    QEDTimelineView *timelineView;
+    QEDGLDemoView *demoView;
     
     
 
@@ -92,11 +94,13 @@
     void statusMsg(QString message);
     void closeEvent(QCloseEvent *event);
     void createMainGUI();
+    void updateResourceView();
     void updateMenuStates();
     void updateTimelineView();
 
     int initEffectsAndResources();
     void shutdownEffectsAndResources();
+    void rehash();
     int reopenResources();
     int loadResources();
     bool initializeVideo();
@@ -112,10 +116,10 @@
     int currViewOffset;
     int currFrameTime;
 
-    TimelineObject *currTimeline;
+    EDTimelineObject *currTimeline;
     DMEngineData engine;
 
-    QList<TimelineObject *> undoHistory;
+    QList<EDTimelineObject *> undoHistory;
     int undoHistoryPos, undoHistoryMax;
 
     void historyReset();