From 9ff5ef80bfd6cd3b1c73269cf411a7e84a80c60f Mon Sep 17 00:00:00 2001 From: joten Date: Wed, 14 Sep 2011 20:30:17 +0200 Subject: [PATCH] updated docs: generalized header and footer for html and txt fixed docs: links fixed bug: #18356 (Missing bar elements on Windows XP.) updated : version to 8.2.1 --- src/Bar.ahk | 2 +- src/Config.ahk | 6 +++--- src/Main.ahk | 4 ++-- src/Manager.ahk | 6 +++--- src/Monitor.ahk | 2 +- src/View.ahk | 2 +- src/docs/configuration.t2t | 41 +++++++++++++++++++++++-------------- src/docs/help.t2t | 42 ++++++++++++++++++++++++-------------- src/docs/hotkeys.t2t | 38 ++++++++++++++++++++++------------ 9 files changed, 89 insertions(+), 54 deletions(-) diff --git a/src/Bar.ahk b/src/Bar.ahk index 5caff14..282f038 100644 --- a/src/Bar.ahk +++ b/src/Bar.ahk @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * @version 8.2.0.03 (31.08.2011) + * @version 8.2.1.01 (31.08.2011) */ Bar_init(m) { diff --git a/src/Config.ahk b/src/Config.ahk index bc3a0dd..3165a58 100644 --- a/src/Config.ahk +++ b/src/Config.ahk @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * @version 8.2.0.03 (02.09.2011) + * @version 8.2.1.01 (14.09.2011) */ Config_init() { @@ -134,7 +134,7 @@ Config_getSystemSettings() { Global Config_fontName, Config_fontSize, Config_normBgColor, Config_normFgColor, Config_selBgColor, Config_selFgColor If Not Config_fontName { - ncmSize := VarSetCapacity(ncm, 44 + 5 * (28 + 32 * (A_IsUnicode ? 2 : 1)), 0) + ncmSize := VarSetCapacity(ncm, 4 * (A_OSVersion = WIN_VISTA ? 11 : 10) + 5 * (28 + 32 * (A_IsUnicode ? 2 : 1)), 0) NumPut(ncmSize, ncm, 0, "UInt") DllCall("SystemParametersInfo", "UInt", 0x0029, "UInt", ncmSize, "UInt", &ncm, "UInt", 0) @@ -145,7 +145,7 @@ Config_getSystemSettings() { ; maestrith: Script Writer (http://www.autohotkey.net/~maestrith/Script Writer/) } If Not Config_fontSize { - ncmSize := VarSetCapacity(ncm, 44 + 5 * (28 + 32 * (A_IsUnicode ? 2 : 1)), 0) + ncmSize := VarSetCapacity(ncm, 4 * (A_OSVersion = WIN_VISTA ? 11 : 10) + 5 * (28 + 32 * (A_IsUnicode ? 2 : 1)), 0) NumPut(ncmSize, ncm, 0, "UInt") DllCall("SystemParametersInfo", "UInt", 0x0029, "UInt", ncmSize, "UInt", &ncm, "UInt", 0) diff --git a/src/Main.ahk b/src/Main.ahk index c02b8fb..b8cce58 100644 --- a/src/Main.ahk +++ b/src/Main.ahk @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * @version 8.2.0.03 (21.08.2011) + * @version 8.2.1.01 (14.09.2011) */ NAME := "bug.n" -VERSION := "8.2.0" +VERSION := "8.2.1" ; script settings OnExit, Main_cleanup diff --git a/src/Manager.ahk b/src/Manager.ahk index 5a2faf6..57d2aef 100644 --- a/src/Manager.ahk +++ b/src/Manager.ahk @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * @version 8.2.0.03 (02.09.2011) + * @version 8.2.1.01 (02.09.2011) */ Manager_init() { @@ -29,7 +29,7 @@ Manager_init() { DllCall("SetSysColors", "Int", 1, "Int*", 10, "UInt*", Config_selBorderColor) } If (Config_borderWidth > 0) Or (Config_borderPadding >= 0 And A_OSVersion = WIN_VISTA) { - ncmSize := VarSetCapacity(ncm, 44 + 5 * (28 + 32 * (A_IsUnicode ? 2 : 1)), 0) + ncmSize := VarSetCapacity(ncm, 4 * (A_OSVersion = WIN_VISTA ? 11 : 10) + 5 * (28 + 32 * (A_IsUnicode ? 2 : 1)), 0) NumPut(ncmSize, ncm, 0, "UInt") DllCall("SystemParametersInfo", "UInt", 0x0029, "UInt", ncmSize, "UInt", &ncm, "UInt", 0) Manager_borderWidth := NumGet(ncm, 4, "Int") @@ -147,7 +147,7 @@ Manager_cleanup() { If Config_selBorderColor DllCall("SetSysColors", "Int", 1, "Int*", 10, "UInt*", Manager_normBorderColor) If (Config_borderWidth > 0) Or (Config_borderPadding >= 0 And A_OSVersion = WIN_VISTA) { - ncmSize := VarSetCapacity(ncm, 44 + 5 * (28 + 32 * (A_IsUnicode ? 2 : 1)), 0) + ncmSize := VarSetCapacity(ncm, 4 * (A_OSVersion = WIN_VISTA ? 11 : 10) + 5 * (28 + 32 * (A_IsUnicode ? 2 : 1)), 0) NumPut(ncmSize, ncm, 0, "UInt") DllCall("SystemParametersInfo", "UInt", 0x0029, "UInt", ncmSize, "UInt", &ncm, "UInt", 0) If (Config_borderWidth > 0) diff --git a/src/Monitor.ahk b/src/Monitor.ahk index c0cb6b4..f25bd0e 100644 --- a/src/Monitor.ahk +++ b/src/Monitor.ahk @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * @version 8.2.0.03 (21.08.2011) + * @version 8.2.1.01 (21.08.2011) */ Monitor_init(m) { diff --git a/src/View.ahk b/src/View.ahk index 951d948..953c6a4 100644 --- a/src/View.ahk +++ b/src/View.ahk @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * @version 8.2.0.03 (11.08.2011) + * @version 8.2.1.01 (11.08.2011) */ View_init(m, v) { diff --git a/src/docs/configuration.t2t b/src/docs/configuration.t2t index c0d7a6a..780bf73 100644 --- a/src/docs/configuration.t2t +++ b/src/docs/configuration.t2t @@ -2,22 +2,30 @@ %!encoding: utf-8 %!options(html): --css-sugar -o configuration.html %!style(html): http://bugn.berlios.de/styles.css -%!preproc(html): '%%html: ' '' -%!postproc(html): '' '\nbug.n configuration variables' -%!postproc(html): '' '\n' -%!postproc(html): '' '\n' -%!postproc(html): '' '\n' -%!postproc(html): '' '\n' -%!postproc(html): '

