Skip to content

Commit 8a1e046

Browse files
committed
Better text as suggested in #5378
Also use code font and better readability for generatedFilter
1 parent 1a0d975 commit 8a1e046

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

Desktop/components/JASP/Widgets/FilterWindow.qml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,11 @@ FocusScope
309309
text: filterModel.generatedFilter +"\n"
310310
height: contentHeight
311311
readOnly: true
312-
color: jaspTheme.gray
312+
color: jaspTheme.grayDarker
313313
selectByMouse: true
314314
onActiveFocusChanged: if(!activeFocus) deselect()
315-
316-
font.family: "Courier"
317-
font.pixelSize: baseFontSize * preferencesModel.uiScale
315+
font.pixelSize: baseFontSize * preferencesModel.uiScale
316+
font.family: jaspTheme.fontCode.family
318317
wrapMode: TextArea.WrapAtWordBoundaryOrAnywhere
319318

320319
}
@@ -352,8 +351,8 @@ FocusScope
352351
height: contentHeight + 30
353352
selectByMouse: true
354353
onActiveFocusChanged: if(!activeFocus) deselect()
355-
font.family: "Courier"
356-
font.pixelSize: baseFontSize * preferencesModel.uiScale
354+
font.family: jaspTheme.fontCode.family
355+
font.pixelSize: baseFontSize * preferencesModel.uiScale
357356
wrapMode: TextArea.WrapAtWordBoundaryOrAnywhere
358357
color: jaspTheme.textEnabled
359358

Desktop/data/filtermodel.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ QString FilterModel::constructorJson() const { return !DataSetPackage::filter()
2222
const char * FilterModel::defaultRFilter()
2323
{
2424
static std::string defaultFilter;
25-
defaultFilter = tr( "# Add filters using R syntax here. By default the non-R filter(s) are passed with generatedFilter." "\n"
26-
"# To include generated filters, append clauses with \"&\": generatedFilter & ..." "\n"
27-
"# Click the (i) icon in the lower right corner for further help." "\n\n"
28-
"generatedFilter" ).toStdString();
25+
defaultFilter = tr(
26+
"# Above you see the code that JASP generates for both value filtering and the drag&drop filter." "\n"
27+
"# This default result is stored in 'generatedFilter' and can be replaced or combined with a custom filter." "\n"
28+
"# To combine you can append clauses using '&': 'generatedFilter & customFilter & perhapsAnotherFilter'" "\n"
29+
"# Click the (i) icon in the lower right corner for further help." "\n"
30+
"\n"
31+
"generatedFilter" "\n"
32+
).toStdString();
2933

3034
return defaultFilter.c_str();
3135
}

0 commit comments

Comments
 (0)