mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-06-07 12:25:15 +00:00
ControlCenter: toggle to hide/show volume sliders + getting ready for more modularity soon
This commit is contained in:
ItsLemmy
@@ -33,14 +33,14 @@ NBox {
|
||||
Layout.minimumHeight: {
|
||||
var widgetCount = widgetModel.length
|
||||
if (widgetCount === 0)
|
||||
return 140
|
||||
return 140 * Style.uiScaleRatio
|
||||
|
||||
var availableWidth = parent.width
|
||||
var avgWidgetWidth = 150
|
||||
var avgWidgetWidth = 150 * Style.uiScaleRatio
|
||||
var widgetsPerRow = Math.max(1, Math.floor(availableWidth / avgWidgetWidth))
|
||||
var rows = Math.ceil(widgetCount / widgetsPerRow)
|
||||
|
||||
return (50 + 20 + (rows * 48) + ((rows - 1) * Style.marginS) + 20)
|
||||
return ((50 + 20 + (rows * 48)) * Style.uiScaleRatio + ((rows - 1) * Style.marginS) + 20 * Style.uiScaleRatio)
|
||||
}
|
||||
|
||||
// Generate widget color from name checksum
|
||||
@@ -73,7 +73,7 @@ NBox {
|
||||
Layout.fillWidth: true
|
||||
|
||||
NText {
|
||||
text: sectionName + " Section"
|
||||
text: sectionName
|
||||
pointSize: Style.fontSizeL
|
||||
font.weight: Style.fontWeightBold
|
||||
color: Color.mOnSurface
|
||||
@@ -131,7 +131,7 @@ NBox {
|
||||
Item {
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
Layout.minimumHeight: 65
|
||||
Layout.minimumHeight: 65 * Style.uiScaleRatio
|
||||
clip: false // Don't clip children so ghost can move freely
|
||||
|
||||
Flow {
|
||||
@@ -180,7 +180,7 @@ NBox {
|
||||
NContextMenu {
|
||||
id: contextMenu
|
||||
parent: Overlay.overlay
|
||||
width: 240
|
||||
width: 240 * Style.uiScaleRatio
|
||||
model: [{
|
||||
"label": I18n.tr("tooltips.move-to-left-section"),
|
||||
"action": "left",
|
||||
@@ -227,16 +227,16 @@ NBox {
|
||||
|
||||
NText {
|
||||
text: modelData.id
|
||||
pointSize: Style.fontSizeS
|
||||
pointSize: Style.fontSizeXS
|
||||
color: root.getWidgetColor(modelData)[1]
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
elide: Text.ElideRight
|
||||
Layout.preferredWidth: 80
|
||||
Layout.preferredWidth: 60 * Style.uiScaleRatio
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
spacing: 0
|
||||
Layout.preferredWidth: buttonsCount * buttonsWidth
|
||||
Layout.preferredWidth: buttonsCount * buttonsWidth * Style.uiScaleRatio
|
||||
|
||||
Loader {
|
||||
active: root.widgetRegistry && root.widgetRegistry.widgetHasUserSettings(modelData.id)
|
||||
@@ -261,19 +261,19 @@ NBox {
|
||||
if (dialog) {
|
||||
dialog.open()
|
||||
} else {
|
||||
Logger.error("WidgetSectionEditor", "Failed to create settings dialog instance")
|
||||
Logger.error("SectionEditor", "Failed to create settings dialog instance")
|
||||
}
|
||||
}
|
||||
if (component.status === Component.Ready) {
|
||||
instantiateAndOpen()
|
||||
} else if (component.status === Component.Error) {
|
||||
Logger.error("WidgetSectionEditor", component.errorString())
|
||||
Logger.error("SectionEditor", component.errorString())
|
||||
} else {
|
||||
component.statusChanged.connect(function () {
|
||||
if (component.status === Component.Ready) {
|
||||
instantiateAndOpen()
|
||||
} else if (component.status === Component.Error) {
|
||||
Logger.error("WidgetSectionEditor", component.errorString())
|
||||
Logger.error("SectionEditor", component.errorString())
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -70,44 +70,19 @@ ColumnLayout {
|
||||
}
|
||||
}
|
||||
|
||||
NToggle {
|
||||
label: I18n.tr("settings.control-center.audio-controls.label")
|
||||
description: I18n.tr("settings.control-center.audio-controls.description")
|
||||
checked: Settings.data.controlCenter.audioControlsEnabled
|
||||
onToggled: checked => Settings.data.controlCenter.audioControlsEnabled = checked
|
||||
}
|
||||
|
||||
NDivider {
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: Style.marginXL
|
||||
Layout.bottomMargin: Style.marginXL
|
||||
}
|
||||
|
||||
// // Quick Settings Style Section
|
||||
// ColumnLayout {
|
||||
// spacing: Style.marginL
|
||||
// Layout.fillWidth: true
|
||||
|
||||
// NHeader {
|
||||
// label: I18n.tr("settings.control-center.quickSettingsStyle.section.label")
|
||||
// description: I18n.tr("settings.control-center.quickSettingsStyle.section.description")
|
||||
// }
|
||||
|
||||
// NComboBox {
|
||||
// id: quickSettingsStyle
|
||||
// label: I18n.tr("settings.control-center.quickSettingsStyle.style.label")
|
||||
// description: I18n.tr("settings.control-center.quickSettingsStyle.style.description")
|
||||
// Layout.fillWidth: true
|
||||
// model: [{
|
||||
// "key": "compact",
|
||||
// "name": I18n.tr("options.control-center.quickSettingsStyle.compact")
|
||||
// }, {
|
||||
// "key": "classic",
|
||||
// "name": I18n.tr("options.control-center.quickSettingsStyle.classic")
|
||||
// }, {
|
||||
// "key": "modern",
|
||||
// "name": I18n.tr("options.control-center.quickSettingsStyle.modern")
|
||||
// }]
|
||||
// currentKey: Settings.data.controlCenter.quickSettingsStyle || "compact"
|
||||
// onSelected: function (key) {
|
||||
// Settings.data.controlCenter.quickSettingsStyle = key
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// NDivider {
|
||||
// Layout.fillWidth: true
|
||||
// Layout.topMargin: Style.marginXL
|
||||
@@ -120,24 +95,41 @@ ColumnLayout {
|
||||
// Layout.fillWidth: true
|
||||
|
||||
// NHeader {
|
||||
// label: I18n.tr("settings.control-center.widgets.section.label")
|
||||
// description: I18n.tr("settings.control-center.widgets.section.description")
|
||||
// label: I18n.tr("settings.control-center.quickSettings.section.label")
|
||||
// description: I18n.tr("settings.control-center.quickSettings.section.description")
|
||||
// }
|
||||
|
||||
// // Bar Sections
|
||||
// // Sections
|
||||
// ColumnLayout {
|
||||
// Layout.fillWidth: true
|
||||
// Layout.fillHeight: true
|
||||
// Layout.topMargin: Style.marginM
|
||||
// spacing: Style.marginM
|
||||
|
||||
// // Quick Settings
|
||||
// // Left
|
||||
// SectionEditor {
|
||||
// sectionName: I18n.tr("settings.control-center.quickSettings.sectionName")
|
||||
// sectionId: "quickSettings"
|
||||
// sectionName: I18n.tr("settings.control-center.quickSettings.sectionLeft")
|
||||
// sectionId: "left"
|
||||
// settingsDialogComponent: ""
|
||||
// widgetRegistry: ControlCenterWidgetRegistry
|
||||
// widgetModel: Settings.data.controlCenter.widgets["quickSettings"]
|
||||
// widgetModel: Settings.data.controlCenter.widgets["left"]
|
||||
// availableWidgets: availableWidgets
|
||||
// enableMoveBetweenSections: false
|
||||
// onAddWidget: (widgetId, section) => _addWidgetToSection(widgetId, section)
|
||||
// onRemoveWidget: (section, index) => _removeWidgetFromSection(section, index)
|
||||
// onReorderWidget: (section, fromIndex, toIndex) => _reorderWidgetInSection(section, fromIndex, toIndex)
|
||||
// onUpdateWidgetSettings: (section, index, settings) => _updateWidgetSettingsInSection(section, index, settings)
|
||||
// onDragPotentialStarted: root.handleDragStart()
|
||||
// onDragPotentialEnded: root.handleDragEnd()
|
||||
// }
|
||||
|
||||
// // Right
|
||||
// SectionEditor {
|
||||
// sectionName: I18n.tr("settings.control-center.quickSettings.sectionRight")
|
||||
// sectionId: "right"
|
||||
// settingsDialogComponent: ""
|
||||
// widgetRegistry: ControlCenterWidgetRegistry
|
||||
// widgetModel: Settings.data.controlCenter.widgets["right"]
|
||||
// availableWidgets: availableWidgets
|
||||
// enableMoveBetweenSections: false
|
||||
// onAddWidget: (widgetId, section) => _addWidgetToSection(widgetId, section)
|
||||
|
||||
Reference in New Issue
Block a user