Merge from BRANCH

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@893 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2010-09-22 09:38:25 +00:00
commit b2d2711256
2 changed files with 19 additions and 7 deletions

View file

@ -58,6 +58,15 @@ If this is true Greenshot will show a balloon at the Systray Icon.
Default is true, will be false after the first start.
Example to change: greenshot.exe /configure General_IsFirstLaunch=false
Hotkey=UInt32
This setting is currently for Greenshot internal usage, it specifies which the hotkey to use (default PrintScreen)!
Although one could change his Hotkey, for instance to the ScrollLock, there is currently no way of changing the modifieds (Shift/Alt etc)
and the changes won't be reflected in the context menu. (Due to work on the Greenshot 0.9 version)
You can lookup the codes here: http://www.liquidcabaret.com/webhelp/ams/Program_Reference/Misc/Virtual_Key_Codes.htm
Only decimal can be passed to Greenshot!
Example, changeing the hotkey to be "ScrollLock": greenshot.exe /configure Hotkey=44 /norun
Changeing back to "PrintScreen": greenshot.exe /configure Hotkey=145 /norun
Capture_Mousepointer=Boolean
This setting, which is available in the settings window, specifies if Greenshot will capture the mouse cursor.
Default is true.
@ -94,13 +103,15 @@ Example to change: greenshot.exe /configure Ui_Effects_CameraSound=false
Output_File_Path=String
This setting, which is available in the settings window, specifies the default location for all captures.
This value can also contain environment variables which will be expanded at runtime, e.g. ${TMP}
Default is the users desktop.
Example to change: greenshot.exe /configure Output_File_Path="C:\Documents and Settings\"
Example to change: greenshot.exe /configure Output_File_Path="${USERPROFILE}\Pictures"
Output_File_FilenamePattern=String
This setting, which is available in the settings window, specifies the default filename pattern.
Default is "%title%_%YYYY%-%MM%-%DD%_%hh%-%mm%-%ss%".
Example to change: greenshot.exe /configure Output_File_FilenamePattern="%hostname%\%user%\%title%-%NUM%"
This value can also contain environment variables which will be expanded at runtime, e.g. ${USERNAME}
Default is "${capturetime}_${title}"
Example to change: greenshot.exe /configure Output_File_FilenamePattern="${hostname}\${user}\${title}-${NUM}"
Output_File_Format=String
This setting, which is available in the settings window, specifies the default file type.
@ -123,7 +134,7 @@ Default is false
Example to change: greenshot.exe /configure Output_File_PromptJpegQuality=true
Output_File_IncrementingNumber=Int32
This setting specifies the number which is used in the filename pattern as "%NUM%".
This setting specifies the number which is used in the filename pattern as "${NUM}".
Default is 0, will increment at every save.
Example to change: greenshot.exe /configure Output_File_IncrementingNumber=10

View file

@ -17,6 +17,7 @@ Bugs resolved:
* Systray icon wasn't removed when stopping Greenshot
* Installer fixes for silent installation and the selected installer language will be passed to Greenshot
* Hotkeys on Windows 7 x64 weren't working, should be okay now.
* Changed variable naming from %VAR% to ${VAR} to prevent early resolving on the command-line
Features added:
* Dutch is added to all Greenshot parts (application, plugins and installer)
@ -28,8 +29,9 @@ Features added:
This should allow you to change the language which is used to OCR your selection!
* Added a simple plugin that will cut the "garbage" from the Internet Explorer and Firefox title when capturing
currently the behaviour can only be controlled by changing the configuration manually (titlefix.properties in the configuration directory)
0.8.0:
* Added environment variable support for the filename and path. Now one can use e.g. "${TMP}"...
0.8.0
Bugs resolved:
* save-as dialog honors default storage location again
@ -67,7 +69,6 @@ Features added:
* Changed language from compiled resources to flexible xml files, user can add their own languages
* Added "Select all" option for image editor
* Added "Drag to", you can now drag images or image files to the Greenshot image editor.
* Added command-line options, now it is possible to change the configuration by using the commandline. See "installer.txt"
0.7