From: <ju...@us...> - 2006-07-11 13:37:05
|
Revision: 580 Author: julienq Date: 2006-07-11 06:36:57 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/urakawa/?rev=580&view=rev Log Message: ----------- Settings should work Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Obi.csproj trunk/urakawa/application/Obi/Obi/ObiForm.cs trunk/urakawa/application/Obi/Obi/UserControls/ProjectPanel.Designer.cs Modified: trunk/urakawa/application/Obi/Obi/Obi.csproj =================================================================== --- trunk/urakawa/application/Obi/Obi/Obi.csproj 2006-07-11 12:58:28 UTC (rev 579) +++ trunk/urakawa/application/Obi/Obi/Obi.csproj 2006-07-11 13:36:57 UTC (rev 580) @@ -92,6 +92,7 @@ <Compile Include="Dialogs\UserProfile.Designer.cs"> <DependentUpon>UserProfile.cs</DependentUpon> </Compile> + <Compile Include="Events\Node\CreatedEventArgs.cs" /> <Compile Include="Events\Project\StateChangedEventArgs.cs" /> <Compile Include="Localizer.cs" /> <Compile Include="messages.Designer.cs"> @@ -197,6 +198,7 @@ <DependentUpon>Settings.settings</DependentUpon> <DesignTimeSharedInput>True</DesignTimeSharedInput> </Compile> + <Compile Include="Settings.cs" /> <Compile Include="SimpleMetadata.cs" /> <Compile Include="Strips\AudioStrip.cs" /> <Compile Include="Strips\Manager.cs" /> Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2006-07-11 12:58:28 UTC (rev 579) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2006-07-11 13:36:57 UTC (rev 580) @@ -39,7 +39,7 @@ ProjectStateChanged += new Events.Project.StateChangedHandler(mProject_StateChanged); GUIUpdateNoProject(); UpdateShowHideTOC(); - GetSettings(); + mSettings = GetSettings(); mUndoStack = new UndoRedoStack(); undo_label = mUndoToolStripMenuItem.Text; redo_label = mRedoToolStripMenuItem.Text; @@ -563,44 +563,33 @@ } /// <summary> - /// Read the settings, or create an empty settings object. + /// Read the settings; missing values are replaced with defaults. /// </summary> - /*private void GetSettings() + private Settings GetSettings() { - mSettings = new Settings(); - mSettings.RecentProjects = new ArrayList(); - ClearRecentList(); - mSettings.UserProfile = new UserProfile(); - Console.WriteLine(mSettings.UserProfile); - mSettings.IdTemplate = "obi_####"; - mSettings.DefaultPath = Environment.CurrentDirectory; - }*/ - - private void GetSettings() - { - mSettings = new Settings(); + IsolatedStorageFile file = IsolatedStorageFile.GetUserStoreForDomain(); try { - IsolatedStorageFile file = IsolatedStorageFile.GetUserStoreForDomain(); IsolatedStorageFileStream stream = new IsolatedStorageFileStream(SettingsFileName, FileMode.Open, FileAccess.Read, file); - MessageBox.Show("OK (stream)", "OK", MessageBoxButtons.OK, MessageBoxIcon.Information); SoapFormatter soap = new SoapFormatter(); mSettings = (Settings)soap.Deserialize(stream); - ClearRecentList(); - for (int i = mSettings.RecentProjects.Count - 1; i >= 0; --i) - { - //AddRecentProject((string) mSettings.RecentProjects[i]); - Console.WriteLine("Add {0} ({1})", (string)mSettings.RecentProjects[i], i); - } - MessageBox.Show("OK (deserialize)", "OK", MessageBoxButtons.OK, MessageBoxIcon.Information); stream.Close(); } - catch (Exception e) + catch (Exception) { - mSettings.RecentProjects = new ArrayList(); - ClearRecentList(); + mSettings = new Settings(); } + if (mSettings.RecentProjects == null) mSettings.RecentProjects = new ArrayList(); + ClearRecentList(); + for (int i = mSettings.RecentProjects.Count - 1; i >= 0; --i) + { + AddRecentProject((string)mSettings.RecentProjects[i]); + } + if (mSettings.UserProfile == null) mSettings.UserProfile = new UserProfile(); + if (mSettings.IdTemplate == null) mSettings.IdTemplate = "obi_####"; + if (mSettings.DefaultPath == null) mSettings.DefaultPath = Environment.CurrentDirectory; + return mSettings; } /// <summary> @@ -616,8 +605,6 @@ SoapFormatter soap = new SoapFormatter(); soap.Serialize(stream, mSettings); stream.Close(); - string[] dirs = file.GetFileNames("*.*"); - MessageBox.Show("OK: " + String.Join(" :: ", dirs), "OK", MessageBoxButtons.OK, MessageBoxIcon.Information); } catch (Exception x) { @@ -697,16 +684,4 @@ Debug(String.Format(Localizer.Message("debug_appended_strip"), par)); } } - - /// <summary> - /// Various persistent application settings. - /// </summary> - [Serializable()] - public class Settings - { - public ArrayList RecentProjects; // paths to projects recently opened - public UserProfile UserProfile; // the user profile - public string IdTemplate; // identifier template - public string DefaultPath; // default location - } } \ No newline at end of file Modified: trunk/urakawa/application/Obi/Obi/UserControls/ProjectPanel.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/UserControls/ProjectPanel.Designer.cs 2006-07-11 12:58:28 UTC (rev 579) +++ trunk/urakawa/application/Obi/Obi/UserControls/ProjectPanel.Designer.cs 2006-07-11 13:36:57 UTC (rev 580) @@ -30,8 +30,8 @@ { this.label1 = new System.Windows.Forms.Label(); this.mSplitContainer = new System.Windows.Forms.SplitContainer(); - this.ncxPanel1 = new Obi.UserControls.NCXPanel(); this.stripManagerPanel1 = new Obi.UserControls.StripManagerPanel(); + this.tocPanel1 = new Obi.UserControls.TOCPanel(); this.mSplitContainer.Panel1.SuspendLayout(); this.mSplitContainer.Panel2.SuspendLayout(); this.mSplitContainer.SuspendLayout(); @@ -59,7 +59,7 @@ // mSplitContainer.Panel1 // this.mSplitContainer.Panel1.BackColor = System.Drawing.Color.Transparent; - this.mSplitContainer.Panel1.Controls.Add(this.ncxPanel1); + this.mSplitContainer.Panel1.Controls.Add(this.tocPanel1); // // mSplitContainer.Panel2 // @@ -69,15 +69,6 @@ this.mSplitContainer.SplitterDistance = 210; this.mSplitContainer.TabIndex = 1; // - // ncxPanel1 - // - this.ncxPanel1.BackColor = System.Drawing.SystemColors.Control; - this.ncxPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ncxPanel1.Location = new System.Drawing.Point(0, 0); - this.ncxPanel1.Name = "ncxPanel1"; - this.ncxPanel1.Size = new System.Drawing.Size(210, 330); - this.ncxPanel1.TabIndex = 2; - // // stripManagerPanel1 // this.stripManagerPanel1.BackColor = System.Drawing.Color.Transparent; @@ -87,6 +78,14 @@ this.stripManagerPanel1.Size = new System.Drawing.Size(417, 330); this.stripManagerPanel1.TabIndex = 0; // + // tocPanel1 + // + this.tocPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tocPanel1.Location = new System.Drawing.Point(0, 0); + this.tocPanel1.Name = "tocPanel1"; + this.tocPanel1.Size = new System.Drawing.Size(210, 330); + this.tocPanel1.TabIndex = 0; + // // ProjectPanel // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -108,8 +107,8 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.SplitContainer mSplitContainer; - private NCXPanel ncxPanel1; private StripManagerPanel stripManagerPanel1; + private TOCPanel tocPanel1; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |