Revision: 30219
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30219
Author: blendix
Date: 2010-07-12 12:55:05 +0200 (Mon, 12 Jul 2010)
Log Message:
-----------
2.5: remove pin floating panels settings, there are no floating panels
at the moment so it shouldn't be there.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2010-07-12 10:47:41 UTC
(rev 30218)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-07-12 10:55:05 UTC
(rev 30219)
@@ -162,7 +162,6 @@
col.prop(view, "show_view_name", text="View Name")
col.prop(view, "show_playback_fps", text="Playback FPS")
col.prop(view, "global_scene")
- col.prop(view, "pin_floating_panels")
col.prop(view, "object_origin_size")
col.separator()
Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c
2010-07-12 10:47:41 UTC (rev 30218)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c
2010-07-12 10:55:05 UTC (rev 30219)
@@ -285,32 +285,6 @@
}
}
-#if 0
-void uiPanelToMouse(const bContext *C, Panel *pa)
-{
- /* global control over this feature; UI_PNL_TO_MOUSE only called for
hotkey panels */
- if(U.uiflag & USER_PANELPINNED);
- else if(pa->control & UI_PNL_TO_MOUSE) {
- int mx, my;
-
- mx= CTX_wm_window(C)->eventstate->x;
- my= CTX_wm_window(C)->eventstate->y;
-
- pa->ofsx= mx-pa->sizex/2;
- pa->ofsy= my-pa->sizey/2;
-
- if(pa->flag & PNL_CLOSED) pa->flag &= ~PNL_CLOSED;
- }
-
- if(pa->control & UI_PNL_UNSTOW) {
- if(pa->flag & PNL_CLOSEDY) {
- pa->flag &= ~PNL_CLOSED;
- }
- }
-}
-#endif
-
-
static void ui_offset_panel_block(uiBlock *block)
{
uiStyle *style= U.uistyles.first;
Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2010-07-12
10:47:41 UTC (rev 30218)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2010-07-12
10:55:05 UTC (rev 30219)
@@ -439,7 +439,7 @@
#define USER_FLIPFULLSCREEN (1 << 7)
#define USER_ALLWINCODECS (1 << 8)
#define USER_MENUOPENAUTO (1 << 9)
-#define USER_PANELPINNED (1 << 10)
+#define USER_PANELPINNED (1 << 10) /* deprecated */
#define USER_AUTOPERSP (1 << 11)
#define USER_LOCKAROUND (1 << 12)
#define USER_GLOBALUNDO (1 << 13)
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2010-07-12
10:47:41 UTC (rev 30218)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2010-07-12
10:55:05 UTC (rev 30219)
@@ -1940,10 +1940,6 @@
RNA_def_property_range(prop, 1, 40);
RNA_def_property_ui_text(prop, "Hold RMB Open Toolbox Delay", "Time in
1/10 seconds to hold the Right Mouse Button before opening the toolbox");
- prop= RNA_def_property(srna, "pin_floating_panels", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_PANELPINNED);
- RNA_def_property_ui_text(prop, "Pin Floating Panels", "Make floating
panels invoked by a hotkey (e.g. N Key) open at the previous location");
-
prop= RNA_def_property(srna, "use_column_layout", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_PLAINMENUS);
RNA_def_property_ui_text(prop, "Toolbox Column Layout", "Use a column
layout for toolbox");
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
