Finally make searching and editing of locations work, code partially still needs cleanup.

multiprovider
None 10 years ago
parent 192402b7b2
commit 501137d429
  1. 14
      data/weather-settings.ui
  2. 115
      src/prefs.js

@ -145,8 +145,13 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkMenu" id="search-menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<object class="GtkWindow" id="search-widget"> <object class="GtkWindow" id="search-widget">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property> <property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property> <property name="destroy_with_parent">True</property>
<property name="hide_titlebar_when_maximized">True</property> <property name="hide_titlebar_when_maximized">True</property>
@ -155,6 +160,8 @@
<object class="GtkBox" id="search-box"> <object class="GtkBox" id="search-box">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_top">10</property> <property name="margin_top">10</property>
<property name="margin_bottom">10</property> <property name="margin_bottom">10</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
@ -183,8 +190,9 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="primary_icon_name">edit-find-symbolic</property>
<property name="secondary_icon_name">edit-clear-symbolic</property> <property name="secondary_icon_name">edit-clear-symbolic</property>
<property name="primary_icon_activatable">False</property>
<property name="primary_icon_sensitive">False</property>
<property name="primary_icon_tooltip_text" translatable="yes">Click here to search the coordinates for the entered location on https://open.mapquestapi.com/nominatim/</property> <property name="primary_icon_tooltip_text" translatable="yes">Click here to search the coordinates for the entered location on https://open.mapquestapi.com/nominatim/</property>
<property name="secondary_icon_tooltip_text" translatable="yes">Click here to search the locatopn for the entered coordinates on https://open.mapquestapi.com/nominatim/</property> <property name="secondary_icon_tooltip_text" translatable="yes">Click here to search the locatopn for the entered coordinates on https://open.mapquestapi.com/nominatim/</property>
<property name="primary_icon_tooltip_markup" translatable="yes">Click here to search the coordinates for the entered location on https://open.mapquestapi.com/nominatim/</property> <property name="primary_icon_tooltip_markup" translatable="yes">Click here to search the coordinates for the entered location on https://open.mapquestapi.com/nominatim/</property>
@ -238,7 +246,7 @@
<property name="valign">baseline</property> <property name="valign">baseline</property>
<property name="vexpand">False</property> <property name="vexpand">False</property>
<child> <child>
<object class="GtkButton" id="button-cancel"> <object class="GtkButton" id="button-search-cancel">
<property name="label">gtk-cancel</property> <property name="label">gtk-cancel</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -257,7 +265,7 @@
<placeholder/> <placeholder/>
</child> </child>
<child> <child>
<object class="GtkButton" id="button-save"> <object class="GtkButton" id="button-search-save">
<property name="label">gtk-save</property> <property name="label">gtk-save</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>

