update documentation for new config format

diff --git a/AUTHORS b/AUTHORS
index 23d6bf1ca6ecb42cdde3ca884d9c2078c819b5ec..e674179755870309cce25ba2d58ce4ed421ca1c7 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,10 @@
-Developed by:
-  Thierry Lorthiois <lorthiois@bbsoft.fr>, project maintainer
-  Pål Staurland <staura@gmail.com>, tint2 is based on ttm originally written by Pål Staurland
+
+tint2 is developped by :
+- 2008 Thierry Lorthiois <lorthiois@bbsoft.fr>, project maintainer
+
+
+tint2 is based on ttm source code (http://code.google.com/p/ttm/)
+- 2007 Pål Staurland <staura@gmail.com>
 
 
 Contributors:

diff --git a/ChangeLog b/ChangeLog
index 60fc00c48f036036cc184d9afbdc571da3f4a080..c60fa676fab54ee246a391cc16727b0c240e36f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 
+2009-01-17
+- fixed drawing of active task (with new layout)
 
 2009-01-05
 - fixed decorated window with compiz

diff --git a/README b/README
index b482d514db3bde596be72e929942564ec5d83c1d..4dd94bf87ae989183ed039d8a7fa0a46579364db 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 DEPENDENCIES:
-cairo, pango, glib, imlib2, xrandr, xinerama
+cairo, pango, glib, imlib2, xinerama, xrandr
 
 ---------------------------------------------------------
 INSTALL:
@@ -10,21 +10,11 @@ as root type "make install"
 execute "tint2"
 or "tint2  -c  path_to_config_file"
 
+
 documentation is in /doc
 
 check http://code.google.com/p/tint2/ 
 for latest release, documentation and sample config file.
 
 
----------------------------------------------------------
-FAQ:
-
-- How to get menu in tint2 panel ?
-use panel_padding = x y  with option x>1
-then put the mouse in left (or right) padding and right clic,
-tint2 will open the menu of your Window manager.
-
-
-
-
 

diff --git a/doc/man/tint2.1 b/doc/man/tint2.1
index ce4646bc05f5925426b6efec9649e6882dddcd44..22d73055282642d678bd0f1e44da05278660af47 100644 (file)
--- a/doc/man/tint2.1
+++ b/doc/man/tint2.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH TINT 1 "2008-09-05"
+.TH TINT2 1 "2009-01-17"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,35 +16,35 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-tint \- lightweight taskbar
+tint2 \- lightweight taskbar
 .SH SYNOPSIS
-.B tint
+.B tint2
 .br
-.B tint
+.B tint2
 .RI -c
-.IR /path/to/config/file 
+.IR /path_to_config_file 
 .SH DESCRIPTION
 This manual page documents briefly the
-.B tint
+.B tint2
 command.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics,
 .\" respectively.
-\fBtint\fP is a simple panel/taskbar intentionally made for openbox3, but 
+\fBtint2\fP is a simple panel/taskbar intentionally made for openbox3, but 
 should also work with other window managers. It's based on ttm code. The goal is to keep a clean and unintrusive look with code lightweight and 
 compliance with freedesktop specifications.
 .PP
-On the first startup tint creates a config file in $HOME/.config/tint/tintrc.
+On the first startup tint2 creates a config file in $HOME/.config/tint2/tint2rc.
 See the /usr/share/tint2/doc directory for more information.
 .SH OPTIONS
 .TP
 .B \-c config-file
 Specify which configuration file to use instead of the default.
 .SH AUTHOR
-tint was written by Thierry Lorthiois <lorthiois@bbsoft.fr>.  It is based on
+tint2 was written by Thierry Lorthiois <lorthiois@bbsoft.fr>.  It is based on
 ttm, originally written by Pål Staurland <staura@gmail.com>
 .PP
 This manual page was written by Daniel Moerner <dmoerner@gmail.com>,
 for the Debian project (but may be used by others).  It was adopted from the
-tint docs.
+tint2 docs.

diff --git a/doc/tint2-0.7.odt b/doc/tint2-0.7.odt
index 03af50a1e4b6060cc79f3e70c7c830dad4b3ef52..41dafe90270b8260e9d903f12485b7e5f2e99759 100644 (file)
Binary files a/doc/tint2-0.7.odt and b/doc/tint2-0.7.odt differ

diff --git a/doc/tint2-0.7.pdf b/doc/tint2-0.7.pdf
index 873effd49cd5f5ba4c611e919cf2c264fac85fcf..988301d17c6a5c8c51941d9aa7f6f30331f42b41 100644 (file)
Binary files a/doc/tint2-0.7.pdf and b/doc/tint2-0.7.pdf differ

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index 7b523916156681d3ba4b07e69a15f00f496d48d8..2a7119ad7c2a51ade4c3560f12b915db6a5927ae 100644 (file)
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -162,12 +162,12 @@ void get_icon (Task *tsk)
       XFree (data);
    }
    else {
+      printf("get_icon vide\n");
       //XWMHints *hints;
       //hints = XGetWMHints(server.dsp, tkwin);
       //if (hints != NULL) {
       //   XFree(hints);
       //}
-      printf("get_icon vide\n");
       // XChangeProperty (display, windowH, XInternAtom (display, "_NET_WM_ICON", False), XA_CARDINAL, 32, PropModeReplace, (unsigned char*) data, dataSize);
       return;
    }

