Revision: 48100
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48100
Author: campbellbarton
Date: 2012-06-19 23:08:16 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
style cleanup: use TRUE/FALSE for ui align args.
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/fmodifier_ui.c
trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_utils.c
trunk/blender/source/blender/editors/space_buttons/buttons_context.c
trunk/blender/source/blender/editors/space_clip/clip_buttons.c
trunk/blender/source/blender/editors/space_file/file_panels.c
trunk/blender/source/blender/editors/space_graph/graph_buttons.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_nla/nla_buttons.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_buttons.c
trunk/blender/source/blender/editors/space_node/node_header.c
trunk/blender/source/blender/editors/space_node/node_templates.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
trunk/blender/source/blender/editors/util/undo.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/animation/fmodifier_ui.c
===================================================================
--- trunk/blender/source/blender/editors/animation/fmodifier_ui.c
2012-06-19 22:41:47 UTC (rev 48099)
+++ trunk/blender/source/blender/editors/animation/fmodifier_ui.c
2012-06-19 23:08:16 UTC (rev 48100)
@@ -123,7 +123,7 @@
RNA_pointer_create(id, &RNA_FModifierFunctionGenerator, fcm, &ptr);
/* basic settings (backdrop + mode selector + some padding) */
- /* col= uiLayoutColumn(layout, 1); */ /* UNUSED */
+ /* col = uiLayoutColumn(layout, TRUE); */ /* UNUSED */
block = uiLayoutGetBlock(layout);
uiBlockBeginAlign(block);
but = uiDefButR(block, MENU, B_FMODIFIER_REDRAW, NULL, 0, 0, width -
30, UI_UNIT_Y, &ptr, "mode", -1, 0, 0, -1, -1, NULL);
@@ -141,7 +141,7 @@
unsigned int i;
/* draw polynomial order selector */
- row = uiLayoutRow(layout, 0);
+ row = uiLayoutRow(layout, FALSE);
block = uiLayoutGetBlock(row);
but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW,
IFACE_("Poly Order:"), 10, 0, width - 30, 19,
&data->poly_order, 1, 100, 0, 0,
@@ -150,7 +150,7 @@
/* draw controls for each coefficient and a + sign at
end of row */
- row = uiLayoutRow(layout, 1);
+ row = uiLayoutRow(layout, TRUE);
block = uiLayoutGetBlock(row);
cp = data->coefficients;
@@ -177,7 +177,7 @@
uiDefBut(block, LABEL, 1, "+", 0, 0,
30, 20, NULL, 0.0, 0.0, 0, 0, "");
/* next coefficient on a new row */
- row = uiLayoutRow(layout, 1);
+ row = uiLayoutRow(layout, TRUE);
block = uiLayoutGetBlock(row);
}
else {
@@ -194,7 +194,7 @@
unsigned int i;
/* draw polynomial order selector */
- row = uiLayoutRow(layout, 0);
+ row = uiLayoutRow(layout, FALSE);
block = uiLayoutGetBlock(row);
but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW,
IFACE_("Poly Order:"), 0, 0, width - 30, 19,
&data->poly_order, 1, 100, 0, 0,
@@ -203,7 +203,7 @@
/* draw controls for each pair of coefficients */
- row = uiLayoutRow(layout, 1);
+ row = uiLayoutRow(layout, TRUE);
block = uiLayoutGetBlock(row);
cp = data->coefficients;
@@ -230,7 +230,7 @@
uiDefBut(block, LABEL, 1, ") +", 0, 0,
30, 20, NULL, 0.0, 0.0, 0, 0, "");
/* set up new row for the next pair of
coefficients*/
- row = uiLayoutRow(layout, 1);
+ row = uiLayoutRow(layout, TRUE);
block = uiLayoutGetBlock(row);
}
else
@@ -253,11 +253,11 @@
RNA_pointer_create(id, &RNA_FModifierFunctionGenerator, fcm, &ptr);
/* add the settings */
- col = uiLayoutColumn(layout, 1);
+ col = uiLayoutColumn(layout, TRUE);
uiItemR(col, &ptr, "function_type", 0, "", ICON_NONE);
uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- col = uiLayoutColumn(layout, 0); // no grouping for now
+ col = uiLayoutColumn(layout, FALSE); // no grouping for now
uiItemR(col, &ptr, "amplitude", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "phase_multiplier", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "phase_offset", 0, NULL, ICON_NONE);
@@ -278,16 +278,16 @@
/* split into 2 columns
* NOTE: the mode comboboxes shouldn't get labels, otherwise there
isn't enough room
*/
- split = uiLayoutSplit(layout, 0.5f, 0);
+ split = uiLayoutSplit(layout, 0.5f, FALSE);
/* before range */
- col = uiLayoutColumn(split, 1);
+ col = uiLayoutColumn(split, TRUE);
uiItemL(col, IFACE_("Before:"), ICON_NONE);
uiItemR(col, &ptr, "mode_before", 0, "", ICON_NONE);
uiItemR(col, &ptr, "cycles_before", 0, NULL, ICON_NONE);
/* after range */
- col = uiLayoutColumn(split, 1);
+ col = uiLayoutColumn(split, TRUE);
uiItemL(col, IFACE_("After:"), ICON_NONE);
uiItemR(col, &ptr, "mode_after", 0, "", ICON_NONE);
uiItemR(col, &ptr, "cycles_after", 0, NULL, ICON_NONE);
@@ -308,15 +308,15 @@
uiItemR(layout, &ptr, "blend_type", 0, NULL, ICON_NONE);
/* split into 2 columns */
- split = uiLayoutSplit(layout, 0.5f, 0);
+ split = uiLayoutSplit(layout, 0.5f, FALSE);
/* col 1 */
- col = uiLayoutColumn(split, 0);
+ col = uiLayoutColumn(split, FALSE);
uiItemR(col, &ptr, "scale", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "strength", 0, NULL, ICON_NONE);
/* col 2 */
- col = uiLayoutColumn(split, 0);
+ col = uiLayoutColumn(split, FALSE);
uiItemR(col, &ptr, "phase", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "depth", 0, NULL, ICON_NONE);
}
@@ -499,18 +499,18 @@
RNA_pointer_create(id, &RNA_FModifierEnvelope, fcm, &ptr);
/* general settings */
- col = uiLayoutColumn(layout, 1);
+ col = uiLayoutColumn(layout, TRUE);
uiItemL(col, IFACE_("Envelope:"), ICON_NONE);
uiItemR(col, &ptr, "reference_value", 0, NULL, ICON_NONE);
- row = uiLayoutRow(col, 1);
+ row = uiLayoutRow(col, TRUE);
uiItemR(row, &ptr, "default_min", 0, IFACE_("Min"), ICON_NONE);
uiItemR(row, &ptr, "default_max", 0, IFACE_("Max"), ICON_NONE);
/* control points header */
// TODO: move this control-point control stuff to using the new special
widgets for lists
// the current way is far too cramped
- row = uiLayoutRow(layout, 0);
+ row = uiLayoutRow(layout, FALSE);
block = uiLayoutGetBlock(row);
uiDefBut(block, LABEL, 1, IFACE_("Control Points:"), 0, 0, 150, 20,
NULL, 0.0, 0.0, 0, 0, "");
@@ -522,7 +522,7 @@
/* control points list */
for (i = 0, fed = env->data; i < env->totvert; i++, fed++) {
/* get a new row to operate on */
- row = uiLayoutRow(layout, 1);
+ row = uiLayoutRow(layout, TRUE);
block = uiLayoutGetBlock(row);
uiBlockBeginAlign(block);
@@ -555,36 +555,36 @@
/* row 1: minimum */
{
- /* row= uiLayoutRow(layout, 0); */ /* UNUSED */
+ /* row = uiLayoutRow(layout, FALSE); */ /* UNUSED */
/* split into 2 columns */
- split = uiLayoutSplit(layout, 0.5f, 0);
+ split = uiLayoutSplit(layout, 0.5f, FALSE);
/* x-minimum */
- col = uiLayoutColumn(split, 1);
+ col = uiLayoutColumn(split, TRUE);
uiItemR(col, &ptr, "use_min_x", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "min_x", 0, NULL, ICON_NONE);
/* y-minimum*/
- col = uiLayoutColumn(split, 1);
+ col = uiLayoutColumn(split, TRUE);
uiItemR(col, &ptr, "use_min_y", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "min_y", 0, NULL, ICON_NONE);
}
/* row 2: maximum */
{
- /* row= uiLayoutRow(layout, 0); */ /* UNUSED */
+ /* row = uiLayoutRow(layout, FALSE); */ /* UNUSED */
/* split into 2 columns */
- split = uiLayoutSplit(layout, 0.5f, 0);
+ split = uiLayoutSplit(layout, 0.5f, FALSE);
/* x-minimum */
- col = uiLayoutColumn(split, 1);
+ col = uiLayoutColumn(split, TRUE);
uiItemR(col, &ptr, "use_max_x", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "max_x", 0, NULL, ICON_NONE);
/* y-minimum*/
- col = uiLayoutColumn(split, 1);
+ col = uiLayoutColumn(split, TRUE);
uiItemR(col, &ptr, "use_max_y", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "max_y", 0, NULL, ICON_NONE);
}
@@ -602,23 +602,23 @@
RNA_pointer_create(id, &RNA_FModifierStepped, fcm, &ptr);
/* block 1: "stepping" settings */
- col = uiLayoutColumn(layout, 0);
+ col = uiLayoutColumn(layout, FALSE);
uiItemR(col, &ptr, "frame_step", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "frame_offset", 0, NULL, ICON_NONE);
/* block 2: start range settings */
- col = uiLayoutColumn(layout, 1);
+ col = uiLayoutColumn(layout, TRUE);
uiItemR(col, &ptr, "use_frame_start", 0, NULL, ICON_NONE);
- sub = uiLayoutColumn(col, 1);
+ sub = uiLayoutColumn(col, TRUE);
uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_frame_start"));
uiItemR(sub, &ptr, "frame_start", 0, NULL, ICON_NONE);
/* block 3: end range settings */
- col = uiLayoutColumn(layout, 1);
+ col = uiLayoutColumn(layout, TRUE);
uiItemR(col, &ptr, "use_frame_end", 0, NULL, ICON_NONE);
- sub = uiLayoutColumn(col, 1);
+ sub = uiLayoutColumn(col, TRUE);
uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_frame_end"));
uiItemR(sub, &ptr, "frame_end", 0, NULL, ICON_NONE);
}
@@ -642,11 +642,11 @@
/* get layout-row + UI-block for this */
box = uiLayoutBox(layout);
- row = uiLayoutRow(box, 0);
+ row = uiLayoutRow(box, FALSE);
block = uiLayoutGetBlock(row); // err...
/* left-align -------------------------------------------- */
- sub = uiLayoutRow(row, 1);
+ sub = uiLayoutRow(row, TRUE);
uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_LEFT);
uiBlockSetEmboss(block, UI_EMBOSSN);
@@ -664,7 +664,7 @@
uiItemL(sub, "<Unknown Modifier>", ICON_NONE);
/* right-align ------------------------------------------- */
- sub = uiLayoutRow(row, 1);
+ sub = uiLayoutRow(row, TRUE);
uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_RIGHT);
@@ -726,28 +726,28 @@
box = uiLayoutBox(layout);
/* restricted range
----------------------------------------------------- */
- col = uiLayoutColumn(box, 1);
+ col = uiLayoutColumn(box, TRUE);
/* top row: use restricted range */
- row = uiLayoutRow(col, 1);
+ row = uiLayoutRow(col, TRUE);
uiItemR(row, &ptr, "use_restricted_range", 0, NULL,
ICON_NONE);
if (fcm->flag & FMODIFIER_FLAG_RANGERESTRICT) {
/* second row: settings */
- row = uiLayoutRow(col, 1);
+ row = uiLayoutRow(col, TRUE);
uiItemR(row, &ptr, "frame_start", 0,
IFACE_("Start"), ICON_NONE);
uiItemR(row, &ptr, "frame_end", 0,
IFACE_("End"), ICON_NONE);
/* third row: blending influence */
- row = uiLayoutRow(col, 1);
+ row = uiLayoutRow(col, TRUE);
uiItemR(row, &ptr, "blend_in", 0, IFACE_("In"),
ICON_NONE);
uiItemR(row, &ptr, "blend_out", 0,
IFACE_("Out"), ICON_NONE);
}
/* influence
-------------------------------------------------------------- */
- col = uiLayoutColumn(box, 1);
+ col = uiLayoutColumn(box, TRUE);
/* top row: use influence */
uiItemR(col, &ptr, "use_influence", 0, NULL, ICON_NONE);
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
2012-06-19 22:41:47 UTC (rev 48099)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
2012-06-19 23:08:16 UTC (rev 48100)
@@ -113,14 +113,14 @@
/* get layout-row + UI-block for header */
box = uiLayoutBox(layout);
- row = uiLayoutRow(box, 0);
+ row = uiLayoutRow(box, FALSE);
uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_EXPAND);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
