← Back to team overview

mlhim-specs-dev team mailing list archive

[Branch ~cdd-dev/cdd/trunk] Rev 299: Changed layout and behavior of CareEntry class

 

------------------------------------------------------------
revno: 299
committer: Eduardo Ribeiro <xcesar@xxxxxxxxx>
branch nick: devel
timestamp: Tue 2013-01-22 00:58:35 -0200
message:
  Changed layout and behavior of CareEntry class
modified:
  src/2.0/cdd.py
  src/2.0/cdd.wxg
  src/2.0/cdd_gui.py


--
lp:cdd
https://code.launchpad.net/~cdd-dev/cdd/trunk

Your team MLHIM Specifications Developers is subscribed to branch lp:cdd.
To unsubscribe from this branch go to https://code.launchpad.net/~cdd-dev/cdd/trunk/+edit-subscription
=== modified file 'src/2.0/cdd.py'
--- src/2.0/cdd.py	2013-01-22 02:57:58 +0000
+++ src/2.0/cdd.py	2013-01-22 02:58:35 +0000
@@ -36,14 +36,10 @@
 import cdd_gui
 from aux_gui import *
 
-gettext.bindtextdomain('CDD','locale/en')
-gettext.textdomain('CDD')
-_ = gettext.gettext
 
 
 class Slot(cdd_gui.Slot):
     def __init__(self, *args, **kwds):
-        #super(Slot, self).__init__(self, *args, **kwds)
         cdd_gui.Slot.__init__(self, *args, **kwds)
 
     def ccd_add(self, event): # Redefinition of cdd_gui.Slot.cdd_add
@@ -61,35 +57,30 @@
 
 class PartySelf(cdd_gui.PartySelf):
     def __init__(self, *args, **kwds):
-        #super(PartySelf, self).__init__(self, *args, **kwds)
         cdd_gui.PartySelf.__init__(self, *args, **kwds)
 
 # end of class PartySelf
 
 class PartyIdentified(cdd_gui.PartyIdentified):
     def __init__(self, *args, **kwds):
-        #super(PartyIdentified, self).__init__(self, *args, **kwds)
         cdd_gui.PartyIdentified.__init__(self, *args, **kwds)
 
 # end of class PartyIdentified
 
 class FeederAudit(cdd_gui.FeederAudit):
     def __init__(self, *args, **kwds):
-        #super(FeederAudit, self).__init__(self, *args, **kwds)
         cdd_gui.FeederAudit.__init__(self, *args, **kwds)
 
 # end of class FeederAudit
 
 class Participation(cdd_gui.Participation):
     def __init__(self, *args, **kwds):
-        #super(Participation, self).__init__(self, *args, **kwds)
         cdd_gui.Participation.__init__(self, *args, **kwds)
 
 # end of class Participation
 
 class DvIdentifier(cdd_gui.DvIdentifier):
     def __init__(self, *args, **kwds):
-        #super(DvIdentifier, self).__init__(self, *args, **kwds)
         cdd_gui.DvIdentifier.__init__(self, *args, **kwds)
         self.init_things()
 
@@ -148,7 +139,6 @@
 
 class DvCodedString(cdd_gui.DvCodedString):
     def __init__(self, *args, **kwds):
-        #super(DvCodedString, self).__init__(self, *args, **kwds)
         cdd_gui.DvCodedString.__init__(self, *args, **kwds)
         self.init_things()
 
@@ -205,14 +195,12 @@
 
 class Attestation(cdd_gui.Attestation):
     def __init__(self, *args, **kwds):
-        #super(Attestation, self).__init__(self, *args, **kwds)
         cdd_gui.Attestation.__init__(self, *args, **kwds)
 
 # end of class Attestation
 
 class DvURI(cdd_gui.DvURI):
     def __init__(self, *args, **kwds):
-        #super(DvURI, self).__init__(self, *args, **kwds)
         cdd_gui.DvURI.__init__(self, *args, **kwds)
         self.init_things()
 
@@ -235,9 +223,11 @@
 
 class Cluster(cdd_gui.Cluster):
     def __init__(self, *args, **kwds):
-        #super(Cluster, self).__init__(self, *args, **kwds)
+        self.suffix = kwds.pop('suffix', '')
         cdd_gui.Cluster.__init__(self, *args, **kwds)
 
