Ignore:
Timestamp:
Apr 5, 2016 4:30:18 PM (6 years ago)
Author:
maronga
Message:

removed parameter file check. update of mrungui for compilation with qt5

Location:
palm/trunk/UTIL/mrungui
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/UTIL/mrungui/main.cpp

    r1047 r1804  
    1818// Current revisions:
    1919// -----------------
     20// Update for use with qt5
    2021//
    2122// Former revisions:
     
    3738//----------------------------------------------------------------------------//
    3839
    39 #include <QtGui/QApplication>
     40#include <QApplication>
    4041#include "mainwindow.h"
    4142#include <QProcess>
  • palm/trunk/UTIL/mrungui/mainwindow.cpp

    r1724 r1804  
    1818// Current revisions:
    1919// -----------------
    20 //
     20// Removed parameter file check
     21// Update for use with qt5
    2122//
    2223// Former revisions:
     
    5354//----------------------------------------------------------------------------//
    5455
    55 #include <QtGui/QApplication>
     56#include <QApplication>
    5657#include "mainwindow.h"
    5758#include "ui_mainwindow.h"
     
    230231    ui->check_advanced->setEnabled(false);
    231232    ui->check_verbose->setEnabled(false);
    232     ui->check_namelist_check->setEnabled(false);
    233233    ui->button_start->setEnabled(false);
    234234    ui->button_start->setText("wait...");
     
    287287    ui->check_advanced->setEnabled(true);
    288288    ui->check_verbose->setEnabled(true);
    289     ui->check_namelist_check->setEnabled(true);
    290289    ui->button_start->setEnabled(true);
    291290    ui->action_save->setEnabled(true);
     
    10341033    }
    10351034
    1036     status = ui->check_namelist_check->checkState();
    1037 
    1038     if (status == 2)
    1039     {
    1040         activate_flag("z");
    1041     }
    1042     else
    1043     {
    1044         deactivate_flag("z");
    1045     }
    1046 
    10471035    status = ui->check_A->checkState();
    10481036
     
    12891277int MainWindow::start_watchdog()
    12901278{
    1291     system("nohup palm_wd >> /dev/null 2>&1 &");
    1292 
    1293     return 0;
     1279    return system("nohup palm_wd >> /dev/null 2>&1 &");
     1280
    12941281}
    12951282
     
    14891476            {
    14901477               ui->check_verbose->setChecked(true);
    1491             }
    1492             else if ( parameter == "z")
    1493             {
    1494                ui->check_namelist_check->setChecked(true);
    14951478            }
    14961479            else if ( parameter == "A")
  • palm/trunk/UTIL/mrungui/mainwindow.ui

    r1723 r1804  
    808808     </property>
    809809    </widget>
    810     <widget class="QCheckBox" name="check_namelist_check">
     810    <widget class="QCheckBox" name="check_cycfill">
    811811     <property name="geometry">
    812812      <rect>
     
    814814       <y>245</y>
    815815       <width>261</width>
    816        <height>23</height>
    817       </rect>
    818      </property>
    819      <property name="text">
    820       <string>Skip namelist file check</string>
    821      </property>
    822     </widget>
    823     <widget class="QCheckBox" name="check_cycfill">
    824      <property name="geometry">
    825       <rect>
    826        <x>270</x>
    827        <y>197</y>
    828        <width>191</width>
    829816       <height>21</height>
    830817      </rect>
     
    13661353     <y>0</y>
    13671354     <width>917</width>
    1368      <height>18</height>
     1355     <height>20</height>
    13691356    </rect>
    13701357   </property>
     
    13741361      <x>2175</x>
    13751362      <y>98</y>
    1376       <width>120</width>
    1377       <height>206</height>
     1363      <width>159</width>
     1364      <height>186</height>
    13781365     </rect>
    13791366    </property>
     
    24422429  </connection>
    24432430  <connection>
    2444    <sender>check_namelist_check</sender>
    2445    <signal>stateChanged(int)</signal>
    2446    <receiver>MainWindow</receiver>
    2447    <slot>check_flags()</slot>
    2448    <hints>
    2449     <hint type="sourcelabel">
    2450      <x>61</x>
    2451      <y>609</y>
    2452     </hint>
    2453     <hint type="destinationlabel">
    2454      <x>5</x>
    2455      <y>594</y>
    2456     </hint>
    2457    </hints>
    2458   </connection>
    2459   <connection>
    24602431   <sender>check_Z</sender>
    24612432   <signal>stateChanged(int)</signal>
  • palm/trunk/UTIL/mrungui/mrungui.pro

    r794 r1804  
    33# Current revisions:
    44# -----------------
    5 #
     5# Update for use with qt5
     6#
    67# Former revisions:
    78# -----------------
     
    1819QT       += core gui
    1920
     21greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
     22
    2023TARGET = mrungui.x
    2124DESTDIR = ../../SCRIPTS/
Note: See TracChangeset for help on using the changeset viewer.