fixed bug #1153
This commit is contained in:
parent
4716b9c968
commit
b46b159528
7 changed files with 25 additions and 40 deletions
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: fgerlits $
|
Author : $Author: fgerlits $
|
||||||
Version : $Revision: 1.1 $
|
Version : $Revision: 1.2 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/OperatorComboBoxText.cxx,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/OperatorComboBoxText.cxx,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -62,16 +62,21 @@ OperatorComboBoxText :: OperatorComboBoxText(
|
||||||
: ComboBoxText(leftImage, centerImage, rightImage),
|
: ComboBoxText(leftImage, centerImage, rightImage),
|
||||||
LocalizedObject(bundle)
|
LocalizedObject(bundle)
|
||||||
{
|
{
|
||||||
appendPair(getResourceUstring("partialOperatorDisplay"),
|
Ptr<Glib::ustring>::Ref searchOperator(new Glib::ustring("partial"));
|
||||||
getResourceUstring("partialOperatorSearchKey"));
|
appendPair(getResourceUstring("partialOperatorDisplay"), searchOperator);
|
||||||
appendPair(getResourceUstring("prefixOperatorDisplay"),
|
|
||||||
getResourceUstring("prefixOperatorSearchKey"));
|
*searchOperator = "prefix";
|
||||||
appendPair(getResourceUstring("=OperatorDisplay"),
|
appendPair(getResourceUstring("prefixOperatorDisplay"), searchOperator);
|
||||||
getResourceUstring("=OperatorSearchKey"));
|
|
||||||
appendPair(getResourceUstring("<=OperatorDisplay"),
|
*searchOperator = "=";
|
||||||
getResourceUstring("<=OperatorSearchKey"));
|
appendPair(getResourceUstring("=OperatorDisplay"), searchOperator);
|
||||||
appendPair(getResourceUstring(">=OperatorDisplay"),
|
|
||||||
getResourceUstring(">=OperatorSearchKey"));
|
*searchOperator = "<=";
|
||||||
|
appendPair(getResourceUstring("<=OperatorDisplay"), searchOperator);
|
||||||
|
|
||||||
|
*searchOperator = ">=";
|
||||||
|
appendPair(getResourceUstring(">=OperatorDisplay"), searchOperator);
|
||||||
|
|
||||||
set_active(0); // select the first item
|
set_active(0); // select the first item
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: fgerlits $
|
Author : $Author: fgerlits $
|
||||||
Version : $Revision: 1.18 $
|
Version : $Revision: 1.19 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.cxx,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.cxx,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -316,10 +316,15 @@ void
|
||||||
SearchWindow :: onSearch(Ptr<SearchCriteria>::Ref criteria)
|
SearchWindow :: onSearch(Ptr<SearchCriteria>::Ref criteria)
|
||||||
throw ()
|
throw ()
|
||||||
{
|
{
|
||||||
Ptr<std::list<Ptr<Playable>::Ref> >::Ref
|
Ptr<std::list<Ptr<Playable>::Ref> >::Ref searchResults;
|
||||||
searchResults = gLiveSupport->search(criteria);
|
try {
|
||||||
std::list<Ptr<Playable>::Ref>::const_iterator it;
|
searchResults = gLiveSupport->search(criteria);
|
||||||
|
} catch (XmlRpcException &e) {
|
||||||
|
std::cerr << e.what() << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::list<Ptr<Playable>::Ref>::const_iterator it;
|
||||||
treeModel->clear();
|
treeModel->clear();
|
||||||
int rowNumber = 0;
|
int rowNumber = 0;
|
||||||
|
|
||||||
|
|
|
@ -152,15 +152,10 @@ es:table
|
||||||
lengthColumnLabel:string { "Duración" }
|
lengthColumnLabel:string { "Duración" }
|
||||||
|
|
||||||
partialOperatorDisplay:string { "contiene" }
|
partialOperatorDisplay:string { "contiene" }
|
||||||
partialOperatorSearchKey:string { "parcial" }
|
|
||||||
prefixOperatorDisplay:string { "empieza con" }
|
prefixOperatorDisplay:string { "empieza con" }
|
||||||
prefixOperatorSearchKey:string { "prefix" }
|
|
||||||
=OperatorDisplay:string { "equivale" }
|
=OperatorDisplay:string { "equivale" }
|
||||||
=OperatorSearchKey:string { "=" }
|
|
||||||
<=OperatorDisplay:string { "<=" }
|
<=OperatorDisplay:string { "<=" }
|
||||||
<=OperatorSearchKey:string { "<=" }
|
|
||||||
>=OperatorDisplay:string { ">=" }
|
>=OperatorDisplay:string { ">=" }
|
||||||
>=OperatorSearchKey:string { ">=" }
|
|
||||||
|
|
||||||
allStringForBrowse { "--- todo ---" }
|
allStringForBrowse { "--- todo ---" }
|
||||||
|
|
||||||
|
|
|
@ -150,15 +150,10 @@ hu:table
|
||||||
lengthColumnLabel:string { "Hossz" }
|
lengthColumnLabel:string { "Hossz" }
|
||||||
|
|
||||||
partialOperatorDisplay:string { "része" }
|
partialOperatorDisplay:string { "része" }
|
||||||
partialOperatorSearchKey:string { "partial" }
|
|
||||||
prefixOperatorDisplay:string { "kezdete" }
|
prefixOperatorDisplay:string { "kezdete" }
|
||||||
prefixOperatorSearchKey:string { "prefix" }
|
|
||||||
=OperatorDisplay:string { "=" }
|
=OperatorDisplay:string { "=" }
|
||||||
=OperatorSearchKey:string { "=" }
|
|
||||||
<=OperatorDisplay:string { "<=" }
|
<=OperatorDisplay:string { "<=" }
|
||||||
<=OperatorSearchKey:string { "<=" }
|
|
||||||
>=OperatorDisplay:string { ">=" }
|
>=OperatorDisplay:string { ">=" }
|
||||||
>=OperatorSearchKey:string { ">=" }
|
|
||||||
|
|
||||||
allStringForBrowse { "--- minden ---" }
|
allStringForBrowse { "--- minden ---" }
|
||||||
|
|
||||||
|
|
|
@ -152,15 +152,10 @@ root:table
|
||||||
lengthColumnLabel:string { "Length" }
|
lengthColumnLabel:string { "Length" }
|
||||||
|
|
||||||
partialOperatorDisplay:string { "contains" }
|
partialOperatorDisplay:string { "contains" }
|
||||||
partialOperatorSearchKey:string { "partial" }
|
|
||||||
prefixOperatorDisplay:string { "starts with" }
|
prefixOperatorDisplay:string { "starts with" }
|
||||||
prefixOperatorSearchKey:string { "prefix" }
|
|
||||||
=OperatorDisplay:string { "equals" }
|
=OperatorDisplay:string { "equals" }
|
||||||
=OperatorSearchKey:string { "=" }
|
|
||||||
<=OperatorDisplay:string { "<=" }
|
<=OperatorDisplay:string { "<=" }
|
||||||
<=OperatorSearchKey:string { "<=" }
|
|
||||||
>=OperatorDisplay:string { ">=" }
|
>=OperatorDisplay:string { ">=" }
|
||||||
>=OperatorSearchKey:string { ">=" }
|
|
||||||
|
|
||||||
allStringForBrowse { "--- all ---" }
|
allStringForBrowse { "--- all ---" }
|
||||||
|
|
||||||
|
|
|
@ -152,15 +152,10 @@ sr_CS:table
|
||||||
lengthColumnLabel:string { "Dužina" }
|
lengthColumnLabel:string { "Dužina" }
|
||||||
|
|
||||||
partialOperatorDisplay:string { "sadrži" }
|
partialOperatorDisplay:string { "sadrži" }
|
||||||
partialOperatorSearchKey:string { "deo" }
|
|
||||||
prefixOperatorDisplay:string { "počinje sa" }
|
prefixOperatorDisplay:string { "počinje sa" }
|
||||||
prefixOperatorSearchKey:string { "prefiks" }
|
|
||||||
=OperatorDisplay:string { "jednako" }
|
=OperatorDisplay:string { "jednako" }
|
||||||
=OperatorSearchKey:string { "=" }
|
|
||||||
<=OperatorDisplay:string { "<=" }
|
<=OperatorDisplay:string { "<=" }
|
||||||
<=OperatorSearchKey:string { "<=" }
|
|
||||||
>=OperatorDisplay:string { ">=" }
|
>=OperatorDisplay:string { ">=" }
|
||||||
>=OperatorSearchKey:string { ">=" }
|
|
||||||
|
|
||||||
allStringForBrowse { "--- sve ---" }
|
allStringForBrowse { "--- sve ---" }
|
||||||
|
|
||||||
|
|
|
@ -151,15 +151,10 @@ sr_CS_CYRILLIC:table
|
||||||
lengthColumnLabel:string { "Дужина" }
|
lengthColumnLabel:string { "Дужина" }
|
||||||
|
|
||||||
partialOperatorDisplay:string { "садржи" }
|
partialOperatorDisplay:string { "садржи" }
|
||||||
partialOperatorSearchKey:string { "део" }
|
|
||||||
prefixOperatorDisplay:string { "почиње са" }
|
prefixOperatorDisplay:string { "почиње са" }
|
||||||
prefixOperatorSearchKey:string { "префикс" }
|
|
||||||
=OperatorDisplay:string { "једнако" }
|
=OperatorDisplay:string { "једнако" }
|
||||||
=OperatorSearchKey:string { "=" }
|
|
||||||
<=OperatorDisplay:string { "<=" }
|
<=OperatorDisplay:string { "<=" }
|
||||||
<=OperatorSearchKey:string { "<=" }
|
|
||||||
>=OperatorDisplay:string { ">=" }
|
>=OperatorDisplay:string { ">=" }
|
||||||
>=OperatorSearchKey:string { ">=" }
|
|
||||||
|
|
||||||
allStringForBrowse { "--- све ---" }
|
allStringForBrowse { "--- све ---" }
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue