AriasCreations/LSLEditor
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev-load+save-notecards' into dev-next

Browse source
This commit is contained in:
Ima Mechanique 2012-10-23 14:06:06 +00:00
commit 0472df43d7
4 changed files with 936 additions and 876 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/Editor/SyntaxRichTextBox.cs
View file

@ -914,6 +914,9 @@ namespace LSLEditor
{
string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.Text, true).ToString().Replace("\r", "");
this.ColoredText = strTextToPaste;
#if DEBUG
// TODO Add code to show encoding used in a dialogue or the status bar.
#endif
}
}

37
trunk/LSLEditorForm.Designer.cs generated
View file

@ -53,7 +53,8 @@ namespace LSLEditor
this.notecardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openProjectSolutionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openNotecardFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openScriptFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.newProjectToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
@ -131,6 +132,8 @@ namespace LSLEditor
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.releaseNotesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openFileDialog0 = new System.Windows.Forms.OpenFileDialog();
this.saveFileDialog0 = new System.Windows.Forms.SaveFileDialog();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
@ -234,7 +237,8 @@ namespace LSLEditor
//
this.openToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.openProjectSolutionToolStripMenuItem,
this.openFileToolStripMenuItem});
this.openNotecardFilesToolStripMenuItem,
this.openScriptFilesToolStripMenuItem});
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
this.openToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
this.openToolStripMenuItem.Text = "Open";
@ -248,14 +252,24 @@ namespace LSLEditor
this.openProjectSolutionToolStripMenuItem.Text = "Project/Solution...";
this.openProjectSolutionToolStripMenuItem.Click += new System.EventHandler(this.openProjectSolutionToolStripMenuItem_Click);
//
// openFileToolStripMenuItem
// openNotecardFilesToolStripMenuItem
//
this.openFileToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.OPEN;
this.openFileToolStripMenuItem.Name = "openFileToolStripMenuItem";
this.openFileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.openFileToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
this.openFileToolStripMenuItem.Text = "File...";
this.openFileToolStripMenuItem.Click += new System.EventHandler(this.openFileToolStripMenuItem_Click);
this.openNotecardFilesToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.OPEN;
this.openNotecardFilesToolStripMenuItem.Name = "openNotecardFilesToolStripMenuItem";
this.openNotecardFilesToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt)
| System.Windows.Forms.Keys.O)));
this.openNotecardFilesToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
this.openNotecardFilesToolStripMenuItem.Text = "Notecard File(s)...";
this.openNotecardFilesToolStripMenuItem.Click += new System.EventHandler(this.openNoteFilesToolStripMenuItem_Click);
//
// openScriptFilesToolStripMenuItem
//
this.openScriptFilesToolStripMenuItem.Image = global::LSLEditor.Properties.Resources.OPEN;
this.openScriptFilesToolStripMenuItem.Name = "openScriptFilesToolStripMenuItem";
this.openScriptFilesToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.openScriptFilesToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
this.openScriptFilesToolStripMenuItem.Text = "Script File(s)...";
this.openScriptFilesToolStripMenuItem.Click += new System.EventHandler(this.openScriptFilesToolStripMenuItem_Click);
//
// toolStripSeparator5
//
@ -1011,6 +1025,8 @@ namespace LSLEditor
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripMenuItem formatDocumentToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem startToolStripMenuItem;
private System.Windows.Forms.OpenFileDialog openFileDialog0;
private System.Windows.Forms.SaveFileDialog saveFileDialog0;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
private System.Windows.Forms.SaveFileDialog saveFileDialog1;
private System.Windows.Forms.ToolStripMenuItem indexToolStripMenuItem;
@ -1038,7 +1054,7 @@ namespace LSLEditor
private System.Windows.Forms.ToolStripMenuItem newProjectToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem newFileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem openProjectSolutionToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem openFileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem openScriptFilesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem addToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem newProjectToolStripMenuItem1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator19;
@ -1076,5 +1092,6 @@ namespace LSLEditor
private System.Windows.Forms.ToolStripMenuItem closeActiveWindowToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem9;
private System.Windows.Forms.ToolStripMenuItem releaseNotesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem openNotecardFilesToolStripMenuItem;
}
}

48
trunk/LSLEditorForm.cs
View file

