1.1 --- a/goatview/src/goatview.h	Thu May 08 23:05:29 2014 +0300
     1.2 +++ b/goatview/src/goatview.h	Sun May 11 22:04:54 2014 +0300
     1.3 @@ -7,13 +7,16 @@
     1.4  #include "goat3d.h"
     1.5  
     1.6  extern goat3d *scene;
     1.7 -extern QSettings *settings;
     1.8  
     1.9 -bool load_scene(const char *fname);
    1.10 +class GoatViewport;
    1.11  
    1.12  class GoatView : public QMainWindow {
    1.13  	Q_OBJECT
    1.14  private:
    1.15 +	GoatViewport *glview;
    1.16 +	QStandardItemModel *sgmodel;	// scene graph model
    1.17 +	QTreeWidget *scntree;
    1.18 +
    1.19  	void closeEvent(QCloseEvent *ev);
    1.20  	bool make_menu();
    1.21  	bool make_dock();
    1.22 @@ -26,12 +29,19 @@
    1.23  public:
    1.24  	GoatView();
    1.25  	~GoatView();
    1.26 +
    1.27 +	bool load_scene(const char *fname);
    1.28  };
    1.29  
    1.30  class GoatViewport : public QGLWidget {
    1.31 +private:
    1.32  	Q_OBJECT
    1.33 +
    1.34 +	QWidget *main_win;
    1.35 +	bool initialized;
    1.36 +
    1.37  public:
    1.38 -	GoatViewport();
    1.39 +	GoatViewport(QWidget *main_win);
    1.40  	~GoatViewport();
    1.41  
    1.42  	QSize sizeHint() const;