/[projects]/infoscreen/MainView.h
ViewVC logotype

Diff of /infoscreen/MainView.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 874 by torben, Mon Jun 21 13:53:17 2010 UTC revision 875 by torben, Tue Jun 22 20:43:13 2010 UTC
# Line 4  Line 4 
4    
5  #include <QVector>  #include <QVector>
6  #include <QWidget>  #include <QWidget>
 #include "screenmanager.h"  
7  #include "screenitem.h"  #include "screenitem.h"
8  #include "screenxmlhandler.h"  #include "screenxmlhandler.h"
9    
# Line 14  class MyWebView; Line 13  class MyWebView;
13  class ClientSideRender;  class ClientSideRender;
14  class PictureView;  class PictureView;
15  class QSvgWidget;  class QSvgWidget;
16    class ScreenManager;
17  class QSettings;  class QSettings;
18    
19  enum Mode {  enum Mode {
# Line 46  private: Line 45  private:
45      void errorInfoScreen(QString msg);      void errorInfoScreen(QString msg);
46    
47      Mode currentMode;      Mode currentMode;
48        bool enableScreenManager;
49    
50      QStackedLayout* layout;      QStackedLayout* layout;
51    
# Line 55  private: Line 55  private:
55      VideoView* video;      VideoView* video;
56      QSvgWidget* svg;      QSvgWidget* svg;
57      QWidget* current;      QWidget* current;
58      ScreenManager screenManager;      ScreenManager* screenManager;
59    
60      QTimer* timer ;      QTimer* timer ;
61      QTime lastXml;      QTime lastXml;

Legend:
Removed from v.874  
changed lines
  Added in v.875

  ViewVC Help
Powered by ViewVC 1.1.20