diff --git a/tintrc01 b/tintrc01
index e7dea48d04e2e940d0f6863b58633bbc8eb76762..f616c4da63e31ae6b83257c33027d5154612c410 100644 (file)
--- a/tintrc01
+++ b/tintrc01
@@ -24,7 +24,7 @@ border_color = #ffffff 70
 # PANEL
 #---------------------------------------------
 panel_monitor = 1
-panel_position = bottom center
+panel_position = top center
 panel_size = 900 30
 panel_margin = 15 2
 panel_padding = 9 0
@@ -34,7 +34,7 @@ panel_background_id = 1
 #---------------------------------------------
 # TASKBAR
 #---------------------------------------------
-taskbar_mode = multi_desktop
+taskbar_mode = single_desktop
 taskbar_padding = 2 4
 taskbar_background_id = 0
 

diff --git a/tintrc02 b/tintrc02
index 538c7f0e3536edd8ed5427f70f6741a88552c552..2cfb910f0876aa72af5e926908715760681dfab9 100644 (file)
--- a/tintrc02
+++ b/tintrc02
@@ -6,24 +6,23 @@
 # BACKGROUND AND BORDER
 #---------------------------------------------
 rounded = 1
-border_width = 1 
-background_color = #282828 100
-border_color = #000000 100
+border_width = 0 
+background_color = #282828 40
+border_color = #000000 40
 
 rounded = 1
 border_width = 1
-background_color = #282828 100
-#background_color = #3b3b3b 100
-border_color = #cccccc 100
+background_color = #282828 0
+border_color = #cccccc 40
 
 #---------------------------------------------
 # PANEL
 #---------------------------------------------
 panel_monitor = 1
-panel_position = bottom right
-panel_size = 0 27
-panel_margin = 0 20
-panel_padding = 4 2
+panel_position = top right
+panel_size = 600 27
+panel_margin = 0 0
+panel_padding = 4 0
 font_shadow = 0
 panel_background_id = 1
 
@@ -38,12 +37,12 @@ taskbar_background_id = 0
 # TASKS
 #---------------------------------------------
 task_icon = 1
-task_text = 1
-task_width = 200
+task_text = 0
+task_width = 30
 task_centered = 1
-task_padding = 2 3
+task_padding = 2 5
 task_font = sans 8
-task_font_color = #ffffff 40
+task_font_color = #ffffff 60
 task_active_font_color = #ffffff 100
 task_background_id = 0
 task_active_background_id = 2
@@ -62,7 +61,7 @@ time1_font = sans 7
 time2_format = %A %d %B
 time2_font = sans 7
 clock_font_color = #ffffff 100
-clock_padding = 0 0
+clock_padding = 4 0
 clock_background_id = 0
 
 #---------------------------------------------