mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Eduardo César (eduardo.cesar)
------------------------------------------------------------
revno: 253 [merge]
committer: Eduardo C. P. Ribeiro <eduardo.cesar@xxxxxxx>
branch nick: mirror
timestamp: Mon 2012-09-10 18:03:49 -0300
message:
  Merged from the 2.0 development tree.
removed:
  src/2.0/under-construction-1.png
added:
  src/2.0/setup_single_exe.py
modified:
  src/2.0/cdd.py
  src/2.0/cdd.wxg


--
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	2012-09-07 19:06:20 +0000
+++ src/2.0/cdd.py	2012-09-10 21:01:04 +0000
@@ -55,7 +55,7 @@
         self.text_ctrl_ccd = wx.TextCtrl(self, -1, "")
         self.button_ccd_remove = wx.Button(self, -1, _("Remove"))
         self.button_ccd_add = wx.Button(self, -1, _("Add"))
-        self.sizer_74_staticbox = wx.StaticBox(self, -1, _("Enter the desired CCD Ids and click Add"))
+        self.sizer_74_staticbox = wx.StaticBox(self, -1, _("Check the box for the required CDDs:"))
 
         self.__set_properties()
         self.__do_layout()
@@ -94,8 +94,9 @@
 
     def ccd_add(self, event):  # wxGlade: Slot.<event_handler>
         cdd_id = self.text_ctrl_ccd.GetValue()
-        self.check_list_box_slot.Append(cdd_id)
-        self.text_ctrl_ccd.Clear()
+        if cdd_id:
+            self.check_list_box_slot.Append(cdd_id)
+            self.text_ctrl_ccd.Clear()
 
     def ccd_remove(self, event):  # wxGlade: Slot.<event_handler>
         pos = self.check_list_box_slot.GetSelection()
@@ -1279,7 +1280,6 @@
         kwds["style"] = wx.TAB_TRAVERSAL
         wx.Panel.__init__(self, *args, **kwds)
         self.label_construction = wx.StaticText(self, -1, _("Under construction!"))
-        self.bitmap_construction = wx.StaticBitmap(self, -1, wx.Bitmap("under-construction-1.png", wx.BITMAP_TYPE_ANY))
 
         self.__set_properties()
         self.__do_layout()
@@ -1294,8 +1294,6 @@
         # begin wxGlade: UnderConstruction.__do_layout
         sizer_15 = wx.BoxSizer(wx.VERTICAL)
         sizer_15.Add(self.label_construction, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
-        sizer_15.Add((20, 20), 0, 0, 0)
-        sizer_15.Add(self.bitmap_construction, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
         self.SetSizer(sizer_15)
         sizer_15.Fit(self)
         # end wxGlade
@@ -2129,7 +2127,7 @@
       <rdf:RDF
 	  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns:dc= "http://purl.org/dc/elements/1.1/";>
 
-	<rdf:Description rdf:about="http://www.mlhim.org/ccd/{ccd_id}";>
+	<rdf:Description rdf:about="http://www.hkcr.net/ccd/{ccd_id}";>
 	  <dc:title>{title}</dc:title>
 	  <dc:creator>{creator} &lt;{creator_email}&gt; </dc:creator>
           {contributors}

=== modified file 'src/2.0/cdd.wxg'
--- src/2.0/cdd.wxg	2012-09-07 19:06:20 +0000
+++ src/2.0/cdd.wxg	2012-09-10 21:01:04 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.6.4 on Fri Sep  7 15:58:31 2012 -->
+<!-- generated by wxGlade 0.6.4 on Mon Sep 10 17:59:14 2012 -->
 
 <application path="cdd.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">
@@ -783,23 +783,6 @@
                     </font>
                 </object>
             </object>
-            <object class="sizeritem">
-                <border>0</border>
-                <option>0</option>
-                <object class="spacer" name="spacer" base="EditSpacer">
-                    <height>20</height>
-                    <width>20</width>
-                </object>
-            </object>
-            <object class="sizeritem">
-                <flag>wxALIGN_CENTER_HORIZONTAL</flag>
-                <border>0</border>
-                <option>0</option>
-                <object class="wxStaticBitmap" name="bitmap_construction" base="EditStaticBitmap">
-                    <attribute>1</attribute>
-                    <bitmap>under-construction-1.png</bitmap>
-                </object>
-            </object>
         </object>
     </object>
     <object class="DvURI" name="panel_dvuri" base="EditTopLevelPanel">
@@ -2043,7 +2026,7 @@
         <style>wxTAB_TRAVERSAL</style>
         <object class="wxStaticBoxSizer" name="sizer_74" base="EditStaticBoxSizer">
             <orient>wxHORIZONTAL</orient>
-            <label>Enter the desired CCD Ids and click Add</label>
+            <label>Check the box for the required CDDs:</label>
             <object class="sizeritem">
                 <flag>wxEXPAND</flag>
                 <border>0</border>

=== added file 'src/2.0/setup_single_exe.py'
--- src/2.0/setup_single_exe.py	1970-01-01 00:00:00 +0000
+++ src/2.0/setup_single_exe.py	2012-09-10 21:02:32 +0000
@@ -0,0 +1,11 @@
+from distutils.core import setup
+import py2exe, sys, os
+
+sys.argv.append('py2exe')
+
+setup(
+    options = {'py2exe': {'bundle_files': 1}},
+    windows = [{'script': "cdd.py"}],
+    zipfile = None,
+)
+

=== removed file 'src/2.0/under-construction-1.png'
Binary files src/2.0/under-construction-1.png	2012-08-27 15:55:02 +0000 and src/2.0/under-construction-1.png	1970-01-01 00:00:00 +0000 differ