mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
CLock settings: less tall UI for 1080p
This commit is contained in:
@@ -107,7 +107,7 @@ ColumnLayout {
|
||||
|
||||
NHeader {
|
||||
label: "Clock format"
|
||||
description: "Build your clock display using the tokens below.\nAdditional lines (3 & 4) are only shown in the vertical bar layout.\nClick on any token to insert it into the selected input field."
|
||||
description: "Build your clock display using the tokens below. Additional lines (3 & 4) are only shown in the vertical bar layout.\nClick on any token to insert it into the selected input field."
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
@@ -319,14 +319,14 @@ ColumnLayout {
|
||||
Layout.bottomMargin: Style.marginL * scaling
|
||||
}
|
||||
|
||||
NHeader {
|
||||
label: "Tokens"
|
||||
description: focusedLineIndex > 0 ? "Click any token to add it to line " + focusedLineIndex : "Select an input field above, then click a token to insert it."
|
||||
}
|
||||
// NHeader {
|
||||
// label: "Tokens"
|
||||
// description: focusedLineIndex > 0 ? "Click any token to add it to line " + focusedLineIndex : "Select an input field above, then click a token to insert it."
|
||||
// }
|
||||
|
||||
NDateTimeTokens {
|
||||
Layout.fillWidth: true
|
||||
height: 400 * scaling
|
||||
height: 200 * scaling
|
||||
|
||||
// Connect to token clicked signal if NDateTimeTokens provides it
|
||||
onTokenClicked: token => root.insertToken(token)
|
||||
|
||||
+30
-30
@@ -18,8 +18,8 @@ Rectangle {
|
||||
ColumnLayout {
|
||||
id: column
|
||||
anchors.fill: parent
|
||||
anchors.margins: Style.marginL * scaling
|
||||
spacing: Style.marginM * scaling
|
||||
anchors.margins: Style.marginS * scaling
|
||||
spacing: Style.marginS * scaling
|
||||
|
||||
// Scrollable list of tokens
|
||||
NScrollView {
|
||||
@@ -82,30 +82,30 @@ Rectangle {
|
||||
}
|
||||
|
||||
// Hour tokens
|
||||
ListElement {
|
||||
category: "Hour"
|
||||
token: "h"
|
||||
description: "Hour without leading zero (12-hour when used with AP/ap, otherwise 24-hour)"
|
||||
example: "2 (needs AP/ap for 12hr)"
|
||||
}
|
||||
ListElement {
|
||||
category: "Hour"
|
||||
token: "hh"
|
||||
description: "Hour with leading zero (12-hour when used with AP/ap, otherwise 24-hour)"
|
||||
example: "02 (needs AP/ap for 12hr)"
|
||||
}
|
||||
ListElement {
|
||||
category: "Hour"
|
||||
token: "h AP"
|
||||
description: "12-hour format with AM/PM"
|
||||
example: "2 PM"
|
||||
}
|
||||
ListElement {
|
||||
category: "Hour"
|
||||
token: "hh AP"
|
||||
description: "12-hour format with leading zero and AM/PM"
|
||||
example: "02 PM"
|
||||
}
|
||||
// ListElement {
|
||||
// category: "Hour"
|
||||
// token: "h"
|
||||
// description: "Hour without leading zero (12-hour when used with AP/ap, otherwise 24-hour)"
|
||||
// example: "2 (needs AP/ap for 12hr)"
|
||||
// }
|
||||
// ListElement {
|
||||
// category: "Hour"
|
||||
// token: "hh"
|
||||
// description: "Hour with leading zero (12-hour when used with AP/ap, otherwise 24-hour)"
|
||||
// example: "02 (needs AP/ap for 12hr)"
|
||||
// }
|
||||
// ListElement {
|
||||
// category: "Hour"
|
||||
// token: "h AP"
|
||||
// description: "12-hour format with AM/PM"
|
||||
// example: "2 PM"
|
||||
// }
|
||||
// ListElement {
|
||||
// category: "Hour"
|
||||
// token: "hh AP"
|
||||
// description: "12-hour format with leading zero and AM/PM"
|
||||
// example: "02 PM"
|
||||
// }
|
||||
ListElement {
|
||||
category: "Hour"
|
||||
token: "H"
|
||||
@@ -239,7 +239,7 @@ Rectangle {
|
||||
delegate: Rectangle {
|
||||
id: tokenDelegate
|
||||
width: tokensList.width
|
||||
height: 50 * scaling
|
||||
height: 32 * scaling
|
||||
color: {
|
||||
if (tokenMouseArea.containsMouse) {
|
||||
return Qt.alpha(Color.mPrimary, 0.1)
|
||||
@@ -288,7 +288,7 @@ Rectangle {
|
||||
// Category badge
|
||||
Rectangle {
|
||||
width: 70 * scaling
|
||||
height: 28 * scaling
|
||||
height: 22 * scaling
|
||||
color: getCategoryColor(model.category)[0]
|
||||
radius: Style.radiusS * scaling
|
||||
opacity: tokenMouseArea.containsMouse ? 0.9 : 1.0
|
||||
@@ -311,7 +311,7 @@ Rectangle {
|
||||
Rectangle {
|
||||
id: tokenButton
|
||||
width: 100 * scaling
|
||||
height: 28 * scaling
|
||||
height: 22 * scaling
|
||||
color: tokenMouseArea.containsMouse ? Color.mPrimary : Color.mOnSurface
|
||||
radius: Style.radiusS * scaling
|
||||
|
||||
@@ -354,7 +354,7 @@ Rectangle {
|
||||
// Live example
|
||||
Rectangle {
|
||||
width: 90 * scaling
|
||||
height: 28 * scaling
|
||||
height: 22 * scaling
|
||||
color: tokenMouseArea.containsMouse ? Color.mPrimary : Color.mOnSurfaceVariant
|
||||
radius: Style.radiusS * scaling
|
||||
border.color: tokenMouseArea.containsMouse ? Color.mPrimary : Color.mOutline
|
||||
|
||||
Reference in New Issue
Block a user