Changeset 6c1dd87


Ignore:
Timestamp:
06/12/13 13:49:20 (16 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
46e10b9
Parents:
f2cdd39
Message:

Add the new Template UI manager to Warden, Now we can create / remove
jail templates, and during jail creation, pick from them

Location:
src-qt4/warden-gui
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/warden-gui/dialogdisplayoutput.ui

    r1620346 r6c1dd87  
    6666   </item> 
    6767   <item row="0" column="0"> 
    68     <widget class="QTextEdit" name="lineDisplay"/> 
     68    <widget class="QTextEdit" name="lineDisplay"> 
     69     <property name="readOnly"> 
     70      <bool>true</bool> 
     71     </property> 
     72    </widget> 
    6973   </item> 
    7074  </layout> 
  • src-qt4/warden-gui/dialogwarden.cpp

    r5dbb9c2 r6c1dd87  
    2525#include "dialogdisplayoutput.h" 
    2626#include "dialogimport.h" 
     27#include "dialogTemplates.h" 
    2728#include "wizardNewJail.h" 
    2829#include "pcbsd-utils.h" 
     
    16831684  this->raise(); 
    16841685} 
     1686 
     1687void dialogWarden::slotTemplateOpen() 
     1688{ 
     1689   tempDialog = new dialogTemplates(); 
     1690   tempDialog->programInit(); 
     1691   tempDialog->exec(); 
     1692} 
  • src-qt4/warden-gui/dialogwarden.h

    r5dbb9c2 r6c1dd87  
    66 
    77#include "ui_dialogwarden.h" 
     8#include "dialogTemplates.h" 
    89#include "dialogimport.h" 
    910#include "dialogEditIP.h" 
     
    8889    void slotCronSnapshotChanged(); 
    8990 
     91    void slotTemplateOpen(); 
     92 
    9093private: 
    9194    void refreshJailDetailsView(); 
     
    100103    QString JailDir; 
    101104    dialogConfig *configDialog; 
     105    dialogTemplates *tempDialog; 
    102106    QString currentStatusWorkingJail; 
    103107    QString currentDetailsWorkingJail; 
  • src-qt4/warden-gui/dialogwarden.ui

    r42584ef r6c1dd87  
    10201020    <addaction name="fileImport_JailAction"/> 
    10211021    <addaction name="separator"/> 
     1022    <addaction name="actionTemplate_Manager"/> 
     1023    <addaction name="separator"/> 
    10221024    <addaction name="fileExitAction"/> 
    10231025   </widget> 
     
    10901092   <property name="name" stdset="0"> 
    10911093    <string notr="true">fileImport_JailAction</string> 
     1094   </property> 
     1095  </action> 
     1096  <action name="actionTemplate_Manager"> 
     1097   <property name="text"> 
     1098    <string>Template Manager</string> 
    10921099   </property> 
    10931100  </action> 
     
    11851192   </hints> 
    11861193  </connection> 
     1194  <connection> 
     1195   <sender>actionTemplate_Manager</sender> 
     1196   <signal>activated()</signal> 
     1197   <receiver>dialogWarden</receiver> 
     1198   <slot>slotTemplateOpen()</slot> 
     1199   <hints> 
     1200    <hint type="sourcelabel"> 
     1201     <x>-1</x> 
     1202     <y>-1</y> 
     1203    </hint> 
     1204    <hint type="destinationlabel"> 
     1205     <x>378</x> 
     1206     <y>333</y> 
     1207    </hint> 
     1208   </hints> 
     1209  </connection> 
    11871210 </connections> 
    11881211</ui> 
  • src-qt4/warden-gui/warden-gui.pro

    r24ef714 r6c1dd87  
    77INCLUDEPATH+= ../libpcbsd/ui ../libpcbsd/utils /usr/local/include 
    88 
    9 HEADERS += dialogwarden.h dialogconfig.h dialogimport.h dialogworking.h dialogdisplayoutput.h wizardNewJail.h dialogEditIP.h 
     9HEADERS += dialogwarden.h \ 
     10        dialogconfig.h \ 
     11        dialogimport.h \ 
     12        dialogworking.h \ 
     13        dialogdisplayoutput.h \ 
     14        wizardNewJail.h \ 
     15        dialogEditIP.h \ 
     16        dialogTemplates.h 
    1017 
    11 SOURCES += main.cpp dialogwarden.cpp dialogconfig.cpp dialogimport.cpp dialogworking.cpp dialogdisplayoutput.cpp wizardNewJail.cpp dialogEditIP.cpp 
     18SOURCES += main.cpp \ 
     19        dialogwarden.cpp \ 
     20        dialogconfig.cpp \ 
     21        dialogimport.cpp \ 
     22        dialogworking.cpp \ 
     23        dialogdisplayoutput.cpp \ 
     24        wizardNewJail.cpp \ 
     25        dialogEditIP.cpp \ 
     26        dialogTemplates.cpp 
    1227 
    1328FORMS   = dialogwarden.ui \ 
     
    1732        dialogimport.ui \ 
    1833        dialogworking.ui \ 
    19         wizardNewJail.ui 
     34        wizardNewJail.ui \ 
     35        dialogTemplates.ui 
    2036 
    2137TARGET  = warden-gui 
  • src-qt4/warden-gui/wizardNewJail.cpp

    rf2cdd39 r6c1dd87  
    3636{ 
    3737   comboTemplate->clear(); 
    38    comboTemplate->addItem(tr("Use host Version + Architecture (default)")); 
     38   comboTemplate->addItem(tr("Use system version (default)")); 
    3939   // Load any available templates 
    4040   QProcess m; 
Note: See TracChangeset for help on using the changeset viewer.