From d7bfc48b3307b7bf53ff69abb0ccd8b605a65598 Mon Sep 17 00:00:00 2001 From: Stephen Leger Date: Mon, 28 Jan 2019 09:28:50 +0100 Subject: archipack 2.8 fix icon_only --- archipack/archipack_cutter.py | 4 ++-- archipack/archipack_fence.py | 28 ++++++++++++++-------------- archipack/archipack_floor.py | 4 ++-- archipack/archipack_roof.py | 32 ++++++++++++++++---------------- archipack/archipack_slab.py | 4 ++-- archipack/archipack_stair.py | 36 ++++++++++++++++++------------------ archipack/archipack_wall2.py | 4 ++-- archipack/archipack_window.py | 12 ++++++------ 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/archipack/archipack_cutter.py b/archipack/archipack_cutter.py index 3b9f424d..b75dc4cf 100644 --- a/archipack/archipack_cutter.py +++ b/archipack/archipack_cutter.py @@ -662,12 +662,12 @@ class ArchipackCutter(): box = layout.box() row = box.row() if self.parts_expand: - row.prop(self, 'parts_expand', icon="TRIA_DOWN", icon_only=True, text="Parts", emboss=False) + row.prop(self, 'parts_expand', icon="TRIA_DOWN", text="Parts", emboss=False) box.prop(self, 'n_parts') for i, part in enumerate(self.parts): part.draw(layout, context, i) else: - row.prop(self, 'parts_expand', icon="TRIA_RIGHT", icon_only=True, text="Parts", emboss=False) + row.prop(self, 'parts_expand', icon="TRIA_RIGHT", text="Parts", emboss=False) def update_parts(self): # print("update_parts") diff --git a/archipack/archipack_fence.py b/archipack/archipack_fence.py index 5f987779..7af93df3 100644 --- a/archipack/archipack_fence.py +++ b/archipack/archipack_fence.py @@ -1490,19 +1490,19 @@ class ARCHIPACK_PT_fence(Panel): box = layout.box() row = box.row() if prop.parts_expand: - row.prop(prop, 'parts_expand', icon="TRIA_DOWN", icon_only=True, text="Parts", emboss=False) + row.prop(prop, 'parts_expand', icon="TRIA_DOWN", text="Parts", emboss=False) box.prop(prop, 'n_parts') for i, part in enumerate(prop.parts): part.draw(layout, context, i) else: - row.prop(prop, 'parts_expand', icon="TRIA_RIGHT", icon_only=True, text="Parts", emboss=False) + row.prop(prop, 'parts_expand', icon="TRIA_RIGHT", text="Parts", emboss=False) box = layout.box() row = box.row(align=True) if prop.handrail_expand: - row.prop(prop, 'handrail_expand', icon="TRIA_DOWN", icon_only=True, text="Handrail", emboss=False) + row.prop(prop, 'handrail_expand', icon="TRIA_DOWN", text="Handrail", emboss=False) else: - row.prop(prop, 'handrail_expand', icon="TRIA_RIGHT", icon_only=True, text="Handrail", emboss=False) + row.prop(prop, 'handrail_expand', icon="TRIA_RIGHT", text="Handrail", emboss=False) row.prop(prop, 'handrail') @@ -1522,9 +1522,9 @@ class ARCHIPACK_PT_fence(Panel): box = layout.box() row = box.row(align=True) if prop.post_expand: - row.prop(prop, 'post_expand', icon="TRIA_DOWN", icon_only=True, text="Post", emboss=False) + row.prop(prop, 'post_expand', icon="TRIA_DOWN", text="Post", emboss=False) else: - row.prop(prop, 'post_expand', icon="TRIA_RIGHT", icon_only=True, text="Post", emboss=False) + row.prop(prop, 'post_expand', icon="TRIA_RIGHT", text="Post", emboss=False) row.prop(prop, 'post') if prop.post_expand: box.prop(prop, 'post_spacing') @@ -1539,9 +1539,9 @@ class ARCHIPACK_PT_fence(Panel): box = layout.box() row = box.row(align=True) if prop.subs_expand: - row.prop(prop, 'subs_expand', icon="TRIA_DOWN", icon_only=True, text="Subs", emboss=False) + row.prop(prop, 'subs_expand', icon="TRIA_DOWN", text="Subs", emboss=False) else: - row.prop(prop, 'subs_expand', icon="TRIA_RIGHT", icon_only=True, text="Subs", emboss=False) + row.prop(prop, 'subs_expand', icon="TRIA_RIGHT", text="Subs", emboss=False) row.prop(prop, 'subs') if prop.subs_expand: @@ -1558,9 +1558,9 @@ class ARCHIPACK_PT_fence(Panel): box = layout.box() row = box.row(align=True) if prop.panel_expand: - row.prop(prop, 'panel_expand', icon="TRIA_DOWN", icon_only=True, text="Panels", emboss=False) + row.prop(prop, 'panel_expand', icon="TRIA_DOWN", text="Panels", emboss=False) else: - row.prop(prop, 'panel_expand', icon="TRIA_RIGHT", icon_only=True, text="Panels", emboss=False) + row.prop(prop, 'panel_expand', icon="TRIA_RIGHT", text="Panels", emboss=False) row.prop(prop, 'panel') if prop.panel_expand: box.prop(prop, 'panel_dist') @@ -1572,9 +1572,9 @@ class ARCHIPACK_PT_fence(Panel): box = layout.box() row = box.row(align=True) if prop.rail_expand: - row.prop(prop, 'rail_expand', icon="TRIA_DOWN", icon_only=True, text="Rails", emboss=False) + row.prop(prop, 'rail_expand', icon="TRIA_DOWN", text="Rails", emboss=False) else: - row.prop(prop, 'rail_expand', icon="TRIA_RIGHT", icon_only=True, text="Rails", emboss=False) + row.prop(prop, 'rail_expand', icon="TRIA_RIGHT", text="Rails", emboss=False) row.prop(prop, 'rail') if prop.rail_expand: box.prop(prop, 'rail_n') @@ -1591,13 +1591,13 @@ class ARCHIPACK_PT_fence(Panel): row = box.row() if prop.idmats_expand: - row.prop(prop, 'idmats_expand', icon="TRIA_DOWN", icon_only=True, text="Materials", emboss=False) + row.prop(prop, 'idmats_expand', icon="TRIA_DOWN", text="Materials", emboss=False) box.prop(prop, 'idmat_handrail') box.prop(prop, 'idmat_panel') box.prop(prop, 'idmat_post') box.prop(prop, 'idmat_subs') else: - row.prop(prop, 'idmats_expand', icon="TRIA_RIGHT", icon_only=True, text="Materials", emboss=False) + row.prop(prop, 'idmats_expand', icon="TRIA_RIGHT", text="Materials", emboss=False) # ------------------------------------------------------------------ # Define operator class to create object diff --git a/archipack/archipack_floor.py b/archipack/archipack_floor.py index 82c1f000..5a5bc66f 100644 --- a/archipack/archipack_floor.py +++ b/archipack/archipack_floor.py @@ -1670,13 +1670,13 @@ class ARCHIPACK_PT_floor(Panel): box = layout.box() row = box.row() if props.parts_expand: - row.prop(props, 'parts_expand', icon="TRIA_DOWN", icon_only=True, text="Parts", emboss=False) + row.prop(props, 'parts_expand', icon="TRIA_DOWN", text="Parts", emboss=False) box.prop(props, 'n_parts') # box.prop(prop, 'closed') for i, part in enumerate(props.parts): part.draw(context, layout, i) else: - row.prop(props, 'parts_expand', icon="TRIA_RIGHT", icon_only=True, text="Parts", emboss=False) + row.prop(props, 'parts_expand', icon="TRIA_RIGHT", text="Parts", emboss=False) layout.separator() box = layout.box() box.prop(props, 'pattern', text="") diff --git a/archipack/archipack_roof.py b/archipack/archipack_roof.py index 02bb01e8..477a3ce6 100644 --- a/archipack/archipack_roof.py +++ b/archipack/archipack_roof.py @@ -3527,12 +3527,12 @@ class ArchipackLines(): box = layout.box() row = box.row() if self.parts_expand: - row.prop(self, 'parts_expand', icon="TRIA_DOWN", icon_only=True, text="Parts", emboss=False) + row.prop(self, 'parts_expand', icon="TRIA_DOWN", text="Parts", emboss=False) box.prop(self, 'n_parts') for i, part in enumerate(self.parts): part.draw(layout, context, i) else: - row.prop(self, 'parts_expand', icon="TRIA_RIGHT", icon_only=True, text="Parts", emboss=False) + row.prop(self, 'parts_expand', icon="TRIA_RIGHT", text="Parts", emboss=False) def update_parts(self): # print("update_parts") @@ -4707,13 +4707,13 @@ class archipack_roof(ArchipackLines, ArchipackObject, Manipulable, PropertyGroup box = layout.box() row = box.row() if self.parts_expand: - row.prop(self, 'parts_expand', icon="TRIA_DOWN", icon_only=True, text="Parts", emboss=False) + row.prop(self, 'parts_expand', icon="TRIA_DOWN", text="Parts", emboss=False) box.prop(self, 'n_parts') # box.prop(self, 'closed') for i, part in enumerate(self.parts): part.draw(layout, context, i) else: - row.prop(self, 'parts_expand', icon="TRIA_RIGHT", icon_only=True, text="Parts", emboss=False) + row.prop(self, 'parts_expand', icon="TRIA_RIGHT", text="Parts", emboss=False) def update_hole(self, context): @@ -4876,9 +4876,9 @@ class ARCHIPACK_PT_roof(Panel): box = layout.box() row = box.row(align=True) if prop.tile_expand: - row.prop(prop, 'tile_expand', icon="TRIA_DOWN", text="Covering", icon_only=True, emboss=False) + row.prop(prop, 'tile_expand', icon="TRIA_DOWN", text="Covering", emboss=False) else: - row.prop(prop, 'tile_expand', icon="TRIA_RIGHT", text="Covering", icon_only=True, emboss=False) + row.prop(prop, 'tile_expand', icon="TRIA_RIGHT", text="Covering", emboss=False) row.prop(prop, 'tile_enable') if prop.tile_expand: box.prop(prop, 'tile_model', text="") @@ -4919,9 +4919,9 @@ class ARCHIPACK_PT_roof(Panel): box = layout.box() row = box.row(align=True) if prop.hip_expand: - row.prop(prop, 'hip_expand', icon="TRIA_DOWN", text="Hip", icon_only=True, emboss=False) + row.prop(prop, 'hip_expand', icon="TRIA_DOWN", text="Hip", emboss=False) else: - row.prop(prop, 'hip_expand', icon="TRIA_RIGHT", text="Hip", icon_only=True, emboss=False) + row.prop(prop, 'hip_expand', icon="TRIA_RIGHT", text="Hip", emboss=False) row.prop(prop, 'hip_enable') if prop.hip_expand: box.prop(prop, 'hip_model', text="") @@ -4938,9 +4938,9 @@ class ARCHIPACK_PT_roof(Panel): row = box.row(align=True) if prop.beam_expand: - row.prop(prop, 'beam_expand', icon="TRIA_DOWN", text="Beam", icon_only=True, emboss=False) + row.prop(prop, 'beam_expand', icon="TRIA_DOWN", text="Beam", emboss=False) else: - row.prop(prop, 'beam_expand', icon="TRIA_RIGHT", text="Beam", icon_only=True, emboss=False) + row.prop(prop, 'beam_expand', icon="TRIA_RIGHT", text="Beam", emboss=False) if prop.beam_expand: box.prop(prop, 'beam_enable') if prop.beam_enable: @@ -4966,9 +4966,9 @@ class ARCHIPACK_PT_roof(Panel): box = layout.box() row = box.row(align=True) if prop.gutter_expand: - row.prop(prop, 'gutter_expand', icon="TRIA_DOWN", text="Gutter", icon_only=True, emboss=False) + row.prop(prop, 'gutter_expand', icon="TRIA_DOWN", text="Gutter", emboss=False) else: - row.prop(prop, 'gutter_expand', icon="TRIA_RIGHT", text="Gutter", icon_only=True, emboss=False) + row.prop(prop, 'gutter_expand', icon="TRIA_RIGHT", text="Gutter", emboss=False) row.prop(prop, 'gutter_enable') if prop.gutter_expand: box.prop(prop, 'gutter_alt') @@ -4980,9 +4980,9 @@ class ARCHIPACK_PT_roof(Panel): box = layout.box() row = box.row(align=True) if prop.fascia_expand: - row.prop(prop, 'fascia_expand', icon="TRIA_DOWN", text="Fascia", icon_only=True, emboss=False) + row.prop(prop, 'fascia_expand', icon="TRIA_DOWN", text="Fascia", emboss=False) else: - row.prop(prop, 'fascia_expand', icon="TRIA_RIGHT", text="Fascia", icon_only=True, emboss=False) + row.prop(prop, 'fascia_expand', icon="TRIA_RIGHT", text="Fascia", emboss=False) row.prop(prop, 'fascia_enable') if prop.fascia_expand: box.prop(prop, 'fascia_altitude') @@ -4993,9 +4993,9 @@ class ARCHIPACK_PT_roof(Panel): box = layout.box() row = box.row(align=True) if prop.bargeboard_expand: - row.prop(prop, 'bargeboard_expand', icon="TRIA_DOWN", text="Bargeboard", icon_only=True, emboss=False) + row.prop(prop, 'bargeboard_expand', icon="TRIA_DOWN", text="Bargeboard", emboss=False) else: - row.prop(prop, 'bargeboard_expand', icon="TRIA_RIGHT", text="Bargeboard", icon_only=True, emboss=False) + row.prop(prop, 'bargeboard_expand', icon="TRIA_RIGHT", text="Bargeboard", emboss=False) row.prop(prop, 'bargeboard_enable') if prop.bargeboard_expand: box.prop(prop, 'bargeboard_altitude') diff --git a/archipack/archipack_slab.py b/archipack/archipack_slab.py index 38150094..3c0d513c 100644 --- a/archipack/archipack_slab.py +++ b/archipack/archipack_slab.py @@ -1327,13 +1327,13 @@ class ARCHIPACK_PT_slab(Panel): box = layout.box() row = box.row() if prop.parts_expand: - row.prop(prop, 'parts_expand', icon="TRIA_DOWN", icon_only=True, text="Parts", emboss=False) + row.prop(prop, 'parts_expand', icon="TRIA_DOWN", text="Parts", emboss=False) box.prop(prop, 'n_parts') # box.prop(prop, 'closed') for i, part in enumerate(prop.parts): part.draw(context, layout, i) else: - row.prop(prop, 'parts_expand', icon="TRIA_RIGHT", icon_only=True, text="Parts", emboss=False) + row.prop(prop, 'parts_expand', icon="TRIA_RIGHT", text="Parts", emboss=False) class ARCHIPACK_PT_slab_cutter(Panel): diff --git a/archipack/archipack_stair.py b/archipack/archipack_stair.py index c0d75317..5f3fcf1f 100644 --- a/archipack/archipack_stair.py +++ b/archipack/archipack_stair.py @@ -2571,7 +2571,7 @@ class ARCHIPACK_PT_stair(Panel): box = layout.box() row = box.row() if prop.parts_expand: - row.prop(prop, 'parts_expand', icon="TRIA_DOWN", icon_only=True, text="Parts", emboss=False) + row.prop(prop, 'parts_expand', icon="TRIA_DOWN", text="Parts", emboss=False) if prop.presets == 'STAIR_USER': box.prop(prop, 'n_parts') if prop.presets != 'STAIR_USER': @@ -2589,26 +2589,26 @@ class ARCHIPACK_PT_stair(Panel): for i, part in enumerate(prop.parts): part.draw(layout, context, i, prop.presets == 'STAIR_USER') else: - row.prop(prop, 'parts_expand', icon="TRIA_RIGHT", icon_only=True, text="Parts", emboss=False) + row.prop(prop, 'parts_expand', icon="TRIA_RIGHT", text="Parts", emboss=False) box = layout.box() row = box.row() if prop.steps_expand: - row.prop(prop, 'steps_expand', icon="TRIA_DOWN", icon_only=True, text="Steps", emboss=False) + row.prop(prop, 'steps_expand', icon="TRIA_DOWN", text="Steps", emboss=False) box.prop(prop, 'steps_type') box.prop(prop, 'step_depth') box.prop(prop, 'nose_type') box.prop(prop, 'nose_z') box.prop(prop, 'nose_y') else: - row.prop(prop, 'steps_expand', icon="TRIA_RIGHT", icon_only=True, text="Steps", emboss=False) + row.prop(prop, 'steps_expand', icon="TRIA_RIGHT", text="Steps", emboss=False) box = layout.box() row = box.row(align=True) if prop.handrail_expand: - row.prop(prop, 'handrail_expand', icon="TRIA_DOWN", icon_only=True, text="Handrail", emboss=False) + row.prop(prop, 'handrail_expand', icon="TRIA_DOWN", text="Handrail", emboss=False) else: - row.prop(prop, 'handrail_expand', icon="TRIA_RIGHT", icon_only=True, text="Handrail", emboss=False) + row.prop(prop, 'handrail_expand', icon="TRIA_RIGHT", text="Handrail", emboss=False) row.prop(prop, 'left_handrail') row.prop(prop, 'right_handrail') @@ -2630,9 +2630,9 @@ class ARCHIPACK_PT_stair(Panel): box = layout.box() row = box.row(align=True) if prop.string_expand: - row.prop(prop, 'string_expand', icon="TRIA_DOWN", icon_only=True, text="String", emboss=False) + row.prop(prop, 'string_expand', icon="TRIA_DOWN", text="String", emboss=False) else: - row.prop(prop, 'string_expand', icon="TRIA_RIGHT", icon_only=True, text="String", emboss=False) + row.prop(prop, 'string_expand', icon="TRIA_RIGHT", text="String", emboss=False) row.prop(prop, 'left_string') row.prop(prop, 'right_string') if prop.string_expand: @@ -2644,9 +2644,9 @@ class ARCHIPACK_PT_stair(Panel): box = layout.box() row = box.row(align=True) if prop.post_expand: - row.prop(prop, 'post_expand', icon="TRIA_DOWN", icon_only=True, text="Post", emboss=False) + row.prop(prop, 'post_expand', icon="TRIA_DOWN", text="Post", emboss=False) else: - row.prop(prop, 'post_expand', icon="TRIA_RIGHT", icon_only=True, text="Post", emboss=False) + row.prop(prop, 'post_expand', icon="TRIA_RIGHT", text="Post", emboss=False) row.prop(prop, 'left_post') row.prop(prop, 'right_post') if prop.post_expand: @@ -2665,9 +2665,9 @@ class ARCHIPACK_PT_stair(Panel): box = layout.box() row = box.row(align=True) if prop.subs_expand: - row.prop(prop, 'subs_expand', icon="TRIA_DOWN", icon_only=True, text="Subs", emboss=False) + row.prop(prop, 'subs_expand', icon="TRIA_DOWN", text="Subs", emboss=False) else: - row.prop(prop, 'subs_expand', icon="TRIA_RIGHT", icon_only=True, text="Subs", emboss=False) + row.prop(prop, 'subs_expand', icon="TRIA_RIGHT", text="Subs", emboss=False) row.prop(prop, 'left_subs') row.prop(prop, 'right_subs') @@ -2686,9 +2686,9 @@ class ARCHIPACK_PT_stair(Panel): box = layout.box() row = box.row(align=True) if prop.panel_expand: - row.prop(prop, 'panel_expand', icon="TRIA_DOWN", icon_only=True, text="Panels", emboss=False) + row.prop(prop, 'panel_expand', icon="TRIA_DOWN", text="Panels", emboss=False) else: - row.prop(prop, 'panel_expand', icon="TRIA_RIGHT", icon_only=True, text="Panels", emboss=False) + row.prop(prop, 'panel_expand', icon="TRIA_RIGHT", text="Panels", emboss=False) row.prop(prop, 'left_panel') row.prop(prop, 'right_panel') if prop.panel_expand: @@ -2701,9 +2701,9 @@ class ARCHIPACK_PT_stair(Panel): box = layout.box() row = box.row(align=True) if prop.rail_expand: - row.prop(prop, 'rail_expand', icon="TRIA_DOWN", icon_only=True, text="Rails", emboss=False) + row.prop(prop, 'rail_expand', icon="TRIA_DOWN", text="Rails", emboss=False) else: - row.prop(prop, 'rail_expand', icon="TRIA_RIGHT", icon_only=True, text="Rails", emboss=False) + row.prop(prop, 'rail_expand', icon="TRIA_RIGHT", text="Rails", emboss=False) row.prop(prop, 'left_rail') row.prop(prop, 'right_rail') if prop.rail_expand: @@ -2721,7 +2721,7 @@ class ARCHIPACK_PT_stair(Panel): row = box.row() if prop.idmats_expand: - row.prop(prop, 'idmats_expand', icon="TRIA_DOWN", icon_only=True, text="Materials", emboss=False) + row.prop(prop, 'idmats_expand', icon="TRIA_DOWN", text="Materials", emboss=False) box.prop(prop, 'idmat_top') box.prop(prop, 'idmat_side') box.prop(prop, 'idmat_bottom') @@ -2734,7 +2734,7 @@ class ARCHIPACK_PT_stair(Panel): box.prop(prop, 'idmat_subs') box.prop(prop, 'idmat_string') else: - row.prop(prop, 'idmats_expand', icon="TRIA_RIGHT", icon_only=True, text="Materials", emboss=False) + row.prop(prop, 'idmats_expand', icon="TRIA_RIGHT", text="Materials", emboss=False) # ------------------------------------------------------------------ diff --git a/archipack/archipack_wall2.py b/archipack/archipack_wall2.py index fdf24082..1eb3ff80 100644 --- a/archipack/archipack_wall2.py +++ b/archipack/archipack_wall2.py @@ -738,9 +738,9 @@ class archipack_wall2_part(PropertyGroup): row = layout.row(align=True) if self.expand: - row.prop(self, 'expand', icon="TRIA_DOWN", icon_only=True, text="Part " + str(index + 1), emboss=False) + row.prop(self, 'expand', icon="TRIA_DOWN", text="Part " + str(index + 1), emboss=False) else: - row.prop(self, 'expand', icon="TRIA_RIGHT", icon_only=True, text="Part " + str(index + 1), emboss=False) + row.prop(self, 'expand', icon="TRIA_RIGHT", text="Part " + str(index + 1), emboss=False) row.prop(self, "type", text="") diff --git a/archipack/archipack_window.py b/archipack/archipack_window.py index f79005e4..74d687dc 100644 --- a/archipack/archipack_window.py +++ b/archipack/archipack_window.py @@ -1579,9 +1579,9 @@ class ARCHIPACK_PT_window(Panel): row = layout.row(align=True) if prop.display_detail: - row.prop(prop, "display_detail", icon="TRIA_DOWN", icon_only=True, text="Components", emboss=False) + row.prop(prop, "display_detail", icon="TRIA_DOWN", text="Components", emboss=False) else: - row.prop(prop, "display_detail", icon="TRIA_RIGHT", icon_only=True, text="Components", emboss=False) + row.prop(prop, "display_detail", icon="TRIA_RIGHT", text="Components", emboss=False) if prop.display_detail: box = layout.box() @@ -1629,9 +1629,9 @@ class ARCHIPACK_PT_window(Panel): if prop.window_shape != 'CIRCLE': row = layout.row() if prop.display_panels: - row.prop(prop, "display_panels", icon="TRIA_DOWN", icon_only=True, text="Rows", emboss=False) + row.prop(prop, "display_panels", icon="TRIA_DOWN", text="Rows", emboss=False) else: - row.prop(prop, "display_panels", icon="TRIA_RIGHT", icon_only=True, text="Rows", emboss=False) + row.prop(prop, "display_panels", icon="TRIA_RIGHT", text="Rows", emboss=False) if prop.display_panels: if prop.window_type != 'RAIL': @@ -1649,9 +1649,9 @@ class ARCHIPACK_PT_window(Panel): row = layout.row(align=True) if prop.display_materials: - row.prop(prop, "display_materials", icon="TRIA_DOWN", icon_only=True, text="Materials", emboss=False) + row.prop(prop, "display_materials", icon="TRIA_DOWN", text="Materials", emboss=False) else: - row.prop(prop, "display_materials", icon="TRIA_RIGHT", icon_only=True, text="Materials", emboss=False) + row.prop(prop, "display_materials", icon="TRIA_RIGHT", text="Materials", emboss=False) if prop.display_materials: box = layout.box() box.label(text="Hole") -- cgit v1.2.3