From e6ecc9c2f1859c91f05757f3f67cb4719c249c7a Mon Sep 17 00:00:00 2001 From: sam80180 Date: Sun, 2 Jun 2019 16:31:54 +0800 Subject: [PATCH] =?UTF-8?q?se=20puede=20cambiar=20la=20precisi=C3=B3n.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CymaticLabs.InfluxDB.Studio/App.config | 13 +- .../AppForm.Designer.cs | 230 ++++++++++++------ src/CymaticLabs.InfluxDB.Studio/AppForm.cs | 97 ++++++-- src/CymaticLabs.InfluxDB.Studio/AppForm.resx | 177 +++++++------- .../AppSettings.cs | 37 ++- .../Controls/QueryControl.cs | 2 +- .../CymaticLabs.InfluxDB.Studio.csproj | 36 +-- .../Data/InfluxDataNetClient.cs | 11 +- .../Data/SslIgnoreValidator.cs | 14 +- .../Dialogs/AboutDialog.Designer.cs | 100 ++++++-- .../Dialogs/AboutDialog.cs | 10 + src/CymaticLabs.InfluxDB.Studio/Program.cs | 3 - .../Properties/Resources.Designer.cs | 40 +++ .../Properties/Resources.resx | 212 ++++++++-------- .../Properties/Settings.Designer.cs | 18 +- .../Properties/Settings.settings | 9 +- .../Resources/ImagesFinal/DbExport.png | Bin 0 -> 1040 bytes .../Resources/ImagesFinal/DbImport.png | Bin 0 -> 1043 bytes .../Resources/ImagesFinal/Settings.png | Bin 0 -> 1083 bytes .../Resources/ImagesFinal/wizard.gif | Bin 0 -> 211 bytes .../packages.config | 12 +- 21 files changed, 664 insertions(+), 357 deletions(-) create mode 100644 src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/DbExport.png create mode 100644 src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/DbImport.png create mode 100644 src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/Settings.png create mode 100644 src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/wizard.gif diff --git a/src/CymaticLabs.InfluxDB.Studio/App.config b/src/CymaticLabs.InfluxDB.Studio/App.config index 9e39d94..cc9ab6b 100644 --- a/src/CymaticLabs.InfluxDB.Studio/App.config +++ b/src/CymaticLabs.InfluxDB.Studio/App.config @@ -13,11 +13,11 @@ - + - + @@ -27,13 +27,16 @@ - False + True - hh:mm:ss tt + HH:mm:ss - M/dd/yyyy + yyyy/M/d + + + rfc3339 diff --git a/src/CymaticLabs.InfluxDB.Studio/AppForm.Designer.cs b/src/CymaticLabs.InfluxDB.Studio/AppForm.Designer.cs index 970540b..6f2089e 100644 --- a/src/CymaticLabs.InfluxDB.Studio/AppForm.Designer.cs +++ b/src/CymaticLabs.InfluxDB.Studio/AppForm.Designer.cs @@ -49,6 +49,14 @@ private void InitializeComponent() this.newQueryToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.runQueryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showQueriesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.precisionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rfc3339ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hourToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.minuteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.secondToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.millisecondToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.microsecondToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.nanosecondToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.timeFormatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.timeFormatComboBox = new System.Windows.Forms.ToolStripComboBox(); @@ -131,6 +139,7 @@ private void InitializeComponent() // // menuStrip // + this.menuStrip.ImageScalingSize = new System.Drawing.Size(18, 18); this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.connectionsToolStripMenuItem, @@ -139,7 +148,8 @@ private void InitializeComponent() this.helpToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(784, 24); + this.menuStrip.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); + this.menuStrip.Size = new System.Drawing.Size(915, 27); this.menuStrip.TabIndex = 0; this.menuStrip.Text = "menuStrip"; // @@ -150,21 +160,23 @@ private void InitializeComponent() this.exportToolStripMenuItem, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(45, 23); this.fileToolStripMenuItem.Text = "File"; // // importToolStripMenuItem // this.importToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.importAppSettingsMenuItem}); + this.importToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.DbImport; this.importToolStripMenuItem.Name = "importToolStripMenuItem"; - this.importToolStripMenuItem.Size = new System.Drawing.Size(110, 22); + this.importToolStripMenuItem.Size = new System.Drawing.Size(129, 24); this.importToolStripMenuItem.Text = "Import"; // // importAppSettingsMenuItem // + this.importAppSettingsMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Settings; this.importAppSettingsMenuItem.Name = "importAppSettingsMenuItem"; - this.importAppSettingsMenuItem.Size = new System.Drawing.Size(116, 22); + this.importAppSettingsMenuItem.Size = new System.Drawing.Size(139, 24); this.importAppSettingsMenuItem.Text = "Settings"; this.importAppSettingsMenuItem.Click += new System.EventHandler(this.importAppSettingsMenuItem_Click); // @@ -172,21 +184,23 @@ private void InitializeComponent() // this.exportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.exportAppSettingsMenuItem}); + this.exportToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.DbExport; this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; - this.exportToolStripMenuItem.Size = new System.Drawing.Size(110, 22); + this.exportToolStripMenuItem.Size = new System.Drawing.Size(129, 24); this.exportToolStripMenuItem.Text = "Export"; // // exportAppSettingsMenuItem // + this.exportAppSettingsMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Settings; this.exportAppSettingsMenuItem.Name = "exportAppSettingsMenuItem"; - this.exportAppSettingsMenuItem.Size = new System.Drawing.Size(116, 22); + this.exportAppSettingsMenuItem.Size = new System.Drawing.Size(139, 24); this.exportAppSettingsMenuItem.Text = "Settings"; this.exportAppSettingsMenuItem.Click += new System.EventHandler(this.exportAppSettingsMenuItem_Click); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(110, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(129, 24); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -196,7 +210,7 @@ private void InitializeComponent() this.refreshToolStripMenuItem, this.manageToolStripMenuItem}); this.connectionsToolStripMenuItem.Name = "connectionsToolStripMenuItem"; - this.connectionsToolStripMenuItem.Size = new System.Drawing.Size(86, 20); + this.connectionsToolStripMenuItem.Size = new System.Drawing.Size(107, 23); this.connectionsToolStripMenuItem.Text = "Connections"; // // refreshToolStripMenuItem @@ -204,14 +218,14 @@ private void InitializeComponent() this.refreshToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Refresh; this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem"; this.refreshToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.refreshToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.refreshToolStripMenuItem.Size = new System.Drawing.Size(161, 24); this.refreshToolStripMenuItem.Text = "Refresh"; // // manageToolStripMenuItem // this.manageToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("manageToolStripMenuItem.Image"))); this.manageToolStripMenuItem.Name = "manageToolStripMenuItem"; - this.manageToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.manageToolStripMenuItem.Size = new System.Drawing.Size(161, 24); this.manageToolStripMenuItem.Text = "Manage"; this.manageToolStripMenuItem.Click += new System.EventHandler(this.manageToolStripMenuItem_Click); // @@ -220,16 +234,17 @@ private void InitializeComponent() this.queryToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newQueryToolStripMenuItem2, this.runQueryToolStripMenuItem, - this.showQueriesToolStripMenuItem}); + this.showQueriesToolStripMenuItem, + this.precisionToolStripMenuItem}); this.queryToolStripMenuItem.Name = "queryToolStripMenuItem"; - this.queryToolStripMenuItem.Size = new System.Drawing.Size(51, 20); + this.queryToolStripMenuItem.Size = new System.Drawing.Size(64, 23); this.queryToolStripMenuItem.Text = "Query"; // // newQueryToolStripMenuItem2 // this.newQueryToolStripMenuItem2.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.NewQuery; this.newQueryToolStripMenuItem2.Name = "newQueryToolStripMenuItem2"; - this.newQueryToolStripMenuItem2.Size = new System.Drawing.Size(146, 22); + this.newQueryToolStripMenuItem2.Size = new System.Drawing.Size(179, 24); this.newQueryToolStripMenuItem2.Text = "New Query"; this.newQueryToolStripMenuItem2.Click += new System.EventHandler(this.newQueryToolStripMenuItem2_Click); // @@ -238,7 +253,7 @@ private void InitializeComponent() this.runQueryToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("runQueryToolStripMenuItem.Image"))); this.runQueryToolStripMenuItem.Name = "runQueryToolStripMenuItem"; this.runQueryToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.runQueryToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.runQueryToolStripMenuItem.Size = new System.Drawing.Size(179, 24); this.runQueryToolStripMenuItem.Text = "Run"; this.runQueryToolStripMenuItem.Click += new System.EventHandler(this.runQueryToolStripMenuItem_Click); // @@ -246,10 +261,76 @@ private void InitializeComponent() // this.showQueriesToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.ShowQueries; this.showQueriesToolStripMenuItem.Name = "showQueriesToolStripMenuItem"; - this.showQueriesToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.showQueriesToolStripMenuItem.Size = new System.Drawing.Size(179, 24); this.showQueriesToolStripMenuItem.Text = "Show Queries"; this.showQueriesToolStripMenuItem.Click += new System.EventHandler(this.showQueriesToolStripMenuItem_Click); // + // precisionToolStripMenuItem + // + this.precisionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.rfc3339ToolStripMenuItem, + this.hourToolStripMenuItem, + this.minuteToolStripMenuItem, + this.secondToolStripMenuItem, + this.millisecondToolStripMenuItem, + this.microsecondToolStripMenuItem, + this.nanosecondToolStripMenuItem}); + this.precisionToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.wizard; + this.precisionToolStripMenuItem.Name = "precisionToolStripMenuItem"; + this.precisionToolStripMenuItem.Size = new System.Drawing.Size(179, 24); + this.precisionToolStripMenuItem.Text = "Epoch"; + // + // rfc3339ToolStripMenuItem + // + this.rfc3339ToolStripMenuItem.Checked = true; + this.rfc3339ToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.rfc3339ToolStripMenuItem.Name = "rfc3339ToolStripMenuItem"; + this.rfc3339ToolStripMenuItem.Size = new System.Drawing.Size(224, 24); + this.rfc3339ToolStripMenuItem.Text = "RFC3339"; + this.rfc3339ToolStripMenuItem.Click += new System.EventHandler(this.rfc3339ToolStripMenuItem_Click); + // + // hourToolStripMenuItem + // + this.hourToolStripMenuItem.Name = "hourToolStripMenuItem"; + this.hourToolStripMenuItem.Size = new System.Drawing.Size(224, 24); + this.hourToolStripMenuItem.Text = "Hour（h）"; + this.hourToolStripMenuItem.Click += new System.EventHandler(this.hourToolStripMenuItem_Click); + // + // minuteToolStripMenuItem + // + this.minuteToolStripMenuItem.Name = "minuteToolStripMenuItem"; + this.minuteToolStripMenuItem.Size = new System.Drawing.Size(224, 24); + this.minuteToolStripMenuItem.Text = "Minute（m）"; + this.minuteToolStripMenuItem.Click += new System.EventHandler(this.minuteToolStripMenuItem_Click); + // + // secondToolStripMenuItem + // + this.secondToolStripMenuItem.Name = "secondToolStripMenuItem"; + this.secondToolStripMenuItem.Size = new System.Drawing.Size(224, 24); + this.secondToolStripMenuItem.Text = "Second（s）"; + this.secondToolStripMenuItem.Click += new System.EventHandler(this.secondToolStripMenuItem_Click); + // + // millisecondToolStripMenuItem + // + this.millisecondToolStripMenuItem.Name = "millisecondToolStripMenuItem"; + this.millisecondToolStripMenuItem.Size = new System.Drawing.Size(224, 24); + this.millisecondToolStripMenuItem.Text = "Millisecond（ms）"; + this.millisecondToolStripMenuItem.Click += new System.EventHandler(this.millisecondToolStripMenuItem_Click); + // + // microsecondToolStripMenuItem + // + this.microsecondToolStripMenuItem.Name = "microsecondToolStripMenuItem"; + this.microsecondToolStripMenuItem.Size = new System.Drawing.Size(224, 24); + this.microsecondToolStripMenuItem.Text = "Microsecond（u|µ）"; + this.microsecondToolStripMenuItem.Click += new System.EventHandler(this.microsecondToolStripMenuItem_Click); + // + // nanosecondToolStripMenuItem + // + this.nanosecondToolStripMenuItem.Name = "nanosecondToolStripMenuItem"; + this.nanosecondToolStripMenuItem.Size = new System.Drawing.Size(224, 24); + this.nanosecondToolStripMenuItem.Text = "Nanosecond（ns）"; + this.nanosecondToolStripMenuItem.Click += new System.EventHandler(this.nanosecondToolStripMenuItem_Click); + // // settingsToolStripMenuItem // this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -257,7 +338,7 @@ private void InitializeComponent() this.dateFormatToolStripMenuItem, this.allowUntrustedSSLToolStripMenuItem}); this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(78, 23); this.settingsToolStripMenuItem.Text = "Settings"; // // timeFormatToolStripMenuItem @@ -266,18 +347,15 @@ private void InitializeComponent() this.timeFormatComboBox}); this.timeFormatToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Time; this.timeFormatToolStripMenuItem.Name = "timeFormatToolStripMenuItem"; - this.timeFormatToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.timeFormatToolStripMenuItem.Size = new System.Drawing.Size(225, 24); this.timeFormatToolStripMenuItem.Text = "Time Format"; // // timeFormatComboBox // this.timeFormatComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.timeFormatComboBox.FlatStyle = System.Windows.Forms.FlatStyle.Standard; - this.timeFormatComboBox.Items.AddRange(new object[] { - "2:30:45 PM 12 Hour", - " 14:30:45 24 Hour"}); this.timeFormatComboBox.Name = "timeFormatComboBox"; - this.timeFormatComboBox.Size = new System.Drawing.Size(136, 23); + this.timeFormatComboBox.Size = new System.Drawing.Size(150, 27); this.timeFormatComboBox.SelectedIndexChanged += new System.EventHandler(this.timeFormatComboBox_SelectedIndexChanged); // // dateFormatToolStripMenuItem @@ -286,25 +364,25 @@ private void InitializeComponent() this.dateFormatComboBox}); this.dateFormatToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Date; this.dateFormatToolStripMenuItem.Name = "dateFormatToolStripMenuItem"; - this.dateFormatToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.dateFormatToolStripMenuItem.Size = new System.Drawing.Size(225, 24); this.dateFormatToolStripMenuItem.Text = "Date Format"; // // dateFormatComboBox // this.dateFormatComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.dateFormatComboBox.DropDownWidth = 205; this.dateFormatComboBox.FlatStyle = System.Windows.Forms.FlatStyle.Standard; - this.dateFormatComboBox.Items.AddRange(new object[] { - "12/31/2016 mm/dd/yyyy", - "31/12/2016 dd/mm/yyyy "}); this.dateFormatComboBox.Name = "dateFormatComboBox"; - this.dateFormatComboBox.Size = new System.Drawing.Size(160, 23); + this.dateFormatComboBox.Size = new System.Drawing.Size(205, 27); this.dateFormatComboBox.SelectedIndexChanged += new System.EventHandler(this.dateFormatComboBox_SelectedIndexChanged); // // allowUntrustedSSLToolStripMenuItem // + this.allowUntrustedSSLToolStripMenuItem.Checked = true; this.allowUntrustedSSLToolStripMenuItem.CheckOnClick = true; + this.allowUntrustedSSLToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.allowUntrustedSSLToolStripMenuItem.Name = "allowUntrustedSSLToolStripMenuItem"; - this.allowUntrustedSSLToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.allowUntrustedSSLToolStripMenuItem.Size = new System.Drawing.Size(225, 24); this.allowUntrustedSSLToolStripMenuItem.Text = "Allow Untrusted SSL"; this.allowUntrustedSSLToolStripMenuItem.CheckedChanged += new System.EventHandler(this.allowUntrustedSSLToolStripMenuItem_CheckedChanged); // @@ -313,13 +391,13 @@ private void InitializeComponent() this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(53, 23); this.helpToolStripMenuItem.Text = "Help"; // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(107, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(124, 24); this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -334,6 +412,7 @@ private void InitializeComponent() // // toolStrip // + this.toolStrip.ImageScalingSize = new System.Drawing.Size(18, 18); this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.manageConnectionsButton, this.disconnectButton, @@ -358,9 +437,9 @@ private void InitializeComponent() this.showSeriesButton, this.dropSeriesButton, this.dropMeasurementButton}); - this.toolStrip.Location = new System.Drawing.Point(0, 24); + this.toolStrip.Location = new System.Drawing.Point(0, 27); this.toolStrip.Name = "toolStrip"; - this.toolStrip.Size = new System.Drawing.Size(784, 25); + this.toolStrip.Size = new System.Drawing.Size(915, 25); this.toolStrip.TabIndex = 2; this.toolStrip.Text = "toolStrip1"; // @@ -596,24 +675,26 @@ private void InitializeComponent() // // statusStrip // + this.statusStrip.ImageScalingSize = new System.Drawing.Size(18, 18); this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel}); - this.statusStrip.Location = new System.Drawing.Point(0, 540); + this.statusStrip.Location = new System.Drawing.Point(0, 581); this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(784, 22); + this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0); + this.statusStrip.Size = new System.Drawing.Size(915, 24); this.statusStrip.TabIndex = 3; this.statusStrip.Text = "statusStrip1"; // // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(16, 17); + this.statusLabel.Size = new System.Drawing.Size(18, 19); this.statusLabel.Text = "..."; // // splitContainer // this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer.Location = new System.Drawing.Point(0, 49); + this.splitContainer.Location = new System.Drawing.Point(0, 52); this.splitContainer.Name = "splitContainer"; // // splitContainer.Panel1 @@ -623,8 +704,9 @@ private void InitializeComponent() // splitContainer.Panel2 // this.splitContainer.Panel2.Controls.Add(this.tabControl); - this.splitContainer.Size = new System.Drawing.Size(784, 491); - this.splitContainer.SplitterDistance = 168; + this.splitContainer.Size = new System.Drawing.Size(915, 529); + this.splitContainer.SplitterDistance = 196; + this.splitContainer.SplitterWidth = 5; this.splitContainer.TabIndex = 4; // // connectionsTreeView @@ -651,7 +733,7 @@ private void InitializeComponent() this.connectionsTreeView.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { treeNode3}); this.connectionsTreeView.SelectedImageIndex = 0; - this.connectionsTreeView.Size = new System.Drawing.Size(168, 491); + this.connectionsTreeView.Size = new System.Drawing.Size(196, 529); this.connectionsTreeView.TabIndex = 1; this.connectionsTreeView.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.connectionsTreeView_AfterExpand); this.connectionsTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.connectionsTreeView_AfterSelect); @@ -666,7 +748,7 @@ private void InitializeComponent() this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; this.tabControl.ShowTabCloseArea = true; - this.tabControl.Size = new System.Drawing.Size(612, 491); + this.tabControl.Size = new System.Drawing.Size(714, 529); this.tabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl.TabCloseSpace = 8; this.tabControl.TabCloseWidth = 16; @@ -680,6 +762,7 @@ private void InitializeComponent() // // connectionsContextMenu // + this.connectionsContextMenu.ImageScalingSize = new System.Drawing.Size(18, 18); this.connectionsContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.connectionRefreshToolStripMenuItem, this.createDatabaseToolStripMenuItem, @@ -690,13 +773,13 @@ private void InitializeComponent() this.diagnosticsToolStripMenuItem, this.disconnectToolStripMenuItem}); this.connectionsContextMenu.Name = "connectionsContextMenu"; - this.connectionsContextMenu.Size = new System.Drawing.Size(201, 180); + this.connectionsContextMenu.Size = new System.Drawing.Size(247, 196); // // connectionRefreshToolStripMenuItem // this.connectionRefreshToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Refresh; this.connectionRefreshToolStripMenuItem.Name = "connectionRefreshToolStripMenuItem"; - this.connectionRefreshToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.connectionRefreshToolStripMenuItem.Size = new System.Drawing.Size(246, 24); this.connectionRefreshToolStripMenuItem.Text = "Refresh"; this.connectionRefreshToolStripMenuItem.Click += new System.EventHandler(this.connectionRefreshToolStripMenuItem_Click); // @@ -704,7 +787,7 @@ private void InitializeComponent() // this.createDatabaseToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.CreateDatabase; this.createDatabaseToolStripMenuItem.Name = "createDatabaseToolStripMenuItem"; - this.createDatabaseToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.createDatabaseToolStripMenuItem.Size = new System.Drawing.Size(246, 24); this.createDatabaseToolStripMenuItem.Text = "Create Database"; this.createDatabaseToolStripMenuItem.Click += new System.EventHandler(this.createDatabaseToolStripMenuItem_Click); // @@ -712,7 +795,7 @@ private void InitializeComponent() // this.showPoliciesToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.RetentionPolicy; this.showPoliciesToolStripMenuItem.Name = "showPoliciesToolStripMenuItem"; - this.showPoliciesToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.showPoliciesToolStripMenuItem.Size = new System.Drawing.Size(246, 24); this.showPoliciesToolStripMenuItem.Text = "Show Retention Policies"; this.showPoliciesToolStripMenuItem.Click += new System.EventHandler(this.showRetentionPoliciesToolStripMenuItem_Click); // @@ -720,7 +803,7 @@ private void InitializeComponent() // this.showUsersToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Users; this.showUsersToolStripMenuItem.Name = "showUsersToolStripMenuItem"; - this.showUsersToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.showUsersToolStripMenuItem.Size = new System.Drawing.Size(246, 24); this.showUsersToolStripMenuItem.Text = "Show Users"; this.showUsersToolStripMenuItem.Click += new System.EventHandler(this.showUsersToolStripMenuItem_Click); // @@ -728,7 +811,7 @@ private void InitializeComponent() // this.showQueriesContextMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.ShowQueries; this.showQueriesContextMenuItem.Name = "showQueriesContextMenuItem"; - this.showQueriesContextMenuItem.Size = new System.Drawing.Size(200, 22); + this.showQueriesContextMenuItem.Size = new System.Drawing.Size(246, 24); this.showQueriesContextMenuItem.Text = "Show Queries"; this.showQueriesContextMenuItem.Click += new System.EventHandler(this.showQueriesContextMenuItem_Click); // @@ -736,7 +819,7 @@ private void InitializeComponent() // this.showStatisticsToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Stats; this.showStatisticsToolStripMenuItem.Name = "showStatisticsToolStripMenuItem"; - this.showStatisticsToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.showStatisticsToolStripMenuItem.Size = new System.Drawing.Size(246, 24); this.showStatisticsToolStripMenuItem.Text = "Show Statistics"; this.showStatisticsToolStripMenuItem.Click += new System.EventHandler(this.showStatisticsToolStripMenuItem_Click); // @@ -744,7 +827,7 @@ private void InitializeComponent() // this.diagnosticsToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Diagnostics; this.diagnosticsToolStripMenuItem.Name = "diagnosticsToolStripMenuItem"; - this.diagnosticsToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.diagnosticsToolStripMenuItem.Size = new System.Drawing.Size(246, 24); this.diagnosticsToolStripMenuItem.Text = "Diagnostics"; this.diagnosticsToolStripMenuItem.Click += new System.EventHandler(this.diagnosticsToolStripMenuItem_Click); // @@ -752,12 +835,13 @@ private void InitializeComponent() // this.disconnectToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Disconnect; this.disconnectToolStripMenuItem.Name = "disconnectToolStripMenuItem"; - this.disconnectToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.disconnectToolStripMenuItem.Size = new System.Drawing.Size(246, 24); this.disconnectToolStripMenuItem.Text = "Disconnect"; this.disconnectToolStripMenuItem.Click += new System.EventHandler(this.disconnectToolStripMenuItem_Click); // // databaseContextMenu // + this.databaseContextMenu.ImageScalingSize = new System.Drawing.Size(18, 18); this.databaseContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.databaseRefreshToolStripMenuItem, this.newQueryToolStripMenuItem, @@ -765,13 +849,13 @@ private void InitializeComponent() this.backFillToolStripMenuItem, this.dropDatabaseToolStripMenuItem}); this.databaseContextMenu.Name = "databaseContextMenu"; - this.databaseContextMenu.Size = new System.Drawing.Size(205, 114); + this.databaseContextMenu.Size = new System.Drawing.Size(253, 124); // // databaseRefreshToolStripMenuItem // this.databaseRefreshToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Refresh; this.databaseRefreshToolStripMenuItem.Name = "databaseRefreshToolStripMenuItem"; - this.databaseRefreshToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.databaseRefreshToolStripMenuItem.Size = new System.Drawing.Size(252, 24); this.databaseRefreshToolStripMenuItem.Text = "Refresh"; this.databaseRefreshToolStripMenuItem.Click += new System.EventHandler(this.databaseRefreshToolStripMenuItem_Click); // @@ -779,7 +863,7 @@ private void InitializeComponent() // this.newQueryToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("newQueryToolStripMenuItem.Image"))); this.newQueryToolStripMenuItem.Name = "newQueryToolStripMenuItem"; - this.newQueryToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.newQueryToolStripMenuItem.Size = new System.Drawing.Size(252, 24); this.newQueryToolStripMenuItem.Text = "New Query"; this.newQueryToolStripMenuItem.Click += new System.EventHandler(this.newQueryMenuItem_Click); // @@ -787,7 +871,7 @@ private void InitializeComponent() // this.continousQueriesToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.ContinuousQuery; this.continousQueriesToolStripMenuItem.Name = "continousQueriesToolStripMenuItem"; - this.continousQueriesToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.continousQueriesToolStripMenuItem.Size = new System.Drawing.Size(252, 24); this.continousQueriesToolStripMenuItem.Text = "Show Continous Queries"; this.continousQueriesToolStripMenuItem.Click += new System.EventHandler(this.continousQueriesToolStripMenuItem_Click); // @@ -795,7 +879,7 @@ private void InitializeComponent() // this.backFillToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.BackFill; this.backFillToolStripMenuItem.Name = "backFillToolStripMenuItem"; - this.backFillToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.backFillToolStripMenuItem.Size = new System.Drawing.Size(252, 24); this.backFillToolStripMenuItem.Text = "Run Backfill"; this.backFillToolStripMenuItem.Click += new System.EventHandler(this.backFillToolStripMenuItem_Click); // @@ -803,12 +887,13 @@ private void InitializeComponent() // this.dropDatabaseToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.DropDatabase; this.dropDatabaseToolStripMenuItem.Name = "dropDatabaseToolStripMenuItem"; - this.dropDatabaseToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.dropDatabaseToolStripMenuItem.Size = new System.Drawing.Size(252, 24); this.dropDatabaseToolStripMenuItem.Text = "Drop Database"; this.dropDatabaseToolStripMenuItem.Click += new System.EventHandler(this.dropDatabaseToolStripMenuItem_Click); // // measurementContextMenu // + this.measurementContextMenu.ImageScalingSize = new System.Drawing.Size(18, 18); this.measurementContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newQueryToolStripMenuItem1, this.tagKeysToolStripMenuItem, @@ -818,13 +903,13 @@ private void InitializeComponent() this.dropMeasurementToolStripMenuItem, this.dropSeriesToolStripMenuItem}); this.measurementContextMenu.Name = "measurementContextMenu"; - this.measurementContextMenu.Size = new System.Drawing.Size(177, 158); + this.measurementContextMenu.Size = new System.Drawing.Size(216, 172); // // newQueryToolStripMenuItem1 // this.newQueryToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("newQueryToolStripMenuItem1.Image"))); this.newQueryToolStripMenuItem1.Name = "newQueryToolStripMenuItem1"; - this.newQueryToolStripMenuItem1.Size = new System.Drawing.Size(176, 22); + this.newQueryToolStripMenuItem1.Size = new System.Drawing.Size(215, 24); this.newQueryToolStripMenuItem1.Text = "New Query"; this.newQueryToolStripMenuItem1.Click += new System.EventHandler(this.newQueryMenuItem_Click); // @@ -832,7 +917,7 @@ private void InitializeComponent() // this.tagKeysToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.TagKeys; this.tagKeysToolStripMenuItem.Name = "tagKeysToolStripMenuItem"; - this.tagKeysToolStripMenuItem.Size = new System.Drawing.Size(176, 22); + this.tagKeysToolStripMenuItem.Size = new System.Drawing.Size(215, 24); this.tagKeysToolStripMenuItem.Text = "Show Tag Keys"; this.tagKeysToolStripMenuItem.Click += new System.EventHandler(this.tagKeysToolStripMenuItem_Click); // @@ -840,7 +925,7 @@ private void InitializeComponent() // this.tagValuesToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.TagValues; this.tagValuesToolStripMenuItem.Name = "tagValuesToolStripMenuItem"; - this.tagValuesToolStripMenuItem.Size = new System.Drawing.Size(176, 22); + this.tagValuesToolStripMenuItem.Size = new System.Drawing.Size(215, 24); this.tagValuesToolStripMenuItem.Text = "Show Tag Values"; this.tagValuesToolStripMenuItem.Click += new System.EventHandler(this.tagValuesToolStripMenuItem_Click); // @@ -848,7 +933,7 @@ private void InitializeComponent() // this.fieldKeysToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.FieldKeys; this.fieldKeysToolStripMenuItem.Name = "fieldKeysToolStripMenuItem"; - this.fieldKeysToolStripMenuItem.Size = new System.Drawing.Size(176, 22); + this.fieldKeysToolStripMenuItem.Size = new System.Drawing.Size(215, 24); this.fieldKeysToolStripMenuItem.Text = "Show Field Keys"; this.fieldKeysToolStripMenuItem.Click += new System.EventHandler(this.fieldKeysToolStripMenuItem_Click); // @@ -856,7 +941,7 @@ private void InitializeComponent() // this.showSeriesToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.Series; this.showSeriesToolStripMenuItem.Name = "showSeriesToolStripMenuItem"; - this.showSeriesToolStripMenuItem.Size = new System.Drawing.Size(176, 22); + this.showSeriesToolStripMenuItem.Size = new System.Drawing.Size(215, 24); this.showSeriesToolStripMenuItem.Text = "Show Series"; this.showSeriesToolStripMenuItem.Click += new System.EventHandler(this.showSeriesToolStripMenuItem_Click); // @@ -864,7 +949,7 @@ private void InitializeComponent() // this.dropMeasurementToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.DropMeasurement; this.dropMeasurementToolStripMenuItem.Name = "dropMeasurementToolStripMenuItem"; - this.dropMeasurementToolStripMenuItem.Size = new System.Drawing.Size(176, 22); + this.dropMeasurementToolStripMenuItem.Size = new System.Drawing.Size(215, 24); this.dropMeasurementToolStripMenuItem.Text = "Drop Measurement"; this.dropMeasurementToolStripMenuItem.Click += new System.EventHandler(this.dropMeasurementToolStripMenuItem_Click); // @@ -872,7 +957,7 @@ private void InitializeComponent() // this.dropSeriesToolStripMenuItem.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.DropSeries; this.dropSeriesToolStripMenuItem.Name = "dropSeriesToolStripMenuItem"; - this.dropSeriesToolStripMenuItem.Size = new System.Drawing.Size(176, 22); + this.dropSeriesToolStripMenuItem.Size = new System.Drawing.Size(215, 24); this.dropSeriesToolStripMenuItem.Text = "Drop Series"; this.dropSeriesToolStripMenuItem.Click += new System.EventHandler(this.dropSeriesToolStripMenuItem_Click); // @@ -888,36 +973,37 @@ private void InitializeComponent() // // tabContextMenuStrip // + this.tabContextMenuStrip.ImageScalingSize = new System.Drawing.Size(18, 18); this.tabContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.closeTabMenuItem, this.closeAllButThisMenuItem, this.closeAllMenuItem}); this.tabContextMenuStrip.Name = "tabContextMenuStrip"; - this.tabContextMenuStrip.Size = new System.Drawing.Size(167, 70); + this.tabContextMenuStrip.Size = new System.Drawing.Size(198, 76); // // closeTabMenuItem // this.closeTabMenuItem.Name = "closeTabMenuItem"; - this.closeTabMenuItem.Size = new System.Drawing.Size(166, 22); + this.closeTabMenuItem.Size = new System.Drawing.Size(197, 24); this.closeTabMenuItem.Text = "Close"; // // closeAllButThisMenuItem // this.closeAllButThisMenuItem.Name = "closeAllButThisMenuItem"; - this.closeAllButThisMenuItem.Size = new System.Drawing.Size(166, 22); + this.closeAllButThisMenuItem.Size = new System.Drawing.Size(197, 24); this.closeAllButThisMenuItem.Text = "Close All But This"; // // closeAllMenuItem // this.closeAllMenuItem.Name = "closeAllMenuItem"; - this.closeAllMenuItem.Size = new System.Drawing.Size(166, 22); + this.closeAllMenuItem.Size = new System.Drawing.Size(197, 24); this.closeAllMenuItem.Text = "Close All"; // // AppForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(784, 562); + this.ClientSize = new System.Drawing.Size(915, 605); this.Controls.Add(this.splitContainer); this.Controls.Add(this.statusStrip); this.Controls.Add(this.toolStrip); @@ -1029,6 +1115,14 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem closeTabMenuItem; private System.Windows.Forms.ToolStripMenuItem closeAllButThisMenuItem; private System.Windows.Forms.ToolStripMenuItem closeAllMenuItem; + private System.Windows.Forms.ToolStripMenuItem precisionToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem hourToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem minuteToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem secondToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem millisecondToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem microsecondToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem nanosecondToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem rfc3339ToolStripMenuItem; } } diff --git a/src/CymaticLabs.InfluxDB.Studio/AppForm.cs b/src/CymaticLabs.InfluxDB.Studio/AppForm.cs index 1611eb9..2ff7a06 100644 --- a/src/CymaticLabs.InfluxDB.Studio/AppForm.cs +++ b/src/CymaticLabs.InfluxDB.Studio/AppForm.cs @@ -104,6 +104,7 @@ public AppForm() // Setup container for active database connection clients ActiveClients = new List(); InitializeComponent(); + my_InitializeComponent(); // Create dialog windows aboutDialog = new AboutDialog(); @@ -207,6 +208,48 @@ private async void showQueriesToolStripMenuItem_Click(object sender, EventArgs e await ShowQueries(node); } + private void hourToolStripMenuItem_Click(object sender, EventArgs e) + { + UncheckOtherToolStripMenuItems((ToolStripMenuItem)sender); + Settings.Precision = "h"; + } // fin hourToolStripMenuItem_Click() + + private void minuteToolStripMenuItem_Click(object sender, EventArgs e) + { + UncheckOtherToolStripMenuItems((ToolStripMenuItem)sender); + Settings.Precision = "m"; + } // fin minuteToolStripMenuItem_Click() + + private void secondToolStripMenuItem_Click(object sender, EventArgs e) + { + UncheckOtherToolStripMenuItems((ToolStripMenuItem)sender); + Settings.Precision = "s"; + } // fin secondToolStripMenuItem_Click() + + private void millisecondToolStripMenuItem_Click(object sender, EventArgs e) + { + UncheckOtherToolStripMenuItems((ToolStripMenuItem)sender); + Settings.Precision = "ms"; + } // fin millisecondToolStripMenuItem_Click() + + private void microsecondToolStripMenuItem_Click(object sender, EventArgs e) + { + UncheckOtherToolStripMenuItems((ToolStripMenuItem)sender); + Settings.Precision = "u"; + } // fin microsecondToolStripMenuItem_Click() + + private void nanosecondToolStripMenuItem_Click(object sender, EventArgs e) + { + UncheckOtherToolStripMenuItems((ToolStripMenuItem)sender); + Settings.Precision = "ns"; + } // fin nanosecondToolStripMenuItem_Click() + + private void rfc3339ToolStripMenuItem_Click(object sender, EventArgs e) + { + UncheckOtherToolStripMenuItems((ToolStripMenuItem)sender); + Settings.Precision = "rfc3339"; + } // fin rfc3339ToolStripMenuItem_Click() + #endregion Query #region Settings @@ -228,7 +271,7 @@ private void timeFormatComboBox_SelectedIndexChanged(object sender, EventArgs e) // Handles Settings -> Date Format -> change of date format private void dateFormatComboBox_SelectedIndexChanged(object sender, EventArgs e) { - Settings.DateFormat = dateFormatComboBox.SelectedIndex == 0 ? AppSettings.DateFormatMonth : AppSettings.DateFormatDay; + Settings.DateFormat = (dateFormatComboBox.SelectedIndex == 0 ? AppSettings.DateFormatYear : (dateFormatComboBox.SelectedIndex == 1 ? AppSettings.DateFormatMonth : AppSettings.DateFormatDay)); } #endregion Settings @@ -846,7 +889,7 @@ async Task RefreshConnection(TreeNode node) var client = GetClient(connection); // Add a placeholder - var placeholderNode = CreateTreeNode("loading...", InfluxDbNodeTypes.LoadingPlacholder); + var placeholderNode = CreateTreeNode("Loading...", InfluxDbNodeTypes.LoadingPlacholder); node.Nodes.Add(placeholderNode); // Refresh and rerender @@ -906,7 +949,7 @@ async Task CreateDatabase(TreeNode node) newDatabaseNode.ContextMenuStrip = databaseContextMenu; // Don't render measurement, instead include a loading place holder - var placeholderNode = CreateTreeNode("loading...", InfluxDbNodeTypes.LoadingPlacholder); + var placeholderNode = CreateTreeNode("Loading...", InfluxDbNodeTypes.LoadingPlacholder); newDatabaseNode.Nodes.Add(placeholderNode); connectionsTreeView.SelectedNode = newDatabaseNode; @@ -1093,7 +1136,7 @@ async Task RefreshDatabase(TreeNode node) var client = GetClient(connection); // Add a placeholder - var placeholderNode = new TreeNode("loading...", 4, 4); + var placeholderNode = new TreeNode("Loading...", 4, 4); node.Nodes.Add(placeholderNode); // Refresh and rerender @@ -1484,7 +1527,7 @@ void NewQuery(TreeNode node) var queryControl = new QueryControl(); queryControl.InfluxDbClient = client; queryControl.Database = database; - queryControl.EditorText = string.Format("SELECT * FROM \"{0}\" WHERE time > now() - 5m", measurement); + queryControl.EditorText = string.Format("SELECT * FROM \"{0}\" WHERE time > now() - 30m", measurement); // Add a tab with a query control in it tabControl.AddTabWithControl(connection.Name + "." + database, queryControl, Properties.Resources.RunQuery); @@ -1580,16 +1623,7 @@ void ApplySettings() } // Set date format - if (Settings.DateFormat == AppSettings.DateFormatMonth) - { - // month-first - dateFormatComboBox.SelectedIndex = 0; - } - else - { - // day-first - dateFormatComboBox.SelectedIndex = 1; - } + dateFormatComboBox.SelectedIndex = (Settings.DateFormat == AppSettings.DateFormatYear ? 0 : (Settings.DateFormat == AppSettings.DateFormatMonth ? 1 : 2)); // Apply untrusted SSL allowUntrustedSSLToolStripMenuItem.Checked = Settings.AllowUntrustedSsl; @@ -1694,6 +1728,35 @@ bool CanRunQuery() return tabControl.SelectedTab != null && tabControl.SelectedTab.Controls.Count > 0 && tabControl.SelectedTab.Controls[0] is RequestControl; } + private void UncheckOtherToolStripMenuItems(ToolStripMenuItem selectedMenuItem) + { // https://stackoverflow.com/a/13604433 + selectedMenuItem.Checked = true; + + // Select the other MenuItens from the ParentMenu(OwnerItens) and unchecked this, + // The current Linq Expression verify if the item is a real ToolStripMenuItem + // and if the item is a another ToolStripMenuItem to uncheck this. + foreach (var ltoolStripMenuItem in (from object + item in selectedMenuItem.Owner.Items + let ltoolStripMenuItem = item as ToolStripMenuItem + where ltoolStripMenuItem != null + where !item.Equals(selectedMenuItem) + select ltoolStripMenuItem)) + (ltoolStripMenuItem).Checked = false; + } // fin UncheckOtherToolStripMenuItems() + + private void my_InitializeComponent() + { + this.timeFormatComboBox.Items.AddRange(new object[] { + DateTime.Now.ToString(AppSettings.TimeFormat12Hour)+" (12 Hr)", + DateTime.Now.ToString(AppSettings.TimeFormat24Hour)+" (24 Hr)" + }); + this.dateFormatComboBox.Items.AddRange(new object[] { + DateTime.Now.ToString(AppSettings.DateFormatYear)+" ("+AppSettings.DateFormatYear+")", + DateTime.Now.ToString(AppSettings.DateFormatMonth)+" ("+AppSettings.DateFormatMonth+")", + DateTime.Now.ToString(AppSettings.DateFormatDay)+" ("+AppSettings.DateFormatDay+")" + }); + } // fin my_InitializeComponent() + #endregion User Interface #region Connections @@ -1797,7 +1860,7 @@ async Task RenderConnectionDetails(TreeNode connectionNode, InfluxDbConnection c else { // Don't render databses, instead include a loading place holder - var placeholderNode = CreateTreeNode("loading...", InfluxDbNodeTypes.LoadingPlacholder); + var placeholderNode = CreateTreeNode("Loading...", InfluxDbNodeTypes.LoadingPlacholder); connectionNode.Nodes.Add(placeholderNode); } } @@ -1843,7 +1906,7 @@ async Task RenderDatabases(TreeNode connectionNode, InfluxDbClient client) connectionNode.Nodes.Add(dbNode); // Don't render measurement, instead include a loading place holder - var placeholderNode = CreateTreeNode("loading...", InfluxDbNodeTypes.LoadingPlacholder); + var placeholderNode = CreateTreeNode("Loading...", InfluxDbNodeTypes.LoadingPlacholder); dbNode.Nodes.Add(placeholderNode); } } diff --git a/src/CymaticLabs.InfluxDB.Studio/AppForm.resx b/src/CymaticLabs.InfluxDB.Studio/AppForm.resx index e83fa27..20180a8 100644 --- a/src/CymaticLabs.InfluxDB.Studio/AppForm.resx +++ b/src/CymaticLabs.InfluxDB.Studio/AppForm.resx @@ -154,95 +154,94 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABu - FAAAAk1TRnQBSQFMAgEBBAEAARgBAwEYAQMBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AbgABIQEIAQAB/wEe - AQQBAAH/ARoBAQEAAf8BFwIAAf8BFAIAAf8BEgIAAf8BEAIAAf8BDwIAAf8BDwIAAf8cAAM7AWUDVwG4 - AV4CZQHlAVcCagH5AQABHQGKAf8BAAEYAYcB/wFBAmoB+QFeAmUB5QFWAlcBuAM7AWVUAAGeAbwBlwH/ - Af0B+AH2Af8BzQHXAcUB/wGCAagBJgH/AQIBlQEAAf8BAAEfAQAB/wEAAR4BAAH/AQABkQEAAf8BngG4 - AZQB/wMHAQoDAQECGAABJgENAQAB/wHFAb0BtgH/AcgBqAGXAf8BxwGmAZUB/wHHAaUBlAH/AcYBpAGS - Af8BxgGjAZIB/wHGAaIBkAH/AQ8CAAH/GAABVAJWAasDTQH6AQgBowG/Af8BJAHAAdQB/wGVAdkB5gH/ - AYEB2wHwAf8BAAHGAewB/wEAAaoB3QH/AQABkgHHAf8BAAGAAawB/wEyAk0B+gFUAlYBqwwAAbcBogGT - Af8BDwIAAf8BDwIAAf8BDwIAAf8BDwIAAf8BDwIAAf8BDwIAAf8BDwIAAf8BDwIAAf8BDwIAAf8BDwIA - Af8BDwIAAf8BDwIAAf8BDwIAAf8NAAGGAQAB/wG7AdABswH/AQABggEAAf8BAAGaAQAB/wEIAbQBAAH/ - AQgBtAEAAf8BCAG0AQAB/wEIAbQBAAH/AQABKgEAAf8BkwG5AYcB/wMqAUAYAAGAARQBAQX/AfMB1wHJ - Af8B8gHVAccB/wHyAdQBxQH/AQABzAEAAf8BAAGbAQAB/wHHAaQBlAH/ARECAAH/GAABBgGEAZsB/wEA - Ab0B5wH/ARMB0wHxAf8BjAHjAfQB/wGiAesB9gH/AYMB3wH0Af8BAAHKAfAB/wEAAbYB7QH/AQABpwHo - Af8BAAGhAeEB/wEAAZYB0gH/AQABCgEmAf8MAAG3AaIBkwH/Af0B+wH5Af8B4QHcAdgB/wHgAdcB0gH/ - Ad8B0gHKAf8B3wHOAcMB/wHdAcgBuwH/AdwBwwGzAf8B2wG/Aa0B/wHbAbsBpwH/AdsBuwGnAf8B2wG7 - AacB/wHPAbQBowH/AQ8CAAH/DQABigEAAf8BAAGIAQAB/wEIAbQBAAH/AQgBtAEAAf8BCAG0AQAB/wEA - AZoBAAH/AQABmgEAAf8BCAG0AQAB/wEIAbQBAAH/AQABKgEAAf8BqAG+AZwB/xgAAYYBGQEHBf8B9AHa - Ac4B/wH0AdkBzAH/AfMB1wHKAf8BAAH/AQAB/wEAAcwBAAH/AcgBqAGYAf8BFQIAAf8YAAEJAYcBngH/ - AQABxAHwAf8BFQHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wEAAcoB8AH/AQABtgHtAf8BAAGo - AegB/wEAAaEB4QH/AQABnAHaAf8BAAELASgB/wwAAbcBogGTAf8D/gH/AcMBrQGfAf8BwAGoAZoB/wG7 - AaMBlAH/AfsB7AHjAf8BsQGYAYcB/wGsAZEBgAH/AacBigElAf8B9gHWAcIB/wGdASsBGAH/AZoBJwET - Af8BzwG0AaMB/wEPAgAB/w0AAZUBAAH/AZUB4gGJAf8BjAHXAYEB/wGMAdcBgQH/AQABkQEAAf8B1gHg - Ac0B/wHbAeEB0QH/AaUBxAGaAf8BAAGaAQAB/wEIAbQBAAH/ARwBoAERAf8YAAGMASABDgX/AfUB3gHT - Af8B9QHdAdEB/wH0AdsBzwH/AfQB2gHNAf8B8wHYAcwB/wHIAasBmwH/ARoCAAH/GAABCwGJAaAB/wEA - AcQB7wH/ARQB1AHxAf8BjQHjAfQB/wGiAesB9gH/AYIB3wHzAf8BAAHKAfAB/wEAAbYB7QH/AQABqAHo - Af8BAAGhAeEB/wEAAZwB2gH/AQABDgEqAf8MAAG3AaIBkwH/A/4B/wP+Af8B/QH7AfkB/wH9AfcB8wH/ - AfwB8gHsAf8B+wHsAeMB/wH6AecB2wH/AfgB4QHSAf8B9wHbAckB/wH2AdYBwgH/AfYB0gG8Af8BzwG0 - AaMB/wEPAgAB/w0AAZ0BAAH/AZUB4gGJAf8BjAHXAYEB/wEAAYwBAAH/AdYB4QHNAf8B7QHqAegB/wMV - AR0DAQECAdoB4QHQAf8BAAGmAQAB/wEAASkBAAH/GAABkgEmARUF/wH2AeEB2AH/AfYB4AHWAf8B9QHf - AdQB/wH1Ad4B0gH/AfUB3AHRAf8ByQGuAaAB/wEeAQQBAAH/GAABDQGMAaIB/wEAAcYB8AH/ARYB1AHx - Af8BjAHjAfQB/wGiAesB9gH/AYIB3wH0Af8BAAHKAfAB/wEAAbYB7QH/AQABqAHoAf8BAAGiAeIB/wEA - AZsB2wH/AQABEQGAAf8MAAG3AaIBkwH/A/4B/wHEAbABogH/AcEBrAGeAf8BvQGnAZgB/wH9AfcB8wH/ - AbMBmwGMAf8BrgGUAYQB/wGpAY4BKQH/AfgB4QHSAf8BnwGCARwB/wGcASkBFgH/Ac8BtAGjAf8BDwIA - Af8NAAGdAQAB/wEAAZcBAAH/AVgBYgFYAe8BUwFkAVMB8QEAAYYBAAH/AaMBxgGYAf8DDgETBAADLAFE - AZ8BwwGYAf8BAAGUAQAB/xgAAZgBgQEcBf8B9wHlAdwB/wH3AeQB2gH/AfYB4gHZAf8B9gHhAdcB/wH2 - AeAB1QH/AcoBsAGjAf8BIwEJAQAB/xgAARABjwGlAf8BAAHGAfAB/wEWAdQB8gH/AY0B4wH0Af8BogHr - AfYB/wGDAd8B9AH/AQABygHwAf8BAAG2Ae0B/wEAAacB6AH/AQABoQHiAf8BAAGcAdsB/wEAARQBgwH/ - DAABugGlAZYB/wP+Af8D/gH/A/4B/wP+Af8B/QH7AfkB/wH9AfcB8wH/AfwB8gHsAf8B+wHsAeMB/wH6 - AecB2wH/AfgB4QHSAf8B9wHbAckB/wHQAbkBqwH/AQ8CAAH/DAAB/gH7AfoB/wH+AfsB+gH/Ay0BRgMC - AQMDKAE8AwAEAQECAwABAQMAAQEDCAELAYkBwwEqAf8YAAGeAYcBIxn/AfMB7wHsAf8BKAEPAQAB/xgA - AREBkgGoAf8BAAHFAfAB/wEXAdQB8gH/AY0B4wH0Af8BogHrAfYB/wGCAd8B9AH/AQABygHwAf8BAAG2 - Ae0B/wEAAacB6AH/AQABoQHhAf8BAAGcAdsB/wEAARcBhgH/DAABvgGpAZoB/wP+Af8BxgGyAaUB/wHD - Aa8BogH/Ab4BqgGcAf8D/gH/AbUBnwGQAf8BsAGYAYkB/wGrAZIBgQH/AfsB7AHjAf8BoQGGASAB/wGd - AYEBGgH/AdEBwQG2Af8BDwIAAf8NAAGUAQAB/wHRAd4BywH/AwQBBQQAAxQBHAMEAQUDBgEIAwQBBgMB - AQIDEQEXAeEB3AHZAf8YAAGkAY4BKgH/AcwBugGtAf8BtwGiAZMB/wGvAZoBiwH/AacBkQGBAf8BnwGJ - ASUB/wGYAYEBHAH/AZEBJgEVAf8BgQEVAQIB/xgAARQBlQGrAf8BAAHFAfAB/wEXAdQB8gH/AY0B4wH0 - Af8BogHrAfYB/wGDAd8B9AH/AQABywHwAf8BAAG1Ae0B/wEAAacB6AH/AQABoQHiAf8BAAGcAdoB/wEA - ARoBiAH/DAABwwGuAZ4B/wP+Af8D/gH/A/4B/wP+Af8D/gH/A/4B/wH9AfsB+QH/Af0B9wHzAf8B/AHy - AewB/wH7AewB4wH/AfoB5wHbAf8B0QHBAbYB/wEPAgAB/w0AAZkBAAH/ASoBrQEiAf8DIQEwAwABAQMA - AQEBsgHNAagB/wEAAYcBAAH/AQABhwEAAf8BAAGDAQAB/wEAASkBAAH/AQABJQEAAf8YAAGpAZQBhQX/ - AfsB8AHrAf8B+gHvAekB/wH6Ae0B6AH/AfkB7AHmAf8B+QHrAeQB/wHNAbkBrgH/AYcBGwEJAf8YAAEW - AZgBrgH/AQABxQHwAf8BFwHUAfEB/wGNAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wEAAcoB8AH/AQABtgHt - Af8BAAGoAekB/wEAAaEB4QH/AQABnAHaAf8BAAEcAYoB/wwAAcgBsgGjAf8D/gH/AcQBsAGiAf8BwQGs - AZ4B/wG9AacBmAH/A/4B/wG3AaIBkwH/AbEBmwGNAf8BrQGVAYUB/wH9AfcB8wH/AaMBiQEkAf8BnwGE - AR4B/wHRAcEBtgH/AQ8CAAH/DAABBgGdAQAB/wEAAZkBAAH/AbUBzQGuAf8DHgErAwgBCwHuAesB6QH/ - AdkB4wHRAf8BAAGCAQAB/wEIAbQBAAH/AQgBtAEAAf8BAAEpAQAB/xgAAbABmwGMGf8B8wHvAewB/wGO - ASIBEAH/GAABGQGbAbAB/wEAAcYB8AH/ARcB1AHyAf8BjQHjAfQB/wGiAesB9gH/AYMB3wH0Af8BAAHK - AfAB/wEAAbYB7QH/AQABqAHoAf8BAAGhAeEB/wEAAZwB2gH/AQABIAGOAf8MAAHMAbYBpwH/A/4B/wP+ - Af8D/gH/A/4B/wP+Af8D/gH/A/4B/wP+Af8B/QH7AfkB/wH9AfcB8wH/AfwB8gHsAf8B+wHsAeMB/wEP - AgAB/wwAAYABsQEkAf8BFQHEAQgB/wEAAZEBAAH/AZQBuAGNAf8B2QHiAdIB/wHhAecB2gH/AQABggEA - Af8BCAG0AQAB/wEIAbQBAAH/AQgBtAEAAf8BAAGDAQAB/xgAAbUBoQGSAf8BzAG6Aa0B/wHEAbABogH/ - Ab0BqQGbAf8BtgGiAZIB/wGuAZkBigH/AaYBkQGBAf8BnwGIASQB/wGUASgBFgH/GAABHAGfAbMB/wEA - AcYB8AH/ARUB1AHxAf8BjAHjAfQB/wGiAesB9gH/AYMB3wH0Af8BAAHKAfAB/wEAAbYB7QH/AQABpwHo - Af8BAAGhAeEB/wEAAZsB2gH/AQABIwGQAf8MAAHqAaoBiwH/AeoBqgGLAf8B6gGqAYsB/wHpAaUBhAH/ - AekBnwEmAf8B5wGXARoB/wHmAY4BDgH/AeUBhgECAf8B4wEpAQAB/wHjASIBAAH/AeIBHgEAAf8B4gEe - AQAB/wHiAR4BAAH/AcgBDgEAAf8MAANiAe8BCAG0AQAB/wGOAd8BhAH/AQMBrgEAAf8BAAErAQAB/wEA - AYMBAAH/ARcBwAEMAf8BjAHXAYEB/wGLAdcBgAH/AQABlgEAAf8BAAGJAQAB/xgAAbsBpgGXBf8B+wHy - Ae4B/wH5AesB5QH/AfgB5QHcAf8B9QHfAdQB/wHzAdcBywH/AdUBtAGkAf8BmgGDAR4B/xgAAR0BoQG1 - Af8BFwHVAfQB/wGaAegB9wH/AbUB8wH6Af8BwgH4AfwB/wHDAfgB/QH/AcEB9wH9Af8BrwHwAfsB/wGP - AeIB9wH/ARYB0AHwAf8BAAG4AeUB/wEAASYBkwH/DAAB6gGqAYsC/wHCAaIB/wH+AcABnwH/Af0BvQGa - Af8B/AG5AZYB/wH7AbUBkAH/AfoBsAGLAf8B+QGrAYQB/wH4AacBKQH/AfYBogEjAf8B9QGdAR0B/wH1 - AZkBFgH/AfMBlQERAf8BzQERAQAB/wwAAw4BEwG2AdIBrwH/AQgBtAEAAf8BhwHfASoB/wGTAeIBhwH/ - AYwB1wGBAf8BigHXASsB/wEgAcoBFAH/AQABlgEAAf8B1gHfAdAB/wEAAY8BAAH/GAABwwGvAaIB/wP8 - Ff8B8wHvAewB/wGmAZABgAH/GAABIAGjAbgB/wHFAfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/ - AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AQEBKQGVAf8MAAHq - AaoBiwH/AeoBqgGLAf8B6gGqAYsB/wHqAaoBiwH/AeoBpgGGAf8B6QGhASsB/wHoAZsBIgH/AecBlAEY - Af8B5gGOAQ4B/wHlAYcBBAH/AeQBgQEAAf8B5AEnAQAB/wHjASIBAAH/AeIBHgEAAf8QAAMWAR4ByAHa - AcQB/wGTAcABjQH/AQkBqgEAAf8BAAGaAQAB/wEAAZABAAH/AYMBrwEoAf8DXQHwAzcBWwGXAcABjAH/ - GAABxwGzAaYB/wHEAbEBowH/AcEBrgGgAf8BvgGrAZwB/wG7AacBmAH/AbgBowGVAf8BtAGfAZAB/wGv - AZoBjAH/AasBlgGHAf8YAANcAcwBjAG9AcwB/wGdAc8B2wH/Aa0B3wHoAf8BuQHsAfMB/wHCAfUB+gH/ - AcIB9QH6Af8BuAHrAfEB/wGpAdoB4wH/AZQBxAHRAf8BJwGoAbgB/wNcAcxQAAMCAQMDAQECAxABFQMH - AQoDEAEVAwsBDwMSARkDAwEEAwABAQQAAx8BLFQAAxQBGwNIAYQDWQHHA2AB6wNfAfsBGgGbAbAB/wEW - AZgBrQH/A18B+wNgAesDWQHHA0gBhAMUARtIAAFCAU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYA - AQEWAAP/gQAC/wHgAQ8B4AEHAv8BwAEHAeABDwHAAQMBgAEBAcABBwHgAQ8BwAEDAYABAQHAAQcB4AEP - AcABAwGAAQEBwAEHAeABDwHAAQMBgAEBAcABBwHgAQ8BwAEDAYABAQHAAUcB4AEPAcABAwGAAQEBwAEH - AeABDwHAAQMBgAEBAcQBBwHgAQ8BwAEDAYABAQHAAQcB4AEPAcABAwGAAQEBwAEHAeABDwHAAQMBgAEB - AcABBwHgAQ8BwAEDAYABAQHAAQcB4AEPAcABAwGAAQEBwAEHAeABDwHAAQMBgAEBAeABBwHgAQ8BwAED - Av8BwAEXAv8BwAEDAv8L + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABQ + FAAAAk1TRnQBSQFMAgEBBAEAAYgBAwGIAQMBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AbgABEwIAAf8BEAIA + Af8BDAIAAf8BCQIAAf8BBgIAAf8BBAIAAf8BAgIAAf8BAQIAAf8BAQIAAf8cAAM7AWUDVwG4AV4CZQHl + AVcCagH5AQABDwGKAf8BAAEKAYcB/wFBAmoB+QFeAmUB5QFWAlcBuAM7AWVUAAGeAbwBlwH/Af0B+AH2 + Af8BzQHXAcUB/wGCAagBGAH/AQABlQEAAf8BAAERAQAB/wEAARABAAH/AQABkQEAAf8BngG4AZQB/wMH + AQoDAQECGAABGAIAAf8BxQG9AbYB/wHIAagBlwH/AccBpgGVAf8BxwGlAZQB/wHGAaQBkgH/AcYBowGS + Af8BxgGiAZAB/wEBAgAB/xgAAVQCVgGrA00B+gEAAaMBvwH/ARYBwAHUAf8BlQHZAeYB/wGBAdsB8AH/ + AQABxgHsAf8BAAGqAd0B/wEAAZIBxwH/AQABgAGsAf8BMgJNAfoBVAJWAasMAAG3AaIBkwH/AQECAAH/ + AQECAAH/AQECAAH/AQECAAH/AQECAAH/AQECAAH/AQECAAH/AQECAAH/AQECAAH/AQECAAH/AQECAAH/ + AQECAAH/AQECAAH/DQABhgEAAf8BuwHQAbMB/wEAAYIBAAH/AQABmgEAAf8BAAG0AQAB/wEAAbQBAAH/ + AQABtAEAAf8BAAG0AQAB/wEAARwBAAH/AZMBuQGHAf8DKgFAGAABgAEGAQAF/wHzAdcByQH/AfIB1QHH + Af8B8gHUAcUB/wEAAcwBAAH/AQABmwEAAf8BxwGkAZQB/wEDAgAB/xkAAYQBmwH/AQABvQHnAf8BBQHT + AfEB/wGMAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wEAAcoB8AH/AQABtgHtAf8BAAGnAegB/wEAAaEB4QH/ + AQABlgHSAf8CAAEYAf8MAAG3AaIBkwH/Af0B+wH5Af8B4QHcAdgB/wHgAdcB0gH/Ad8B0gHKAf8B3wHO + AcMB/wHdAcgBuwH/AdwBwwGzAf8B2wG/Aa0B/wHbAbsBpwH/AdsBuwGnAf8B2wG7AacB/wHPAbQBowH/ + AQECAAH/DQABigEAAf8BAAGIAQAB/wEAAbQBAAH/AQABtAEAAf8BAAG0AQAB/wEAAZoBAAH/AQABmgEA + Af8BAAG0AQAB/wEAAbQBAAH/AQABHAEAAf8BqAG+AZwB/xgAAYYBCwEABf8B9AHaAc4B/wH0AdkBzAH/ + AfMB1wHKAf8BAAH/AQAB/wEAAcwBAAH/AcgBqAGYAf8BBwIAAf8ZAAGHAZ4B/wEAAcQB8AH/AQcB1AHx + Af8BjAHjAfQB/wGiAesB9gH/AYMB3wH0Af8BAAHKAfAB/wEAAbYB7QH/AQABqAHoAf8BAAGhAeEB/wEA + AZwB2gH/AgABGgH/DAABtwGiAZMB/wP+Af8BwwGtAZ8B/wHAAagBmgH/AbsBowGUAf8B+wHsAeMB/wGx + AZgBhwH/AawBkQGAAf8BpwGKARcB/wH2AdYBwgH/AZ0BHQEKAf8BmgEZAQUB/wHPAbQBowH/AQECAAH/ + DQABlQEAAf8BlQHiAYkB/wGMAdcBgQH/AYwB1wGBAf8BAAGRAQAB/wHWAeABzQH/AdsB4QHRAf8BpQHE + AZoB/wEAAZoBAAH/AQABtAEAAf8BDgGgAQMB/xgAAYwBEgEABf8B9QHeAdMB/wH1Ad0B0QH/AfQB2wHP + Af8B9AHaAc0B/wHzAdgBzAH/AcgBqwGbAf8BDAIAAf8ZAAGJAaAB/wEAAcQB7wH/AQYB1AHxAf8BjQHj + AfQB/wGiAesB9gH/AYIB3wHzAf8BAAHKAfAB/wEAAbYB7QH/AQABqAHoAf8BAAGhAeEB/wEAAZwB2gH/ + AgABHAH/DAABtwGiAZMB/wP+Af8D/gH/Af0B+wH5Af8B/QH3AfMB/wH8AfIB7AH/AfsB7AHjAf8B+gHn + AdsB/wH4AeEB0gH/AfcB2wHJAf8B9gHWAcIB/wH2AdIBvAH/Ac8BtAGjAf8BAQIAAf8NAAGdAQAB/wGV + AeIBiQH/AYwB1wGBAf8BAAGMAQAB/wHWAeEBzQH/Ae0B6gHoAf8DFQEdAwEBAgHaAeEB0AH/AQABpgEA + Af8BAAEbAQAB/xgAAZIBGAEHBf8B9gHhAdgB/wH2AeAB1gH/AfUB3wHUAf8B9QHeAdIB/wH1AdwB0QH/ + AckBrgGgAf8BEAIAAf8ZAAGMAaIB/wEAAcYB8AH/AQgB1AHxAf8BjAHjAfQB/wGiAesB9gH/AYIB3wH0 + Af8BAAHKAfAB/wEAAbYB7QH/AQABqAHoAf8BAAGiAeIB/wEAAZsB2wH/AQABAwGAAf8MAAG3AaIBkwH/ + A/4B/wHEAbABogH/AcEBrAGeAf8BvQGnAZgB/wH9AfcB8wH/AbMBmwGMAf8BrgGUAYQB/wGpAY4BGwH/ + AfgB4QHSAf8BnwGCAQ4B/wGcARsBCAH/Ac8BtAGjAf8BAQIAAf8NAAGdAQAB/wEAAZcBAAH/AVgBYgFY + Ae8BUwFkAVMB8QEAAYYBAAH/AaMBxgGYAf8DDgETBAADLAFEAZ8BwwGYAf8BAAGUAQAB/xgAAZgBgQEO + Bf8B9wHlAdwB/wH3AeQB2gH/AfYB4gHZAf8B9gHhAdcB/wH2AeAB1QH/AcoBsAGjAf8BFQIAAf8YAAEC + AY8BpQH/AQABxgHwAf8BCAHUAfIB/wGNAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wEAAcoB8AH/AQABtgHt + Af8BAAGnAegB/wEAAaEB4gH/AQABnAHbAf8BAAEGAYMB/wwAAboBpQGWAf8D/gH/A/4B/wP+Af8D/gH/ + Af0B+wH5Af8B/QH3AfMB/wH8AfIB7AH/AfsB7AHjAf8B+gHnAdsB/wH4AeEB0gH/AfcB2wHJAf8B0AG5 + AasB/wEBAgAB/wwAAf4B+wH6Af8B/gH7AfoB/wMtAUYDAgEDAygBPAMABAEBAgMAAQEDAAEBAwgBCwGJ + AcMBHAH/GAABngGHARUZ/wHzAe8B7AH/ARoBAQEAAf8YAAEDAZIBqAH/AQABxQHwAf8BCQHUAfIB/wGN + AeMB9AH/AaIB6wH2Af8BggHfAfQB/wEAAcoB8AH/AQABtgHtAf8BAAGnAegB/wEAAaEB4QH/AQABnAHb + Af8BAAEJAYYB/wwAAb4BqQGaAf8D/gH/AcYBsgGlAf8BwwGvAaIB/wG+AaoBnAH/A/4B/wG1AZ8BkAH/ + AbABmAGJAf8BqwGSAYEB/wH7AewB4wH/AaEBhgESAf8BnQGBAQwB/wHRAcEBtgH/AQECAAH/DQABlAEA + Af8B0QHeAcsB/wMEAQUEAAMUARwDBAEFAwYBCAMEAQYDAQECAxEBFwHhAdwB2QH/GAABpAGOARwB/wHM + AboBrQH/AbcBogGTAf8BrwGaAYsB/wGnAZEBgQH/AZ8BiQEXAf8BmAGBAQ4B/wGRARgBBwH/AYEBBwEA + Af8YAAEGAZUBqwH/AQABxQHwAf8BCQHUAfIB/wGNAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wEAAcsB8AH/ + AQABtQHtAf8BAAGnAegB/wEAAaEB4gH/AQABnAHaAf8BAAEMAYgB/wwAAcMBrgGeAf8D/gH/A/4B/wP+ + Af8D/gH/A/4B/wP+Af8B/QH7AfkB/wH9AfcB8wH/AfwB8gHsAf8B+wHsAeMB/wH6AecB2wH/AdEBwQG2 + Af8BAQIAAf8NAAGZAQAB/wEcAa0BFAH/AyEBMAMAAQEDAAEBAbIBzQGoAf8BAAGHAQAB/wEAAYcBAAH/ + AQABgwEAAf8BAAEbAQAB/wEAARcBAAH/GAABqQGUAYUF/wH7AfAB6wH/AfoB7wHpAf8B+gHtAegB/wH5 + AewB5gH/AfkB6wHkAf8BzQG5Aa4B/wGHAQ0BAAH/GAABCAGYAa4B/wEAAcUB8AH/AQkB1AHxAf8BjQHj + AfQB/wGiAesB9gH/AYMB3wH0Af8BAAHKAfAB/wEAAbYB7QH/AQABqAHpAf8BAAGhAeEB/wEAAZwB2gH/ + AQABDgGKAf8MAAHIAbIBowH/A/4B/wHEAbABogH/AcEBrAGeAf8BvQGnAZgB/wP+Af8BtwGiAZMB/wGx + AZsBjQH/Aa0BlQGFAf8B/QH3AfMB/wGjAYkBFgH/AZ8BhAEQAf8B0QHBAbYB/wEBAgAB/w0AAZ0BAAH/ + AQABmQEAAf8BtQHNAa4B/wMeASsDCAELAe4B6wHpAf8B2QHjAdEB/wEAAYIBAAH/AQABtAEAAf8BAAG0 + AQAB/wEAARsBAAH/GAABsAGbAYwZ/wHzAe8B7AH/AY4BFAECAf8YAAELAZsBsAH/AQABxgHwAf8BCQHU + AfIB/wGNAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wEAAcoB8AH/AQABtgHtAf8BAAGoAegB/wEAAaEB4QH/ + AQABnAHaAf8BAAESAY4B/wwAAcwBtgGnAf8D/gH/A/4B/wP+Af8D/gH/A/4B/wP+Af8D/gH/A/4B/wH9 + AfsB+QH/Af0B9wHzAf8B/AHyAewB/wH7AewB4wH/AQECAAH/DAABgAGxARYB/wEHAcQBAAH/AQABkQEA + Af8BlAG4AY0B/wHZAeIB0gH/AeEB5wHaAf8BAAGCAQAB/wEAAbQBAAH/AQABtAEAAf8BAAG0AQAB/wEA + AYMBAAH/GAABtQGhAZIB/wHMAboBrQH/AcQBsAGiAf8BvQGpAZsB/wG2AaIBkgH/Aa4BmQGKAf8BpgGR + AYEB/wGfAYgBFgH/AZQBGgEIAf8YAAEOAZ8BswH/AQABxgHwAf8BBwHUAfEB/wGMAeMB9AH/AaIB6wH2 + Af8BgwHfAfQB/wEAAcoB8AH/AQABtgHtAf8BAAGnAegB/wEAAaEB4QH/AQABmwHaAf8BAAEVAZAB/wwA + AeoBqgGLAf8B6gGqAYsB/wHqAaoBiwH/AekBpQGEAf8B6QGfARgB/wHnAZcBDAH/AeYBjgEAAf8B5QGG + AQAB/wHjARsBAAH/AeMBFAEAAf8B4gEQAQAB/wHiARABAAH/AeIBEAEAAf8ByAIAAf8MAANiAe8BAAG0 + AQAB/wGOAd8BhAH/AQABrgEAAf8BAAEdAQAB/wEAAYMBAAH/AQkBwAEAAf8BjAHXAYEB/wGLAdcBgAH/ + AQABlgEAAf8BAAGJAQAB/xgAAbsBpgGXBf8B+wHyAe4B/wH5AesB5QH/AfgB5QHcAf8B9QHfAdQB/wHz + AdcBywH/AdUBtAGkAf8BmgGDARAB/xgAAQ8BoQG1Af8BCQHVAfQB/wGaAegB9wH/AbUB8wH6Af8BwgH4 + AfwB/wHDAfgB/QH/AcEB9wH9Af8BrwHwAfsB/wGPAeIB9wH/AQgB0AHwAf8BAAG4AeUB/wEAARgBkwH/ + DAAB6gGqAYsC/wHCAaIB/wH+AcABnwH/Af0BvQGaAf8B/AG5AZYB/wH7AbUBkAH/AfoBsAGLAf8B+QGr + AYQB/wH4AacBGwH/AfYBogEVAf8B9QGdAQ8B/wH1AZkBCAH/AfMBlQEDAf8BzQEDAQAB/wwAAw4BEwG2 + AdIBrwH/AQABtAEAAf8BhwHfARwB/wGTAeIBhwH/AYwB1wGBAf8BigHXAR0B/wESAcoBBgH/AQABlgEA + Af8B1gHfAdAB/wEAAY8BAAH/GAABwwGvAaIB/wP8Ff8B8wHvAewB/wGmAZABgAH/GAABEgGjAbgB/wHF + AfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9 + Af8BxQH5Af0B/wHFAfkB/QH/AQABGwGVAf8MAAHqAaoBiwH/AeoBqgGLAf8B6gGqAYsB/wHqAaoBiwH/ + AeoBpgGGAf8B6QGhAR0B/wHoAZsBFAH/AecBlAEKAf8B5gGOAQAB/wHlAYcBAAH/AeQBgQEAAf8B5AEZ + AQAB/wHjARQBAAH/AeIBEAEAAf8QAAMWAR4ByAHaAcQB/wGTAcABjQH/AQABqgEAAf8BAAGaAQAB/wEA + AZABAAH/AYMBrwEaAf8DXQHwAzcBWwGXAcABjAH/GAABxwGzAaYB/wHEAbEBowH/AcEBrgGgAf8BvgGr + AZwB/wG7AacBmAH/AbgBowGVAf8BtAGfAZAB/wGvAZoBjAH/AasBlgGHAf8YAANcAcwBjAG9AcwB/wGd + Ac8B2wH/Aa0B3wHoAf8BuQHsAfMB/wHCAfUB+gH/AcIB9QH6Af8BuAHrAfEB/wGpAdoB4wH/AZQBxAHR + Af8BGQGoAbgB/wNcAcxQAAMCAQMDAQECAxABFQMHAQoDEAEVAwsBDwMSARkDAwEEAwABAQQAAx8BLFQA + AxQBGwNIAYQDWQHHA2AB6wNfAfsBDAGbAbAB/wEIAZgBrQH/A18B+wNgAesDWQHHA0gBhAMUARtIAAFC + AU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/gQAC/wHgAQ8B4AEHAv8BwAEHAeABDwHA + AQMBgAEBAcABBwHgAQ8BwAEDAYABAQHAAQcB4AEPAcABAwGAAQEBwAEHAeABDwHAAQMBgAEBAcABBwHg + AQ8BwAEDAYABAQHAAUcB4AEPAcABAwGAAQEBwAEHAeABDwHAAQMBgAEBAcQBBwHgAQ8BwAEDAYABAQHA + AQcB4AEPAcABAwGAAQEBwAEHAeABDwHAAQMBgAEBAcABBwHgAQ8BwAEDAYABAQHAAQcB4AEPAcABAwGA + AQEBwAEHAeABDwHAAQMBgAEBAeABBwHgAQ8BwAEDAv8BwAEXAv8BwAEDAv8L diff --git a/src/CymaticLabs.InfluxDB.Studio/AppSettings.cs b/src/CymaticLabs.InfluxDB.Studio/AppSettings.cs index 1c4a917..8c6cb0e 100644 --- a/src/CymaticLabs.InfluxDB.Studio/AppSettings.cs +++ b/src/CymaticLabs.InfluxDB.Studio/AppSettings.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using CymaticLabs.InfluxDB.Data; @@ -26,21 +27,26 @@ public class AppSettings /// /// Date format string for day-first dates. /// - public const string DateFormatDay = "d/MM/yyyy"; + public const string DateFormatDay = "dd/MM/yyyy"; /// /// Date format string for month-first dates. /// - public const string DateFormatMonth = "M/dd/yyyy"; + public const string DateFormatMonth = "MM/dd/yyyy"; + + public const string DateFormatYear = "yyyy/MM/dd"; // Whether or not to allow untrusted SSL certificates - bool allowUntrustedSsl = false; + bool allowUntrustedSsl = true; // Internal app time format setting - string timeFormat; + string timeFormat = TimeFormat24Hour; // Internal app date format setting - string dateFormat; + string dateFormat = DateFormatYear; + + string precision = "rfc3339"; + static readonly string[] PRECISION_VALUES = {"h", "m", "s", "ms", "u", "ns", "rfc3339"}; #endregion Fields @@ -106,6 +112,18 @@ public bool AllowUntrustedSsl } } + public string Precision { + get { return this.precision; } + set { + if (this.precision!=value) { + if (!PRECISION_VALUES.Contains(value)) { throw new Exception("Precisión inválida."); } // fin if + this.precision = value; + Properties.Settings.Default.Precision = this.precision; + Properties.Settings.Default.Save(); // actualizar ajustes + } // fin if + } + } + /// /// Gets or sets the available InfluxDB connections. /// @@ -118,9 +136,10 @@ public bool AllowUntrustedSsl public AppSettings() { // Initialize default settings - timeFormat = TimeFormat12Hour; - dateFormat = DateFormatMonth; - allowUntrustedSsl = false; + timeFormat = TimeFormat24Hour; + dateFormat = DateFormatYear; + allowUntrustedSsl = true; + SslIgnoreValidator.AllowUntrusted = allowUntrustedSsl; Connections = new List(); // Set the version string @@ -142,6 +161,7 @@ public void LoadAll() timeFormat = Properties.Settings.Default.TimeFormat; dateFormat = Properties.Settings.Default.DateFormat; allowUntrustedSsl = Properties.Settings.Default.AllowUntrustedSsl; + precision = Properties.Settings.Default.Precision; LoadConnections(); } @@ -152,6 +172,7 @@ public void SaveAll() { Properties.Settings.Default.TimeFormat = TimeFormat; Properties.Settings.Default.DateFormat = DateFormat; + Properties.Settings.Default.Precision = Precision; Properties.Settings.Default.AllowUntrustedSsl = AllowUntrustedSsl; SaveConnections(); } diff --git a/src/CymaticLabs.InfluxDB.Studio/Controls/QueryControl.cs b/src/CymaticLabs.InfluxDB.Studio/Controls/QueryControl.cs index b8fbd74..c8187ff 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Controls/QueryControl.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Controls/QueryControl.cs @@ -111,7 +111,7 @@ public override async Task ExecuteRequestAsync() } // Show stat results of query - resultsLabel.Text = string.Format("results: {0}, response time: {1:0} ms", resultsCount, stopWatch.Elapsed.TotalMilliseconds); + resultsLabel.Text = string.Format("Results: {0}, Response time: {1:0} ms", resultsCount, stopWatch.Elapsed.TotalMilliseconds); } #endregion Methods diff --git a/src/CymaticLabs.InfluxDB.Studio/CymaticLabs.InfluxDB.Studio.csproj b/src/CymaticLabs.InfluxDB.Studio/CymaticLabs.InfluxDB.Studio.csproj index c09949c..86ba23a 100644 --- a/src/CymaticLabs.InfluxDB.Studio/CymaticLabs.InfluxDB.Studio.csproj +++ b/src/CymaticLabs.InfluxDB.Studio/CymaticLabs.InfluxDB.Studio.csproj @@ -53,9 +53,8 @@ ..\..\packages\InfluxData.Net.8.0.1\lib\net461\InfluxData.Net.Kapacitor.dll True - - ..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll - True + + ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll @@ -69,20 +68,19 @@ ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll True - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True + + ..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\jacobslusser.ScintillaNET.3.5.10\lib\net40\ScintillaNET.dll - True + + ..\..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll + + + ..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll - - - ..\..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll - True + + ..\..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll @@ -94,8 +92,7 @@ - ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll - True + ..\..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll @@ -105,9 +102,8 @@ ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll True - - ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True + + ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -583,6 +579,10 @@ + + + + diff --git a/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs b/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs index 6a1216d..a07cdb6 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs @@ -1,4 +1,5 @@ -using System; +using CymaticLabs.InfluxDB.Studio; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -129,7 +130,7 @@ public async override Task CreateRetentionPolicyAsync(strin // If the default was supplied, run a second query to alter and add the default status since InfluxData.NET doesn't allow for the default argument if (response != null && response.Success && isDefault) { - var alterResponse = await influx.Client.QueryAsync(string.Format("ALTER RETENTION POLICY \"{0}\" ON \"{1}\" DEFAULT",database, policyName, database)).ConfigureAwait(false); + var alterResponse = await influx.Client.QueryAsync(string.Format("ALTER RETENTION POLICY \"{0}\" ON \"{1}\" DEFAULT",database, policyName, database), null, (AppForm.Settings.Precision.Equals("rfc3339") ? null : AppForm.Settings.Precision)).ConfigureAwait(false); } return new InfluxDbApiResponse(response.Body, response.StatusCode, response.Success); @@ -157,7 +158,7 @@ public async override Task AlterRetentionPolicyAsync(string // If the default was supplied, run a second query to alter and add the default status since InfluxData.NET doesn't allow for the default argument if (response != null && response.Success && isDefault) { - var alterResponse = await influx.Client.QueryAsync(string.Format("ALTER RETENTION POLICY \"{0}\" ON \"{1}\" DEFAULT",database, policyName, database)).ConfigureAwait(false); + var alterResponse = await influx.Client.QueryAsync(string.Format("ALTER RETENTION POLICY \"{0}\" ON \"{1}\" DEFAULT",database, policyName, database), null, (AppForm.Settings.Precision.Equals("rfc3339") ? null : AppForm.Settings.Precision)).ConfigureAwait(false); } return new InfluxDbApiResponse(response.Body, response.StatusCode, response.Success); @@ -304,7 +305,7 @@ public async override Task DropSeriesAsync(string database, /// A list of the currently running queries. public async override Task> GetRunningQueriesAsync() { - var response = await influx.Client.QueryAsync( "SHOW QUERIES", "_internal").ConfigureAwait(false); + var response = await influx.Client.QueryAsync( "SHOW QUERIES", "_internal", (AppForm.Settings.Precision.Equals("rfc3339") ? null : AppForm.Settings.Precision)).ConfigureAwait(false); if (response.Count() == 0 || response.First().Values == null) return new InfluxDbRunningQuery[0]; var results = response.First().Values; var queries = new List(results.Count); @@ -338,7 +339,7 @@ public async override Task> QueryAsync(string databa if (string.IsNullOrWhiteSpace(database)) throw new ArgumentNullException("database"); if (string.IsNullOrWhiteSpace(query)) throw new ArgumentNullException("query"); - var response = await influx.Client.QueryAsync(query, database).ConfigureAwait(false); + var response = await influx.Client.QueryAsync(query, database, (AppForm.Settings.Precision.Equals("rfc3339") ? null : AppForm.Settings.Precision)).ConfigureAwait(false); var results = new List(response.Count()); foreach (var r in response) diff --git a/src/CymaticLabs.InfluxDB.Studio/Data/SslIgnoreValidator.cs b/src/CymaticLabs.InfluxDB.Studio/Data/SslIgnoreValidator.cs index 52635cd..89eb2db 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Data/SslIgnoreValidator.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Data/SslIgnoreValidator.cs @@ -10,10 +10,10 @@ namespace CymaticLabs.InfluxDB.Data public static class SslIgnoreValidator { // Whether or not the SSL validator override has been enabled or not - private static bool enabled = false; + //private static bool enabled = true; // Whether or not to allow untrusted SSL/TLS certificates. - private static bool allowUntrusted = false; + private static bool allowUntrusted = true; /// /// Gets whether or not to allow untrusted SSL/TLS certificates. @@ -27,11 +27,8 @@ public static bool AllowUntrusted allowUntrusted = value; // Configure untrusted allowances as needed - if (allowUntrusted && !enabled) - { - OverrideValidation(); - enabled = true; - } + OverrideValidation(); + //enabled = allowUntrusted; } } @@ -40,10 +37,13 @@ private static bool OnValidateCertificate(object sender, X509Certificate certifi { if (sslPolicyErrors != SslPolicyErrors.None) { + /* if (!allowUntrusted && sslPolicyErrors == SslPolicyErrors.RemoteCertificateChainErrors) { return false; } + */ + return (allowUntrusted ? true : false); } return true; diff --git a/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.Designer.cs b/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.Designer.cs index b0c0754..311e8f8 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.Designer.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.Designer.cs @@ -40,15 +40,19 @@ private void InitializeComponent() this.projectLinkLabel = new System.Windows.Forms.LinkLabel(); this.influxDataNetLabel = new System.Windows.Forms.Label(); this.influxDataNetLinkLabel = new System.Windows.Forms.LinkLabel(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.label1 = new System.Windows.Forms.Label(); + this.linkLabel2 = new System.Windows.Forms.LinkLabel(); + this.label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.influxDBLogo)).BeginInit(); this.SuspendLayout(); // // influxDBLogo // this.influxDBLogo.Image = global::CymaticLabs.InfluxDB.Studio.Properties.Resources.influxdb_logo; - this.influxDBLogo.Location = new System.Drawing.Point(12, 12); + this.influxDBLogo.Location = new System.Drawing.Point(14, 13); this.influxDBLogo.Name = "influxDBLogo"; - this.influxDBLogo.Size = new System.Drawing.Size(165, 165); + this.influxDBLogo.Size = new System.Drawing.Size(192, 178); this.influxDBLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.influxDBLogo.TabIndex = 0; this.influxDBLogo.TabStop = false; @@ -57,9 +61,9 @@ private void InitializeComponent() // this.titleLabel.AutoSize = true; this.titleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.titleLabel.Location = new System.Drawing.Point(189, 13); + this.titleLabel.Location = new System.Drawing.Point(220, 14); this.titleLabel.Name = "titleLabel"; - this.titleLabel.Size = new System.Drawing.Size(112, 16); + this.titleLabel.Size = new System.Drawing.Size(135, 20); this.titleLabel.TabIndex = 1; this.titleLabel.Text = "InfluxDB Studio"; // @@ -67,18 +71,18 @@ private void InitializeComponent() // this.versionLabel.AutoSize = true; this.versionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.versionLabel.Location = new System.Drawing.Point(298, 13); + this.versionLabel.Location = new System.Drawing.Point(354, 14); this.versionLabel.Name = "versionLabel"; - this.versionLabel.Size = new System.Drawing.Size(52, 16); + this.versionLabel.Size = new System.Drawing.Size(64, 20); this.versionLabel.TabIndex = 1; this.versionLabel.Text = "0.0.0.0"; // // closeButton // this.closeButton.DialogResult = System.Windows.Forms.DialogResult.OK; - this.closeButton.Location = new System.Drawing.Point(363, 204); + this.closeButton.Location = new System.Drawing.Point(423, 280); this.closeButton.Name = "closeButton"; - this.closeButton.Size = new System.Drawing.Size(75, 23); + this.closeButton.Size = new System.Drawing.Size(87, 25); this.closeButton.TabIndex = 2; this.closeButton.Text = "Close"; this.closeButton.UseVisualStyleBackColor = true; @@ -86,35 +90,35 @@ private void InitializeComponent() // descriptionLabel // this.descriptionLabel.AutoSize = true; - this.descriptionLabel.Location = new System.Drawing.Point(189, 40); + this.descriptionLabel.Location = new System.Drawing.Point(220, 43); this.descriptionLabel.Name = "descriptionLabel"; - this.descriptionLabel.Size = new System.Drawing.Size(167, 13); + this.descriptionLabel.Size = new System.Drawing.Size(209, 15); this.descriptionLabel.TabIndex = 3; this.descriptionLabel.Text = "Visual InfluxDB Management Tool"; // // projectLabel // this.projectLabel.AutoSize = true; - this.projectLabel.Location = new System.Drawing.Point(189, 65); + this.projectLabel.Location = new System.Drawing.Point(220, 70); this.projectLabel.Name = "projectLabel"; - this.projectLabel.Size = new System.Drawing.Size(133, 13); + this.projectLabel.Size = new System.Drawing.Size(162, 15); this.projectLabel.TabIndex = 3; this.projectLabel.Text = "Visit the project website on"; // // copyrightLabel // this.copyrightLabel.AutoSize = true; - this.copyrightLabel.Location = new System.Drawing.Point(189, 90); + this.copyrightLabel.Location = new System.Drawing.Point(220, 97); this.copyrightLabel.Name = "copyrightLabel"; - this.copyrightLabel.Size = new System.Drawing.Size(250, 13); + this.copyrightLabel.Size = new System.Drawing.Size(312, 15); this.copyrightLabel.TabIndex = 3; this.copyrightLabel.Text = "Copyright 2017 Michael Everett. All rights reserved."; // // warranyLabel // - this.warranyLabel.Location = new System.Drawing.Point(189, 140); + this.warranyLabel.Location = new System.Drawing.Point(220, 151); this.warranyLabel.Name = "warranyLabel"; - this.warranyLabel.Size = new System.Drawing.Size(250, 61); + this.warranyLabel.Size = new System.Drawing.Size(292, 66); this.warranyLabel.TabIndex = 3; this.warranyLabel.Text = "The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANT" + "Y OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARITCULAR PURPOSE."; @@ -122,9 +126,9 @@ private void InitializeComponent() // projectLinkLabel // this.projectLinkLabel.AutoSize = true; - this.projectLinkLabel.Location = new System.Drawing.Point(319, 65); + this.projectLinkLabel.Location = new System.Drawing.Point(372, 70); this.projectLinkLabel.Name = "projectLinkLabel"; - this.projectLinkLabel.Size = new System.Drawing.Size(38, 13); + this.projectLinkLabel.Size = new System.Drawing.Size(46, 15); this.projectLinkLabel.TabIndex = 4; this.projectLinkLabel.TabStop = true; this.projectLinkLabel.Text = "Github"; @@ -133,28 +137,72 @@ private void InitializeComponent() // influxDataNetLabel // this.influxDataNetLabel.AutoSize = true; - this.influxDataNetLabel.Location = new System.Drawing.Point(189, 115); + this.influxDataNetLabel.Location = new System.Drawing.Point(220, 124); this.influxDataNetLabel.Name = "influxDataNetLabel"; - this.influxDataNetLabel.Size = new System.Drawing.Size(66, 13); + this.influxDataNetLabel.Size = new System.Drawing.Size(78, 15); this.influxDataNetLabel.TabIndex = 3; this.influxDataNetLabel.Text = "Powered by "; // // influxDataNetLinkLabel // this.influxDataNetLinkLabel.AutoSize = true; - this.influxDataNetLinkLabel.Location = new System.Drawing.Point(249, 115); + this.influxDataNetLinkLabel.Location = new System.Drawing.Point(290, 124); this.influxDataNetLinkLabel.Name = "influxDataNetLinkLabel"; - this.influxDataNetLinkLabel.Size = new System.Drawing.Size(75, 13); + this.influxDataNetLinkLabel.Size = new System.Drawing.Size(92, 15); this.influxDataNetLinkLabel.TabIndex = 4; this.influxDataNetLinkLabel.TabStop = true; this.influxDataNetLinkLabel.Text = "InfluxData.Net"; this.influxDataNetLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.influxDataNetLinkLabel_LinkClicked); // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(315, 225); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(64, 15); + this.linkLabel1.TabIndex = 6; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "sam80180"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(221, 225); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(99, 15); + this.label1.TabIndex = 5; + this.label1.Text = "Modificada por "; + // + // linkLabel2 + // + this.linkLabel2.AutoSize = true; + this.linkLabel2.Location = new System.Drawing.Point(286, 252); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.Size = new System.Drawing.Size(98, 15); + this.linkLabel2.TabIndex = 8; + this.linkLabel2.TabStop = true; + this.linkLabel2.Text = "ASP.NET icons"; + this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(221, 252); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(71, 15); + this.label2.TabIndex = 7; + this.label2.Text = "Iconos por "; + // // AboutDialog // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(450, 239); + this.ClientSize = new System.Drawing.Size(538, 319); + this.Controls.Add(this.linkLabel2); + this.Controls.Add(this.label2); + this.Controls.Add(this.linkLabel1); + this.Controls.Add(this.label1); this.Controls.Add(this.influxDataNetLinkLabel); this.Controls.Add(this.projectLinkLabel); this.Controls.Add(this.warranyLabel); @@ -193,5 +241,9 @@ private void InitializeComponent() private System.Windows.Forms.LinkLabel projectLinkLabel; private System.Windows.Forms.Label influxDataNetLabel; private System.Windows.Forms.LinkLabel influxDataNetLinkLabel; + private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.LinkLabel linkLabel2; } } \ No newline at end of file diff --git a/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.cs b/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.cs index a279f2b..a332402 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.cs @@ -46,10 +46,20 @@ private void influxDataNetLinkLabel_LinkClicked(object sender, LinkLabelLinkClic System.Diagnostics.Process.Start("https://github.com/pootzko/InfluxData.Net"); } + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + System.Diagnostics.Process.Start("https://github.com/sam80180/InfluxDBStudio"); + } // fin linkLabel1_LinkClicked() + #endregion Event Handlers #region Methods #endregion Methods + + private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + System.Diagnostics.Process.Start("https://www.iconfinder.com/iconsets/aspneticons"); + } // fin linkLabel2_LinkClicked() } } diff --git a/src/CymaticLabs.InfluxDB.Studio/Program.cs b/src/CymaticLabs.InfluxDB.Studio/Program.cs index 3f3c06a..50f3652 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Program.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Program.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using System.Windows.Forms; namespace CymaticLabs.InfluxDB.Studio diff --git a/src/CymaticLabs.InfluxDB.Studio/Properties/Resources.Designer.cs b/src/CymaticLabs.InfluxDB.Studio/Properties/Resources.Designer.cs index 61cd9b1..9034bb7 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Properties/Resources.Designer.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Properties/Resources.Designer.cs @@ -302,6 +302,26 @@ internal static System.Drawing.Bitmap Date { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap DbExport { + get { + object obj = ResourceManager.GetObject("DbExport", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap DbImport { + get { + object obj = ResourceManager.GetObject("DbImport", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -551,6 +571,16 @@ internal static System.Drawing.Bitmap Series { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Settings { + get { + object obj = ResourceManager.GetObject("Settings", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -620,5 +650,15 @@ internal static System.Drawing.Bitmap Users { return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap wizard { + get { + object obj = ResourceManager.GetObject("wizard", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/src/CymaticLabs.InfluxDB.Studio/Properties/Resources.resx b/src/CymaticLabs.InfluxDB.Studio/Properties/Resources.resx index a118c49..b1cc9b9 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Properties/Resources.resx +++ b/src/CymaticLabs.InfluxDB.Studio/Properties/Resources.resx @@ -118,172 +118,184 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\ImagesFinal\Password.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ImagesFinal\Connection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\ContinuousQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\CQ_FillType_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\BF_Interval_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\Resources\CQ_Interval_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\ImagesFinal\DbExport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\CQ_ResampleEvery_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\CQ_Tags_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\Resources\CQ_ResampleFor_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\ImagesFinal\EditConnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\CQ_Resample_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\ImagesFinal\Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\CQ_Tags_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\ImagesFinal\FieldKeys.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ImagesFinal\CreateConnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\CreateDatabase.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\DropRetentionPolicy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\CreateUser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\RetentionPolicy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ImagesFinal\Database.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\Diagnostics.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImagesFinal\Disconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImagesFinal\DropDatabase.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\Date.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ImagesFinal\DropMeasurement.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\DropSeries.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImagesFinal\DropUser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImagesFinal\EditConnection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImagesFinal\EditPrivilege.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\CreateContinuousQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ImagesFinal\EditUser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\FieldKeys.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImagesFinal\GrantPrivilege.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImagesFinal\Info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImagesFinal\Measurement.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImagesFinal\NewQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\BF_Filters_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\Resources\ImagesFinal\Password.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\CreateDatabase.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CQ_ResampleEvery_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\Resources\ImagesFinal\RunQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CQ_Resample_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 ..\Resources\ImagesFinal\Series.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\ShowSeries.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\DropSeries.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\TagKeys.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CQ_Destination_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\Resources\ImagesFinal\TagValues.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\DropUser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\RunQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ImagesFinal\Users.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\CQ_Subquery_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - - ..\Resources\ImagesFinal\CreateContinuousQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ImagesFinal\DropContinuousQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\BF_Destination_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\Resources\AppIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\Stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\influxdb-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\Info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\BackFill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\KillQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\CQ_Destination_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\BF_Source_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 ..\Resources\CQ_Source_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\Resources\ImagesFinal\Date.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\influxdb-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\CreateUser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ImagesFinal\Time.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\BF_Destination_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\CQ_Interval_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\Resources\BF_Interval_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\CQ_ResampleFor_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\Resources\BF_Source_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\ImagesFinal\DropContinuousQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\BF_Filters_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\Resources\ImagesFinal\NewQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\KillQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\TagKeys.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\ShowQueries.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\TagValues.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\Stats.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\EditPrivilege.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\ContinuousQuery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\Diagnostics.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\Measurement.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\Disconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ImagesFinal\CreateRetentionPolicy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\DropRetentionPolicy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AppIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\CQ_Subquery_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 ..\Resources\ImagesFinal\EditRetentionPolicy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ImagesFinal\RetentionPolicy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ImagesFinal\BackFill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\ShowQueries.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\GrantPrivilege.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\resources\rp_duration_info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + ..\Resources\ImagesFinal\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\CQ_FillType_Info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + + ..\Resources\ImagesFinal\DbImport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\DropDatabase.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\ShowSeries.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ImagesFinal\wizard.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/src/CymaticLabs.InfluxDB.Studio/Properties/Settings.Designer.cs b/src/CymaticLabs.InfluxDB.Studio/Properties/Settings.Designer.cs index 5017677..8edbe73 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Properties/Settings.Designer.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Properties/Settings.Designer.cs @@ -37,7 +37,7 @@ public string ConnectionsJson { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] + [global::System.Configuration.DefaultSettingValueAttribute("True")] public bool AllowUntrustedSsl { get { return ((bool)(this["AllowUntrustedSsl"])); @@ -49,7 +49,7 @@ public bool AllowUntrustedSsl { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("hh:mm:ss tt")] + [global::System.Configuration.DefaultSettingValueAttribute("HH:mm:ss")] public string TimeFormat { get { return ((string)(this["TimeFormat"])); @@ -61,7 +61,7 @@ public string TimeFormat { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("M/dd/yyyy")] + [global::System.Configuration.DefaultSettingValueAttribute("yyyy/M/d")] public string DateFormat { get { return ((string)(this["DateFormat"])); @@ -70,5 +70,17 @@ public string DateFormat { this["DateFormat"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("rfc3339")] + public string Precision { + get { + return ((string)(this["Precision"])); + } + set { + this["Precision"] = value; + } + } } } diff --git a/src/CymaticLabs.InfluxDB.Studio/Properties/Settings.settings b/src/CymaticLabs.InfluxDB.Studio/Properties/Settings.settings index b4db461..d4e5bd0 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Properties/Settings.settings +++ b/src/CymaticLabs.InfluxDB.Studio/Properties/Settings.settings @@ -6,13 +6,16 @@ - False + True - hh:mm:ss tt + HH:mm:ss - M/dd/yyyy + yyyy/M/d + + + rfc3339 \ No newline at end of file diff --git a/src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/DbExport.png b/src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/DbExport.png new file mode 100644 index 0000000000000000000000000000000000000000..9f682114f109f6c48fb7cda759aca8cb9f8701ee GIT binary patch literal 1040 zcmdr}?Mst!6g^XvoExc_JSnA=gh+~o%#1J>k1tbM;)GNprP7R+%3N((rkI)y2SOMm zmQdPqJIOlTiy&vwm_gYeX<_%_?gI}>kg-Fm6=^I2XyT(zjYTEz<$a_2FfaGApnwrB!I>h>Ftfp z%~i&+Y+FSkoG#ar)u!oxS5zXmEU&!L4Dk3Fr6_|0`HPfwxI;I%K6 z2%oal+;SlL;1*c&j+56(u~k6xv*q8ee)t+t6T?ZIRMCM-U4334>rD1{=9jx_gx6@- zRhl0PTRf^qJ%x%BLB3US?4Uc{FLNZVlDg-63&uL*S~__*K21(EdsnoJ5-u;=IKRF5 zF`P=Szd{~+XpiYo@__-PSQt5{Ivn0F8SH>rJXG|0<^|n0SFNMk#`VqVX`JHx(%zIb kS&wtx_jE;}`lg{zoiMZJ?^XZg_%hiOf+Qi`b*iA|4+c#QvH$=8 literal 0 HcmV?d00001 diff --git a/src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/DbImport.png b/src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/DbImport.png new file mode 100644 index 0000000000000000000000000000000000000000..2a7ca5980f0ea852eb7f55ca854c39a6eaa12c89 GIT binary patch literal 1043 zcmds0>r2y77=AXBYAH=W#4pV>6kMi~6{cwDVsn}@M2%D=hm{$jSk5+9hDS`kTABjw1dI(F@P>-VU7ic@O7SvQXg8@?rsS zPl)HG5YJx2HW$L2ke#W33zC!4_|A1Jud1)8sxvRIwD<+zgaeT)3rt3?m`n%3x zv{|j=)B0tLb;e-Q3{R*&4m^3)@v{AsVQv9uQF{B{&v7j~kB!qPsl3~({_1oBRPV#NN!bu13{r#>&L$j5d;~!uLQz1p zo+tSK%zIr@9$||1YYL!65(X%e={+Vv7V;062vg9>$RKnnc7S5809%!w98hAtcsj@% zei$9%`g+e4(PVJc#$f8?$uIf()uDqVfz zNwU2#KBEW-^zM^NB{Gc0OlK%xtClb#9 literal 0 HcmV?d00001 diff --git a/src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/Settings.png b/src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/Settings.png new file mode 100644 index 0000000000000000000000000000000000000000..009eaac3c6b310a850e6e542de521a5191c75e04 GIT binary patch literal 1083 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR|lYLC4gE%@gJ{^v-PV zpSkbonRg$*l{Zg#@ciwx1uFw$)At`c`{nzOzkmM(CuGiDv-|Rm`|sbsd-VME#hZ`s z-M_!<$i?#JK0Qm9isrte+RmKHmdjUf>^yXG!km?^{*k_62?f>dJNE29diGjyTxLmK z=k*6KR;<}@_wfsTYc~yJJD;$`B`el%+jH>Z&4;rWuetN^iH3>&agAYS8kS=COV$fsAWAJ21V<=_F zVW?nmVsHV9lrRJX`I!tU4EYQ}3^5F;K)M(xlFU#9WXAy6oqn=nV!S4R%Bckd*kYutep1PB|lk1d#Vi@CgIZ(Srb- zV9?{tyaRN|_Z|jTpxZ7oFfh6ZX)s8XyefI7CC#94tAl}&GZUyF^Ui_q8#oU$NR-Pz zkbmIHz)%i%{tpv|c%Y8wCnSEDoY)EU*>kwmmjeu(xrc!M2a50jvBVDs1_vMwq<~=p zBv1ek0~44p!N};?#-LJq5~yB^;oY4ROzi)Rp8=&9OM?7@862M7NCR<_yxm;OkH}&M20djEW~^9hUj`IB?&;zfQgO?+|E5rr0gtP&V>kCBCap(#tSmfX4hNt9 zuRks3cHTMv-Aq4g#ub^FQQZGBq+WFFIyI}TUD9oPw#1st!F%l!mUSLhoTVlm5fqVQ zGS4Ts+Dfv2hERg#xtx6wXVUu?@7nz(?Dbi(!tIgk_blbEK5}^C;ud-Sj%tgabpmEe zJT?DWo@@B&b(+Mu$;^GKZMgJ$%jYMvg4WmxmMqrM@3NWP9Pr4GziP@-n-_Yov_);> sQ-4+ksm@AmY54y9bJ$P!j`-h9vwFomXY=fw2lNtyr>mdKI;Vst0B5!@vj6}9 literal 0 HcmV?d00001 diff --git a/src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/wizard.gif b/src/CymaticLabs.InfluxDB.Studio/Resources/ImagesFinal/wizard.gif new file mode 100644 index 0000000000000000000000000000000000000000..04db53a6c659ea6a31075fd9a7ab74b7ccc5fec6 GIT binary patch literal 211 zcmZ?wbhEHb6krfwI3mgLzta2ve}*|yq=qPV%DtZ#`d277n-J} z9hf+4`R@IP{$Cf1Oe%f-@$3Huru+8&FD<>fV8JU>)BJ*hbN{c4|3C8|2pBMc;!hSv z1_nt69gqyjP6pP11hu{twka!SayBejwn*TN-X1mwxhpHyX$aoYH07|6nSS8FG|h9< xRyJobMDTgCv!s>irgFEjTyA0zp3&bXdAGqp>kR8r-9B%%(zLdMYw1o5)&P|7Qq}+f literal 0 HcmV?d00001 diff --git a/src/CymaticLabs.InfluxDB.Studio/packages.config b/src/CymaticLabs.InfluxDB.Studio/packages.config index 827f9ec..f360c4e 100644 --- a/src/CymaticLabs.InfluxDB.Studio/packages.config +++ b/src/CymaticLabs.InfluxDB.Studio/packages.config @@ -1,16 +1,16 @@  - - + + - - - + + + - + \ No newline at end of file