Permalink
Browse files

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.
  • Loading branch information...
1 parent 155b055 commit 108626c488e941b03baa3d4f6b2601b13416bac7 Ken Moore committed Sep 25, 2013
@@ -172,8 +172,11 @@
</item>
<item>
<widget class="QLabel" name="label_replication">
+ <property name="statusTip">
+ <string/>
+ </property>
<property name="styleSheet">
- <string notr="true">background-color: rgba(10,200,10,100)</string>
+ <string notr="true">background-color: rgba(10,200,10,100); border-radius: 5px</string>
</property>
<property name="text">
<string notr="true">Replication Status</string>
@@ -189,7 +192,7 @@
<item>
<widget class="QLabel" name="label_mirror">
<property name="styleSheet">
- <string notr="true">background-color: rgba(10,100,200,100)</string>
+ <string notr="true">background-color: rgba(10,100,200,100); border-radius: 5px</string>
</property>
<property name="text">
<string notr="true">Mirror Status</string>
@@ -205,7 +208,7 @@
<item>
<widget class="QLabel" name="label_errors">
<property name="styleSheet">
- <string notr="true">background-color: rgba(230,10,10,100)</string>
+ <string notr="true">background-color: rgba(230,10,10,100); border-radius: 5px</string>
</property>
<property name="text">
<string notr="true">System Errors</string>
@@ -236,6 +239,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QToolButton" name="tool_prevsnap">
+ <property name="statusTip">
+ <string>Select the previous (older) snapshot</string>
+ </property>
<property name="styleSheet">
<string notr="true"/>
</property>
@@ -283,6 +289,9 @@
</item>
<item>
<widget class="QToolButton" name="tool_nextsnap">
+ <property name="statusTip">
+ <string>Select the next (more recent) snapshot</string>
+ </property>
<property name="text">
<string>Next</string>
</property>
@@ -34,10 +34,10 @@ LPTray::~LPTray(){
void LPTray::updateTrayIcon(){
if( watcher->hasError() ){
//Errors - show that attention is required
- this->setIcon( QIcon(":/images/tray-icon-failed.png") );
+ this->setIcon( QIcon(":/images/tray-icon-error.png") );
}else if( watcher->isRunning() ){
//Show the working icon
- this->setIcon( QIcon(":/images/tray-icon-active7.png") );
+ this->setIcon( QIcon(":/images/tray-icon-working.png") );
}else{
//Show the idle icon
this->setIcon( QIcon(":/images/tray-icon-idle.png") );
@@ -377,7 +377,7 @@ void LPWatcher::checkPoolStatus(){
QString timecomplete = zstat[i].section(" ",4,4,QString::SectionSkipEmpty);
QString errors = zstat[i].section(" ", 6,6,QString::SectionSkipEmpty);
//Setup the running re-silvering progress
- if(LOGS.contains(50)){newresilver=true; } //don't display message for first run
+ if(LOGS.value(50) != "FINISHED" && LOGS.value(50) != "ERROR" ){newresilver=true; } //don't display message for first run
if(errors.toInt() > 0){
LOGS.insert(50, "ERROR");
LOGS.insert(52, QString(tr("Resilver completed in &1 with %2 errors")).arg(timecomplete, errors) );
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,5 +1,7 @@
<RCC>
<qresource>
+ <file>images/tray-icon-error.png</file>
+ <file>images/tray-icon-working.png</file>
<file>images/next.png</file>
<file>images/previous.png</file>
<file>images/view.png</file>

0 comments on commit 108626c

Please sign in to comment.