Skip to content

Some button cosmetics and fix the easy filter help file #6300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
boutinb wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Some button cosmetics and fix the easy filter help file #6300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Desktop/components/JASP/Widgets/AnalysisFormExpander.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,8 @@ DropArea
{
id: rSyntaxButton
width: height
iconSource: enabled ? jaspTheme.iconPath + "/R-roundbutton.svg" : jaspTheme.iconPath + "/R-roundbutton-disabled.svg"
buttonPadding: 4 * preferencesModel.uiScale
iconSource: jaspTheme.iconPath + "/R.png"
enabled: expanderButton.expanded
onClicked: if (formParent.myForm) formParent.myForm.toggleRSyntax();
toolTip: preferencesModel.showRSyntax ? qsTr("Hide R Syntax") : qsTr("Show R syntax")
Expand Down
58 changes: 31 additions & 27 deletions Desktop/components/JASP/Widgets/FilterWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,36 @@ FocusScope
anchors.margins: 1

}

JaspControls.HelpButton
{
id: helpButton
height: 33 * jaspTheme.uiScale
width: height
buttonPadding: 6 * preferencesModel.uiScale
anchors.right: closeRectangularButton.left
anchors.top: closeRectangularButton.top
helpMD: allHelp.rfilterconstructor
toolTip: qsTr("Open Documentation")
}

JaspControls.MenuButton
{
id: closeRectangularButton
height: 33 * jaspTheme.uiScale
width: height
radius: height
iconSource: jaspTheme.iconPath + "collapse.png"
onClicked: filterEditRectangle.askIfChanged(function (){ filterWindow.close() })
toolTip: qsTr("Hide filter")
anchors
{
top: parent.top
right: parent.right
rightMargin: jaspTheme.generalAnchorMargin
}
}

}

Item
Expand Down Expand Up @@ -495,40 +525,14 @@ FocusScope

text: qsTr("Apply pass-through filter")
anchors.left: clearRectangularButton.right
anchors.right: helpButton.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.top: closeRectangularButton.top

onClicked: { forceActiveFocus(); filterWindow.applyAndSendFilter(filterEdit.text) }

toolTip: qsTr("Click to apply filter")
}

JaspControls.HelpButton
{
id: helpButton
height: 33 * jaspTheme.uiScale
width: height
buttonPadding: 6 * preferencesModel.uiScale

anchors.right: closeRectangularButton.left
anchors.bottom: parent.bottom
anchors.top: closeRectangularButton.top
helpMD: allHelp.rfilterconstructor
toolTip: qsTr("Open Documentation")
}


