[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60238] branches/soc-2013-ui_replay: Fixed drag and drop for custom panels, added copying of operator properties.
Vincent Akkermans
vincent at ack-err.net
Thu Sep 19 21:32:50 CEST 2013
Revision: 60238
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60238
Author: ack-err
Date: 2013-09-19 19:32:49 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
Fixed drag and drop for custom panels, added copying of operator properties. Also did minor code cleanup:
* combined add & delete panel icons in the tool shelf
* delete some of my old commented out code
* fixed drop poll for the toolbar
* changed default value for the layout property 'single_unit'
Modified Paths:
--------------
branches/soc-2013-ui_replay/release/datafiles/blender_operator_icons.svg
branches/soc-2013-ui_replay/release/datafiles/blender_operator_icons16.png
branches/soc-2013-ui_replay/release/datafiles/blender_operator_icons32.png
branches/soc-2013-ui_replay/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-ui_replay/source/blender/editors/include/UI_interface.h
branches/soc-2013-ui_replay/source/blender/editors/interface/interface_layout.c
branches/soc-2013-ui_replay/source/blender/editors/interface/interface_panel.c
branches/soc-2013-ui_replay/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-ui_replay/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2013-ui_replay/source/blender/windowmanager/intern/wm_operators.c
Modified: branches/soc-2013-ui_replay/release/datafiles/blender_operator_icons.svg
===================================================================
--- branches/soc-2013-ui_replay/release/datafiles/blender_operator_icons.svg 2013-09-19 13:35:43 UTC (rev 60237)
+++ branches/soc-2013-ui_replay/release/datafiles/blender_operator_icons.svg 2013-09-19 19:32:49 UTC (rev 60238)
@@ -37558,16 +37558,16 @@
objecttolerance="10000"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="18.829965"
- inkscape:cx="332.76626"
- inkscape:cy="15.614719"
+ inkscape:zoom="26.629592"
+ inkscape:cx="66.274599"
+ inkscape:cy="7.6793309"
inkscape:document-units="px"
- inkscape:current-layer="layer4"
+ inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1680"
inkscape:window-height="1002"
- inkscape:window-x="1920"
- inkscape:window-y="22"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
showguides="true"
@@ -44047,7 +44047,7 @@
<g
style="display:inline"
id="g16518"
- transform="translate(-63,127)">
+ transform="translate(-63,128)">
<rect
style="opacity:0;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect16520"
@@ -44347,7 +44347,7 @@
style="fill:#ffeeaa;display:inline"
transform="translate(-870.9421,-297.02038)" />
<g
- transform="translate(-206.98389,650.9857)"
+ transform="translate(-206.98389,651.9857)"
style="display:inline;enable-background:new"
id="g37229">
<path
@@ -44449,7 +44449,7 @@
y="66" />
<g
style="display:inline;enable-background:new"
- transform="translate(231,587)"
+ transform="translate(231,588)"
id="g40240">
<path
id="path40242"
@@ -44539,7 +44539,7 @@
<g
style="display:inline;enable-background:new"
id="g40603-2"
- transform="translate(50,740)">
+ transform="translate(50,741)">
<rect
y="-122"
x="-44"
@@ -44686,7 +44686,7 @@
</g>
<g
id="g40887"
- transform="translate(-189,147)">
+ transform="translate(-189,148)">
<g
id="g40668">
<rect
@@ -45081,7 +45081,7 @@
style="fill:none;stroke:#ffffff;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<g
- transform="translate(-293.56435,481.5061)"
+ transform="translate(-293.56435,482.5061)"
id="g17734">
<g
id="g15999"
@@ -45218,7 +45218,7 @@
</g>
</g>
<g
- transform="translate(-294,482)"
+ transform="translate(-294,483)"
id="g17757">
<g
style="display:inline"
@@ -45358,7 +45358,7 @@
</g>
</g>
<g
- transform="translate(-293.9899,481.99999)"
+ transform="translate(-293.9899,482.99999)"
id="g17780">
<g
style="display:inline;enable-background:new"
@@ -45515,7 +45515,7 @@
</g>
</g>
<g
- transform="translate(-293.99495,481.99999)"
+ transform="translate(-293.99495,482.99999)"
id="g17799">
<g
transform="matrix(0.75063125,0,0,0.75000075,415.7092,66.028803)"
@@ -45678,7 +45678,7 @@
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<g
- transform="translate(-273,481.93401)"
+ transform="translate(-273,482.93401)"
id="g17837">
<g
id="g16274"
@@ -45776,7 +45776,7 @@
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<g
- transform="translate(-273,481.93401)"
+ transform="translate(-273,482.93401)"
id="g17855">
<g
style="display:inline;enable-background:new"
@@ -45874,7 +45874,7 @@
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<g
- transform="translate(-273,482)"
+ transform="translate(-273,483)"
id="g17873">
<g
id="g16359"
@@ -46005,7 +46005,7 @@
</g>
</g>
<g
- transform="translate(-273,481.95313)"
+ transform="translate(-273,482.95313)"
id="g17819">
<g
style="display:inline;enable-background:new"
@@ -46104,7 +46104,7 @@
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<g
- transform="translate(-293.98509,482.96061)"
+ transform="translate(-293.98509,483.96061)"
id="g17726">
<rect
transform="matrix(0,1,-1,0,0,0)"
@@ -46146,7 +46146,7 @@
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<g
- transform="translate(-148.2,460.86584)"
+ transform="translate(-148.2,461.86584)"
id="g17906">
<g
transform="translate(-38.13389,188.9857)"
@@ -46205,7 +46205,7 @@
</g>
</g>
<g
- transform="translate(-315,460)"
+ transform="translate(-315,461)"
id="g17895">
<g
style="display:inline;enable-background:new"
Modified: branches/soc-2013-ui_replay/release/datafiles/blender_operator_icons16.png
===================================================================
(Binary files differ)
Modified: branches/soc-2013-ui_replay/release/datafiles/blender_operator_icons32.png
===================================================================
(Binary files differ)
Modified: branches/soc-2013-ui_replay/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2013-ui_replay/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-09-19 13:35:43 UTC (rev 60237)
+++ branches/soc-2013-ui_replay/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-09-19 19:32:49 UTC (rev 60238)
@@ -67,7 +67,7 @@
layout = self.layout
col = layout.column(align=True)
- row = col.row(align=True)
+ row = col.row(align=True, button_height=1.5)
row.operator("transform.translate", text="", single_unit=False, icon='MAN_TRANS', shortcut=False)
row.operator("transform.rotate", text="", single_unit=False, icon='MAN_ROT', shortcut=False)
row.operator("transform.resize", text="", single_unit=False, icon='MAN_SCALE', shortcut=False)
@@ -83,13 +83,11 @@
col = layout.column(align=True)
row = col.row(align=True, button_height=1.5)
row.operator("wm.call_menu", text="", single_unit=False, shortcut=False, icon='ADD').name = 'INFO_MT_add'
+ row.operator("object.duplicate_move", text="", shortcut=False, single_unit=False, icon='DUP')
+ row.operator("object.duplicate_move_linked", text="", shortcut=False, single_unit=False, icon='DUP_LINKED')
row.operator("object.delete", text="", shortcut=False, single_unit=False, icon='DELETE')
col = layout.column(align=True)
- row = col.row(align=True)
- row.operator("object.duplicate_move", text="", shortcut=False, single_unit=False, icon='DUP')
- row.operator("object.duplicate_move_linked", text="", shortcut=False, single_unit=False, icon='DUP_LINKED')
- row = col.row(align=True)
col.operator("object.join")
class VIEW3D_PT_tools_objectmode_adjust(View3DPanel, Panel):
@@ -160,7 +158,7 @@
layout = self.layout
col = layout.column(align=True)
- row = col.row(align=True)
+ row = col.row(align=True, button_height=1.5)
row.operator("transform.translate", text="", single_unit=False, icon='MAN_TRANS', shortcut=False)
row.operator("transform.rotate", text="", single_unit=False, icon='MAN_ROT', shortcut=False)
row.operator("transform.resize", text="", single_unit=False, icon='MAN_SCALE', shortcut=False)
@@ -184,10 +182,9 @@
col = layout.column(align=True)
row = col.row(align=True, button_height=1.5)
row.operator("wm.call_menu", text="", single_unit=False, shortcut=False, icon='ADD').name = 'INFO_MT_mesh_add'
+ row.operator("mesh.duplicate_move", text="", single_unit=False, shortcut=False, icon='DUP')
row.operator("wm.call_menu", text="", single_unit=False, shortcut=False, icon='DELETE').name = 'VIEW3D_MT_edit_mesh_delete'
- col = layout.column(align=True)
- col.operator("mesh.duplicate_move", text="Duplicate", single_unit=False, icon='DUP')
class VIEW3D_PT_tools_editmode_mesh(View3DPanel, Panel):
bl_context = "mesh_edit"
Modified: branches/soc-2013-ui_replay/source/blender/editors/include/UI_interface.h
===================================================================
--- branches/soc-2013-ui_replay/source/blender/editors/include/UI_interface.h 2013-09-19 13:35:43 UTC (rev 60237)
+++ branches/soc-2013-ui_replay/source/blender/editors/include/UI_interface.h 2013-09-19 19:32:49 UTC (rev 60238)
@@ -676,7 +676,7 @@
void uiEndPanel(uiBlock *block, int width, int height);
void uiScalePanels(struct ARegion *ar, float new_width);
-void uiPanelAddOperator(struct Panel *pa, const char *optype_idname);
+void uiPanelAddOperator(struct bContext *C, struct Panel *pa, struct wmOperatorType *ot, PointerRNA *opptr);
void uiPanelFree(struct Panel *pa);
int uiPanelClosed(struct Panel *pa);
Modified: branches/soc-2013-ui_replay/source/blender/editors/interface/interface_layout.c
===================================================================
--- branches/soc-2013-ui_replay/source/blender/editors/interface/interface_layout.c 2013-09-19 13:35:43 UTC (rev 60237)
+++ branches/soc-2013-ui_replay/source/blender/editors/interface/interface_layout.c 2013-09-19 19:32:49 UTC (rev 60238)
@@ -716,7 +716,7 @@
uiBlockSetEmboss(block, UI_EMBOSSN);
/* create the button */
- if (icon) {
+ if (icon != 0) {
if (name[0]) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list