Skip to content

Commit

Permalink
jx: enforce title of classes derived from JXSearchTextDialog
Browse files Browse the repository at this point in the history
  • Loading branch information
jafl committed Feb 26, 2024
1 parent 2ec623d commit 6d2854a
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .ace-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.2
7.1.3
3 changes: 2 additions & 1 deletion libjx/code/JXSearchTextDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ JXSearchTextDialog::BuildWindow()
{
// begin JXLayout

auto* window = jnew JXWindow(this, 450,300, JGetString("WindowTitle::JXSearchTextDialog::JXLayout"));
auto* window = jnew JXWindow(this, 450,300, JString::empty);

auto* searchInputLabel =
jnew JXStaticText(JGetString("searchInputLabel::JXSearchTextDialog::JXLayout"), window,
Expand Down Expand Up @@ -439,6 +439,7 @@ JXSearchTextDialog::SetObjects
)
{
JXWindow* window = searchInput->GetWindow();
window->SetTitle(JGetString("WindowTitle::JXSearchTextDialog"));
window->SetCloseAction(JXWindow::kDeactivateDirector);
window->PlaceAsDialogWindow();
window->LockCurrentMinSize();
Expand Down
35 changes: 33 additions & 2 deletions libjx/code/JXSearchTextDialog.jxl
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
jx_layout_editor 5
jx_layout_editor 8
450
300
"JXLayout"
"Search text"
""
""
""
0

1
0
0
"StaticText"
0
0
Expand All @@ -26,6 +27,7 @@ jx_layout_editor 5

1
0
0
"CustomWidget"
1
0
Expand All @@ -41,6 +43,7 @@ jx_layout_editor 5

1
0
0
"StaticText"
1
0
Expand All @@ -58,6 +61,7 @@ jx_layout_editor 5

1
0
0
"CustomWidget"
1
0
Expand All @@ -73,6 +77,7 @@ jx_layout_editor 5

1
0
0
"InputField"
2
0
Expand All @@ -89,9 +94,12 @@ jx_layout_editor 5
""
0
0
0
""

1
0
0
"HistoryMenu"
1
0
Expand All @@ -105,6 +113,7 @@ jx_layout_editor 5

1
0
0
"TextButton"
1
0
Expand All @@ -118,6 +127,7 @@ jx_layout_editor 5

1
0
0
"CustomWidget"
1
0
Expand All @@ -133,6 +143,7 @@ jx_layout_editor 5

1
0
0
"StaticText"
1
0
Expand All @@ -150,6 +161,7 @@ jx_layout_editor 5

1
0
0
"CustomWidget"
1
0
Expand All @@ -165,6 +177,7 @@ jx_layout_editor 5

1
0
0
"StaticText"
0
0
Expand All @@ -182,6 +195,7 @@ jx_layout_editor 5

1
0
0
"InputField"
2
0
Expand All @@ -198,9 +212,12 @@ jx_layout_editor 5
""
0
0
0
""

1
0
0
"TextButton"
1
0
Expand All @@ -214,6 +231,7 @@ jx_layout_editor 5

1
0
0
"TextButton"
1
0
Expand All @@ -227,6 +245,7 @@ jx_layout_editor 5

1
0
0
"HistoryMenu"
1
0
Expand All @@ -240,6 +259,7 @@ jx_layout_editor 5

1
0
0
"TextCheckbox"
0
0
Expand All @@ -253,6 +273,7 @@ jx_layout_editor 5

1
0
0
"TextCheckbox"
0
0
Expand All @@ -266,6 +287,7 @@ jx_layout_editor 5

1
0
0
"TextCheckbox"
0
0
Expand All @@ -279,6 +301,7 @@ jx_layout_editor 5

1
0
0
"TextCheckbox"
0
0
Expand All @@ -292,6 +315,7 @@ jx_layout_editor 5

1
0
0
"TextCheckbox"
0
0
Expand All @@ -305,6 +329,7 @@ jx_layout_editor 5

1
0
0
"TextCheckbox"
0
0
Expand All @@ -318,6 +343,7 @@ jx_layout_editor 5

1
0
0
"TextCheckbox"
0
0
Expand All @@ -331,6 +357,7 @@ jx_layout_editor 5

1
0
0
"TextCheckbox"
0
0
Expand All @@ -344,6 +371,7 @@ jx_layout_editor 5

1
0
0
"TextCheckbox"
0
0
Expand All @@ -357,6 +385,7 @@ jx_layout_editor 5

1
0
0
"TextButton"
0
0
Expand All @@ -370,6 +399,7 @@ jx_layout_editor 5

1
0
0
"TextButton"
0
0
Expand All @@ -383,6 +413,7 @@ jx_layout_editor 5

1
0
0
"TextButton"
0
0
Expand Down
2 changes: 1 addition & 1 deletion libjx/libjx.jcc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jx_browser_data 94
jx_browser_data 95
# project tree
0 "root"
T
Expand Down
1 change: 0 additions & 1 deletion libjx/strings/JXSearchTextDialog_layout
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ itsHelpButton::JXSearchTextDialog::JXLayout "Help"
itsPreserveCaseCB::shortcuts::JXSearchTextDialog::JXLayout "#P"
replaceInputLabel::JXSearchTextDialog::JXLayout "Replace with:"
itsPreserveCaseCB::JXSearchTextDialog::JXLayout "Preserve case"
WindowTitle::JXSearchTextDialog::JXLayout "Search text"
itsReplaceAllInSelButton::JXSearchTextDialog::JXLayout "in selection"
itsQRefButton::JXSearchTextDialog::JXLayout "Quick Ref"
itsEntireWordCB::shortcuts::JXSearchTextDialog::JXLayout "#E"
Expand Down
1 change: 1 addition & 0 deletions libjx/strings/jx_strings
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ VariableSizeLabel::JXFontSizeMenu "Other..."

# JXSearchTextDialog

WindowTitle::JXSearchTextDialog "Search Text"
CloseShortcut::JXSearchTextDialog "#W^["
IgnoreCaseShortcut::JXSearchTextDialog "#I"
WrapSearchShortcut::JXSearchTextDialog "#S"
Expand Down

0 comments on commit 6d2854a

Please sign in to comment.