cleanup

git-svn-id: http://tint2.googlecode.com/svn/trunk@288 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
2009-12-17 11:08:14 +00:00
parent f4867f9366
commit e11cb05c96
10 changed files with 80 additions and 9 deletions
--- a/sample/black_single_desktop.tint2rc
+++ b/sample/black_single_desktop.tint2rc
@@ -53,6 +53,7 @@ wm_menu = 1
 taskbar_mode = single_desktop
 taskbar_padding = 0 5 2
 taskbar_background_id = 0
+#taskbar_active_background_id = 0

 #---------------------------------------------
 # TASK
@@ -71,6 +72,7 @@ task_active_background_id = 3
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 7 8 5
 systray_background_id = 1
 systray_sort = left2right
--- a/sample/default.tint2rc
+++ b/sample/default.tint2rc
@@ -70,6 +70,7 @@ task_active_background_id = 3
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 8 4 5
 systray_background_id = 1
 systray_sort = left2right
@@ -98,6 +99,7 @@ clock_padding = 1 0
 clock_background_id = 1
 #clock_lclick_command = xclock
 clock_rclick_command = orage
+#clock_tooltip = %A %d %B

 #---------------------------------------------
 # TOOLTIP
--- a/sample/horizontal_icon_only.tint2rc
+++ b/sample/horizontal_icon_only.tint2rc
@@ -68,6 +68,7 @@ task_active_background_id = 3
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 8 6 5
 systray_background_id = 0
 systray_sort = left2right
@@ -96,6 +97,7 @@ clock_padding = 2 0
 clock_background_id = 0
 #clock_lclick_command = xclock
 clock_rclick_command = orage
+#clock_tooltip = %A %d %B

 #---------------------------------------------
 # TOOLTIP
@@ -104,7 +106,7 @@ tooltip = 1
 tooltip_padding = 2 2
 tooltip_show_timeout = 0.7
 tooltip_hide_timeout = 0.3
-tooltip_background_id = 4
+tooltip_background_id = 1
 tooltip_font_color = #OOOOOO 80
 tooltip_font = sans 10

--- a/sample/rounded_multi_desktop.tint2rc
+++ b/sample/rounded_multi_desktop.tint2rc
@@ -65,9 +65,33 @@ task_active_background_id = 0
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 6 5 5
 systray_background_id =2
+systray_sort = left2right

+#---------------------------------------------
+# BATTERY
+#---------------------------------------------
+battery = 0
+battery_low_status = 7
+battery_low_cmd = notify-send "battery low"
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #ffffff 76
+battery_padding = 1 0
+battery_background_id = 2
+
+#---------------------------------------------
+# TOOLTIP
+#---------------------------------------------
+tooltip = 1
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 3
+tooltip_font_color = #OOOOOO 80
+tooltip_font = sans 10

 #---------------------------------------------
 # MOUSE ACTION ON TASK
--- a/sample/tint2rc
+++ b/sample/tint2rc
@@ -39,13 +39,14 @@ wm_menu = 0
 taskbar_mode = single_desktop
 taskbar_padding = 2 3 2
 taskbar_background_id = 0
+#taskbar_active_background_id = 0

 #---------------------------------------------
 # TASKS
 #---------------------------------------------
 task_icon = 1
 task_text = 1
-task_width = 140
+task_maximum_size = 140 35
 task_centered = 1
 task_padding = 6 3
 task_font = sans 7
@@ -57,8 +58,10 @@ task_active_background_id = 2
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 0 4 5
 systray_background_id = 0
+systray_sort = left2right

 #---------------------------------------------
 # CLOCK
@@ -72,6 +75,7 @@ clock_padding = 1 0
 clock_background_id = 0
 #clock_lclick_command = xclock
 clock_rclick_command = orage
+#clock_tooltip = %A %d %B

 #---------------------------------------------
 # BATTERY
@@ -85,6 +89,16 @@ battery_font_color = #ffffff 76
 battery_padding = 1 0
 battery_background_id = 0

+#---------------------------------------------
+# TOOLTIP
+#---------------------------------------------
+tooltip = 0
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font_color = #OOOOOO 80
+tooltip_font = sans 10

 #---------------------------------------------
 # MOUSE ACTION ON TASK
--- a/sample/vertical_icon_only.tint2rc
+++ b/sample/vertical_icon_only.tint2rc
@@ -39,13 +39,14 @@ wm_menu = 0
 taskbar_mode = single_desktop
 taskbar_padding = 0 0 2
 taskbar_background_id = 3
+#taskbar_active_background_id = 0

 #---------------------------------------------
 # TASKS
 #---------------------------------------------
 task_icon = 1
 task_text = 0
-task_width = 50
+task_maximum_size = 50 35
 task_centered = 1
 task_padding = 0 2
 task_font = Aller 9
@@ -57,8 +58,10 @@ task_active_background_id = 1
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 2 8 0
 systray_background_id = 1
+systray_sort = left2right

 #---------------------------------------------
 # CLOCK
@@ -72,6 +75,7 @@ clock_padding = 6 4
 clock_background_id = 1
 #clock_lclick_command = xclock
 #clock_rclick_command = orage
+#clock_tooltip = %A %d %B

 #---------------------------------------------
 # BATTERY
@@ -85,6 +89,16 @@ battery_font_color = #ffffff 76
 battery_padding = 1 0
 battery_background_id = 0

+#---------------------------------------------
+# TOOLTIP
+#---------------------------------------------
+tooltip = 0
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font_color = #OOOOOO 80
+tooltip_font = sans 10

 #---------------------------------------------
 # MOUSE ACTION ON TASK
--- a/sample/white_single_desktop.tint2rc
+++ b/sample/white_single_desktop.tint2rc
@@ -43,7 +43,7 @@ panel_background_id = 3
 #---------------------------------------------
 task_icon = 0
 task_text = 1
-task_width = 100
+task_maximum_size = 100
 task_centered = 1
 task_margin = 4
 task_padding = 5
@@ -66,19 +66,22 @@ taskbar_active_background_id = 0
 #---------------------------------------------
 # SYSTRAYBAR
 #---------------------------------------------
+systray = 1
 systray_padding = 4 2 3
 systray_background_id = 0
+systray_sort = left2right

 #---------------------------------------------
 # CLOCK
 #---------------------------------------------
-time1_format = %H:%M / %a %d %b
+time1_format = %H:%M
 #time1_font = Museo 8
-time1_font = AvantGardeLTMedium 8
+time1_font = AvantGardeLTMedium 9 bold
 #time2_format = %A %d %B
 #time2_font = Monospace 6
 clock_font_color = #151515 60
 clock_padding = 4 0
+clock_tooltip = %A %d %B

 #---------------------------------------------
 # BATTERY
@@ -92,6 +95,17 @@ battery_font_color = #151515 60
 battery_padding = 1 0
 battery_background_id = 0

+#---------------------------------------------
+# TOOLTIP
+#---------------------------------------------
+tooltip = 1
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font_color = #OOOOOO 80
+tooltip_font = sans 10
+
 #---------------------------------------------
 # MOUSE ACTION ON TASK
 #---------------------------------------------