JaspControls.RectangularButton
{
id: closeRectangularButton
iconSource: jaspTheme.iconPath + "cross.png"
anchors.right: parent.right
anchors.bottom: parent.bottom

onClicked: filterEditRectangle.askIfChanged(function (){ filterWindow.close() })
toolTip: qsTr("Hide filter")
}
}
}
}
Expand Down
63 changes: 29 additions & 34 deletions Desktop/po/jaspDesktop-ar.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8550,32 +8550,29 @@ msgid ""
"<p>The following examples will show you how you can create your own filters "
"in a (relatively) simple manner: </p>\n"
"\n"
"<p>A new feature missing from the rather old help gifs is the changing of a "
"A new feature missing from the rather old help gifs is the changing of a "
"columntype within the constructor. \n"
"\tJust click the icon and choose the type you want, the tooltip will show an "
"Just click the icon and choose the type you want, the tooltip will show an "
"example of the data.\n"
"</p>\n"
"\n"
"<p>\n"
"\tAnother feature missing in the gifs is:\n"
"\t\n"
"\tKeeping or dropping levels is about whether each level (a value and label) "
"Another feature missing in the gifs is:\n"
"\n"
"Keeping or dropping levels is about whether each level (a value and label) "
"of a column is passed to the analysis, levels are inspectable via the "
"\"Label editor\". \n"
"\tKeeping levels means that all levels defined on the column are passed to "
"the analysis.\n"
"\tDropping levels means that only those levels that occur on rows that pass "
"Keeping levels means that all levels defined on the column are passed to the "
"analysis.\n"
"Dropping levels means that only those levels that occur on rows that pass "
"the filter are in the end end communicated to the analysis.\n"
"\tAs an example, suppose you have a column <code>contBinom</code> with two "
"As an example, suppose you have a column <code>contBinom</code> with two "
"values/labels \"0\" and \"1\", and we filter all the \"1\"es out whereafter "
"the analysis would get:\n"
"\t<ul>\n"
"\t\t<li>When keeping levels: \"0\", \"1\"</li>\n"
"\t\t<li>When dropping levels: \"0\"</li>\n"
"\t</ul>\n"
"\tOne caveat is that when the filter is set to drop levels, yet doesn't "
"<ul>\n"
"\t<li>When keeping levels: \"0\", \"1\"</li>\n"
"\t<li>When dropping levels: \"0\"</li>\n"
"</ul>\n"
"One caveat is that when the filter is set to drop levels, yet doesn't "
"actually filter anything, it won't drop levels.\n"
"</p>\n"
"\n"
"<details>\n"
"\t<summary><b>Filtering a continuous column</b></summary>\n"
Expand Down Expand Up @@ -8718,30 +8715,27 @@ msgstr ""
"<p>ستوضّح لك الأمثلة التالية كيف يمكنك إنشاء مرشّحاتك الخاصة بطريقة (بسيطة "
"نسبيًا): </p>\n"
"\n"
"<p>ميزة جديدة تنقص في ملفات gif المساعدة القديمة نوعًا ما هي تغيير نوع العمود "
"ميزة جديدة تنقص في ملفات gif المساعدة القديمة نوعًا ما هي تغيير نوع العمود "
"داخل المنشئ. \n"
"\tما عليك سوى النقر على الأيقونة واختيار النوع الذي تريده، وستُظهر التلميحة "
"ما عليك سوى النقر على الأيقونة واختيار النوع الذي تريده، وستُظهر التلميحة "
"مثالاً على البيانات.\n"
"</p>\n"
"\n"
"<p>\n"
"\tميزة أخرى تنقص في ملفات gif هي:\n"
"\t\n"
"\tيتعلق الاحتفاظ بالمستويات أو إسقاطها بما إذا كان كل مستوى (قيمة وتسمية) "
"ميزة أخرى تنقص في ملفات gif هي:\n"
"\n"
"يتعلق الاحتفاظ بالمستويات أو إسقاطها بما إذا كان كل مستوى (قيمة وتسمية) "
"لعمود يُمرَّر إلى التحليل؛ ويمكن فحص المستويات عبر \"Label editor\". \n"
"\tالاحتفاظ بالمستويات يعني أن جميع المستويات المعرّفة على العمود تُمرَّر إلى "
"الاحتفاظ بالمستويات يعني أن جميع المستويات المعرّفة على العمود تُمرَّر إلى "
"التحليل.\n"
"\tإسقاط المستويات يعني أنه في النهاية تُبلَّغ إلى التحليل فقط المستويات "
"الموجودة في الصفوف التي تجتاز المرشّح.\n"
"\tكمثال، لنفترض أن لديك عمودًا <code>contBinom</code> بقيمتين/تسميتين \"0\" "
"إسقاط المستويات يعني أنه في النهاية تُبلَّغ إلى التحليل فقط المستويات الموجودة "
"في الصفوف التي تجتاز المرشّح.\n"
"كمثال، لنفترض أن لديك عمودًا <code>contBinom</code> بقيمتين/تسميتين \"0\" "
"و\"1\"، ونرشّح جميع \"1\" وبعدها سيحصل التحليل على:\n"
"\t<ul>\n"
"\t\t<li>عند الاحتفاظ بالمستويات: \"0\"، \"1\"</li>\n"
"\t\t<li>عند إسقاط المستويات: \"0\"</li>\n"
"\t</ul>\n"
"\tتحذير واحد هو أنه عندما يُضبَط المرشّح على إسقاط المستويات، لكنه في الواقع لا "
"<ul>\n"
"\t<li>عند الاحتفاظ بالمستويات: \"0\"، \"1\"</li>\n"
"\t<li>عند إسقاط المستويات: \"0\"</li>\n"
"</ul>\n"
"تحذير واحد هو أنه عندما يُضبَط المرشّح على إسقاط المستويات، لكنه في الواقع لا "
"يرشّح شيئًا، فلن يُسقِط المستويات.\n"
"</p>\n"
"\n"
"<details>\n"
"\t<summary><b>تصفية عمود متصل</b></summary>\n"
Expand Down Expand Up @@ -8862,6 +8856,7 @@ msgstr ""
"\t\t</ul>\n"
"</details>\n"