' '

' -%!postproc(html): '%%LINK_hotkeys' 'bug.n/hotkeys' -%!postproc(html): '\(c\)' '©' +%!preproc(html): '%%html: ' '' +%!postproc(html): '' '\nberliOS project: bug.n -- Configuration' +%!postproc(html): '' '\n' +%!postproc(html): '' '\n' +%!postproc(html): '' '\n' +%!postproc(html): '' '\n' +%!postproc(html): 'bug.n/hotkeys' +%!postproc(html): '\(c\)' '©' %!options(txt): -o configuration.txt -%!preproc(txt): '%%txt: ' '' -%!postproc(txt): '%%LINK_hotkeys' 'docs/hotkeys.txt' -%!postproc(txt): '
' '' +%!preproc(txt): '%%txt: ' '' +%!postproc(txt): '%%LINK_hotkeys' 'docs/hotkeys.txt' +%!postproc(txt): '
' '' +%!postproc(txt): '
' '' -= bug.n/configuration = ------------------------------------------------------------------------- +'''
+%%html: '''
+%%html: | [bugn.png] | bug.n -- Configuration | [config.png] +%%txt: =bug.n -- Configuration= +%%html: ------------------------------------------------------------------------ +%%html: '''
=== bug.n GUI === @@ -275,6 +283,9 @@ settings. ''
'' +%%html: '''
------------------------------------------------------------------------ -%%html: (c) 2010-2011 joten, last modified %%date(%d.%m.%Y) ([View txt2tags source %%infile]) [http://bugn.berlios.de/images/jn.png] %%txt: (c) 2010-2011 joten, last modified %%date(%d.%m.%Y) +%%html: | (c) 2010-2011 joten, last modified %%date(%d.%m.%Y) | [jn.png] +%%html: '''
+%%html: '''
diff --git a/src/docs/help.t2t b/src/docs/help.t2t index 46d03d5..0f85922 100644 --- a/src/docs/help.t2t +++ b/src/docs/help.t2t @@ -2,25 +2,33 @@ %!encoding: utf-8 %!options(html): --css-sugar -o help.html %!style(html): http://bugn.berlios.de/styles.css -%!preproc(html): '%%html: ' '' -%!postproc(html): '' '\nbug.n help' -%!postproc(html): '' '\n' -%!postproc(html): '' '\n' -%!postproc(html): '' '\n' -%!postproc(html): '' '\n' -%!postproc(html): '

' '

' +%!preproc(html): '%%html: ' '' +%!postproc(html): '' '\nberliOS project: bug.n -- Help' +%!postproc(html): '' '\n' +%!postproc(html): '' '\n' +%!postproc(html): '' '\n' +%!postproc(html): '' '\n' +%!postproc(html): 'http://www.autohotkey.com/' '" TARGET="_blank">http://www.autohotkey.com/' %!postproc(html): '%%LINK_configuration' 'bug.n/configuration' -%!postproc(html): '%%LINK_hotkeys' 'bug.n/hotkeys' -%!postproc(html): '\(c\)' '©' +%!postproc(html): '%%LINK_hotkeys' 'bug.n/hotkeys' +%!postproc(html): '\(c\)' '©' %!options(txt): -o help.txt -%!preproc(txt): '%%txt: ' '' -%!postproc(txt): '
' '' +%!preproc(txt): '%%txt: ' '' +%!postproc(txt): '
' '' +%!postproc(txt): '
' '' %!postproc(txt): '%%LINK_configuration' 'docs/configuration.txt' -%!postproc(txt): '%%LINK_hotkeys' 'docs/hotkeys.txt' +%!postproc(txt): '%%LINK_hotkeys' 'docs/hotkeys.txt' -= bug.n/help = ------------------------------------------------------------------------- +'''
+%%html: '''
+%%html: | [bugn.png] | bug.n -- Help | [help.png] +%%txt: =bug.n -- Help= +%%html: ------------------------------------------------------------------------ +%%html: '''
bug.n is a tiling window manager for Microsoft Windows.''
'' The advantages of tiling window management over the standard stacking @@ -171,7 +179,11 @@ The following functions can also be controlled with the mouse: - A function can be selected from a list in the command GUI, which is accessible by cklickig on "#!" on the right end of the status bar. + ''
'' +%%html: '''
------------------------------------------------------------------------ -%%html: (c) 2010-2011 joten, last modified %%date(%d.%m.%Y) ([View txt2tags source %%infile]) [http://bugn.berlios.de/images/jn.png] %%txt: (c) 2010-2011 joten, last modified %%date(%d.%m.%Y) +%%html: | (c) 2010-2011 joten, last modified %%date(%d.%m.%Y) | [jn.png] +%%html: '''
+%%html: '''
diff --git a/src/docs/hotkeys.t2t b/src/docs/hotkeys.t2t index d90e098..e8ceedf 100644 --- a/src/docs/hotkeys.t2t +++ b/src/docs/hotkeys.t2t @@ -2,20 +2,28 @@ %!encoding: utf-8 %!options(html): --css-sugar -o hotkeys.html %!style(html): http://bugn.berlios.de/styles.css -%!preproc(html): '%%html: ' '' -%!postproc(html): '' '\nbug.n hotkeys' -%!postproc(html): '' '\n' -%!postproc(html): '' '\n' -%!postproc(html): '' '\n' -%!postproc(html): '' '\n' -%!postproc(html): '

' '

' -%!postproc(html): '\(c\)' '©' +%!preproc(html): '%%html: ' '' +%!postproc(html): '' '\nberliOS project: bug.n -- Hotkeys' +%!postproc(html): '' '\n' +%!postproc(html): '' '\n' +%!postproc(html): '' '\n' +%!postproc(html): '' '\n' +%!postproc(html): '' '' +%!preproc(txt): '%%txt: ' '' +%!postproc(txt): '
' '' +%!postproc(txt): '
' '' -= bug.n/hotkeys = ------------------------------------------------------------------------- +'''
+%%html: '''
+%%html: | [bugn.png] | bug.n -- Hotkeys | [hotkeys.png] +%%txt: =bug.n -- Hotkeys= +%%html: ------------------------------------------------------------------------ +%%html: '''
=== General description === @@ -204,7 +212,11 @@ pressing the left Windows key and the shift key and the q key : #^q::**ExitApp Quit bug.n, restore the default Windows UI and show all windows. + ''
'' +%%html: '''
------------------------------------------------------------------------ -%%html: (c) 2010-2011 joten, last modified %%date(%d.%m.%Y) ([View txt2tags source %%infile]) [http://bugn.berlios.de/images/jn.png] %%txt: (c) 2010-2011 joten, last modified %%date(%d.%m.%Y) +%%html: | (c) 2010-2011 joten, last modified %%date(%d.%m.%Y) | [jn.png] +%%html: '''
+%%html: '''