@ -190,7 +190,7 @@ namespace LSLEditor
}
catch (Exception exception)
{
MessageBox.Show("Error:" + OopsFormatter.ApplyFormatting(exception.Message), "Oops");
MessageBox.Show("Error: " + OopsFormatter.ApplyFormatting(exception.Message), "Oops");
}
}
@ -296,20 +296,33 @@ namespace LSLEditor
private void Start(string[] args)
{
string fileFilterNotes = "Notecard files (*.txt)|*.txt|All files (*.*)|*.*";
string fileFilterScripts = "Secondlife script files (*.lsl)|*.lsl|All files (*.*)|*.*";
string fileFilterSolutions = "LSLEditor Solution File (*.sol)|*.sol|All Files (*.*)|*.*";
this.ConfLSL = GetXmlFromResource(Properties.Settings.Default.ConfLSL);
this.ConfCSharp = GetXmlFromResource(Properties.Settings.Default.ConfCSharp);
this.openFileDialog0.FileName = "";
this.openFileDialog0.InitialDirectory = Properties.Settings.Default.WorkingDirectory;
this.openFileDialog0.Filter = fileFilterNotes;
this.saveFileDialog0.FileName = "";
this.saveFileDialog0.InitialDirectory = Properties.Settings.Default.WorkingDirectory;
this.saveFileDialog0.Filter = fileFilterNotes;
this.openFileDialog1.FileName = "";
this.openFileDialog1.InitialDirectory = Properties.Settings.Default.WorkingDirectory;
this.openFileDialog1.Filter = "Secondlife script files (*.lsl)|*.lsl|All files (*.*)|*.*";
this.openFileDialog1.Filter = fileFilterScripts;
this.saveFileDialog1.FileName = "";
this.saveFileDialog1.InitialDirectory = Properties.Settings.Default.WorkingDirectory;
this.saveFileDialog1.Filter = "Secondlife script files (*.lsl)|*.lsl|All files (*.*)|*.*";
this.saveFileDialog1.Filter = fileFilterScripts;
this.openFileDialog2.Multiselect = false;
this.openFileDialog2.FileName = "";
this.openFileDialog2.Filter = "LSLEditor Solution File (*.sol)|*.sol|All Files (*.*)|*.*";
this.openFileDialog2.Filter = fileFilterSolutions;
this.openFileDialog2.InitialDirectory = Properties.Settings.Default.ProjectLocation;
@ -567,7 +580,23 @@ namespace LSLEditor
}
private void ReadFile()
private void ReadNoteFiles()
{
this.openFileDialog0.Multiselect = true;
if (this.openFileDialog0.ShowDialog() == DialogResult.OK)
{
foreach (string strFileName in this.openFileDialog0.FileNames)
{
if (File.Exists(strFileName))
{
OpenFile(strFileName, Guid.NewGuid(), false);
UpdateRecentFileList(strFileName);
}
}
}
}
private void ReadScriptFiles()
{
this.openFileDialog1.Multiselect = true;
if (this.openFileDialog1.ShowDialog() == DialogResult.OK)
@ -1534,9 +1563,14 @@ namespace LSLEditor
this.newProjectToolStripMenuItem.Enabled = !blnVisible;
}
private void openFileToolStripMenuItem_Click(object sender, EventArgs e)
private void openNoteFilesToolStripMenuItem_Click(object sender, EventArgs e)
{
ReadFile();
ReadNoteFiles();
}
private void openScriptFilesToolStripMenuItem_Click(object sender, EventArgs e)
{
ReadScriptFiles();
}
private void closeFileToolStripMenuItem_Click(object sender, EventArgs e)

20
trunk/LSLEditorForm.resx
View file

@ -118,28 +118,34 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>293, 17</value>
</metadata>
<metadata name="openFileDialog0.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="saveFileDialog0.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>157, 17</value>
</metadata>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>271, 17</value>
<value>563, 17</value>
</metadata>
<metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>401, 17</value>
<value>703, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>671, 17</value>
<value>17, 56</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>126, 17</value>
<value>408, 17</value>
</metadata>
<metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>529, 17</value>
<value>839, 17</value>
</metadata>
<metadata name="openFileDialog2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 54</value>
<value>133, 56</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>157, 54</value>
<value>273, 56</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>53</value>