Skip to content

Commit

Permalink
[Search Tours] Big renaming, fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfgang-ch committed Aug 4, 2021
1 parent da80d19 commit 6740d2d
Show file tree
Hide file tree
Showing 21 changed files with 812 additions and 838 deletions.
631 changes: 318 additions & 313 deletions build/build.net.tourbook.ant/src/net/tourbook/ant/I18ToDojo.java

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -56,44 +56,21 @@ Messages

this.inherited(arguments)

// hide dialog when mouse has leaved it
on(this.domNode, "mouseleave", lang.hitch(this, "hideDialog"))

/*
* Tooltips with html tags must be defined in the js code, otherwise the TAGs do not work.
* Tooltips with html tags must be defined in the js code, otherwise the TAGs do not work
*/
var onShowDialog = function() { dlg.openedTooltips++ }
var onHideDialog = function() { dlg.openedTooltips-- }

this.apChk_EaseSearching_Tooltip.label = Messages.Search_Options_Checkbox_EaseSearching_Tooltip
this.apChk_EaseSearching_Tooltip.onShow = onShowDialog
this.apChk_EaseSearching_Tooltip.onHide = onHideDialog


this.apChkSearch_Tour_Tooltip.label = Messages.Search_Options_Checkbox_Search_Tour_Tooltip
this.apChkSearch_Tour_Tooltip.onShow = onShowDialog
this.apChkSearch_Tour_Tooltip.onHide = onHideDialog

this.apChkSearch_Tour_LocationStart_Tooltip.label = Messages.Search_Options_Checkbox_Search_Tour_LocationStart_Tooltip
this.apChkSearch_Tour_LocationStart_Tooltip.onShow = onShowDialog
this.apChkSearch_Tour_LocationStart_Tooltip.onHide = onHideDialog

this.apChkSearch_Tour_LocationEnd_Tooltip.label = Messages.Search_Options_Checkbox_Search_Tour_LocationEnd_Tooltip
this.apChkSearch_Tour_LocationEnd_Tooltip.onShow = onShowDialog
this.apChkSearch_Tour_LocationEnd_Tooltip.onHide = onHideDialog

this.apChkSearch_Tour_Weather_Tooltip.label = Messages.Search_Options_Checkbox_Search_Tour_Weather_Tooltip
this.apChkSearch_Tour_Weather_Tooltip.onShow = onShowDialog
this.apChkSearch_Tour_Weather_Tooltip.onHide = onHideDialog

this.apChkSearch_Marker_Tooltip.label = Messages.Search_Options_Checkbox_Search_Marker_Tooltip
this.apChkSearch_Marker_Tooltip.onShow = onShowDialog
this.apChkSearch_Marker_Tooltip.onHide = onHideDialog

this.apChkSearch_Waypoint_Tooltip.label = Messages.Search_Options_Checkbox_Search_Waypoint_Tooltip
this.apChkSearch_Waypoint_Tooltip.onShow = onShowDialog
this.apChkSearch_Waypoint_Tooltip.onHide = onHideDialog
},

/**
* Overwrite BaseDialog.showDialog and restore the state of the UI.
*/
Expand Down Expand Up @@ -208,12 +185,14 @@ Messages
var isSearch_All = this.apChkSearch_All.get('checked')

this.apChkSearch_Tour .set('disabled', isSearch_All)
// this.apChkSearch_Tour_Label .set('disabled', isSearch_All)
this.apChkSearch_Marker .set('disabled', isSearch_All)
this.apChkSearch_Waypoint .set('disabled', isSearch_All)

this.apChkSearch_Tour_LocationStart .set('disabled', isSearch_All)
this.apChkSearch_Tour_LocationEnd .set('disabled', isSearch_All)
this.apChkSearch_Tour_Weather .set('disabled', isSearch_All)

