morgan/gnome-shell-extension-freon
1
0
Fork 0
mirror of https://github.com/morgan9e/gnome-shell-extension-freon synced 2026-04-14 00:14:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

add group functionality

Browse Source
This commit is contained in:
UshakovVasilii
2014-10-08 23:45:21 +04:00
parent 1648517a6e
commit 297d4e614f
4 changed files with 111 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
freon@UshakovVasilii_Github.yahoo.com/extension.js
View File

@@ -39,11 +39,13 @@ const FreonMenuButton = new Lang.Class({
this._settings = Convenience.getSettings();
let temperatureIcon = Gio.icon_new_for_string(Me.path + '/icons/freon-temperature-symbolic.svg');
this._sensorIcons = {
'temperature' : Gio.icon_new_for_string(Me.path + '/icons/freon-temperature-symbolic.svg'),
'temperature' : temperatureIcon,
'temperature-average' : temperatureIcon,
'temperature-maximum' : temperatureIcon,
'gpu-temperature' : Gio.icon_new_for_string(Me.path + '/icons/freon-gpu-temperature-symbolic.svg'),
'drive-temperature' : Gio.icon_new_for_string('drive-harddisk-symbolic'),
'temperature' : Gio.icon_new_for_string(Me.path + '/icons/freon-temperature-symbolic.svg'),
'voltage' : Gio.icon_new_for_string(Me.path + '/icons/freon-voltage-symbolic.svg'),
'fan' : Gio.icon_new_for_string(Me.path + '/icons/freon-fan-symbolic.svg')
}
@@ -74,6 +76,8 @@ const FreonMenuButton = new Lang.Class({
this._addSettingChangedSignal('drive-utility', Lang.bind(this, this._driveUtilityChanged));
this._addSettingChangedSignal('gpu-utility', Lang.bind(this, this._gpuUtilityChanged));
this._addSettingChangedSignal('position-in-panel', Lang.bind(this, this._positionInPanelChanged));
this._addSettingChangedSignal('group-temperature', Lang.bind(this, this._querySensors))
this._addSettingChangedSignal('group-voltage', Lang.bind(this, this._rerender))
this.connect('destroy', Lang.bind(this, this._onDestroy));
@@ -83,6 +87,11 @@ const FreonMenuButton = new Lang.Class({
this._addTimer();
},
_rerender : function(){
this._needRerender = true;
this._querySensors();
},
_positionInPanelChanged : function(){
this.container.get_parent().remove_actor(this.container);
@@ -223,8 +232,8 @@ const FreonMenuButton = new Lang.Class({
let tempInfo = gpuTempInfo.concat(sensorsTempInfo).concat(driveTempInfo);
if (tempInfo.length > 0){
let sum = 0; //sum
let max = 0; //max temp
let sum = 0;
let max = 0;
for each (let i in tempInfo){
sum += i.temp;
if (i.temp > max)
@@ -247,13 +256,21 @@ const FreonMenuButton = new Lang.Class({
sensors.push({type : 'separator'});
// Add average and maximum entries
sensors.push({type:'temperature', label:_("Average"), value:this._formatTemp(sum/tempInfo.length)});
sensors.push({type:'temperature', label:_("Maximum"), value:this._formatTemp(max)});
sensors.push({type:'temperature-average', label:_("Average"), value:this._formatTemp(sum/tempInfo.length)});
sensors.push({type:'temperature-maximum', label:_("Maximum"), value:this._formatTemp(max)});
if(fanInfo.length > 0 || voltageInfo.length > 0)
sensors.push({type : 'separator'});
}
if(this._settings.get_boolean('group-temperature')){
sum = 0;
for each (let i in sensorsTempInfo){
sum += i.temp;
}
sensors.push({type:'temperature-group', label:'temperature-group', value: this._formatTemp(sum/sensorsTempInfo.length)});
}
for each (let fan in fanInfo){
sensors.push({type:'fan',label:fan.label, value:_("%drpm").format(fan.rpm)});
}
@@ -266,47 +283,44 @@ const FreonMenuButton = new Lang.Class({
let mainSensor = this._settings.get_string('main-sensor');
let sensorCount = 0;
for each (let s in sensors) {
if(s.type != 'separator') {
sensorCount++;
if (mainSensor == s.label) {
this.statusLabel.set_text(s.value);
if(s.type != 'separator' && mainSensor == s.label) {
this.statusLabel.set_text(s.value);
let item = this._sensorMenuItems[s.label];
if(item) {
if(!item.main){
global.log('[FREON] Change active sensor');
if(this._lastActiveItem) {
this._lastActiveItem.main = false;
}
this._lastActiveItem = item;
item.main = true;
if(this._icon)
this._icon.gicon = item.gicon;
}
let item = this._sensorMenuItems[s.label];
if(item && !item.main) {
global.log('[FREON] Change active sensor');
if(this._lastActiveItem) {
this._lastActiveItem.main = false;
}
this._lastActiveItem = item;
item.main = true;
if(this._icon)
this._icon.gicon = item.gicon;
}
}
}
let needAppendMenuItems = false;
if(Object.keys(this._sensorMenuItems).length==sensorCount){
if(this._lastSensorsCount && this._lastSensorsCount==sensors.length){
for each (let s in sensors) {
if(s.type != 'separator') {
let item = this._sensorMenuItems[s.label];
if(item) {
item.value = s.value;
if(s.type == 'temperature-group')
item.status.text = s.value;
else
item.value = s.value;
} else {
needAppendMenuItems = true;
this._needRerender = true;
}
}
}
} else {
needAppendMenuItems = true;
this._needRerender = true;
}
if(needAppendMenuItems){
if(this._needRerender){
this._needRerender = false;
global.log('[FREON] Render all MenuItems');
this.menu.removeAll();
this._appendMenuItems(sensors);
@@ -329,11 +343,41 @@ const FreonMenuButton = new Lang.Class({
},
_appendMenuItems : function(sensors){
this._lastSensorsCount = sensors.length;
this._sensorMenuItems = {};
let mainSensor = this._settings.get_string('main-sensor');
let needGroupTemperature = this._settings.get_boolean('group-temperature');
let needGroupVoltage = this._settings.get_boolean('group-voltage');
if(needGroupTemperature){
let i = 0;
for each (let s in sensors)
if(s.type == 'temperature')
i++;
if(i <= 3)
needGroupTemperature = false;
}
if(needGroupVoltage){
let i = 0;
for each (let s in sensors)
if(s.type == 'voltage')
i++;
if(i <= 3)
needGroupVoltage = false;
}
let temperatureGroup = null;
let voltageGroup = null;
for each (let s in sensors){
if(s.type == 'separator'){
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
} else if (s.type == 'temperature-group') {
if(temperatureGroup) {
temperatureGroup.status.text = s.value;
this._sensorMenuItems['temperature-group'] = temperatureGroup;
}
} else {
let item = new FreonItem.FreonItem(this._sensorIcons[s.type], s.label, s.value);
item.connect('activate', Lang.bind(this, function (self) {
@@ -346,10 +390,26 @@ const FreonMenuButton = new Lang.Class({
this._icon.gicon = item.gicon;
}
this._sensorMenuItems[s.label] = item;
this.menu.addMenuItem(item);
if(needGroupTemperature && s.type == 'temperature') {
if(!temperatureGroup) {
temperatureGroup = new PopupMenu.PopupSubMenuMenuItem(_('Temperature Sensors'), true);
temperatureGroup.icon.gicon = this._sensorIcons['temperature'];
this.menu.addMenuItem(temperatureGroup);
}
temperatureGroup.menu.addMenuItem(item);
} else if(needGroupVoltage && s.type == 'voltage') {
if(!voltageGroup) {
voltageGroup = new PopupMenu.PopupSubMenuMenuItem(_('Voltage'), true);
voltageGroup.icon.gicon = this._sensorIcons['voltage'];
this.menu.addMenuItem(voltageGroup);
}
voltageGroup.menu.addMenuItem(item);
} else {
this.menu.addMenuItem(item);
}
}
}
// separator
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

8
freon@UshakovVasilii_Github.yahoo.com/prefs.js
View File

@@ -60,6 +60,14 @@ const FreonPrefsWidget = new GObject.Class({
this._addSwitch({key : 'show-voltage', y : i++, x : 2,
label : _('Show Power Supply Voltage')});
this._addSwitch({key : 'group-temperature', y : i, x : 0,
label : _('Group Temperature Items'),
help : _("Works if you have more than three temperature sensors")});
this._addSwitch({key : 'group-voltage', y : i++, x : 2,
label : _('Group Voltage Items'),
help : _("Works if you have more than three voltage sensors")});
this._addComboBox({
items : {none : 'None', hddtemp : 'Hddtemp', udisks2 : 'UDisks2'},
key: 'drive-utility', y : i, x : 0,

BIN
freon@UshakovVasilii_Github.yahoo.com/schemas/gschemas.compiled
View File

Binary file not shown.

12
freon@UshakovVasilii_Github.yahoo.com/schemas/org.gnome.shell.extensions.sensors.gschema.xml
View File

@@ -63,5 +63,17 @@
<description>Position in Panel ('left', 'center', 'right')</description>
</key>
<key type="b" name="group-temperature">
<default>true</default>
<summary>Group temperature menu items</summary>
<description>Group more than three sensors temperature menu items</description>
</key>
<key type="b" name="group-voltage">
<default>true</default>
<summary>Group voltage menu items</summary>
<description>Group more than three voltage menu items</description>
</key>
</schema>
</schemalist>