Merge branch 'master' into dev-stub-audit
This commit is contained in:
Ima Mechanique
commit
7260dbd9de
6 changed files with 213 additions and 185 deletions
|
|
@ -20,7 +20,7 @@
|
|||
// ********
|
||||
// * LSLEditor, a External editor for the LSL Language.
|
||||
// * Copyright (C) 2010 The LSLEditor Group.
|
||||
//
|
||||
//
|
||||
// * This program is free software; you can redistribute it and/or
|
||||
// * modify it under the terms of the GNU General Public License
|
||||
// * as published by the Free Software Foundation; either version 2
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
// * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
// ********
|
||||
// *
|
||||
// * The above copyright notice and this permission notice shall be included in all
|
||||
// * The above copyright notice and this permission notice shall be included in all
|
||||
// * copies or substantial portions of the Software.
|
||||
// *
|
||||
// ********
|
||||
|
|
@ -70,7 +70,10 @@ namespace LSLEditor.Helpers
|
|||
int intCharPrint;
|
||||
|
||||
// print document
|
||||
PrintDocument printDoc = null;
|
||||
PrintDocument docToPrint = null;
|
||||
|
||||
// print dialogue
|
||||
PrintDialog pd = null;
|
||||
|
||||
// print status items
|
||||
int fromPage = 0;
|
||||
|
|
@ -103,7 +106,7 @@ namespace LSLEditor.Helpers
|
|||
public String Title
|
||||
{
|
||||
get { return title; }
|
||||
set { title = value; printDoc.DocumentName = title; }
|
||||
set { title = value; docToPrint.DocumentName = title; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -127,8 +130,8 @@ namespace LSLEditor.Helpers
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Allow the user to override the title string alignment. Default value is
|
||||
/// Alignment - Near;
|
||||
/// Allow the user to override the title string alignment. Default value is
|
||||
/// Alignment - Near;
|
||||
/// </summary>
|
||||
private StringAlignment titlealignment;
|
||||
public StringAlignment TitleAlignment
|
||||
|
|
@ -183,8 +186,8 @@ namespace LSLEditor.Helpers
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Allow the user to override the subtitle string alignment. Default value is
|
||||
/// Alignment - Near;
|
||||
/// Allow the user to override the subtitle string alignment. Default value is
|
||||
/// Alignment - Near;
|
||||
/// </summary>
|
||||
private StringAlignment subtitlealignment;
|
||||
public StringAlignment SubTitleAlignment
|
||||
|
|
@ -239,8 +242,8 @@ namespace LSLEditor.Helpers
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Allow the user to override the footer string alignment. Default value is
|
||||
/// Alignment - Center;
|
||||
/// Allow the user to override the footer string alignment. Default value is
|
||||
/// Alignment - Center;
|
||||
/// </summary>
|
||||
private StringAlignment footeralignment;
|
||||
public StringAlignment FooterAlignment
|
||||
|
|
@ -302,8 +305,8 @@ namespace LSLEditor.Helpers
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Allow the user to override the page number string alignment. Default value is
|
||||
/// Alignment - Near;
|
||||
/// Allow the user to override the page number string alignment. Default value is
|
||||
/// Alignment - Near;
|
||||
/// </summary>
|
||||
private StringAlignment pagenumberalignment;
|
||||
public StringAlignment PaageNumberAlignment
|
||||
|
|
@ -371,27 +374,27 @@ namespace LSLEditor.Helpers
|
|||
public PrinterHelper(PageSetupDialog pageSetupDialog)
|
||||
{
|
||||
// create print document
|
||||
printDoc = new PrintDocument();
|
||||
printDoc.PrintPage += new PrintPageEventHandler(printDoc_PrintPage);
|
||||
docToPrint = new PrintDocument();
|
||||
docToPrint.PrintPage += new PrintPageEventHandler(printDoc_PrintPage);
|
||||
|
||||
if (pageSetupDialog.PrinterSettings != null)
|
||||
printDoc.PrinterSettings = pageSetupDialog.PrinterSettings;
|
||||
docToPrint.PrinterSettings = pageSetupDialog.PrinterSettings;
|
||||
|
||||
if (pageSetupDialog.PageSettings != null)
|
||||
printDoc.DefaultPageSettings = pageSetupDialog.PageSettings;
|
||||
docToPrint.DefaultPageSettings = pageSetupDialog.PageSettings;
|
||||
else
|
||||
printDoc.DefaultPageSettings.Margins = new Margins(60, 80, 40, 40);
|
||||
docToPrint.DefaultPageSettings.Margins = new Margins(60, 80, 40, 40);
|
||||
|
||||
printmargins = printDoc.DefaultPageSettings.Margins;
|
||||
printmargins = docToPrint.DefaultPageSettings.Margins;
|
||||
|
||||
// set default fonts
|
||||
pagenofont = new Font("Tahoma", 8, FontStyle.Regular, GraphicsUnit.Point);
|
||||
pagenofont = new Font("Tahoma", 10, FontStyle.Regular, GraphicsUnit.Point);
|
||||
pagenocolor = Color.Black;
|
||||
titlefont = new Font("Tahoma", 8, FontStyle.Bold, GraphicsUnit.Point);
|
||||
titlefont = new Font("Tahoma", 10, FontStyle.Bold, GraphicsUnit.Point);
|
||||
titlecolor = Color.Black;
|
||||
subtitlefont = new Font("Tahoma", 8, FontStyle.Regular, GraphicsUnit.Point);
|
||||
subtitlefont = new Font("Tahoma", 10, FontStyle.Regular, GraphicsUnit.Point);
|
||||
subtitlecolor = Color.Black;
|
||||
footerfont = new Font("Tahoma", 8, FontStyle.Regular, GraphicsUnit.Point);
|
||||
footerfont = new Font("Tahoma", 10, FontStyle.Regular, GraphicsUnit.Point);
|
||||
footercolor = Color.Black;
|
||||
|
||||
// set default string formats
|
||||
|
|
@ -415,27 +418,16 @@ namespace LSLEditor.Helpers
|
|||
/// NOTE: Any changes to this method also need to be done in PrintPreviewEditForm
|
||||
public void PrintEditForm(EditForm editForm)
|
||||
{
|
||||
// save the datagridview we're printing
|
||||
this.editForm = editForm;
|
||||
this.intCharFrom = 0;
|
||||
this.intCharPrint = 0;
|
||||
this.intCharTo = editForm.TextBox.Text.Length;
|
||||
|
||||
// create new print dialog
|
||||
PrintDialog pd = new PrintDialog();
|
||||
pd.Document = printDoc;
|
||||
//printDoc.DefaultPageSettings.Margins = printmargins;
|
||||
pd.AllowSelection = true;
|
||||
pd.AllowSomePages = false;
|
||||
pd.AllowCurrentPage = false;
|
||||
pd.AllowPrintToFile = false;
|
||||
saveFormData(editForm);
|
||||
setupPrintDialogue();
|
||||
|
||||
// show print dialog
|
||||
if (DialogResult.OK == pd.ShowDialog())
|
||||
if (pd.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
SetupPrint(pd);
|
||||
printDoc.Print();
|
||||
docToPrint.Print();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -445,26 +437,15 @@ namespace LSLEditor.Helpers
|
|||
/// NOTE: Any changes to this method also need to be done in PrintDataGridView
|
||||
public void PrintPreviewEditForm(EditForm editForm)
|
||||
{
|
||||
// save the datagridview we're printing
|
||||
this.editForm = editForm;
|
||||
this.intCharFrom = 0;
|
||||
this.intCharTo = editForm.TextBox.Text.Length;
|
||||
|
||||
// create new print dialog and set options
|
||||
PrintDialog pd = new PrintDialog();
|
||||
pd.Document = printDoc;
|
||||
//printDoc.DefaultPageSettings.Margins = printmargins;
|
||||
pd.AllowSelection = true;
|
||||
pd.AllowSomePages = false;
|
||||
pd.AllowCurrentPage = false;
|
||||
pd.AllowPrintToFile = false;
|
||||
saveFormData(editForm);
|
||||
setupPrintDialogue();
|
||||
|
||||
// show print dialog
|
||||
if (DialogResult.OK == pd.ShowDialog())
|
||||
if (pd.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
SetupPrint(pd);
|
||||
PrintPreviewDialog ppdialog = new PrintPreviewDialog();
|
||||
ppdialog.Document = printDoc;
|
||||
ppdialog.Document = docToPrint;
|
||||
ppdialog.ShowDialog();
|
||||
}
|
||||
}
|
||||
|
|
@ -481,25 +462,25 @@ namespace LSLEditor.Helpers
|
|||
// save data from print dialog and document
|
||||
//-----------------------------------------------------------------
|
||||
|
||||
// check to see if we're doing landscape printing
|
||||
if (printDoc.DefaultPageSettings.Landscape)
|
||||
// check to see if we're doing landscape printing
|
||||
if (docToPrint.DefaultPageSettings.Landscape)
|
||||
{
|
||||
// landscape: switch width and height
|
||||
pageHeight = printDoc.DefaultPageSettings.PaperSize.Width;
|
||||
pageWidth = printDoc.DefaultPageSettings.PaperSize.Height;
|
||||
pageHeight = docToPrint.DefaultPageSettings.PaperSize.Width;
|
||||
pageWidth = docToPrint.DefaultPageSettings.PaperSize.Height;
|
||||
}
|
||||
else
|
||||
{
|
||||
// portrait: keep width and height as expected
|
||||
pageHeight = printDoc.DefaultPageSettings.PaperSize.Height;
|
||||
pageWidth = printDoc.DefaultPageSettings.PaperSize.Width;
|
||||
pageHeight = docToPrint.DefaultPageSettings.PaperSize.Height;
|
||||
pageWidth = docToPrint.DefaultPageSettings.PaperSize.Width;
|
||||
}
|
||||
|
||||
// save printer margins and calc print width
|
||||
printmargins = printDoc.DefaultPageSettings.Margins;
|
||||
printmargins = docToPrint.DefaultPageSettings.Margins;
|
||||
printWidth = pageWidth - printmargins.Left - printmargins.Right;
|
||||
|
||||
// save print range
|
||||
// save print range
|
||||
printRange = pd.PrinterSettings.PrintRange;
|
||||
|
||||
// pages to print handles "some pages" option
|
||||
|
|
@ -699,5 +680,27 @@ namespace LSLEditor.Helpers
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void saveFormData(EditForm editForm)
|
||||
{
|
||||
// save the datagridview we're printing
|
||||
this.editForm = editForm;
|
||||
this.intCharFrom = 0;
|
||||
this.intCharPrint = 0;
|
||||
this.intCharTo = editForm.TextBox.Text.Length;
|
||||
}
|
||||
|
||||
private void setupPrintDialogue()
|
||||
{
|
||||
// create new print dialog
|
||||
pd = new PrintDialog();
|
||||
|
||||
pd.Document = docToPrint;
|
||||
pd.AllowSelection = true;
|
||||
pd.AllowSomePages = false;
|
||||
pd.AllowCurrentPage = false;
|
||||
pd.AllowPrintToFile = false;
|
||||
pd.UseEXDialog = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ namespace LSLEditor
|
|||
|
||||
public bool CancelClosing = false;
|
||||
|
||||
public Solution.SolutionExplorer m_SolutionExplorer;
|
||||
public Solution.SolutionExplorer m_SolutionExplorer;
|
||||
|
||||
public GListBoxWindow GListBoxWindow;
|
||||
public TooltipWindow TooltipMouse;
|
||||
|
|
@ -102,10 +102,11 @@ namespace LSLEditor
|
|||
public GotoWindow GotoWindow;
|
||||
|
||||
public List<llDialogForm> llDialogForms;
|
||||
public List<llTextBoxForm> llTextBoxForms;
|
||||
public List<llTextBoxForm> llTextBoxForms;
|
||||
public List<PermissionsForm> PermissionForms;
|
||||
|
||||
private UpdateApplicationForm updateApplicationForm;
|
||||
private Helpers.PrinterHelper printer;
|
||||
|
||||
public SyntaxError SyntaxErrors;
|
||||
|
||||
|
|
@ -131,7 +132,7 @@ namespace LSLEditor
|
|||
{
|
||||
get
|
||||
{
|
||||
return this.m_SolutionExplorer;
|
||||
return this.m_SolutionExplorer;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -175,8 +176,8 @@ namespace LSLEditor
|
|||
|
||||
InitializeComponent();
|
||||
|
||||
m_SolutionExplorer = new LSLEditor.Solution.SolutionExplorer();
|
||||
m_SolutionExplorer.parent = this;
|
||||
m_SolutionExplorer = new LSLEditor.Solution.SolutionExplorer();
|
||||
m_SolutionExplorer.parent = this;
|
||||
|
||||
InitRecentFileList();
|
||||
InitRecentProjectList();
|
||||
|
|
@ -203,7 +204,7 @@ namespace LSLEditor
|
|||
|
||||
List<Form> children = new List<Form>();
|
||||
//TODO: Find Child forms
|
||||
//foreach (TabPage tabPage in this.tabControlExtended1.TabPages)
|
||||
//foreach (TabPage tabPage in this.tabControlExtended1.TabPages)
|
||||
// children.Add(tabPage.Tag as Form);
|
||||
return children.ToArray();
|
||||
}
|
||||
|
|
@ -217,9 +218,9 @@ namespace LSLEditor
|
|||
return this.ActiveMdiChild;
|
||||
else
|
||||
{
|
||||
//TODO: Get Active Mdi Form
|
||||
return null;
|
||||
//dockPanel.ActiveContent
|
||||
//TODO: Get Active Mdi Form
|
||||
return null;
|
||||
//dockPanel.ActiveContent
|
||||
// if (this.tabControlExtended1.SelectedTab == null)
|
||||
// return null;
|
||||
// return this.tabControlExtended1.SelectedTab.Tag as Form;
|
||||
|
|
@ -235,7 +236,7 @@ namespace LSLEditor
|
|||
}
|
||||
else
|
||||
{
|
||||
//TODO: Activate the right Mdi Form
|
||||
//TODO: Activate the right Mdi Form
|
||||
/*for (int intI = 0; intI < this.tabControlExtended1.TabCount; intI++)
|
||||
{
|
||||
TabPage tabPage = this.tabControlExtended1.TabPages[intI];
|
||||
|
|
@ -259,8 +260,8 @@ namespace LSLEditor
|
|||
//form.Show();
|
||||
//ActivateMdiChild(form);
|
||||
|
||||
//TODO: add form in the right way
|
||||
form.Show(dockPanel);
|
||||
//TODO: add form in the right way
|
||||
form.Show(dockPanel);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -278,7 +279,7 @@ namespace LSLEditor
|
|||
// Was already commented out //tabPage.Controls.Add(form.Controls[0]);
|
||||
|
||||
|
||||
//this.tabControlExtended1.TabPages.Add(tabPage);
|
||||
//this.tabControlExtended1.TabPages.Add(tabPage);
|
||||
//this.tabControlExtended1.SelectedTab = tabPage;
|
||||
}
|
||||
}
|
||||
|
|
@ -296,32 +297,32 @@ 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 (*.*)|*.*";
|
||||
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.openNoteFilesDialog.FileName = "";
|
||||
this.openNoteFilesDialog.FileName = "";
|
||||
this.openNoteFilesDialog.Filter = fileFilterNotes;
|
||||
this.openNoteFilesDialog.InitialDirectory = Properties.Settings.Default.WorkingDirectory;
|
||||
|
||||
this.saveNoteFilesDialog.FileName = "";
|
||||
this.saveNoteFilesDialog.Filter = fileFilterNotes;
|
||||
this.saveNoteFilesDialog.Filter = fileFilterNotes;
|
||||
this.saveNoteFilesDialog.InitialDirectory = Properties.Settings.Default.WorkingDirectory;
|
||||
|
||||
|
||||
this.openScriptFilesDialog.FileName = "";
|
||||
this.openScriptFilesDialog.Filter = fileFilterScripts;
|
||||
this.openScriptFilesDialog.Filter = fileFilterScripts;
|
||||
this.openScriptFilesDialog.InitialDirectory = Properties.Settings.Default.WorkingDirectory;
|
||||
|
||||
this.saveScriptFilesDialog.FileName = "";
|
||||
this.saveScriptFilesDialog.Filter = fileFilterScripts;
|
||||
this.saveScriptFilesDialog.Filter = fileFilterScripts;
|
||||
this.saveScriptFilesDialog.InitialDirectory = Properties.Settings.Default.WorkingDirectory;
|
||||
|
||||
this.openSolutionFilesDialog.FileName = "";
|
||||
this.openSolutionFilesDialog.Filter = fileFilterSolutions;
|
||||
this.openSolutionFilesDialog.Filter = fileFilterSolutions;
|
||||
this.openSolutionFilesDialog.InitialDirectory = Properties.Settings.Default.ProjectLocation;
|
||||
this.openSolutionFilesDialog.Multiselect = false;
|
||||
|
||||
|
|
@ -339,7 +340,7 @@ namespace LSLEditor
|
|||
this.Text += " (BETA)";
|
||||
}
|
||||
|
||||
//TODO: Fix close buttons on tabs
|
||||
//TODO: Fix close buttons on tabs
|
||||
// enables close buttons on tab
|
||||
//this.tabControlExtended1.SetDrawMode();
|
||||
//this.tabControlExtended1.OnTabClose += new EventHandler(tabControl1_OnTabClose);
|
||||
|
|
@ -371,8 +372,8 @@ namespace LSLEditor
|
|||
continue;
|
||||
}
|
||||
EditForm editForm = new EditForm(this);
|
||||
editForm.LoadFile(strFileName);
|
||||
editForm.TextBox.OnCursorPositionChanged += new SyntaxRichTextBox.CursorPositionChangedHandler(TextBox_OnCursorPositionChanged);
|
||||
editForm.LoadFile(strFileName);
|
||||
editForm.TextBox.OnCursorPositionChanged += new SyntaxRichTextBox.CursorPositionChangedHandler(TextBox_OnCursorPositionChanged);
|
||||
AddForm(editForm);
|
||||
}
|
||||
if (blnRun)
|
||||
|
|
@ -618,20 +619,20 @@ namespace LSLEditor
|
|||
browser.ShowWebBrowser("Import Examples", Properties.Settings.Default.Examples);
|
||||
}
|
||||
|
||||
/***
|
||||
* Return value indicate whether file was saved or not.
|
||||
*/
|
||||
/***
|
||||
* Return value indicate whether file was saved or not.
|
||||
*/
|
||||
public bool SaveFile(EditForm editForm, bool blnSaveAs)
|
||||
{
|
||||
DialogResult dialogresult = DialogResult.OK;
|
||||
if (editForm.FullPathName == Properties.Settings.Default.ExampleName || blnSaveAs)
|
||||
{
|
||||
SaveFileDialog saveDialog = editForm.IsScript ? this.saveScriptFilesDialog : this.saveNoteFilesDialog;
|
||||
saveDialog.FileName = editForm.FullPathName;
|
||||
SaveFileDialog saveDialog = editForm.IsScript ? this.saveScriptFilesDialog : this.saveNoteFilesDialog;
|
||||
saveDialog.FileName = editForm.FullPathName;
|
||||
string strExtension = Path.GetExtension(editForm.FullPathName);
|
||||
dialogresult = saveDialog.ShowDialog();
|
||||
dialogresult = saveDialog.ShowDialog();
|
||||
if (dialogresult == DialogResult.OK)
|
||||
editForm.FullPathName = saveDialog.FileName;
|
||||
editForm.FullPathName = saveDialog.FileName;
|
||||
}
|
||||
if (dialogresult == DialogResult.OK)
|
||||
{
|
||||
|
|
@ -649,9 +650,9 @@ namespace LSLEditor
|
|||
if (editForm == null)
|
||||
return false;
|
||||
// save as!!
|
||||
// TODO: Refactor saveDialog to be a property of the form
|
||||
SaveFileDialog saveDialog = editForm.IsScript ? this.saveScriptFilesDialog : this.saveNoteFilesDialog;
|
||||
return SaveFile(editForm, true);
|
||||
// TODO: Refactor saveDialog to be a property of the form
|
||||
SaveFileDialog saveDialog = editForm.IsScript ? this.saveScriptFilesDialog : this.saveNoteFilesDialog;
|
||||
return SaveFile(editForm, true);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -702,7 +703,7 @@ namespace LSLEditor
|
|||
}
|
||||
else
|
||||
{
|
||||
//TODO: find browser in childs
|
||||
//TODO: find browser in childs
|
||||
/*for (int intI = 0; intI < this.tabControlExtended1.TabCount; intI++)
|
||||
{
|
||||
TabPage tabPage = this.tabControlExtended1.TabPages[intI];
|
||||
|
|
@ -756,27 +757,29 @@ namespace LSLEditor
|
|||
private void printPreviewtoolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
EditForm editForm = this.ActiveMdiForm as EditForm;
|
||||
if (editForm == null)
|
||||
return;
|
||||
|
||||
Helpers.PrinterHelper printer = new Helpers.PrinterHelper(pageSetupDialog1);
|
||||
printer.Title = editForm.FullPathName;
|
||||
printer.SubTitle = DateTime.Now.ToString("s");
|
||||
printer.Footer = this.Text;
|
||||
printer.PrintPreviewEditForm(editForm);
|
||||
if (editForm != null)
|
||||
{
|
||||
printerHelp(editForm);
|
||||
printer.PrintPreviewEditForm(editForm);
|
||||
}
|
||||
}
|
||||
|
||||
private void printToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
EditForm editForm = this.ActiveMdiForm as EditForm;
|
||||
if (editForm == null)
|
||||
return;
|
||||
if (editForm != null)
|
||||
{
|
||||
printerHelp(editForm);
|
||||
printer.PrintEditForm(editForm);
|
||||
}
|
||||
}
|
||||
|
||||
Helpers.PrinterHelper printer = new Helpers.PrinterHelper(pageSetupDialog1);
|
||||
private void printerHelp(EditForm editForm)
|
||||
{
|
||||
printer = new Helpers.PrinterHelper(pageSetupDialog1);
|
||||
printer.Title = editForm.FullPathName;
|
||||
printer.SubTitle = DateTime.Now.ToString("s");
|
||||
printer.Footer = this.Text;
|
||||
printer.PrintEditForm(editForm);
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -944,14 +947,14 @@ namespace LSLEditor
|
|||
|
||||
SetFontsOnWindows();
|
||||
|
||||
//TODO: Fix new file drop down
|
||||
//TODO: Fix new file drop down
|
||||
//this.solutionExplorer1.parent = this;
|
||||
//this.solutionExplorer1.CreateNewFileDrowDownMenu(this.addNewFileToolStripMenuItem);
|
||||
this.solutionExplorerToolStripMenuItem.Checked = Properties.Settings.Default.ShowSolutionExplorer;
|
||||
ShowSolutionExplorer(this.solutionExplorerToolStripMenuItem.Checked);
|
||||
|
||||
this.llDialogForms = new List<llDialogForm>();
|
||||
this.llTextBoxForms = new List<llTextBoxForm>();
|
||||
this.llTextBoxForms = new List<llTextBoxForm>();
|
||||
this.PermissionForms = new List<PermissionsForm>();
|
||||
|
||||
this.TooltipMouse.Tag = "";
|
||||
|
|
@ -960,7 +963,7 @@ namespace LSLEditor
|
|||
this.TooltipListBox.XOffset = 200; // TODO, afhankelijk van toegepaste font
|
||||
this.GListBoxWindow.Tag = "";
|
||||
|
||||
// This order equals with the KeyWordTypeEnum in KeyWords.cs
|
||||
// This order equals with the KeyWordTypeEnum in KeyWords.cs
|
||||
ImageList imageList = new ImageList();
|
||||
imageList.Images.Add(new Bitmap(this.GetType(), "Images.Unknown.gif"));
|
||||
imageList.Images.Add(new Bitmap(this.GetType(), "Images.Functions.gif"));
|
||||
|
|
@ -969,10 +972,10 @@ namespace LSLEditor
|
|||
imageList.Images.Add(new Bitmap(this.GetType(), "Images.Class.gif"));
|
||||
imageList.Images.Add(new Bitmap(this.GetType(), "Images.Vars.gif"));
|
||||
imageList.Images.Add(new Bitmap(this.GetType(), "Images.Properties.gif"));
|
||||
imageList.Images.Add(new Bitmap(this.GetType(), "Images.States.gif"));
|
||||
imageList.Images.Add(new Bitmap(this.GetType(), "Images.States.gif"));
|
||||
|
||||
this.GListBoxWindow.GListBox.ImageList = imageList;
|
||||
// this.tvOutline.ImageList = imageList;
|
||||
// this.tvOutline.ImageList = imageList;
|
||||
|
||||
this.Move += new EventHandler(LSLEditorForm_SetPosition);
|
||||
this.Resize += new EventHandler(LSLEditorForm_SetPosition);
|
||||
|
|
@ -1008,11 +1011,11 @@ namespace LSLEditor
|
|||
df.Top = this.Top + 30;
|
||||
df.Left = this.Right - df.Width - 5;
|
||||
}
|
||||
foreach(llTextBoxForm tbf in this.llTextBoxForms)
|
||||
{
|
||||
tbf.Left = this.Left + this.Width / 2 - tbf.Width / 2;
|
||||
tbf.Top = this.Top + this.Height / 2 - tbf.Height / 2;
|
||||
}
|
||||
foreach(llTextBoxForm tbf in this.llTextBoxForms)
|
||||
{
|
||||
tbf.Left = this.Left + this.Width / 2 - tbf.Width / 2;
|
||||
tbf.Top = this.Top + this.Height / 2 - tbf.Height / 2;
|
||||
}
|
||||
EditForm editForm = this.ActiveMdiForm as EditForm;
|
||||
if (editForm != null)
|
||||
editForm.TextBox.SetPosition(Screen.PrimaryScreen.WorkingArea);
|
||||
|
|
@ -1022,7 +1025,7 @@ namespace LSLEditor
|
|||
{
|
||||
try
|
||||
{
|
||||
//TODO: hmmm?
|
||||
//TODO: hmmm?
|
||||
//this.tabControlExtended1.Visible = false;
|
||||
|
||||
// this.panel1.Visible = false; // Simulator
|
||||
|
|
@ -1072,8 +1075,8 @@ namespace LSLEditor
|
|||
}
|
||||
if (dialogResult == DialogResult.Yes)
|
||||
{
|
||||
// TODO: Refactor saveDialog to be a property of the form
|
||||
SaveFileDialog saveDialog = editForm.IsScript ? this.saveScriptFilesDialog : this.saveNoteFilesDialog;
|
||||
// TODO: Refactor saveDialog to be a property of the form
|
||||
SaveFileDialog saveDialog = editForm.IsScript ? this.saveScriptFilesDialog : this.saveNoteFilesDialog;
|
||||
if(!SaveFile(editForm, false))
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1224,9 +1227,9 @@ namespace LSLEditor
|
|||
|
||||
this.SimulatorConsole = new SimulatorConsole(this.SolutionExplorer, this.Children);
|
||||
|
||||
this.SimulatorConsole.Show(dockPanel);
|
||||
//TODO: Show Simulator Console somewhere
|
||||
//this.panel1.Controls.Clear();
|
||||
this.SimulatorConsole.Show(dockPanel);
|
||||
//TODO: Show Simulator Console somewhere
|
||||
//this.panel1.Controls.Clear();
|
||||
//this.panel1.Controls.Add(this.SimulatorConsole);
|
||||
//this.panel1.Visible = true;
|
||||
//this.splitter1.SplitPosition = Properties.Settings.Default.SimulatorSize.Height;
|
||||
|
|
@ -1234,7 +1237,7 @@ namespace LSLEditor
|
|||
|
||||
public void StopSimulator()
|
||||
{
|
||||
//TODO: Hide simulator? Or we could keep it like the debug output in VS
|
||||
//TODO: Hide simulator? Or we could keep it like the debug output in VS
|
||||
//this.panel1.Visible = false;
|
||||
if (this.SimulatorConsole != null)
|
||||
{
|
||||
|
|
@ -1247,7 +1250,7 @@ namespace LSLEditor
|
|||
|
||||
private bool SyntaxCheck(bool Silent)
|
||||
{
|
||||
//TODO: What do we hide on SyntaxCheck?
|
||||
//TODO: What do we hide on SyntaxCheck?
|
||||
//this.panel1.Visible = false;
|
||||
InitSyntaxError();
|
||||
|
||||
|
|
@ -1266,8 +1269,8 @@ namespace LSLEditor
|
|||
|
||||
if (this.SyntaxErrors.HasErrors)
|
||||
{
|
||||
this.SyntaxErrors.Show(dockPanel);
|
||||
//TODO: Show errors somewhere in an output
|
||||
this.SyntaxErrors.Show(dockPanel);
|
||||
//TODO: Show errors somewhere in an output
|
||||
//this.panel1.Controls.Clear();
|
||||
//this.panel1.Controls.Add(this.SyntaxErrors);
|
||||
//this.panel1.Visible = true;
|
||||
|
|
@ -1302,7 +1305,7 @@ namespace LSLEditor
|
|||
|
||||
private void splitter1_SplitterMoved(object sender, SplitterEventArgs e)
|
||||
{
|
||||
//TODO: Splitter moved? I Think this is depricated
|
||||
//TODO: Splitter moved? I Think this is depricated
|
||||
//if( this.splitter1.SplitPosition>50)
|
||||
// Properties.Settings.Default.SimulatorSize = new Size(this.splitter1.Width, this.splitter1.SplitPosition);
|
||||
}
|
||||
|
|
@ -1347,19 +1350,19 @@ namespace LSLEditor
|
|||
|
||||
private void CloseTab(int intTabToDelete)
|
||||
{
|
||||
//TODO: Find a new way for closing tabs
|
||||
/*
|
||||
//TODO: Find a new way for closing tabs
|
||||
/*
|
||||
// reset toolstrip information
|
||||
this.toolStripStatusLabel1.Text = "";
|
||||
|
||||
//int intTabToDelete = (int)this.contextMenuStrip1.Tag;
|
||||
|
||||
if (intTabToDelete >= this.tabControlExtended1.TabCount)
|
||||
if (intTabToDelete >= this.tabControlExtended1.TabCount)
|
||||
return;
|
||||
|
||||
TabPage tabPage = this.tabControlExtended1.TabPages[intTabToDelete];
|
||||
TabPage tabPage = this.tabControlExtended1.TabPages[intTabToDelete];
|
||||
|
||||
if (tabPage.Text.Contains("Browser"))
|
||||
if (tabPage.Text.Contains("Browser"))
|
||||
{
|
||||
this.browser.Dispose();
|
||||
this.browser = null;
|
||||
|
|
@ -1393,7 +1396,7 @@ namespace LSLEditor
|
|||
editForm = null;
|
||||
}
|
||||
this.tabControlExtended1.TabPages[intTabToDelete].Dispose();
|
||||
*/
|
||||
*/
|
||||
GC.Collect();
|
||||
}
|
||||
|
||||
|
|
@ -1437,14 +1440,14 @@ namespace LSLEditor
|
|||
}
|
||||
else
|
||||
{
|
||||
//TODO: Find a new way
|
||||
//TODO: Find a new way
|
||||
/*
|
||||
int intTabToClose = this.tabControlExtended1.SelectedIndex;
|
||||
int intTabToClose = this.tabControlExtended1.SelectedIndex;
|
||||
if (intTabToClose >= 0)
|
||||
CloseTab(intTabToClose);
|
||||
|
||||
*/
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
private void closeActiveWindowToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
|
|
@ -1535,16 +1538,16 @@ namespace LSLEditor
|
|||
|
||||
public void ShowSolutionExplorer(bool blnVisible)
|
||||
{
|
||||
//TODO: We need another way to activate the Solution Explorer
|
||||
//TODO: We need another way to activate the Solution Explorer
|
||||
//this.panel2.Visible = blnVisible;
|
||||
if (blnVisible)
|
||||
{
|
||||
m_SolutionExplorer.Show(dockPanel);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_SolutionExplorer.Hide();
|
||||
}
|
||||
if (blnVisible)
|
||||
{
|
||||
m_SolutionExplorer.Show(dockPanel);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_SolutionExplorer.Hide();
|
||||
}
|
||||
this.solutionExplorerToolStripMenuItem.Checked = blnVisible;
|
||||
//this.tabControlExtended1.Refresh();
|
||||
}
|
||||
|
|
@ -1571,15 +1574,15 @@ namespace LSLEditor
|
|||
this.newProjectToolStripMenuItem.Enabled = !blnVisible;
|
||||
}
|
||||
|
||||
private void openNoteFilesToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
ReadNoteFiles();
|
||||
}
|
||||
private void openNoteFilesToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
ReadNoteFiles();
|
||||
}
|
||||
|
||||
private void openScriptFilesToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
ReadScriptFiles();
|
||||
}
|
||||
private void openScriptFilesToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
ReadScriptFiles();
|
||||
}
|
||||
|
||||
private void closeFileToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
|
@ -1784,7 +1787,7 @@ namespace LSLEditor
|
|||
|
||||
private void PluginsHandler(object sender, EventArgs e)
|
||||
{
|
||||
//TODO: What do we hide here?
|
||||
//TODO: What do we hide here?
|
||||
//this.panel1.Visible = false;
|
||||
|
||||
ToolStripMenuItem tsmi = sender as ToolStripMenuItem;
|
||||
|
|
@ -1885,36 +1888,36 @@ namespace LSLEditor
|
|||
NativeHelper.SendMyKeys.ClipBoardToApp("SecondLife", null);
|
||||
}
|
||||
|
||||
private void outlineToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
//old
|
||||
}
|
||||
private void outlineToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
//old
|
||||
}
|
||||
|
||||
private void outlineToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
foreach (Form k in this.Children)
|
||||
{
|
||||
EditForm editForm = k as EditForm;
|
||||
if (editForm == null)
|
||||
return;
|
||||
if (outlineToolStripMenuItem.Checked)
|
||||
{
|
||||
editForm.splitContainer1.Panel2Collapsed = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
editForm.splitContainer1.Panel2Collapsed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
private void outlineToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
foreach (Form k in this.Children)
|
||||
{
|
||||
EditForm editForm = k as EditForm;
|
||||
if (editForm == null)
|
||||
return;
|
||||
if (outlineToolStripMenuItem.Checked)
|
||||
{
|
||||
editForm.splitContainer1.Panel2Collapsed = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
editForm.splitContainer1.Panel2Collapsed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void toolStripMenuItem9_Click_1(object sender, EventArgs e)
|
||||
{
|
||||
Browser browser = GetBrowser();
|
||||
browser.ShowWebBrowser("LSLEditor QA", Properties.Settings.Default.qasite);
|
||||
}
|
||||
private void toolStripMenuItem9_Click_1(object sender, EventArgs e)
|
||||
{
|
||||
Browser browser = GetBrowser();
|
||||
browser.ShowWebBrowser("LSLEditor QA", Properties.Settings.Default.qasite);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ using System.Runtime.InteropServices;
|
|||
// You can specify all the values or you can default the Revision and Build Numbers
|
||||
// by using the '*' as shown below:
|
||||
|
||||
[assembly: AssemblyVersion("2.53.0.1")]
|
||||
[assembly: AssemblyVersion("2.53.1.2")]
|
||||
|
||||
//
|
||||
// In order to sign your assembly you must specify a key to use. Refer to the
|
||||
|
|
@ -100,4 +100,4 @@ using System.Runtime.InteropServices;
|
|||
[assembly: AssemblyDelaySign(false)]
|
||||
//[assembly: AssemblyKeyName("")]
|
||||
[assembly: ComVisibleAttribute(false)]
|
||||
[assembly: AssemblyFileVersionAttribute("2.53.0.1")]
|
||||
[assembly: AssemblyFileVersionAttribute("2.53.1.2")]
|
||||
|
|
|
|||
|
|
@ -6,6 +6,13 @@
|
|||
<body style="background-color: white; font-family: Verdana, sans-serif;font-size: 13px;line-height: 1.3">
|
||||
<div>
|
||||
<div>
|
||||
<h3><span class="date">2013-07-07</span> - Release 2.53.1</h3>
|
||||
<div>
|
||||
* Fixes
|
||||
<ul>
|
||||
<li>Fixed print dialogue box not opening on AMD64 CPUs</li>
|
||||
</ul>
|
||||
</div>
|
||||
<h3><span class="date">2013-07-02</span> - Release 2.53.0</h3>
|
||||
<div>
|
||||
* Constants Added:
|
||||
|
|
|
|||
14
trunk/SecondLife/json.cs
Normal file
14
trunk/SecondLife/json.cs
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Text;
|
||||
|
||||
namespace LSLEditor
|
||||
{
|
||||
public partial class SecondLife
|
||||
{
|
||||
public class jsonObject : DictionaryBase
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -251,6 +251,7 @@
|
|||
</Compile>
|
||||
<Compile Include="Plugins\Generic.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="SecondLife\json.cs" />
|
||||
<Compile Include="Solution\GuidProperty.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue