Changeset b620d96


Ignore:
Timestamp:
04/18/13 08:30:00 (19 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
9c5c6c1, 3402bd9
Parents:
73d8dee (diff), 781fd04 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
5 added
15 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-mounttray/fsDialog.cpp

    rbe298e4 r891636a  
    22 
    33FSDialog::FSDialog() : QDialog(){ 
     4  this->setWindowTitle( tr("System Disk Capacity") ); 
     5  this->setWindowIcon( QIcon(":icons/harddrive.png")); 
    46  generateUI(); 
    57} 
     
    5961  QHBoxLayout *hb = new QHBoxLayout(); 
    6062  hb->addStretch(); 
    61   QPushButton *closeButton = new QPushButton("Close"); 
     63  QPushButton *closeButton = new QPushButton(QIcon(":icons/application-exit.png"),tr("Close")); 
    6264  hb->addWidget(closeButton); 
    6365  hb->addStretch(); 
     
    6769  this->setLayout(vlayout); 
    6870  //Now resize the dialog to fit the widget appropriately 
    69   this->adjustSize(); 
     71  this->adjustSize(); //still not working right -- need research on this 
    7072} 
    7173 
  • src-qt4/pc-mounttray/fsDialog.h

    rbe298e4 r891636a  
    1212#include <QBrush> 
    1313#include <QColor> 
     14#include <QIcon> 
    1415 
    1516#include "fsWatcher.h" 
  • src-qt4/pc-mounttray/fsWatcher.cpp

    rbb6089a r781fd04  
    44  //setup the timer 
    55  timer = new QTimer(); 
     6  timer->setSingleShot(TRUE); 
    67  QObject::connect(timer, SIGNAL(timeout()), this, SLOT(checkFS())); 
    78} 
     
    1112 
    1213void FSWatcher::start(int ms){  
    13     timer->start(ms);  
     14    timer->stop(); 
     15    timer->setInterval(ms); //max time between system checks 
     16    timer->start();  
    1417    QTimer::singleShot(2000,this,SLOT(checkFS()) ); //make sure to perform a check when it starts up 
    1518} 
     
    100103} 
    101104 
    102 //====== Private Slot ======= 
     105//====== Public Slot ======= 
    103106void FSWatcher::checkFS(){ 
    104107  QStringList devList = getFSmountpoints(); 
     
    109112      //Device greater than 90% full, warn the user 
    110113      badDevs << devList[i].section("::",0,0); //list the mountpoint 
    111       qDebug() << "WARNING: Device almost full:" << devList[i].section("::",0,0)+": "+QString::number(percent)+"% full"; 
     114      qDebug() << "WARNING: Device almost full:" << devList[i].section("::",0,0)+": "+QString::number(percent)+"% full: Time: "+QTime::currentTime().toString(); 
    112115    } 
    113116  } 
    114117  if(!badDevs.isEmpty()){ 
    115     QString title = tr("Disk(s) Almost Full"); 
    116     QString message = badDevs.join(", "); 
    117     emit FSWarning(title,message); 
     118    //check to make sure these are new "bad" devices 
     119    bool newFound = FALSE; 
     120    for(int i=0; i<badDevs.length(); i++){ 
     121      if( oldBadDevs.indexOf(badDevs[i]) == -1){ newFound = TRUE; }          
     122    } 
     123    if(newFound){ 
     124      QString title = tr("Disk(s) Almost Full"); 
     125      QString message = badDevs.join(", "); 
     126      emit FSWarning(title,message); 
     127    } 
    118128  } 
     129  //Save the current badDevs as the old list 
     130  oldBadDevs = badDevs; 
     131  //Reset the timer for the next time this function is to be called 
     132  timer->start(); //reset the timer again 
    119133} 
    120134 
     135//===== Calculate Percentages ===== 
    121136int FSWatcher::calculatePercentage(int used, int total){ 
    122137  double U = used; 
  • src-qt4/pc-mounttray/fsWatcher.h

    rbb6089a r781fd04  
    1010#include <QCoreApplication> 
    1111#include <QDebug> 
     12#include <QTime> 
     13 
    1214 
    1315class FSWatcher : public QObject 
     
    2830private: 
    2931  QTimer *timer; 
     32  QStringList oldBadDevs; 
     33   
    3034  static QStringList runCMD(QString); 
    3135  static int calculatePercentage(int,int); 
    3236   
    33 private slots: 
     37public slots: 
    3438  void checkFS(); //function in a timer loop 
    3539 
  • src-qt4/pc-mounttray/mountTray.cpp

    rbb6089a r891636a  
    2121  getInitialUsername(); //try to detect the non-root user who is running the program with root permissions 
    2222  getDefaultFileManager(); //try to detect the default file-manager for opening the mount directory 
     23  loadSavedSettings(); 
    2324   
    2425  trayIcon = new QSystemTrayIcon(this); 
    2526  trayIconMenu = new QMenu(); 
    26          
     27  //Generate the system menu options (these don't change) 
     28  sysMenu = new QMenu( tr("More Options") ); 
     29    sysMenu->setIcon( QIcon(":icons/config.png") ); 
     30    //Add the additional options 
     31    sysMenu->addAction( QIcon(":icons/folder.png"), tr("Open Media Directory"), this, SLOT(slotOpenMediaDir()) ); 
     32    sysMenu->addAction( QIcon(":icons/harddrive.png"), tr("View Disk Usage"),this,SLOT(slotOpenFSDialog()) ); 
     33    sysMenu->addAction( QIcon(":icons/refresh.png"),tr("Rescan Devices"), this, SLOT(slotRescan()) ); 
     34    //Add the setting dialog option seperately 
     35    sysMenu->addSeparator(); 
     36    sysMenu->addAction( QIcon(":icons/config.png"), tr("Change Settings"), this, SLOT(slotOpenSettings()) ); 
     37    //Add the Close button seperately 
     38    sysMenu->addSeparator(); 
     39    sysMenu->addAction( QIcon(":icons/application-exit.png"), tr("Close Tray"), this, SLOT(closeTray()) ); 
     40   
    2741  // Tie the left-click signal to open the context menu 
    2842  connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(slotTrayActivated(QSystemTrayIcon::ActivationReason)) ); 
     
    4458   
    4559  //Start up the filesystem watcher 
    46   qDebug() << "-Starting up the disk space alert system"; 
    4760  diskWatcher = new FSWatcher(); 
    4861  connect(diskWatcher,SIGNAL(FSWarning(QString,QString)),this,SLOT(slotDisplayWarning(QString,QString))); 
    49   diskWatcher->start(3600000); // check every 1 hour in milliseconds 
     62  if(useDiskWatcher){  
     63    qDebug() << "-Starting up the disk space alert system"; 
     64    diskWatcher->start(diskTimerMaxMS);  
     65  } 
    5066   
    5167  //Update the tray menu and icons 
     
    7692  //Separate the extra options at the end 
    7793  trayIconMenu->addSeparator(); 
    78   //Add the "open media" entry to the list 
    79   trayIconMenu->addAction( QIcon(":icons/folder.png"), tr("Open Media Directory"), this, SLOT(slotOpenMediaDir()) ); 
    80   trayIconMenu->addSeparator(); 
    81   trayIconMenu->addAction( QIcon(":icons/folder.png"), tr("Current Disk Usage"),this,SLOT(slotOpenFSDialog()) ); 
    82   trayIconMenu->addAction( QIcon(":icons/refresh.png"),tr("Rescan Devices"), this, SLOT(slotRescan()) ); 
    83   //Add the "close tray" entry to the list 
    84   trayIconMenu->addAction( QIcon(":icons/application-exit.png"), tr("Close Tray"), this, SLOT(closeTray()) ); 
    85    
     94  trayIconMenu->addMenu(sysMenu); 
    8695  //Apply the menu to the Tray 
    8796  trayIcon->setContextMenu(trayIconMenu); 
     
    167176 
    168177void MountTray::newDevdMessage(){        
    169   devdTimer->start(1000); //wait 1.5 seconds before checking for device changes 
     178  devdTimer->start(1500); //wait 1.5 seconds before checking for device changes 
    170179  return; 
    171180} 
     
    245254    } 
    246255  } //end loop over cd/dvd devices 
     256   
     257  //Run the disk space check if appropriate 
     258  if(useDiskWatcher && useDiskTimerDevd && showPopup){ diskWatcher->checkFS(); } 
    247259} 
    248260 
     
    334346    deviceList[i]->updateItem(); 
    335347  } 
     348  //Run the disk check if appropriate 
     349  if(useDiskWatcher){ diskWatcher->checkFS(); } 
    336350} 
    337351 
    338352void MountTray::slotOpenFSDialog(){ 
    339   //Open up the Filsystem disk space monitoring dialog 
     353  //Open up the Filesystem disk space monitoring dialog 
    340354  diskDisplay = new FSDialog(); 
    341355  diskDisplay->show(); 
     356} 
     357 
     358void MountTray::slotOpenSettings(){ 
     359  //Stop the refresh timer on the watcher 
     360  diskWatcher->stop(); 
     361  //Open up the settings window and apply changes as necessary 
     362  SettingsDialog *sdlg = new SettingsDialog(); 
     363  sdlg->useDiskWatcher = useDiskWatcher; 
     364  sdlg->useDiskAutoTimer = useDiskTimerDevd; 
     365  sdlg->diskRefreshMS = diskTimerMaxMS; 
     366  sdlg->showDialog(); 
     367  //Now parse the output and save if necessary 
     368  if(sdlg->SettingsChanged){ 
     369    useDiskWatcher = sdlg->useDiskWatcher; 
     370    useDiskTimerDevd = sdlg->useDiskAutoTimer; 
     371    diskTimerMaxMS = sdlg->diskRefreshMS; 
     372    qDebug() << "INFO: Saving updated settings to file"; 
     373    saveCurrentSettings(); //update the saved settings 
     374  } 
     375  //Now restart the disk watcher if enabled 
     376  if(useDiskWatcher){ diskWatcher->start(diskTimerMaxMS); } 
    342377} 
    343378 
     
    362397  trayIcon->showMessage(title, msg , QSystemTrayIcon::Warning,5000 ); 
    363398} 
     399 
     400void MountTray::loadSavedSettings(){ 
     401  //The saved settings file 
     402  QString filename = QDir::homePath()+"/.mounttray.settings"; 
     403  //Set the defaults 
     404  useDiskWatcher=TRUE; useDiskTimerDevd=TRUE; 
     405  diskTimerMaxMS=3600000; //1 hour refresh timer 
     406  //Now load the file 
     407  QFile file(filename); 
     408  if(file.exists()){ 
     409    if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){  
     410      qDebug() << "-Could not open settings file: using defaults"; 
     411      return;  
     412    } 
     413    QTextStream in(&file); 
     414    while(!in.atEnd()){ 
     415      QString line = in.readLine(); 
     416      if(!line.startsWith("#")){ //skip comment lines 
     417        QString var = line.section(")",0,0,QString::SectionSkipEmpty).simplified(); 
     418        QString val = line.section(")",1,30,QString::SectionSkipEmpty).simplified(); 
     419        if(var=="UseDiskSpaceMonitoring"){  
     420          if(val.toLower() == "true"){ useDiskWatcher = TRUE;} 
     421          else{ useDiskWatcher = FALSE; } 
     422        }else if(var=="UseDiskSpaceDevdTiming"){ 
     423          if(val.toLower() == "true"){ useDiskTimerDevd = TRUE;} 
     424          else{ useDiskTimerDevd = FALSE; }      
     425        }else if(var=="DiskSpaceTimingMaxMilliseconds"){ 
     426          diskTimerMaxMS = val.toInt();  
     427        } 
     428      } 
     429    } 
     430    file.close(); 
     431  }else{ 
     432    qDebug() << "-Creating new settings file with defaults"; 
     433    saveCurrentSettings(); 
     434  } 
     435} 
     436 
     437void MountTray::saveCurrentSettings(){ 
     438  //The saved settings file 
     439  QString filename = QDir::homePath()+"/.mounttray.settings"; 
     440  //Now write the current values to the file 
     441  QFile file(filename); 
     442  if(!file.open(QIODevice::WriteOnly | QIODevice::Text)){ 
     443    qDebug() << "ERROR: Could not open file to save settings:"<<filename; 
     444    return; 
     445  } 
     446  QTextStream out(&file); 
     447  out << "#pc-mounttray saved settings file\n"; 
     448  out << "# DO NOT EDIT: Use the settings dialog in the application instead!!\n"; 
     449  //Save the settings 
     450  out << "UseDiskSpaceMonitoring)"; 
     451  if(useDiskWatcher){ out << "true\n";} 
     452  else{ out << "false\n"; } 
     453  out << "UseDiskSpaceDevdTiming)"; 
     454  if(useDiskTimerDevd){ out << "true\n";} 
     455  else{ out << "false\n"; } 
     456  out << "DiskSpaceTimingMaxMilliseconds)"+QString::number(diskTimerMaxMS)+"\n"; 
     457  //Now close the file 
     458  file.close(); 
     459} 
  • src-qt4/pc-mounttray/mountTray.h

    rbb6089a r891636a  
    1111#include <QList> 
    1212#include <QTimer> 
     13#include <QDir> 
     14#include <QFile> 
     15#include <QTextStream> 
    1316 
    1417#include "menuItem.h" 
     
    1619#include "fsWatcher.h" 
    1720#include "fsDialog.h" 
     21#include "settingsDialog.h" 
    1822 
    1923extern bool DEBUG_MODE; 
     
    4852  void slotRescan(); 
    4953  void slotOpenFSDialog(); 
     54  void slotOpenSettings(); 
    5055   
    5156private: 
     
    5661  int numMount, numAvail; 
    5762  QSystemTrayIcon* trayIcon; 
    58   QMenu* trayIconMenu; 
     63  QMenu *trayIconMenu, *sysMenu; 
    5964  QList<MenuItem*> deviceList; 
    6065  QStringList oldsysdev; 
    6166  FSWatcher *diskWatcher; 
    6267  FSDialog *diskDisplay; 
     68  //Saved Settings 
     69  bool useDiskWatcher, useDiskTimerDevd; 
     70  int diskTimerMaxMS; //milliseconds 
    6371 
    6472 
     
    7078  void getInitialUsername(); 
    7179  void getDefaultFileManager(); 
     80  void loadSavedSettings(); 
     81  void saveCurrentSettings(); 
    7282   
    7383}; 
  • src-qt4/pc-mounttray/pc-mounttray.pro

    rbb6089a r891636a  
    1111        devCheck.h \ 
    1212        fsWatcher.h \ 
    13         fsDialog.h 
     13        fsDialog.h \ 
     14        settingsDialog.h 
    1415 
    1516SOURCES += main.cpp \ 
     
    1819        devCheck.cpp \ 
    1920        fsWatcher.cpp \ 
    20         fsDialog.cpp 
     21        fsDialog.cpp \ 
     22        settingsDialog.cpp 
    2123 
    2224RESOURCES += pc-mounttray.qrc 
  • src-qt4/pc-mounttray/pc-mounttray.qrc

    r1620346 r891636a  
    1313    <file>icons/harddrive.png</file> 
    1414    <file>icons/refresh.png</file> 
     15    <file>icons/config.png</file> 
     16    <file>icons/checkmark.png</file> 
    1517  </qresource> 
    1618</RCC> 
  • src-qt4/warden-gui/dialogEditIP.cpp

    r1620346 rf7c535e  
    1818#include <QMessageBox> 
    1919#include <QDebug> 
     20#include <QListWidgetItem> 
    2021#include "pcbsd-utils.h" 
    2122 
    2223// Local Includes 
    2324#include "dialogEditIP.h" 
     25 
    2426 
    2527void dialogEditIP::programInit(QString name) 
     
    133135  slotCheckChecks(); 
    134136  slotComboIPChanged(); 
     137  loadPerms(); 
     138} 
     139 
     140void dialogEditIP::loadPerms() 
     141{ 
     142 
     143  // Add the allow flags to show in the GUI 
     144  // <flag> | <default value> | <descrip> 
     145  jailFlags \ 
     146        << "allow.set_hostname|true|" + tr("A process within the jail has access to System V IPC primitives.") \ 
     147        << "allow.sysvipc|false|" + tr("A process within the jail has access to System V IPC primitives.") \ 
     148        << "allow.raw_sockets|false|" + tr("The prison root is allowed to create raw sockets. Enables ping / traceroute.") \ 
     149        << "allow.chflags|false|" + tr("When this parameter is set, such users are treated as privileged, and may manipulate system file flags subject to the usual constraints on kern.securelevel.") \ 
     150        << "allow.mount|false|" + tr("Privileged users inside the jail will be able to mount and unmount file system types marked as jail-friendly.") \ 
     151        << "allow.mount.devfs|false|" + tr("Privileged users inside the jail will be able to mount and unmount the devfs file system.") \ 
     152        << "allow.mount.nullfs|false|" + tr("Privileged users inside the jail will be able to mount and unmount the nullfs file system.") \ 
     153        << "allow.mount.procfs|false|" + tr("Privileged users inside the jail will be able to mount and unmount the procfs file system.") \ 
     154        << "allow.mount.zfs|false|" + tr("Privileged users inside the jail will be able to mount and unmount the zfs file system.") \ 
     155        << "allow.quotas|false|" + tr("The prison root may administer quotas on the jail's filesystem(s).") \ 
     156        << "allow.socket_af|false|" + tr("This allows access to other protocol stacks that have not had jail functionality added to them.") \ 
     157        ; 
     158 
     159  QString jDefault; 
     160  QString toggled; 
     161  QString curFlags; 
     162  QFile file( JailDir + "/." + jailName + ".meta/jail-flags" ); 
     163  if ( file.exists() && file.open( QIODevice::ReadOnly ) ) { 
     164     QTextStream stream( &file ); 
     165     curFlags = stream.readLine(); 
     166     file.close(); 
     167  } 
     168 
     169 
     170  for (int i = 0; i < jailFlags.size(); ++i) { 
     171      QListWidgetItem *myItem = new QListWidgetItem; 
     172      myItem->setText( jailFlags.at(i).section("|", 0, 0) ); 
     173      jDefault = jailFlags.at(i).section("|", 1, 1); 
     174      myItem->setToolTip( jailFlags.at(i).section("|", 2, 2) ); 
     175      if ( jDefault == "false" ) { 
     176        if ( curFlags.indexOf(jailFlags.at(i).section("|", 0,0) + "=true") != -1 ) 
     177          myItem->setCheckState(Qt::Checked); 
     178        else 
     179          myItem->setCheckState(Qt::Unchecked); 
     180      } else { 
     181        if ( curFlags.indexOf(jailFlags.at(i).section("|", 0,0) + "=false") != -1 ) 
     182          myItem->setCheckState(Qt::Unchecked); 
     183        else 
     184          myItem->setCheckState(Qt::Checked); 
     185      } 
     186      listPerms->addItem(myItem); 
     187  } 
     188} 
     189 
     190void dialogEditIP::savePerms() 
     191{ 
     192  QStringList savePerms; 
     193  QString jFlag, jDefault; 
     194  QString lFlag, lChecked; 
     195 
     196  for ( int i=0; i < listPerms->count() ; i++) { 
     197    lFlag =  listPerms->item(i)->text(); 
     198    if ( listPerms->item(i)->checkState() == Qt::Checked ) 
     199       lChecked="true"; 
     200    else 
     201       lChecked="false"; 
     202     
     203    for ( int j=0; j < jailFlags.count() ; j++) { 
     204       jFlag = jailFlags.at(j).section("|", 0, 0); 
     205       if ( jFlag != lFlag )  
     206         continue; 
     207 
     208       jDefault = jailFlags.at(j).section("|", 1, 1); 
     209       if ( jDefault == "true" && lChecked == "false" ) 
     210          savePerms << jFlag + "=false"; 
     211       if ( jDefault == "false" && lChecked == "true" ) 
     212          savePerms << jFlag + "=true"; 
     213    } 
     214  } 
     215 
     216  QFile file( JailDir + "/." + jailName + ".meta/jail-flags" ); 
     217  if ( ! savePerms.isEmpty() ) { 
     218    if ( file.open( QIODevice::WriteOnly ) ) { 
     219       QTextStream stream( &file ); 
     220       stream << savePerms.join(" "); 
     221       file.close(); 
     222    } 
     223  } else { 
     224    file.remove(); 
     225  } 
     226 
     227 
    135228} 
    136229 
     
    212305   { 
    213306     saveSettings(); 
     307     savePerms(); 
    214308     emit saved(); 
    215309     close(); 
  • src-qt4/warden-gui/dialogEditIP.h

    r1620346 rf7c535e  
    3232private: 
    3333        void displayRepos(); 
     34        void loadPerms(); 
     35        void savePerms(); 
    3436        void saveSettings(); 
    3537        bool checkValidBlock(QString block, QString type); 
     
    4042        QStringList IPv6Alias; 
    4143        QStringList IPv6AliasBridge; 
     44        QStringList jailFlags; 
    4245 
    4346signals: 
  • src-qt4/warden-gui/dialogEditIP.ui

    r1620346 rf7c535e  
    1212  </property> 
    1313  <property name="windowTitle"> 
    14    <string>IP Configuration</string> 
     14   <string>Jail Configuration</string> 
    1515  </property> 
    1616  <property name="windowIcon"> 
     
    2222    <widget class="QGroupBox" name="groupBox"> 
    2323     <property name="title"> 
    24       <string>Jail IP Addresses</string> 
     24      <string>Jail Configuration</string> 
    2525     </property> 
    2626     <layout class="QGridLayout" name="gridLayout"> 
     
    165165        <widget class="QWidget" name="tab_2"> 
    166166         <attribute name="title"> 
    167           <string>Advanced</string> 
     167          <string>Aliases</string> 
    168168         </attribute> 
    169169         <layout class="QGridLayout" name="gridLayout_3"> 
     
    233233            </item> 
    234234           </layout> 
     235          </item> 
     236         </layout> 
     237        </widget> 
     238        <widget class="QWidget" name="tab_4"> 
     239         <attribute name="title"> 
     240          <string>Permissions</string> 
     241         </attribute> 
     242         <layout class="QGridLayout" name="gridLayout_6"> 
     243          <item row="0" column="0"> 
     244           <widget class="QLabel" name="label"> 
     245            <property name="text"> 
     246             <string>The following permissions can be enabled or diabled for this jail. For more details hover over each item or refer to the jail manpage.</string> 
     247            </property> 
     248            <property name="wordWrap"> 
     249             <bool>true</bool> 
     250            </property> 
     251           </widget> 
     252          </item> 
     253          <item row="1" column="0"> 
     254           <widget class="QListWidget" name="listPerms"/> 
    235255          </item> 
    236256         </layout> 
  • src-qt4/warden-gui/dialogwarden.cpp

    r1620346 r73d8dee  
    8989   connect( pushTerminal, SIGNAL(clicked()), this, SLOT(slotTerminal() ) ); 
    9090   connect( pushUserAdmin, SIGNAL(clicked()), this, SLOT(slotUserAdmin() ) ); 
    91    connect( pushEditIP, SIGNAL(clicked()), this, SLOT(slotPushEditIP() ) ); 
     91   connect( pushConfigure, SIGNAL(clicked()), this, SLOT(slotPushEditIP() ) ); 
    9292   connect( pushUpdate, SIGNAL(clicked()), this, SLOT(slotUpdate() ) ); 
    9393   connect( comboPackageSet, SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangeMetaDefault() ) ); 
  • src-qt4/warden-gui/dialogwarden.ui

    r1620346 r73d8dee  
    167167                    <property name="text"> 
    168168                     <string>IPs:</string> 
    169                     </property> 
    170                    </widget> 
    171                   </item> 
    172                   <item> 
    173                    <widget class="QPushButton" name="pushEditIP"> 
    174                     <property name="cursor"> 
    175                      <cursorShape>OpenHandCursor</cursorShape> 
    176                     </property> 
    177                     <property name="styleSheet"> 
    178                      <string notr="true">color: rgb(0, 0, 255);</string> 
    179                     </property> 
    180                     <property name="text"> 
    181                      <string>(edit)</string> 
    182                     </property> 
    183                     <property name="autoDefault"> 
    184                      <bool>false</bool> 
    185                     </property> 
    186                     <property name="default"> 
    187                      <bool>false</bool> 
    188                     </property> 
    189                     <property name="flat"> 
    190                      <bool>true</bool> 
    191169                    </property> 
    192170                   </widget> 
     
    907885             <normaloff>:/running.png</normaloff>:/running.png</iconset> 
    908886           </property> 
     887           <property name="iconSize"> 
     888            <size> 
     889             <width>20</width> 
     890             <height>20</height> 
     891            </size> 
     892           </property> 
    909893           <property name="autoDefault"> 
    910894            <bool>false</bool> 
     
    915899           <property name="flat"> 
    916900            <bool>false</bool> 
     901           </property> 
     902          </widget> 
     903         </item> 
     904         <item> 
     905          <widget class="QPushButton" name="pushConfigure"> 
     906           <property name="minimumSize"> 
     907            <size> 
     908             <width>32</width> 
     909             <height>32</height> 
     910            </size> 
     911           </property> 
     912           <property name="maximumSize"> 
     913            <size> 
     914             <width>32</width> 
     915             <height>32</height> 
     916            </size> 
     917           </property> 
     918           <property name="toolTip"> 
     919            <string>Configure the jail</string> 
     920           </property> 
     921           <property name="text"> 
     922            <string/> 
     923           </property> 
     924           <property name="icon"> 
     925            <iconset resource="warden.qrc"> 
     926             <normaloff>:/configure.png</normaloff>:/configure.png</iconset> 
     927           </property> 
     928           <property name="iconSize"> 
     929            <size> 
     930             <width>20</width> 
     931             <height>20</height> 
     932            </size> 
    917933           </property> 
    918934          </widget> 
     
    955971             <normaloff>:/edit_add.png</normaloff>:/edit_add.png</iconset> 
    956972           </property> 
     973           <property name="iconSize"> 
     974            <size> 
     975             <width>20</width> 
     976             <height>20</height> 
     977            </size> 
     978           </property> 
    957979          </widget> 
    958980         </item> 
     
    9801002            <iconset resource="warden.qrc"> 
    9811003             <normaloff>:/edit_remove.png</normaloff>:/edit_remove.png</iconset> 
     1004           </property> 
     1005           <property name="iconSize"> 
     1006            <size> 
     1007             <width>20</width> 
     1008             <height>20</height> 
     1009            </size> 
    9821010           </property> 
    9831011          </widget> 
  • src-qt4/warden-gui/warden.qrc

    r1620346 r73d8dee  
    11<RCC> 
    22  <qresource> 
     3    <file>configure.png</file> 
    34    <file>utilities-terminal.png</file> 
    45    <file>updateavail.png</file> 
  • src-sh/warden/scripts/backend/startjail.sh

    re50ac20 r5cb55b5  
    366366instance=`get_ipfw_nat_instance "${IFACE}"` 
    367367if [ -z "${instance}" ] ; then 
    368 echo "NAT IS NULL" 
    369368   priority=`get_ipfw_nat_priority` 
    370369   instance=`get_ipfw_nat_instance` 
Note: See TracChangeset for help on using the changeset viewer.