+
+
     def evt_button_ok(self):
         top_panel = self.GetTopLevelParent()
         tree = top_panel.tree_ctrl_ccd
@@ -246,68 +236,84 @@
         subject = None
         if self.radio_btn_cluster.GetValue():
             subject = self.text_ctrl_cluster.GetValue()
-            sel_string = 'Cluster' ' .' + subject
+            sel_string = 'Cluster' + self.suffix + ' .' + subject
         elif self.radio_btn_element.GetValue():
-            sel_string = 'Element'
+            sel_string = 'Element' + self.suffix
         elif self.radio_btn_slot.GetValue():
-            sel_string = 'Slot'
+            sel_string = 'Slot' + self.suffix
 
         i = tree.AppendItem(item, sel_string)
         top_panel.set_item_index(i)
         tree.Expand(item)
 
+    def evt_delete(self):
+        top_panel = self.GetTopLevelParent()
+        tree = top_panel.tree_ctrl_ccd
+        tree_selected = tree.GetSelection()
+
+        child, cookie = tree.GetFirstChild(tree_selected)
+        while child.IsOk():
+            txt = tree.GetItemText(child)
+            splitted = txt.split()
+            
+            if splitted.count('Data'):
+                tree.Delete(child)
+                return
+
+            child, cookie = tree.GetNextChild(tree_selected, cookie)
+
+
 # end of class Cluster
 
-class ClusterEmbed(Cluster):
-    def __init__(self, *args, **kwds):
-        self.suffix = kwds.pop('suffix', '')
-
-        Cluster.__init__(self, *args, **kwds)
-        self.Bind(wx.EVT_RADIOBUTTON, self.evt_radio_button)
-
-    def evt_radio_button(self, event):
-
-        top_panel = self.GetTopLevelParent()
-        tree = top_panel.tree_ctrl_ccd
-        tree_selected = tree.GetSelection()
-
-        subject = None
-        if self.radio_btn_cluster.GetValue():
-            sel_string = 'Cluster'
-            subject = self.text_ctrl_cluster.GetValue()
-        elif self.radio_btn_element.GetValue():
-            sel_string = 'Element'
-        elif self.radio_btn_slot.GetValue():
-            sel_string = 'Slot'
-
-        if subject:
-            sel_string += ' .' + subject
-
-        sel_string += self.suffix
-
-        child, cookie = tree.GetFirstChild(tree_selected)
-        while child.IsOk():
-            txt = tree.GetItemText(child)
-            if txt.endswith(self.suffix):
-                tree.InsertItem(tree_selected, child, sel_string)
-                tree.Delete(child)
-                return
-
-            child, cookie = tree.GetNextChild(tree_selected, cookie)
-
-
-
-        i = tree.AppendItem(tree_selected, sel_string)
-        top_panel.set_item_index(i)
-        tree.Expand(tree_selected)
-
-    # Undefining parent function
-    def evt_button_ok(self):
-        pass
+# class ClusterEmbed(Cluster):
+#     def __init__(self, *args, **kwds):
+#         self.suffix = kwds.pop('suffix', '')
+
+#         Cluster.__init__(self, *args, **kwds)
+#         self.Bind(wx.EVT_RADIOBUTTON, self.evt_radio_button)
+
+#     def evt_radio_button(self, event):
+
+#         top_panel = self.GetTopLevelParent()
+#         tree = top_panel.tree_ctrl_ccd
+#         tree_selected = tree.GetSelection()
+
+#         subject = None
+#         if self.radio_btn_cluster.GetValue():
+#             sel_string = 'Cluster'
+#             subject = self.text_ctrl_cluster.GetValue()
+#         elif self.radio_btn_element.GetValue():
+#             sel_string = 'Element'
+#         elif self.radio_btn_slot.GetValue():
+#             sel_string = 'Slot'
+
+#         if subject:
+#             sel_string += ' .' + subject
+
+#         sel_string += self.suffix
+
+#         child, cookie = tree.GetFirstChild(tree_selected)
+#         while child.IsOk():
+#             txt = tree.GetItemText(child)
+#             if txt.endswith(self.suffix):
+#                 tree.InsertItem(tree_selected, child, sel_string)
+#                 tree.Delete(child)
+#                 return
+
+#             child, cookie = tree.GetNextChild(tree_selected, cookie)
+
+
+
+#         i = tree.AppendItem(tree_selected, sel_string)
+#         top_panel.set_item_index(i)
+#         tree.Expand(tree_selected)
+
+#     # Undefining parent function
+#     def evt_button_ok(self):
+#         pass
 
 class Element(cdd_gui.Element):
     def __init__(self, *args, **kwds):