@ -105,30 +105,72 @@ const WeatherPrefsWidget = new GObject.Class({
this.editWidget = this.Window.get_object("edit-widget"); this.editWidget = this.Window.get_object("edit-widget");
this.editName = this.Window.get_object("edit-name"); this.editName = this.Window.get_object("edit-name");
this.editCoord = this.Window.get_object("edit-coord"); this.editCoord = this.Window.get_object("edit-coord");
this.searchWidget = this.Window.get_object("search-widget");
this.searchMenu = this.Window.get_object("search-menu");
this.searchName = this.Window.get_object("search-name");
this.searchName.connect("icon-release", Lang.bind(this, this.clearEntry));
this.editName.connect("icon-release", Lang.bind(this, this.clearEntry));
this.editCoord.connect("icon-release", Lang.bind(this, this.clearEntry));
this.Window.get_object("tree-toolbutton-add").connect("clicked", Lang.bind(this, function() { this.Window.get_object("tree-toolbutton-add").connect("clicked", Lang.bind(this, function() {
this.addCity(); log(new Error().fileName + ':' + new Error().lineNumber + ' => this.searchWidget.get_parent() = ' + this.searchWidget.get_parent());
this.searchWidget.show_all();
})); }));
this.Window.get_object("tree-toolbutton-remove").connect("clicked", Lang.bind(this, function() { this.Window.get_object("tree-toolbutton-remove").connect("clicked", Lang.bind(this, this.removeCity));
this.removeCity();
}));
this.Window.get_object("tree-toolbutton-edit").connect("clicked", Lang.bind(this, function() { this.Window.get_object("tree-toolbutton-edit").connect("clicked", Lang.bind(this, this.editCity));
this.editCity();
}));
this.Window.get_object("treeview-selection").connect("changed", Lang.bind(this, function(selection) { this.Window.get_object("treeview-selection").connect("changed", Lang.bind(this, function(selection) {
this.selectionChanged(selection); this.selectionChanged(selection);
})); }));
this.Window.get_object("button-edit-cancel").connect("clicked", Lang.bind(this, function() { this.Window.get_object("button-edit-cancel").connect("clicked", Lang.bind(this, this.editCancel));
this.editCancel();
this.Window.get_object("button-edit-save").connect("clicked", Lang.bind(this, this.editSave));
this.Window.get_object("button-search-cancel").connect("clicked", Lang.bind(this, function() {
this.searchWidget.hide();
})); }));
this.Window.get_object("button-edit-save").connect("clicked", Lang.bind(this, function() { this.Window.get_object("button-search-save").connect("clicked", Lang.bind(this, this.searchSave));
this.editSave();
this.Window.get_object("button-search-find").connect("clicked", Lang.bind(this, function() {
let location = this.searchName.get_text().trim();
if (location === "")
return 0;
let params = {
format: 'json',
addressdetails: '1',
q: location
};
this.loadJsonAsync(WEATHER_URL_FIND, params, Lang.bind(this, function() {
if (!arguments[0])
return 0;
let newCity = arguments[0];
if (Number(newCity.length) < 1)
return 0;
this.clearSearchMenu();
var m = {};
for (var i in newCity) {
let cityText = newCity[i].display_name;
let cityCoord = "[" + newCity[i].lat + "," + newCity[i].lon + "]";
let item = new Gtk.MenuItem({
label: cityText + " " + cityCoord
});
item.connect("activate", Lang.bind(this, this.onActivateItem));
this.searchMenu.append(item);
}
this.searchMenu.show_all();
this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName);
}));
})); }));
let column = new Gtk.TreeViewColumn(); let column = new Gtk.TreeViewColumn();
@ -157,6 +199,28 @@ const WeatherPrefsWidget = new GObject.Class({
} }
}, },
clearEntry: function() {
arguments[0].set_text("");
},
onActivateItem: function() {
this.searchName.set_text(arguments[0].get_label());
},
placeSearchMenu: function() {
let[gx, gy, gw, gh] = this.searchName.get_window().get_geometry();
let[px, py] = this.searchName.get_window().get_position();
return [gx + px, gy + py + this.searchName.get_allocated_height()];
},
clearSearchMenu: function() {
let children = this.searchMenu.get_children();
for (let i in children) {
log(new Error().fileName + ':' + new Error().lineNumber + ' => children[' + i + '] = ' + children[i]);
this.searchMenu.remove(children[i]);
}
},
initEntry: function(theEntry) { initEntry: function(theEntry) {
let name = theEntry.get_name(); let name = theEntry.get_name();
theEntry.text = this[name]; theEntry.text = this[name];
@ -332,6 +396,22 @@ const WeatherPrefsWidget = new GObject.Class({
completionModel.set_value(current, 0, cityText + " " + cityCoord); completionModel.set_value(current, 0, cityText + " " + cityCoord);
} }
log(new Error().fileName + ':' + new Error().lineNumber);
let ev = Gdk.EventKey();
log(new Error().fileName + ':' + new Error().lineNumber + ' => Gdk.EventKey = ' + Gdk.EventKey);
// log(new Error().fileName+':'+new Error().lineNumber+' => ev = '+ev);
// new_event.key.type = GDK_KEY_PRESS;
// new_event.key.window = gtk_widget_get_parent_window(entry);
// new_event.key.send_event = TRUE;
// new_event.key.time = GDK_CURRENT_TIME;
// new_event.key.keyval = 0x053; // capital S
// new_event.key.state = GDK_KEY_PRESS_MASK;
// new_event.key.length = 0;
// new_event.key.string = 0;
// new_event.key.hardware_keycode = 0;
// new_event.key.group = 0;
//
// gdk_event_put((gpointer)&new_event);
completion.complete(); completion.complete();
return 0; return 0;
}, "getInfo"); }, "getInfo");
@ -438,6 +518,19 @@ const WeatherPrefsWidget = new GObject.Class({
return 0; return 0;
}, },
searchSave: function() {
let cityText = this.searchName.get_text().split(/\[/)[0];
let coord = this.searchName.get_text().split(/\[/)[1].split(/\]/)[0];
if (this.city)
this.city = this.city + " && " + coord + ">" + cityText;
else
this.city = coord + ">" + cityText;
this.searchWidget.hide();
return 0;
},
editSave: function() { editSave: function() {
let theCity = this.city.split(" && "); let theCity = this.city.split(" && ");

Loading…
Cancel
Save