Merge all changes from the depot
This commit is contained in:
commit
321112bcff
11 changed files with 766 additions and 752 deletions
|
@ -4,3 +4,4 @@ src/log.txt
|
|||
syntax: regexp
|
||||
.*[cC]onfig.*\.ini
|
||||
.+\.\w{3}~
|
||||
src/data/_.*.ini
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
@version 8.3.0
|
||||
@version 8.4.0
|
||||
*/
|
||||
|
||||
Bar_init(m)
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
@version 8.3.0
|
||||
@version 8.4.0
|
||||
*/
|
||||
|
||||
Config_init()
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
@version 8.3.0
|
||||
@version 8.4.0
|
||||
*/
|
||||
|
||||
Debug_initLog(filename, level = 0, truncateFile = True)
|
||||
|
|
16
src/Main.ahk
16
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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
@version 8.3.0
|
||||
@version 8.4.0
|
||||
*/
|
||||
|
||||
NAME := "bug.n"
|
||||
VERSION := "8.3.0"
|
||||
VERSION := "8.4.0"
|
||||
|
||||
;; Script settings
|
||||
OnExit, Main_cleanup
|
||||
|
@ -33,9 +33,7 @@ SetWinDelay, 10
|
|||
|
||||
;; Pseudo main function
|
||||
If 0 = 1
|
||||
Main_dataDir = %1%
|
||||
Else
|
||||
Main_dataDir = %A_ScriptDir%
|
||||
Main_appDir = %1%
|
||||
|
||||
Main_setup()
|
||||
|
||||
|
@ -46,8 +44,8 @@ SetWinDelay, 10
|
|||
Config_init()
|
||||
|
||||
Menu, Tray, Tip, %NAME% %VERSION%
|
||||
IfExist %A_ScriptDir%\images\kfm.ico
|
||||
Menu, Tray, Icon, %A_ScriptDir%\images\kfm.ico
|
||||
IfExist %A_ScriptDir%\logo.ico
|
||||
Menu, Tray, Icon, %A_ScriptDir%\logo.ico
|
||||
Menu, Tray, NoStandard
|
||||
Menu, Tray, Add, Toggle bar, Main_toggleBar
|
||||
Menu, Tray, Add, Help, Main_help
|
||||
|
@ -154,7 +152,6 @@ Main_makeDir(dirName) {
|
|||
Main_setup() {
|
||||
Local winAppDir
|
||||
|
||||
Main_appDir := ""
|
||||
Main_logFile := ""
|
||||
Main_dataDir := ""
|
||||
Main_autoLayout := ""
|
||||
|
@ -162,7 +159,8 @@ Main_setup() {
|
|||
|
||||
EnvGet, winAppDir, APPDATA
|
||||
|
||||
Main_appDir := winAppDir . "\bug.n"
|
||||
If (Main_appDir = "")
|
||||
Main_appDir := winAppDir . "\bug.n"
|
||||
Main_logFile := Main_appDir . "\bugn_log.txt"
|
||||
Main_dataDir := Main_appDir . "\data"
|
||||
Main_autoLayout := Main_dataDir . "\_Layout.ini"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
@version 8.3.0
|
||||
@version 8.4.0
|
||||
*/
|
||||
|
||||
Manager_init()
|
||||
|
@ -114,8 +114,6 @@ Manager_maintenance()
|
|||
|
||||
; @todo: Manager_sync?
|
||||
|
||||
Manager__displaySync()
|
||||
|
||||
If Not (Config_autoSaveSession = "off") And Not (Config_autoSaveSession = "False")
|
||||
Manager_saveState()
|
||||
}
|
||||
|
@ -385,7 +383,7 @@ Manager_loop(index, increment, lowerBound, upperBound)
|
|||
Return, index
|
||||
}
|
||||
|
||||
Manager__setWinProperties(wndId, isManaged, m, tags, isDecorated, isFloating, hideTitle )
|
||||
Manager__setWinProperties(wndId, isManaged, m, tags, isDecorated, isFloating, hideTitle, action = "")
|
||||
{
|
||||
Local a
|
||||
|
||||
|
@ -394,6 +392,9 @@ Manager__setWinProperties(wndId, isManaged, m, tags, isDecorated, isFloating, hi
|
|||
|
||||
If (isManaged)
|
||||
{
|
||||
If (action = "Close" Or action = "Maximize")
|
||||
Manager_win%action%(wndId)
|
||||
|
||||
Manager_managedWndIds .= wndId ";"
|
||||
Monitor_moveWindow(m, wndId)
|
||||
Manager_#%wndId%_tags := tags
|
||||
|
@ -480,7 +481,7 @@ Manager_manage(preferredMonitor, preferredView, wndId)
|
|||
isManaged := False
|
||||
}
|
||||
|
||||
a := Manager__setWinProperties( wndId, isManaged, m, tags, isDecorated, isFloating, hideTitle)
|
||||
a := Manager__setWinProperties( wndId, isManaged, m, tags, isDecorated, isFloating, hideTitle, action)
|
||||
|
||||
; Do view placement.
|
||||
If isManaged {
|
||||
|
|
|
@ -15,9 +15,10 @@
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
@version 8.3.0
|
||||
@version 8.4.0
|
||||
*/
|
||||
|
||||
|
||||
Monitor_init(m, doRestore)
|
||||
{
|
||||
Global
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
@version 8.3.0
|
||||
@version 8.4.0
|
||||
*/
|
||||
|
||||
ResourceMonitor_init()
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
@version 8.3.0
|
||||
@version 8.4.0
|
||||
*/
|
||||
|
||||
View_init(m, v)
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
(~) changed
|
||||
(+) added
|
||||
|
||||
=?????=
|
||||
|
||||
=8.4.0=
|
||||
|
||||
(+) Session auto-save and restore. Layout and Window information is
|
||||
stored periodically so that it may be recovered after a restart.
|
||||
|
|
|
@ -38,32 +38,37 @@ window management of Microsoft Windows are as follows:
|
|||
available screen estate.
|
||||
|
||||
|
||||
Additionally bug.n increases the available screen estate by freeing up
|
||||
the space occupied by
|
||||
- the Microsoft Windows Taskbar
|
||||
Additionally bug.n can increase the available screen estate by freeing
|
||||
up the space occupied by
|
||||
- the Microsoft Windows Taskbar and
|
||||
- the title bar for every single window
|
||||
|
||||
|
||||
by hiding and replacing all with a single slim status bar (but bug.n is
|
||||
not a shell replacement).
|
||||
|
||||
This status bar may show the following:
|
||||
- system information
|
||||
- time
|
||||
- date
|
||||
- CPU usage
|
||||
- battery level
|
||||
This status bar shows the following:
|
||||
- active window title
|
||||
- layout
|
||||
- []= (tile)
|
||||
- [M] (monocle)
|
||||
- ><> (floating)
|
||||
- layout, e. g.
|
||||
- 1x1|= (tile)
|
||||
- [0] (monocle)
|
||||
- ><> (floating)
|
||||
- up to nine views indicating
|
||||
- the active view
|
||||
- how many windows are tagged with and shown on the view with the same
|
||||
number
|
||||
|
||||
|
||||
Additionally it can show the following system information:
|
||||
- time
|
||||
- date
|
||||
- CPU usage
|
||||
- memory usage
|
||||
- disk load
|
||||
- network load
|
||||
- battery level
|
||||
|
||||
|
||||
=== Layouts ===
|
||||
|
||||
There are three layouts.
|
||||
|
@ -74,7 +79,8 @@ There are three layouts.
|
|||
- the dimensions of the master area (1x1 ... 2x3 ... 9x9)
|
||||
- the stacking direction of the master and stacking area (from left to
|
||||
right, from top to bottom or monocle)
|
||||
- the position of the master area (left, top, right or bottom)
|
||||
- the position of the master area (left, top, right or bottom) and
|
||||
accordingly the position of the stacking area
|
||||
- the witdh or height of the master area (depending on its position)
|
||||
+ **monocle**''<BR>''
|
||||
All windows are maximized and only one is shown at any time.
|
||||
|
@ -109,10 +115,13 @@ read and write access. This is the only requirement for using bug.n (at
|
|||
least for saving the bug.n configuration file). Apart from that you may
|
||||
copy bug.n to any directory.
|
||||
If you want to save it to a directory, to which you do not have write
|
||||
access, you will have to run bug.n with a parameter indicating the file
|
||||
path to the configuration file (<file path to the bug.n executable>
|
||||
<file path to the session file>), e. g.
|
||||
"C:\Program Files\bugn\bugn.exe C:\Users\joten\bugn.ini".
|
||||
access and do not want to use the default directory for application data
|
||||
(APPDATA, e. g. C:\Users\joten\AppData\Roaming\bug.n), you will have to
|
||||
run bug.n with a parameter indicating the file path to that application
|
||||
data directory, which i. a. contains the configuration file (config.ini)
|
||||
(<file path to the bug.n executable> <file path to the data directory>),
|
||||
e. g.
|
||||
"C:\Program Files\bugn\bugn.exe D:\projects\bugn".
|
||||
|
||||
|
||||
=== Microsoft Windows Vista / 7 and UAC ===
|
||||
|
@ -132,35 +141,37 @@ file properties.
|
|||
|
||||
Customization can be done
|
||||
- with configuration variables for
|
||||
- the appearance of the bug.n status bar (font, colour and content)
|
||||
- the appearance of the bug.n status bar (position, size, font,
|
||||
colour and content)
|
||||
- controlling Windows UI elements (border width and colour, hiding
|
||||
elements)
|
||||
- default values (number of tags, layouts, runtime and session
|
||||
management)
|
||||
- rules controlling specific windows (i. a. exclusions)
|
||||
- rules controlling specific windows (i. a. excluding windows from
|
||||
tiling window management)
|
||||
- for hotkeys (the key bindings for the bug.n functions)
|
||||
|
||||
|
||||
The available configuration variables are listed in
|
||||
%%LINK_configuration.''<BR>''
|
||||
To change these, first create a session file by using the hotkey
|
||||
To change these, first create a configuration file by using the hotkey
|
||||
"WIN+CTRL+S". The file is either saved in the directory you specified
|
||||
with the parameter to the executable, or in the same directory where the
|
||||
executable is saved. You may then edit the file with a text editor
|
||||
("WIN+CTRL+E" opens the file for editing) and add a new line for each
|
||||
configuration variable with its value (format: <variable>=<value>, use
|
||||
no quotation marks, 1 for true and 0 for false), e. g.
|
||||
"Config_showBar=0". You will have to quit and run bug.n again for the
|
||||
changes to take effect.''<BR>''
|
||||
You may find a sample configuration file (Config_example.ini) in the
|
||||
"Config_showBar=0". You will have to reload bug.n for the changes to
|
||||
take effect.''<BR>''
|
||||
You may find a sample configuration file (config_example.ini) in the
|
||||
main directory of bug.n.
|
||||
|
||||
|
||||
== Usage ==
|
||||
|
||||
bug.n is mostly controlled with hotkeys. The available hotkeys are
|
||||
listed in %%LINK_hotkeys. A list of all functions is available through
|
||||
the command GUI. For a quick help there are the following hotkeys:
|
||||
listed in %%LINK_hotkeys. For a quick help there are the following
|
||||
hotkeys:
|
||||
- WIN+Y: Show the command GUI.
|
||||
- WIN+Space: Show / Hide the Windows Taskbar.
|
||||
- WIN+CTRL+Q: Quit bug.n and restore all windows and Windows UI
|
||||
|
@ -176,8 +187,9 @@ The following functions can also be controlled with the mouse:
|
|||
layout to the last used.
|
||||
- With a right-click on the layout symbol you can set the layout to the
|
||||
next in the list.
|
||||
- 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.
|
||||
- A function can be selected from a list or entered in the command GUI,
|
||||
which is accessible by cklickig on "#!" on the right end of the status
|
||||
bar.
|
||||
|
||||
|
||||
''<BR>''
|
||||
|
|
Loading…
Reference in a new issue