Changeset 4ba9054e


Ignore:
Timestamp:
08/27/13 08:16:04 (16 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
bfe4e62
Parents:
50676f3 (diff), 426313b (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

Location:
src-qt4
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-pkgmanager/mainWin.cpp

    re55b4d0 r426313b  
    14281428   groupInfo->setVisible(false); 
    14291429} 
     1430 
     1431void mainWin::closeEvent(QCloseEvent *event) { 
     1432 
     1433  if ( pkgCmdList.isEmpty() ) { 
     1434    this->close(); 
     1435    return;    
     1436  } 
     1437  if ( pkgCmdList.at(0).at(0).isEmpty() ) { 
     1438    this->close(); 
     1439    return;   
     1440  } 
     1441 
     1442  //Verify that they want to continue 
     1443  QMessageBox::StandardButton button = QMessageBox::warning(this, tr("Processes Running"), tr("Packages are currently being changed. Are you sure you want to quit?"), QMessageBox::Yes | QMessageBox::Cancel,QMessageBox::Cancel); 
     1444  if(button == QMessageBox::Yes) { 
     1445    this->close(); 
     1446  } else { 
     1447    event->ignore(); 
     1448    return; 
     1449  } 
     1450} 
     1451 
  • src-qt4/pc-pkgmanager/mainWin.h

    re55b4d0 r426313b  
    22#define MAINWIN_H 
    33 
     4#include <QCloseEvent> 
    45#include <QDialog> 
    56#include <QFile> 
     
    3839    void ProgramInit(QString); 
    3940    void slotSingleInstance(); 
     41 
     42protected: 
     43    void closeEvent(QCloseEvent *event); 
    4044 
    4145private slots: 
  • src-qt4/life-preserver/LPTray.cpp

    r845aaf6 r50676f3  
    144144  QStringList dsList = LPBackend::listDatasets(); 
    145145  if(dsList.isEmpty()){ 
    146     this->setToolTip(tr("Automatic Backups Disabled")); 
     146    this->setToolTip(tr("Automatic Snapshots Disabled")); 
    147147  }else{ 
    148148    //Grab the newest snapshot from each dataset 
     
    154154        tt.append( QString(tr("%1: No snapshots available")).arg(dsList[0]) ); 
    155155      }else{ 
    156         tt.append( QString(tr("%1: %2 available")).arg(dsList[0],snaps[0]) ); 
     156        tt.append( QString(tr("%1: Latest snapshot: %2")).arg(dsList[0],snaps[0]) ); 
    157157      } 
    158158    } 
     
    201201  if(file == "/var/log/lpreserver/lpreserver.log"){ 
    202202    //Backend Status Update 
    203     //get the last line from the log file 
    204203    //Now parse the log lines and do stuff with it 
    205204    while( !LFStream->atEnd() ){ parseLogMessage(LFStream->readLine(), initPhase); } 
Note: See TracChangeset for help on using the changeset viewer.