-        #super(Element, self).__init__(self, *args, **kwds)
         cdd_gui.Element.__init__(self, *args, **kwds)
 
     def evt_button_ok(self):
@@ -335,7 +341,6 @@
 
 class Definition(cdd_gui.Definition):
     def __init__(self, *args, **kwds):
-        #super(Definition, self).__init__(self, *args, **kwds)
         cdd_gui.Definition.__init__(self, *args, **kwds)
 
     def evt_button_ok(self):
@@ -374,53 +379,72 @@
 
 # end of class Definition
 
+class Party(cdd_gui.Party):
+    def __init__(self, *args, **kwds):
+        self.suffix = kwds.pop('suffix', '')
+        cdd_gui.Party.__init__(self, *args, **kwds)
+
+    def evt_button_ok(self):
+        top_panel = self.GetTopLevelParent()
+        tree = top_panel.tree_ctrl_ccd
+        item = tree.GetSelection()
+
+        if self.radio_btn_party_self.GetValue():
+            sel_string = 'PartySelf' + self.suffix
+        elif self.radio_btn_party_identified.GetValue():
+            sel_string = 'PartyIdentified' + self.suffix
+
+        i = tree.AppendItem(item, sel_string)
+        top_panel.set_item_index(i)
+        tree.Expand(item)
+
+# end of class Party
+
 class CareEntry(cdd_gui.CareEntry):
     def __init__(self, *args, **kwds):
-        #super(CareEntry, self).__init__(self, *args, **kwds)
         cdd_gui.CareEntry.__init__(self, *args, **kwds)
-        self.init_things()
 
-    def init_things(self):
-        self.init_panels()
         self.set_lang()
+        self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.evt_notebook_page_changed)
+        self.old_ok_button = None
+
+        # Save the old evt_button_ok
+        self.orig_evt_button_ok = self.evt_button_ok
+
 
     def set_lang(self):
         self.choice_language.SetItems(get_lang_list())
         self.choice_language.SetSelection(get_lang_list().index(info.language) | 0)
 
-    def init_panels(self):
-        self.data = ClusterEmbed(self.panel_data, suffix=' - Data')
-        self.provider = ClusterEmbed(self.panel_provider, suffix=' - Provider')
-
-
-    def populate_main_tree(self):
-
-        top_panel = self.GetTopLevelParent()
-        tree = top_panel.tree_ctrl_ccd
-        item = tree.GetSelection()
-
-        if tree.GetChildrenCount(item) >= 3:
-            pass
-        else:
-        
-            i = self.tree_data = tree.AppendItem(item, 'data')
-            top_panel.set_item_index(i)
-
-            i = self.tree_provider = tree.AppendItem(item, 'provider')
-            top_panel.set_item_index(i)
-
-            i = self.tree_subject = tree.AppendItem(item, 'subject')
-            top_panel.set_item_index(i)
-        
-            tree.Expand(item)
+    def evt_notebook_page_changed(self, evt):
+
+        if self.notebook_care_entry.GetSelection() == 0:
+            self.evt_button_ok = self.orig_evt_button_ok
+            return
+
+        panel = self.notebook_care_entry.GetCurrentPage()
+        try:
+            panel.evt_button_ok
+        except AttributeError:
+            return
+
+        self.evt_button_ok = panel.evt_button_ok
 
     def evt_button_remove(self):
         tab_number = self.notebook_care_entry.GetSelection()
         if tab_number:
+            panel = self.notebook_care_entry.GetCurrentPage()
+            try:
+                # Calls evt_delete if possible
+                panel.evt_delete()
+            except AttributeError:
+                pass
+
+            # Deletes the notebook page from the notebook
             self.notebook_care_entry.DeletePage(tab_number)
+
         else:
-            top_panel = self.GetTopLevelParent()
-            tree = top_panel.tree_ctrl_ccd
+            tree = self.GetTopLevelParent().tree_ctrl_ccd
             item = tree.GetSelection()
             tree.Delete(item)
 
