← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xosview/trusty

« back to all changes in this revision

Viewing changes to linux/btrymeter.cc

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry
  • Date: 2012-04-23 21:56:29 UTC
  • mfrom: (6.2.12 sid)
  • Revision ID: package-import@ubuntu.com-20120423215629-7fwcsel5mlxdhsuk
* debian/control:
  + ok. Drop hurd-i386 as of now, until we really fix it at upstream.
* debian/patches:
  + Refreshed patch to fix FTBFS on s390/s390x.

Show diffs side-by-side

added added

removed removed

Lines of Context:
linux/btrymeter.cc
194
194
  case 0:  // charged
195
195
    XOSDEBUG("battery_status CHARGED\n");
196
196
    setfieldcolor( 0, parent_->getResource("batteryFullColor"));
197
 
    legend( "CHARGED/FULL");
 
197
    legend( "CHRG/FULL");
198
198
    break;
199
199
 
200
200
  case -1: // discharging
201
201
    XOSDEBUG("battery_status DISCHARGING\n");
202
202
    setfieldcolor( 0, parent_->getResource("batteryLeftColor"));
203
 
    legend( "AVAIL/USED");
 
203
    legend( "CHRG/USED");
204
204
    break;
205
205
 
206
206
  case -2: // discharging - below alarm
207
207
    XOSDEBUG("battery_status ALARM DISCHARGING\n");
208
208
    setfieldcolor( 0, parent_->getResource("batteryCritColor"));
209
 
    legend( "LOW/ALARM");
 
209
    legend( "CHRG/USED");
210
210
    break;
211
211
 
212
212
  case -3: // not present
218
218
  case 1:  // charging
219
219
    XOSDEBUG("battery_status CHARGING\n");
220
220
    setfieldcolor( 0, parent_->getResource("batteryChargeColor"));
221
 
    legend( "AC/Charging");
 
221
    legend( "CHRG/AC");
222
222
    break;
223
223
  }
224
224
}
437
437
  // XOSDEBUG("acpi: total max=%d, remain=%d\n",acpi_sum_cap,acpi_sum_remain);
438
438
 
439
439
  // below alarm ?
440
 
  if ( acpi_sum_alarm >= acpi_sum_remain )
 
440
  if ( acpi_sum_alarm >= acpi_sum_remain && acpi_charge_state != 1 )
441
441
                acpi_charge_state=-2;
442
442
 
443
443
  // if NONE of the batts is present: