/[projects]/infoscreen/mainview.cpp
ViewVC logotype

Diff of /infoscreen/mainview.cpp

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

revision 869 by torben, Mon Jun 21 13:32:45 2010 UTC revision 872 by torben, Tue Jun 22 07:24:14 2010 UTC
# Line 2  Line 2 
2  #include <QApplication>  #include <QApplication>
3  #include <QPushButton>  #include <QPushButton>
4  #include <QLabel>  #include <QLabel>
5  #include <QVBoxLayout>  #include <QStackedLayout>
6  #include <QSvgWidget>  #include <QSvgWidget>
7    
8  #include <QTimer>  #include <QTimer>
# Line 18  Line 18 
18  #include "httpwrapper.h"  #include "httpwrapper.h"
19    
20    
21    
22  MainView::MainView(QWidget* parent)  MainView::MainView(QWidget* parent)
23      : QWidget(parent), timer(0)      : QWidget(parent), timer(0)
24  {  {
# Line 31  MainView::MainView(QWidget* parent) Line 32  MainView::MainView(QWidget* parent)
32    
33      if (currentMode == ModeSimpleWeb){      if (currentMode == ModeSimpleWeb){
34          qDebug() << "Starting plain browser mode";          qDebug() << "Starting plain browser mode";
         web->setVisible(true);  
         web->start(url,screenid);  
35      }      }
36    
37      if (currentMode == ModeLocal ) {      if (currentMode == ModeLocal ) {
# Line 49  MainView::MainView(QWidget* parent) Line 48  MainView::MainView(QWidget* parent)
48      qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );      qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
49    
50      render = new ClientSideRender(this);      render = new ClientSideRender(this);
     render->setVisible( false );  
51    
52      web = new MyWebView(this);      web = new MyWebView(this);
     web->setVisible( false);  
53    
54      picture = new PictureView(this);      picture = new PictureView(this);
     picture->setVisible( false );  
55    
56      video = new VideoView(this);      video = new VideoView(this);
     video->setVisible(false);  
57    
58      svg = new QSvgWidget(this);      svg = new QSvgWidget(this);
     svg->setVisible(false);  
59    
60      QVBoxLayout* layout = new QVBoxLayout();      layout = new QStackedLayout();
61      layout->addWidget(web,1);      layout->addWidget(web);
62      layout->addWidget(render,1);      layout->addWidget(render);
63      layout->addWidget(picture,1);      layout->addWidget(picture);
64      layout->addWidget(video,1);      layout->addWidget(video);
65      layout->addWidget(svg,1);      layout->addWidget(svg);
     layout->addStretch();  
66      layout->setContentsMargins(0,0,0,0);      layout->setContentsMargins(0,0,0,0);
67      setLayout(layout);      setLayout(layout);
68    
69        if (currentMode == ModeSimpleWeb) {
70            web->setVisible(true);
71            web->start(url,screenid);
72        }
73    
74      if (currentMode == ModeXml || currentMode == ModeLocal) {      if (currentMode == ModeXml || currentMode == ModeLocal) {
75          qDebug() << "Starting timer...";          qDebug() << "Starting timer...";
# Line 291  void MainView::errorInfoScreen(QString m Line 288  void MainView::errorInfoScreen(QString m
288    
289  void MainView::ensureVisible(QWidget* widget)  void MainView::ensureVisible(QWidget* widget)
290  {  {
291      if (! widget->isVisible()) {      layout->setCurrentWidget(widget);    
         hideAll();  
         widget->setVisible(true);  
     }  
292  }  }
293    
 void MainView::hideAll()  
 {  
     render->setVisible( false );  
     web->setVisible( false);  
     picture->setVisible( false );  
     video->setVisible(false);  
     svg->setVisible(false);  
 }  
Legend:
Removed from v.869  
changed lines
  Added in v.872
  ViewVC Help
Powered by ViewVC 1.1.20