Merge branch 'main' into module/wifi
This commit is contained in:
@@ -7,8 +7,6 @@ Singleton {
|
||||
readonly property AppearanceConf.Deform deform: Config.appearance.deform
|
||||
readonly property AppearanceConf.FontStuff font: Config.appearance.font
|
||||
readonly property AppearanceConf.Padding padding: Config.appearance.padding
|
||||
// Literally just here to shorten accessing stuff :woe:
|
||||
// Also kinda so I can keep accessing it with `Appearance.xxx` instead of `Conf.appearance.xxx`
|
||||
readonly property AppearanceConf.Rounding rounding: Config.appearance.rounding
|
||||
readonly property AppearanceConf.Spacing spacing: Config.appearance.spacing
|
||||
readonly property AppearanceConf.Transparency transparency: Config.appearance.transparency
|
||||
|
||||
@@ -28,9 +28,13 @@ JsonObject {
|
||||
property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
|
||||
property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
|
||||
property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
|
||||
property list<real> expressiveDefaultEffects: [0.34, 0.8, 0.34, 1, 1, 1]
|
||||
property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
|
||||
property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
|
||||
property list<real> expressiveFastEffects: [0.31, 0.94, 0.34, 1, 1, 1]
|
||||
property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
|
||||
property list<real> expressiveSlowEffects: [0.34, 0.88, 0.34, 1, 1, 1]
|
||||
property list<real> expressiveSlowSpatial: [0.39, 1.29, 0.35, 0.98, 1, 1]
|
||||
property list<real> standard: [0.2, 0, 0, 1, 1, 1]
|
||||
property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
|
||||
property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
|
||||
@@ -38,7 +42,9 @@ JsonObject {
|
||||
component AnimDurations: JsonObject {
|
||||
property int expressiveDefaultSpatial: 500 * scale
|
||||
property int expressiveEffects: 200 * scale
|
||||
property int expressiveFastEffects: 150 * scale
|
||||
property int expressiveFastSpatial: 350 * scale
|
||||
property int expressiveSlowEffects: 300 * scale
|
||||
property int extraLarge: 1000 * scale
|
||||
property int large: 600 * scale
|
||||
property int normal: 400 * scale
|
||||
@@ -57,7 +63,8 @@ JsonObject {
|
||||
component FontSize: JsonObject {
|
||||
property int extraLarge: 28 * scale
|
||||
property int large: 18 * scale
|
||||
property int larger: 15 * scale
|
||||
property int larger: 16 * scale
|
||||
property int medium: 14 * scale
|
||||
property int normal: 13 * scale
|
||||
property real scale: 1
|
||||
property int small: 11 * scale
|
||||
@@ -70,23 +77,30 @@ JsonObject {
|
||||
}
|
||||
}
|
||||
component Padding: JsonObject {
|
||||
property int large: 15 * scale
|
||||
property int larger: 13 * scale
|
||||
property int normal: 9 * scale
|
||||
property int extraLarge: 28 * scale
|
||||
property int extraLargeIncreased: 32 * scale
|
||||
property int extraSmall: 4 * scale
|
||||
property int large: 16 * scale
|
||||
property int largeIncreased: 20 * scale
|
||||
property int larger: 12 * scale
|
||||
property int normal: 8 * scale
|
||||
property real scale: 1
|
||||
property int small: 5 * scale
|
||||
property int smaller: 7 * scale
|
||||
property int smallest: 2 * scale
|
||||
}
|
||||
component Rounding: JsonObject {
|
||||
property int extraSmall: 4 * scale
|
||||
property int full: 1000 * scale
|
||||
property int large: 24 * scale
|
||||
property int medium: 16 * scale
|
||||
property int normal: 18 * scale
|
||||
property real scale: 1
|
||||
property int small: 12 * scale
|
||||
property int smallest: 8 * scale
|
||||
}
|
||||
component Spacing: JsonObject {
|
||||
property int extraSmall: 4 * scale
|
||||
property int large: 20 * scale
|
||||
property int larger: 16 * scale
|
||||
property int normal: 12 * scale
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
import Quickshell.Io
|
||||
|
||||
JsonObject {
|
||||
property bool enabled: true
|
||||
property int maxEntriesShown: 10
|
||||
property Sizes sizes: Sizes {
|
||||
}
|
||||
|
||||
component Sizes: JsonObject {
|
||||
property int itemHeight: 60
|
||||
property int minPreviewWidth: 200
|
||||
property int previewWidth: 500
|
||||
property int width: 500
|
||||
}
|
||||
}
|
||||
+21
-2
@@ -13,6 +13,7 @@ Singleton {
|
||||
property alias appearance: adapter.appearance
|
||||
property alias background: adapter.background
|
||||
property alias barConfig: adapter.barConfig
|
||||
property alias clipboard: adapter.clipboard
|
||||
property alias colors: adapter.colors
|
||||
property alias dashboard: adapter.dashboard
|
||||
property alias dock: adapter.dock
|
||||
@@ -116,6 +117,19 @@ Singleton {
|
||||
};
|
||||
}
|
||||
|
||||
function serializeClipboard(): var {
|
||||
return {
|
||||
enabled: clipboard.enabled,
|
||||
maxEntriesShown: clipboard.maxEntriesShown,
|
||||
sizes: {
|
||||
width: clipboard.sizes.width,
|
||||
previewWidth: clipboard.sizes.previewWidth,
|
||||
minPreviewWidth: clipboard.sizes.minPreviewWidth,
|
||||
itemHeight: clipboard.sizes.itemHeight
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function serializeColors(): var {
|
||||
return {
|
||||
schemeType: colors.schemeType,
|
||||
@@ -143,7 +157,8 @@ Singleton {
|
||||
launcher: serializeLauncher(),
|
||||
colors: serializeColors(),
|
||||
dock: serializeDock(),
|
||||
screenshot: serializeScreenshot()
|
||||
screenshot: serializeScreenshot(),
|
||||
clipboard: serializeClipboard()
|
||||
};
|
||||
}
|
||||
|
||||
@@ -173,7 +188,7 @@ Singleton {
|
||||
resourceProgessThickness: dashboard.sizes.resourceProgessThickness,
|
||||
weatherWidth: dashboard.sizes.weatherWidth,
|
||||
mediaCoverArtSize: dashboard.sizes.mediaCoverArtSize,
|
||||
mediaVisualiserSize: dashboard.sizes.mediaVisualiserSize,
|
||||
mediaVisualizerSize: dashboard.sizes.mediaVisualizerSize,
|
||||
resourceSize: dashboard.sizes.resourceSize
|
||||
}
|
||||
};
|
||||
@@ -194,6 +209,7 @@ Singleton {
|
||||
return {
|
||||
logo: general.logo,
|
||||
wallpaperPath: general.wallpaperPath,
|
||||
showOverFullscreen: general.showOverFullscreen,
|
||||
desktopIcons: general.desktopIcons,
|
||||
dateFormat: general.dateFormat,
|
||||
color: {
|
||||
@@ -315,6 +331,7 @@ Singleton {
|
||||
weatherLocation: services.weatherLocation,
|
||||
updates: services.updates,
|
||||
useFahrenheit: services.useFahrenheit,
|
||||
minBrightness: services.minBrightness,
|
||||
ddcutilService: services.ddcutilService,
|
||||
useTwelveHourClock: services.useTwelveHourClock,
|
||||
gpuType: services.gpuType,
|
||||
@@ -447,6 +464,8 @@ Singleton {
|
||||
}
|
||||
property BarConfig barConfig: BarConfig {
|
||||
}
|
||||
property ClipboardConfig clipboard: ClipboardConfig {
|
||||
}
|
||||
property Colors colors: Colors {
|
||||
}
|
||||
property DashboardConfig dashboard: DashboardConfig {
|
||||
|
||||
@@ -25,7 +25,7 @@ JsonObject {
|
||||
readonly property int mediaCoverArtSize: 150
|
||||
readonly property int mediaProgressSweep: 180
|
||||
readonly property int mediaProgressThickness: 8
|
||||
readonly property int mediaVisualiserSize: 80
|
||||
readonly property int mediaVisualizerSize: 200
|
||||
readonly property int mediaWidth: 200
|
||||
readonly property int resourceProgessThickness: 10
|
||||
readonly property int resourceSize: 200
|
||||
|
||||
@@ -13,11 +13,16 @@ JsonObject {
|
||||
property Idle idle: Idle {
|
||||
}
|
||||
property string logo: ""
|
||||
property bool showOverFullscreen: true
|
||||
property string wallpaperPath: Quickshell.env("HOME") + "/Pictures/Wallpapers"
|
||||
|
||||
component Apps: JsonObject {
|
||||
property list<string> archiver: ["ark"]
|
||||
property list<string> audio: ["pavucontrol"]
|
||||
property list<string> document: ["libreoffice"]
|
||||
property list<string> editor: ["kate"]
|
||||
property list<string> explorer: ["dolphin"]
|
||||
property list<string> image: ["imv"]
|
||||
property list<string> playback: ["mpv"]
|
||||
property list<string> terminal: ["kitty"]
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ JsonObject {
|
||||
property string defaultPlayer: "Spotify"
|
||||
property string gpuType: ""
|
||||
property real maxVolume: 1.0
|
||||
property real minBrightness: 0.01
|
||||
property list<var> playerAliases: [
|
||||
{
|
||||
"from": "com.github.th_ch.youtube_music",
|
||||
|
||||
Reference in New Issue
Block a user