diff --git a/Scheduler/Forms/MainForm.Designer.cs b/Scheduler/Forms/MainForm.Designer.cs index a3e121e..faecd36 100644 --- a/Scheduler/Forms/MainForm.Designer.cs +++ b/Scheduler/Forms/MainForm.Designer.cs @@ -55,6 +55,7 @@ namespace RecurringIntegrationsScheduler.Forms this.pauseJobMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resumeJobToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.deletJobMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.runJobNowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.openInputFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openSuccessfulUploadsFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -79,6 +80,7 @@ namespace RecurringIntegrationsScheduler.Forms this.resumeAllJobsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.refreshButton = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.runJobNowButton = new System.Windows.Forms.ToolStripButton(); this.mainMenuToolStrip.SuspendLayout(); this.statusStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.jobsDataGridView)).BeginInit(); @@ -97,7 +99,7 @@ namespace RecurringIntegrationsScheduler.Forms this.aboutButton}); this.mainMenuToolStrip.Location = new System.Drawing.Point(0, 0); this.mainMenuToolStrip.Name = "mainMenuToolStrip"; - this.mainMenuToolStrip.Size = new System.Drawing.Size(1384, 40); + this.mainMenuToolStrip.Size = new System.Drawing.Size(755, 25); this.mainMenuToolStrip.TabIndex = 0; // // connectToServerButton @@ -105,7 +107,7 @@ namespace RecurringIntegrationsScheduler.Forms this.connectToServerButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.connectToServerButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.connectToServerButton.Name = "connectToServerButton"; - this.connectToServerButton.Size = new System.Drawing.Size(188, 34); + this.connectToServerButton.Size = new System.Drawing.Size(109, 22); this.connectToServerButton.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Connect_to_service; this.connectToServerButton.Click += new System.EventHandler(this.ConnectToServerButton_Click); // @@ -114,7 +116,7 @@ namespace RecurringIntegrationsScheduler.Forms this.privateSchedulerButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.privateSchedulerButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.privateSchedulerButton.Name = "privateSchedulerButton"; - this.privateSchedulerButton.Size = new System.Drawing.Size(262, 34); + this.privateSchedulerButton.Size = new System.Drawing.Size(150, 22); this.privateSchedulerButton.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Start_standalone_scheduler; this.privateSchedulerButton.Click += new System.EventHandler(this.PrivateSchedulerButton_Click); // @@ -124,7 +126,7 @@ namespace RecurringIntegrationsScheduler.Forms this.saveScheduleButton.Enabled = false; this.saveScheduleButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.saveScheduleButton.Name = "saveScheduleButton"; - this.saveScheduleButton.Size = new System.Drawing.Size(182, 34); + this.saveScheduleButton.Size = new System.Drawing.Size(104, 22); this.saveScheduleButton.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Save_schedule_file; this.saveScheduleButton.Click += new System.EventHandler(this.SaveScheduleButton_Click); // @@ -133,7 +135,7 @@ namespace RecurringIntegrationsScheduler.Forms this.settingsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.settingsButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.settingsButton.Name = "settingsButton"; - this.settingsButton.Size = new System.Drawing.Size(120, 34); + this.settingsButton.Size = new System.Drawing.Size(70, 22); this.settingsButton.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Parameters; this.settingsButton.Click += new System.EventHandler(this.SettingsButton_Click); // @@ -143,7 +145,7 @@ namespace RecurringIntegrationsScheduler.Forms this.aboutButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.aboutButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.aboutButton.Name = "aboutButton"; - this.aboutButton.Size = new System.Drawing.Size(74, 34); + this.aboutButton.Size = new System.Drawing.Size(44, 22); this.aboutButton.Text = global::RecurringIntegrationsScheduler.Properties.Resources.A_bout; this.aboutButton.Click += new System.EventHandler(this.AboutButton_Click); // @@ -152,17 +154,16 @@ namespace RecurringIntegrationsScheduler.Forms this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripConnectionStatus}); - this.statusStrip.Location = new System.Drawing.Point(0, 566); + this.statusStrip.Location = new System.Drawing.Point(0, 306); this.statusStrip.Name = "statusStrip"; - this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 26, 0); - this.statusStrip.Size = new System.Drawing.Size(1384, 39); + this.statusStrip.Size = new System.Drawing.Size(755, 22); this.statusStrip.TabIndex = 1; this.statusStrip.Text = "statusStrip1"; // // toolStripConnectionStatus // this.toolStripConnectionStatus.Name = "toolStripConnectionStatus"; - this.toolStripConnectionStatus.Size = new System.Drawing.Size(151, 30); + this.toolStripConnectionStatus.Size = new System.Drawing.Size(86, 17); this.toolStripConnectionStatus.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Not_connected; // // jobsDataGridView @@ -188,15 +189,14 @@ namespace RecurringIntegrationsScheduler.Forms this.jobsDataGridView.ContextMenuStrip = this.contextMenuStrip1; this.jobsDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.jobsDataGridView.GridColor = System.Drawing.SystemColors.Window; - this.jobsDataGridView.Location = new System.Drawing.Point(0, 40); - this.jobsDataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.jobsDataGridView.Location = new System.Drawing.Point(0, 25); this.jobsDataGridView.MultiSelect = false; this.jobsDataGridView.Name = "jobsDataGridView"; this.jobsDataGridView.ReadOnly = true; this.jobsDataGridView.RowHeadersVisible = false; this.jobsDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders; this.jobsDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.jobsDataGridView.Size = new System.Drawing.Size(1384, 486); + this.jobsDataGridView.Size = new System.Drawing.Size(755, 256); this.jobsDataGridView.TabIndex = 3; this.jobsDataGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.JobsDataGridView_CellContentDoubleClick); this.jobsDataGridView.CellContextMenuStripNeeded += new System.Windows.Forms.DataGridViewCellContextMenuStripNeededEventHandler(this.JobsDataGridView_CellContextMenuStripNeeded); @@ -276,6 +276,7 @@ namespace RecurringIntegrationsScheduler.Forms this.editJobMenuItem, this.pauseJobMenuItem, this.resumeJobToolStripMenuItem1, + this.runJobNowToolStripMenuItem, this.deletJobMenuItem, this.toolStripSeparator1, this.openInputFolderToolStripMenuItem, @@ -285,80 +286,87 @@ namespace RecurringIntegrationsScheduler.Forms this.openFailedProcessingFolderToolStripMenuItem, this.openSuccessfulDownloadsFolderToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(404, 370); + this.contextMenuStrip1.Size = new System.Drawing.Size(256, 252); // // editJobMenuItem // this.editJobMenuItem.Name = "editJobMenuItem"; - this.editJobMenuItem.Size = new System.Drawing.Size(403, 36); + this.editJobMenuItem.Size = new System.Drawing.Size(255, 22); this.editJobMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Edit_job; this.editJobMenuItem.Click += new System.EventHandler(this.EditJobButton_Click); // // pauseJobMenuItem // this.pauseJobMenuItem.Name = "pauseJobMenuItem"; - this.pauseJobMenuItem.Size = new System.Drawing.Size(403, 36); + this.pauseJobMenuItem.Size = new System.Drawing.Size(255, 22); this.pauseJobMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Pause_job; this.pauseJobMenuItem.Click += new System.EventHandler(this.PauseJobButton_Click); // // resumeJobToolStripMenuItem1 // this.resumeJobToolStripMenuItem1.Name = "resumeJobToolStripMenuItem1"; - this.resumeJobToolStripMenuItem1.Size = new System.Drawing.Size(403, 36); + this.resumeJobToolStripMenuItem1.Size = new System.Drawing.Size(255, 22); this.resumeJobToolStripMenuItem1.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Resume_job; this.resumeJobToolStripMenuItem1.Click += new System.EventHandler(this.ResumeJobButton_Click); // // deletJobMenuItem // this.deletJobMenuItem.Name = "deletJobMenuItem"; - this.deletJobMenuItem.Size = new System.Drawing.Size(403, 36); + this.deletJobMenuItem.Size = new System.Drawing.Size(255, 22); this.deletJobMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Delete_job; this.deletJobMenuItem.Click += new System.EventHandler(this.DeleteJobButton_Click); // + // runJobNowToolStripMenuItem + // + this.runJobNowToolStripMenuItem.Name = "runJobNowToolStripMenuItem"; + this.runJobNowToolStripMenuItem.Size = new System.Drawing.Size(255, 22); + this.runJobNowToolStripMenuItem.Text = "Run job now!"; + this.runJobNowToolStripMenuItem.Click += new System.EventHandler(this.RunJobNowToolStripMenuItem_Click); + // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(400, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(252, 6); // // openInputFolderToolStripMenuItem // this.openInputFolderToolStripMenuItem.Name = "openInputFolderToolStripMenuItem"; - this.openInputFolderToolStripMenuItem.Size = new System.Drawing.Size(403, 36); + this.openInputFolderToolStripMenuItem.Size = new System.Drawing.Size(255, 22); this.openInputFolderToolStripMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Open_input_folder; this.openInputFolderToolStripMenuItem.Click += new System.EventHandler(this.OpenInputFolderToolStripMenuItem_Click); // // openSuccessfulUploadsFolderToolStripMenuItem // this.openSuccessfulUploadsFolderToolStripMenuItem.Name = "openSuccessfulUploadsFolderToolStripMenuItem"; - this.openSuccessfulUploadsFolderToolStripMenuItem.Size = new System.Drawing.Size(403, 36); + this.openSuccessfulUploadsFolderToolStripMenuItem.Size = new System.Drawing.Size(255, 22); this.openSuccessfulUploadsFolderToolStripMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Open_successful_uploads_folder; this.openSuccessfulUploadsFolderToolStripMenuItem.Click += new System.EventHandler(this.OpenSuccessfulUploadsFolderToolStripMenuItem_Click); // // openFailedUploadsFolderToolStripMenuItem // this.openFailedUploadsFolderToolStripMenuItem.Name = "openFailedUploadsFolderToolStripMenuItem"; - this.openFailedUploadsFolderToolStripMenuItem.Size = new System.Drawing.Size(403, 36); + this.openFailedUploadsFolderToolStripMenuItem.Size = new System.Drawing.Size(255, 22); this.openFailedUploadsFolderToolStripMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Open_failed_uploads_folder; this.openFailedUploadsFolderToolStripMenuItem.Click += new System.EventHandler(this.OpenFailedUploadsFolderToolStripMenuItem_Click); // // openSuccessfulProcessingFolderToolStripMenuItem // this.openSuccessfulProcessingFolderToolStripMenuItem.Name = "openSuccessfulProcessingFolderToolStripMenuItem"; - this.openSuccessfulProcessingFolderToolStripMenuItem.Size = new System.Drawing.Size(403, 36); + this.openSuccessfulProcessingFolderToolStripMenuItem.Size = new System.Drawing.Size(255, 22); this.openSuccessfulProcessingFolderToolStripMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Open_successful_processing_folder; this.openSuccessfulProcessingFolderToolStripMenuItem.Click += new System.EventHandler(this.OpenSuccessfulProcessingFolderToolStripMenuItem_Click); // // openFailedProcessingFolderToolStripMenuItem // this.openFailedProcessingFolderToolStripMenuItem.Name = "openFailedProcessingFolderToolStripMenuItem"; - this.openFailedProcessingFolderToolStripMenuItem.Size = new System.Drawing.Size(403, 36); + this.openFailedProcessingFolderToolStripMenuItem.Size = new System.Drawing.Size(255, 22); this.openFailedProcessingFolderToolStripMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Open_failed_processing_folder; this.openFailedProcessingFolderToolStripMenuItem.Click += new System.EventHandler(this.OpenFailedProcessingFolderToolStripMenuItem_Click); // // openSuccessfulDownloadsFolderToolStripMenuItem // this.openSuccessfulDownloadsFolderToolStripMenuItem.Name = "openSuccessfulDownloadsFolderToolStripMenuItem"; - this.openSuccessfulDownloadsFolderToolStripMenuItem.Size = new System.Drawing.Size(403, 36); + this.openSuccessfulDownloadsFolderToolStripMenuItem.Size = new System.Drawing.Size(255, 22); this.openSuccessfulDownloadsFolderToolStripMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Open_successful_downloads_folder; this.openSuccessfulDownloadsFolderToolStripMenuItem.Click += new System.EventHandler(this.OpenSuccessfulDownloadsFolderToolStripMenuItem_Click); // @@ -373,28 +381,27 @@ namespace RecurringIntegrationsScheduler.Forms this.deleteJobButton, this.editJobButton, this.pauseResumeDropDownButton, + this.runJobNowButton, this.refreshButton}); - this.jobsToolStrip.Location = new System.Drawing.Point(0, 526); + this.jobsToolStrip.Location = new System.Drawing.Point(0, 281); this.jobsToolStrip.Name = "jobsToolStrip"; this.jobsToolStrip.Padding = new System.Windows.Forms.Padding(0); - this.jobsToolStrip.Size = new System.Drawing.Size(1384, 40); + this.jobsToolStrip.Size = new System.Drawing.Size(755, 25); this.jobsToolStrip.TabIndex = 4; // // instanceFilter // this.instanceFilter.Enabled = false; - this.instanceFilter.Font = new System.Drawing.Font("Segoe UI", 9F); this.instanceFilter.Name = "instanceFilter"; - this.instanceFilter.Size = new System.Drawing.Size(136, 40); + this.instanceFilter.Size = new System.Drawing.Size(76, 25); this.instanceFilter.ToolTipText = global::RecurringIntegrationsScheduler.Properties.Resources.Filter_instances; this.instanceFilter.TextChanged += new System.EventHandler(this.InstanceFilter_TextChanged); // // jobNameFilter // this.jobNameFilter.Enabled = false; - this.jobNameFilter.Font = new System.Drawing.Font("Segoe UI", 9F); this.jobNameFilter.Name = "jobNameFilter"; - this.jobNameFilter.Size = new System.Drawing.Size(136, 40); + this.jobNameFilter.Size = new System.Drawing.Size(76, 25); this.jobNameFilter.ToolTipText = global::RecurringIntegrationsScheduler.Properties.Resources.Filter_job_names; this.jobNameFilter.TextChanged += new System.EventHandler(this.JobNameFilter_TextChanged); // @@ -408,14 +415,14 @@ namespace RecurringIntegrationsScheduler.Forms this.addDownloadJobMenuItem}); this.addJobsDropDownButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.addJobsDropDownButton.Name = "addJobsDropDownButton"; - this.addJobsDropDownButton.Size = new System.Drawing.Size(107, 34); + this.addJobsDropDownButton.Size = new System.Drawing.Size(62, 22); this.addJobsDropDownButton.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Add_job; // // addImportJobMenuItem // this.addImportJobMenuItem.Enabled = false; this.addImportJobMenuItem.Name = "addImportJobMenuItem"; - this.addImportJobMenuItem.Size = new System.Drawing.Size(561, 40); + this.addImportJobMenuItem.Size = new System.Drawing.Size(321, 22); this.addImportJobMenuItem.Text = "Add import job (Package API)"; this.addImportJobMenuItem.Click += new System.EventHandler(this.AddImportJobMenuItem_Click); // @@ -423,7 +430,7 @@ namespace RecurringIntegrationsScheduler.Forms // this.addExportJobMenuItem.Enabled = false; this.addExportJobMenuItem.Name = "addExportJobMenuItem"; - this.addExportJobMenuItem.Size = new System.Drawing.Size(561, 40); + this.addExportJobMenuItem.Size = new System.Drawing.Size(321, 22); this.addExportJobMenuItem.Text = "Add export job (Package API)"; this.addExportJobMenuItem.Click += new System.EventHandler(this.AddExportJobMenuItem_Click); // @@ -431,7 +438,7 @@ namespace RecurringIntegrationsScheduler.Forms // this.addUploadJobMenuItem.Enabled = false; this.addUploadJobMenuItem.Name = "addUploadJobMenuItem"; - this.addUploadJobMenuItem.Size = new System.Drawing.Size(561, 40); + this.addUploadJobMenuItem.Size = new System.Drawing.Size(321, 22); this.addUploadJobMenuItem.Text = "Add upload job (Recurring integrations API)"; this.addUploadJobMenuItem.Click += new System.EventHandler(this.AddUploadJobMenuItem_Click); // @@ -439,7 +446,7 @@ namespace RecurringIntegrationsScheduler.Forms // this.addDownloadJobMenuItem.Enabled = false; this.addDownloadJobMenuItem.Name = "addDownloadJobMenuItem"; - this.addDownloadJobMenuItem.Size = new System.Drawing.Size(561, 40); + this.addDownloadJobMenuItem.Size = new System.Drawing.Size(321, 22); this.addDownloadJobMenuItem.Text = "Add download job (Recurring integrations API)"; this.addDownloadJobMenuItem.Click += new System.EventHandler(this.AddDownloadJobMenuItem_Click); // @@ -449,7 +456,7 @@ namespace RecurringIntegrationsScheduler.Forms this.deleteJobButton.Enabled = false; this.deleteJobButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.deleteJobButton.Name = "deleteJobButton"; - this.deleteJobButton.Size = new System.Drawing.Size(112, 34); + this.deleteJobButton.Size = new System.Drawing.Size(64, 22); this.deleteJobButton.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Delete_job; this.deleteJobButton.ToolTipText = global::RecurringIntegrationsScheduler.Properties.Resources.Delete_job; this.deleteJobButton.Click += new System.EventHandler(this.DeleteJobButton_Click); @@ -460,7 +467,7 @@ namespace RecurringIntegrationsScheduler.Forms this.editJobButton.Enabled = false; this.editJobButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.editJobButton.Name = "editJobButton"; - this.editJobButton.Size = new System.Drawing.Size(87, 34); + this.editJobButton.Size = new System.Drawing.Size(51, 22); this.editJobButton.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Edit_job; this.editJobButton.Click += new System.EventHandler(this.EditJobButton_Click); // @@ -475,34 +482,34 @@ namespace RecurringIntegrationsScheduler.Forms this.pauseResumeDropDownButton.Enabled = false; this.pauseResumeDropDownButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.pauseResumeDropDownButton.Name = "pauseResumeDropDownButton"; - this.pauseResumeDropDownButton.Size = new System.Drawing.Size(169, 34); + this.pauseResumeDropDownButton.Size = new System.Drawing.Size(98, 22); this.pauseResumeDropDownButton.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Pause_Resume; // // pauseJobToolStripMenuItem // this.pauseJobToolStripMenuItem.Name = "pauseJobToolStripMenuItem"; - this.pauseJobToolStripMenuItem.Size = new System.Drawing.Size(275, 40); + this.pauseJobToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.pauseJobToolStripMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Pause_job; this.pauseJobToolStripMenuItem.Click += new System.EventHandler(this.PauseJobToolStripMenuItem_Click); // // pauseAllJobsToolStripMenuItem // this.pauseAllJobsToolStripMenuItem.Name = "pauseAllJobsToolStripMenuItem"; - this.pauseAllJobsToolStripMenuItem.Size = new System.Drawing.Size(275, 40); + this.pauseAllJobsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.pauseAllJobsToolStripMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Pause_all_jobs; this.pauseAllJobsToolStripMenuItem.Click += new System.EventHandler(this.PauseAllJobsToolStripMenuItem_Click); // // resumeJobToolStripMenuItem // this.resumeJobToolStripMenuItem.Name = "resumeJobToolStripMenuItem"; - this.resumeJobToolStripMenuItem.Size = new System.Drawing.Size(275, 40); + this.resumeJobToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.resumeJobToolStripMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Resume_job; this.resumeJobToolStripMenuItem.Click += new System.EventHandler(this.ResumeJobToolStripMenuItem_Click); // // resumeAllJobsToolStripMenuItem // this.resumeAllJobsToolStripMenuItem.Name = "resumeAllJobsToolStripMenuItem"; - this.resumeAllJobsToolStripMenuItem.Size = new System.Drawing.Size(275, 40); + this.resumeAllJobsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.resumeAllJobsToolStripMenuItem.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Resume_all_jobs; this.resumeAllJobsToolStripMenuItem.Click += new System.EventHandler(this.ResumeAllJobsToolStripMenuItem_Click); // @@ -512,7 +519,7 @@ namespace RecurringIntegrationsScheduler.Forms this.refreshButton.Enabled = false; this.refreshButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.refreshButton.Name = "refreshButton"; - this.refreshButton.Size = new System.Drawing.Size(167, 34); + this.refreshButton.Size = new System.Drawing.Size(97, 22); this.refreshButton.Text = global::RecurringIntegrationsScheduler.Properties.Resources.Refresh_grid; this.refreshButton.Click += new System.EventHandler(this.RefreshButton_Click); // @@ -523,18 +530,29 @@ namespace RecurringIntegrationsScheduler.Forms this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(24, 24); // + // runJobNowButton + // + this.runJobNowButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.runJobNowButton.Enabled = false; + this.runJobNowButton.Image = ((System.Drawing.Image)(resources.GetObject("runJobNowButton.Image"))); + this.runJobNowButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.runJobNowButton.Name = "runJobNowButton"; + this.runJobNowButton.Size = new System.Drawing.Size(81, 22); + this.runJobNowButton.Text = "Run job now!"; + this.runJobNowButton.ToolTipText = "Run job now!"; + this.runJobNowButton.Click += new System.EventHandler(this.RunJobNowToolStripMenuItem_Click); + // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1384, 605); + this.ClientSize = new System.Drawing.Size(755, 328); this.Controls.Add(this.jobsDataGridView); this.Controls.Add(this.jobsToolStrip); this.Controls.Add(this.statusStrip); this.Controls.Add(this.mainMenuToolStrip); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.MinimumSize = new System.Drawing.Size(1229, 420); + this.MinimumSize = new System.Drawing.Size(678, 245); this.Name = "MainForm"; this.Text = "Recurring Integrations Scheduler"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Manager_FormClosing); @@ -599,5 +617,7 @@ namespace RecurringIntegrationsScheduler.Forms private System.Windows.Forms.ToolStripMenuItem addDownloadJobMenuItem; private System.Windows.Forms.ToolStripMenuItem addImportJobMenuItem; private System.Windows.Forms.ToolStripMenuItem addExportJobMenuItem; + private System.Windows.Forms.ToolStripMenuItem runJobNowToolStripMenuItem; + private System.Windows.Forms.ToolStripButton runJobNowButton; } } \ No newline at end of file diff --git a/Scheduler/Forms/MainForm.cs b/Scheduler/Forms/MainForm.cs index 9a3d2cd..c09e079 100644 --- a/Scheduler/Forms/MainForm.cs +++ b/Scheduler/Forms/MainForm.cs @@ -95,6 +95,7 @@ namespace RecurringIntegrationsScheduler.Forms deleteJobButton.Enabled = true; editJobButton.Enabled = true; pauseResumeDropDownButton.Enabled = true; + runJobNowButton.Enabled = true; instanceFilter.Enabled = true; jobNameFilter.Enabled = true; } @@ -634,6 +635,7 @@ namespace RecurringIntegrationsScheduler.Forms deleteJobButton.Enabled = false; editJobButton.Enabled = false; pauseResumeDropDownButton.Enabled = false; + runJobNowButton.Enabled = false; } } @@ -1008,5 +1010,28 @@ namespace RecurringIntegrationsScheduler.Forms } } } + + private void RunJobNowToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + var selectedRow = jobsDataGridView.Rows[jobsDataGridView.SelectedCells[0].RowIndex]; + var jobKey = new JobKey(Convert.ToString(selectedRow.Cells["JobName"].Value), + Convert.ToString(selectedRow.Cells["JobGroup"].Value)); + + var scheduler = Scheduler.Instance.GetScheduler(); + if (scheduler == null) + { + MessageBox.Show(Resources.No_active_scheduler, Resources.Missing_scheduler); + return; + } + scheduler.TriggerJob(jobKey); + RefreshGrid(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, Resources.Unexpected_error); + } + } } } \ No newline at end of file diff --git a/Scheduler/Forms/MainForm.resx b/Scheduler/Forms/MainForm.resx index 28dcc23..f3ef6be 100644 --- a/Scheduler/Forms/MainForm.resx +++ b/Scheduler/Forms/MainForm.resx @@ -130,6 +130,21 @@ 687, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + AAABAA0AICAQAAEABADoAgAA1gAAABAQEAABAAQAKAEAAL4DAAAwMAAAAQAIAKgOAADmBAAAICAAAAEA