@@ -548,16 +572,29 @@
             self.choice_language.Enable()
         else:
             self.choice_language.Disable()
+    def evt_button_data(self, event):  # wxGlade: CareEntry.<event_handler>
+        "Opens another tab with a Cluster panel on it"
+
+        tab = Cluster(self.notebook_care_entry, suffix=' - Data')
+        self.notebook_care_entry.AddPage(tab, 'Data')
+
+    def evt_button_provider(self, event):  # wxGlade: CareEntry.<event_handler>
+        "Opens another tab with a Cluster panel on it"
+
+        tab = Cluster(self.notebook_care_entry, suffix=' - Provider')
+        self.notebook_care_entry.AddPage(tab, 'Provider')
+
+    def evt_button_subject(self, event):  # wxGlade: CareEntry.<event_handler>
+        "Opens another tab with a Cluster panel on it"
+
+        tab = Party(self.notebook_care_entry, suffix=' - Subject')
+        self.notebook_care_entry.AddPage(tab, 'Subject')
+
             
 # end of class CareEntry
 
-
-class UnderConstruction(cdd_gui.UnderConstruction):
-    pass
-
 class ConfigDialog(cdd_gui.ConfigDialog):
     def __init__(self, *args, **kwds):
-        #super(ConfigDialog, self).__init__(self, *args, **kwds)
         cdd_gui.ConfigDialog.__init__(self, *args, **kwds)
         self.init_things()
 
@@ -664,7 +701,6 @@
 
 class MetadataPanel(cdd_gui.MetadataPanel):
     def __init__(self, *args, **kwds):
-        #super(MetadataPanel, self).__init__(self, *args, **kwds)
         cdd_gui.MetadataPanel.__init__(self, *args, **kwds)
         self.init_things()
 
@@ -787,7 +823,6 @@
 
 class MainFrame(cdd_gui.MainFrame):
     def __init__(self, *args, **kwds):
-        #super(MainFrame, self).__init__(self, *args, **kwds)
         cdd_gui.MainFrame.__init__(self, *args, **kwds)
         self.init_things()
 
@@ -1155,6 +1190,8 @@
 
 # end of class MainFrame
 
+UnderConstruction = cdd_gui.UnderConstruction
+
 # Object that retains all information necessary to create the cdd
 import info
 info = info.Info()

=== modified file 'src/2.0/cdd.wxg'
--- src/2.0/cdd.wxg	2013-01-22 02:57:58 +0000
+++ src/2.0/cdd.wxg	2013-01-22 02:58:35 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.6.5 on Mon Jan 21 19:31:29 2013 -->
+<!-- generated by wxGlade 0.6.5 on Mon Jan 21 19:42:18 2013 -->
 
 <application path="cdd_gui.py" name="" class="" option="0" language="python" top_window="dialog_config" encoding="UTF-8" use_gettext="1" overwrite="0" use_new_namespace="1" for_version="2.8" is_template="0" indent_amount="4" indent_symbol="space" source_extension=".cpp" header_extension=".h">
     <object class="MainFrame" name="frame_main" base="EditFrame">
@@ -223,86 +223,67 @@
                                     <object class="sizeritem">
                                         <flag>wxEXPAND</flag>
                                         <border>0</border>
-                                        <option>0</option>
+                                        <option>1</option>
                                         <object class="spacer" name="spacer" base="EditSpacer">
                                             <height>20</height>
                                             <width>20</width>
                                         </object>
                                     </object>
                                     <object class="sizeritem">
-                                        <flag>wxEXPAND</flag>
+                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
                                         <border>0</border>
-                                        <option>1</option>
-                                        <object class="wxStaticBoxSizer" name="sizer_72" base="EditStaticBoxSizer">
-                                            <orient>wxHORIZONTAL</orient>
+                                        <option>0</option>
+                                        <object class="wxButton" name="button_data" base="EditButton">
                                             <label>Data</label>
-                                            <object class="sizeritem">
-                                                <flag>wxEXPAND</flag>
-                                                <border>0</border>
-                                                <option>1</option>
-                                                <object class="wxPanel" name="panel_data" base="EditPanel">
-                                                    <style>wxTAB_TRAVERSAL</style>
-                                                </object>
-                                            </object>
+                                            <events>
+                                                <handler event="EVT_BUTTON">evt_button_data</handler>
+                                            </events>
                                         </object>
                                     </object>
                                     <object class="sizeritem">
                                         <flag>wxEXPAND</flag>
                                         <border>0</border>
