Changeset 2067 for palm


Ignore:
Timestamp:
Nov 11, 2016 9:55:49 PM (7 years ago)
Author:
maronga
Message:

small bugfix in palm_jm, integration of palm_jm in mrungui

Location:
palm/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/palm_jm

    r2066 r2067  
    9191
    9292        # Load predefined mainwindow
    93         uic.loadUi('palm_jm_files/palm_jm.ui', self)
     93        uic.loadUi(palm_bin + '/palm_jm_files/palm_jm.ui', self)
    9494   
    9595        # Display MainWindow
     
    359359        super(CreateSetBox, self).__init__()
    360360       
    361         uic.loadUi('palm_jm_files/palm_jm_create_set.ui', self)
     361        uic.loadUi(palm_bin + '/palm_jm_files/palm_jm_create_set.ui', self)
    362362       
    363363        self.show()
  • palm/trunk/UTIL/mrungui/mainwindow.cpp

    r1805 r2067  
    1818// Current revisions:
    1919// -----------------
    20 //
     20// Added support for PALM job manager
    2121//
    2222// Former revisions:
     
    12811281{
    12821282    return system("nohup palm_wd >> /dev/null 2>&1 &");
     1283
     1284}
     1285
     1286//****************************************************************************//
     1287//  Start job manager (palm_jm)
     1288int MainWindow::start_jobmanager()
     1289{
     1290    return system("nohup palm_jm >> /dev/null 2>&1 &");
    12831291
    12841292}
  • palm/trunk/UTIL/mrungui/mainwindow.h

    r1612 r2067  
    6262    int save_to_file();
    6363    int save_default();
     64    int start_jobmanager();
    6465    int start_watchdog();
    6566    int open_from_file();
  • palm/trunk/UTIL/mrungui/mainwindow.ui

    r1804 r2067  
    13591359    <property name="geometry">
    13601360     <rect>
    1361       <x>2175</x>
    1362       <y>98</y>
     1361      <x>4137</x>
     1362      <y>194</y>
    13631363      <width>159</width>
    1364       <height>186</height>
     1364      <height>163</height>
    13651365     </rect>
    13661366    </property>
     
    13761376    <addaction name="action_save"/>
    13771377    <addaction name="action_default"/>
    1378     <addaction name="action_start_wd"/>
    13791378    <addaction name="action_quit"/>
    13801379   </widget>
     
    13861385    <addaction name="action_about"/>
    13871386   </widget>
     1387   <widget class="QMenu" name="menuTools">
     1388    <property name="title">
     1389     <string>Tools</string>
     1390    </property>
     1391    <addaction name="action_start_watchdog"/>
     1392    <addaction name="action_start_jobmanager"/>
     1393   </widget>
    13881394   <addaction name="menuStart"/>
     1395   <addaction name="menuTools"/>
    13891396   <addaction name="menuHelp"/>
    13901397  </widget>
     
    14411448   <property name="text">
    14421449    <string>Start watchdog</string>
     1450   </property>
     1451  </action>
     1452  <action name="actionStart_job_manager">
     1453   <property name="text">
     1454    <string>Start job manager</string>
     1455   </property>
     1456  </action>
     1457  <action name="action_start_watchdog">
     1458   <property name="text">
     1459    <string>Watchdog</string>
     1460   </property>
     1461  </action>
     1462  <action name="action_start_jobmanager">
     1463   <property name="text">
     1464    <string>Job manager</string>
    14431465   </property>
    14441466  </action>
     
    15561578    <hint type="sourcelabel">
    15571579     <x>222</x>
    1558      <y>296</y>
     1580     <y>326</y>
    15591581    </hint>
    15601582    <hint type="destinationlabel">
     
    16521674    <hint type="sourcelabel">
    16531675     <x>413</x>
    1654      <y>141</y>
     1676     <y>164</y>
    16551677    </hint>
    16561678    <hint type="destinationlabel">
     
    17641786    <hint type="sourcelabel">
    17651787     <x>270</x>
    1766      <y>295</y>
     1788     <y>326</y>
    17671789    </hint>
    17681790    <hint type="destinationlabel">
     
    19081930    <hint type="sourcelabel">
    19091931     <x>606</x>
    1910      <y>216</y>
     1932     <y>239</y>
    19111933    </hint>
    19121934    <hint type="destinationlabel">
     
    19401962    <hint type="sourcelabel">
    19411963     <x>617</x>
    1942      <y>266</y>
     1964     <y>289</y>
    19431965    </hint>
    19441966    <hint type="destinationlabel">
     
    21322154    <hint type="sourcelabel">
    21332155     <x>805</x>
    2134      <y>389</y>
     2156     <y>421</y>
    21352157    </hint>
    21362158    <hint type="destinationlabel">
     
    22922314    <hint type="sourcelabel">
    22932315     <x>900</x>
    2294      <y>343</y>
     2316     <y>371</y>
    22952317    </hint>
    22962318    <hint type="destinationlabel">
     
    24202442    <hint type="sourcelabel">
    24212443     <x>175</x>
    2422      <y>66</y>
     2444     <y>91</y>
    24232445    </hint>
    24242446    <hint type="destinationlabel">
     
    24452467  </connection>
    24462468  <connection>
    2447    <sender>action_start_wd</sender>
     2469   <sender>check_cycfill</sender>
     2470   <signal>stateChanged(int)</signal>
     2471   <receiver>MainWindow</receiver>
     2472   <slot>change_rc_list()</slot>
     2473   <hints>
     2474    <hint type="sourcelabel">
     2475     <x>280</x>
     2476     <y>622</y>
     2477    </hint>
     2478    <hint type="destinationlabel">
     2479     <x>4</x>
     2480     <y>510</y>
     2481    </hint>
     2482   </hints>
     2483  </connection>
     2484  <connection>
     2485   <sender>action_start_jobmanager</sender>
    24482486   <signal>triggered()</signal>
    24492487   <receiver>MainWindow</receiver>
    2450    <slot>start_watchdog()</slot>
     2488   <slot>start_jobmanager()</slot>
    24512489   <hints>
    24522490    <hint type="sourcelabel">
     
    24612499  </connection>
    24622500  <connection>
    2463    <sender>check_cycfill</sender>
    2464    <signal>stateChanged(int)</signal>
    2465    <receiver>MainWindow</receiver>
    2466    <slot>change_rc_list()</slot>
    2467    <hints>
    2468     <hint type="sourcelabel">
    2469      <x>336</x>
    2470      <y>526</y>
    2471     </hint>
    2472     <hint type="destinationlabel">
    2473      <x>4</x>
    2474      <y>510</y>
     2501   <sender>action_start_watchdog</sender>
     2502   <signal>triggered()</signal>
     2503   <receiver>MainWindow</receiver>
     2504   <slot>start_watchdog()</slot>
     2505   <hints>
     2506    <hint type="sourcelabel">
     2507     <x>-1</x>
     2508     <y>-1</y>
     2509    </hint>
     2510    <hint type="destinationlabel">
     2511     <x>458</x>
     2512     <y>344</y>
    24752513    </hint>
    24762514   </hints>
     
    24952533  <slot>help()</slot>
    24962534  <slot>start_watchdog()</slot>
     2535  <slot>start_jobmanager()</slot>
    24972536 </slots>
    24982537</ui>
Note: See TracChangeset for help on using the changeset viewer.