Reformat javascript and stylesheet, no functional changes

yahoo_weather
Jens Lody 11 years ago
parent 3c95779109
commit 434823ada0
  1. 6
      po/update.js
  2. 8
      src/convenience.js
  3. 629
      src/extension.js
  4. 250
      src/prefs.js

@ -32,16 +32,14 @@ var xgettext = Seed.spawn("xgettext -o gnome-shell-extension-weather.pot -L pyth
if (xgettext.stderr) if (xgettext.stderr)
print(xgettext.stderr); print(xgettext.stderr);
else else {
{
var file = Gio.file_new_for_path("."); var file = Gio.file_new_for_path(".");
var enumerator = file.enumerate_children("standard::name,standard::size"); var enumerator = file.enumerate_children("standard::name,standard::size");
var linguas = ""; var linguas = "";
var n = ""; var n = "";
var i = 0; var i = 0;
while (child = enumerator.next_file()) while (child = enumerator.next_file())
if(child.get_name().search(/.po$/) != -1) if (child.get_name().search(/.po$/) != -1) {
{
print("Generate " + child.get_name()); print("Generate " + child.get_name());
linguas += n + (child.get_name().split(".po")[0]); linguas += n + (child.get_name().split(".po")[0]);
Seed.spawn("msgmerge -U " + child.get_name() + " gnome-shell-extension-weather.pot"); Seed.spawn("msgmerge -U " + child.get_name() + " gnome-shell-extension-weather.pot");

@ -24,7 +24,6 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
const Gettext = imports.gettext; const Gettext = imports.gettext;
const Gio = imports.gi.Gio; const Gio = imports.gi.Gio;
@ -85,8 +84,9 @@ function getSettings(schema) {
let schemaObj = schemaSource.lookup(schema, true); let schemaObj = schemaSource.lookup(schema, true);
if (!schemaObj) if (!schemaObj)
throw new Error('Schema ' + schema + ' could not be found for extension ' throw new Error('Schema ' + schema + ' could not be found for extension ' + extension.metadata.uuid + '. Please check your installation.');
+ extension.metadata.uuid + '. Please check your installation.');
return new Gio.Settings({ settings_schema: schemaObj }); return new Gio.Settings({
settings_schema: schemaObj
});
} }

File diff suppressed because it is too large Load Diff

@ -26,7 +26,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
* *
*/ */
const Gtk = imports.gi.Gtk; const Gtk = imports.gi.Gtk;
const GObject = imports.gi.GObject; const GObject = imports.gi.GObject;
const GtkBuilder = Gtk.Builder; const GtkBuilder = Gtk.Builder;
@ -62,14 +61,12 @@ Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefa
let mCities = null; let mCities = null;
const WeatherPrefsWidget = new GObject.Class( const WeatherPrefsWidget = new GObject.Class({
{
Name: 'WeatherExtension.Prefs.Widget', Name: 'WeatherExtension.Prefs.Widget',
GTypeName: 'WeatherExtensionPrefsWidget', GTypeName: 'WeatherExtensionPrefsWidget',
Extends: Gtk.Box, Extends: Gtk.Box,
_init: function(params) _init: function(params) {
{
this.parent(params); this.parent(params);
this.initWindow(); this.initWindow();
@ -81,8 +78,7 @@ Extends: Gtk.Box,
Window: new Gtk.Builder(), Window: new Gtk.Builder(),
initWindow : function() initWindow: function() {
{
let that = this; let that = this;
mCities = null; mCities = null;
@ -93,18 +89,15 @@ Extends: Gtk.Box,
this.liststore = this.Window.get_object("liststore"); this.liststore = this.Window.get_object("liststore");
this.Iter = this.liststore.get_iter_first(); this.Iter = this.liststore.get_iter_first();
this.Window.get_object("tree-toolbutton-add").connect("clicked",function() this.Window.get_object("tree-toolbutton-add").connect("clicked", function() {
{
that.addCity(); that.addCity();
}); });
this.Window.get_object("tree-toolbutton-remove").connect("clicked",function() this.Window.get_object("tree-toolbutton-remove").connect("clicked", function() {
{
that.removeCity(); that.removeCity();
}); });
this.Window.get_object("treeview-selection").connect("changed",function(selection) this.Window.get_object("treeview-selection").connect("changed", function(selection) {
{
that.selectionChanged(selection); that.selectionChanged(selection);
}); });
@ -116,8 +109,7 @@ Extends: Gtk.Box,
let renderer = new Gtk.CellRendererText(); let renderer = new Gtk.CellRendererText();
column.pack_start(renderer, null); column.pack_start(renderer, null);
column.set_cell_data_func(renderer,function() column.set_cell_data_func(renderer, function() {
{
arguments[1].markup = arguments[2].get_value(arguments[3], 0); arguments[1].markup = arguments[2].get_value(arguments[3], 0);
}); });
@ -142,8 +134,7 @@ Extends: Gtk.Box,
this.addSwitch("comment_in_panel"); this.addSwitch("comment_in_panel");
}, },
refreshUI : function() refreshUI: function() {
{
this.MainWidget = this.Window.get_object("main-widget"); this.MainWidget = this.Window.get_object("main-widget");
this.treeview = this.Window.get_object("tree-treeview"); this.treeview = this.Window.get_object("tree-treeview");
this.liststore = this.Window.get_object("liststore"); this.liststore = this.Window.get_object("liststore");
@ -151,13 +142,11 @@ Extends: Gtk.Box,
this.Window.get_object("tree-toolbutton-remove").sensitive = Boolean(this.city.length); this.Window.get_object("tree-toolbutton-remove").sensitive = Boolean(this.city.length);
if(mCities != this.city) if (mCities != this.city) {
{
if (typeof this.liststore != "undefined") if (typeof this.liststore != "undefined")
this.liststore.clear(); this.liststore.clear();
if(this.city.length > 0) if (this.city.length > 0) {
{
let city = String(this.city).split(" && "); let city = String(this.city).split(" && ");
if (city && typeof city == "string") if (city && typeof city == "string")
@ -165,8 +154,7 @@ Extends: Gtk.Box,
let current = this.liststore.get_iter_first(); let current = this.liststore.get_iter_first();
for(let i in city) for (let i in city) {
{
current = this.liststore.append(); current = this.liststore.append();
this.liststore.set_value(current, 0, this.extractLocation(city[i])); this.liststore.set_value(current, 0, this.extractLocation(city[i]));
} }
@ -183,8 +171,7 @@ Extends: Gtk.Box,
config[i][0].active = this[config[i][1]]; config[i][0].active = this[config[i][1]];
}, },
initConfigWidget : function() initConfigWidget: function() {
{
this.inc(1); this.inc(1);
let a = this.Window.get_object("right-widget-table"); let a = this.Window.get_object("right-widget-table");
a.visible = 1; a.visible = 1;
@ -198,10 +185,8 @@ Extends: Gtk.Box,
configWidgets: [], configWidgets: [],
inc : function() inc: function() {
{ if (arguments[0]) {
if(arguments[0])
{
this.x[0] = 0; this.x[0] = 0;
this.x[1] = 1; this.x[1] = 1;
this.y[0] = 0; this.y[0] = 0;
@ -209,33 +194,31 @@ Extends: Gtk.Box,
return 0; return 0;
} }
if(this.x[0] == 1) if (this.x[0] == 1) {
{
this.x[0] = 0; this.x[0] = 0;
this.x[1] = 1; this.x[1] = 1;
this.y[0] += 1; this.y[0] += 1;
this.y[1] += 1; this.y[1] += 1;
return 0; return 0;
} } else {
else
{
this.x[0] += 1; this.x[0] += 1;
this.x[1] += 1; this.x[1] += 1;
return 0; return 0;
} }
}, },
addLabel : function(text) addLabel: function(text) {
{ let l = new Gtk.Label({
let l = new Gtk.Label({label:text,xalign:0}); label: text,
xalign: 0
});
l.visible = 1; l.visible = 1;
l.can_focus = 0; l.can_focus = 0;
this.right_widget.attach(l, this.x[0], this.x[1], this.y[0], this.y[1], 0, 0, 0, 0); this.right_widget.attach(l, this.x[0], this.x[1], this.y[0], this.y[1], 0, 0, 0, 0);
this.inc(); this.inc();
}, },
addComboBox : function(a,b) addComboBox: function(a, b) {
{
let that = this; let that = this;
let cf = new Gtk.ComboBoxText(); let cf = new Gtk.ComboBoxText();
this.configWidgets.push([cf, b]); this.configWidgets.push([cf, b]);
@ -245,26 +228,28 @@ Extends: Gtk.Box,
for (let i in a) for (let i in a)
cf.append_text(a[i]); cf.append_text(a[i]);
cf.active = this[b]; cf.active = this[b];
cf.connect("changed",function(){that[b] = arguments[0].active;}); cf.connect("changed", function() {
that[b] = arguments[0].active;
});
this.right_widget.attach(cf, this.x[0], this.x[1], this.y[0], this.y[1], 0, 0, 0, 0); this.right_widget.attach(cf, this.x[0], this.x[1], this.y[0], this.y[1], 0, 0, 0, 0);
this.inc(); this.inc();
}, },
addSwitch : function(a) addSwitch: function(a) {
{
let that = this; let that = this;
let sw = new Gtk.Switch(); let sw = new Gtk.Switch();
this.configWidgets.push([sw, a]); this.configWidgets.push([sw, a]);
sw.visible = 1; sw.visible = 1;
sw.can_focus = 0; sw.can_focus = 0;
sw.active = this[a]; sw.active = this[a];
sw.connect("notify::active",function(){that[a] = arguments[0].active;}); sw.connect("notify::active", function() {
that[a] = arguments[0].active;
});
this.right_widget.attach(sw, this.x[0], this.x[1], this.y[0], this.y[1], 0, 0, 0, 0); this.right_widget.attach(sw, this.x[0], this.x[1], this.y[0], this.y[1], 0, 0, 0, 0);
this.inc(); this.inc();
}, },
selectionChanged : function(select) selectionChanged: function(select) {
{
let a = select.get_selected_rows(this.liststore)[0][0]; let a = select.get_selected_rows(this.liststore)[0][0];
if (typeof a != "undefined") if (typeof a != "undefined")
@ -272,11 +257,12 @@ Extends: Gtk.Box,
this.actual_city = parseInt(a.to_string()); this.actual_city = parseInt(a.to_string());
}, },
addCity : function() addCity: function() {
{
let that = this; let that = this;
let textDialog = _("Name of the city"); let textDialog = _("Name of the city");
let dialog = new Gtk.Dialog({title : ""}); let dialog = new Gtk.Dialog({
title: ""
});
let entry = new Gtk.Entry(); let entry = new Gtk.Entry();
let completion = new Gtk.EntryCompletion(); let completion = new Gtk.EntryCompletion();
entry.set_completion(completion); entry.set_completion(completion);
@ -286,10 +272,8 @@ Extends: Gtk.Box,
completion.set_text_column(0); completion.set_text_column(0);
completion.set_popup_single_match(true); completion.set_popup_single_match(true);
completion.set_minimum_key_length(1); completion.set_minimum_key_length(1);
completion.set_match_func(function(completion,key,iter) completion.set_match_func(function(completion, key, iter) {
{ if (iter) {
if(iter)
{
if (completionModel.get_value(iter, 0)) if (completionModel.get_value(iter, 0))
return true; return true;
} }
@ -297,7 +281,9 @@ Extends: Gtk.Box,
}); });
entry.margin_top = 12; entry.margin_top = 12;
entry.margin_bottom = 12; entry.margin_bottom = 12;
let label = new Gtk.Label({label : textDialog}); let label = new Gtk.Label({
label: textDialog
});
dialog.set_border_width(12); dialog.set_border_width(12);
dialog.set_modal(1); dialog.set_modal(1);
@ -313,8 +299,7 @@ Extends: Gtk.Box,
dialog.set_default(d); dialog.set_default(d);
entry.activates_default = true; entry.activates_default = true;
let testLocation = function(location) let testLocation = function(location) {
{
if (location.search(/\[/) == -1 || location.search(/\]/) == -1) if (location.search(/\[/) == -1 || location.search(/\]/) == -1)
return 0; return 0;
@ -322,8 +307,7 @@ Extends: Gtk.Box,
if (!woeid) if (!woeid)
return 0; return 0;
that.loadJsonAsync(encodeURI('http://query.yahooapis.com/v1/public/yql?q=select woeid from geo.places where woeid = "'+woeid+'" limit 1&format=json'),function() that.loadJsonAsync(encodeURI('http://query.yahooapis.com/v1/public/yql?q=select woeid from geo.places where woeid = "' + woeid + '" limit 1&format=json'), function() {
{
d.sensitive = 0; d.sensitive = 0;
if (typeof arguments[0].query == "undefined") if (typeof arguments[0].query == "undefined")
return 0; return 0;
@ -338,12 +322,10 @@ Extends: Gtk.Box,
return 0; return 0;
}; };
let searchLocation = function() let searchLocation = function() {
{
let location = entry.get_text(); let location = entry.get_text();
if (testLocation(location) == 0) if (testLocation(location) == 0)
that.loadJsonAsync(encodeURI('http://query.yahooapis.com/v1/public/yql?q=select woeid,name,admin1,country from geo.places where text = "*'+location+'*" or text = "'+location+'"&format=json'),function() that.loadJsonAsync(encodeURI('http://query.yahooapis.com/v1/public/yql?q=select woeid,name,admin1,country from geo.places where text = "*' + location + '*" or text = "' + location + '"&format=json'), function() {
{
if (!arguments[0]) if (!arguments[0])
return 0; return 0;
let city = arguments[0].query; let city = arguments[0].query;
@ -356,10 +338,8 @@ Extends: Gtk.Box,
let current = this.liststore.get_iter_first(); let current = this.liststore.get_iter_first();
if(n > 1) if (n > 1) {
{ for (var i in city) {
for(var i in city)
{
if (typeof m == "undefined") if (typeof m == "undefined")
var m = {}; var m = {};
@ -380,9 +360,7 @@ Extends: Gtk.Box,
completionModel.set_value(current, 0, cityText); completionModel.set_value(current, 0, cityText);
} }
} } else {
else
{
current = completionModel.append(); current = completionModel.append();
let cityText = city.name; let cityText = city.name;
if (city.admin1) if (city.admin1)
@ -406,8 +384,7 @@ Extends: Gtk.Box,
dialog_area.pack_start(label, 0, 0, 0); dialog_area.pack_start(label, 0, 0, 0);
dialog_area.pack_start(entry, 0, 0, 0); dialog_area.pack_start(entry, 0, 0, 0);
dialog.connect("response", function(w, response_id) { dialog.connect("response", function(w, response_id) {
if(response_id) if (response_id) {
{
if (entry.get_text().search(/\[/) == -1 || entry.get_text().search(/\]/) == -1) if (entry.get_text().search(/\[/) == -1 || entry.get_text().search(/\]/) == -1)
return 0; return 0;
@ -415,8 +392,7 @@ Extends: Gtk.Box,
if (!woeid) if (!woeid)
return 0; return 0;
that.loadJsonAsync(encodeURI('http://query.yahooapis.com/v1/public/yql?format=json&q=select woeid,name,admin1,country from geo.places where woeid = "'+woeid+'" limit 1'),function() that.loadJsonAsync(encodeURI('http://query.yahooapis.com/v1/public/yql?format=json&q=select woeid,name,admin1,country from geo.places where woeid = "' + woeid + '" limit 1'), function() {
{
let city = arguments[0].query; let city = arguments[0].query;
if (Number(city.count) > 0) if (Number(city.count) > 0)
city = city.results.place; city = city.results.place;
@ -444,16 +420,19 @@ Extends: Gtk.Box,
dialog.show_all(); dialog.show_all();
}, },
removeCity : function() removeCity: function() {
{
let that = this; let that = this;
let city = this.city.split(" && "); let city = this.city.split(" && ");
if (!city.length) if (!city.length)
return 0; return 0;
let ac = this.actual_city; let ac = this.actual_city;
let textDialog = _("Remove %s ?").replace("%s", this.extractLocation(city[ac])); let textDialog = _("Remove %s ?").replace("%s", this.extractLocation(city[ac]));
let dialog = new Gtk.Dialog({title : ""}); let dialog = new Gtk.Dialog({
let label = new Gtk.Label({label : textDialog}); title: ""
});
let label = new Gtk.Label({
label: textDialog
});
label.margin_bottom = 12; label.margin_bottom = 12;
dialog.set_border_width(12); dialog.set_border_width(12);
@ -469,10 +448,8 @@ Extends: Gtk.Box,
let dialog_area = dialog.get_content_area(); let dialog_area = dialog.get_content_area();
dialog_area.pack_start(label, 0, 0, 0); dialog_area.pack_start(label, 0, 0, 0);
dialog.connect("response",function(w, response_id) dialog.connect("response", function(w, response_id) {
{ if (response_id) {
if(response_id)
{
if (city.length == 0) if (city.length == 0)
city = []; city = [];
@ -497,8 +474,7 @@ Extends: Gtk.Box,
return 0; return 0;
}, },
changeSelection : function() changeSelection: function() {
{
let path = this.actual_city; let path = this.actual_city;
if (arguments[0]) if (arguments[0])
path = arguments[0]; path = arguments[0];
@ -506,37 +482,30 @@ Extends: Gtk.Box,
this.treeview.get_selection().select_path(path); this.treeview.get_selection().select_path(path);
}, },
loadJsonAsync : function(url, fun, id) loadJsonAsync: function(url, fun, id) {
{
let here = this; let here = this;
let message = Soup.Message.new('GET', url); let message = Soup.Message.new('GET', url);
if (typeof this.asyncSession == "undefined") if (typeof this.asyncSession == "undefined")
this.asyncSession = {}; this.asyncSession = {};
if(typeof this.asyncSession[id] != "undefined" && this.asyncSession[id]) if (typeof this.asyncSession[id] != "undefined" && this.asyncSession[id]) {
{
_httpSession.abort(); _httpSession.abort();
this.asyncSession[id] = 0; this.asyncSession[id] = 0;
} }
this.asyncSession[id] = 1; this.asyncSession[id] = 1;
_httpSession.queue_message(message, function(_httpSession, message) _httpSession.queue_message(message, function(_httpSession, message) {
{
here.asyncSession[id] = 0; here.asyncSession[id] = 0;
if(!message.response_body.data) if (!message.response_body.data) {
{
fun.call(here, 0); fun.call(here, 0);
return 0; return 0;
} }
try try {
{
let jp = JSON.parse(message.response_body.data); let jp = JSON.parse(message.response_body.data);
fun.call(here, jp); fun.call(here, jp);
} } catch (e) {
catch(e)
{
fun.call(here, 0); fun.call(here, 0);
return 0; return 0;
} }
@ -544,85 +513,75 @@ Extends: Gtk.Box,
}); });
}, },
loadConfig : function() loadConfig: function() {
{
let that = this; let that = this;
this.Settings = Convenience.getSettings(WEATHER_SETTINGS_SCHEMA); this.Settings = Convenience.getSettings(WEATHER_SETTINGS_SCHEMA);
this.Settings.connect("changed", function(){that.refreshUI();}); this.Settings.connect("changed", function() {
that.refreshUI();
});
}, },
get units() get units() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_enum(WEATHER_UNIT_KEY); return this.Settings.get_enum(WEATHER_UNIT_KEY);
}, },
set units(v) set units(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_enum(WEATHER_UNIT_KEY, v); this.Settings.set_enum(WEATHER_UNIT_KEY, v);
}, },
get pressure_unit() get pressure_unit() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_enum(WEATHER_PRESSURE_UNIT_KEY); return this.Settings.get_enum(WEATHER_PRESSURE_UNIT_KEY);
}, },
set pressure_unit(v) set pressure_unit(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_enum(WEATHER_PRESSURE_UNIT_KEY, v); this.Settings.set_enum(WEATHER_PRESSURE_UNIT_KEY, v);
}, },
get wind_speed_unit() get wind_speed_unit() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_enum(WEATHER_WIND_SPEED_UNIT_KEY); return this.Settings.get_enum(WEATHER_WIND_SPEED_UNIT_KEY);
}, },
set wind_speed_unit(v) set wind_speed_unit(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_enum(WEATHER_WIND_SPEED_UNIT_KEY, v); this.Settings.set_enum(WEATHER_WIND_SPEED_UNIT_KEY, v);
}, },
get wind_direction() get wind_direction() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_boolean(WEATHER_WIND_DIRECTION_KEY); return this.Settings.get_boolean(WEATHER_WIND_DIRECTION_KEY);
}, },
set wind_direction(v) set wind_direction(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.set_boolean(WEATHER_WIND_DIRECTION_KEY, v); return this.Settings.set_boolean(WEATHER_WIND_DIRECTION_KEY, v);
}, },
get city() get city() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_string(WEATHER_CITY_KEY); return this.Settings.get_string(WEATHER_CITY_KEY);
}, },
set city(v) set city(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_string(WEATHER_CITY_KEY, v); this.Settings.set_string(WEATHER_CITY_KEY, v);
}, },
get actual_city() get actual_city() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
let a = this.Settings.get_int(WEATHER_ACTUAL_CITY_KEY); let a = this.Settings.get_int(WEATHER_ACTUAL_CITY_KEY);
@ -645,8 +604,7 @@ Extends: Gtk.Box,
return a; return a;
}, },
set actual_city(a) set actual_city(a) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
let citys = this.city.split(" && "); let citys = this.city.split(" && ");
@ -668,112 +626,96 @@ Extends: Gtk.Box,
this.Settings.set_int(WEATHER_ACTUAL_CITY_KEY, a); this.Settings.set_int(WEATHER_ACTUAL_CITY_KEY, a);
}, },
get translate_condition() get translate_condition() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_boolean(WEATHER_TRANSLATE_CONDITION_KEY); return this.Settings.get_boolean(WEATHER_TRANSLATE_CONDITION_KEY);
}, },
set translate_condition(v) set translate_condition(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_boolean(WEATHER_TRANSLATE_CONDITION_KEY, v); this.Settings.set_boolean(WEATHER_TRANSLATE_CONDITION_KEY, v);
}, },
get icon_type() get icon_type() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_boolean(WEATHER_USE_SYMBOLIC_ICONS_KEY); return this.Settings.get_boolean(WEATHER_USE_SYMBOLIC_ICONS_KEY);
}, },
set icon_type(v) set icon_type(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_boolean(WEATHER_USE_SYMBOLIC_ICONS_KEY, v); this.Settings.set_boolean(WEATHER_USE_SYMBOLIC_ICONS_KEY, v);
}, },
get text_in_panel() get text_in_panel() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_boolean(WEATHER_SHOW_TEXT_IN_PANEL_KEY); return this.Settings.get_boolean(WEATHER_SHOW_TEXT_IN_PANEL_KEY);
}, },
set text_in_panel(v) set text_in_panel(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_boolean(WEATHER_SHOW_TEXT_IN_PANEL_KEY, v); this.Settings.set_boolean(WEATHER_SHOW_TEXT_IN_PANEL_KEY, v);
}, },
get position_in_panel() get position_in_panel() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_enum(WEATHER_POSITION_IN_PANEL_KEY); return this.Settings.get_enum(WEATHER_POSITION_IN_PANEL_KEY);
}, },
set position_in_panel(v) set position_in_panel(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_enum(WEATHER_POSITION_IN_PANEL_KEY, v); this.Settings.set_enum(WEATHER_POSITION_IN_PANEL_KEY, v);
}, },
get comment_in_panel() get comment_in_panel() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY); return this.Settings.get_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY);
}, },
set comment_in_panel(v) set comment_in_panel(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY, v); this.Settings.set_boolean(WEATHER_SHOW_COMMENT_IN_PANEL_KEY, v);
}, },
get refresh_interval() get refresh_interval() {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
return this.Settings.get_int(WEATHER_REFRESH_INTERVAL); return this.Settings.get_int(WEATHER_REFRESH_INTERVAL);
}, },
set refresh_interval(v) set refresh_interval(v) {
{
if (!this.Settings) if (!this.Settings)
this.loadConfig(); this.loadConfig();
this.Settings.set_int(WEATHER_REFRESH_INTERVAL, v); this.Settings.set_int(WEATHER_REFRESH_INTERVAL, v);
}, },
extractLocation : function(a) extractLocation: function(a) {
{
if (a.search(">") == -1) if (a.search(">") == -1)
return _("Invalid city"); return _("Invalid city");
return a.split(">")[1]; return a.split(">")[1];
}, },
extractWoeid : function(a) extractWoeid: function(a) {
{
if (a.search(">") == -1) if (a.search(">") == -1)
return 0; return 0;
return a.split(">")[0]; return a.split(">")[0];
} }
}); });
function init() function init() {
{
Convenience.initTranslations('gnome-shell-extension-weather'); Convenience.initTranslations('gnome-shell-extension-weather');
} }
function buildPrefsWidget() function buildPrefsWidget() {
{
let widget = new WeatherPrefsWidget(); let widget = new WeatherPrefsWidget();
widget.show_all(); widget.show_all();
return widget; return widget;

Loading…
Cancel
Save