Skip to content
Snippets Groups Projects
Commit ec5bad63 authored by SeeLook's avatar SeeLook
Browse files

In start exam dialog: list all previous exams properly when the exam list is...

In start exam dialog: list all previous exams properly when the exam list is long and requires scrolling.
Added new donor name, app image fixes
parent 0be55ade
No related branches found
No related tags found
No related merge requests found
......@@ -68,7 +68,7 @@ cp $TRANS_PATH/qtbase_pl.qm AppDir/usr/share/nootka/lang
cp $TRANS_PATH/qtbase_ru.qm AppDir/usr/share/nootka/lang
# desktop integration files
cp AppDir/usr/share/pixmaps/nootka.png AppDir/usr/
cp AppDir/usr/share/nootka/picts/nootka.png AppDir/usr/
cp AppDir/usr/share/applications/nootka.desktop AppDir/usr/
LD_LIBRARY_PATH="$BIN_DIR/AppDir/usr/lib/nootka:$LD_LIBRARY_PATH" linuxdeployqt AppDir/usr/bin/nootka -bundle-non-qt-libs -qmldir=$SRC_DIR/src/qml
......@@ -87,6 +87,10 @@ else
cp -r $XCB/xcbglintegrations AppDir/usr/plugins/
fi
# Fix for XCB platform plugin - copy X11 library and remove freetype
cp /usr/lib/x86_64-linux-gnu/libX11.so.6.3.0 AppDir/usr/lib/libX11.so.6
rm AppDir/usr/lib/libfreetype*
# make all contents pointing to itself as a usr/
cd AppDir/usr
ln -s ./. usr
......
......@@ -56,7 +56,7 @@ Tflickable {
property real widest: 0
spacing: Noo.fontSize()
Repeater {
model: [ "Aaron Wolf", "Torsten Philipp", "Vincent Bermel", "Tomasz Matuszewski", "Yves Balhant", "Илья Б.", "...and others" ]
model: [ "Wayne Bonner", "Aaron Wolf", "Torsten Philipp", "Vincent Bermel", "Tomasz Matuszewski", "Yves Balhant", "Илья Б.", "...and others" ]
Tile {
anchors.horizontalCenter: undefined
property color randCol: Noo.randomColor()
......
......@@ -112,22 +112,6 @@ TstartExamItem {
iconHeight: startDialog.height / 15
pixmap: Noo.pix("exam"); text: qsTr("Select an exam to continue") + ""
onClicked: menu.open()
Menu {
id: menu
width: Noo.fontSize() * 20
background: TipRect { shadowRadius: Noo.fontSize() }
Repeater {
model: recentModel
MenuItem {
padding: 0
width: menu.width
contentItem: MenuButton {
action: modelData
onClicked: menu.close()
}
}
}
}
}
}
}
......@@ -168,6 +152,25 @@ TstartExamItem {
}
}
Menu {
id: menu
width: Noo.fontSize() * 20; height: startDialog.height * 0.8; y: startDialog.height / 10; x: Noo.fontSize() * 2
background: TipRect { shadowRadius: Noo.fontSize() }
contentItem: ListView {
clip: true
ScrollBar.vertical: ScrollBar { active: true }
model: recentModel
delegate: MenuButton {
width: Noo.fontSize() * 20
action: modelData
onClicked: menu.close()
}
}
scale: GLOB.useAnimations ? 0.1 : 1.0
enter: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 1.0 }}
exit: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 0.1 }}
}
Component.onCompleted: {
if (Noo.isAndroid()) {
dialLoader.buttons = []
......
......@@ -28,21 +28,20 @@ Rectangle {
}
Image {
x: Noo.fontSize() / 2
id: icon
x: Noo.fontSize() / 2
sourceSize.height: Noo.fontSize() * 2.2
anchors.verticalCenter: parent.verticalCenter
source: action ? action.icon : ""
}
Column {
x: Noo.fontSize() * 3.7
anchors.verticalCenter: parent.verticalCenter
Text {
x: Noo.fontSize() * (action && action.icon !== "" ? 3.7 : 0.8)
anchors.verticalCenter: parent.verticalCenter
id: butText
text: action ? action.text : ""
font.bold: true
color: activPal.text
}
width: parent.width - x - Noo.fontSize() / 2; elide: Text.ElideRight
}
Component {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment