search: Don't expand search when clicking section headers
Currently section headers in the search view are reactive and run the corresponding provider's expandSearch() function when clicked, which should launch an external program displaying all search results for the section. Unfortunately it is only implemented for the "Settings" provider, and does not work properly (as it ignores the search and just launches System Settings). Also current mockups deemphasize the section header, making the feature pretty much indiscoverable (except by accident when interfering with swipe-scrolling). In conclusion, the feature does not make much sense in its current form, so remove it. https://bugzilla.gnome.org/show_bug.cgi?id=643632
This commit is contained in:
parent
08e0485213
commit
7f5135016e
@ -294,10 +294,6 @@ AppSearchProvider.prototype = {
|
|||||||
let app = this._appSys.get_app(resultMeta['id']);
|
let app = this._appSys.get_app(resultMeta['id']);
|
||||||
let icon = new AppWellIcon(app);
|
let icon = new AppWellIcon(app);
|
||||||
return icon.actor;
|
return icon.actor;
|
||||||
},
|
|
||||||
|
|
||||||
expandSearch: function(terms) {
|
|
||||||
log('TODO expand search');
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -318,12 +314,6 @@ PrefsSearchProvider.prototype = {
|
|||||||
|
|
||||||
getSubsearchResultSet: function(previousResults, terms) {
|
getSubsearchResultSet: function(previousResults, terms) {
|
||||||
return this._appSys.subsearch(true, previousResults, terms);
|
return this._appSys.subsearch(true, previousResults, terms);
|
||||||
},
|
|
||||||
|
|
||||||
expandSearch: function(terms) {
|
|
||||||
let controlCenter = this._appSys.load_from_desktop_file('gnomecc.desktop');
|
|
||||||
controlCenter.launch();
|
|
||||||
Main.overview.hide();
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -43,9 +43,5 @@ DocSearchProvider.prototype = {
|
|||||||
|
|
||||||
getSubsearchResultSet: function(previousResults, terms) {
|
getSubsearchResultSet: function(previousResults, terms) {
|
||||||
return this._docManager.subsearch(previousResults, terms);
|
return this._docManager.subsearch(previousResults, terms);
|
||||||
},
|
|
||||||
|
|
||||||
expandSearch: function(terms) {
|
|
||||||
log('TODO expand docs search');
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -209,17 +209,6 @@ SearchProvider.prototype = {
|
|||||||
*/
|
*/
|
||||||
activateResult: function(id) {
|
activateResult: function(id) {
|
||||||
throw new Error('Not implemented');
|
throw new Error('Not implemented');
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* expandSearch:
|
|
||||||
*
|
|
||||||
* Called when the user clicks on the header for this
|
|
||||||
* search section. Should typically launch an external program
|
|
||||||
* displaying search results for that item type.
|
|
||||||
*/
|
|
||||||
expandSearch: function(terms) {
|
|
||||||
throw new Error('Not implemented');
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
Signals.addSignalMethods(SearchProvider.prototype);
|
Signals.addSignalMethods(SearchProvider.prototype);
|
||||||
|
@ -243,13 +243,9 @@ SearchResults.prototype = {
|
|||||||
createProviderMeta: function(provider) {
|
createProviderMeta: function(provider) {
|
||||||
let providerBox = new St.BoxLayout({ style_class: 'search-section',
|
let providerBox = new St.BoxLayout({ style_class: 'search-section',
|
||||||
vertical: true });
|
vertical: true });
|
||||||
let titleButton = new St.Button({ style_class: 'search-section-header',
|
let title = new St.Label({ style_class: 'search-section-header',
|
||||||
reactive: true,
|
text: provider.title });
|
||||||
x_fill: true,
|
providerBox.add(title);
|
||||||
y_fill: true });
|
|
||||||
titleButton.connect('clicked', Lang.bind(this, function () { this._onHeaderClicked(provider); }));
|
|
||||||
providerBox.add(titleButton);
|
|
||||||
titleButton.set_child(new St.Label({ text: provider.title }));
|
|
||||||
|
|
||||||
let resultDisplayBin = new St.Bin({ style_class: 'search-section-results',
|
let resultDisplayBin = new St.Bin({ style_class: 'search-section-results',
|
||||||
x_fill: true,
|
x_fill: true,
|
||||||
@ -324,10 +320,6 @@ SearchResults.prototype = {
|
|||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
|
|
||||||
_onHeaderClicked: function(provider) {
|
|
||||||
provider.expandSearch(this._searchSystem.getTerms());
|
|
||||||
},
|
|
||||||
|
|
||||||
_modifyActorSelection: function(resultDisplay, up) {
|
_modifyActorSelection: function(resultDisplay, up) {
|
||||||
let success;
|
let success;
|
||||||
let index = resultDisplay.getSelectionIndex();
|
let index = resultDisplay.getSelectionIndex();
|
||||||
|
Loading…
Reference in New Issue
Block a user