Merge branch 'master' of newton:/data1/x0-0-0/pwr

xtt/exe/rt_xtt/qt/rt_xtt_qt.cqt

@@ -603,7 +603,7 @@ XttQt::XttQt(int argc, char* argv[], int* return_sts)
 
   // Qt
   toplevel = new XttQtWidget(this);
-  toplevel->setFixedSize(window_width, window_height);
+  toplevel->setMinimumSize(window_width, window_height);
   toplevel->setWindowTitle(fl(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
 
@@ -729,8 +729,6 @@ XttQt::XttQt(int argc, char* argv[], int* return_sts)
 
   statusbar->show();
 
-  wow = new CoWowQt(toplevel);
-
   xnav = new XNavQt(this, xnav_form, "Plant", &brow_widget,
       (xnav_sStartMenu*)root_menu, opplace_str, op_close_button, &sts);
   xnav->message_cb = &xtt_message_cb;

xtt/exe/rt_xtt/src/rt_xtt.cpp

@@ -65,12 +65,18 @@ int main(int argc, char* argv[])
   if (!found) {
     struct stat st;
 
-    strcpy(file, "$pwr_exe/rt_xtt_gtk");
+    strcpy(file, "$pwr_exe/rt_xtt_qt");
     dcli_translate_filename(file, file);
     if (stat(file, &st) == 0)
-      strcpy(wmg, "gtk");
-    else
-      strcpy(wmg, "motif");
+      strcpy(wmg, "qt");
+    else {
+      strcpy(file, "$pwr_exe/rt_xtt_gtk");
+      dcli_translate_filename(file, file);
+      if (stat(file, &st) == 0)
+        strcpy(wmg, "gtk");
+      else
+        strcpy(wmg, "motif");
+    }
   }
 
   strcpy(file, argv[0]);

xtt/lib/cow/qt/cow_login_qt.cqt

@@ -107,7 +107,6 @@ CoLoginQt::CoLoginQt(void* wl_parent_ctx, QWidget* wl_parent_wid,
   // Create an input dialog
   toplevel = new CoLoginQtWidget(this, wl_parent_wid);
   toplevel->setToolTip(fl("cow_login widget"));
-  toplevel->setMinimumSize(500, 200);
   toplevel->setWindowTitle(fl("Proview Login"));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
 

xtt/lib/cow/qt/cow_rtmon_qt.cqt

@@ -45,7 +45,6 @@
 #include "cow_statusmon_nodelistnav_qt.h"
 #include "cow_wow_qt.h"
 
-#include <QHBoxLayout>
 #include <QMenu>
 #include <QMenuBar>
 #include <QPalette>
@@ -90,7 +89,7 @@ RtMonQt::RtMonQt(void* rtmon_parent_ctx, QWidget* rtmon_parent_wid,
 
   toplevel = new RtMonQtWidget(this, rtmon_parent_wid);
   toplevel->setToolTip(fl("cow_rtmon widget"));
-  toplevel->setMinimumSize(480, 340);
+  toplevel->setMinimumHeight(340);
   toplevel->setWindowTitle(fl(title));
   toplevel->setAttribute(Qt::WA_DeleteOnClose);
 
@@ -144,6 +143,7 @@ RtMonQt::RtMonQt(void* rtmon_parent_ctx, QWidget* rtmon_parent_wid,
   pwr_tFileName fname;
   dcli_translate_filename(fname, "$pwr_exe/pwr_logofully.png");
   bbox_image = new_image_label(toplevel, fname);
+  bbox_image->setVisible(false);
 
   dcli_translate_filename(fname, "$pwr_exe/pwr_logofullg.png");
   bbox_image_gray = new_image_label(toplevel, fname);
@@ -164,8 +164,7 @@ RtMonQt::RtMonQt(void* rtmon_parent_ctx, QWidget* rtmon_parent_wid,
   lbox->addWidget(bbox_label);
   addButton(toplevel, lbox, "Reset Runtime", SLOT(activate_reset()));
 
-  QHBoxLayout* bbox_vbox = new QHBoxLayout();
-  bbox_vbox->addWidget(bbox_image);
+  bbox_vbox = new QHBoxLayout();
   bbox_vbox->addWidget(bbox_image_gray);
   bbox_vbox->addLayout(bbox);
   bbox_vbox->addLayout(lbox);
@@ -178,8 +177,6 @@ RtMonQt::RtMonQt(void* rtmon_parent_ctx, QWidget* rtmon_parent_wid,
   toplevel->setLayout(vbox);
   toplevel->show();
 
-  bbox_image->setVisible(false);
-
   wow = new CoWowQt(toplevel);
 
   timerid = new QTimer();
@@ -209,8 +206,11 @@ void RtMonQtWidget::rtmon_scan()
       rtmon->file_xtt->setEnabled(false);
       rtmon->file_op->setEnabled(false);
 
+      rtmon->bbox_vbox->insertWidget(0, rtmon->bbox_image_gray);
+      rtmon->bbox_vbox->removeWidget(rtmon->bbox_image);
       rtmon->bbox_image->setVisible(false);
       rtmon->bbox_image_gray->setVisible(true);
+      rtmon->bbox_vbox->update();
     } else {
       if (((sts & 7) == 2) || ((sts & 7) == 4)) {
         strcpy(color_name, "Red");
@@ -229,8 +229,12 @@ void RtMonQtWidget::rtmon_scan()
       rtmon->tools_op->setEnabled(true);
       rtmon->file_xtt->setEnabled(true);
       rtmon->file_op->setEnabled(true);
+
+      rtmon->bbox_vbox->insertWidget(0, rtmon->bbox_image);
+      rtmon->bbox_vbox->removeWidget(rtmon->bbox_image_gray);
       rtmon->bbox_image->setVisible(true);
       rtmon->bbox_image_gray->setVisible(false);
+      rtmon->bbox_vbox->update();
     }
 
     QPalette pal;

xtt/lib/cow/qt/cow_rtmon_qt.h

@@ -42,6 +42,7 @@
 #include "cow_rtmon.h"
 
 #include <QAction>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QWidget>
 
@@ -60,6 +61,7 @@ public:
   QWidget* bbox_stop;
   QLabel* bbox_image;
   QLabel* bbox_image_gray;
+  QHBoxLayout *bbox_vbox;
   QAction* tools_xtt;
   QAction* tools_op;
   QAction* file_xtt;