From 9cdafa013125ba849db57ad12c37ab53b57a6b0c Mon Sep 17 00:00:00 2001 From: ttp Date: Thu, 4 Jun 2009 00:32:22 +0900 Subject: [PATCH] =?utf8?q?AppliStation-GUI,=E3=83=91=E3=83=83=E3=82=B1?= =?utf8?q?=E3=83=BC=E3=82=B8=E6=83=85=E5=A0=B1=E8=A1=A8=E7=A4=BA=E3=83=80?= =?utf8?q?=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=81=AB=E3=83=91=E3=83=83?= =?utf8?q?=E3=82=B1=E3=83=BC=E3=82=B8=E3=83=AA=E3=82=B9=E3=83=88=E5=90=8D?= =?utf8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- AppliStation/PackageInfoForm.Designer.cs | 41 +++++++++++++++++++++++++------- AppliStation/PackageInfoForm.cs | 10 ++++++++ 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/AppliStation/PackageInfoForm.Designer.cs b/AppliStation/PackageInfoForm.Designer.cs index 59537db..8c05a04 100644 --- a/AppliStation/PackageInfoForm.Designer.cs +++ b/AppliStation/PackageInfoForm.Designer.cs @@ -45,6 +45,8 @@ this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); this.stateLabel = new System.Windows.Forms.Label(); this.statusLinkLabel = new System.Windows.Forms.LinkLabel(); + this.packageListNameLabel = new System.Windows.Forms.Label(); + this.packageListNameValueLabel = new System.Windows.Forms.Label(); this.flowLayoutPanel1.SuspendLayout(); this.tableLayoutPanel.SuspendLayout(); this.SuspendLayout(); @@ -135,10 +137,8 @@ // // tagsTextBox // - this.tagsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.tagsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.tagsTextBox.Dock = System.Windows.Forms.DockStyle.Fill; this.tagsTextBox.Location = new System.Drawing.Point(130, 105); this.tagsTextBox.Name = "tagsTextBox"; this.tagsTextBox.ReadOnly = true; @@ -180,10 +180,10 @@ // this.tableLayoutPanel.SetColumnSpan(this.tabControl1, 2); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl1.Location = new System.Drawing.Point(11, 147); + this.tabControl1.Location = new System.Drawing.Point(11, 159); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(370, 165); + this.tabControl1.Size = new System.Drawing.Size(370, 153); this.tabControl1.TabIndex = 12; // // closeButton @@ -205,23 +205,26 @@ this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel.Controls.Add(this.stateLabel, 0, 2); this.tableLayoutPanel.Controls.Add(this.typeValueLabel, 1, 6); - this.tableLayoutPanel.Controls.Add(this.tabControl1, 0, 7); + this.tableLayoutPanel.Controls.Add(this.tabControl1, 0, 8); this.tableLayoutPanel.Controls.Add(this.licenseLinkLabel, 1, 5); this.tableLayoutPanel.Controls.Add(this.flowLayoutPanel1, 0, 0); this.tableLayoutPanel.Controls.Add(this.summaryTextBox, 0, 1); this.tableLayoutPanel.Controls.Add(this.tagsTextBox, 1, 4); - this.tableLayoutPanel.Controls.Add(this.closeButton, 1, 8); + this.tableLayoutPanel.Controls.Add(this.closeButton, 1, 9); this.tableLayoutPanel.Controls.Add(this.typeLabel, 0, 6); this.tableLayoutPanel.Controls.Add(this.licenseLabel, 0, 5); this.tableLayoutPanel.Controls.Add(this.tagsLabel, 0, 4); this.tableLayoutPanel.Controls.Add(this.urlLabel, 0, 3); this.tableLayoutPanel.Controls.Add(this.urlLinkLabel, 1, 3); this.tableLayoutPanel.Controls.Add(this.statusLinkLabel, 1, 2); + this.tableLayoutPanel.Controls.Add(this.packageListNameLabel, 0, 7); + this.tableLayoutPanel.Controls.Add(this.packageListNameValueLabel, 1, 7); this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel.Name = "tableLayoutPanel"; this.tableLayoutPanel.Padding = new System.Windows.Forms.Padding(8); - this.tableLayoutPanel.RowCount = 9; + this.tableLayoutPanel.RowCount = 10; + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); @@ -259,6 +262,26 @@ this.statusLinkLabel.VisitedLinkColor = System.Drawing.SystemColors.HotTrack; this.statusLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelLinkClicked); // + // packageListNameLabel + // + this.packageListNameLabel.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.packageListNameLabel.AutoSize = true; + this.packageListNameLabel.Location = new System.Drawing.Point(11, 144); + this.packageListNameLabel.Name = "packageListNameLabel"; + this.packageListNameLabel.Size = new System.Drawing.Size(93, 12); + this.packageListNameLabel.TabIndex = 14; + this.packageListNameLabel.Text = "パッケージリスト名："; + // + // packageListNameValueLabel + // + this.packageListNameValueLabel.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.packageListNameValueLabel.AutoSize = true; + this.packageListNameValueLabel.Location = new System.Drawing.Point(130, 144); + this.packageListNameValueLabel.Name = "packageListNameValueLabel"; + this.packageListNameValueLabel.Size = new System.Drawing.Size(41, 12); + this.packageListNameValueLabel.TabIndex = 14; + this.packageListNameValueLabel.Text = "（不明）"; + // // PackageInfoForm // this.AcceptButton = this.closeButton; @@ -277,6 +300,8 @@ this.tableLayoutPanel.PerformLayout(); this.ResumeLayout(false); } + private System.Windows.Forms.Label packageListNameValueLabel; + private System.Windows.Forms.Label packageListNameLabel; private System.Windows.Forms.LinkLabel statusLinkLabel; private System.Windows.Forms.Label stateLabel; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel; diff --git a/AppliStation/PackageInfoForm.cs b/AppliStation/PackageInfoForm.cs index 4aeb081..69409f1 100644 --- a/AppliStation/PackageInfoForm.cs +++ b/AppliStation/PackageInfoForm.cs @@ -74,6 +74,8 @@ namespace AppliStation if (pkg.Url != null) { urlLinkLabel.Text = pkg.Url.Href; urlLinkLabel.Links.Add(0, pkg.Url.Href.Length, pkg.Url.Href); + urlLinkLabel.Enabled = true; + urlLabel.Enabled = true; } else { urlLinkLabel.Text = string.Empty; urlLinkLabel.Enabled = false; @@ -82,6 +84,14 @@ namespace AppliStation tagsTextBox.Text = pkg.Tags; setLinkLabelFromLicense(licenseLinkLabel, pkg.License, (pkg.Url!=null)?pkg.Url.Href:string.Empty); setTypeValueLabel(typeValueLabel, pkg.Type); + if (! string.IsNullOrEmpty(pkg.PackageListName)) { + packageListNameValueLabel.Text = pkg.PackageListName; + packageListNameLabel.Enabled = true; + packageListNameValueLabel.Enabled = true; + } else { + packageListNameLabel.Enabled = false; + packageListNameValueLabel.Enabled = false; + } tabControl1.TabPages.Clear(); if (pkg is InstalledPackage && string.IsNullOrEmpty(pkg.Version)) { -- 2.11.0