-                                        <option>0</option>
+                                        <option>1</option>
                                         <object class="spacer" name="spacer" base="EditSpacer">
                                             <height>20</height>
                                             <width>20</width>
                                         </object>
                                     </object>
                                     <object class="sizeritem">
-                                        <flag>wxEXPAND</flag>
+                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
                                         <border>0</border>
-                                        <option>1</option>
-                                        <object class="wxStaticBoxSizer" name="sizer_73" base="EditStaticBoxSizer">
-                                            <orient>wxHORIZONTAL</orient>
+                                        <option>0</option>
+                                        <object class="wxButton" name="button_provider" base="EditButton">
                                             <label>Provider</label>
-                                            <object class="sizeritem">
-                                                <flag>wxEXPAND</flag>
-                                                <border>0</border>
-                                                <option>1</option>
-                                                <object class="wxPanel" name="panel_provider" base="EditPanel">
-                                                    <style>wxTAB_TRAVERSAL</style>
-                                                </object>
-                                            </object>
+                                            <events>
+                                                <handler event="EVT_BUTTON">evt_button_provider</handler>
+                                            </events>
                                         </object>
                                     </object>
                                     <object class="sizeritem">
                                         <flag>wxEXPAND</flag>
                                         <border>0</border>
-                                        <option>0</option>
+                                        <option>1</option>
                                         <object class="spacer" name="spacer" base="EditSpacer">
                                             <height>20</height>
                                             <width>20</width>
                                         </object>
                                     </object>
                                     <object class="sizeritem">
-                                        <flag>wxEXPAND</flag>
+                                        <flag>wxALIGN_CENTER_VERTICAL</flag>
                                         <border>0</border>
-                                        <option>1</option>
-                                        <object class="wxRadioBox" name="radio_box_subject" base="EditRadioBox">
-                                            <style>wxRA_SPECIFY_ROWS</style>
-                                            <selection>0</selection>
-                                            <dimension>0</dimension>
+                                        <option>0</option>
+                                        <object class="wxButton" name="button_subject" base="EditButton">
                                             <label>Subject</label>
-                                            <choices>
-                                                <choice>PartySelf</choice>
-                                                <choice>PartyIdentified</choice>
-                                            </choices>
                                             <events>
-                                                <handler event="EVT_RADIOBOX">evt_radiobox_subject</handler>
+                                                <handler event="EVT_BUTTON">evt_button_subject</handler>
                                             </events>
                                         </object>
                                     </object>
                                     <object class="sizeritem">
                                         <flag>wxEXPAND</flag>
                                         <border>0</border>
-                                        <option>0</option>
+                                        <option>1</option>
                                         <object class="spacer" name="spacer" base="EditSpacer">
                                             <height>20</height>
                                             <width>20</width>
@@ -757,6 +738,22 @@
                             <label>Slot</label>
                         </object>
                     </object>
+                    <object class="sizeritem">
+                        <flag>wxALIGN_CENTER_HORIZONTAL</flag>
+                        <border>0</border>
+                        <option>0</option>
+                        <object class="wxStaticText" name="label_cluster" base="EditStaticText">
+                            <attribute>1</attribute>
+                            <font>
+                                <size>17</size>
+                                <family>default</family>
+                                <style>normal</style>
+                                <weight>normal</weight>
+                                <underlined>0</underlined>
+                                <face></face>
+                            </font>
+                        </object>
+                    </object>
                 </object>
             </object>
         </object>
@@ -2729,4 +2726,32 @@
             </object>
         </object>
     </object>
+    <object class="Party" name="panel_party" base="EditTopLevelPanel">
+        <style>wxTAB_TRAVERSAL</style>
+        <object class="wxBoxSizer" name="sizer_12_copy_1" base="EditBoxSizer">
+            <orient>wxHORIZONTAL</orient>
+            <object class="sizeritem">
+                <flag>wxEXPAND</flag>
+                <border>0</border>
+                <option>1</option>
+                <object class="wxBoxSizer" name="sizer_70_copy" base="EditBoxSizer">
+                    <orient>wxVERTICAL</orient>
+                    <object class="sizeritem">
+                        <border>0</border>
+                        <option>0</option>
+                        <object class="wxRadioButton" name="radio_btn_party_self" base="EditRadioButton">
+                            <label>PartySelf</label>
+                        </object>
+                    </object>
+                    <object class="sizeritem">
+                        <border>0</border>
+                        <option>0</option>
+                        <object class="wxRadioButton" name="radio_btn_party_identified" base="EditRadioButton">
+                            <label>PartyIdentified</label>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
 </application>