msgctxt "AllHelp|"
msgid ""
"\n"
Expand Down
67 changes: 31 additions & 36 deletions Desktop/po/jaspDesktop-de.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9047,32 +9047,29 @@ msgid ""
"<p>The following examples will show you how you can create your own filters "
"in a (relatively) simple manner: </p>\n"
"\n"
"<p>A new feature missing from the rather old help gifs is the changing of a "
"A new feature missing from the rather old help gifs is the changing of a "
"columntype within the constructor. \n"
"\tJust click the icon and choose the type you want, the tooltip will show an "
"Just click the icon and choose the type you want, the tooltip will show an "
"example of the data.\n"
"</p>\n"
"\n"
"<p>\n"
"\tAnother feature missing in the gifs is:\n"
"\t\n"
"\tKeeping or dropping levels is about whether each level (a value and label) "
"Another feature missing in the gifs is:\n"
"\n"
"Keeping or dropping levels is about whether each level (a value and label) "
"of a column is passed to the analysis, levels are inspectable via the "
"\"Label editor\". \n"
"\tKeeping levels means that all levels defined on the column are passed to "
"the analysis.\n"
"\tDropping levels means that only those levels that occur on rows that pass "
"Keeping levels means that all levels defined on the column are passed to the "
"analysis.\n"
"Dropping levels means that only those levels that occur on rows that pass "
"the filter are in the end end communicated to the analysis.\n"
"\tAs an example, suppose you have a column <code>contBinom</code> with two "
"As an example, suppose you have a column <code>contBinom</code> with two "
"values/labels \"0\" and \"1\", and we filter all the \"1\"es out whereafter "
"the analysis would get:\n"
"\t<ul>\n"
"\t\t<li>When keeping levels: \"0\", \"1\"</li>\n"
"\t\t<li>When dropping levels: \"0\"</li>\n"
"\t</ul>\n"
"\tOne caveat is that when the filter is set to drop levels, yet doesn't "
"<ul>\n"
"\t<li>When keeping levels: \"0\", \"1\"</li>\n"
"\t<li>When dropping levels: \"0\"</li>\n"
"</ul>\n"
"One caveat is that when the filter is set to drop levels, yet doesn't "
"actually filter anything, it won't drop levels.\n"
"</p>\n"
"\n"
"<details>\n"
"\t<summary><b>Filtering a continuous column</b></summary>\n"
Expand Down Expand Up @@ -9215,33 +9212,30 @@ msgstr ""
"<p>Die folgenden Beispiele zeigen Ihnen, wie Sie Ihre eigenen Filter auf "
"(relativ) einfache Weise erstellen können: </p>\n"
"\n"
"<p>Eine neue Funktion, die in den ziemlich alten Hilfe-GIFs fehlt, ist das "
"Eine neue Funktion, die in den ziemlich alten Hilfe-GIFs fehlt, ist das "
"Ändern eines Spaltentyps innerhalb des Konstruktors. \n"
"\tKlicken Sie einfach auf das Symbol und wählen Sie den gewünschten Typ; der "
"Klicken Sie einfach auf das Symbol und wählen Sie den gewünschten Typ; der "
"Tooltip zeigt ein Beispiel der Daten.\n"
"</p>\n"
"\n"
"<p>\n"
"\tEine weitere in den GIFs fehlende Funktion ist:\n"
"\t\n"
"\tBeim Beibehalten oder Verwerfen von Stufen geht es darum, ob jede Stufe "
"(ein Wert und ein Label) einer Spalte an die Analyse übergeben wird; Stufen "
"sind über den \"Label editor\" einsehbar. \n"
"\tStufen beibehalten bedeutet, dass alle für die Spalte definierten Stufen "
"an die Analyse übergeben werden.\n"
"\tStufen verwerfen bedeutet, dass am Ende nur die Stufen an die Analyse "
"Eine weitere in den GIFs fehlende Funktion ist:\n"
"\n"
"Beim Beibehalten oder Verwerfen von Stufen geht es darum, ob jede Stufe (ein "
"Wert und ein Label) einer Spalte an die Analyse übergeben wird; Stufen sind "
"über den \"Label editor\" einsehbar. \n"
"Stufen beibehalten bedeutet, dass alle für die Spalte definierten Stufen an "
"die Analyse übergeben werden.\n"
"Stufen verwerfen bedeutet, dass am Ende nur die Stufen an die Analyse "
"übermittelt werden, die in Zeilen vorkommen, die den Filter passieren.\n"
"\tAngenommen, Sie haben eine Spalte <code>contBinom</code> mit zwei Werten/"
"Angenommen, Sie haben eine Spalte <code>contBinom</code> mit zwei Werten/"
"Labels \"0\" und \"1\", und wir filtern alle \"1\"en heraus, wonach die "
"Analyse Folgendes erhalten würde:\n"
"\t<ul>\n"
"\t\t<li>Beim Beibehalten von Stufen: \"0\", \"1\"</li>\n"
"\t\t<li>Beim Verwerfen von Stufen: \"0\"</li>\n"
"\t</ul>\n"
"\tEin Vorbehalt ist, dass wenn der Filter auf das Verwerfen von Stufen "
"<ul>\n"
"\t<li>Beim Beibehalten von Stufen: \"0\", \"1\"</li>\n"
"\t<li>Beim Verwerfen von Stufen: \"0\"</li>\n"
"</ul>\n"
"Ein Vorbehalt ist, dass wenn der Filter auf das Verwerfen von Stufen "
"eingestellt ist, aber tatsächlich nichts filtert, keine Stufen verworfen "
"werden.\n"
"</p>\n"
"\n"
"<details>\n"
"\t<summary><b>Filtern einer kontinuierlichen Spalte</b></summary>\n"
Expand Down Expand Up @@ -9389,6 +9383,7 @@ msgstr ""
"\t\t</ul>\n"
"</details>\n"


msgctxt "AllHelp|"
msgid ""
"\n"
Expand Down
Loading
Loading