summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qml/components/Event.qml112
-rw-r--r--src/theme.cpp4
2 files changed, 60 insertions, 56 deletions
diff --git a/qml/components/Event.qml b/qml/components/Event.qml
index 4bb1e95..575bee7 100644
--- a/qml/components/Event.qml
+++ b/qml/components/Event.qml
@@ -64,7 +64,7 @@ Rectangle {
SubTitle {
id: subTitle
- titleText: Theme.text.talks.arg(applicationClient.currentConferenceDetails.title)
+ titleText: Theme.text.details
}
Flickable {
@@ -85,61 +85,53 @@ Rectangle {
Column {
id: columnLayout
width: parent.width
- spacing: Theme.margins.ten
+ spacing: Theme.margins.twenty
Text {
text: model.data(indexCurrentEvent, "topic")
color: Theme.colors.black
width: columnLayout.width
- font.pointSize: Theme.fonts.twelve_pt
+ font.pointSize: Theme.fonts.ten_pt
maximumLineCount: 2
wrapMode: Text.Wrap
elide: Text.ElideRight
}
- RowLayout {
- id: feedbackBar
- width: columnLayout.width
- Label {
- id: eventPerformers
- text: model.data(indexCurrentEvent, "performer")
- font.pointSize: Theme.fonts.seven_pt
- color: Theme.colors.gray
- }
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
- }
- Button {
- id: buttonFeedback
- text: Theme.text.feedback
- Layout.preferredHeight: Theme.sizes.buttonHeight
- Layout.preferredWidth: Theme.sizes.buttonWidth
- style: ButtonStyle {
- background: Rectangle {
- border.width: 2
- border.color: Theme.colors.qtgreen
- color: control.pressed ? Qt.darker(Theme.colors.qtgreen, 1.1) : Theme.colors.qtgreen
- }
- label: Text {
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- text: control.text
- color: Theme.colors.white
- font.capitalization: Font.AllUppercase
- font.pointSize: Theme.fonts.seven_pt
- }
+ Label {
+ id: eventPerformers
+ text: model.data(indexCurrentEvent, "performer")
+ font.pointSize: Theme.fonts.eight_pt
+ color: Theme.colors.gray
+ }
+ Button {
+ id: buttonFeedback
+ text: Theme.text.feedback
+ height: Theme.sizes.buttonHeightFeedback
+ width: Theme.sizes.buttonWidthFeedback
+ style: ButtonStyle {
+ background: Rectangle {
+ border.width: 2
+ border.color: Theme.colors.qtgreen
+ color: control.pressed ? Qt.darker(Theme.colors.qtgreen, 1.1) : Theme.colors.qtgreen
}
- onClicked: {
- var itemFe = Qt.resolvedUrl("Feedback.qml")
- stack.push({
- "item" : itemFe,
- "properties" : {
- "eventId" : eventId,
- "eventPerformer": model.data(indexCurrentEvent, "performer"),
- "eventTopic": model.data(indexCurrentEvent, "topic")
- }
- })
+ label: Text {
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ text: control.text
+ color: Theme.colors.white
+ font.capitalization: Font.AllUppercase
+ font.pointSize: Theme.fonts.seven_pt
}
}
+ onClicked: {
+ var itemFe = Qt.resolvedUrl("Feedback.qml")
+ stack.push({
+ "item" : itemFe,
+ "properties" : {
+ "eventId" : eventId,
+ "eventPerformer": model.data(indexCurrentEvent, "performer"),
+ "eventTopic": model.data(indexCurrentEvent, "topic")
+ }
+ })
+ }
}
Item {
id: separator
@@ -149,7 +141,7 @@ Rectangle {
Label {
id: eventIntro
text: model.data(indexCurrentEvent, "intro")
- font.pointSize: Theme.fonts.seven_pt
+ font.pointSize: Theme.fonts.eight_pt
width: parent.width
wrapMode: Text.WordWrap
elide: Text.ElideRight
@@ -172,32 +164,37 @@ Rectangle {
id: statusBar
anchors.bottom: eventView.bottom
width: eventView.width
- height: Theme.sizes.trackHeaderHeight
+ height: Theme.sizes.trackHeaderHeight_Event
spacing: Theme.margins.ten
+ baselineOffset: Theme.sizes.trackHeaderHeight_Event*4/9
Rectangle {
id: trackSquare
- Layout.preferredHeight: Theme.sizes.trackHeaderHeight
+ Layout.fillHeight: true
Layout.preferredWidth: Theme.sizes.trackHeaderWidth
color: track.backgroundColor
+ baselineOffset: parent.baselineOffset
Text {
- anchors.fill: parent
- anchors.margins: Theme.margins.ten
+ id: trackName
+ anchors.left: parent.left
+ anchors.leftMargin: Theme.margins.ten
text: track.name
color: track.fontColor
- font.pointSize: Theme.fonts.six_pt
+ font.pointSize: Theme.fonts.seven_pt
horizontalAlignment: Text.AlignLeft
- verticalAlignment: Text.AlignVCenter
+ anchors.baseline: parent.baseline
font.capitalization: Font.AllUppercase
}
}
Rectangle {
Layout.fillWidth: true
+ Layout.fillHeight: true
color: Theme.colors.smokewhite
- height: statusBar.height
+ baselineOffset: parent.baselineOffset
RowLayout {
id: statusBar2
anchors.fill: parent
anchors.leftMargin: Theme.margins.ten
+ baselineOffset: parent.baselineOffset
Label {
height: parent.height
text: Qt.formatDate(model.data(indexCurrentEvent, "start"), "dddd d. MMM") +
@@ -207,14 +204,17 @@ Rectangle {
Qt.formatTime(model.data(indexCurrentEvent, "end"), "hh:mm")
color: Theme.colors.gray
font.pointSize: Theme.fonts.seven_pt
- font.capitalization: Font.SmallCaps
+ font.capitalization: Font.AllUppercase
+ anchors.baseline: parent.baseline
}
Label {
+ anchors.baseline: parent.baseline
text: Theme.text.room.arg(model.data(indexCurrentEvent, "location"))
height: parent.height
- color: Theme.colors.darkgray
- font.pointSize: Theme.fonts.seven_pt
+ color: mouseRoom.pressed ? Theme.colors.green : Theme.colors.qtgreen
+ font.pointSize: Theme.fonts.eight_pt
MouseArea {
+ id: mouseRoom
anchors.fill: parent
onClicked: window.showFloor()
}
diff --git a/src/theme.cpp b/src/theme.cpp
index ca1d0f3..e0be59f 100644
--- a/src/theme.cpp
+++ b/src/theme.cpp
@@ -74,6 +74,7 @@ Theme::Theme(QObject *parent)
m_text->insert(QLatin1String("home"), tr("%1 Home"));
m_text->insert(QLatin1String("schedule"), tr("Schedule"));
m_text->insert(QLatin1String("talks"), tr("%1 Presentations"));
+ m_text->insert(QLatin1String("details"), tr("Presentation Details"));
m_text->insert(QLatin1String("favorites"), tr("%1 Favorites"));
m_text->insert(QLatin1String("feedback"), tr("Send Feedback"));
m_text->insert(QLatin1String("upcoming"), tr("Upcoming: %1 %2"));
@@ -106,6 +107,7 @@ Theme::Theme(QObject *parent)
m_sizes = new QQmlPropertyMap(this);
m_sizes->insert(QLatin1String("trackHeaderHeight"), QVariant(applyRatio(270)));
m_sizes->insert(QLatin1String("trackHeaderWidth"), QVariant(applyRatio(tempTrackHeaderWidth)));
+ m_sizes->insert(QLatin1String("trackHeaderHeight_Event"), QVariant(applyRatio(135)));
m_sizes->insert(QLatin1String("timeColumnWidth"), QVariant(applyRatio(tempTimeColumnWidth)));
m_sizes->insert(QLatin1String("conferenceHeaderHeight"), QVariant(applyRatio(158)));
m_sizes->insert(QLatin1String("dayWidth"), QVariant(applyRatio(150)));
@@ -125,6 +127,8 @@ Theme::Theme(QObject *parent)
m_sizes->insert(QLatin1String("trackFieldHeight"), QVariant(applyRatio(50)));
m_sizes->insert(QLatin1String("buttonHeight"), QVariant(applyRatio(130)));
m_sizes->insert(QLatin1String("buttonWidth"), QVariant(applyRatio(400)));
+ m_sizes->insert(QLatin1String("buttonHeightFeedback"), QVariant(applyRatio(110)));
+ m_sizes->insert(QLatin1String("buttonWidthFeedback"), QVariant(applyRatio(330)));
m_sizes->insert(QLatin1String("ratingImageHeight"), QVariant(applyRatio(38)));
m_sizes->insert(QLatin1String("ratingImageWidth"), QVariant(applyRatio(40)));
m_sizes->insert(QLatin1String("infoButtonSize"), QVariant(applyRatio(160)));
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 18:46:23 +0000