From: Jens G. <fi...@us...> - 2013-03-01 18:46:55
|
gemrb: Infinity Engine emulator The branch master has been updated via 3990b9da38f44b74b4b4fdb0eaee33e40ce9ba26 (commit) Summary of changes: gemrb/GUIScripts/GUIDefines.py | 3 +-- gemrb/core/GUI/Button.h | 5 +++-- gemrb/docs/en/GUIScript/SetButtonFlags.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) from 36f833c7f80804e9ea32c510ed5fa1b88e17c97e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=3990b9da38f44b74b4b4fdb0eaee33e40ce9ba26 commit 3990b9da38f44b74b4b4fdb0eaee33e40ce9ba26 Author: Jens Granseuer <je...@gm...> Date: Fri Mar 1 19:44:08 2013 +0100 remove unused ALT_SOUND flag and move CAPS back up into the safe 24 bits Top 8 bits of the field are reserved for a copy of the ControlID, so CAPS no longer worked since it got pushed into that range. diff --git a/gemrb/GUIScripts/GUIDefines.py b/gemrb/GUIScripts/GUIDefines.py index 9ab8efb..756ac42 100644 --- a/gemrb/GUIScripts/GUIDefines.py +++ b/gemrb/GUIScripts/GUIDefines.py @@ -25,7 +25,7 @@ IE_GUI_BUTTON_NORMAL = 0x00000004 #default button, doesn't stick IE_GUI_BUTTON_NO_IMAGE = 0x00000001 IE_GUI_BUTTON_PICTURE = 0x00000002 IE_GUI_BUTTON_SOUND = 0x00000004 -IE_GUI_BUTTON_ALT_SOUND = 0x00000008 +IE_GUI_BUTTON_CAPS = 0x00000008 #capitalize all the text IE_GUI_BUTTON_CHECKBOX = 0x00000010 #or radio button IE_GUI_BUTTON_RADIOBUTTON= 0x00000020 #sticks in a state IE_GUI_BUTTON_DEFAULT = 0x00000040 #enter key triggers it @@ -51,7 +51,6 @@ IE_GUI_BUTTON_CENTER_PICTURES = 0x00100000 # center the button's PictureList IE_GUI_BUTTON_BG1_PAPERDOLL = 0x00200000 # BG1-style paperdoll IE_GUI_BUTTON_HORIZONTAL = 0x00400000 # horizontal clipping of overlay IE_GUI_BUTTON_CANCEL = 0x00800000 # escape key triggers it -IE_GUI_BUTTON_CAPS = 0x01000000 # capitalize all the text (default for bg2) #scrollbar flags IE_GUI_SCROLLBAR_DEFAULT = 0x00000040 # mousewheel triggers it (same value as default button) diff --git a/gemrb/core/GUI/Button.h b/gemrb/core/GUI/Button.h index 66f3160..dfce887 100644 --- a/gemrb/core/GUI/Button.h +++ b/gemrb/core/GUI/Button.h @@ -56,7 +56,7 @@ class Palette; #define IE_GUI_BUTTON_NO_IMAGE 0x00000001 // don't draw image (BAM) #define IE_GUI_BUTTON_PICTURE 0x00000002 // draw picture (BMP, MOS, ...) #define IE_GUI_BUTTON_SOUND 0x00000004 -#define IE_GUI_BUTTON_ALT_SOUND 0x00000008 +#define IE_GUI_BUTTON_CAPS 0x00000008 // convert text to uppercase #define IE_GUI_BUTTON_CHECKBOX 0x00000010 // or radio button #define IE_GUI_BUTTON_RADIOBUTTON 0x00000020 // sticks in a state #define IE_GUI_BUTTON_DEFAULT 0x00000040 // enter key triggers it @@ -81,7 +81,8 @@ class Palette; #define IE_GUI_BUTTON_BG1_PAPERDOLL 0x00200000 // BG1-style paperdoll PictureList #define IE_GUI_BUTTON_HORIZONTAL 0x00400000 // horizontal clipping of overlay #define IE_GUI_BUTTON_CANCEL 0x00800000 // cancel key triggers it -#define IE_GUI_BUTTON_CAPS 0x01000000 // convert text to uppercase +//WARNING: we cannot add any more flags here +//the top 8 bits are reserved for the control ID (see setFlags) //composite button flags #define IE_GUI_BUTTON_NORMAL 0x00000004 // default button, doesn't stick diff --git a/gemrb/docs/en/GUIScript/SetButtonFlags.txt b/gemrb/docs/en/GUIScript/SetButtonFlags.txt index 480d574..470a8b1 100644 --- a/gemrb/docs/en/GUIScript/SetButtonFlags.txt +++ b/gemrb/docs/en/GUIScript/SetButtonFlags.txt @@ -11,7 +11,7 @@ Flags - various bits altering the behaviour of the control IE_GUI_BUTTON_NO_IMAGE = 0x00000001, no button image set by SetButtonSprites IE_GUI_BUTTON_PICTURE = 0x00000002, has picture set by other SetButton* commands IE_GUI_BUTTON_SOUND = 0x00000004, clicking the button has a sound -IE_GUI_BUTTON_ALT_SOUND = 0x00000008, clicking the button has a different sound +IE_GUI_BUTTON_CAPS = 0x00000008, uppercase the button label IE_GUI_BUTTON_CHECKBOX = 0x00000010, it is a checkbox IE_GUI_BUTTON_RADIOBUTTON= 0x00000020, it is a radio button IE_GUI_BUTTON_DEFAULT = 0x00000040, it is the default button ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |