From 6a0b4786415ac7ce6922d1fa16c4001f2885fb0b Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Sun, 7 Apr 2013 15:12:50 +0530
Subject: [PATCH 1/4] Various improvements to the Openbox theme
---
openbox-3/bullet.xbm | 4 ----
openbox-3/desk.xbm | 8 ++++----
openbox-3/desk_toggled.xbm | 8 ++++----
openbox-3/max_toggled.xbm | 2 +-
openbox-3/shade.xbm | 2 +-
openbox-3/shade_toggled.xbm | 2 +-
openbox-3/themerc | 26 ++++++++++++++------------
7 files changed, 25 insertions(+), 27 deletions(-)
delete mode 100644 openbox-3/bullet.xbm
diff --git a/openbox-3/bullet.xbm b/openbox-3/bullet.xbm
deleted file mode 100644
index 4e8300f..0000000
--- a/openbox-3/bullet.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bullet_width 4
-#define bullet_height 8
-static unsigned char bullet_bits[] = {
- 0x00, 0x00, 0x01, 0x03, 0x07, 0x03, 0x01, 0x00 };
diff --git a/openbox-3/desk.xbm b/openbox-3/desk.xbm
index 015976b..abca780 100644
--- a/openbox-3/desk.xbm
+++ b/openbox-3/desk.xbm
@@ -1,4 +1,4 @@
-#define desk_width 8
-#define desk_height 8
-static unsigned char desk_bits[] = {
- 0x04, 0x0e, 0x3f, 0x1e, 0x1c, 0x24, 0x40, 0x00 };
+#define desk_toggled_width 8
+#define desk_toggled_height 8
+static unsigned char desk_toggled_bits[] = {
+ 0xe7, 0xe7, 0xe7, 0x00, 0x00, 0xe7, 0xe7, 0xe7 };
diff --git a/openbox-3/desk_toggled.xbm b/openbox-3/desk_toggled.xbm
index abca780..b4b5330 100644
--- a/openbox-3/desk_toggled.xbm
+++ b/openbox-3/desk_toggled.xbm
@@ -1,4 +1,4 @@
-#define desk_toggled_width 8
-#define desk_toggled_height 8
-static unsigned char desk_toggled_bits[] = {
- 0xe7, 0xe7, 0xe7, 0x00, 0x00, 0xe7, 0xe7, 0xe7 };
+#define desk_width 8
+#define desk_height 8
+static unsigned char desk_bits[] = {
+ 0x04, 0x0e, 0x3f, 0x1e, 0x1c, 0x24, 0x40, 0x80 };
diff --git a/openbox-3/max_toggled.xbm b/openbox-3/max_toggled.xbm
index 41b5350..cec3f24 100644
--- a/openbox-3/max_toggled.xbm
+++ b/openbox-3/max_toggled.xbm
@@ -1,4 +1,4 @@
#define max_toggled_width 8
#define max_toggled_height 8
static unsigned char max_toggled_bits[] = {
- 0xff, 0xff, 0xc3, 0xc3, 0xc3, 0xff, 0xff, 0x00 };
+ 0xff, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xff, 0xff };
diff --git a/openbox-3/shade.xbm b/openbox-3/shade.xbm
index ff774f8..83df38d 100644
--- a/openbox-3/shade.xbm
+++ b/openbox-3/shade.xbm
@@ -1,4 +1,4 @@
#define shade_width 8
#define shade_height 8
static unsigned char shade_bits[] = {
- 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+ 0x18, 0x3c, 0x7e, 0xff, 0x18, 0x18, 0x18, 0x18 };
diff --git a/openbox-3/shade_toggled.xbm b/openbox-3/shade_toggled.xbm
index 18e19f3..188cce2 100644
--- a/openbox-3/shade_toggled.xbm
+++ b/openbox-3/shade_toggled.xbm
@@ -1,4 +1,4 @@
#define shade_toggled_width 8
#define shade_toggled_height 8
static unsigned char shade_toggled_bits[] = {
- 0xff, 0xff, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00 };
+ 0x18, 0x18, 0x18, 0x18, 0xff, 0x7e, 0x3c, 0x18 };
diff --git a/openbox-3/themerc b/openbox-3/themerc
index d5d3293..aeb883f 100644
--- a/openbox-3/themerc
+++ b/openbox-3/themerc
@@ -88,32 +88,34 @@ window.inactive.button.disabled.image.color: #888888
# OSD
osd.border.width: 1
-osd.border.color: #a5a5a5
+osd.border.color: #2d2d2d
osd.bg: flat solid
osd.bg.color: #dedede
osd.label.bg: flat solid
osd.label.bg.color: #dedede
-osd.label.text.color: #222
+osd.label.text.color: #555555
osd.hilight.bg: flat solid
osd.hilight.bg.color: #d64937
osd.unhilight.bg: flat solid
-osd.unhilight.bg.color: #dedede
+osd.unhilight.bg.color: #888888
-osd.button.unpressed.text.color: #222
-osd.button.pressed.text.color: #222
-osd.button.focused.text.color #222
+osd.button.unpressed.bg: flat border
+osd.button.unpressed.bg.color: #f0f0f0
+osd.button.unpressed.*.border.color: #b2b2b2
-osd.button.pressed.box.color: #D3D3D4
-osd.button.focused.box.color: #bbb
+osd.button.pressed.bg: flat border
+osd.button.pressed.bg.color: #d3d3d3
+osd.button.pressed.*.border.color: #b2b2b2
-osd.button.*.bg: flat border
-osd.button.pressed.bg: sunken solid
-osd.button.*.bg.color: #f0f0f0
-osd.button.*.border.color: #b2b2b2
+osd.button.focused.bg: flat solid border
+osd.button.focused.bg.color: #f0f0f0
+osd.button.focused.*.border.color: #9c9c9c
+
+osd.button.focused.box.color: #d64937
# Fonts
From 1e9e40fee9e2b621f161226fee22cab3fe03ea85 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Sun, 7 Apr 2013 15:34:41 +0530
Subject: [PATCH 2/4] Improvements to the GTK2 theme
---
gtk-2.0/gtkrc | 55 ++++++++++++++++++++++++---------------------------
1 file changed, 26 insertions(+), 29 deletions(-)
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index 2f9b3fa..d2bcba9 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -210,8 +210,8 @@ style "murrine-scale" = "murrine-default" {
bg[NORMAL] = @bg_color
bg[ACTIVE] = @bg_color
- bg[SELECTED] = @selected_bg_color
- bg[INSENSITIVE] = shade (0.95, @bg_color)
+ bg[SELECTED] = @selected_bg_color
+ bg[INSENSITIVE] = shade (0.95, @bg_color)
engine "murrine" {
roundness = 7
@@ -332,14 +332,14 @@ style "murrine-menu" {
}
style "murrine-menu-item" = "murrine-wider" {
- bg[PRELIGHT] = @selected_bg_color
- bg[SELECTED] = @selected_bg_color
- bg[ACTIVE] = @selected_bg_color
+ bg[PRELIGHT] = @selected_bg_color
+ bg[SELECTED] = @selected_bg_color
+ bg[ACTIVE] = @selected_bg_color
- fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
- fg[PRELIGHT] = @selected_fg_color
- fg[SELECTED] = @selected_fg_color
- fg[ACTIVE] = @selected_fg_color
+ fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
+ fg[PRELIGHT] = @selected_fg_color
+ fg[SELECTED] = @selected_fg_color
+ fg[ACTIVE] = @selected_fg_color
fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
engine "murrine" {
@@ -436,7 +436,8 @@ class "GtkHandleBox" style "murrine-toolbar"
# Panels
style "murrine-panel" {
- xthickness = 2
+ xthickness = 1
+ ythickness = 1
bg[NORMAL] = @panel_bg_color
bg[PRELIGHT] = mix (0.21, @panel_fg_color, @panel_bg_color)
@@ -501,12 +502,12 @@ widget "*gimmie*" style "bold-panel-item"
# XFCE Styles
style "workspace-switcher" = "murrine-panel" {
- bg[SELECTED] = @selected_bg_color
+ bg[SELECTED] = @selected_bg_color
}
style "xfce-header" {
- bg[NORMAL] = shade (0.9, @bg_color)
- base[NORMAL] = shade (1.18, @bg_color)
+ bg[NORMAL] = shade (0.9, @bg_color)
+ base[NORMAL] = shade (1.18, @bg_color)
}
style "xfdesktop-windowlist" {
@@ -516,30 +517,26 @@ style "xfdesktop-windowlist" {
}
style "xfdesktop-icon-view" {
- font_name = "normal"
- XfdesktopIconView::label-alpha = 90
- XfdesktopIconView::selected-label-alpha = 90
- XfdesktopIconView::shadow-color = shade (1.05, @panel_bg_color)
- XfdesktopIconView::selected-shadow-color = @panel_bg_color
- XfdesktopIconView::shadow-x-offset = -1
- XfdesktopIconView::selected-shadow-x-offset = -1
- XfdesktopIconView::shadow-y-offset = -1
- XfdesktopIconView::selected-shadow-y-offset = -1
+ XfdesktopIconView::label-alpha = 0
+ XfdesktopIconView::selected-label-alpha = 60
+ XfdesktopIconVIew::ellipsize-icon-labels = 1
- base[NORMAL] = @panel_bg_color
+ base[NORMAL] = @selected_bg_color
+ base[SELECTED] = @selected_bg_color
base[ACTIVE] = @selected_bg_color
- fg[NORMAL] = @panel_fg_color
+ fg[NORMAL] = @selected_fg_color
+ fg[SELECTED] = @selected_fg_color
fg[ACTIVE] = @selected_fg_color
engine "murrine" {
- textstyle = 0
+ textstyle = 5
text_shade = 0.05
}
}
style "xfwm-tabwin" {
- Xfwm4TabwinWidget::border-width = 1
+ Xfwm4TabwinWidget::border-width = 0
Xfwm4TabwinWidget::icon-size = 64
engine "murrine" {
@@ -550,7 +547,7 @@ style "xfwm-tabwin" {
style "xfsm-logout" {
engine "murrine" {
- }
+ }
}
widget "*WnckPager*" style "workspace-switcher"
@@ -690,8 +687,8 @@ widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" st
style "inkscape-toolbar-fix" {
engine "murrine" {
- gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
- highlight_shade = 1.0
+ gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
+ highlight_shade = 1.0
}
}
From 7b23a6c3aa4d73ab59c054f8a82809c171881a12 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Sun, 7 Apr 2013 15:42:35 +0530
Subject: [PATCH 3/4] Tweaked the Xfwm4 theme
---
xfwm4/title-1-active.xpm | 6 +++++-
xfwm4/title-1-inactive.xpm | 6 +++++-
xfwm4/title-2-active.xpm | 6 +++++-
xfwm4/title-2-inactive.xpm | 6 +++++-
xfwm4/title-3-active.xpm | 6 +++++-
xfwm4/title-3-inactive.xpm | 6 +++++-
xfwm4/title-4-active.xpm | 6 +++++-
xfwm4/title-4-inactive.xpm | 6 +++++-
xfwm4/title-5-active.xpm | 6 +++++-
xfwm4/title-5-inactive.xpm | 6 +++++-
xfwm4/top-left-active.xpm | 6 +++++-
xfwm4/top-left-inactive.xpm | 6 +++++-
xfwm4/top-right-active.xpm | 6 +++++-
xfwm4/top-right-inactive.xpm | 6 +++++-
14 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/xfwm4/title-1-active.xpm b/xfwm4/title-1-active.xpm
index 51f07e5..dafd8ae 100644
--- a/xfwm4/title-1-active.xpm
+++ b/xfwm4/title-1-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_active_xpm[] = {
-"1 21 3 1",
+"1 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * title_1_active_xpm[] = {
"+",
"+",
"+",
+"+",
+"+",
+"+",
+"+",
"+"};
diff --git a/xfwm4/title-1-inactive.xpm b/xfwm4/title-1-inactive.xpm
index f6df270..f2da5b3 100644
--- a/xfwm4/title-1-inactive.xpm
+++ b/xfwm4/title-1-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_inactive_xpm[] = {
-"1 21 3 1",
+"1 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * title_1_inactive_xpm[] = {
"+",
"+",
"+",
+"+",
+"+",
+"+",
+"+",
"+"};
diff --git a/xfwm4/title-2-active.xpm b/xfwm4/title-2-active.xpm
index e6098d0..a2bd671 100644
--- a/xfwm4/title-2-active.xpm
+++ b/xfwm4/title-2-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_2_active_xpm[] = {
-"1 21 3 1",
+"1 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * title_2_active_xpm[] = {
"+",
"+",
"+",
+"+",
+"+",
+"+",
+"+",
"+"};
diff --git a/xfwm4/title-2-inactive.xpm b/xfwm4/title-2-inactive.xpm
index c72c745..ac1e11a 100644
--- a/xfwm4/title-2-inactive.xpm
+++ b/xfwm4/title-2-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_2_inactive_xpm[] = {
-"1 21 3 1",
+"1 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * title_2_inactive_xpm[] = {
"+",
"+",
"+",
+"+",
+"+",
+"+",
+"+",
"+"};
diff --git a/xfwm4/title-3-active.xpm b/xfwm4/title-3-active.xpm
index f5b2cd5..2119dda 100644
--- a/xfwm4/title-3-active.xpm
+++ b/xfwm4/title-3-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_active_xpm[] = {
-"1 21 3 1",
+"1 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * title_3_active_xpm[] = {
"+",
"+",
"+",
+"+",
+"+",
+"+",
+"+",
"+"};
diff --git a/xfwm4/title-3-inactive.xpm b/xfwm4/title-3-inactive.xpm
index bedc76f..8c28bcc 100644
--- a/xfwm4/title-3-inactive.xpm
+++ b/xfwm4/title-3-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_inactive_xpm[] = {
-"1 21 3 1",
+"1 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * title_3_inactive_xpm[] = {
"+",
"+",
"+",
+"+",
+"+",
+"+",
+"+",
"+"};
diff --git a/xfwm4/title-4-active.xpm b/xfwm4/title-4-active.xpm
index 61f176a..13d7fee 100644
--- a/xfwm4/title-4-active.xpm
+++ b/xfwm4/title-4-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_4_active_xpm[] = {
-"1 21 3 1",
+"1 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * title_4_active_xpm[] = {
"+",
"+",
"+",
+"+",
+"+",
+"+",
+"+",
"+"};
diff --git a/xfwm4/title-4-inactive.xpm b/xfwm4/title-4-inactive.xpm
index 5899de9..42627ea 100644
--- a/xfwm4/title-4-inactive.xpm
+++ b/xfwm4/title-4-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_4_inactive_xpm[] = {
-"1 21 3 1",
+"1 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * title_4_inactive_xpm[] = {
"+",
"+",
"+",
+"+",
+"+",
+"+",
+"+",
"+"};
diff --git a/xfwm4/title-5-active.xpm b/xfwm4/title-5-active.xpm
index 7c0a23a..7936fc7 100644
--- a/xfwm4/title-5-active.xpm
+++ b/xfwm4/title-5-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_active_xpm[] = {
-"1 21 3 1",
+"1 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * title_5_active_xpm[] = {
"+",
"+",
"+",
+"+",
+"+",
+"+",
+"+",
"+"};
diff --git a/xfwm4/title-5-inactive.xpm b/xfwm4/title-5-inactive.xpm
index e152136..0a3c98b 100644
--- a/xfwm4/title-5-inactive.xpm
+++ b/xfwm4/title-5-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_inactive_xpm[] = {
-"1 21 3 1",
+"1 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * title_5_inactive_xpm[] = {
"+",
"+",
"+",
+"+",
+"+",
+"+",
+"+",
"+"};
diff --git a/xfwm4/top-left-active.xpm b/xfwm4/top-left-active.xpm
index c5b2842..2d98285 100644
--- a/xfwm4/top-left-active.xpm
+++ b/xfwm4/top-left-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"2 21 3 1",
+"2 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * top_left_active_xpm[] = {
".+",
".+",
".+",
+".+",
+".+",
+".+",
+".+",
".+"};
diff --git a/xfwm4/top-left-inactive.xpm b/xfwm4/top-left-inactive.xpm
index 6449cea..a4cfd1c 100644
--- a/xfwm4/top-left-inactive.xpm
+++ b/xfwm4/top-left-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"2 21 3 1",
+"2 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * top_left_inactive_xpm[] = {
".+",
".+",
".+",
+".+",
+".+",
+".+",
+".+",
".+"};
diff --git a/xfwm4/top-right-active.xpm b/xfwm4/top-right-active.xpm
index 9f075b8..071710e 100644
--- a/xfwm4/top-right-active.xpm
+++ b/xfwm4/top-right-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"2 21 3 1",
+"2 25 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * top_right_active_xpm[] = {
"+.",
"+.",
"+.",
+"+.",
+"+.",
+"+.",
+"+.",
"+."};
diff --git a/xfwm4/top-right-inactive.xpm b/xfwm4/top-right-inactive.xpm
index b6a2386..95e48e1 100644
--- a/xfwm4/top-right-inactive.xpm
+++ b/xfwm4/top-right-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"2 21 3 1",
+"2 25 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -24,4 +24,8 @@ static char * top_right_inactive_xpm[] = {
"+.",
"+.",
"+.",
+"+.",
+"+.",
+"+.",
+"+.",
"+."};
From eff27ebdba40af2b705515630d3a773cadf766c1 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Sun, 7 Apr 2013 16:37:06 +0530
Subject: [PATCH 4/4] Added CREDITS file
---
CREDITS | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 CREDITS
diff --git a/CREDITS b/CREDITS
new file mode 100644
index 0000000..69ca9cb
--- /dev/null
+++ b/CREDITS
@@ -0,0 +1,3 @@
+Joern Konopka <cldx3000@googlemail.com>
+Georgi Karavasilev <motorslav@gmail.com>
+David Barr <dpbarr@gmail.com>