compbench-devel

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Status
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29619

Modified Files:
	Status-Console.cpp Status-Console.h Status.cpp 
Log Message:
Working message console.

Index: Status-Console.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status-Console.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Status-Console.h	11 Sep 2007 20:17:40 -0000	1.1
--- Status-Console.h	12 Sep 2007 16:24:52 -0000	1.2
***************
*** 15,19 ****
  namespace CQT {
  
!   class StatusConsole : public QGroupBox,
                          public CBM::UI
    {
--- 15,19 ----
  namespace CQT {
  
!   class StatusConsole : public QWidget,
                          public CBM::UI
    {

Index: Status.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Status.cpp	11 Sep 2007 20:17:40 -0000	1.4
--- Status.cpp	12 Sep 2007 16:24:52 -0000	1.5
***************
*** 31,38 ****
--- 31,42 ----
      progressBar=new QProgressBar();
      progressBar->setRange(0,100);
+     progressBar->setMinimumWidth(256);
+     progressBar->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
      lay->addWidget(progressBar);
    }
  
+   setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
    lay->setMargin(2);
+   lay->setSizeConstraint(QLayout::SetMinimumSize);
    setLayout(lay);
  }

Index: Status-Console.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status-Console.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Status-Console.cpp	11 Sep 2007 21:24:10 -0000	1.2
--- Status-Console.cpp	12 Sep 2007 16:24:52 -0000	1.3
***************
*** 7,19 ****
  
  StatusConsole::StatusConsole(QWidget *parent)
!   : QGroupBox(parent),
      UI()
  {
!   setTitle(tr("Message window"));
  
    lay=new QVBoxLayout();
    setLayout(lay);
  
!   setMinimumSize(500,300);
  
    connect(this, SIGNAL(sigMessageShow(CBM::UIMsg*)),
--- 7,28 ----
  
  StatusConsole::StatusConsole(QWidget *parent)
!   : QWidget(parent),
!     // QGroupBox(parent),
      UI()
  {
!   //  setTitle(tr("Message window"));
  
    lay=new QVBoxLayout();
    setLayout(lay);
+   /*   int i = 30;
+        while (i--)
+        lay->addWidget(new QLabel("what aizeuaziue"));
+   */
  
!   // setBackgroundRole(QPalette::BrightText);
!   setMinimumSize(0,0);
!   setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
!   lay->setSizeConstraint(QLayout::SetMinAndMaxSize);
!   // QSizePolicy::Ignored, QSizePolicy::Ignored);
  
    connect(this, SIGNAL(sigMessageShow(CBM::UIMsg*)),
***************
*** 202,205 ****
--- 211,216 ----
    }
  
+   if (_msg->getFlags()==CBM::UIMsg::Progress)
+     r+=" : ";
    return(r);
  }
***************
*** 212,215 ****
--- 223,227 ----
    if (label!="") {
      StatusAction *widget = new StatusAction(msg, label, this);
+     printf("%x d=%d\n", msg, CBM::UI::depth(msg)*16);
      widget->setContentsMargins(CBM::UI::depth(msg)*16, 0, 0, 0);
      lay->addWidget(widget);