Skip to content

Commit 94e7383

Browse files
kRHYME7kRHYME7
authored
Merge branch 'rc' into dev
2 parents 95f9ca4 + 975982b commit 94e7383

File tree

6 files changed

+214
-6
lines changed

6 files changed

+214
-6
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
1111
- Fish: Pleas Move you configs to `~/.config/fish/conf.d`
1212

1313

14+
### Added
15+
16+
- QT6CT: Added explicit font configuration for QT6 Applications see [#1309](https://github.com/HyDE-Project/HyDE/issues/1309)
17+
- QT5CT: Added explicit font configuration for QT5 Applications see [#1309](https://github.com/HyDE-Project/HyDE/issues/1309)
18+
- GTK3: Added explicit font configuration for GTK3 Applications see [#1309](https://github.com/HyDE-Project/HyDE/issues/1309)
19+
20+
21+
1422
## v25.9.3
1523

1624
### Changed

‎Configs/.local/lib/hyde/theme.switch.sh‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,29 @@ fi
195195

196196
#// qt5ct
197197

198+
QT5_FONT="${QT5_FONT:-${FONT}}"
199+
QT5_FONT_SIZE="${QT5_FONT_SIZE:-${FONT_SIZE}}"
200+
QT5_MONOSPACE_FONT="${QT5_MONOSPACE_FONT:-${MONOSPACE_FONT}}"
201+
QT5_MONOSPACE_FONT_SIZE="${QT5_MONOSPACE_FONT_SIZE:-${MONOSPACE_FONT_SIZE:-9}}"
202+
203+
198204
toml_write "${confDir}/qt5ct/qt5ct.conf" "Appearance" "icon_theme" "${ICON_THEME}"
199-
toml_write "${confDir}/qt5ct/qt5ct.conf" "Fonts" "general" "\"${FONT},${FONT_SIZE},-1,5,400,0,0,0,0,0,0,0,0,0,0,1,${FONT_STYLE}\""
200-
toml_write "${confDir}/qt5ct/qt5ct.conf" "Fonts" "fixed" "\"${MONOSPACE_FONT},${MONOSPACE_FONT_SIZE:-9},-1,5,400,0,0,0,0,0,0,0,0,0,0,1\""
205+
toml_write "${confDir}/qt5ct/qt5ct.conf" "Fonts" "general" "\"${QT5_FONT},${QT5_FONT_SIZE},-1,5,400,0,0,0,0,0,0,0,0,0,0,1,${FONT_STYLE}\""
206+
toml_write "${confDir}/qt5ct/qt5ct.conf" "Fonts" "fixed" "\"${QT5_MONOSPACE_FONT},${QT5_MONOSPACE_FONT_SIZE},-1,5,400,0,0,0,0,0,0,0,0,0,0,1\""
201207

202208
# toml_write "${confDir}/qt5ct/qt5ct.conf" "Appearance" "color_scheme_path" "${confDir}/qt5ct/colors/colors.conf"
203209
# toml_write "${confDir}/qt5ct/qt5ct.conf" "Appearance" "custom_palette" "true"
204210

205211
# // qt6ct
206212

213+
QT6_FONT="${QT6_FONT:-${FONT}}"
214+
QT6_FONT_SIZE="${QT6_FONT_SIZE:-${FONT_SIZE}}"
215+
QT6_MONOSPACE_FONT="${QT6_MONOSPACE_FONT:-${MONOSPACE_FONT}}"
216+
QT6_MONOSPACE_FONT_SIZE="${QT6_MONOSPACE_FONT_SIZE:-${MONOSPACE_FONT_SIZE:-9}}"
217+
207218
toml_write "${confDir}/qt6ct/qt6ct.conf" "Appearance" "icon_theme" "${ICON_THEME}"
208-
toml_write "${confDir}/qt6ct/qt6ct.conf" "Fonts" "general" "\"${FONT},${FONT_SIZE},-1,5,400,0,0,0,0,0,0,0,0,0,0,1,${FONT_STYLE}\""
209-
toml_write "${confDir}/qt6ct/qt6ct.conf" "Fonts" "fixed" "\"${MONOSPACE_FONT},${MONOSPACE_FONT_SIZE:-9},-1,5,400,0,0,0,0,0,0,0,0,0,0,1\""
219+
toml_write "${confDir}/qt6ct/qt6ct.conf" "Fonts" "general" "\"${QT6_FONT},${QT6_FONT_SIZE},-1,5,400,0,0,0,0,0,0,0,0,0,0,1,${FONT_STYLE}\""
220+
toml_write "${confDir}/qt6ct/qt6ct.conf" "Fonts" "fixed" "\"${QT6_MONOSPACE_FONT},${QT6_MONOSPACE_FONT_SIZE:-9},-1,5,400,0,0,0,0,0,0,0,0,0,0,1\""
210221
# toml_write "${confDir}/qt6ct/qt6ct.conf" "Appearance" "color_scheme_path" "${confDir}/qt6ct/colors/colors.conf"
211222
# toml_write "${confDir}/qt6ct/qt6ct.conf" "Appearance" "custom_palette" "true"
212223

@@ -233,11 +244,14 @@ sed -i -e "/^gtk-theme-name=/c\gtk-theme-name=\"${GTK_THEME}\"" \
233244

234245
#// gtk3
235246

247+
GTK3_FONT="${GTK3_FONT:-${FONT}}"
248+
GTK3_FONT_SIZE="${GTK3_FONT_SIZE:-${FONT_SIZE}}"
249+
236250
toml_write "${confDir}/gtk-3.0/settings.ini" "Settings" "gtk-theme-name" "${GTK_THEME}"
237251
toml_write "${confDir}/gtk-3.0/settings.ini" "Settings" "gtk-icon-theme-name" "${ICON_THEME}"
238252
toml_write "${confDir}/gtk-3.0/settings.ini" "Settings" "gtk-cursor-theme-name" "${CURSOR_THEME}"
239253
toml_write "${confDir}/gtk-3.0/settings.ini" "Settings" "gtk-cursor-theme-size" "${CURSOR_SIZE}"
240-
toml_write "${confDir}/gtk-3.0/settings.ini" "Settings" "gtk-font-name" "${FONT} ${FONT_SIZE}"
254+
toml_write "${confDir}/gtk-3.0/settings.ini" "Settings" "gtk-font-name" "${GTK3_FONT} ${GTK3_FONT_SIZE}"
241255

242256
#// gtk4
243257
if [ -d "${themesDir}/${GTK_THEME}/gtk-4.0" ]; then

‎Configs/.local/share/hyde/schema/config.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,15 @@ Cava visualizer configuration.
9595
| standby | Standby character for cava. | 🎶 |
9696
| width | Width of the cava output. | 20 |
9797

98+
### [gtk3]
99+
100+
GTK3 configuration.
101+
102+
| Key | Description | Default |
103+
| --- | ----------- | ------- |
104+
| font | GTK3 font. | Canterell |
105+
| font_size | GTK3 font size. | 10 |
106+
98107
### [hyprland]
99108

100109
Hyprland configuration.
@@ -166,6 +175,28 @@ Notification script configuration.
166175
| font | Font for notifications. | mononoki Nerd Font |
167176
| font_size | Font size for notifications. | 10 |
168177

178+
### [qt5]
179+
180+
Qt5 configuration.
181+
182+
| Key | Description | Default |
183+
| --- | ----------- | ------- |
184+
| font | Qt5 font. | Canterell |
185+
| font_size | Qt5 font size. | 10 |
186+
| monospace_font | Qt5 monospace font. | CaskaydiaCove Nerd Font Mono |
187+
| monospace_font_size | Qt5 monospace font size. | 9 |
188+
189+
### [qt6]
190+
191+
Qt6 configuration.
192+
193+
| Key | Description | Default |
194+
| --- | ----------- | ------- |
195+
| font | Qt6 font. | Canterell |
196+
| font_size | Qt6 font size. | 10 |
197+
| monospace_font | Qt6 monospace font. | CaskaydiaCove Nerd Font Mono |
198+
| monospace_font_size | Qt6 monospace font size. | 9 |
199+
169200
### [rofi]
170201

171202
Global rofi configuration.

‎Configs/.local/share/hyde/schema/config.toml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,25 @@ monospace_font = "CaskaydiaCove Nerd Font Mono" # Monospace font.
229229
monospace_font_size = 9 # Monospace font size.
230230
background_path = "" # LockScreen's Background path.
231231

232+
# Qt5 configuration.
233+
[qt5]
234+
font = "Canterell" # Qt5 font.
235+
font_size = 10 # Qt5 font size.
236+
monospace_font = "CaskaydiaCove Nerd Font Mono" # Qt5 monospace font.
237+
monospace_font_size = 9 # Qt5 monospace font size.
238+
239+
# Qt6 configuration.
240+
[qt6]
241+
font = "Canterell" # Qt6 font.
242+
font_size = 10 # Qt6 font size.
243+
monospace_font = "CaskaydiaCove Nerd Font Mono" # Qt6 monospace font.
244+
monospace_font_size = 9 # Qt6 monospace font size.
245+
246+
# GTK3 configuration.
247+
[gtk3]
248+
font = "Canterell" # GTK3 font.
249+
font_size = 10 # GTK3 font size.
250+
232251
# Hyprland start configuration.
233252
[hyprland-start]
234253
apptray_bluetooth = "blueman-applet" # Bluetooth applet.

‎Configs/.local/share/hyde/schema/config.toml.json‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -950,6 +950,74 @@
950950
}
951951
}
952952
},
953+
"qt5": {
954+
"description": "Qt5 configuration.",
955+
"type": "object",
956+
"properties": {
957+
"font": {
958+
"default": "Canterell",
959+
"description": "Qt5 font.",
960+
"type": "string"
961+
},
962+
"font_size": {
963+
"default": 10,
964+
"description": "Qt5 font size.",
965+
"type": "integer"
966+
},
967+
"monospace_font": {
968+
"default": "CaskaydiaCove Nerd Font Mono",
969+
"description": "Qt5 monospace font.",
970+
"type": "string"
971+
},
972+
"monospace_font_size": {
973+
"default": 9,
974+
"description": "Qt5 monospace font size.",
975+
"type": "integer"
976+
}
977+
}
978+
},
979+
"qt6": {
980+
"description": "Qt6 configuration.",
981+
"type": "object",
982+
"properties": {
983+
"font": {
984+
"default": "Canterell",
985+
"description": "Qt6 font.",
986+
"type": "string"
987+
},
988+
"font_size": {
989+
"default": 10,
990+
"description": "Qt6 font size.",
991+
"type": "integer"
992+
},
993+
"monospace_font": {
994+
"default": "CaskaydiaCove Nerd Font Mono",
995+
"description": "Qt6 monospace font.",
996+
"type": "string"
997+
},
998+
"monospace_font_size": {
999+
"default": 9,
1000+
"description": "Qt6 monospace font size.",
1001+
"type": "integer"
1002+
}
1003+
}
1004+
},
1005+
"gtk3": {
1006+
"description": "GTK3 configuration.",
1007+
"type": "object",
1008+
"properties": {
1009+
"font": {
1010+
"default": "Canterell",
1011+
"description": "GTK3 font.",
1012+
"type": "string"
1013+
},
1014+
"font_size": {
1015+
"default": 10,
1016+
"description": "GTK3 font size.",
1017+
"type": "integer"
1018+
}
1019+
}
1020+
},
9531021
"hyprland-start": {
9541022
"description": "Hyprland start configuration.",
9551023
"type": "object",

‎Configs/.local/share/hyde/schema/schema.toml‎

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@
1313
# ? This file is a reference for:
1414
# * wiki table
1515
# * --json to generate the JSON schema
16-
# TODO --config to generate a copy of config.toml // ! Not implemented yet
16+
# * --config to generate a copy of config.toml
17+
18+
# Run commands to generate:
19+
# ./gen-config.py > ./config.toml
20+
# ./gen-table.py > config.md
21+
# ./gen-json.py > ./config.toml.json
22+
1723

1824
"$schema" = "http://json-schema.org/draft-07/schema#"
1925
type = "object"
@@ -835,6 +841,68 @@ type = "object"
835841
description = "LockScreen's Background path."
836842
type = "string"
837843

844+
[properties.qt5]
845+
description = "Qt5 configuration."
846+
type = "object"
847+
848+
[properties.qt5.properties.font]
849+
default = "Canterell"
850+
description = "Qt5 font."
851+
type = "string"
852+
853+
[properties.qt5.properties.font_size]
854+
default = 10
855+
description = "Qt5 font size."
856+
type = "integer"
857+
858+
[properties.qt5.properties.monospace_font]
859+
default = "CaskaydiaCove Nerd Font Mono"
860+
description = "Qt5 monospace font."
861+
type = "string"
862+
863+
[properties.qt5.properties.monospace_font_size]
864+
default = 9
865+
description = "Qt5 monospace font size."
866+
type = "integer"
867+
868+
[properties.qt6]
869+
description = "Qt6 configuration."
870+
type = "object"
871+
872+
[properties.qt6.properties.font]
873+
default = "Canterell"
874+
description = "Qt6 font."
875+
type = "string"
876+
877+
[properties.qt6.properties.font_size]
878+
default = 10
879+
description = "Qt6 font size."
880+
type = "integer"
881+
882+
[properties.qt6.properties.monospace_font]
883+
default = "CaskaydiaCove Nerd Font Mono"
884+
description = "Qt6 monospace font."
885+
type = "string"
886+
887+
[properties.qt6.properties.monospace_font_size]
888+
default = 9
889+
description = "Qt6 monospace font size."
890+
type = "integer"
891+
892+
[properties.gtk3]
893+
description = "GTK3 configuration."
894+
type = "object"
895+
896+
[properties.gtk3.properties.font]
897+
default = "Canterell"
898+
description = "GTK3 font."
899+
type = "string"
900+
901+
[properties.gtk3.properties.font_size]
902+
default = 10
903+
description = "GTK3 font size."
904+
type = "integer"
905+
838906
[properties.hyprland-start]
839907
description = "Hyprland start configuration."
840908
type = "object"

0 commit comments

Comments
 (0)