Skip to content

Commit

Permalink
Settings: Family, Cloud, Web
Browse files Browse the repository at this point in the history
  • Loading branch information
tkashkin committed Aug 10, 2022
1 parent aa65b66 commit 1a8875c
Show file tree
Hide file tree
Showing 31 changed files with 335 additions and 70 deletions.
2 changes: 2 additions & 0 deletions Adwaita/adw/colors.styles
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,7 @@ colors.styles
scrollbar="255 255 255 51"
scrollbar_hover="255 255 255 102"
scrollbar_active="255 255 255 153"

focusring="120 174 237 128"
}
}
45 changes: 0 additions & 45 deletions Adwaita/adw/settingsdialog.styles
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
settingsdialog.styles
{
colors
{
ListPanelItem.Tall=36
}

styles
{
CDialogSettings
Expand Down Expand Up @@ -42,46 +37,6 @@ settingsdialog.styles
render_bg {}
}

SettingsList
{
inset="12 -18 12 0"
bgcolor=none
selectedbgcolor="button_bg"
textcolor="button_fg"
padding-left=2
font-family=basefont
font-size=16
font-style=none
render_bg {}
render
{
0="fill(x1-1, y0, x1, y1, border)"
}
}

ListPanelColumnHeader
{
inset="0 0 0 0"
minimum-height=1
bgcolor=none
render_bg {}
}

ListPanelSectionHeader
{
inset="0 0 0 0"
minimum-height=1
bgcolor=none
render_bg {}
}

ListPanelInterior
{
inset="0 0 0 0"
bgcolor=none
render_bg {}
}

"CDialogSettings Page Button"
{
bgcolor="button_bg"
Expand Down
Binary file added Adwaita/assets/focusring/12/bl.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/12/bl@2x.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/12/br.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/12/br@2x.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/12/tl.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/12/tl@2x.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/12/tr.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/12/tr@2x.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/6/bl.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/6/bl@2x.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/6/br.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/6/br@2x.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/6/tl.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/6/tl@2x.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/6/tr.tga
Binary file not shown.
Binary file added Adwaita/assets/focusring/6/tr@2x.tga
Binary file not shown.
Binary file added Adwaita/assets/icons/edit.tga
Binary file not shown.
Binary file added Adwaita/assets/icons/edit@2x.tga
Binary file not shown.
1 change: 1 addition & 0 deletions Adwaita/public/UseOfflineMode.res
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ UseOfflineModeChosen.res

Button
{
inset-left=10
render
{
0="fill(x0, y0-1, x1, y0, border)"
Expand Down
1 change: 1 addition & 0 deletions Adwaita/public/UseOfflineModeChosen.res
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ UseOfflineModeChosen.res

Button
{
inset-left=10
render
{
0="fill(x0, y0-1, x1+1, y0, border)"
Expand Down
42 changes: 42 additions & 0 deletions Adwaita/resource/layout/settingsdialog.layout
Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
settingsdialog.layout
{
styles
{
SettingsList
{
inset="12 -18 12 0"
bgcolor=none
selectedbgcolor="button_bg"
textcolor="button_fg"
padding-left=2
font-family=basefont
font-size=16
font-style=none
render_bg {}
render
{
0="fill(x1-1, y0, x1, y1, border)"
}
}
ListPanelColumnHeader
{
inset="0 0 0 0"
minimum-height=1
bgcolor=none
render_bg {}
render {}
}
ListPanelSectionHeader
{
inset="0 0 0 0"
minimum-height=1
bgcolor=none
render_bg {}
render {}
}
ListPanelInterior
{
inset="0 0 0 0"
bgcolor=none
render_bg {}
}
}

layout
{
place { control="frame_title" x=0 y=0 width=max height=48 }
Expand Down
98 changes: 98 additions & 0 deletions Adwaita/resource/layout/subpaneloptionsbrowser.layout
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
subpaneloptionsbrowser.layout
{
styles
{
Label
{
font-size=12
textcolor="button_disabled_fg"
}

TextEntry
{
inset-left=9
inset-right=9
inset-top=6
inset-bottom=-6
render
{
0="fill(x0, y1-1, x1, y1, headerbar_shade)"
1="image(x1-28, y0+17, x1-12, y1-17, assets/icons/edit)"
}
render_bg
{
0="fill(x0, y0+12, x1, y1, button_bg)"
1="fill(x0+12, y0, x1-12, y0+12, button_bg)"
2="image(x0, y0, x0+12, y0+12, assets/corners/12_w10/tl)"
3="image(x1-12, y0, x1, y0+12, assets/corners/12_w10/tr)"
}
}
TextEntry:hover
{
render_bg
{
0="fill(x0, y0+12, x1, y1, button_hover_bg)"
1="fill(x0+12, y0, x1-12, y0+12, button_hover_bg)"
2="image(x0, y0, x0+12, y0+12, assets/corners/12_w15/tl)"
3="image(x1-12, y0, x1, y0+12, assets/corners/12_w15/tr)"
}
}
TextEntry:focus
{
render
{
0="image(x0, y0, x0+13, y0+13, assets/focusring/12/tl)"
1="image(x1-13, y0, x1, y0+13, assets/focusring/12/tr)"
2="fill(x0+13, y0, x1-13, y0+2, focusring)"
3="fill(x0, y0+13, x0+2, y1-2, focusring)"
4="fill(x1-2, y0+13, x1, y1-2, focusring)"
5="fill(x0, y1-2, x1, y1, focusring)"
}
}

Button
{
bgcolor=none
render_bg
{
0="fill(x0, y0, x1, y1-12, button_bg)"
1="fill(x0+12, y1-12, x1-12, y1, button_bg)"
2="image(x0, y1-12, x0+12, y1, assets/corners/12_w10/bl)"
3="image(x1-12, y1-12, x1, y1, assets/corners/12_w10/br)"
}
}
Button:hover
{
bgcolor=none
render_bg
{
0="fill(x0, y0, x1, y1-12, button_hover_bg)"
1="fill(x0+12, y1-12, x1-12, y1, button_hover_bg)"
2="image(x0, y1-12, x0+12, y1, assets/corners/12_w15/bl)"
3="image(x1-12, y1-12, x1, y1, assets/corners/12_w15/br)"
}
}
Button:active
{
bgcolor=none
render_bg
{
0="fill(x0, y0, x1, y1-12, button_active_bg)"
1="fill(x0+12, y1-12, x1-12, y1, button_active_bg)"
2="image(x0, y1-12, x0+12, y1, assets/corners/12_w30/bl)"
3="image(x1-12, y1-12, x1, y1, assets/corners/12_w30/br)"
}
}
}

layout
{
region { name="content" margin-top=16 margin-left=16 width=500 height=max }

place { control="OverlayHomePage,ClientBrowserAuthHomePage,ClearAllBrowserDataButton" region="content" dir=down width=max height=50 }
place { control="OverlayHomePageLabel" region="content" start="OverlayHomePage" dir=down margin-left=12 margin-top=-43 margin-right=12 width=max }

region { name="hidden" width=0 height=0 margin-left=-999 }
place { control="DescriptionLabel,Divider1" region="hidden" width=0 height=0 }
}
}
29 changes: 29 additions & 0 deletions Adwaita/resource/layout/subpaneloptionscloud.layout
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
subpaneloptionscloud.layout
{
styles
{
CSubPanelOptionsCloud
{
render
{
0="image(x0+196, y0+16, x0+208, y0+28, assets/corners/12_mask_window_bg/tl)"
1="image(x1-32, y0+16, x1-20, y0+28, assets/corners/12_mask_window_bg/tr)"
2="image(x0+196, y0+104, x0+208, y0+116, assets/corners/12_mask_window_bg/bl)"
3="image(x1-32, y0+104, x1-20, y0+116, assets/corners/12_mask_window_bg/br)"
4="fill(x0+196, y0+115, x1-20, y0+116, window_bg)"
}
}

CheckButton
{
inset-top=84
}
}

layout
{
region { name="content" margin-top=16 margin-left=16 width=500 height=max }
place { control="EnableCloudCheck,EnableScreenshotsCheck" region="content" dir=down width=max height=50 }
place { control="SteamCloudInfo" region="content" start="EnableScreenshotsCheck" dir=down margin-top=16 width=max }
}
}
21 changes: 4 additions & 17 deletions Adwaita/resource/layout/subpaneloptionsdownloads.layout
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ subpaneloptionsdownloads.layout

ComboBoxButton
{
inset-left=-6
inset-left=-4
render_bg {}
}

Expand Down Expand Up @@ -77,19 +77,6 @@ subpaneloptionsdownloads.layout
6="image(x1-6, y1-6, x1, y1, assets/corners/6_w30/br)"
}
}
ComboBox:focus
{
render
{
0="fill(x0+6, y0, x1-6, y1, button_active_bg)"
1="fill(x0, y0+6, x0+6, y1-6, button_active_bg)"
2="fill(x1-6, y0+6, x1, y1-6, button_active_bg)"
3="image(x0, y0, x0+6, y0+6, assets/corners/6_w30/tl)"
4="image(x1-6, y0, x1, y0+6, assets/corners/6_w30/tr)"
5="image(x0, y1-6, x0+6, y1, assets/corners/6_w30/bl)"
6="image(x1-6, y1-6, x1, y1, assets/corners/6_w30/br)"
}
}
ComboBox:disabled
{
render
Expand Down Expand Up @@ -229,15 +216,15 @@ subpaneloptionsdownloads.layout
place { control="ManageInstalledApps" region="content" start="LibrariesLabel" dir=down width=max height=50 }

place { control="RegionLabel" region="content" start="ManageInstalledApps" dir=down width=max height=34 }
place { control="DownloadRegionCombo" region="content" start="RegionLabel" dir=down margin-top=8 margin-left=278 width=200 height=34 }
place { control="DownloadRegionCombo" region="content" start="RegionLabel" dir=down margin-top=8 margin-left=276 width=200 height=34 }
place { control="RegionInfoLabel" region="content" start="RegionLabel" dir=down margin-top=8 margin-left=12 width=254 height=34 }

place { control="RestrictionsLabel" region="content" start="RegionLabel" margin-top=50 dir=down width=max height=34 }
place { control="AutoUpdateTimeRestrictCheckbox,ThrottleCheckbox" region="content" start="RestrictionsLabel" dir=down width=272 height=50 }

place { control="AutoUpdateTimeRestrictStart,AutoUpdateTimeRestrictEnd" region="content" start="AutoUpdateTimeRestrictCheckbox" align=right margin-top=7 margin-right=6 width=97 height=34 spacing=6 }
place { control="AutoUpdateTimeRestrictStart,AutoUpdateTimeRestrictEnd" region="content" start="AutoUpdateTimeRestrictCheckbox" align=right margin-top=7 margin-right=8 width=97 height=34 spacing=6 }

place { control="ThrottleRateEdit,ThrottleRateApply" region="content" start="ThrottleCheckbox" align=right margin-top=7 margin-right=6 width=97 height=34 spacing=6 }
place { control="ThrottleRateEdit,ThrottleRateApply" region="content" start="ThrottleCheckbox" align=right margin-top=7 margin-right=8 width=97 height=34 spacing=6 }
place { control="ThrottleRateEditSuffix" region="content" align=right start="ThrottleRateApply" end-right="ThrottleRateApply" margin-right=10 height=34 }

place { control="AllowDownloadsDuringGameplayCheckbox,ThrottleDownloadsWhileStreamingCheckbox,DownloadRatesInBitsCheckbox" region="content" start="ThrottleCheckbox" dir=down width=max height=50 }
Expand Down
85 changes: 85 additions & 0 deletions Adwaita/resource/layout/subpaneloptionsfamily.layout
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
subpaneloptionsfamily.layout
{
styles
{
Label
{
padding-top=8
padding-bottom=8
render
{
0="fill(x0, y0-1, x1, y0, window_bg)"
1="image(x0, y0-12, x0+12, y0, assets/corners/12_mask_window_bg/bl)"
2="image(x1-12, y0-12, x1, y0, assets/corners/12_mask_window_bg/br)"
}
}

Highlight
{
padding-top=0
padding-bottom=0
render
{
0="fill(x0, y0-1, x1, y0, window_bg)"
1="image(x0, y0-12, x0+12, y0, assets/corners/12_mask_window_bg/bl)"
2="image(x1-12, y0-12, x1, y0, assets/corners/12_mask_window_bg/br)"
3="image(x0, y1, x0+12, y1+12, assets/corners/12_mask_window_bg/tl)"
4="image(x1-12, y1, x1, y1+12, assets/corners/12_mask_window_bg/tr)"
}
}

"TooltipWindow Label"
{
padding-top=0
padding-bottom=0
render {}
}

URLLabel
{
bgcolor="button_bg"
font-size=14
font-weight=400
inset-left=12
padding-top=0
padding-bottom=0
render_bg
{
0="fill(x0, y1-1, x1, y1, headerbar_shade)"
}
render
{
0="image(x1-28, y0+17, x1-12, y1-17, assets/icons/external_link)"
}
}
URLLabel:hover
{
bgcolor="button_hover_bg"
font-style=regular
}
URLLabel:active
{
bgcolor="button_active_bg"
}
}

layout
{
region { name="content" margin-top=8 margin-left=16 width=500 height=max }

place { control="FamilyOptionsTitle" region="content" dir=down width=max height=34 }
place { control="ManageOptionsLabel" region="content" start="FamilyOptionsTitle" dir=down width=max height=50 }

place { control="FamilySharingTitle" region="content" start="ManageOptionsLabel" dir=down width=max height=34 }
place { control="AuthorizedDeviceCheck,ManageSharingLabel" region="content" start="FamilySharingTitle" dir=down width=max height=50 }

place { control="Divider1" region="content" start="ManageSharingLabel" dir=down width=max height=16 }

place { control="ShowNotificationsCheck" region="content" start="Divider1" dir=down width=max height=50 }
place { control="BorrowersLabel" region="content" start="ShowNotificationsCheck" dir=down width=max }
place { control="BorrowersList" region="content" start="BorrowersLabel" dir=down margin-bottom=16 width=max height=max }

region { name="hidden" width=0 height=0 margin-left=-999 }
place { control="FamilyOptionsText,FamilySharingInfoText" region="hidden" width=0 height=0 }
}
}
Loading

0 comments on commit 1a8875c

Please sign in to comment.