diff --git a/WinLess/Forms/aboutForm.Designer.cs b/WinLess/Forms/aboutForm.Designer.cs index b536600..b4cf081 100644 --- a/WinLess/Forms/aboutForm.Designer.cs +++ b/WinLess/Forms/aboutForm.Designer.cs @@ -30,6 +30,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(aboutForm)); this.versionGroupBox = new System.Windows.Forms.GroupBox(); + this.updatingLabel = new System.Windows.Forms.Label(); this.checkingForUpdatesLabel = new System.Windows.Forms.Label(); this.lessjsVersionLabel = new System.Windows.Forms.Label(); this.lessjsLabel = new System.Windows.Forms.Label(); @@ -40,7 +41,6 @@ private void InitializeComponent() this.authorNameLabel = new System.Windows.Forms.Label(); this.graphicalDesignLabel = new System.Windows.Forms.Label(); this.authorLabel = new System.Windows.Forms.Label(); - this.updatingLabel = new System.Windows.Forms.Label(); this.versionGroupBox.SuspendLayout(); this.creditsGroupBox.SuspendLayout(); this.SuspendLayout(); @@ -60,6 +60,16 @@ private void InitializeComponent() this.versionGroupBox.TabStop = false; this.versionGroupBox.Text = "Version info"; // + // updatingLabel + // + this.updatingLabel.AutoSize = true; + this.updatingLabel.Location = new System.Drawing.Point(165, 37); + this.updatingLabel.Name = "updatingLabel"; + this.updatingLabel.Size = new System.Drawing.Size(59, 13); + this.updatingLabel.TabIndex = 5; + this.updatingLabel.Text = "Updating..."; + this.updatingLabel.Visible = false; + // // checkingForUpdatesLabel // this.checkingForUpdatesLabel.AutoSize = true; @@ -154,16 +164,6 @@ private void InitializeComponent() this.authorLabel.TabIndex = 0; this.authorLabel.Text = "Author:"; // - // updatingLabel - // - this.updatingLabel.AutoSize = true; - this.updatingLabel.Location = new System.Drawing.Point(165, 37); - this.updatingLabel.Name = "updatingLabel"; - this.updatingLabel.Size = new System.Drawing.Size(59, 13); - this.updatingLabel.TabIndex = 5; - this.updatingLabel.Text = "Updating..."; - this.updatingLabel.Visible = false; - // // aboutForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/WinLess/Forms/aboutForm.cs b/WinLess/Forms/aboutForm.cs index b61e761..d4e27ea 100644 --- a/WinLess/Forms/aboutForm.cs +++ b/WinLess/Forms/aboutForm.cs @@ -54,6 +54,8 @@ private void aboutForm_Shown(object sender, EventArgs e) MessageBox.Show(string.Format("Succesfully updated less.js to version {0}", newVersion), "LESS compiler update"); } } - } + } + + } } diff --git a/WinLess/Forms/mainForm.Designer.cs b/WinLess/Forms/mainForm.Designer.cs index f6071c6..1ce5b6f 100644 --- a/WinLess/Forms/mainForm.Designer.cs +++ b/WinLess/Forms/mainForm.Designer.cs @@ -50,10 +50,6 @@ private void InitializeComponent() this.directoryFilesSplitContainer = new System.Windows.Forms.SplitContainer(); this.foldersListBox = new System.Windows.Forms.ListBox(); this.filesDataGridView = new System.Windows.Forms.DataGridView(); - this.enabledDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.fullPathDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.outputPathDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.minifyDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.compileSelectedButton = new System.Windows.Forms.Button(); this.addDirectoryButton = new System.Windows.Forms.Button(); this.refreshDirectoryButton = new System.Windows.Forms.Button(); @@ -71,6 +67,11 @@ private void InitializeComponent() this.compileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.notifyIconMenuExit = new System.Windows.Forms.ToolStripMenuItem(); this.logoPictureBox = new System.Windows.Forms.PictureBox(); + this.enabledDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.fullPathDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.outputPathDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.minifyDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.debugDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.directoryBindingSource)).BeginInit(); this.menu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fileBindingSource)).BeginInit(); @@ -144,7 +145,7 @@ private void InitializeComponent() this.fileOpenFolderToolStripMenuItem, this.fileSelectOutputToolStripMenuItem}); this.fileContextMenuStrip.Name = "fileContextMenuStrip"; - this.fileContextMenuStrip.Size = new System.Drawing.Size(198, 92); + this.fileContextMenuStrip.Size = new System.Drawing.Size(198, 70); // // openFiletoolStripMenuItem // @@ -253,7 +254,8 @@ private void InitializeComponent() this.enabledDataGridViewTextBoxColumn, this.fullPathDataGridViewTextBoxColumn, this.outputPathDataGridViewTextBoxColumn, - this.minifyDataGridViewCheckBoxColumn}); + this.minifyDataGridViewCheckBoxColumn, + this.debugDataGridViewCheckBoxColumn}); this.filesDataGridView.DataSource = this.fileBindingSource; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; @@ -270,49 +272,11 @@ private void InitializeComponent() this.filesDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; this.filesDataGridView.Size = new System.Drawing.Size(581, 303); this.filesDataGridView.TabIndex = 5; + this.filesDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.filesDataGridView_CellContentClick); this.filesDataGridView.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.filesDataGridView_CellDoubleClick); this.filesDataGridView.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.filesDataGridView_CellEndEdit); this.filesDataGridView.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.filesDataGridView_CellMouseDown); // - // enabledDataGridViewTextBoxColumn - // - this.enabledDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; - this.enabledDataGridViewTextBoxColumn.DataPropertyName = "Enabled"; - this.enabledDataGridViewTextBoxColumn.HeaderText = ""; - this.enabledDataGridViewTextBoxColumn.MinimumWidth = 30; - this.enabledDataGridViewTextBoxColumn.Name = "enabledDataGridViewTextBoxColumn"; - this.enabledDataGridViewTextBoxColumn.Width = 30; - // - // fullPathDataGridViewTextBoxColumn - // - this.fullPathDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.fullPathDataGridViewTextBoxColumn.ContextMenuStrip = this.fileContextMenuStrip; - this.fullPathDataGridViewTextBoxColumn.DataPropertyName = "RelativePath"; - this.fullPathDataGridViewTextBoxColumn.HeaderText = "File"; - this.fullPathDataGridViewTextBoxColumn.MinimumWidth = 150; - this.fullPathDataGridViewTextBoxColumn.Name = "fullPathDataGridViewTextBoxColumn"; - this.fullPathDataGridViewTextBoxColumn.ReadOnly = true; - this.fullPathDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; - // - // outputPathDataGridViewTextBoxColumn - // - this.outputPathDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.outputPathDataGridViewTextBoxColumn.ContextMenuStrip = this.fileContextMenuStrip; - this.outputPathDataGridViewTextBoxColumn.DataPropertyName = "RelativeOutputPath"; - this.outputPathDataGridViewTextBoxColumn.HeaderText = "Output file"; - this.outputPathDataGridViewTextBoxColumn.MinimumWidth = 150; - this.outputPathDataGridViewTextBoxColumn.Name = "outputPathDataGridViewTextBoxColumn"; - this.outputPathDataGridViewTextBoxColumn.ReadOnly = true; - // - // minifyDataGridViewCheckBoxColumn - // - this.minifyDataGridViewCheckBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; - this.minifyDataGridViewCheckBoxColumn.DataPropertyName = "Minify"; - this.minifyDataGridViewCheckBoxColumn.HeaderText = "Minify"; - this.minifyDataGridViewCheckBoxColumn.MinimumWidth = 40; - this.minifyDataGridViewCheckBoxColumn.Name = "minifyDataGridViewCheckBoxColumn"; - this.minifyDataGridViewCheckBoxColumn.Width = 40; - // // compileSelectedButton // this.compileSelectedButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -500,6 +464,58 @@ private void InitializeComponent() this.logoPictureBox.TabIndex = 9; this.logoPictureBox.TabStop = false; // + // enabledDataGridViewTextBoxColumn + // + this.enabledDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; + this.enabledDataGridViewTextBoxColumn.DataPropertyName = "Enabled"; + this.enabledDataGridViewTextBoxColumn.HeaderText = ""; + this.enabledDataGridViewTextBoxColumn.MinimumWidth = 30; + this.enabledDataGridViewTextBoxColumn.Name = "enabledDataGridViewTextBoxColumn"; + this.enabledDataGridViewTextBoxColumn.Width = 30; + // + // fullPathDataGridViewTextBoxColumn + // + this.fullPathDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.fullPathDataGridViewTextBoxColumn.ContextMenuStrip = this.fileContextMenuStrip; + this.fullPathDataGridViewTextBoxColumn.DataPropertyName = "RelativePath"; + this.fullPathDataGridViewTextBoxColumn.HeaderText = "File"; + this.fullPathDataGridViewTextBoxColumn.MinimumWidth = 150; + this.fullPathDataGridViewTextBoxColumn.Name = "fullPathDataGridViewTextBoxColumn"; + this.fullPathDataGridViewTextBoxColumn.ReadOnly = true; + this.fullPathDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; + // + // outputPathDataGridViewTextBoxColumn + // + this.outputPathDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.outputPathDataGridViewTextBoxColumn.ContextMenuStrip = this.fileContextMenuStrip; + this.outputPathDataGridViewTextBoxColumn.DataPropertyName = "RelativeOutputPath"; + this.outputPathDataGridViewTextBoxColumn.HeaderText = "Output file"; + this.outputPathDataGridViewTextBoxColumn.MinimumWidth = 150; + this.outputPathDataGridViewTextBoxColumn.Name = "outputPathDataGridViewTextBoxColumn"; + this.outputPathDataGridViewTextBoxColumn.ReadOnly = true; + // + // minifyDataGridViewCheckBoxColumn + // + this.minifyDataGridViewCheckBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; + this.minifyDataGridViewCheckBoxColumn.DataPropertyName = "Minify"; + this.minifyDataGridViewCheckBoxColumn.FalseValue = "false"; + this.minifyDataGridViewCheckBoxColumn.HeaderText = "Minify"; + this.minifyDataGridViewCheckBoxColumn.MinimumWidth = 40; + this.minifyDataGridViewCheckBoxColumn.Name = "minifyDataGridViewCheckBoxColumn"; + this.minifyDataGridViewCheckBoxColumn.TrueValue = "true"; + this.minifyDataGridViewCheckBoxColumn.Width = 40; + // + // debugDataGridViewCheckBoxColumn + // + this.debugDataGridViewCheckBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; + this.debugDataGridViewCheckBoxColumn.DataPropertyName = "Debug"; + this.debugDataGridViewCheckBoxColumn.FalseValue = "false"; + this.debugDataGridViewCheckBoxColumn.HeaderText = "Debug"; + this.debugDataGridViewCheckBoxColumn.MinimumWidth = 40; + this.debugDataGridViewCheckBoxColumn.Name = "debugDataGridViewCheckBoxColumn"; + this.debugDataGridViewCheckBoxColumn.TrueValue = "true"; + this.debugDataGridViewCheckBoxColumn.Width = 45; + // // mainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -567,15 +583,16 @@ private void InitializeComponent() private System.Windows.Forms.SplitContainer directoryFilesSplitContainer; private System.Windows.Forms.ListBox foldersListBox; private System.Windows.Forms.DataGridView filesDataGridView; - private System.Windows.Forms.DataGridViewCheckBoxColumn enabledDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn fullPathDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn outputPathDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewCheckBoxColumn minifyDataGridViewCheckBoxColumn; private System.Windows.Forms.Button compileSelectedButton; private System.Windows.Forms.Button addDirectoryButton; private System.Windows.Forms.Button refreshDirectoryButton; private System.Windows.Forms.Button removeDirectoryButton; private System.Windows.Forms.ToolStripMenuItem compileToolStripMenuItem; + private System.Windows.Forms.DataGridViewCheckBoxColumn enabledDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn fullPathDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn outputPathDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewCheckBoxColumn minifyDataGridViewCheckBoxColumn; + private System.Windows.Forms.DataGridViewCheckBoxColumn debugDataGridViewCheckBoxColumn; } } diff --git a/WinLess/Forms/mainForm.cs b/WinLess/Forms/mainForm.cs index c1437ef..180d580 100644 --- a/WinLess/Forms/mainForm.cs +++ b/WinLess/Forms/mainForm.cs @@ -92,6 +92,7 @@ public void LoadDirectories(CommandArguments args) foreach (Models.File file in directory.Files) { file.Minify = args.Minify; + file.Debug = args.Debug; if (args.InitialCompile) { file.Compile(); @@ -523,11 +524,60 @@ private void CompileSelectedFiles() { if (file.Enabled) { - LessCompiler.Compile(file.FullPath, file.OutputPath, file.Minify); + LessCompiler.Compile(file.FullPath, file.OutputPath, file.Minify, file.Debug); } } } #endregion + + private void filesDataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + DataGridView dgv = (DataGridView)sender; + bool minifyed, debug; + //DataGridViewCheckBoxCell currentCell; + + minifyed = (bool)dgv.CurrentRow.Cells[3].EditedFormattedValue; + debug = (bool)dgv.CurrentRow.Cells[4].EditedFormattedValue; + + if (dgv.CurrentCell.ColumnIndex == 3 || dgv.CurrentCell.ColumnIndex == 4) + { + if (minifyed && debug) + { + MessageBox.Show("You can´t minify and add debug.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Warning); + dgv.CurrentRow.Cells[4].Value = false; + dgv.CurrentRow.Cells[3].Value = false; + return; + } + + /*currentCell = (DataGridViewCheckBoxCell)dgv.CurrentCell; + switch (currentCell.ColumnIndex) + { + case 3: + //Minfy + if ((bool)dgv.CurrentCell.EditedFormattedValue == true) + { + if (minifyed) + { + MessageBox.Show("You can´t minify when debug is checked.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Warning); + dgv.CurrentRow.Cells[4].Value = false; + dgv.CurrentRow.Cells[3].Value = false; + return; + } + } + else + { + + } + break; + case 4: + dgv.CurrentRow.Cells[4].Value = false; + dgv.CurrentRow.Cells[3].Value = false; + //debug + break; + } */ + } + + } } } diff --git a/WinLess/Forms/mainForm.resx b/WinLess/Forms/mainForm.resx index f9708a5..c19fff6 100644 --- a/WinLess/Forms/mainForm.resx +++ b/WinLess/Forms/mainForm.resx @@ -129,6 +129,9 @@ 835, 17 + + True + True diff --git a/WinLess/Forms/settingsForm.Designer.cs b/WinLess/Forms/settingsForm.Designer.cs index 54704e9..2f5dd39 100644 --- a/WinLess/Forms/settingsForm.Designer.cs +++ b/WinLess/Forms/settingsForm.Designer.cs @@ -32,20 +32,21 @@ private void InitializeComponent() this.cancelButton = new System.Windows.Forms.Button(); this.okButton = new System.Windows.Forms.Button(); this.generalGroupBox = new System.Windows.Forms.GroupBox(); + this.checkForLessUpdatesCheckbox = new System.Windows.Forms.CheckBox(); this.startMinimizedCheckBox = new System.Windows.Forms.CheckBox(); this.startWithWindowsCheckBox = new System.Windows.Forms.CheckBox(); this.compilingGroupBox = new System.Windows.Forms.GroupBox(); + this.AddDebuggInfoCheckBox = new System.Windows.Forms.CheckBox(); this.showSuccessMessagesCheckbox = new System.Windows.Forms.CheckBox(); this.compileOnSaveCheckBox = new System.Windows.Forms.CheckBox(); this.defaultMinifyCheckBox = new System.Windows.Forms.CheckBox(); - this.checkForLessUpdatesCheckbox = new System.Windows.Forms.CheckBox(); this.generalGroupBox.SuspendLayout(); this.compilingGroupBox.SuspendLayout(); this.SuspendLayout(); // // cancelButton // - this.cancelButton.Location = new System.Drawing.Point(197, 233); + this.cancelButton.Location = new System.Drawing.Point(197, 275); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 23); this.cancelButton.TabIndex = 0; @@ -55,7 +56,7 @@ private void InitializeComponent() // // okButton // - this.okButton.Location = new System.Drawing.Point(116, 233); + this.okButton.Location = new System.Drawing.Point(116, 275); this.okButton.Name = "okButton"; this.okButton.Size = new System.Drawing.Size(75, 23); this.okButton.TabIndex = 1; @@ -75,6 +76,16 @@ private void InitializeComponent() this.generalGroupBox.TabStop = false; this.generalGroupBox.Text = "General"; // + // checkForLessUpdatesCheckbox + // + this.checkForLessUpdatesCheckbox.AutoSize = true; + this.checkForLessUpdatesCheckbox.Location = new System.Drawing.Point(7, 67); + this.checkForLessUpdatesCheckbox.Name = "checkForLessUpdatesCheckbox"; + this.checkForLessUpdatesCheckbox.Size = new System.Drawing.Size(208, 17); + this.checkForLessUpdatesCheckbox.TabIndex = 2; + this.checkForLessUpdatesCheckbox.Text = "Automatically check for less.js updates"; + this.checkForLessUpdatesCheckbox.UseVisualStyleBackColor = true; + // // startMinimizedCheckBox // this.startMinimizedCheckBox.AutoSize = true; @@ -97,16 +108,28 @@ private void InitializeComponent() // // compilingGroupBox // + this.compilingGroupBox.Controls.Add(this.AddDebuggInfoCheckBox); this.compilingGroupBox.Controls.Add(this.showSuccessMessagesCheckbox); this.compilingGroupBox.Controls.Add(this.compileOnSaveCheckBox); this.compilingGroupBox.Controls.Add(this.defaultMinifyCheckBox); this.compilingGroupBox.Location = new System.Drawing.Point(13, 127); this.compilingGroupBox.Name = "compilingGroupBox"; - this.compilingGroupBox.Size = new System.Drawing.Size(259, 100); + this.compilingGroupBox.Size = new System.Drawing.Size(259, 122); this.compilingGroupBox.TabIndex = 3; this.compilingGroupBox.TabStop = false; this.compilingGroupBox.Text = "Compiling"; // + // AddDebuggInfoCheckBox + // + this.AddDebuggInfoCheckBox.AutoSize = true; + this.AddDebuggInfoCheckBox.Location = new System.Drawing.Point(6, 91); + this.AddDebuggInfoCheckBox.Name = "AddDebuggInfoCheckBox"; + this.AddDebuggInfoCheckBox.Size = new System.Drawing.Size(147, 17); + this.AddDebuggInfoCheckBox.TabIndex = 3; + this.AddDebuggInfoCheckBox.Text = "Add debug info as default"; + this.AddDebuggInfoCheckBox.UseVisualStyleBackColor = true; + this.AddDebuggInfoCheckBox.CheckedChanged += new System.EventHandler(this.AddDebuggInfoCheckBox_CheckedChanged); + // // showSuccessMessagesCheckbox // this.showSuccessMessagesCheckbox.AutoSize = true; @@ -136,22 +159,13 @@ private void InitializeComponent() this.defaultMinifyCheckBox.TabIndex = 0; this.defaultMinifyCheckBox.Text = "Minify by default"; this.defaultMinifyCheckBox.UseVisualStyleBackColor = true; - // - // checkForLessUpdatesCheckbox - // - this.checkForLessUpdatesCheckbox.AutoSize = true; - this.checkForLessUpdatesCheckbox.Location = new System.Drawing.Point(7, 67); - this.checkForLessUpdatesCheckbox.Name = "checkForLessUpdatesCheckbox"; - this.checkForLessUpdatesCheckbox.Size = new System.Drawing.Size(208, 17); - this.checkForLessUpdatesCheckbox.TabIndex = 2; - this.checkForLessUpdatesCheckbox.Text = "Automatically check for less.js updates"; - this.checkForLessUpdatesCheckbox.UseVisualStyleBackColor = true; + this.defaultMinifyCheckBox.CheckedChanged += new System.EventHandler(this.defaultMinifyCheckBox_CheckedChanged); // // settingsForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(289, 268); + this.ClientSize = new System.Drawing.Size(289, 325); this.Controls.Add(this.compilingGroupBox); this.Controls.Add(this.generalGroupBox); this.Controls.Add(this.okButton); @@ -179,5 +193,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox compileOnSaveCheckBox; private System.Windows.Forms.CheckBox showSuccessMessagesCheckbox; private System.Windows.Forms.CheckBox checkForLessUpdatesCheckbox; + private System.Windows.Forms.CheckBox AddDebuggInfoCheckBox; } } \ No newline at end of file diff --git a/WinLess/Forms/settingsForm.cs b/WinLess/Forms/settingsForm.cs index 64001af..cbc4f22 100644 --- a/WinLess/Forms/settingsForm.cs +++ b/WinLess/Forms/settingsForm.cs @@ -24,6 +24,7 @@ private void loadSettings() defaultMinifyCheckBox.Checked = Program.Settings.DefaultMinify; compileOnSaveCheckBox.Checked = Program.Settings.CompileOnSave; showSuccessMessagesCheckbox.Checked = Program.Settings.ShowSuccessMessages; + AddDebuggInfoCheckBox.Checked = Program.Settings.DefaultDebugInfo; } private void saveSettings() @@ -34,6 +35,7 @@ private void saveSettings() Program.Settings.DefaultMinify = defaultMinifyCheckBox.Checked; Program.Settings.CompileOnSave = compileOnSaveCheckBox.Checked; Program.Settings.ShowSuccessMessages = showSuccessMessagesCheckbox.Checked; + Program.Settings.DefaultDebugInfo = AddDebuggInfoCheckBox.Checked; Program.Settings.SaveSettings(); } @@ -47,5 +49,25 @@ private void okButton_Click(object sender, EventArgs e) saveSettings(); this.Close(); } + + private void AddDebuggInfoCheckBox_CheckedChanged(object sender, EventArgs e) + { + if (defaultMinifyCheckBox.Checked && AddDebuggInfoCheckBox.Checked) + { + MessageBox.Show("You can´t add debug info when minifying. Please uncheck '" + defaultMinifyCheckBox.Text + "'", "Information", MessageBoxButtons.OK, MessageBoxIcon.Warning); + AddDebuggInfoCheckBox.Checked = false; + return; + } + } + + private void defaultMinifyCheckBox_CheckedChanged(object sender, EventArgs e) + { + if (defaultMinifyCheckBox.Checked && AddDebuggInfoCheckBox.Checked) + { + MessageBox.Show("You can´t minifying and add debug info. Please uncheck '" + AddDebuggInfoCheckBox.Text + "'", "Information", MessageBoxButtons.OK, MessageBoxIcon.Warning); + AddDebuggInfoCheckBox.Checked = false; + return; + } + } } } diff --git a/WinLess/LessCompiler.cs b/WinLess/LessCompiler.cs index def6c33..b5f0699 100644 --- a/WinLess/LessCompiler.cs +++ b/WinLess/LessCompiler.cs @@ -6,16 +6,17 @@ using WinLess.Models; using WinLess.Helpers; using System.Text.RegularExpressions; +using System.Web; namespace WinLess { public static class LessCompiler { - public static void Compile(string lessFile, string cssFile, bool minify) + public static void Compile(string lessFile, string cssFile, bool minify, bool addDebugInfo) { try { - CompileCommandResult compileResult = ExecuteCompileCommand(lessFile, cssFile, minify); + CompileCommandResult compileResult = ExecuteCompileCommand(lessFile, cssFile, minify, addDebugInfo); mainForm.ActiveOrInActiveMainForm.AddCompileResult(compileResult); } catch (Exception e) @@ -76,17 +77,17 @@ private static CommandResult ExecuteLessCommand(string arguments) return ExecuteCommand(fileName, arguments); } - private static CompileCommandResult ExecuteCompileCommand(string lessFile, string cssFile, bool minify) - { - string arguments = CreateCompileArguments(lessFile, cssFile, minify); + private static CompileCommandResult ExecuteCompileCommand(string lessFile, string cssFile, bool minify, bool addDebugInfo) + { + string arguments = CreateCompileArguments(lessFile, cssFile, minify, addDebugInfo); CompileCommandResult result = new CompileCommandResult(ExecuteLessCommand(arguments)); result.FullPath = lessFile; - + return result; } - private static string CreateCompileArguments(string lessFile, string cssFile, bool minify) + private static string CreateCompileArguments(string lessFile, string cssFile, bool minify, bool addDebugInfo) { string arguments = string.Format("\"{0}\" \"{1}\" --no-color", lessFile, cssFile); if (minify) @@ -94,6 +95,11 @@ private static string CreateCompileArguments(string lessFile, string cssFile, bo arguments = string.Format("{0} --yui-compress", arguments); } + if (addDebugInfo) + { + arguments = string.Format("{0} --line-numbers=all", arguments); + } + return arguments; } @@ -140,5 +146,6 @@ private static CommandResult ExecuteCommand(string fileName, string arguments){ return result; } + } } diff --git a/WinLess/Models/CommandArguments.cs b/WinLess/Models/CommandArguments.cs index 39979f5..a5fc092 100644 --- a/WinLess/Models/CommandArguments.cs +++ b/WinLess/Models/CommandArguments.cs @@ -15,6 +15,7 @@ public CommandArguments(string[] args) Minify = false; InitialCompile = false; ClearDirectories = false; + Debug = false; if (HasArguments) { @@ -45,6 +46,11 @@ public CommandArguments(string[] args) "h|help", "Show this message and exit", v=> ShowHelp = v != null + }, + { + "debug", + "Add the 'debug' flag to add debug info", + v=> Debug = v != null } }; @@ -90,6 +96,7 @@ public CommandArguments(string[] args) public bool Minify { get; set; } public bool InitialCompile { get; set; } public bool ClearDirectories { get; set; } + public bool Debug { get; set; } #endregion diff --git a/WinLess/Models/File.cs b/WinLess/Models/File.cs index 9bc05d2..fadf3cf 100644 --- a/WinLess/Models/File.cs +++ b/WinLess/Models/File.cs @@ -22,6 +22,7 @@ public File(Models.Directory directory, string fullPath) this.FullPath = fullPath; this.ProjectDirectoryPath = directory.FullPath; this.Minify = Program.Settings.DefaultMinify; + this.Debug = Program.Settings.DefaultDebugInfo; this.Enabled = true; this.OutputPath = GetInitialOutputPath(); this.ParentFiles = new List(); @@ -88,6 +89,12 @@ public bool Enabled get; set; } + public bool Debug + { + get; + set; + } + [XmlIgnore] public List ParentFiles @@ -116,7 +123,7 @@ public void Compile(bool compileParentFiles = true) { if (this.Enabled) { - LessCompiler.Compile(this.FullPath, this.OutputPath, this.Minify); + LessCompiler.Compile(this.FullPath, this.OutputPath, this.Minify, this.Debug); } if (compileParentFiles) { diff --git a/WinLess/Properties/AssemblyInfo.cs b/WinLess/Properties/AssemblyInfo.cs index 49ad029..fa1d3c6 100644 --- a/WinLess/Properties/AssemblyInfo.cs +++ b/WinLess/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.0.0")] -[assembly: AssemblyFileVersion("1.8.0.0")] +[assembly: AssemblyVersion("1.8.1.0")] +[assembly: AssemblyFileVersion("1.8.1.0")] diff --git a/WinLess/Settings.cs b/WinLess/Settings.cs index 16b7f54..6882e27 100644 --- a/WinLess/Settings.cs +++ b/WinLess/Settings.cs @@ -28,6 +28,7 @@ public Settings() public bool ShowSuccessMessages { get; set; } public bool StartMinified { get; set; } public bool CheckForLessUpdates { get; set; } + public bool DefaultDebugInfo { get; set; } private bool startWithWindows; public bool StartWithWindows