=== modified file 'src/2.0/cdd_gui.py'
--- src/2.0/cdd_gui.py	2013-01-22 02:57:58 +0000
+++ src/2.0/cdd_gui.py	2013-01-22 02:58:35 +0000
@@ -2,10 +2,16 @@
 # -*- coding: utf-8 -*-
 # generated by wxGlade 0.6.5
 
-
 import wx
 from aux_gui import *
 
+# Debug purposes !
+import gettext
+gettext.bindtextdomain('CDD','locale/en')
+gettext.textdomain('CDD')
+_ = gettext.gettext
+# Debug purposes !
+
 # begin wxGlade: extracode
 # end wxGlade
 
@@ -200,11 +206,9 @@
         wx.Panel.__init__(self, *args, **kwds)
         self.notebook_care_entry = wx.Notebook(self, -1, style=0)
         self.panel_care_entry = wx.Panel(self.notebook_care_entry, -1)
-        self.panel_data = wx.Panel(self.panel_care_entry, -1)
-        self.sizer_72_staticbox = wx.StaticBox(self.panel_care_entry, -1, _("Data"))
-        self.panel_provider = wx.Panel(self.panel_care_entry, -1)
-        self.sizer_73_staticbox = wx.StaticBox(self.panel_care_entry, -1, _("Provider"))
-        self.radio_box_subject = wx.RadioBox(self.panel_care_entry, -1, _("Subject"), choices=[_("PartySelf"), _("PartyIdentified")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.button_data = wx.Button(self.panel_care_entry, -1, _("Data"))
+        self.button_provider = wx.Button(self.panel_care_entry, -1, _("Provider"))
+        self.button_subject = wx.Button(self.panel_care_entry, -1, _("Subject"))
         self.button_links = wx.Button(self.panel_care_entry, -1, _("Links"))
         self.button_attestation = wx.Button(self.panel_care_entry, -1, _("Attestation"))
         self.button_feeder_audit = wx.Button(self.panel_care_entry, -1, _("Feeder Audit"))
@@ -219,7 +223,9 @@
         self.__set_properties()
         self.__do_layout()
 
-        self.Bind(wx.EVT_RADIOBOX, self.evt_radiobox_subject, self.radio_box_subject)
+        self.Bind(wx.EVT_BUTTON, self.evt_button_data, self.button_data)
+        self.Bind(wx.EVT_BUTTON, self.evt_button_provider, self.button_provider)
+        self.Bind(wx.EVT_BUTTON, self.evt_button_subject, self.button_subject)
         self.Bind(wx.EVT_BUTTON, self.evt_button_links, self.button_links)
         self.Bind(wx.EVT_BUTTON, self.evt_button_attestation, self.button_attestation)
         self.Bind(wx.EVT_BUTTON, self.evt_button_feeder_audit, self.button_feeder_audit)
@@ -232,7 +238,6 @@
 
     def __set_properties(self):
         # begin wxGlade: CareEntry.__set_properties
-        self.radio_box_subject.SetSelection(0)
         self.radio_box_language.SetSelection(0)
         self.choice_language.Enable(False)
         self.notebook_care_entry.SetBackgroundColour(wx.Colour(176, 0, 255))
@@ -247,19 +252,13 @@
         self.sizer_48_staticbox.Lower()
         sizer_48 = wx.StaticBoxSizer(self.sizer_48_staticbox, wx.HORIZONTAL)
         sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
-        self.sizer_73_staticbox.Lower()
-        sizer_73 = wx.StaticBoxSizer(self.sizer_73_staticbox, wx.HORIZONTAL)
-        self.sizer_72_staticbox.Lower()
-        sizer_72 = wx.StaticBoxSizer(self.sizer_72_staticbox, wx.HORIZONTAL)
-        sizer_6.Add((20, 20), 0, wx.EXPAND, 0)
-        sizer_72.Add(self.panel_data, 1, wx.EXPAND, 0)
-        sizer_6.Add(sizer_72, 1, wx.EXPAND, 0)
-        sizer_6.Add((20, 20), 0, wx.EXPAND, 0)
-        sizer_73.Add(self.panel_provider, 1, wx.EXPAND, 0)
-        sizer_6.Add(sizer_73, 1, wx.EXPAND, 0)
-        sizer_6.Add((20, 20), 0, wx.EXPAND, 0)
-        sizer_6.Add(self.radio_box_subject, 1, wx.EXPAND, 0)
-        sizer_6.Add((20, 20), 0, wx.EXPAND, 0)
+        sizer_6.Add((20, 20), 1, wx.EXPAND, 0)
+        sizer_6.Add(self.button_data, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_6.Add((20, 20), 1, wx.EXPAND, 0)
+        sizer_6.Add(self.button_provider, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_6.Add((20, 20), 1, wx.EXPAND, 0)
+        sizer_6.Add(self.button_subject, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_6.Add((20, 20), 1, wx.EXPAND, 0)
         sizer_4.Add(sizer_6, 1, wx.EXPAND, 0)
         sizer_19.Add((20, 20), 0, wx.EXPAND, 0)
         sizer_19.Add(self.button_links, 0, wx.ALIGN_CENTER_VERTICAL, 0)
@@ -335,10 +334,6 @@
         print "Event handler `evt_button_workflow_id' not implemented!"
         event.Skip()
 
-    def evt_radiobox_subject(self, event):  # wxGlade: CareEntry.<event_handler>
-        print "Event handler `evt_radiobox_subject' not implemented"
-        event.Skip()
-
 # end of class CareEntry
 
 class MyPanel4(wx.Panel):
@@ -465,6 +460,7 @@
         self.text_ctrl_cluster = wx.TextCtrl(self, -1, "")
         self.radio_btn_element = wx.RadioButton(self, -1, _("Element"))
         self.radio_btn_slot = wx.RadioButton(self, -1, _("Slot"))
+        self.label_cluster = wx.StaticText(self, -1, "")
 
         self.__set_properties()
         self.__do_layout()
@@ -473,6 +469,7 @@
     def __set_properties(self):
         # begin wxGlade: Cluster.__set_properties
         self.text_ctrl_cluster.SetMinSize((100, 27))
+        self.label_cluster.SetFont(wx.Font(17, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ""))
         # end wxGlade
 
     def __do_layout(self):
@@ -485,6 +482,7 @@
         sizer_70.Add(sizer_71, 0, wx.EXPAND, 0)
         sizer_70.Add(self.radio_btn_element, 0, 0, 0)
         sizer_70.Add(self.radio_btn_slot, 0, 0, 0)
+        sizer_70.Add(self.label_cluster, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
         sizer_12.Add(sizer_70, 1, wx.EXPAND, 0)
         self.SetSizer(sizer_12)
         sizer_12.Fit(self)
@@ -1376,16 +1374,31 @@
 
 class Party(wx.Panel):
     def __init__(self, *args, **kwds):
-        # content of this block not found: did you rename this class?
-        pass
+        # begin wxGlade: Party.__init__
+        kwds["style"] = wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+        self.radio_btn_party_self = wx.RadioButton(self, -1, _("PartySelf"))
+        self.radio_btn_party_identified = wx.RadioButton(self, -1, _("PartyIdentified"))
+
+        self.__set_properties()
+        self.__do_layout()
+        # end wxGlade
 
     def __set_properties(self):
-        # content of this block not found: did you rename this class?
+        # begin wxGlade: Party.__set_properties
         pass
+        # end wxGlade
 
     def __do_layout(self):
-        # content of this block not found: did you rename this class?
-        pass
+        # begin wxGlade: Party.__do_layout
+        sizer_12_copy_1 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_70_copy = wx.BoxSizer(wx.VERTICAL)
+        sizer_70_copy.Add(self.radio_btn_party_self, 0, 0, 0)
+        sizer_70_copy.Add(self.radio_btn_party_identified, 0, 0, 0)
+        sizer_12_copy_1.Add(sizer_70_copy, 1, wx.EXPAND, 0)
+        self.SetSizer(sizer_12_copy_1)
+        sizer_12_copy_1.Fit(self)
+        # end wxGlade
 
 # end of class Party
 if __name__ == "__main__":