Changeset 108626c


Ignore:
Timestamp:
09/25/13 08:49:57 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
cec4c86b
Parents:
155b055
Message:

Clean up the tray icons for life-preserver so they are easier to see, and fix the constant resilvering messages when a reilver is finished.

Location:
src-qt4/life-preserver
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/life-preserver/LPMain.ui

    ra194d99 r108626c  
    173173        <item> 
    174174         <widget class="QLabel" name="label_replication"> 
     175          <property name="statusTip"> 
     176           <string/> 
     177          </property> 
    175178          <property name="styleSheet"> 
    176            <string notr="true">background-color: rgba(10,200,10,100)</string> 
     179           <string notr="true">background-color: rgba(10,200,10,100); border-radius: 5px</string> 
    177180          </property> 
    178181          <property name="text"> 
     
    190193         <widget class="QLabel" name="label_mirror"> 
    191194          <property name="styleSheet"> 
    192            <string notr="true">background-color: rgba(10,100,200,100)</string> 
     195           <string notr="true">background-color: rgba(10,100,200,100); border-radius: 5px</string> 
    193196          </property> 
    194197          <property name="text"> 
     
    206209         <widget class="QLabel" name="label_errors"> 
    207210          <property name="styleSheet"> 
    208            <string notr="true">background-color: rgba(230,10,10,100)</string> 
     211           <string notr="true">background-color: rgba(230,10,10,100); border-radius: 5px</string> 
    209212          </property> 
    210213          <property name="text"> 
     
    237240          <item> 
    238241           <widget class="QToolButton" name="tool_prevsnap"> 
     242            <property name="statusTip"> 
     243             <string>Select the previous (older) snapshot</string> 
     244            </property> 
    239245            <property name="styleSheet"> 
    240246             <string notr="true"/> 
     
    284290          <item> 
    285291           <widget class="QToolButton" name="tool_nextsnap"> 
     292            <property name="statusTip"> 
     293             <string>Select the next (more recent) snapshot</string> 
     294            </property> 
    286295            <property name="text"> 
    287296             <string>Next</string> 
  • src-qt4/life-preserver/LPTray.cpp

    re9760d0 r108626c  
    3535  if( watcher->hasError() ){ 
    3636    //Errors - show that attention is required 
    37     this->setIcon( QIcon(":/images/tray-icon-failed.png") ); 
     37    this->setIcon( QIcon(":/images/tray-icon-error.png") ); 
    3838  }else if( watcher->isRunning() ){ 
    3939    //Show the working icon 
    40     this->setIcon( QIcon(":/images/tray-icon-active7.png") ); 
     40    this->setIcon( QIcon(":/images/tray-icon-working.png") ); 
    4141  }else{ 
    4242    //Show the idle icon 
  • src-qt4/life-preserver/LPWatcher.cpp

    r04144d6 r108626c  
    378378          QString errors = zstat[i].section(" ", 6,6,QString::SectionSkipEmpty); 
    379379          //Setup the running re-silvering progress 
    380           if(LOGS.contains(50)){newresilver=true; } //don't display message for first run 
     380          if(LOGS.value(50) != "FINISHED" && LOGS.value(50) != "ERROR" ){newresilver=true; } //don't display message for first run 
    381381          if(errors.toInt() > 0){  
    382382            LOGS.insert(50, "ERROR"); 
  • src-qt4/life-preserver/lPreserve.qrc

    r4019f37 r108626c  
    11<RCC> 
    22  <qresource> 
     3    <file>images/tray-icon-error.png</file> 
     4    <file>images/tray-icon-working.png</file> 
    35    <file>images/next.png</file> 
    46    <file>images/previous.png</file> 
Note: See TracChangeset for help on using the changeset viewer.