JASP on the small screen (#5322)

* FileMenu scrollable, better z and background OSFLogin should handle being very small better * VariablesWindow should just show column info in a tab when it gets too small should solve jasp-stats/jasp-issues#2406 (computed column hard to see small window) * Modules menu should also scroll in edit mode * FileMenu now dynamically determines the required size for the buttons This makes it smaller than it was before which makes the preference menus *just* usable on the minimumwindow size I did move the treshold spinbox down a bit to make it fit * also show column info for virtual column
jasp-stats · Nov 15, 2023 · 9fbd814 · 9fbd814
1 parent dd76f14
commit 9fbd814
Show file tree

Hide file tree

Showing 17 changed files with 719 additions and 585 deletions.
diff --git a/Desktop/components/JASP/Widgets/ColumnBasicInfo.qml b/Desktop/components/JASP/Widgets/ColumnBasicInfo.qml
@@ -0,0 +1,197 @@
+//
+// Copyright (C) 2013-2023 University of Amsterdam
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public
+// License along with this program.  If not, see
+// <http://www.gnu.org/licenses/>.
+//
+
+import QtQuick
+import JASP
+import JASP.Widgets
+import JASP.Controls
+import QtQuick.Controls as QTC
+import QtQuick.Layouts
+Item
+{
+	id:							common
+	implicitHeight:				Math.max(leftColumn.childrenRect.height, rightColumn.childrenRect.height) + 2 * jaspTheme.generalAnchorMargin
+	height:						implicitHeight
+	property bool closeIcon:	true
+
+	Column
+	{
+		id:			leftColumn
+		width:		Math.max(columnTypeVariableWindow.implicitWidth, computedTypeVariableWindow.implicitWidth, columnNameVariablesWindow.implicitWidth)
+		spacing:	jaspTheme.rowGroupSpacing
+
+		anchors
+		{
+			top:		common.top
+			left:		common.left
+			bottom:		common.bottom
+			margins:	jaspTheme.generalAnchorMargin
+		}
+
+		property int labelWidth:	Math.max(columnTypeVariableWindow.controlLabel.implicitWidth, computedTypeVariableWindow.controlLabel.implicitWidth, columnNameVariablesWindow.controlLabel.implicitWidth)
+
+		RowLayout
+		{
+			height:				longNameRow.height
+
+			TextField
+			{
+				id:					columnNameVariablesWindow
+				placeholderText:	qsTr("<Fill in the name of the column>")
+				value:				columnModel.columnName
+				onValueChanged:		if(columnModel.columnName !== value) columnModel.columnName = value
+				undoModel:			columnModel
+				editable:           columnModel.nameEditable
+				label:				qsTr("Name: ")
+				controlLabel.width:	leftColumn.labelWidth
+
+			}
+		}
+
+
+		DropDown
+		{
+			id: columnTypeVariableWindow
+
+			label:				qsTr("Column type: ")
+			isBound:			false
+			showVariableTypeIcon: true
+			values:				columnModel.columnTypeValues
+			currentValue:		columnModel.currentColumnType
+			onValueChanged:		columnModel.currentColumnType = currentValue
+			controlMinWidth:	200 * jaspTheme.uiScale
+			controlLabel.width:	leftColumn.labelWidth
+		}
+
+		DropDown
+		{
+			id: computedTypeVariableWindow
+
+			label:				qsTr("Computed type: ")
+			values:				columnModel.computedTypeValues
+			currentValue:		columnModel.computedType
+			onValueChanged:		columnModel.computedType = currentValue
+			visible:			columnModel.computedTypeEditable
+			controlMinWidth:	200 * jaspTheme.uiScale
+
+			controlLabel.width:	leftColumn.labelWidth
+		}
+
+		Item
+		{
+			implicitWidth:			parent.width
+			implicitHeight:			showAnalysisButton.height
+			visible:				columnModel.computedType === "analysisNotComputed" || columnModel.computedType === "analysisNotComputed"
+
+			RoundedButton
+			{
+				id:					showAnalysisButton
+				text:				qsTr("Show parent analysis")
+				width:				parent.width - x
+				x:					leftColumn.labelWidth
+				onClicked:			computedColumnsInterface.showAnalysisFormForColumn(columnModel.columnName)
+			}
+		}
+	}
+
+	Column
+	{
+		id:			rightColumn
+		spacing:	jaspTheme.rowGroupSpacing
+
+		anchors
+		{
+			top:		common.top
+			left:		leftColumn.right
+			right:		common.right
+			bottom:		common.bottom
+			margins:	jaspTheme.generalAnchorMargin
+		}
+
+		property int labelWidth:	Math.max(columnTitleVariablesWindow.controlLabel.implicitWidth, descriptionLabel.implicitWidth)
+
+		RowLayout
+		{
+			id:					longNameRow
+			width:				parent.width
+
+
+			TextField
+			{
+				id:					columnTitleVariablesWindow
+				label:				qsTr("Long name: ");
+				placeholderText:	qsTr("<Fill in a more descriptive name of the column>")
+				fieldWidth:			longNameRow.width - ( rightColumn.labelWidth + closeButton.width )
+				value:				columnModel.columnTitle
+				onValueChanged:		if(columnModel.columnTitle !== value) columnModel.columnTitle = value
+				undoModel:			columnModel
+				controlLabel.width:	rightColumn.labelWidth
+
+			}
+
+			MenuButton
+			{
+				id:					closeButton
+				height:				33 * jaspTheme.uiScale
+				width:				common.closeIcon? height : 0
+				iconSource:			jaspTheme.iconPath + "close-button.png"
+				onClicked:			{ computedColumnWindow.askIfChangedOrClose(); columnModel.visible = false }
+				toolTip:			qsTr("Close variable window")
+				radius:				height
+				visible:			common.closeIcon
+			}
+		}
+
+		Item
+		{
+			id:					descriptionRow
+			width:				parent.width
+			height:				Math.max(descriptionLabel.height, columnDescriptionVariablesWindow.height)
+
+			Label
+			{
+				id:				descriptionLabel
+				text:			qsTr("Description: ")
+				width:			rightColumn.labelWidth
+			}
+
+			TextArea
+			{
+				id:					columnDescriptionVariablesWindow
+				height:				implicitHeight
+				width:				implicitWidth
+				x:					rightColumn.labelWidth + jaspTheme.labelSpacing //Cause that happens inside TextField between labelRect and actual control
+				implicitHeight:		columnTypeVariableWindow.height + computedTypeVariableWindow.height + rightColumn.spacing
+				implicitWidth:		descriptionRow.width - x
+				control.padding:	3 * jaspTheme.uiScale
+
+				text:				columnModel.columnDescription
+				onEditingFinished: 	if(columnModel.columnDescription !== text) columnModel.columnDescription = text
+				applyScriptInfo:	""
+				placeholderText:	"..."
+				undoModel:			columnModel
+				useTabAsSpaces:		false
+
+
+
+			}
+		}
+	}
+
+
+}