File tree 2 files changed +13
-10
lines changed
2 files changed +13
-10
lines changed Original file line number Diff line number Diff line change @@ -309,12 +309,11 @@ FocusScope
309
309
text: filterModel .generatedFilter + " \n "
310
310
height: contentHeight
311
311
readOnly: true
312
- color: jaspTheme .gray
312
+ color: jaspTheme .grayDarker
313
313
selectByMouse: true
314
314
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
318
317
wrapMode: TextArea .WrapAtWordBoundaryOrAnywhere
319
318
320
319
}
@@ -352,8 +351,8 @@ FocusScope
352
351
height: contentHeight + 30
353
352
selectByMouse: true
354
353
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
357
356
wrapMode: TextArea .WrapAtWordBoundaryOrAnywhere
358
357
color: jaspTheme .textEnabled
359
358
Original file line number Diff line number Diff line change @@ -22,10 +22,14 @@ QString FilterModel::constructorJson() const { return !DataSetPackage::filter()
22
22
const char * FilterModel::defaultRFilter ()
23
23
{
24
24
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 ();
29
33
30
34
return defaultFilter.c_str ();
31
35
}
You can’t perform that action at this time.
0 commit comments