Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-27 20:59:01 +00:00
Code Issues Releases Activity
4,156 Commits 5 Branches 46 Tags 22 MiB
b1b7ae8b2c
Commit Graph

141 Commits

Author SHA1 Message Date
Brenden Matthews
e45db41a9d Added border_inner_margin and border_outer_margin. 
The border_margin config option is now deprecated.  This also resolves
an issue with weird border_margin values causing X to crash.
 2009-06-11 19:07:21 -06:00
Vincent Breitmoser
f3aa025872 Added format_human_readable option (sf.net #2803345, thanks Vincent). 2009-06-09 14:52:18 -06:00
Brenden Matthews
576d55e473 Add tidying/sorting to check_docs.py. 2009-06-06 16:56:35 -06:00
Nikolas Garofil
f3fd389ea0 read_tcp werkt maar moet nog stresstesten ondergaan 2009-06-04 19:39:18 +02:00
Brenden Matthews
ddcc8ceb70 Merge branch 'master' into imlib2 
Conflicts:
	extras/nano/conky.nanorc
	extras/vim/syntax/conkyrc.vim
 2009-05-17 22:11:40 -06:00
Brenden Matthews
353f0b6ad7 More work on imlib2 stuff. 
Seems to be some rendering corruption which I'm not sure the reason for,
but other than that I think it works okay.
 2009-05-16 23:47:02 -06:00
Brenden Matthews
e18e051b66 Fix docs. 2009-05-16 17:19:15 -06:00
Brenden Matthews
0e21a804ee Couple minor lua changes. 2009-05-16 14:55:05 -06:00
Brenden Matthews
8cb0027f45 Various fixes. 
Added missing apcupsd.[hc], added apcupsd_loadgauge, fixed compilation
errors, updated docs & syntax stuff.
 2009-05-10 13:11:09 -06:00
Brenden Matthews
197c4d5bc3 Update docs, remove deprecated code. 2009-05-09 23:30:42 -06:00
Brenden Matthews
c105b54afa Finish with check_docs.py. 
This script checks consistency of docs, and automatically updates the
nano and vim syntax files.
 2009-05-09 23:25:11 -06:00
Brenden Matthews
fdadbbf98e Added top_name_width config option. 2009-05-07 17:49:32 -06:00
Nikolas Garofil
e05e9ece8e Added the combine variable 2009-04-30 21:05:59 +02:00
Brenden Matthews
38ee788da4 Added default_bar/graph/gauge_size config options (thanks wire64 for the idea) 2009-04-09 16:00:40 -06:00
Ali Polatel
c1cf1232e0 Add extra_newline option for awesome's wiboxes 
Hi Brenden,
Below is an updated patch, it works for me with the master.

p.s: don't forget to use git-am to apply the patch ;p

Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-03-15 18:56:23 -06:00
Nikolas Garofil
d1baa243a8 Added alias configfile setting 
This patch is written by a anonymous author, see patch on sf.net
id #2663691 . I changed it a bit so that it can't overwrite
existing environment variables and updated the docs and syntaxfiles
 2009-03-07 15:12:09 +01:00
Nikolas Garofil
09ac943a3a if_updatenr added 2009-03-01 15:10:01 +01:00
Nikolas Garofil
1085d2b27e out_to_x can now be turned off 2009-02-15 18:58:03 +01:00
Nikolas Garofil
227e5a3d38 docs and syntax for overwrite_file and append_file 2009-02-12 23:04:39 +01:00
Nikolas Garofil
4c25a9680e Added output_to_stderr 2009-02-10 09:43:20 +01:00
Phil Sutter
c84b485178 update the default config along with the syntax files 2008-12-12 15:32:16 +01:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Nikolas Garofil
312d3d6de8 Merge with conky1-extra, Changelog contains the changes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1193 7f574dfc-610e-0410-a909-a81674777703
 2008-06-21 20:37:58 +00:00
Nikolas Garofil
57318c7012 Background was defined twice in vim and nano syntax 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1125 7f574dfc-610e-0410-a909-a81674777703
 2008-06-04 08:33:01 +00:00
Brenden Matthews
c70e1ead9f updating docs, syntax highlighting, code formatting 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1118 7f574dfc-610e-0410-a909-a81674777703
 2008-05-06 21:44:23 +00:00
Brenden Matthews
801cf11545 * Added patch for the following (thanks larsko): 
* New $loadgraph to show a graph of load averages,
* add "show_graph_scale" option to turn off/on the showing of the
current max value for the graph,
* minor code fixes,
* update nano and vim syntax highlighting stuff.

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1104 7f574dfc-610e-0410-a909-a81674777703
 2008-04-13 04:10:35 +00:00
Brenden Matthews
62b0a5f778 detect conky.conf as well as conkyrc for syntax highlighting 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1102 7f574dfc-610e-0410-a909-a81674777703
 2008-04-03 02:54:47 +00:00
Brenden Matthews
94bb46b868 added $execpi, new ebuild, various other misc updates 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1027 7f574dfc-610e-0410-a909-a81674777703
 2008-03-22 06:10:54 +00:00
Brenden Matthews
a1452f5db4 * Applied 12 patches: 
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
        2) Improved audacious support patch (thanks Miroslav)
        3) tp_smapi support patch for IBM laptops (thanks Phil)
        4) user info patch (thanks Roland)
        5) added conky build info patch (thanks Roland)
        6) added if_up patch (thanks Phil)
        7) added reload on SIGHUP patch (thanks Jonas)
        8) added pad percentages patch (thanks Jonas)
        9) added fs_type patch (thanks Ryan)
        10) added xmms2 fixes patch (thanks Lassi)
        11) fix sysfs crash patch (thanks Phil)
        12) multiple ip patch ($addrs)
    * Added more alignment support (top_middle, bottom_middle, middle_left,
    and middle_right).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1010 7f574dfc-610e-0410-a909-a81674777703
 2008-03-18 00:23:16 +00:00