this.apChkSearch_Marker .set('disabled', isSearch_All)
this.apChkSearch_Waypoint .set('disabled', isSearch_All)
},

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public class Messages extends NLS {

private static final String BUNDLE_NAME = "tourbook.search.nls.messages"; //$NON-NLS-1$


public static String Search_App_Action_EditMarker;
public static String Search_App_Action_EditTour;
public static String Search_App_Action_SearchOptions_Tooltip;
Expand All @@ -35,35 +34,39 @@ public class Messages extends NLS {
public static String Search_Options_Action_RestoreDefaults;
public static String Search_Options_Checkbox_EaseSearching;
public static String Search_Options_Checkbox_EaseSearching_Tooltip;
public static String Search_Options_Checkbox_ShowContentAll;
public static String Search_Options_Checkbox_ShowContentTour;
public static String Search_Options_Checkbox_ShowContentMarker;
public static String Search_Options_Checkbox_ShowContentWaypoint;
public static String Search_Options_Checkbox_ShowDate;
public static String Search_Options_Checkbox_ShowTime;
public static String Search_Options_Checkbox_ShowDescription;
public static String Search_Options_Checkbox_ShowItemNumber;
public static String Search_Options_Checkbox_ShowLuceneDocId;

public static String Search_Options_Checkbox_Search_All;
public static String Search_Options_Checkbox_Search_Marker;
public static String Search_Options_Checkbox_Search_Marker_Tooltip;
public static String Search_Options_Checkbox_Search_Tour_LocationEnd;
public static String Search_Options_Checkbox_Search_Tour_LocationEnd_Tooltip;
public static String Search_Options_Checkbox_Search_Tour_LocationStart;
public static String Search_Options_Checkbox_Search_Tour_LocationStart_Tooltip;
public static String Search_Options_Checkbox_Search_Tour;
public static String Search_Options_Checkbox_Search_Tour_Tooltip;
public static String Search_Options_Checkbox_Search_Tour_Weather;
public static String Search_Options_Checkbox_Search_Tour_Weather_Tooltip;
public static String Search_Options_Checkbox_Search_Waypoint;
public static String Search_Options_Checkbox_Search_Waypoint_Tooltip;

public static String Search_Options_Checkbox_Show_Date;
public static String Search_Options_Checkbox_Show_Time;
public static String Search_Options_Checkbox_Show_Description;
public static String Search_Options_Checkbox_Show_ItemNumber;
public static String Search_Options_Checkbox_Show_LuceneDocId;

public static String Search_Options_Dialog_Header;
public static String Search_Options_Group_Content;
public static String Search_Options_Group_Sorting;
public static String Search_Options_Group_Result;
public static String Search_Options_Label_SortAscending;
public static String Search_Options_Radio_SortAscending;
public static String Search_Options_Radio_SortDescending;
public static String Search_Options_Label_Sort_ByDate;
public static String Search_Options_Radio_Sort_ByDate_Ascending;
public static String Search_Options_Radio_Sort_ByDate_Descending;

public static String Search_Validation_SearchFilter;

static {

// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
define(//
{
// 'root' is default language (en)
root :
{
Search_App_Action_EditMarker : 'Edit Marker',
Search_App_Action_EditTour : 'Edit Tour',
Search_App_Action_SearchOptions_Tooltip : 'Search Options',
Search_App_Action_StartSearch_Tooltip : 'Start searching',
Search_App_Label_Status_Tooltip : 'Number of search results - Search time',
Search_App_Text_Search_PlaceHolder : 'Search Tours, Marker and Waypoints',
Search_App_Tooltip : '<b>Wildcard Search</b><br>' + 'A search can also be done with * or ? wildcards and other features, read more details in the <a href=\'{0}\'>Lucene query parser description.</a><br><br>' + '' + 'Lucene is the internal used search engine.' + '',
Search_Grid_Label_NoDataMessage : 'No search results found',
Search_Options_Action_RestoreDefaults : 'Restore Defaults',
Search_Options_Checkbox_EaseSearching : 'Use ease searching',
Search_Options_Checkbox_EaseSearching_Tooltip : '<div class="tooltip-container">' + '<b>* Wildcard Search</b><br>' + 'When <i>Use ease searching</i> is selected, a * wildcard is appended to the search text, this is done internally which is not visible.<br><br>' + '' + '<b>Extended Search</b><br>' + 'It can be helpfull to deactivate <i>Use ease searching</i> when doing a search with Lucene query parser options.' + '</div>',
Search_Options_Checkbox_Search_Marker_Tooltip : 'Search label and description in tour markers',
Search_Options_Checkbox_Search_Tour_LocationEnd : 'End location',
Search_Options_Checkbox_Search_Tour_LocationEnd_Tooltip : 'Search in tour end locations',
Search_Options_Checkbox_Search_Tour_LocationStart : 'Start location',
Search_Options_Checkbox_Search_Tour_LocationStart_Tooltip : 'Search in tour start locations',
Search_Options_Checkbox_Search_Tour_Tooltip : 'Search title and description in tours',
Search_Options_Checkbox_Search_Tour_Weather : 'Weather',
Search_Options_Checkbox_Search_Tour_Weather_Tooltip : 'Search in tour weather',
Search_Options_Checkbox_Search_Waypoint_Tooltip : 'Search label and description in waypoints',
Search_Options_Checkbox_ShowContentAll : 'All',
Search_Options_Checkbox_ShowContentMarker : 'Markers',
Search_Options_Checkbox_ShowContentTour : 'Tours',
Search_Options_Checkbox_ShowContentWaypoint : 'Waypoints',
Search_Options_Checkbox_ShowDate : 'Show date',
Search_Options_Checkbox_ShowDescription : 'Show description',
Search_Options_Checkbox_ShowItemNumber : 'Show item number',
Search_Options_Checkbox_ShowLuceneDocId : 'Show Lucene doc ID',
Search_Options_Checkbox_ShowTime : 'Show time',
Search_Options_Dialog_Header : 'Search Options',
Search_Options_Group_Content : 'What should be searched?',
Search_Options_Group_Result : 'Result',
Search_Options_Group_Sorting : 'Sorting',
Search_Options_Label_SortAscending : 'By Date ',
Search_Options_Radio_SortAscending : 'Ascending',
Search_Options_Radio_SortDescending : 'Descending',
Search_Validation_SearchFilter : 'Nothing can be found with these search options'
},
// list of available languages, default (en) is defined in 'root'
define(
{
// 'root' is default language (en)
root :
{
Search_App_Action_EditMarker : 'Edit Marker',
Search_App_Action_EditTour : 'Edit Tour',
Search_App_Action_SearchOptions_Tooltip : 'Search Options',
Search_App_Action_StartSearch_Tooltip : 'Start searching',
Search_App_Label_Status_Tooltip : 'Number of search results - Search time',
Search_App_Text_Search_PlaceHolder : 'Search Tours, Marker and Waypoints',
Search_App_Tooltip : '<b>Wildcard Search</b><br>' + 'A search can also be done with * or ? wildcards and other features, read more details in the <a href=\'{0}\'>Lucene query parser description.</a><br><br>' + '' + 'Lucene is the internal used search engine.' + '',
Search_Grid_Label_NoDataMessage : 'No search results found',
Search_Options_Action_RestoreDefaults : 'Restore Defaults',
Search_Options_Checkbox_EaseSearching : 'Use ease searching',
Search_Options_Checkbox_EaseSearching_Tooltip : '<div class="tooltip-container">' + '<b>* Wildcard Search</b><br>' + 'When <i>Use ease searching</i> is selected, a * wildcard is appended to the search text, this is done internally which is not visible.<br><br>' + '' + '<b>Extended Search</b><br>' + 'It can be helpfull to deactivate <i>Use ease searching</i> when doing a search with Lucene query parser options.' + '</div>',
Search_Options_Checkbox_Search_All : 'All',
Search_Options_Checkbox_Search_Marker : 'Markers',
Search_Options_Checkbox_Search_Marker_Tooltip : 'Search label and description in tour markers',
Search_Options_Checkbox_Search_Tour : 'Tours',
Search_Options_Checkbox_Search_Tour_LocationEnd : 'End location',
Search_Options_Checkbox_Search_Tour_LocationEnd_Tooltip : 'Search end location in tours',
Search_Options_Checkbox_Search_Tour_LocationStart : 'Start location',
Search_Options_Checkbox_Search_Tour_LocationStart_Tooltip : 'Search start location in tours',
Search_Options_Checkbox_Search_Tour_Tooltip : 'Search title and description in tours',
Search_Options_Checkbox_Search_Tour_Weather : 'Weather',
Search_Options_Checkbox_Search_Tour_Weather_Tooltip : 'Search weather in tours',
Search_Options_Checkbox_Search_Waypoint : 'Waypoints',
Search_Options_Checkbox_Search_Waypoint_Tooltip : 'Search label and description in waypoints',
Search_Options_Checkbox_Show_Date : 'Show date',
Search_Options_Checkbox_Show_Description : 'Show description',
Search_Options_Checkbox_Show_ItemNumber : 'Show item number',
Search_Options_Checkbox_Show_LuceneDocId : 'Show Lucene doc ID',
Search_Options_Checkbox_Show_Time : 'Show time',
Search_Options_Dialog_Header : 'Search Options',
Search_Options_Group_Content : 'What should be searched?',
Search_Options_Group_Result : 'Result',
Search_Options_Group_Sorting : 'Sorting',
Search_Options_Label_Sort_ByDate : 'By Date ',
Search_Options_Radio_Sort_ByDate_Ascending : 'Ascending',
Search_Options_Radio_Sort_ByDate_Descending : 'Descending',
Search_Validation_SearchFilter : 'Nothing can be found with these search options'
},
// list of available languages, default (en) is defined in 'root'
cs : true,
de : true,
es : true,
nl : true,
fr : true,
it : true
});
})
Original file line number Diff line number Diff line change
Expand Up @@ -36,33 +36,35 @@ public class MessagesUsed {
used = Messages.Search_Grid_Label_NoDataMessage;

used = Messages.Search_Options_Action_RestoreDefaults;

used = Messages.Search_Options_Checkbox_EaseSearching;
used = Messages.Search_Options_Checkbox_EaseSearching_Tooltip;
used = Messages.Search_Options_Checkbox_ShowContentAll;
used = Messages.Search_Options_Checkbox_ShowContentMarker;
used = Messages.Search_Options_Checkbox_ShowContentTour;
used = Messages.Search_Options_Checkbox_ShowContentWaypoint;
used = Messages.Search_Options_Checkbox_ShowDate;
used = Messages.Search_Options_Checkbox_ShowTime;
used = Messages.Search_Options_Checkbox_ShowDescription;
used = Messages.Search_Options_Checkbox_ShowItemNumber;
used = Messages.Search_Options_Checkbox_ShowLuceneDocId;
used = Messages.Search_Options_Checkbox_Search_All;
used = Messages.Search_Options_Checkbox_Search_Marker;
used = Messages.Search_Options_Checkbox_Search_Marker_Tooltip;
used = Messages.Search_Options_Checkbox_Search_Tour;
used = Messages.Search_Options_Checkbox_Search_Tour_Tooltip;
used = Messages.Search_Options_Checkbox_Search_Tour_LocationEnd;
used = Messages.Search_Options_Checkbox_Search_Tour_LocationEnd_Tooltip;
used = Messages.Search_Options_Checkbox_Search_Tour_LocationStart;
used = Messages.Search_Options_Checkbox_Search_Tour_LocationStart_Tooltip;
used = Messages.Search_Options_Checkbox_Search_Tour_Tooltip;
used = Messages.Search_Options_Checkbox_Search_Tour_Weather;
used = Messages.Search_Options_Checkbox_Search_Tour_Weather_Tooltip;
used = Messages.Search_Options_Checkbox_Search_Waypoint;
used = Messages.Search_Options_Checkbox_Search_Waypoint_Tooltip;
used = Messages.Search_Options_Checkbox_Show_Date;
used = Messages.Search_Options_Checkbox_Show_Time;
used = Messages.Search_Options_Checkbox_Show_Description;
used = Messages.Search_Options_Checkbox_Show_ItemNumber;
used = Messages.Search_Options_Checkbox_Show_LuceneDocId;

used = Messages.Search_Options_Dialog_Header;
used = Messages.Search_Options_Group_Content;
used = Messages.Search_Options_Group_Result;
used = Messages.Search_Options_Group_Sorting;
used = Messages.Search_Options_Label_SortAscending;
used = Messages.Search_Options_Radio_SortAscending;
used = Messages.Search_Options_Radio_SortDescending;
used = Messages.Search_Options_Label_Sort_ByDate;
used = Messages.Search_Options_Radio_Sort_ByDate_Ascending;
used = Messages.Search_Options_Radio_Sort_ByDate_Descending;

used = Messages.Search_Validation_SearchFilter;
}
Expand Down

0 comments on commit 6740d2d

Please sign in to comment.