[gnome-themes-standard/wip/jimmac/updated-gtk2: 34/106] Updated frames and lines.
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard/wip/jimmac/updated-gtk2: 34/106] Updated frames and lines.
- Date: Thu, 3 Mar 2016 22:20:09 +0000 (UTC)
commit 8a6baef0a0d56c8881460a6d7722358de62229d6
Author: Juraj Fiala <doctorjellyface riseup net>
Date: Fri Jan 8 11:02:52 2016 +0100
Updated frames and lines.
themes/Adwaita/gtk-2.0/assets.svg | 68 ++++++++++++-
themes/Adwaita/gtk-2.0/assets.txt | 6 +
themes/Adwaita/gtk-2.0/assets/border.png | Bin 0 -> 142 bytes
themes/Adwaita/gtk-2.0/assets/frame-inline.png | Bin 0 -> 161 bytes
themes/Adwaita/gtk-2.0/assets/frame-notebook.png | Bin 0 -> 162 bytes
themes/Adwaita/gtk-2.0/assets/frame.png | Bin 0 -> 163 bytes
themes/Adwaita/gtk-2.0/assets/menu-border.png | Bin 0 -> 163 bytes
.../Adwaita/gtk-2.0/assets/separator-treeview.png | Bin 0 -> 142 bytes
themes/Adwaita/gtk-2.0/main.rc | 103 +++++++++++--------
9 files changed, 130 insertions(+), 47 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/assets.svg b/themes/Adwaita/gtk-2.0/assets.svg
index 7e9507c..836a0a4 100644
--- a/themes/Adwaita/gtk-2.0/assets.svg
+++ b/themes/Adwaita/gtk-2.0/assets.svg
@@ -1586,9 +1586,9 @@
borderopacity="1"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:zoom="3.8095378"
- inkscape:cx="605.93539"
- inkscape:cy="337.96594"
+ inkscape:zoom="45.254834"
+ inkscape:cx="213.75757"
+ inkscape:cy="463.96555"
inkscape:current-layer="layer1"
inkscape:document-units="px"
showgrid="false"
@@ -1614,7 +1614,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -5229,5 +5229,65 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccscsccsscscc" />
</g>
+ <rect
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#9d9d99;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="frame"
+ width="2"
+ height="2"
+ x="211.5"
+ y="12.518561"
+ inkscape:label="#rect4938" />
+ <rect
+ inkscape:label="#rect4938"
+ y="17"
+ x="211"
+ height="1"
+ width="1"
+ id="border"
+
style="opacity:1;fill:#9d9d99;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <rect
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png"
+ inkscape:label="#rect4723"
+ y="7.5"
+ x="476.5"
+ height="2"
+ width="2"
+ id="menu-border"
+
style="fill:none;fill-opacity:0.1;stroke:#9d9d99;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <rect
+ inkscape:label="#rect4938"
+ y="12.518561"
+ x="219.5"
+ height="2"
+ width="2"
+ id="frame-notebook"
+
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#9d9d99;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <g
+ id="separator-treeview"
+ inkscape:label="#g4959">
+ <rect
+ y="8"
+ x="480"
+ height="2"
+ width="2"
+ id="rect4951"
+
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.1"
/>
+ <path
+ inkscape:label="#rect4948"
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="rect4948"
+ d="m 481.5,8 0,1.5 -1.5,0"
+
style="fill:none;fill-opacity:0.1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.1"
/>
+ </g>
+ <path
+
style="opacity:1;fill:none;fill-opacity:1;stroke:#9d9d99;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 217.5,13 0,1.518561 -2,0 L 215.5,13"
+ id="frame-inline"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:label="#rect4963" />
</g>
</svg>
diff --git a/themes/Adwaita/gtk-2.0/assets.txt b/themes/Adwaita/gtk-2.0/assets.txt
index 68dabf5..18ef3f2 100644
--- a/themes/Adwaita/gtk-2.0/assets.txt
+++ b/themes/Adwaita/gtk-2.0/assets.txt
@@ -57,7 +57,13 @@ entry-active
entry-insensitive
entry-background
entry-background-insensitive
+border
+frame
+frame-inline
+frame-notebook
line
+separator-treeview
+menu-border
menubar-item-active
progressbar-horz
progressbar-horz-trough
diff --git a/themes/Adwaita/gtk-2.0/assets/border.png b/themes/Adwaita/gtk-2.0/assets/border.png
new file mode 100644
index 0000000..3ded604
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/assets/border.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/frame-inline.png b/themes/Adwaita/gtk-2.0/assets/frame-inline.png
new file mode 100644
index 0000000..a14ff44
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/assets/frame-inline.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/frame-notebook.png
b/themes/Adwaita/gtk-2.0/assets/frame-notebook.png
new file mode 100644
index 0000000..fc2a745
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/assets/frame-notebook.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/frame.png b/themes/Adwaita/gtk-2.0/assets/frame.png
new file mode 100644
index 0000000..88ba70a
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/assets/frame.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/menu-border.png b/themes/Adwaita/gtk-2.0/assets/menu-border.png
new file mode 100644
index 0000000..88ba70a
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/assets/menu-border.png differ
diff --git a/themes/Adwaita/gtk-2.0/assets/separator-treeview.png
b/themes/Adwaita/gtk-2.0/assets/separator-treeview.png
new file mode 100644
index 0000000..9ea2cec
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/assets/separator-treeview.png differ
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index 8b23752..9453f37 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -1696,8 +1696,8 @@ style "notebook" {
image {
function = BOX_GAP
- file = "Tabs/notebook.png"
- border = {4, 4, 4, 4}
+ file = "assets/frame-notebook.png"
+ border = {1, 1, 1, 1}
stretch = TRUE
gap_file = "Tabs/notebook-gap-horiz.png"
gap_border = {1, 1, 0, 0}
@@ -1706,8 +1706,8 @@ style "notebook" {
image {
function = BOX_GAP
- file = "Tabs/notebook.png"
- border = {4, 4, 4, 4}
+ file = "assets/frame-notebook.png"
+ border = {1, 1, 1, 1}
stretch = TRUE
gap_file = "Tabs/notebook-gap-horiz.png"
gap_border = {1, 1, 0, 0}
@@ -1785,8 +1785,10 @@ style "button_separator" {
}
style "combobox" {
+
xthickness = 0
ythickness = 0
+
}
style "combobox_button" {
@@ -2008,7 +2010,7 @@ style "separator_menu_item" {
engine "pixmap" {
image {
function = BOX
- file = "Lines/menu_line_h.png"
+ file = "assets/line.png"
border = {0, 0, 0, 0}
stretch = TRUE
}
@@ -2033,8 +2035,8 @@ style "treeview_header" {
engine "pixmap" {
image {
function = BOX
- file = "Others/tree_header.png"
- border = {1, 1, 1, 1}
+ file = "assets/separator-treeview.png"
+ border = {0, 1, 0, 1}
stretch = TRUE
}
}
@@ -2059,8 +2061,8 @@ style "scrolled_window" {
engine "pixmap" {
image {
function = SHADOW
- file = "Shadows/frame.png"
- border = {5, 5, 5, 5}
+ file = "assets/frame.png"
+ border = {1, 1, 1, 1}
stretch = TRUE
}
}
@@ -2076,82 +2078,74 @@ style "frame" {
image {
function = SHADOW
- file = "Shadows/frame.png"
+ shadow = IN
+ file = "assets/frame.png"
border = {1, 1, 1, 1}
stretch = TRUE
- shadow = IN
}
image {
function = SHADOW_GAP
- file = "Shadows/frame.png"
+ shadow = IN
+ file = "assets/frame.png"
border = {1, 1, 1, 1}
stretch = TRUE
- gap_start_file = "Shadows/frame-gap-start.png"
- gap_start_border = {1, 0, 0, 0}
- gap_end_file = "Shadows/frame-gap-end.png"
- gap_end_border = {0, 1, 0, 0}
- shadow = IN
+ gap_start_file = "assets/border.png"
+ gap_end_file = "assets/border.png"
}
image {
function = SHADOW
- file = "Shadows/frame.png"
+ shadow = OUT
+ file = "assets/frame.png"
border = {1, 1, 1, 1}
stretch = TRUE
- shadow = OUT
}
image {
function = SHADOW_GAP
- file = "Shadows/frame.png"
+ shadow = OUT
+ file = "assets/frame.png"
border = {1, 1, 1, 1}
stretch = TRUE
- gap_start_file = "Shadows/frame-gap-start.png"
- gap_start_border = {1, 0, 0, 0}
- gap_end_file = "Shadows/frame-gap-end.png"
- gap_end_border = {0, 1, 0, 0}
- shadow = OUT
+ gap_start_file = "assets/border.png"
+ gap_end_file = "assets/border.png"
}
image {
function = SHADOW
- file = "Shadows/frame.png"
+ shadow = ETCHED_IN
+ file = "assets/frame.png"
border = {1, 1, 1, 1}
stretch = TRUE
- shadow = ETCHED_IN
}
image {
function = SHADOW_GAP
- file = "Shadows/frame.png"
+ shadow = ETCHED_IN
+ file = "assets/frame.png"
border = {1, 1, 1, 1}
stretch = TRUE
- gap_start_file = "Shadows/frame-gap-start.png"
- gap_start_border = {1, 0, 0, 0}
- gap_end_file = "Shadows/frame-gap-end.png"
- gap_end_border = {0, 1, 0, 0}
- shadow = ETCHED_IN
+ gap_start_file = "assets/border.png"
+ gap_end_file = "assets/border.png"
}
image {
function = SHADOW
- file = "Shadows/frame.png"
+ shadow = ETCHED_OUT
+ file = "assets/frame.png"
border = {1, 1, 1, 1}
stretch = TRUE
- shadow = ETCHED_OUT
}
image {
function = SHADOW_GAP
- file = "Shadows/frame.png"
+ shadow = ETCHED_OUT
+ file = "assets/frame.png"
border = {1, 1, 1, 1}
stretch = TRUE
- gap_start_file = "Shadows/frame-gap-start.png"
- gap_start_border = {1, 0, 0, 0}
- gap_end_file = "Shadows/frame-gap-end.png"
- gap_end_border = {0, 1, 0, 0}
- shadow = ETCHED_OUT
+ gap_start_file = "assets/border.png"
+ gap_end_file = "assets/border.png"
}
}
@@ -2174,8 +2168,9 @@ style "inline_toolbar" {
engine "pixmap" {
image {
- function = BOX
- file = "Toolbar/inline-toolbar.png"
+ function = SHADOW
+ file = "assets/frame-inline.png"
+ border = {1, 1, 0, 1}
stretch = TRUE
}
}
@@ -2190,6 +2185,24 @@ style "notebook_prelight" {
bg[PRELIGHT] = @base_color
}
+style "separator" {
+
+ engine "pixmap" {
+ image {
+ function = HLINE
+ file = "assets/line.png"
+ stretch = TRUE
+ }
+
+ image {
+ function = VLINE
+ file = "assets/line.png"
+ stretch = TRUE
+ }
+ }
+
+}
+
style "tooltips" {
xthickness = 8
@@ -2268,5 +2281,9 @@ widget_class "*<GtkComboBox>*<GtkCellView>" style "combobox_cellview"
# Correct arrows on ComboBoxes
widget_class "*<GtkComboBox>*<GtkArrow>" style "combobox_arrows"
+# Separators
+widget_class "*<GtkHSeparator>" style "separator"
+widget_class "*<GtkVSeparator>" style "separator"
+
# GTK tooltips
widget "gtk-tooltip*" style "tooltips"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
