version 1.1.1v1.1.2

7 files changed, 109 insertions, 26 deletions

diff --git a/Makefile.in b/Makefile.in
index 9d26e09b..5e6e0a21 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,7 @@ subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	install-sh missing py-compile
+	TODO install-sh missing py-compile
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/README b/README
new file mode 100644
index 00000000..98f24d0b
--- /dev/null
+++ b/README
@@ -0,0 +1,83 @@
+Glances -- Eye on your system
+=============================
+
+## Description
+
+Glances is a CLI curses based monitoring tools for both GNU/Linux and BSD.
+
+Glances uses the libstatgrab library to get informations from your system.
+Glances is developped in Python and uses the python-statgrab lib.
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/screenshot.png)
+
+## Installation
+
+Glances use a standard GNU style installer:
+
+	$ tar zxvf glances-v1.0.tar.gz
+	$ cd glances
+	$ ./configure
+	$ make
+	$ sudo make install
+
+Pre-requisites:
+
+* Python 2.6+ (not tested with Python 3)
+* python-statgrab 0.5+ (did not work with python-statgrab 0.5)
+
+Notes: The Debian Squeeze repos only include the python-statgrab 0.4.
+You had to install the version 0.5 using the following commands:
+
+	$ sudo apt-get install libstatgrab-dev
+	$ wget http://ftp.uk.i-scream.org/sites/ftp.i-scream.org/pub/i-scream/pystatgrab/pystatgrab-0.5.tar.gz
+	$ tar zxvf pystatgrab-0.5.tar.gz
+	$ cd pystatgrab-0.5/
+	$ ./setup.py build
+	$ sudo ./setup.py install
+
+## Running
+
+Easy:
+
+	$ glances.py
+
+## User guide
+
+By default, stats are refrsh every second, to change this setting, you can
+use the -t option. For exemple to set the refrech rate to 5 seconds:
+
+	$ glances.py -t 5
+
+Importants stats are colored:
+
+* GREEN:   stat counter is < 50%
+* BLUE:    stat counter is > 50% and < 70%
+* MAGENTA: stat counter is > 70% and < 90%
+* RED:     stat counter is > 90%
+
+When Glances is running, you can press:
+
+* 'a' to set the automatic mode. The process list is sorted automatically
+
+    If CPU > 70%, sort by process CPU consomption
+
+    If MEM > 70%, sort by process size
+
+* 'c' the processes list is sorted by CPU consomption
+* 'm' the processes list is sorted by process size
+* 'q' Exit
+
+## Limitation
+
+The current version of the python-statgrab API can not retrieve the file 
+system statistics.
+https://bugs.launchpad.net/ubuntu/+source/libstatgrab/+bug/886783
+
+## Todo
+
+You are welcome to contribute to this software.
+
+* Packaging for Debian, Ubuntu, Fedora, Redhat, BSD...
+* Check the needed Python library in the configure.ac
+* Add file system stats when the python-statgrab is corrected
+* Add a user guide window
diff --git a/TODO b/TODO
index 3f4005ef..d7599fe1 100644
--- a/TODO
+++ b/TODO
@@ -1 +1 @@
-- Add color indicators in the last line (right)
+- Crach when a terminal is resized with a size < 80x24
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 3a2fcabd..407b7017 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -65,13 +65,13 @@
                         '_AM_MANGLE_OPTION' => 1,
                         'AM_CONDITIONAL' => 1,
                         'AM_SET_LEADING_DOT' => 1,
-                        'AC_PYTHON_MODULE' => 1,
                         'AM_SET_DEPDIR' => 1,
+                        'AC_PYTHON_MODULE' => 1,
                         '_AM_DEPENDENCIES' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
                         'm4_include' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
                         'AM_PATH_PYTHON' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AU_DEFUN' => 1,
                         'AM_MAKE_INCLUDE' => 1
                       }
@@ -88,55 +88,55 @@
                         'configure.ac'
                       ],
                       {
-                        '_LT_AC_TAGCONFIG' => 1,
                         'AM_PROG_F77_C_O' => 1,
-                        'AC_INIT' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'm4_pattern_forbid' => 1,
-                        '_AM_COND_IF' => 1,
+                        'AC_INIT' => 1,
                         'AC_CANONICAL_TARGET' => 1,
-                        'AC_SUBST' => 1,
+                        '_AM_COND_IF' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_FC_SRCEXT' => 1,
+                        'AC_SUBST' => 1,
                         'AC_CANONICAL_HOST' => 1,
+                        'AC_FC_SRCEXT' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        'AM_PATH_GUILE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_PATH_GUILE' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_CONFIG_LINKS' => 1,
-                        'm4_sinclude' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
                         'LT_SUPPORTED_TAG' => 1,
+                        'm4_sinclude' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_NLS' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
                         '_m4_warn' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
                         'AM_PROG_CXX_C_O' => 1,
-                        '_AM_COND_ENDIF' => 1,
                         '_AM_MAKEFILE_INCLUDE' => 1,
+                        '_AM_COND_ENDIF' => 1,
                         'AM_ENABLE_MULTILIB' => 1,
                         'AM_SILENT_RULES' => 1,
                         'AM_PROG_MOC' => 1,
                         'AC_CONFIG_FILES' => 1,
-                        'include' => 1,
                         'LT_INIT' => 1,
-                        'AM_PROG_AR' => 1,
+                        'include' => 1,
                         'AM_GNU_GETTEXT' => 1,
+                        'AM_PROG_AR' => 1,
                         'AC_LIBSOURCE' => 1,
-                        'AM_PROG_FC_C_O' => 1,
                         'AC_CANONICAL_BUILD' => 1,
+                        'AM_PROG_FC_C_O' => 1,
                         'AC_FC_FREEFORM' => 1,
                         'AH_OUTPUT' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        'sinclude' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
                         'm4_pattern_allow' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'sinclude' => 1,
                         'AM_CONDITIONAL' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'AM_POT_TOOLS' => 1,
diff --git a/configure.ac b/configure.ac
index 3d77f33e..a8ea2348 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
-AC_INIT(Glances, 1.0, , glances)
+AC_INIT(Glances, 1.1.1, , glances)
 
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/setup.py b/setup.py
index a0faa149..a7e78a64 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ def read(fname):
 	return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 setup(  name='Glances',
-	version='1.1',
+	version='1.1.1',
 	description='CLI curses-based monitoring tools',
 	author='Nicolas Hennion',
 	author_email='nicolas@nicolargo.com',
diff --git a/src/glances.py b/src/glances.py
index ab267d12..2514d0c8 100755
--- a/src/glances.py
+++ b/src/glances.py
@@ -33,7 +33,7 @@ import statgrab
 #==================
 
 # The glances version id
-__version__ = "1.1"		
+__version__ = "1.1.1"		
 
 # Class
 #======