Merge branch 'tabs'

This commit is contained in:
Iris Lightshard 2022-01-29 23:11:22 -07:00
commit ef9977abad
10 changed files with 263 additions and 18 deletions

View file

@ -27,6 +27,10 @@ Feel free to change and share the code.
## changelog
0.71 fix left/right anchored tabs
0.70 modernize tabs
0.65 add `darker` Qt5 colorscheme for Kate and installer script, tweak GTK2 theme and Qt5 colorscheme
0.632 fix selected text color

View file

@ -97,7 +97,129 @@ style "default" {
GtkProgressBar::min-horizontal-bar-height = 6
GtkProgressBar::min-vertical-bar-width = 6
engine "pixmap" {
image {
function = EXTENSION
state = NORMAL
file = "../img/tab-active.png"
border = { 0,0,0,2 }
stretch = TRUE
gap_side = BOTTOM
}
image {
function = EXTENSION
file = "../img/tab-inactive.png"
border = { 0,0,0,2 }
stretch = TRUE
gap_side = BOTTOM
}
image {
function = EXTENSION
state = NORMAL
file = "../img/tab-active-180.png"
border = { 0,0,2,0 }
stretch = TRUE
gap_side = TOP
}
image {
function = EXTENSION
file = "../img/tab-inactive.png"
border = { 0,0,2,0 }
stretch = TRUE
gap_side = TOP
}
image {
function = EXTENSION
state = NORMAL
file = "../img/tab-active-90.png"
border = { 2,0,0,0 }
stretch = TRUE
gap_side = LEFT
}
image {
function = EXTENSION
file = "../img/tab-inactive-90.png"
border = { 2,0,0,0 }
stretch = TRUE
gap_side = LEFT
}
image {
function = EXTENSION
state = NORMAL
file = "../img/tab-active-270.png"
border = { 0,2,0,0 }
stretch = TRUE
gap_side = RIGHT
}
image {
function = EXTENSION
file = "../img/tab-inactive-90.png"
border = { 0,2,0,0 }
stretch = TRUE
gap_side = RIGHT
}
image {
function = BOX_GAP
detail = "notebook"
file = "../img/base.png"
border = {0,0,0,0}
stretch = TRUE
gap_file = "../img/base.png"
gap_border = {0,0,0,0}
gap_side = LEFT
}
image {
function = BOX_GAP
detail = "notebook"
file = "../img/base.png"
border = {0,0,0,0}
stretch = TRUE
gap_file = "../img/base.png"
gap_border = {0,0,0,0}
gap_side = RIGHT
}
image {
function = BOX_GAP
detail = "notebook"
file = "../img/base.png"
border = {0,0,0,0}
stretch = TRUE
gap_file = "../img/base.png"
gap_border = {0,0,0,0}
gap_side = TOP
}
image {
function = BOX_GAP
detail = "notebook"
file = "../img/base.png"
border = {0,0,0,0}
stretch = TRUE
gap_file = "../img/base.png"
gap_border = {0,0,0,0}
gap_side = BOTTOM
}
# Standalone frame
image {
function = BOX
detail = "notebook"
file = "../img/base.png"
border = {0,0,0,0}
stretch = TRUE
}
}
}
style "button" {
@ -322,6 +444,129 @@ style "notebook" {
fg[ACTIVE] = @black_color
fg[PRELIGHT] = @black_color
bg[ACTIVE] = @darker_color # pour variantes de couleur
engine "pixmap" {
image {
function = EXTENSION
state = NORMAL
file = "../img/tab-active.png"
border = { 0,0,0,2 }
stretch = TRUE
gap_side = BOTTOM
}
image {
function = EXTENSION
file = "../img/tab-inactive.png"
border = { 0,0,0,2 }
stretch = TRUE
gap_side = BOTTOM
}
image {
function = EXTENSION
state = NORMAL
file = "../img/tab-active-180.png"
border = { 0,0,2,0 }
stretch = TRUE
gap_side = TOP
}
image {
function = EXTENSION
file = "../img/tab-inactive.png"
border = { 0,0,2,0 }
stretch = TRUE
gap_side = TOP
}
image {
function = EXTENSION
state = NORMAL
file = "../img/tab-active-90.png"
border = { 2,0,0,0 }
stretch = TRUE
gap_side = LEFT
}
image {
function = EXTENSION
file = "../img/tab-inactive-90.png"
border = { 2,0,0,0 }
stretch = TRUE
gap_side = LEFT
}
image {
function = EXTENSION
state = NORMAL
file = "../img/tab-active-270.png"
border = { 0,2,0,0 }
stretch = TRUE
gap_side = RIGHT
}
image {
function = EXTENSION
file = "../img/tab-inactive-90.png"
border = { 0,2,0,0 }
stretch = TRUE
gap_side = RIGHT
}
image {
function = BOX_GAP
detail = "notebook"
file = "../img/base.png"
border = {0,0,0,0}
stretch = TRUE
gap_file = "../img/base.png"
gap_border = {0,0,0,0}
gap_side = LEFT
}
image {
function = BOX_GAP
detail = "notebook"
file = "../img/base.png"
border = {0,0,0,0}
stretch = TRUE
gap_file = "../img/base.png"
gap_border = {0,0,0,0}
gap_side = RIGHT
}
image {
function = BOX_GAP
detail = "notebook"
file = "../img/base.png"
border = {0,0,0,0}
stretch = TRUE
gap_file = "../img/base.png"
gap_border = {0,0,0,0}
gap_side = TOP
}
image {
function = BOX_GAP
detail = "notebook"
file = "../img/base.png"
border = {0,0,0,0}
stretch = TRUE
gap_file = "../img/base.png"
gap_border = {0,0,0,0}
gap_side = BOTTOM
}
# Standalone frame
image {
function = BOX
detail = "notebook"
file = "../img/base.png"
border = {0,0,0,0}
stretch = TRUE
}
}
}

View file

@ -500,27 +500,23 @@ notebook {
background-color: @base_color;
color: @black_color;
padding: 0px;
border-left: 1px solid @outset_lighter_color;
border-top: 1px solid @outset_lighter_color;
border-right: 1.3px solid @trueblack;
border-bottom: 1.3px solid @trueblack;
border: none;
}
notebook frame {
background-color: @base_color;
border-left: 1px solid @outset_lighter_color;
border-top: 1px solid @outset_lighter_color;
border-right: 1.3px solid @trueblack;
border-bottom: 1.3px solid @trueblack;
border-left: none;
border-top: none;
border-right: none;
border-bottom: none;
}
notebook tab {
background-color: @darker_color;
border: 1px solid @outset_darker_color;
border-right: 1px solid @trueblack;
border-bottom: 1px solid @outset_lighter_color;
border-left: none;
border-top: 1px solid @darker_color;
background-color: @base_color;
border-right: 0px solid @base_color;
border-bottom: 2px solid @base_color;
border-left: 0px solid @base_color;
border-top: 0px solid @base_color;
padding: 3px;
margin: 0px;
}
@ -528,10 +524,10 @@ notebook tab {
notebook tab:checked,
notebook tab:active {
background-color: @base_color;
border-left: 1px solid @outset_lighter_color;
border-top: 1px solid @base_color;
border-bottom: 1px solid @base_color;
border-right: 1px solid @trueblack;
border-right: 0px solid @base_color;
border-bottom: 2px solid @scale_color;
border-left: 0px solid @base_color;
border-top: 0px solid @base_color;
}
frame

BIN
img/base.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 B

BIN
img/tab-active-180.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
img/tab-active-270.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
img/tab-active-90.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
img/tab-active.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 560 B

BIN
img/tab-inactive-90.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
img/tab-inactive.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 553 B