2009-02-04 11:52:16 +00:00
/**
* * * * * * BEGIN GPL LICENSE BLOCK * * * * *
*
* This program is free software ; you can redistribute it and / or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation ; either version 2
* of the License , or ( at your option ) any later version .
*
* This program is distributed in the hope that it will be useful ,
* but WITHOUT ANY WARRANTY ; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the
* GNU General Public License for more details .
*
* You should have received a copy of the GNU General Public License
* along with this program ; if not , write to the Free Software Foundation ,
* Inc . , 59 Temple Place - Suite 330 , Boston , MA 02111 - 1307 , USA .
*
* The Original Code is Copyright ( C ) 2009 Blender Foundation .
* All rights reserved .
*
* Contributor ( s ) : Blender Foundation
*
* * * * * * END GPL LICENSE BLOCK * * * * *
*/
# include <math.h>
# include <stdlib.h>
# include <string.h>
# include "MEM_guardedalloc.h"
2.5
Smaller jobs, all in one commit!
- Moved object_do_update out of view3d drawing, into
the event system (currently after notifiers).
Depsgraph calls for setting update flags will have to
keep track of each Screen's needs, so a UI showing only
a Sequencer doesn't do objects.
- Added button in "Properties region" in 3D window to set
or disable 4-split, including the 3 options it has.
(lock, box, clip)
- Restored legacy code for UI, to make things work like
bone rename, autocomplete.
- Node editor now shows Curves widgets again
- Bugfix: composite job increased Viewer user id count
- Bugfix: Node editor, not "Enable nodes" still called
a Job, which didn't do anything
- Various code cleaning, unused vars and prototypes.
2009-02-11 16:54:55 +00:00
# include "DNA_action_types.h"
# include "DNA_color_types.h"
2009-02-04 11:52:16 +00:00
# include "DNA_listBase.h"
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
# include "DNA_material_types.h"
2.5
Smaller jobs, all in one commit!
- Moved object_do_update out of view3d drawing, into
the event system (currently after notifiers).
Depsgraph calls for setting update flags will have to
keep track of each Screen's needs, so a UI showing only
a Sequencer doesn't do objects.
- Added button in "Properties region" in 3D window to set
or disable 4-split, including the 3 options it has.
(lock, box, clip)
- Restored legacy code for UI, to make things work like
bone rename, autocomplete.
- Node editor now shows Curves widgets again
- Bugfix: composite job increased Viewer user id count
- Bugfix: Node editor, not "Enable nodes" still called
a Job, which didn't do anything
- Various code cleaning, unused vars and prototypes.
2009-02-11 16:54:55 +00:00
# include "DNA_object_types.h"
2009-02-04 11:52:16 +00:00
# include "DNA_screen_types.h"
# include "DNA_windowmanager_types.h"
2.5
Smaller jobs, all in one commit!
- Moved object_do_update out of view3d drawing, into
the event system (currently after notifiers).
Depsgraph calls for setting update flags will have to
keep track of each Screen's needs, so a UI showing only
a Sequencer doesn't do objects.
- Added button in "Properties region" in 3D window to set
or disable 4-split, including the 3 options it has.
(lock, box, clip)
- Restored legacy code for UI, to make things work like
bone rename, autocomplete.
- Node editor now shows Curves widgets again
- Bugfix: composite job increased Viewer user id count
- Bugfix: Node editor, not "Enable nodes" still called
a Job, which didn't do anything
- Various code cleaning, unused vars and prototypes.
2009-02-11 16:54:55 +00:00
# include "BKE_colortools.h"
2009-02-04 11:52:16 +00:00
# include "BKE_context.h"
# include "BKE_idprop.h"
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
# include "BKE_library.h"
# include "BKE_main.h"
2009-02-04 11:52:16 +00:00
# include "BKE_utildefines.h"
# include "RNA_access.h"
# include "UI_interface.h"
# include "UI_resources.h"
2.5
Smaller jobs, all in one commit!
- Moved object_do_update out of view3d drawing, into
the event system (currently after notifiers).
Depsgraph calls for setting update flags will have to
keep track of each Screen's needs, so a UI showing only
a Sequencer doesn't do objects.
- Added button in "Properties region" in 3D window to set
or disable 4-split, including the 3 options it has.
(lock, box, clip)
- Restored legacy code for UI, to make things work like
bone rename, autocomplete.
- Node editor now shows Curves widgets again
- Bugfix: composite job increased Viewer user id count
- Bugfix: Node editor, not "Enable nodes" still called
a Job, which didn't do anything
- Various code cleaning, unused vars and prototypes.
2009-02-11 16:54:55 +00:00
# include "ED_screen.h"
2009-02-04 11:52:16 +00:00
# include "ED_util.h"
# include "WM_api.h"
# include "WM_types.h"
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
# include "interface_intern.h"
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
# define DEF_BUT_WIDTH 150
# define DEF_ICON_BUT_WIDTH 20
# define DEF_BUT_HEIGHT 20
2009-02-04 11:52:16 +00:00
/*************************** RNA Utilities ******************************/
int UI_GetIconRNA ( PointerRNA * ptr )
{
StructRNA * rnatype = ptr - > type ;
if ( rnatype = = & RNA_Scene )
2009-02-18 05:54:37 +00:00
return ICON_SCENE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_World )
2009-02-18 05:54:37 +00:00
return ICON_WORLD_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Object )
2009-02-18 05:54:37 +00:00
return ICON_OBJECT_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Mesh )
2009-02-18 05:54:37 +00:00
return ICON_MESH_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_MeshVertex )
return ICON_VERTEXSEL ;
else if ( rnatype = = & RNA_MeshEdge )
return ICON_EDGESEL ;
else if ( rnatype = = & RNA_MeshFace )
return ICON_FACESEL ;
else if ( rnatype = = & RNA_MeshTextureFace )
return ICON_FACESEL_HLT ;
else if ( rnatype = = & RNA_VertexGroup )
2009-05-23 07:19:31 +00:00
return ICON_GROUP_VERTEX ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_VertexGroupElement )
2009-05-23 07:19:31 +00:00
return ICON_GROUP_VERTEX ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Curve )
2009-02-18 05:54:37 +00:00
return ICON_CURVE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_MetaBall )
2009-05-04 07:04:48 +00:00
return ICON_META_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_MetaElement )
return ICON_OUTLINER_DATA_META ;
else if ( rnatype = = & RNA_Lattice )
2009-02-18 05:54:37 +00:00
return ICON_LATTICE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Armature )
2009-02-18 05:54:37 +00:00
return ICON_ARMATURE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Bone )
2009-02-18 05:54:37 +00:00
return ICON_BONE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Camera )
2009-02-18 05:54:37 +00:00
return ICON_CAMERA_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_LocalLamp )
2009-02-18 05:54:37 +00:00
return ICON_LAMP_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_AreaLamp )
2009-02-18 05:54:37 +00:00
return ICON_LAMP_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_SpotLamp )
2009-02-18 05:54:37 +00:00
return ICON_LAMP_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_SunLamp )
2009-02-18 05:54:37 +00:00
return ICON_LAMP_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_HemiLamp )
2009-02-18 05:54:37 +00:00
return ICON_LAMP_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Lamp )
2009-02-18 05:54:37 +00:00
return ICON_LAMP_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Group )
return ICON_GROUP ;
else if ( rnatype = = & RNA_ParticleSystem )
2009-02-18 05:54:37 +00:00
return ICON_PARTICLE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_ParticleSettings )
2009-02-18 05:54:37 +00:00
return ICON_PARTICLE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Material )
2009-02-18 05:54:37 +00:00
return ICON_MATERIAL_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Texture )
2009-02-18 05:54:37 +00:00
return ICON_TEXTURE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_TextureSlot )
2009-02-18 05:54:37 +00:00
return ICON_TEXTURE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_WorldTextureSlot )
2009-02-18 05:54:37 +00:00
return ICON_TEXTURE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_MaterialTextureSlot )
2009-02-18 05:54:37 +00:00
return ICON_TEXTURE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Image )
2009-02-18 05:54:37 +00:00
return ICON_IMAGE_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Screen )
return ICON_SPLITSCREEN ;
else if ( rnatype = = & RNA_NodeTree )
return ICON_NODE ;
else if ( rnatype = = & RNA_Text )
return ICON_TEXT ;
else if ( rnatype = = & RNA_Sound )
return ICON_SOUND ;
else if ( rnatype = = & RNA_Brush )
2009-02-18 05:54:37 +00:00
return ICON_BRUSH_DATA ;
2009-02-10 02:39:19 +00:00
else if ( rnatype = = & RNA_VectorFont )
2009-05-04 07:04:48 +00:00
return ICON_FONT_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Library )
2009-02-18 05:54:37 +00:00
return ICON_LIBRARY_DATA_DIRECT ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Action )
return ICON_ACTION ;
else if ( rnatype = = & RNA_FCurve )
2009-02-18 05:54:37 +00:00
return ICON_ANIM_DATA ;
2009-02-04 11:52:16 +00:00
//else if(rnatype == &RNA_Ipo)
2009-02-18 05:54:37 +00:00
// return ICON_ANIM_DATA;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Key )
2009-02-18 05:54:37 +00:00
return ICON_SHAPEKEY_DATA ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_Main )
return ICON_BLENDER ;
else if ( rnatype = = & RNA_Struct )
return ICON_RNA ;
else if ( rnatype = = & RNA_Property )
return ICON_RNA ;
else if ( rnatype = = & RNA_BooleanProperty )
return ICON_RNA ;
else if ( rnatype = = & RNA_IntProperty )
return ICON_RNA ;
else if ( rnatype = = & RNA_FloatProperty )
return ICON_RNA ;
else if ( rnatype = = & RNA_StringProperty )
return ICON_RNA ;
else if ( rnatype = = & RNA_EnumProperty )
return ICON_RNA ;
else if ( rnatype = = & RNA_EnumPropertyItem )
return ICON_RNA ;
else if ( rnatype = = & RNA_PointerProperty )
return ICON_RNA ;
else if ( rnatype = = & RNA_CollectionProperty )
return ICON_RNA ;
else if ( rnatype = = & RNA_GameObjectSettings )
return ICON_GAME ;
else if ( rnatype = = & RNA_ScriptLink )
return ICON_PYTHON ;
/* modifiers */
else if ( rnatype = = & RNA_SubsurfModifier )
return ICON_MOD_SUBSURF ;
else if ( rnatype = = & RNA_ArmatureModifier )
2009-02-18 05:54:37 +00:00
return ICON_MOD_ARMATURE ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_LatticeModifier )
2009-02-18 05:54:37 +00:00
return ICON_MOD_LATTICE ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_CurveModifier )
2009-02-18 05:54:37 +00:00
return ICON_MOD_CURVE ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_BuildModifier )
return ICON_MOD_BUILD ;
else if ( rnatype = = & RNA_MirrorModifier )
return ICON_MOD_MIRROR ;
else if ( rnatype = = & RNA_DecimateModifier )
return ICON_MOD_DECIM ;
else if ( rnatype = = & RNA_WaveModifier )
return ICON_MOD_WAVE ;
else if ( rnatype = = & RNA_HookModifier )
return ICON_HOOK ;
else if ( rnatype = = & RNA_SoftbodyModifier )
return ICON_MOD_SOFT ;
else if ( rnatype = = & RNA_BooleanModifier )
return ICON_MOD_BOOLEAN ;
else if ( rnatype = = & RNA_ParticleInstanceModifier )
2009-05-04 07:04:48 +00:00
return ICON_MOD_PARTICLES ;
2009-02-04 11:52:16 +00:00
else if ( rnatype = = & RNA_ParticleSystemModifier )
return ICON_MOD_PARTICLES ;
else if ( rnatype = = & RNA_EdgeSplitModifier )
return ICON_MOD_EDGESPLIT ;
else if ( rnatype = = & RNA_ArrayModifier )
return ICON_MOD_ARRAY ;
else if ( rnatype = = & RNA_UVProjectModifier )
return ICON_MOD_UVPROJECT ;
else if ( rnatype = = & RNA_DisplaceModifier )
return ICON_MOD_DISPLACE ;
2009-04-29 02:47:28 +00:00
else if ( rnatype = = & RNA_ShrinkwrapModifier )
return ICON_MOD_SHRINKWRAP ;
else if ( rnatype = = & RNA_CastModifier )
return ICON_MOD_CAST ;
else if ( rnatype = = & RNA_MeshDeformModifier )
return ICON_MOD_MESHDEFORM ;
else if ( rnatype = = & RNA_BevelModifier )
return ICON_MOD_BEVEL ;
else if ( rnatype = = & RNA_SmoothModifier )
return ICON_MOD_SMOOTH ;
else if ( rnatype = = & RNA_SimpleDeformModifier )
return ICON_MOD_SIMPLEDEFORM ;
else if ( rnatype = = & RNA_MaskModifier )
return ICON_MOD_MASK ;
else if ( rnatype = = & RNA_ClothModifier )
return ICON_MOD_CLOTH ;
else if ( rnatype = = & RNA_ExplodeModifier )
return ICON_MOD_EXPLODE ;
2009-05-04 07:04:48 +00:00
else if ( rnatype = = & RNA_CollisionModifier )
return ICON_MOD_PHYSICS ;
2009-05-05 02:24:58 +00:00
else if ( rnatype = = & RNA_FluidSimulationModifier )
return ICON_MOD_FLUIDSIM ;
else if ( rnatype = = & RNA_MultiresModifier )
return ICON_MOD_MULTIRES ;
2009-02-04 11:52:16 +00:00
else
return ICON_DOT ;
}
2009-03-13 13:38:41 +00:00
uiBut * uiDefAutoButR ( uiBlock * block , PointerRNA * ptr , PropertyRNA * prop , int index , char * name , int icon , int x1 , int y1 , int x2 , int y2 )
2009-02-04 11:52:16 +00:00
{
uiBut * but = NULL ;
2009-04-19 13:37:59 +00:00
const char * propname = RNA_property_identifier ( prop ) ;
int arraylen = RNA_property_array_length ( prop ) ;
2009-02-04 11:52:16 +00:00
2009-04-19 13:37:59 +00:00
switch ( RNA_property_type ( prop ) ) {
2009-02-04 11:52:16 +00:00
case PROP_BOOLEAN : {
int value , length ;
if ( arraylen & & index = = - 1 )
return NULL ;
2009-04-19 13:37:59 +00:00
length = RNA_property_array_length ( prop ) ;
2009-02-04 11:52:16 +00:00
if ( length )
value = RNA_property_boolean_get_index ( ptr , prop , index ) ;
else
value = RNA_property_boolean_get ( ptr , prop ) ;
2009-03-13 13:38:41 +00:00
if ( icon & & name & & strcmp ( name , " " ) = = 0 )
but = uiDefIconButR ( block , ICONTOG , 0 , icon , x1 , y1 , x2 , y2 , ptr , propname , index , 0 , 0 , - 1 , - 1 , NULL ) ;
else if ( icon )
but = uiDefIconTextButR ( block , ICONTOG , 0 , icon , name , x1 , y1 , x2 , y2 , ptr , propname , index , 0 , 0 , - 1 , - 1 , NULL ) ;
else
2009-05-27 00:03:49 +00:00
but = uiDefButR ( block , OPTION , 0 , name , x1 , y1 , x2 , y2 , ptr , propname , index , 0 , 0 , - 1 , - 1 , NULL ) ;
2009-02-04 11:52:16 +00:00
break ;
}
case PROP_INT :
case PROP_FLOAT :
if ( arraylen & & index = = - 1 ) {
2009-04-19 13:37:59 +00:00
if ( RNA_property_subtype ( prop ) = = PROP_COLOR )
2009-02-04 11:52:16 +00:00
but = uiDefButR ( block , COL , 0 , name , x1 , y1 , x2 , y2 , ptr , propname , 0 , 0 , 0 , - 1 , - 1 , NULL ) ;
}
2009-04-19 13:37:59 +00:00
else if ( RNA_property_subtype ( prop ) = = PROP_PERCENTAGE )
2009-02-17 21:07:01 +00:00
but = uiDefButR ( block , NUMSLI , 0 , name , x1 , y1 , x2 , y2 , ptr , propname , index , 0 , 0 , - 1 , - 1 , NULL ) ;
2009-02-04 11:52:16 +00:00
else
but = uiDefButR ( block , NUM , 0 , name , x1 , y1 , x2 , y2 , ptr , propname , index , 0 , 0 , - 1 , - 1 , NULL ) ;
break ;
case PROP_ENUM :
but = uiDefButR ( block , MENU , 0 , NULL , x1 , y1 , x2 , y2 , ptr , propname , index , 0 , 0 , - 1 , - 1 , NULL ) ;
break ;
case PROP_STRING :
but = uiDefButR ( block , TEX , 0 , name , x1 , y1 , x2 , y2 , ptr , propname , index , 0 , 0 , - 1 , - 1 , NULL ) ;
break ;
case PROP_POINTER : {
PointerRNA pptr ;
int icon ;
pptr = RNA_property_pointer_get ( ptr , prop ) ;
2009-03-13 13:38:41 +00:00
if ( ! pptr . type )
2009-04-19 13:37:59 +00:00
pptr . type = RNA_property_pointer_type ( prop ) ;
2009-02-04 11:52:16 +00:00
icon = UI_GetIconRNA ( & pptr ) ;
2009-03-13 13:38:41 +00:00
2009-03-30 17:31:37 +00:00
but = uiDefIconTextButR ( block , IDPOIN , 0 , icon , name , x1 , y1 , x2 , y2 , ptr , propname , index , 0 , 0 , - 1 , - 1 , NULL ) ;
2009-02-04 11:52:16 +00:00
break ;
}
case PROP_COLLECTION : {
char text [ 256 ] ;
sprintf ( text , " %d items " , RNA_property_collection_length ( ptr , prop ) ) ;
but = uiDefBut ( block , LABEL , 0 , text , x1 , y1 , x2 , y2 , NULL , 0 , 0 , 0 , 0 , NULL ) ;
uiButSetFlag ( but , UI_BUT_DISABLED ) ;
break ;
}
default :
but = NULL ;
break ;
}
return but ;
}
2009-05-19 17:13:33 +00:00
void uiDefAutoButsRNA ( const bContext * C , uiLayout * layout , PointerRNA * ptr )
2009-02-04 11:52:16 +00:00
{
CollectionPropertyIterator iter ;
PropertyRNA * iterprop , * prop ;
2009-05-19 17:13:33 +00:00
uiLayout * split ;
2009-03-25 14:34:17 +00:00
char * name ;
2009-02-04 11:52:16 +00:00
2009-04-19 13:37:59 +00:00
uiItemL ( layout , ( char * ) RNA_struct_ui_name ( ptr - > type ) , 0 ) ;
2009-02-04 11:52:16 +00:00
2009-04-19 13:37:59 +00:00
iterprop = RNA_struct_iterator_property ( ptr - > type ) ;
2009-02-04 11:52:16 +00:00
RNA_property_collection_begin ( ptr , iterprop , & iter ) ;
for ( ; iter . valid ; RNA_property_collection_next ( & iter ) ) {
prop = iter . ptr . data ;
2009-04-19 13:37:59 +00:00
if ( strcmp ( RNA_property_identifier ( prop ) , " rna_type " ) = = 0 )
2009-02-04 11:52:16 +00:00
continue ;
UI: Layout Engine
* Buttons are now created first, and after that the layout is computed.
This means the layout engine now works at button level, and makes it
easier to write templates. Otherwise you had to store all info and
create the buttons later.
* Added interface_templates.c as a separate file to put templates in.
These can contain regular buttons, and can be put in a Free layout,
which means you can specify manual coordinates, but still get nested
correct inside other layouts.
* API was changed to allow better nesting. Previously items were added
in the last added layout specifier, i.e. one level up in the layout
hierarchy. This doesn't work well in always, so now when creating things
like rows or columns it always returns a layout which you have to add
the items in. All py scripts were updated to follow this.
* Computing the layout now goes in two passes, first estimating the
required width/height of all nested layouts, and then in the second
pass using the results of that to decide on the actual locations.
* Enum and array buttons now follow the direction of the layout, i.e.
they are vertical or horizontal depending if they are in a column or row.
* Color properties now get a color picker, and only get the additional
RGB sliders with Expand=True.
* File/directory string properties now get a button next to them for
opening the file browse, though this is not implemented yet.
* Layout items can now be aligned, set align=True when creating a column,
row, etc.
* Buttons now get a minimum width of one icon (avoids squashing icon
buttons).
* Moved some more space variables into Style.
2009-05-15 11:19:59 +00:00
split = uiLayoutSplit ( layout ) ;
2009-02-04 11:52:16 +00:00
2009-04-19 13:37:59 +00:00
name = ( char * ) RNA_property_ui_name ( prop ) ;
UI: Layout Engine
* Buttons are now created first, and after that the layout is computed.
This means the layout engine now works at button level, and makes it
easier to write templates. Otherwise you had to store all info and
create the buttons later.
* Added interface_templates.c as a separate file to put templates in.
These can contain regular buttons, and can be put in a Free layout,
which means you can specify manual coordinates, but still get nested
correct inside other layouts.
* API was changed to allow better nesting. Previously items were added
in the last added layout specifier, i.e. one level up in the layout
hierarchy. This doesn't work well in always, so now when creating things
like rows or columns it always returns a layout which you have to add
the items in. All py scripts were updated to follow this.
* Computing the layout now goes in two passes, first estimating the
required width/height of all nested layouts, and then in the second
pass using the results of that to decide on the actual locations.
* Enum and array buttons now follow the direction of the layout, i.e.
they are vertical or horizontal depending if they are in a column or row.
* Color properties now get a color picker, and only get the additional
RGB sliders with Expand=True.
* File/directory string properties now get a button next to them for
opening the file browse, though this is not implemented yet.
* Layout items can now be aligned, set align=True when creating a column,
row, etc.
* Buttons now get a minimum width of one icon (avoids squashing icon
buttons).
* Moved some more space variables into Style.
2009-05-15 11:19:59 +00:00
uiItemL ( uiLayoutColumn ( split , 0 ) , name , 0 ) ;
2009-05-27 00:03:49 +00:00
uiItemFullR ( uiLayoutColumn ( split , 0 ) , " " , 0 , ptr , prop , - 1 , 0 , 0 , 0 , 0 ) ;
2009-02-04 11:52:16 +00:00
}
RNA_property_collection_end ( & iter ) ;
}
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
/* temp call, single collumn, test for toolbar only */
2009-05-19 17:13:33 +00:00
void uiDefAutoButsRNA_single ( const bContext * C , uiLayout * layout , PointerRNA * ptr )
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
{
CollectionPropertyIterator iter ;
PropertyRNA * iterprop , * prop ;
2009-05-19 17:13:33 +00:00
uiLayout * col ;
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
char * name ;
uiItemL ( layout , ( char * ) RNA_struct_ui_name ( ptr - > type ) , 0 ) ;
iterprop = RNA_struct_iterator_property ( ptr - > type ) ;
RNA_property_collection_begin ( ptr , iterprop , & iter ) ;
for ( ; iter . valid ; RNA_property_collection_next ( & iter ) ) {
prop = iter . ptr . data ;
if ( strcmp ( RNA_property_identifier ( prop ) , " rna_type " ) = = 0 )
continue ;
name = ( char * ) RNA_property_ui_name ( prop ) ;
2009-05-19 17:13:33 +00:00
col = uiLayoutColumn ( layout , 1 ) ;
uiItemL ( col , name , 0 ) ;
2009-06-01 14:08:19 +00:00
/* temp hack to show normal button for spin/screw */
if ( strcmp ( name , " Axis " ) = = 0 ) {
uiDefButR ( uiLayoutGetBlock ( layout ) , BUT_NORMAL , 0 , name , 0 , 0 , 100 , 100 , ptr , " axis " , - 1 , 0 , 0 , - 1 , - 1 , NULL ) ;
}
else uiItemFullR ( col , " " , 0 , ptr , prop , - 1 , 0 , 0 , 0 , 0 ) ;
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
}
RNA_property_collection_end ( & iter ) ;
}
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
/***************************** ID Utilities *******************************/
typedef struct uiIDPoinParams {
uiIDPoinFunc func ;
2.5: Text Editor back.
There was very little structure in this code, using many globals
and duplicated code. Now it should be better structured. Most
things should work, the main parts that are not back yet are the
python plugins and markers. Notes:
* Blenfont is used for drawing the text, nicely anti-aliased.
* A monospace truetype font was added, since that is needed for
the text editor. It's Bitstream Vera Sans Mono. This is the
default gnome terminal font, but it doesn't fit entirely well
with the other font I think, can be changed easily of course.
* Clipboard copy/cut/paste now always uses the system clipboard,
the code for the own cut buffer was removed.
* The interface buttons should support copy/cut/paste again now
as well.
* WM_clipboard_text_get/WM_clipboard_text_set were added to the
windowmanager code.
* Find panel is now a kind of second header, instead of a panel.
This needs especially a way to start editing the text field
immediately on open still.
* Operators are independent of the actual space when possible,
was a bit of puzzling but got it solved nice with notifiers,
and some lazy init for syntax highlight in the drawing code.
* RNA was created for the text editor space and used for buttons.
* Operators:
* New, Open, Reload, Save, Save As, Make Internal
* Run Script, Refresh Pyconstraints
* Copy, Cut, Paste
* Convert Whitespace, Uncomment, Comment, Indent, Unindent
* Line Break, Insert
* Next Marker, Previous Marker, Clear All Markers, Mark All
* Select Line, Select All
* Jump, Move, Move Select, Delete, Toggle Overwrite
* Scroll, Scroll Bar, Set Cursor, Line Number
* Find and Replace, Find, Replace, Find Set Selected,
Replace Set Selected
* To 3D Object
* Resolve Conflict
2009-02-28 23:33:35 +00:00
ID * id ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
short id_code ;
short browsenr ;
} uiIDPoinParams ;
static void idpoin_cb ( bContext * C , void * arg_params , void * arg_event )
{
Main * bmain ;
ListBase * lb ;
uiIDPoinParams * params = ( uiIDPoinParams * ) arg_params ;
uiIDPoinFunc func = params - > func ;
2.5: Text Editor back.
There was very little structure in this code, using many globals
and duplicated code. Now it should be better structured. Most
things should work, the main parts that are not back yet are the
python plugins and markers. Notes:
* Blenfont is used for drawing the text, nicely anti-aliased.
* A monospace truetype font was added, since that is needed for
the text editor. It's Bitstream Vera Sans Mono. This is the
default gnome terminal font, but it doesn't fit entirely well
with the other font I think, can be changed easily of course.
* Clipboard copy/cut/paste now always uses the system clipboard,
the code for the own cut buffer was removed.
* The interface buttons should support copy/cut/paste again now
as well.
* WM_clipboard_text_get/WM_clipboard_text_set were added to the
windowmanager code.
* Find panel is now a kind of second header, instead of a panel.
This needs especially a way to start editing the text field
immediately on open still.
* Operators are independent of the actual space when possible,
was a bit of puzzling but got it solved nice with notifiers,
and some lazy init for syntax highlight in the drawing code.
* RNA was created for the text editor space and used for buttons.
* Operators:
* New, Open, Reload, Save, Save As, Make Internal
* Run Script, Refresh Pyconstraints
* Copy, Cut, Paste
* Convert Whitespace, Uncomment, Comment, Indent, Unindent
* Line Break, Insert
* Next Marker, Previous Marker, Clear All Markers, Mark All
* Select Line, Select All
* Jump, Move, Move Select, Delete, Toggle Overwrite
* Scroll, Scroll Bar, Set Cursor, Line Number
* Find and Replace, Find, Replace, Find Set Selected,
Replace Set Selected
* To 3D Object
* Resolve Conflict
2009-02-28 23:33:35 +00:00
ID * id = params - > id , * idtest ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
int nr , event = GET_INT_FROM_POINTER ( arg_event ) ;
bmain = CTX_data_main ( C ) ;
lb = wich_libbase ( bmain , params - > id_code ) ;
2.5: Text Editor back.
There was very little structure in this code, using many globals
and duplicated code. Now it should be better structured. Most
things should work, the main parts that are not back yet are the
python plugins and markers. Notes:
* Blenfont is used for drawing the text, nicely anti-aliased.
* A monospace truetype font was added, since that is needed for
the text editor. It's Bitstream Vera Sans Mono. This is the
default gnome terminal font, but it doesn't fit entirely well
with the other font I think, can be changed easily of course.
* Clipboard copy/cut/paste now always uses the system clipboard,
the code for the own cut buffer was removed.
* The interface buttons should support copy/cut/paste again now
as well.
* WM_clipboard_text_get/WM_clipboard_text_set were added to the
windowmanager code.
* Find panel is now a kind of second header, instead of a panel.
This needs especially a way to start editing the text field
immediately on open still.
* Operators are independent of the actual space when possible,
was a bit of puzzling but got it solved nice with notifiers,
and some lazy init for syntax highlight in the drawing code.
* RNA was created for the text editor space and used for buttons.
* Operators:
* New, Open, Reload, Save, Save As, Make Internal
* Run Script, Refresh Pyconstraints
* Copy, Cut, Paste
* Convert Whitespace, Uncomment, Comment, Indent, Unindent
* Line Break, Insert
* Next Marker, Previous Marker, Clear All Markers, Mark All
* Select Line, Select All
* Jump, Move, Move Select, Delete, Toggle Overwrite
* Scroll, Scroll Bar, Set Cursor, Line Number
* Find and Replace, Find, Replace, Find Set Selected,
Replace Set Selected
* To 3D Object
* Resolve Conflict
2009-02-28 23:33:35 +00:00
if ( event = = UI_ID_BROWSE & & params - > browsenr = = 32767 )
event = UI_ID_ADD_NEW ;
else if ( event = = UI_ID_BROWSE & & params - > browsenr = = 32766 )
event = UI_ID_OPEN ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
switch ( event ) {
case UI_ID_RENAME :
if ( id ) test_idbutton ( id - > name + 2 ) ;
else return ;
break ;
case UI_ID_BROWSE : {
2009-05-20 16:23:55 +00:00
/* ID can be NULL, if nothing was assigned yet */
if ( lb - > first = = NULL ) return ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
if ( params - > browsenr = = - 2 ) {
2009-05-20 16:23:55 +00:00
/* XXX implement or find a replacement (ID can be NULL!)
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
* activate_databrowse ( ( ID * ) G . buts - > lockpoin , GS ( id - > name ) , 0 , B_MESHBROWSE , & params - > browsenr , do_global_buttons ) ; */
return ;
}
if ( params - > browsenr < 0 )
return ;
for ( idtest = lb - > first , nr = 1 ; idtest ; idtest = idtest - > next , nr + + ) {
if ( nr = = params - > browsenr ) {
2.5: Text Editor back.
There was very little structure in this code, using many globals
and duplicated code. Now it should be better structured. Most
things should work, the main parts that are not back yet are the
python plugins and markers. Notes:
* Blenfont is used for drawing the text, nicely anti-aliased.
* A monospace truetype font was added, since that is needed for
the text editor. It's Bitstream Vera Sans Mono. This is the
default gnome terminal font, but it doesn't fit entirely well
with the other font I think, can be changed easily of course.
* Clipboard copy/cut/paste now always uses the system clipboard,
the code for the own cut buffer was removed.
* The interface buttons should support copy/cut/paste again now
as well.
* WM_clipboard_text_get/WM_clipboard_text_set were added to the
windowmanager code.
* Find panel is now a kind of second header, instead of a panel.
This needs especially a way to start editing the text field
immediately on open still.
* Operators are independent of the actual space when possible,
was a bit of puzzling but got it solved nice with notifiers,
and some lazy init for syntax highlight in the drawing code.
* RNA was created for the text editor space and used for buttons.
* Operators:
* New, Open, Reload, Save, Save As, Make Internal
* Run Script, Refresh Pyconstraints
* Copy, Cut, Paste
* Convert Whitespace, Uncomment, Comment, Indent, Unindent
* Line Break, Insert
* Next Marker, Previous Marker, Clear All Markers, Mark All
* Select Line, Select All
* Jump, Move, Move Select, Delete, Toggle Overwrite
* Scroll, Scroll Bar, Set Cursor, Line Number
* Find and Replace, Find, Replace, Find Set Selected,
Replace Set Selected
* To 3D Object
* Resolve Conflict
2009-02-28 23:33:35 +00:00
if ( id = = idtest )
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
return ;
2.5: Text Editor back.
There was very little structure in this code, using many globals
and duplicated code. Now it should be better structured. Most
things should work, the main parts that are not back yet are the
python plugins and markers. Notes:
* Blenfont is used for drawing the text, nicely anti-aliased.
* A monospace truetype font was added, since that is needed for
the text editor. It's Bitstream Vera Sans Mono. This is the
default gnome terminal font, but it doesn't fit entirely well
with the other font I think, can be changed easily of course.
* Clipboard copy/cut/paste now always uses the system clipboard,
the code for the own cut buffer was removed.
* The interface buttons should support copy/cut/paste again now
as well.
* WM_clipboard_text_get/WM_clipboard_text_set were added to the
windowmanager code.
* Find panel is now a kind of second header, instead of a panel.
This needs especially a way to start editing the text field
immediately on open still.
* Operators are independent of the actual space when possible,
was a bit of puzzling but got it solved nice with notifiers,
and some lazy init for syntax highlight in the drawing code.
* RNA was created for the text editor space and used for buttons.
* Operators:
* New, Open, Reload, Save, Save As, Make Internal
* Run Script, Refresh Pyconstraints
* Copy, Cut, Paste
* Convert Whitespace, Uncomment, Comment, Indent, Unindent
* Line Break, Insert
* Next Marker, Previous Marker, Clear All Markers, Mark All
* Select Line, Select All
* Jump, Move, Move Select, Delete, Toggle Overwrite
* Scroll, Scroll Bar, Set Cursor, Line Number
* Find and Replace, Find, Replace, Find Set Selected,
Replace Set Selected
* To 3D Object
* Resolve Conflict
2009-02-28 23:33:35 +00:00
id = idtest ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
break ;
}
}
break ;
}
case UI_ID_DELETE :
2.5: Text Editor back.
There was very little structure in this code, using many globals
and duplicated code. Now it should be better structured. Most
things should work, the main parts that are not back yet are the
python plugins and markers. Notes:
* Blenfont is used for drawing the text, nicely anti-aliased.
* A monospace truetype font was added, since that is needed for
the text editor. It's Bitstream Vera Sans Mono. This is the
default gnome terminal font, but it doesn't fit entirely well
with the other font I think, can be changed easily of course.
* Clipboard copy/cut/paste now always uses the system clipboard,
the code for the own cut buffer was removed.
* The interface buttons should support copy/cut/paste again now
as well.
* WM_clipboard_text_get/WM_clipboard_text_set were added to the
windowmanager code.
* Find panel is now a kind of second header, instead of a panel.
This needs especially a way to start editing the text field
immediately on open still.
* Operators are independent of the actual space when possible,
was a bit of puzzling but got it solved nice with notifiers,
and some lazy init for syntax highlight in the drawing code.
* RNA was created for the text editor space and used for buttons.
* Operators:
* New, Open, Reload, Save, Save As, Make Internal
* Run Script, Refresh Pyconstraints
* Copy, Cut, Paste
* Convert Whitespace, Uncomment, Comment, Indent, Unindent
* Line Break, Insert
* Next Marker, Previous Marker, Clear All Markers, Mark All
* Select Line, Select All
* Jump, Move, Move Select, Delete, Toggle Overwrite
* Scroll, Scroll Bar, Set Cursor, Line Number
* Find and Replace, Find, Replace, Find Set Selected,
Replace Set Selected
* To 3D Object
* Resolve Conflict
2009-02-28 23:33:35 +00:00
id = NULL ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
break ;
case UI_ID_FAKE_USER :
if ( id ) {
if ( id - > flag & LIB_FAKEUSER ) id - > us + + ;
else id - > us - - ;
}
else return ;
break ;
case UI_ID_PIN :
break ;
case UI_ID_ADD_NEW :
break ;
case UI_ID_OPEN :
break ;
case UI_ID_ALONE :
if ( ! id | | id - > us < 1 )
return ;
break ;
case UI_ID_LOCAL :
if ( ! id | | id - > us < 1 )
return ;
break ;
case UI_ID_AUTO_NAME :
break ;
}
if ( func )
2.5: Text Editor back.
There was very little structure in this code, using many globals
and duplicated code. Now it should be better structured. Most
things should work, the main parts that are not back yet are the
python plugins and markers. Notes:
* Blenfont is used for drawing the text, nicely anti-aliased.
* A monospace truetype font was added, since that is needed for
the text editor. It's Bitstream Vera Sans Mono. This is the
default gnome terminal font, but it doesn't fit entirely well
with the other font I think, can be changed easily of course.
* Clipboard copy/cut/paste now always uses the system clipboard,
the code for the own cut buffer was removed.
* The interface buttons should support copy/cut/paste again now
as well.
* WM_clipboard_text_get/WM_clipboard_text_set were added to the
windowmanager code.
* Find panel is now a kind of second header, instead of a panel.
This needs especially a way to start editing the text field
immediately on open still.
* Operators are independent of the actual space when possible,
was a bit of puzzling but got it solved nice with notifiers,
and some lazy init for syntax highlight in the drawing code.
* RNA was created for the text editor space and used for buttons.
* Operators:
* New, Open, Reload, Save, Save As, Make Internal
* Run Script, Refresh Pyconstraints
* Copy, Cut, Paste
* Convert Whitespace, Uncomment, Comment, Indent, Unindent
* Line Break, Insert
* Next Marker, Previous Marker, Clear All Markers, Mark All
* Select Line, Select All
* Jump, Move, Move Select, Delete, Toggle Overwrite
* Scroll, Scroll Bar, Set Cursor, Line Number
* Find and Replace, Find, Replace, Find Set Selected,
Replace Set Selected
* To 3D Object
* Resolve Conflict
2009-02-28 23:33:35 +00:00
func ( C , id , event ) ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
}
2.5: Text Editor back.
There was very little structure in this code, using many globals
and duplicated code. Now it should be better structured. Most
things should work, the main parts that are not back yet are the
python plugins and markers. Notes:
* Blenfont is used for drawing the text, nicely anti-aliased.
* A monospace truetype font was added, since that is needed for
the text editor. It's Bitstream Vera Sans Mono. This is the
default gnome terminal font, but it doesn't fit entirely well
with the other font I think, can be changed easily of course.
* Clipboard copy/cut/paste now always uses the system clipboard,
the code for the own cut buffer was removed.
* The interface buttons should support copy/cut/paste again now
as well.
* WM_clipboard_text_get/WM_clipboard_text_set were added to the
windowmanager code.
* Find panel is now a kind of second header, instead of a panel.
This needs especially a way to start editing the text field
immediately on open still.
* Operators are independent of the actual space when possible,
was a bit of puzzling but got it solved nice with notifiers,
and some lazy init for syntax highlight in the drawing code.
* RNA was created for the text editor space and used for buttons.
* Operators:
* New, Open, Reload, Save, Save As, Make Internal
* Run Script, Refresh Pyconstraints
* Copy, Cut, Paste
* Convert Whitespace, Uncomment, Comment, Indent, Unindent
* Line Break, Insert
* Next Marker, Previous Marker, Clear All Markers, Mark All
* Select Line, Select All
* Jump, Move, Move Select, Delete, Toggle Overwrite
* Scroll, Scroll Bar, Set Cursor, Line Number
* Find and Replace, Find, Replace, Find Set Selected,
Replace Set Selected
* To 3D Object
* Resolve Conflict
2009-02-28 23:33:35 +00:00
int uiDefIDPoinButs ( uiBlock * block , Main * bmain , ID * parid , ID * id , int id_code , short * pin_p , int x , int y , uiIDPoinFunc func , int events )
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
{
ListBase * lb ;
uiBut * but ;
uiIDPoinParams * params , * dup_params ;
char * str = NULL , str1 [ 10 ] ;
2.5
More cleanup!
- removed old UI font completely, including from uiBeginBlock
- emboss hints for uiBlock only have three types now;
Regular, Pulldown, or "Nothing" (only icon/text)
- removed old font path from Userdef
- removed all old button theme hinting
- removed old "auto block" to merge buttons in groups
(was only in use for radiosity buttons)
And went over all warnings. One hooray for make giving clean output :)
Well, we need uniform definitions for warnings, so people at least fix
them... here's the real bad bugs I found:
- in mesh code, a call to editmesh mixed *em and *me
- in armature, ED_util.h was not included, so no warnings for wrong call
to ED_undo_push()
- The extern Py api .h was not included in the bpy_interface.c, showing
a several calls using different args.
Further just added the missing includes, and removed unused vars.
2009-04-14 15:59:52 +00:00
int len , add_addbutton = 0 ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
/* setup struct that we will pass on with the buttons */
params = MEM_callocN ( sizeof ( uiIDPoinParams ) , " uiIDPoinParams " ) ;
2.5: Text Editor back.
There was very little structure in this code, using many globals
and duplicated code. Now it should be better structured. Most
things should work, the main parts that are not back yet are the
python plugins and markers. Notes:
* Blenfont is used for drawing the text, nicely anti-aliased.
* A monospace truetype font was added, since that is needed for
the text editor. It's Bitstream Vera Sans Mono. This is the
default gnome terminal font, but it doesn't fit entirely well
with the other font I think, can be changed easily of course.
* Clipboard copy/cut/paste now always uses the system clipboard,
the code for the own cut buffer was removed.
* The interface buttons should support copy/cut/paste again now
as well.
* WM_clipboard_text_get/WM_clipboard_text_set were added to the
windowmanager code.
* Find panel is now a kind of second header, instead of a panel.
This needs especially a way to start editing the text field
immediately on open still.
* Operators are independent of the actual space when possible,
was a bit of puzzling but got it solved nice with notifiers,
and some lazy init for syntax highlight in the drawing code.
* RNA was created for the text editor space and used for buttons.
* Operators:
* New, Open, Reload, Save, Save As, Make Internal
* Run Script, Refresh Pyconstraints
* Copy, Cut, Paste
* Convert Whitespace, Uncomment, Comment, Indent, Unindent
* Line Break, Insert
* Next Marker, Previous Marker, Clear All Markers, Mark All
* Select Line, Select All
* Jump, Move, Move Select, Delete, Toggle Overwrite
* Scroll, Scroll Bar, Set Cursor, Line Number
* Find and Replace, Find, Replace, Find Set Selected,
Replace Set Selected
* To 3D Object
* Resolve Conflict
2009-02-28 23:33:35 +00:00
params - > id = id ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
params - > id_code = id_code ;
params - > func = func ;
lb = wich_libbase ( bmain , id_code ) ;
/* create buttons */
uiBlockBeginAlign ( block ) ;
2.5
More cleanup!
- removed old UI font completely, including from uiBeginBlock
- emboss hints for uiBlock only have three types now;
Regular, Pulldown, or "Nothing" (only icon/text)
- removed old font path from Userdef
- removed all old button theme hinting
- removed old "auto block" to merge buttons in groups
(was only in use for radiosity buttons)
And went over all warnings. One hooray for make giving clean output :)
Well, we need uniform definitions for warnings, so people at least fix
them... here's the real bad bugs I found:
- in mesh code, a call to editmesh mixed *em and *me
- in armature, ED_util.h was not included, so no warnings for wrong call
to ED_undo_push()
- The extern Py api .h was not included in the bpy_interface.c, showing
a several calls using different args.
Further just added the missing includes, and removed unused vars.
2009-04-14 15:59:52 +00:00
/* XXX solve?
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
if ( id & & id - > us > 1 )
uiBlockSetCol ( block , TH_BUT_SETTING1 ) ;
if ( ( events & UI_ID_PIN ) & & * pin_p )
uiBlockSetCol ( block , TH_BUT_SETTING2 ) ;
2.5
More cleanup!
- removed old UI font completely, including from uiBeginBlock
- emboss hints for uiBlock only have three types now;
Regular, Pulldown, or "Nothing" (only icon/text)
- removed old font path from Userdef
- removed all old button theme hinting
- removed old "auto block" to merge buttons in groups
(was only in use for radiosity buttons)
And went over all warnings. One hooray for make giving clean output :)
Well, we need uniform definitions for warnings, so people at least fix
them... here's the real bad bugs I found:
- in mesh code, a call to editmesh mixed *em and *me
- in armature, ED_util.h was not included, so no warnings for wrong call
to ED_undo_push()
- The extern Py api .h was not included in the bpy_interface.c, showing
a several calls using different args.
Further just added the missing includes, and removed unused vars.
2009-04-14 15:59:52 +00:00
*/
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
/* pin button */
if ( id & & ( events & UI_ID_PIN ) ) {
2009-02-07 14:03:34 +00:00
but = uiDefIconButS ( block , ICONTOG , ( events & UI_ID_PIN ) , ICON_KEY_DEHLT , x , y , DEF_ICON_BUT_WIDTH , DEF_BUT_HEIGHT , pin_p , 0 , 0 , 0 , 0 , " Keeps this view displaying the current data regardless of what object is selected " ) ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
uiButSetNFunc ( but , idpoin_cb , MEM_dupallocN ( params ) , SET_INT_IN_POINTER ( UI_ID_PIN ) ) ;
x + = DEF_ICON_BUT_WIDTH ;
}
/* browse menu */
if ( events & UI_ID_BROWSE ) {
char * extrastr = NULL ;
if ( ELEM4 ( id_code , ID_MA , ID_TE , ID_BR , ID_PA ) )
add_addbutton = 1 ;
if ( ELEM8 ( id_code , ID_SCE , ID_SCR , ID_MA , ID_TE , ID_WO , ID_IP , ID_AC , ID_BR ) | | id_code = = ID_PA )
extrastr = " ADD NEW %x 32767 " ;
else if ( id_code = = ID_TXT )
extrastr = " OPEN NEW %x 32766 |ADD NEW %x 32767 " ;
else if ( id_code = = ID_SO )
extrastr = " OPEN NEW %x 32766 " ;
/* XXX should be moved out of this function
uiBlockSetButLock ( block , G . scene - > id . lib ! = 0 , " Can't edit external libdata " ) ;
if ( id_code = = ID_SCE | | id_code = = ID_SCR ) uiBlockClearButLock ( block ) ; */
/* XXX should be moved out of this function
if ( curarea - > spacetype = = SPACE_BUTS )
uiBlockSetButLock ( block , id_code ! = ID_SCR & & G . obedit ! = 0 & & G . buts - > mainb = = CONTEXT_EDITING , " Cannot perform in EditMode " ) ; */
if ( parid )
uiBlockSetButLock ( block , parid - > lib ! = 0 , " Can't edit external libdata " ) ;
if ( lb ) {
if ( id_code ! = ID_IM | | ( events & UI_ID_BROWSE_RENDER ) )
IDnames_to_pupstring ( & str , NULL , extrastr , lb , id , & params - > browsenr ) ;
else
IMAnames_to_pupstring ( & str , NULL , extrastr , lb , id , & params - > browsenr ) ;
}
dup_params = MEM_dupallocN ( params ) ;
but = uiDefButS ( block , MENU , 0 , str , x , y , DEF_ICON_BUT_WIDTH , DEF_BUT_HEIGHT , & dup_params - > browsenr , 0 , 0 , 0 , 0 , " Browse existing choices, or add new " ) ;
uiButSetNFunc ( but , idpoin_cb , dup_params , SET_INT_IN_POINTER ( UI_ID_BROWSE ) ) ;
x + = DEF_ICON_BUT_WIDTH ;
uiBlockClearButLock ( block ) ;
MEM_freeN ( str ) ;
}
/* text button with name */
if ( id ) {
2.5
More cleanup!
- removed old UI font completely, including from uiBeginBlock
- emboss hints for uiBlock only have three types now;
Regular, Pulldown, or "Nothing" (only icon/text)
- removed old font path from Userdef
- removed all old button theme hinting
- removed old "auto block" to merge buttons in groups
(was only in use for radiosity buttons)
And went over all warnings. One hooray for make giving clean output :)
Well, we need uniform definitions for warnings, so people at least fix
them... here's the real bad bugs I found:
- in mesh code, a call to editmesh mixed *em and *me
- in armature, ED_util.h was not included, so no warnings for wrong call
to ED_undo_push()
- The extern Py api .h was not included in the bpy_interface.c, showing
a several calls using different args.
Further just added the missing includes, and removed unused vars.
2009-04-14 15:59:52 +00:00
/* XXX solve?
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
if ( id - > us > 1 )
uiBlockSetCol ( block , TH_BUT_SETTING1 ) ;
2.5
More cleanup!
- removed old UI font completely, including from uiBeginBlock
- emboss hints for uiBlock only have three types now;
Regular, Pulldown, or "Nothing" (only icon/text)
- removed old font path from Userdef
- removed all old button theme hinting
- removed old "auto block" to merge buttons in groups
(was only in use for radiosity buttons)
And went over all warnings. One hooray for make giving clean output :)
Well, we need uniform definitions for warnings, so people at least fix
them... here's the real bad bugs I found:
- in mesh code, a call to editmesh mixed *em and *me
- in armature, ED_util.h was not included, so no warnings for wrong call
to ED_undo_push()
- The extern Py api .h was not included in the bpy_interface.c, showing
a several calls using different args.
Further just added the missing includes, and removed unused vars.
2009-04-14 15:59:52 +00:00
*/
/* pinned data?
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
if ( ( events & UI_ID_PIN ) & & * pin_p )
uiBlockSetCol ( block , TH_BUT_SETTING2 ) ;
2.5
More cleanup!
- removed old UI font completely, including from uiBeginBlock
- emboss hints for uiBlock only have three types now;
Regular, Pulldown, or "Nothing" (only icon/text)
- removed old font path from Userdef
- removed all old button theme hinting
- removed old "auto block" to merge buttons in groups
(was only in use for radiosity buttons)
And went over all warnings. One hooray for make giving clean output :)
Well, we need uniform definitions for warnings, so people at least fix
them... here's the real bad bugs I found:
- in mesh code, a call to editmesh mixed *em and *me
- in armature, ED_util.h was not included, so no warnings for wrong call
to ED_undo_push()
- The extern Py api .h was not included in the bpy_interface.c, showing
a several calls using different args.
Further just added the missing includes, and removed unused vars.
2009-04-14 15:59:52 +00:00
*/
/* redalert overrides pin color
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
if ( id - > us < = 0 )
uiBlockSetCol ( block , TH_REDALERT ) ;
2.5
More cleanup!
- removed old UI font completely, including from uiBeginBlock
- emboss hints for uiBlock only have three types now;
Regular, Pulldown, or "Nothing" (only icon/text)
- removed old font path from Userdef
- removed all old button theme hinting
- removed old "auto block" to merge buttons in groups
(was only in use for radiosity buttons)
And went over all warnings. One hooray for make giving clean output :)
Well, we need uniform definitions for warnings, so people at least fix
them... here's the real bad bugs I found:
- in mesh code, a call to editmesh mixed *em and *me
- in armature, ED_util.h was not included, so no warnings for wrong call
to ED_undo_push()
- The extern Py api .h was not included in the bpy_interface.c, showing
a several calls using different args.
Further just added the missing includes, and removed unused vars.
2009-04-14 15:59:52 +00:00
*/
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
uiBlockSetButLock ( block , id - > lib ! = 0 , " Can't edit external libdata " ) ;
/* name button */
2009-04-22 18:39:44 +00:00
text_idbutton ( id , str1 ) ;
2.5: ID datablock button back, previously known as std_libbuttons. The
way this worked in 2.4x wasn't really clean, with events going all over
the place and using dubious variables such as G.but->lockpoin or
G.sima->menunr. It works as follows now, for example:
xco= uiDefIDPoinButs(block, CTX_data_main(C), NULL, (ID**)&sima->image, ID_IM, &sima->pin, xco, yco,
sima_idpoin_handle, UI_ID_BROWSE|UI_ID_RENAME|UI_ID_ADD_NEW|UI_ID_OPEN|UI_ID_DELETE|UI_ID_ALONE|UI_ID_PIN);
The last two parameters are a callback function, and a list of events
or functionalities that are supported. The callback function will then
get the ID pointer + event to handle.
2009-02-06 16:40:14 +00:00
if ( GS ( id - > name ) = = ID_IP ) len = 110 ;
else if ( ( y ) & & ( GS ( id - > name ) = = ID_AC ) ) len = 100 ; // comes from button panel (poselib)
else if ( y ) len = 140 ; // comes from button panel
else len = 120 ;
but = uiDefBut ( block , TEX , 0 , str1 , x , y , ( short ) len , DEF_BUT_HEIGHT , id - > name + 2 , 0.0 , 21.0 , 0 , 0 , " Displays current Datablock name. Click to change. " ) ;
uiButSetNFunc ( but , idpoin_cb , MEM_dupallocN ( params ) , SET_INT_IN_POINTER ( UI_ID_RENAME ) ) ;
x + = len ;
uiBlockClearButLock ( block ) ;
/* lib make local button */
if ( id - > lib ) {
if ( id - > flag & LIB_INDIRECT ) uiDefIconBut ( block , BUT , 0 , 0 /* XXX ICON_DATALIB */ , x , y , DEF_ICON_BUT_WIDTH , DEF_BUT_HEIGHT , 0 , 0 , 0 , 0 , 0 , " Indirect Library Datablock. Cannot change. " ) ;
else {
but = uiDefIconBut ( block , BUT , 0 , 0 /* XXX ICON_PARLIB */ , x , y , DEF_ICON_BUT_WIDTH , DEF_BUT_HEIGHT , 0 , 0 , 0 , 0 , 0 ,
( events & UI_ID_LOCAL ) ? " Direct linked Library Datablock. Click to make local. " : " Direct linked Library Datablock, cannot make local. " ) ;
uiButSetNFunc ( but , idpoin_cb , MEM_dupallocN ( params ) , SET_INT_IN_POINTER ( UI_ID_ALONE ) ) ;
}
x + = DEF_ICON_BUT_WIDTH ;
}
/* number of users / make local button */
if ( ( events & UI_ID_ALONE ) & & id - > us > 1 ) {
int butwidth ;
uiBlockSetButLock ( block , ( events & UI_ID_PIN ) & & * pin_p , " Can't make pinned data single-user " ) ;
sprintf ( str1 , " %d " , id - > us ) ;
butwidth = ( id - > us < 10 ) ? DEF_ICON_BUT_WIDTH : DEF_ICON_BUT_WIDTH + 10 ;
but = uiDefBut ( block , BUT , 0 , str1 , x , y , butwidth , DEF_BUT_HEIGHT , 0 , 0 , 0 , 0 , 0 , " Displays number of users of this data. Click to make a single-user copy. " ) ;
uiButSetNFunc ( but , idpoin_cb , MEM_dupallocN ( params ) , SET_INT_IN_POINTER ( UI_ID_ALONE ) ) ;
x + = butwidth ;
uiBlockClearButLock ( block ) ;
}
/* delete button */
if ( events & UI_ID_DELETE ) {
uiBlockSetButLock ( block , ( events & UI_ID_PIN ) & & * pin_p , " Can't unlink pinned data " ) ;
if ( parid & & parid - > lib ) ;
else {
but = uiDefIconBut ( block , BUT , 0 , ICON_X , x , y , DEF_ICON_BUT_WIDTH , DEF_BUT_HEIGHT , 0 , 0 , 0 , 0 , 0 , " Deletes link to this Datablock " ) ;
uiButSetNFunc ( but , idpoin_cb , MEM_dupallocN ( params ) , SET_INT_IN_POINTER ( UI_ID_DELETE ) ) ;
x + = DEF_ICON_BUT_WIDTH ;
}
uiBlockClearButLock ( block ) ;
}
/* auto name button */
if ( events & UI_ID_AUTO_NAME ) {
if ( parid & & parid - > lib ) ;
else {
but = uiDefIconBut ( block , BUT , 0 , ICON_AUTO , x , y , DEF_ICON_BUT_WIDTH , DEF_BUT_HEIGHT , 0 , 0 , 0 , 0 , 0 , " Generates an automatic name " ) ;
uiButSetNFunc ( but , idpoin_cb , MEM_dupallocN ( params ) , SET_INT_IN_POINTER ( UI_ID_AUTO_NAME ) ) ;
x + = DEF_ICON_BUT_WIDTH ;
}
}
/* fake user button */
if ( events & UI_ID_FAKE_USER ) {
but = uiDefButBitS ( block , TOG , LIB_FAKEUSER , 0 , " F " , x , y , DEF_ICON_BUT_WIDTH , DEF_BUT_HEIGHT , & id - > flag , 0 , 0 , 0 , 0 , " Saves this datablock even if it has no users " ) ;
uiButSetNFunc ( but , idpoin_cb , MEM_dupallocN ( params ) , SET_INT_IN_POINTER ( UI_ID_FAKE_USER ) ) ;
x + = DEF_ICON_BUT_WIDTH ;
}
}
/* add new button */
else if ( add_addbutton ) {
if ( parid ) uiBlockSetButLock ( block , parid - > lib ! = 0 , " Can't edit external libdata " ) ;
dup_params = MEM_dupallocN ( params ) ;
but = uiDefButS ( block , TOG , 0 , " Add New " , x , y , 110 , DEF_BUT_HEIGHT , & dup_params - > browsenr , params - > browsenr , 32767.0 , 0 , 0 , " Add new data block " ) ;
uiButSetNFunc ( but , idpoin_cb , dup_params , SET_INT_IN_POINTER ( UI_ID_ADD_NEW ) ) ;
x + = 110 ;
}
uiBlockEndAlign ( block ) ;
MEM_freeN ( params ) ;
return x ;
}
2009-02-04 11:52:16 +00:00
2.5
Smaller jobs, all in one commit!
- Moved object_do_update out of view3d drawing, into
the event system (currently after notifiers).
Depsgraph calls for setting update flags will have to
keep track of each Screen's needs, so a UI showing only
a Sequencer doesn't do objects.
- Added button in "Properties region" in 3D window to set
or disable 4-split, including the 3 options it has.
(lock, box, clip)
- Restored legacy code for UI, to make things work like
bone rename, autocomplete.
- Node editor now shows Curves widgets again
- Bugfix: composite job increased Viewer user id count
- Bugfix: Node editor, not "Enable nodes" still called
a Job, which didn't do anything
- Various code cleaning, unused vars and prototypes.
2009-02-11 16:54:55 +00:00
/* ****************************** default button callbacks ******************* */
/* ************ LEGACY WARNING, only to get things work with 2.48 code! ****** */
void test_idbutton_cb ( struct bContext * C , void * namev , void * arg2 )
{
char * name = namev ;
test_idbutton ( name + 2 ) ;
}
void test_scriptpoin_but ( struct bContext * C , char * name , ID * * idpp )
{
ID * id ;
id = CTX_data_main ( C ) - > text . first ;
while ( id ) {
if ( strcmp ( name , id - > name + 2 ) = = 0 ) {
* idpp = id ;
return ;
}
id = id - > next ;
}
* idpp = NULL ;
}
void test_actionpoin_but ( struct bContext * C , char * name , ID * * idpp )
{
ID * id ;
id = CTX_data_main ( C ) - > action . first ;
while ( id ) {
if ( strcmp ( name , id - > name + 2 ) = = 0 ) {
id_us_plus ( id ) ;
* idpp = id ;
return ;
}
id = id - > next ;
}
* idpp = NULL ;
}
void test_obpoin_but ( struct bContext * C , char * name , ID * * idpp )
{
ID * id ;
// XXX if(idpp == (ID **)&(emptytex.object)) {
// error("You must add a texture first");
// *idpp= 0;
// return;
// }
id = CTX_data_main ( C ) - > object . first ;
while ( id ) {
if ( strcmp ( name , id - > name + 2 ) = = 0 ) {
* idpp = id ;
id_lib_extern ( id ) ; /* checks lib data, sets correct flag for saving then */
return ;
}
id = id - > next ;
}
* idpp = NULL ;
}
/* tests for an object of type OB_MESH */
void test_meshobpoin_but ( struct bContext * C , char * name , ID * * idpp )
{
ID * id ;
id = CTX_data_main ( C ) - > object . first ;
while ( id ) {
Object * ob = ( Object * ) id ;
if ( ob - > type = = OB_MESH & & strcmp ( name , id - > name + 2 ) = = 0 ) {
* idpp = id ;
/* checks lib data, sets correct flag for saving then */
id_lib_extern ( id ) ;
return ;
}
id = id - > next ;
}
* idpp = NULL ;
}
void test_meshpoin_but ( struct bContext * C , char * name , ID * * idpp )
{
ID * id ;
if ( * idpp ) ( * idpp ) - > us - - ;
id = CTX_data_main ( C ) - > mesh . first ;
while ( id ) {
if ( strcmp ( name , id - > name + 2 ) = = 0 ) {
* idpp = id ;
id_us_plus ( id ) ;
return ;
}
id = id - > next ;
}
* idpp = NULL ;
}
void test_matpoin_but ( struct bContext * C , char * name , ID * * idpp )
{
ID * id ;
if ( * idpp ) ( * idpp ) - > us - - ;
id = CTX_data_main ( C ) - > mat . first ;
while ( id ) {
if ( strcmp ( name , id - > name + 2 ) = = 0 ) {
* idpp = id ;
id_us_plus ( id ) ;
return ;
}
id = id - > next ;
}
* idpp = NULL ;
}
void test_scenepoin_but ( struct bContext * C , char * name , ID * * idpp )
{
ID * id ;
if ( * idpp ) ( * idpp ) - > us - - ;
id = CTX_data_main ( C ) - > scene . first ;
while ( id ) {
if ( strcmp ( name , id - > name + 2 ) = = 0 ) {
* idpp = id ;
id_us_plus ( id ) ;
return ;
}
id = id - > next ;
}
* idpp = NULL ;
}
void test_grouppoin_but ( struct bContext * C , char * name , ID * * idpp )
{
ID * id ;
if ( * idpp ) ( * idpp ) - > us - - ;
id = CTX_data_main ( C ) - > group . first ;
while ( id ) {
if ( strcmp ( name , id - > name + 2 ) = = 0 ) {
* idpp = id ;
id_us_plus ( id ) ;
return ;
}
id = id - > next ;
}
* idpp = NULL ;
}
void test_texpoin_but ( struct bContext * C , char * name , ID * * idpp )
{
ID * id ;
if ( * idpp ) ( * idpp ) - > us - - ;
id = CTX_data_main ( C ) - > tex . first ;
while ( id ) {
if ( strcmp ( name , id - > name + 2 ) = = 0 ) {
* idpp = id ;
id_us_plus ( id ) ;
return ;
}
id = id - > next ;
}
* idpp = NULL ;
}
void test_imapoin_but ( struct bContext * C , char * name , ID * * idpp )
{
ID * id ;
if ( * idpp ) ( * idpp ) - > us - - ;
id = CTX_data_main ( C ) - > image . first ;
while ( id ) {
if ( strcmp ( name , id - > name + 2 ) = = 0 ) {
* idpp = id ;
id_us_plus ( id ) ;
return ;
}
id = id - > next ;
}
* idpp = NULL ;
}
/* autocomplete callback for buttons */
void autocomplete_bone ( struct bContext * C , char * str , void * arg_v )
{
Object * ob = ( Object * ) arg_v ;
if ( ob = = NULL | | ob - > pose = = NULL ) return ;
/* search if str matches the beginning of name */
if ( str [ 0 ] ) {
AutoComplete * autocpl = autocomplete_begin ( str , 32 ) ;
bPoseChannel * pchan ;
for ( pchan = ob - > pose - > chanbase . first ; pchan ; pchan = pchan - > next )
autocomplete_do_name ( autocpl , pchan - > name ) ;
autocomplete_end ( autocpl , str ) ;
}
}
/* autocomplete callback for buttons */
void autocomplete_vgroup ( struct bContext * C , char * str , void * arg_v )
{
Object * ob = ( Object * ) arg_v ;
if ( ob = = NULL ) return ;
/* search if str matches the beginning of a name */
if ( str [ 0 ] ) {
AutoComplete * autocpl = autocomplete_begin ( str , 32 ) ;
bDeformGroup * dg ;
for ( dg = ob - > defbase . first ; dg ; dg = dg - > next )
if ( dg - > name ! = str )
autocomplete_do_name ( autocpl , dg - > name ) ;
autocomplete_end ( autocpl , str ) ;
}
}
/* ----------- custom button group ---------------------- */
static void curvemap_buttons_zoom_in ( bContext * C , void * cumap_v , void * unused )
{
CurveMapping * cumap = cumap_v ;
float d ;
/* we allow 20 times zoom */
if ( ( cumap - > curr . xmax - cumap - > curr . xmin ) > 0.04f * ( cumap - > clipr . xmax - cumap - > clipr . xmin ) ) {
d = 0.1154f * ( cumap - > curr . xmax - cumap - > curr . xmin ) ;
cumap - > curr . xmin + = d ;
cumap - > curr . xmax - = d ;
d = 0.1154f * ( cumap - > curr . ymax - cumap - > curr . ymin ) ;
cumap - > curr . ymin + = d ;
cumap - > curr . ymax - = d ;
}
}
static void curvemap_buttons_zoom_out ( bContext * C , void * cumap_v , void * unused )
{
CurveMapping * cumap = cumap_v ;
float d , d1 ;
/* we allow 20 times zoom, but dont view outside clip */
if ( ( cumap - > curr . xmax - cumap - > curr . xmin ) < 20.0f * ( cumap - > clipr . xmax - cumap - > clipr . xmin ) ) {
d = d1 = 0.15f * ( cumap - > curr . xmax - cumap - > curr . xmin ) ;
if ( cumap - > flag & CUMA_DO_CLIP )
if ( cumap - > curr . xmin - d < cumap - > clipr . xmin )
d1 = cumap - > curr . xmin - cumap - > clipr . xmin ;
cumap - > curr . xmin - = d1 ;
d1 = d ;
if ( cumap - > flag & CUMA_DO_CLIP )
if ( cumap - > curr . xmax + d > cumap - > clipr . xmax )
d1 = - cumap - > curr . xmax + cumap - > clipr . xmax ;
cumap - > curr . xmax + = d1 ;
d = d1 = 0.15f * ( cumap - > curr . ymax - cumap - > curr . ymin ) ;
if ( cumap - > flag & CUMA_DO_CLIP )
if ( cumap - > curr . ymin - d < cumap - > clipr . ymin )
d1 = cumap - > curr . ymin - cumap - > clipr . ymin ;
cumap - > curr . ymin - = d1 ;
d1 = d ;
if ( cumap - > flag & CUMA_DO_CLIP )
if ( cumap - > curr . ymax + d > cumap - > clipr . ymax )
d1 = - cumap - > curr . ymax + cumap - > clipr . ymax ;
cumap - > curr . ymax + = d1 ;
}
}
static void curvemap_buttons_setclip ( bContext * C , void * cumap_v , void * unused )
{
CurveMapping * cumap = cumap_v ;
curvemapping_changed ( cumap , 0 ) ;
}
static void curvemap_buttons_delete ( bContext * C , void * cumap_v , void * unused )
{
CurveMapping * cumap = cumap_v ;
curvemap_remove ( cumap - > cm + cumap - > cur , SELECT ) ;
curvemapping_changed ( cumap , 0 ) ;
}
/* NOTE: this is a block-menu, needs 0 events, otherwise the menu closes */
static uiBlock * curvemap_clipping_func ( struct bContext * C , struct ARegion * ar , void * cumap_v )
{
CurveMapping * cumap = cumap_v ;
uiBlock * block ;
uiBut * bt ;
2.5
More cleanup!
- removed old UI font completely, including from uiBeginBlock
- emboss hints for uiBlock only have three types now;
Regular, Pulldown, or "Nothing" (only icon/text)
- removed old font path from Userdef
- removed all old button theme hinting
- removed old "auto block" to merge buttons in groups
(was only in use for radiosity buttons)
And went over all warnings. One hooray for make giving clean output :)
Well, we need uniform definitions for warnings, so people at least fix
them... here's the real bad bugs I found:
- in mesh code, a call to editmesh mixed *em and *me
- in armature, ED_util.h was not included, so no warnings for wrong call
to ED_undo_push()
- The extern Py api .h was not included in the bpy_interface.c, showing
a several calls using different args.
Further just added the missing includes, and removed unused vars.
2009-04-14 15:59:52 +00:00
block = uiBeginBlock ( C , ar , " curvemap_clipping_func " , UI_EMBOSS ) ;
2.5
Smaller jobs, all in one commit!
- Moved object_do_update out of view3d drawing, into
the event system (currently after notifiers).
Depsgraph calls for setting update flags will have to
keep track of each Screen's needs, so a UI showing only
a Sequencer doesn't do objects.
- Added button in "Properties region" in 3D window to set
or disable 4-split, including the 3 options it has.
(lock, box, clip)
- Restored legacy code for UI, to make things work like
bone rename, autocomplete.
- Node editor now shows Curves widgets again
- Bugfix: composite job increased Viewer user id count
- Bugfix: Node editor, not "Enable nodes" still called
a Job, which didn't do anything
- Various code cleaning, unused vars and prototypes.
2009-02-11 16:54:55 +00:00
/* use this for a fake extra empy space around the buttons */
uiDefBut ( block , LABEL , 0 , " " , - 4 , 16 , 128 , 106 , NULL , 0 , 0 , 0 , 0 , " " ) ;
bt = uiDefButBitI ( block , TOG , CUMA_DO_CLIP , 1 , " Use Clipping " ,
0 , 100 , 120 , 18 , & cumap - > flag , 0.0 , 0.0 , 10 , 0 , " " ) ;
uiButSetFunc ( bt , curvemap_buttons_setclip , cumap , NULL ) ;
uiBlockBeginAlign ( block ) ;
uiDefButF ( block , NUM , 0 , " Min X " , 0 , 74 , 120 , 18 , & cumap - > clipr . xmin , - 100.0 , cumap - > clipr . xmax , 10 , 0 , " " ) ;
uiDefButF ( block , NUM , 0 , " Min Y " , 0 , 56 , 120 , 18 , & cumap - > clipr . ymin , - 100.0 , cumap - > clipr . ymax , 10 , 0 , " " ) ;
uiDefButF ( block , NUM , 0 , " Max X " , 0 , 38 , 120 , 18 , & cumap - > clipr . xmax , cumap - > clipr . xmin , 100.0 , 10 , 0 , " " ) ;
uiDefButF ( block , NUM , 0 , " Max Y " , 0 , 20 , 120 , 18 , & cumap - > clipr . ymax , cumap - > clipr . ymin , 100.0 , 10 , 0 , " " ) ;
uiBlockSetDirection ( block , UI_RIGHT ) ;
uiEndBlock ( C , block ) ;
return block ;
}
static void curvemap_tools_dofunc ( bContext * C , void * cumap_v , int event )
{
CurveMapping * cumap = cumap_v ;
CurveMap * cuma = cumap - > cm + cumap - > cur ;
switch ( event ) {
case 0 :
curvemap_reset ( cuma , & cumap - > clipr ) ;
curvemapping_changed ( cumap , 0 ) ;
break ;
case 1 :
cumap - > curr = cumap - > clipr ;
break ;
case 2 : /* set vector */
curvemap_sethandle ( cuma , 1 ) ;
curvemapping_changed ( cumap , 0 ) ;
break ;
case 3 : /* set auto */
curvemap_sethandle ( cuma , 0 ) ;
curvemapping_changed ( cumap , 0 ) ;
break ;
case 4 : /* extend horiz */
cuma - > flag & = ~ CUMA_EXTEND_EXTRAPOLATE ;
curvemapping_changed ( cumap , 0 ) ;
break ;
case 5 : /* extend extrapolate */
cuma - > flag | = CUMA_EXTEND_EXTRAPOLATE ;
curvemapping_changed ( cumap , 0 ) ;
break ;
}
ED_region_tag_redraw ( CTX_wm_region ( C ) ) ;
}
static uiBlock * curvemap_tools_func ( struct bContext * C , struct ARegion * ar , void * cumap_v )
{
uiBlock * block ;
short yco = 0 , menuwidth = 120 ;
2.5
More cleanup!
- removed old UI font completely, including from uiBeginBlock
- emboss hints for uiBlock only have three types now;
Regular, Pulldown, or "Nothing" (only icon/text)
- removed old font path from Userdef
- removed all old button theme hinting
- removed old "auto block" to merge buttons in groups
(was only in use for radiosity buttons)
And went over all warnings. One hooray for make giving clean output :)
Well, we need uniform definitions for warnings, so people at least fix
them... here's the real bad bugs I found:
- in mesh code, a call to editmesh mixed *em and *me
- in armature, ED_util.h was not included, so no warnings for wrong call
to ED_undo_push()
- The extern Py api .h was not included in the bpy_interface.c, showing
a several calls using different args.
Further just added the missing includes, and removed unused vars.
2009-04-14 15:59:52 +00:00
block = uiBeginBlock ( C , ar , " curvemap_tools_func " , UI_EMBOSS ) ;
2.5
Smaller jobs, all in one commit!
- Moved object_do_update out of view3d drawing, into
the event system (currently after notifiers).
Depsgraph calls for setting update flags will have to
keep track of each Screen's needs, so a UI showing only
a Sequencer doesn't do objects.
- Added button in "Properties region" in 3D window to set
or disable 4-split, including the 3 options it has.
(lock, box, clip)
- Restored legacy code for UI, to make things work like
bone rename, autocomplete.
- Node editor now shows Curves widgets again
- Bugfix: composite job increased Viewer user id count
- Bugfix: Node editor, not "Enable nodes" still called
a Job, which didn't do anything
- Various code cleaning, unused vars and prototypes.
2009-02-11 16:54:55 +00:00
uiBlockSetButmFunc ( block , curvemap_tools_dofunc , cumap_v ) ;
uiDefIconTextBut ( block , BUTM , 1 , ICON_BLANK1 , " Reset View " , 0 , yco - = 20 , menuwidth , 19 , NULL , 0.0 , 0.0 , 0 , 1 , " " ) ;
uiDefIconTextBut ( block , BUTM , 1 , ICON_BLANK1 , " Vector Handle " , 0 , yco - = 20 , menuwidth , 19 , NULL , 0.0 , 0.0 , 0 , 2 , " " ) ;
uiDefIconTextBut ( block , BUTM , 1 , ICON_BLANK1 , " Auto Handle " , 0 , yco - = 20 , menuwidth , 19 , NULL , 0.0 , 0.0 , 0 , 3 , " " ) ;
uiDefIconTextBut ( block , BUTM , 1 , ICON_BLANK1 , " Extend Horizontal " , 0 , yco - = 20 , menuwidth , 19 , NULL , 0.0 , 0.0 , 0 , 4 , " " ) ;
uiDefIconTextBut ( block , BUTM , 1 , ICON_BLANK1 , " Extend Extrapolated " , 0 , yco - = 20 , menuwidth , 19 , NULL , 0.0 , 0.0 , 0 , 5 , " " ) ;
uiDefIconTextBut ( block , BUTM , 1 , ICON_BLANK1 , " Reset Curve " , 0 , yco - = 20 , menuwidth , 19 , NULL , 0.0 , 0.0 , 0 , 0 , " " ) ;
uiBlockSetDirection ( block , UI_RIGHT ) ;
uiTextBoundsBlock ( block , 50 ) ;
uiEndBlock ( C , block ) ;
return block ;
}
/* still unsure how this call evolves... we use labeltype for defining what curve-channels to show */
void curvemap_buttons ( uiBlock * block , CurveMapping * cumap , char labeltype , short event , short redraw , rctf * rect )
{
uiBut * bt ;
float dx , fy = rect - > ymax - 18.0f ;
int icon ;
short xco , yco ;
yco = ( short ) ( rect - > ymax - 18.0f ) ;
/* curve choice options + tools/settings, 8 icons + spacer */
dx = ( rect - > xmax - rect - > xmin ) / ( 9.0f ) ;
uiBlockBeginAlign ( block ) ;
if ( labeltype = = ' v ' ) { /* vector */
xco = ( short ) rect - > xmin ;
if ( cumap - > cm [ 0 ] . curve )
uiDefButI ( block , ROW , redraw , " X " , xco , yco + 2 , dx , 16 , & cumap - > cur , 0.0 , 0.0 , 0.0 , 0.0 , " " ) ;
xco = ( short ) ( rect - > xmin + 1.0f * dx ) ;
if ( cumap - > cm [ 1 ] . curve )
uiDefButI ( block , ROW , redraw , " Y " , xco , yco + 2 , dx , 16 , & cumap - > cur , 0.0 , 1.0 , 0.0 , 0.0 , " " ) ;
xco = ( short ) ( rect - > xmin + 2.0f * dx ) ;
if ( cumap - > cm [ 2 ] . curve )
uiDefButI ( block , ROW , redraw , " Z " , xco , yco + 2 , dx , 16 , & cumap - > cur , 0.0 , 2.0 , 0.0 , 0.0 , " " ) ;
}
else if ( labeltype = = ' c ' ) { /* color */
xco = ( short ) rect - > xmin ;
if ( cumap - > cm [ 3 ] . curve )
uiDefButI ( block , ROW , redraw , " C " , xco , yco + 2 , dx , 16 , & cumap - > cur , 0.0 , 3.0 , 0.0 , 0.0 , " " ) ;
xco = ( short ) ( rect - > xmin + 1.0f * dx ) ;
if ( cumap - > cm [ 0 ] . curve )
uiDefButI ( block , ROW , redraw , " R " , xco , yco + 2 , dx , 16 , & cumap - > cur , 0.0 , 0.0 , 0.0 , 0.0 , " " ) ;
xco = ( short ) ( rect - > xmin + 2.0f * dx ) ;
if ( cumap - > cm [ 1 ] . curve )
uiDefButI ( block , ROW , redraw , " G " , xco , yco + 2 , dx , 16 , & cumap - > cur , 0.0 , 1.0 , 0.0 , 0.0 , " " ) ;
xco = ( short ) ( rect - > xmin + 3.0f * dx ) ;
if ( cumap - > cm [ 2 ] . curve )
uiDefButI ( block , ROW , redraw , " B " , xco , yco + 2 , dx , 16 , & cumap - > cur , 0.0 , 2.0 , 0.0 , 0.0 , " " ) ;
}
/* else no channels ! */
uiBlockEndAlign ( block ) ;
xco = ( short ) ( rect - > xmin + 4.5f * dx ) ;
uiBlockSetEmboss ( block , UI_EMBOSSN ) ;
bt = uiDefIconBut ( block , BUT , redraw , ICON_ZOOMIN , xco , yco , dx , 14 , NULL , 0.0 , 0.0 , 0.0 , 0.0 , " Zoom in " ) ;
uiButSetFunc ( bt , curvemap_buttons_zoom_in , cumap , NULL ) ;
xco = ( short ) ( rect - > xmin + 5.25f * dx ) ;
bt = uiDefIconBut ( block , BUT , redraw , ICON_ZOOMOUT , xco , yco , dx , 14 , NULL , 0.0 , 0.0 , 0.0 , 0.0 , " Zoom out " ) ;
uiButSetFunc ( bt , curvemap_buttons_zoom_out , cumap , NULL ) ;
xco = ( short ) ( rect - > xmin + 6.0f * dx ) ;
bt = uiDefIconBlockBut ( block , curvemap_tools_func , cumap , event , ICON_MODIFIER , xco , yco , dx , 18 , " Tools " ) ;
xco = ( short ) ( rect - > xmin + 7.0f * dx ) ;
if ( cumap - > flag & CUMA_DO_CLIP ) icon = ICON_CLIPUV_HLT ; else icon = ICON_CLIPUV_DEHLT ;
bt = uiDefIconBlockBut ( block , curvemap_clipping_func , cumap , event , icon , xco , yco , dx , 18 , " Clipping Options " ) ;
xco = ( short ) ( rect - > xmin + 8.0f * dx ) ;
bt = uiDefIconBut ( block , BUT , event , ICON_X , xco , yco , dx , 18 , NULL , 0.0 , 0.0 , 0.0 , 0.0 , " Delete points " ) ;
uiButSetFunc ( bt , curvemap_buttons_delete , cumap , NULL ) ;
uiBlockSetEmboss ( block , UI_EMBOSS ) ;
uiDefBut ( block , BUT_CURVE , event , " " ,
rect - > xmin , rect - > ymin , rect - > xmax - rect - > xmin , fy - rect - > ymin ,
cumap , 0.0f , 1.0f , 0 , 0 , " " ) ;
}