Kevin Lyles
3d26a4880e Reformatted all code 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1007 7f574dfc-610e-0410-a909-a81674777703
 2008-02-20 20:30:45 +00:00
Philip Kovacs
414ee01477 Update vim/nano syntax files 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@980 7f574dfc-610e-0410-a909-a81674777703
 2007-10-21 23:46:38 +00:00
Philip Kovacs
62f8ff9be7 mpd_interval -> music_player_interval 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@957 7f574dfc-610e-0410-a909-a81674777703
 2007-09-02 04:26:08 +00:00
Philip Kovacs
64eb75d329 update vim/nano syntax files 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@923 7f574dfc-610e-0410-a909-a81674777703
 2007-08-15 00:35:25 +00:00
Philip Kovacs
1c35f432e5 Conky 1.5.0 -- client/server prototype 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@818 7f574dfc-610e-0410-a909-a81674777703
 2006-12-23 06:01:16 +00:00
Philip Kovacs
5ff932ff21 split battery off into battery and battery_time 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@814 7f574dfc-610e-0410-a909-a81674777703
 2006-12-12 23:21:14 +00:00
Philip Kovacs
e4713dc790 use GLib GHashTable for port monitors 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@806 7f574dfc-610e-0410-a909-a81674777703
 2006-12-09 05:40:08 +00:00
Philip Kovacs
31ed581a28 update syntax files 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@799 7f574dfc-610e-0410-a909-a81674777703
 2006-11-30 22:09:27 +00:00
Philip Kovacs
9609a330d8 add max_specials config item with default 512. really closes bug #1574523 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@793 7f574dfc-610e-0410-a909-a81674777703
 2006-11-22 21:53:54 +00:00
Philip Kovacs
6d5ba7e7b3 Conky 1.4.4 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@761 7f574dfc-610e-0410-a909-a81674777703
 2006-11-13 00:10:29 +00:00
Philip Kovacs
ff915b0c10 syntax files 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@751 7f574dfc-610e-0410-a909-a81674777703
 2006-11-11 02:19:29 +00:00
Philip Kovacs
ef9255e22b rename dir 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@743 7f574dfc-610e-0410-a909-a81674777703
 2006-11-09 19:54:17 +00:00