Menu
▾
▴
[Urakawa-vcs] SF.net SVN: urakawa: [3089] trunk/urakawa/application/Obi/Obi
|
From: <ju...@us...> - 2008-05-20 03:44:22
|
Revision: 3089
http://urakawa.svn.sourceforge.net/urakawa/?rev=3089&view=rev
Author: julienq
Date: 2008-05-19 20:44:13 -0700 (Mon, 19 May 2008)
Log Message:
-----------
Updated new project dialog to generate a new ID.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs
trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.resx
trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs
trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.cs
trunk/urakawa/application/Obi/Obi/Obi.csproj
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ProjectView/Waveform.cs
Added Paths:
-----------
trunk/urakawa/application/Obi/Obi/images/obi_new_project_dialog.png
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs 2008-05-20 03:44:13 UTC (rev 3089)
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditRoles));
this.mCustomRolesList = new System.Windows.Forms.ListBox();
this.mNewCustomRole = new System.Windows.Forms.TextBox();
this.mInstructions = new System.Windows.Forms.Label();
@@ -112,7 +113,7 @@
//
this.mRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.mRemove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.mRemove.Location = new System.Drawing.Point(305, 51);
+ this.mRemove.Location = new System.Drawing.Point(305, 52);
this.mRemove.Name = "mRemove";
this.mRemove.Size = new System.Drawing.Size(75, 23);
this.mRemove.TabIndex = 3;
@@ -132,9 +133,9 @@
this.Controls.Add(this.mInstructions);
this.Controls.Add(this.mNewCustomRole);
this.Controls.Add(this.mCustomRolesList);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "EditRoles";
- this.ShowIcon = false;
this.ShowInTaskbar = false;
this.Text = "Edit roles";
this.Load += new System.EventHandler(this.CustomRoles_Load);
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.resx 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.resx 2008-05-20 03:44:13 UTC (rev 3089)
@@ -117,4 +117,261 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAMAMDAAAAEAIACoJQAANgAAACAgAAABACAAqBAAAN4lAAAQEAAAAQAgAGgEAACGNgAAKAAAADAA
+ AABgAAAAAQAgAAAAAAAAAAAARlwAAEZcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAATLgAqFjQAhhk7ALsdQwLkH0cC8CBKAvcgSwL4IUwC+yFMAvohTAL6IUwD+iFM
+ A/ogTAP6IUwD+iFNAvshTQL7IEwC+SBKA/YgSQP1H0gD8x9HA+0eRAPkHD8EwRc3AKQWNACDFC8APhMs
+ AA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAEy4ANBxDAOYhTwD8IU0B+yFKBvMrVhnsNWMn7EBzNu9LhEXzWZhX+V+h
+ XvxkqmX/ZKpl/2SqZf9kqmX/ZKpl/2mybP9kqmX/XZ9d/FaUVPlKgkPyRnw/8D5wM+42ZSjtKFIU7CFK
+ BvMgSgP3IEsB+B9KAfUcQwDoFzcAvRQxAHAULwAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDgAwCBKBPZgo2D3dMJ6/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/brly/1yeW/s/cjTtK1UY6yBJA/YgSwD2GDgArhMsAAgAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0AA2ydRE+52xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP9Sjk70IksJ8x1G
+ AO0TLAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIA4itW
+ Gep2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/brly/yFNAfsUMABPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAHEMA5zJfI+t2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/yBLAvgVMwB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAHUYA7jFeIup2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/yBKA/YWNQCXAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEMA5zBdIOt2xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/yBKA/YXNwCnAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIA5C5aHex2xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/yBJ
+ BfMYOQCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0EA3yxY
+ Gut2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP9xvXf/Gy0c0xMfE9Q0VzbSZ6xs9XbF
+ fP92xXz/dsV8/yJLCfAZOwPHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAHEIA5DFeIut2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3G9d/9goWXuSnxO3TRXN9IkPCbVAAAA/wAA
+ AP8AAAD/CA4J33K/eP12xXz/dsV8/yZPDuwWOy72CR45YggcMgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAHUUA7DFeIup2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/cb13/1KJVuQxUjTSEh0S1gUIBekEBwToChAK3xgo
+ GdIdMR/SAQIB8gAAAP8AAAD/AAEA9miubfp2xXz/eMZ6/yROEOoZQCr8Di9Y+A4tTe8KHzZiAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkgA8zZlKOt2xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP87Yj7UBQgF6wUIBesWJBfVMlQ11VmV
+ XuZvuXX6dsV8/3bFfP92xXz/X59k8DBQMtcjOyXTQWxE3HbFfP92xXz/eMZ5/yBJCO8aSijrG5P5/w9F
+ d+0PM1f8DCdD0QkcMBQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkYA7zdmKet2xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP91xX3/c8V//3LDf/9wwn7/c8V//3bFfP92xXz/cr94/xgnGdMEBgTtSnxO23PA
+ ef92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/ecd4/yBJ
+ CO8aTC7pG5P4/xyU9/8YfdP/DjFU9A4wUvcJHzVUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkYA7jRj
+ Jup2xXz/dsV8/3bFfP92xXz/dsV8/1l+S+5LNAvuUS4C91UvAftWLwH7Ui8C+E5TJudmsHL4CQ8J3woR
+ C+BstHH8dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/esd3/yBJBvMYU0vnG5T4/xyU9/8clPf/HJT3/xBGduwQNFn+CiA3cQAAAAAAAAAAAAAAAAAA
+ AAAAAAAAH0sA9j1vMu52xXz/dsV8/3bFfP92xXz/UGEz6GI1AP9SLwHyZUMA5XxXAOWCXADkY0EA5lkw
+ APxIJwD/GCYX1XPAef92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/esd2/x9KBPYXWWTnHJT3/xyU9/8clPf/HJT3/xyU9/8SUIfuEDRZ/gkf
+ NVAAAAAAAAAAAAAAAAAAAAAAH0sA9z9yNe52xXz/dsV8/3bFfP9tvHr+Vi8B+2tHAOb3vwD/9L8A//O/
+ AP/zvwD/9L8A/+qxAP9ULwD4TTQK73PFf/92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/esd2/yBLAvgXW2nlHJT3/xyU9/8clPf/HJT3/xyU
+ 9/8clPf/Djlh8Q0rSeYAAAAAAAAAAAAAAAAAAAAAH0sA9kJ3OfB2xXz/dsV8/3bFfP9Tbj7mWDAA/euz
+ AP/zvwD/878A//O/AP/zvwD/878A//O/AP/fqQD9VzAA+1RuPut2xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/esd2/yBLA/gXXXDmHJT3/xyU
+ 9/8clPf/HJT3/xyU9/8SVI3tEDRa/gwoRNUAAAAAAAAAAAAAAAAAAAAAH0sA9zttMO12xXz/dsV8/3XF
+ ff9MSB3jUi8B9fi/AP/zvwD/878A//O/AP/zvwD/878A//O/AP/0vwD/ZUMA6EwyCO5yxX//dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dcV7/3TEev9zxHr/dcV7/3bFfP92xXz/dsV8/3bFfP92xXz/esd2/yBM
+ AvkXXWvlHJT3/xyU9/8bieX/Dz9r7A8xVPsQNVr+CyQ+tAkcMAQAAAAAAAAAAAAAAAAAAAAAH0oA9jZl
+ KOt2xXz/dsV8/3TFfv9LQRblUi8B8/e/AP/zvwD/878A//O/AP/zvwD/878A//O/AP/zvwD/mXEA6lEv
+ AvdwxYL/dsV8/3bFfP92xXz/dsV8/3TEev+Q0JXvxebH1+Lz5Nfo9enYzOnO14nNjvN1xHv/dsV8/3bF
+ fP92xXz/ecVz/yBNAvoWZ5DuHJT3/xFMgu0PM1j9DjBS9woiOpQJHTIfAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAHkYA7jFdIet2xXz/dsV8/3XFfP9QYDLkVC4A+fm/AP/zvwD/878A//O/AP/zvwD/878A//O/
+ AP/zvwD/rYAA7VMvAvhvxYP/dsV8/3bFfP92xXz/gMmG++v37Nz+/v70+fv51e/y79Lv8e/U+vz61Pz+
+ /O3A5MLbc8R5/3bFfP92xXz/dsBv/iFNAfsRPEjwDi9Y+Q8yVvsLIzuhCRwwBgAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAHEMA5S9cH+x2xXz/dsV8/3bFfP9ruXr9VS8B+4phAOjzvwD/878A//O/
+ AP/zvwD/878A//O/AP/0vwD/d1IA6FAvA/VxxYH/dsV8/3bFfP91xHv/9Pr03vr7+tni4uLxoqKi31hY
+ WNJOTk7T09PT7/v7+/z9/v3ov+TB2nXEe/92xXz/dMF1/yJPA/wRN1b+CiE/oQkcMAwAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0AA3ChRE+x2xXz/dsV8/3bFfP91xX3/Tlgr51Yv
+ APy5hwDu9r8A//O/AP/zvwD/878A//O/AP/zuAD/VC4A+U1MIOd1xX3/dsV8/3bFfP+v3bPb/f796N/f
+ 3/gICAjnAAAA/wAAAP8AAAD/AAAA/4qKitT39/f1+f366HfGff12xXz/b7p0/yFPAPsRKxFcAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGj0AyyRMDe52xXz/dsV8/3bF
+ fP92xXz/dMV+/1FcLehZMQD9Ui8A9KN4AOygeADrgl0A5XBNAOVULwD5UC8D9nHBff92xXz/dsV8/3LD
+ ef/h8+PT6+3r2lxcXNIAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP3Z2dnz+Pz53qTYqOF2xXz/Y6hk+yBN
+ APsULwAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDgAqyFK
+ BvJ2xXz/dsV8/3bFfP92xXz/dsV8/3XFff9kqG36SzQK7l4zAP9WLwD7Uy4A+F0zAP5KOA/rcL57/3bF
+ fP92xXz/dsV8/3HDeP/s9+3Y5eXl3yMjI9EAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP9mZmbQ7vLv1cvp
+ zdF0xHr/SYFC8SFOAPsTLAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAFjQAiCBLAvh2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/abt9/1IvAfjKlwD4+b8A/1Ew
+ AvRXfEntdsV8/3bFfP92xXz/dsV8/3PEev/V7dfV5ujn3ExMTNEAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP88PDzP6Ozo18joy9N1xHv/MV4i7B1EAOoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAFDEAXCFOAPxst3D+dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/Zahs8lMv
+ AfngqgD9+b8A/1ExAvJWdkTodsV8/3bFfP92xXz/dsV8/3bFfP+d1qHm+f363MPDw+sAAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP+Tk5PZ9/v32q/dstx1xXv/I0wM7xk6AL4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEy4ALiFOAPthpWH7dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/YZ1j8VMvAfjsswD/+b8A/1MzAvBSYzTldsV8/3bFfP92xXz/dsV8/3bFfP9xw3j/9/z44uzs
+ 7OBra2vRAAAA/wAAAP8AAAD/AAAA/xAQENzf39/p/P7863vHgvp2xXz/IEoD9hY0AIcAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9LAPhFez7tdsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/YJtj8FMvAfjttQD/978A/1Y2Au1NSh7mdMV+/3bFfP92xXz/dsV8/3bF
+ fP92xXz/odem5f3+/u7w8PDwr6+v30BAQNMiIiLXMjIy09bW1u/9/v7ov+TC2HXFe/9uuXL/IE0B+hQw
+ AE0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB1E
+ AOoxXiLqdsV8/3bFfP92xXz/dsV8/3bFfP92xXz/YJtj8FMvAfjvtgD/9r8A/1g5AupMQRbqdMV+/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dMR6/7rivd3+//739vf20vj4+Pz/////8vLy9P39/efk8+XYc8N5/3bF
+ fP9XllX5IEsA9xMsAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAABo9AMwkTQzxdsV8/3bFfP92xXz/dsV8/3bFfP92xXz/YJph8FMvAfjvtgD/9b8A/1w7
+ AepMOA3tc8V//3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3XEe/+P0JTu5fTm2Pn8+eX8/vzm/f798dXt
+ 19V1xHv/dsV8/3bFfP87bC/rHUUA6gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAABY0AIMgTAL5dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/YqBm8lMv
+ AfjsswD/9b8A/1s6AepMOQ7sdMV+/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/c8R5/3bF
+ e/+JzY7zfMiB/nTEev92xXz/dsV8/3bFfP8pUhXrGj0AywAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQvACAgTQD6WJdW93bFfP92xXz/dsV8/3bF
+ fP92xXz/Zqpv9FIvAffkrQD9978A/1c3AutMRBjpdMV+/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP8gSgP2FjUAjAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQQDhKFIU7HbF
+ fP92xXz/dsV8/3bFfP92xXz/a719/VEvAvbTnwD3+L8A/1IxAvBPUybkdcV9/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/2ataf8gTQH6FC8AOAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAVMwBxIE0B+m65cv92xXz/dsV8/3bFfP92xXz/bMB//1EvAvbKlwDz+L8A/1IxAfFQWSvidcV9/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/zFe
+ Ie0dRgDvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAHUYA7zJfI+52xXz/dsV8/3bFfP92xXz/b8OB/1EvAvfAjwDw+L8A/1Iw
+ AfJRXi/idcV9/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/c8B4/yBMAvkWNACLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFTIAayFOAPxcnlv8dsV8/3bFfP92xXz/bcKB/1Ev
+ AvfDkwDx+b8A/1EwAvNSaTrldsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/NGIl7B9JAPUTLAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABg5ALEhTQH7bLVv/3bF
+ fP92xXz/bMB//1EvAvbLmAD0+L8A/1EvAfRQXjDjdcV9/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP9dn1z6IlEA/RY0AIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAbPwDZIEsD92+8dP92xXz/a7x8/FEvAvbTnwD1+L8A/1IxAvFQXC3jdcV9/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/2WrZ/0hTgH8GTwAygAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAG0EA4SBMA/hwvHX/Z7F1+lMuAffkrQD8+L8A/1Q0Au9QWCrkdcV9/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/U5BQ9CJRAP4bQQDfAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABo9AMwdTQL4R3I98lUtAfjnrgD/+L8A/1Iw
+ AfJPVynidcV9/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/2y3cP8sVxntI1QA/xg6
+ ALsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUNgB+L0IA9l8x
+ AP6FXwDv7bYA/1IvAfVVcUDodsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/2+6dP9QjEzyKFIU7SJR
+ AP0gTAD5FTIAcwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAHiYACjwgAI9NLQDwUi8A914zAP4yTRbtTopL9FyeW/xeoV78VpRU+UN4O/AzYSXsIksJ8SFP
+ AfwgTQD6G0AA5hQwAHoZOwADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMR8AKTYiAHkgQQbSH0kD9CBMAvohTQL7IEwC+R9I
+ A/IdQwTiGj0ByRUyAGsTLAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAP///////wAA////////AAD4AAAH//8AAOAAAAB//wAAwAAAAA//AADAAAAAB/8AAMAA
+ AAAH/wAAwAAAAAf/AADAAAAAA/8AAMAAAAAD/wAAwAAAAAP/AADAAAAAA/8AAMAAAAAD/wAAwAAAAAD/
+ AADAAAAAAD8AAMAAAAAAHwAAwAAAAAAPAADAAAAAAAcAAMAAAAAAAwAAwAAAAAADAADAAAAAAAcAAMAA
+ AAAAHwAAwAAAAAB/AADAAAAAAf8AAMAAAAAH/wAAwAAAAAf/AADAAAAAB/8AAMAAAAAH/wAA4AAAAAf/
+ AADgAAAAB/8AAOAAAAAP/wAA4AAAAA//AADgAAAAD/8AAOAAAAAP/wAA8AAAAA//AADwAAAAH/8AAPgA
+ AAAf/wAA+AAAAB//AAD8AAAAP/8AAPwAAAA//wAA/gAAAH//AAD/AAAA//8AAP+AAAH//wAA/+AAB///
+ AAD/8AAf//8AAP//AP///wAA////////AAD///////8AACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAEZc
+ AABGXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATLgAfFzcAnhxABM4fRQffIEcI5CJK
+ C+UlTQ/lJk8S5CdPEuMnTxLjJk8R5iVOEOQlTA/gIkoM4CFIC90gRgrSHUEGxho8BKsVMwB+EywAPhMs
+ AAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5DBtgsWBrsVJFR9Gat
+ af9wvHT/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xHz/b7p0/2WrZ/9WlFT4SH5B7DJf
+ I+QlTA/kHkMF2RUyAHMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIUgJ5mWr
+ Z/92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP9psmz/JU0O7BY0AIYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAiSgrra7Nu/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP8+bzLrGDkAtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAACJKCexstW//dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/0R6PO4ZPADFAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAIkoL52ivav92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP9qsW/2bbZy+XbFfP92xXz/SoNF8hs+AcoAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjSwznabJs/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ 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
+ CjyAD09DwA9QRcAfbGngHyBQ8H9MSf//Ii0=
+</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs 2008-05-20 03:44:13 UTC (rev 3089)
@@ -37,6 +37,9 @@
this.mOKButton = new System.Windows.Forms.Button();
this.mCancelButton = new System.Windows.Forms.Button();
this.mAutoTitleCheckBox = new System.Windows.Forms.CheckBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.mIDBox = new System.Windows.Forms.TextBox();
+ this.mGenerateIDButton = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// label1
@@ -63,7 +66,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(16, 68);
+ this.label2.Location = new System.Drawing.Point(16, 99);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(51, 13);
this.label2.TabIndex = 3;
@@ -75,20 +78,19 @@
this.mFileBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.mFileBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.mFileBox.Location = new System.Drawing.Point(73, 64);
+ this.mFileBox.Location = new System.Drawing.Point(73, 97);
this.mFileBox.Name = "mFileBox";
this.mFileBox.Size = new System.Drawing.Size(426, 20);
- this.mFileBox.TabIndex = 4;
- this.mFileBox.TextChanged += new System.EventHandler(this.mFileBox_TextChanged);
+ this.mFileBox.TabIndex = 5;
//
// mSelectButton
//
this.mSelectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.mSelectButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.mSelectButton.Location = new System.Drawing.Point(505, 62);
+ this.mSelectButton.Location = new System.Drawing.Point(505, 93);
this.mSelectButton.Name = "mSelectButton";
this.mSelectButton.Size = new System.Drawing.Size(75, 25);
- this.mSelectButton.TabIndex = 5;
+ this.mSelectButton.TabIndex = 6;
this.mSelectButton.Text = "&Select";
this.mSelectButton.UseVisualStyleBackColor = true;
this.mSelectButton.Click += new System.EventHandler(this.mSelectButton_Click);
@@ -98,10 +100,10 @@
this.mOKButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.mOKButton.DialogResult = System.Windows.Forms.DialogResult.OK;
this.mOKButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.mOKButton.Location = new System.Drawing.Point(218, 122);
+ this.mOKButton.Location = new System.Drawing.Point(218, 154);
this.mOKButton.Name = "mOKButton";
this.mOKButton.Size = new System.Drawing.Size(75, 25);
- this.mOKButton.TabIndex = 6;
+ this.mOKButton.TabIndex = 7;
this.mOKButton.Text = "&OK";
this.mOKButton.UseVisualStyleBackColor = true;
this.mOKButton.Click += new System.EventHandler(this.mOKButton_Click);
@@ -111,10 +113,10 @@
this.mCancelButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.mCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.mCancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.mCancelButton.Location = new System.Drawing.Point(299, 122);
+ this.mCancelButton.Location = new System.Drawing.Point(299, 154);
this.mCancelButton.Name = "mCancelButton";
this.mCancelButton.Size = new System.Drawing.Size(75, 25);
- this.mCancelButton.TabIndex = 7;
+ this.mCancelButton.TabIndex = 8;
this.mCancelButton.Text = "&Cancel";
this.mCancelButton.UseVisualStyleBackColor = true;
//
@@ -129,13 +131,48 @@
this.mAutoTitleCheckBox.Text = "&Automatically create a title section with this title";
this.mAutoTitleCheckBox.UseVisualStyleBackColor = true;
//
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(46, 68);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(21, 13);
+ this.label3.TabIndex = 8;
+ this.label3.Text = "&ID:";
+ //
+ // mIDBox
+ //
+ this.mIDBox.AccessibleName = "Location:";
+ this.mIDBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mIDBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.mIDBox.Location = new System.Drawing.Point(73, 66);
+ this.mIDBox.Name = "mIDBox";
+ this.mIDBox.Size = new System.Drawing.Size(426, 20);
+ this.mIDBox.TabIndex = 3;
+ //
+ // mGenerateIDButton
+ //
+ this.mGenerateIDButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.mGenerateIDButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mGenerateIDButton.Location = new System.Drawing.Point(505, 62);
+ this.mGenerateIDButton.Name = "mGenerateIDButton";
+ this.mGenerateIDButton.Size = new System.Drawing.Size(75, 25);
+ this.mGenerateIDButton.TabIndex = 4;
+ this.mGenerateIDButton.Text = "&Generate";
+ this.mGenerateIDButton.UseVisualStyleBackColor = true;
+ this.mGenerateIDButton.Click += new System.EventHandler(this.mGenerateIDButton_Click);
+ //
// NewProject
//
this.AcceptButton = this.mOKButton;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.mCancelButton;
- this.ClientSize = new System.Drawing.Size(592, 160);
+ this.ClientSize = new System.Drawing.Size(592, 191);
+ this.Controls.Add(this.mGenerateIDButton);
+ this.Controls.Add(this.mIDBox);
+ this.Controls.Add(this.label3);
this.Controls.Add(this.mAutoTitleCheckBox);
this.Controls.Add(this.mCancelButton);
this.Controls.Add(this.mOKButton);
@@ -145,8 +182,10 @@
this.Controls.Add(this.mTitleBox);
this.Controls.Add(this.label1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MinimumSize = new System.Drawing.Size(8, 173);
+ this.MaximizeBox = false;
+ this.MinimumSize = new System.Drawing.Size(336, 197);
this.Name = "NewProject";
+ this.ShowInTaskbar = false;
this.Text = "Create a new project";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.NewProject_FormClosing);
this.ResumeLayout(false);
@@ -164,5 +203,8 @@
private System.Windows.Forms.Button mOKButton;
private System.Windows.Forms.Button mCancelButton;
private System.Windows.Forms.CheckBox mAutoTitleCheckBox;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox mIDBox;
+ private System.Windows.Forms.Button mGenerateIDButton;
}
}
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.cs 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.cs 2008-05-20 03:44:13 UTC (rev 3089)
@@ -34,6 +34,7 @@
{
InitializeComponent();
mTitleBox.Text = title;
+ mIDBox.Text = Guid.NewGuid().ToString();
mBasepath = basepath;
mExtension = extension;
mFilename = filename;
@@ -59,21 +60,20 @@
public void DisableAutoTitleCheckbox() { mAutoTitleCheckBox.Enabled = false; }
/// <summary>
+ /// Generated or user-chosen ID for the project.
+ /// </summary>
+ public string ID { get { return mIDBox.Text; } }
+
+ /// <summary>
/// The chosen path for the XUK project file; derived from the title or chosen
/// by the user.
/// </summary>
- public string Path
- {
- get { return mFileBox.Text; }
- }
+ public string Path { get { return mFileBox.Text; }}
/// <summary>
/// The chosen title for the project.
/// </summary>
- public string Title
- {
- get { return mTitleBox.Text; }
- }
+ public string Title { get { return mTitleBox.Text; } }
// Update the file box to generate a filename for the project
@@ -175,12 +175,7 @@
return safe;
}
- private void mFileBox_TextChanged(object sender, EventArgs e)
- {
- if (mFileBox.Text.Trim() == "")
- mOKButton.Enabled = false;
- else
- mOKButton.Enabled = true;
- }
+ // Generate a new GUID
+ private void mGenerateIDButton_Click(object sender, EventArgs e) { mIDBox.Text = Guid.NewGuid().ToString(); }
}
}
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/Obi.csproj
===================================================================
--- trunk/urakawa/application/Obi/Obi/Obi.csproj 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/Obi.csproj 2008-05-20 03:44:13 UTC (rev 3089)
@@ -71,9 +71,9 @@
<Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="urakawa, Version=1.0.0.36257, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="urakawa, Version=1.0.0.21762, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\implementation\UrakawaToolkit\bin\Debug\urakawa.dll</HintPath>
+ <HintPath>..\..\..\SDK\core\obj\Debug\urakawa.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -552,6 +552,7 @@
<Content Include="images\obi_meta_editor_small.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="images\obi_new_project_dialog.png" />
<Content Include="images\obi_phrase_and_cursor.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-20 03:44:13 UTC (rev 3089)
@@ -76,7 +76,7 @@
dialog.CreateTitleSection = mSettings.CreateTitleSection;
if (dialog.ShowDialog() == DialogResult.OK)
{
- CreateNewProject(dialog.Path, dialog.Title, dialog.CreateTitleSection);
+ CreateNewProject(dialog.Path, dialog.Title, dialog.CreateTitleSection, dialog.ID);
}
}
@@ -97,7 +97,7 @@
dialog.DisableAutoTitleCheckbox();
dialog.Text = Localizer.Message("create_new_project_from_import");
if (dialog.ShowDialog() != DialogResult.OK) return;
- CreateNewProject(dialog.Path, dialog.Title, false);
+ CreateNewProject(dialog.Path, dialog.Title, false, dialog.ID);
try
{
(new ImportStructure()).ImportFromXHTML(openFile.FileName, mSession.Presentation);
@@ -781,7 +781,7 @@
help.WebBrowser.Url = new Uri(Path.Combine(
Path.GetDirectoryName(GetType().Assembly.Location),
Localizer.Message("help_file_name")));
- help.ShowDialog();
+ help.Show();
}
// Show the HTML help page in an external browser.
@@ -884,7 +884,7 @@
private void CloseAndOpenProject(string path) { if (DidCloseProject()) OpenProject(path); }
// Try to create a new project with the given title at the given path.
- private void CreateNewProject(string path, string title, bool createTitleSection)
+ private void CreateNewProject(string path, string title, bool createTitleSection, string id)
{
try
{
@@ -894,7 +894,7 @@
mSettings.CreateTitleSection = createTitleSection;
if (DidCloseProject())
{
- mSession.NewPresentation(path, title, createTitleSection, "(please set id)", mSettings);
+ mSession.NewPresentation(path, title, createTitleSection, id, mSettings);
}
UpdateMenus();
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Waveform.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Waveform.cs 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Waveform.cs 2008-05-20 03:44:13 UTC (rev 3089)
@@ -100,8 +100,8 @@
set
{
int x = value < 0 ? 0 : value > Width ? Width : value;
- double start = mSelection.CursorTime;
double end = TimeFromX(x);
+ double start = mSelection == null ? end : mSelection.CursorTime;
if (start == end)
{
mSelection.HasCursor = true;
Added: trunk/urakawa/application/Obi/Obi/images/obi_new_project_dialog.png
===================================================================
(Binary files differ)
Property changes on: trunk/urakawa/application/Obi/Obi/images/obi_new_project_dialog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|