Changeset 10284ca


Ignore:
Timestamp:
07/07/15 11:31:16 (7 weeks ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.2
Children:
f9ad3ef
Parents:
c2e2f55
Message:

Remove the "Enable Offsite Backeups" option from teh File menu - this is now incorporated into the pool configuration flow.

Location:
src-qt5/life-preserver/lp-gui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt5/life-preserver/lp-gui/LPMain.cpp

    r5804d35 r10284ca  
    5858  connect(ui->menuManage_Pool, SIGNAL(triggered(QAction*)), this, SLOT(menuAddPool(QAction*)) ); 
    5959  connect(ui->menuUnmanage_Pool, SIGNAL(triggered(QAction*)), this, SLOT(menuRemovePool(QAction*)) ); 
    60   connect(ui->menuEnable_Offsite_Backups, SIGNAL(triggered(QAction*)), this, SLOT(menuSetupISCSI(QAction*)) ); 
     60  //connect(ui->menuEnable_Offsite_Backups, SIGNAL(triggered(QAction*)), this, SLOT(menuSetupISCSI(QAction*)) ); 
    6161  connect(ui->action_SaveKeyToUSB, SIGNAL(triggered()), this, SLOT(menuSaveSSHKey()) ); 
    6262  connect(ui->actionClose_Window, SIGNAL(triggered()), this, SLOT(menuCloseWindow()) ); 
     
    180180  ui->menuManage_Pool->setEnabled( !ui->menuManage_Pool->isEmpty() ); 
    181181  ui->menuUnmanage_Pool->clear(); 
    182   ui->menuEnable_Offsite_Backups->clear(); 
     182  //ui->menuEnable_Offsite_Backups->clear(); 
    183183  for( int i=0; i<pools.length(); i++){ 
    184184    ui->menuUnmanage_Pool->addAction(pools[i]); 
    185     ui->menuEnable_Offsite_Backups->addAction(pools[i]); 
     185    //ui->menuEnable_Offsite_Backups->addAction(pools[i]); 
    186186  } 
    187187  ui->menuUnmanage_Pool->setEnabled( !ui->menuUnmanage_Pool->isEmpty() ); 
    188   ui->menuEnable_Offsite_Backups->setEnabled( !ui->menuEnable_Offsite_Backups->isEmpty() ); 
     188  //ui->menuEnable_Offsite_Backups->setEnabled( !ui->menuEnable_Offsite_Backups->isEmpty() ); 
    189189  qDebug() << "[DEBUG] Update user menus"; 
    190190  //Now update the user's that are available for home-dir packaging 
     
    638638} 
    639639 
    640 void LPMain::menuSetupISCSI(QAction *act){ 
     640/*void LPMain::menuSetupISCSI(QAction *act){ 
    641641  QString ds = act->text(); //this is the zpool 
    642642  LPISCSIWizard dlg(this, ds); 
    643643    dlg.exec(); 
    644644 
    645 } 
     645}*/ 
    646646 
    647647void LPMain::menuCloseWindow(){ 
  • src-qt5/life-preserver/lp-gui/LPMain.h

    r8e27bfd r10284ca  
    8080        void menuRemovePool(QAction*); 
    8181        void menuSaveSSHKey(); 
    82         void menuSetupISCSI(QAction*); 
     82        //void menuSetupISCSI(QAction*); 
    8383        void menuCloseWindow(); 
    8484        //Classic Backups 
  • src-qt5/life-preserver/lp-gui/LPMain.ui

    r1b702e0 r10284ca  
    403403     <addaction name="actionPools_2"/> 
    404404    </widget> 
    405     <widget class="QMenu" name="menuEnable_Offsite_Backups"> 
    406      <property name="title"> 
    407       <string>Enable Offsite Backups</string> 
    408      </property> 
    409      <property name="icon"> 
    410       <iconset resource="lPreserve.qrc"> 
    411        <normaloff>:/images/upload.png</normaloff>:/images/upload.png</iconset> 
    412      </property> 
    413      <addaction name="actionPools_3"/> 
    414     </widget> 
    415405    <addaction name="menuManage_Pool"/> 
    416406    <addaction name="menuUnmanage_Pool"/> 
    417     <addaction name="menuEnable_Offsite_Backups"/> 
    418407    <addaction name="separator"/> 
    419408    <addaction name="action_SaveKeyToUSB"/> 
Note: See TracChangeset for help on using the changeset viewer.