diff options
author | Lluis Sanchez <lluis@novell.com> | 2010-04-27 22:42:33 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@novell.com> | 2010-04-27 22:42:33 +0400 |
commit | 67da10d7ee1dd8fa51d5d893749611678e8afe0b (patch) | |
tree | 36e1cd4bbc9b6d79b8fd13a65eaa9ebf685bb2a1 /main/src/core/MonoDevelop.Ide | |
parent | daabc6e17a2a01a7e9e8bd85ffdfbf6b8ffcbfe4 (diff) |
* gtk-gui/gui.stetic:
* MonoDevelop.Ide.Projects/NewFileDialog.cs:
* gtk-gui/MonoDevelop.Ide.Projects.NewFileDialog.cs:
* gtk-gui/MonoDevelop.Ide.Projects.NewProjectDialog.cs:
* gtk-gui/MonoDevelop.Ide.NavigateToDialog.NavigateToDialog.cs:
Improved look of the New File dialog.
svn path=/trunk/monodevelop/; revision=156247
Diffstat (limited to 'main/src/core/MonoDevelop.Ide')
6 files changed, 353 insertions, 146 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog index ea82f145bd..a63d3ac447 100644 --- a/main/src/core/MonoDevelop.Ide/ChangeLog +++ b/main/src/core/MonoDevelop.Ide/ChangeLog @@ -1,3 +1,12 @@ +2010-04-27 Lluis Sanchez Gual <lluis@novell.com> + + * gtk-gui/gui.stetic: + * MonoDevelop.Ide.Projects/NewFileDialog.cs: + * gtk-gui/MonoDevelop.Ide.Projects.NewFileDialog.cs: + * gtk-gui/MonoDevelop.Ide.Projects.NewProjectDialog.cs: + * gtk-gui/MonoDevelop.Ide.NavigateToDialog.NavigateToDialog.cs: + Improved look of the New File dialog. + 2010-04-27 Mike Krüger <mkrueger@novell.com> * gtk-gui/gui.stetic: diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs index 1df3984092..1aa5e8a710 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewFileDialog.cs @@ -43,6 +43,7 @@ using Gtk; using MonoDevelop.Components; using IconView = MonoDevelop.Components.IconView; using Gdk; +using MonoDevelop.Ide.Gui.Components; namespace MonoDevelop.Ide.Projects { @@ -56,6 +57,7 @@ namespace MonoDevelop.Ide.Projects Dictionary<string, bool> activeLangs = new Dictionary<string, bool> (); TreeStore catStore; + TemplateView iconView; // Add To Project widgets string[] projectNames; @@ -133,6 +135,7 @@ namespace MonoDevelop.Ide.Projects if (catView.Selection.GetSelected (out treeModel, out treeIter)) { okButton.Sensitive = false; FillCategoryTemplates (treeIter); + catView.ExpandRow (treeModel.GetPath (treeIter), false); } } @@ -333,7 +336,7 @@ namespace MonoDevelop.Ide.Projects { iconView.Clear (); foreach (TemplateItem item in (List<TemplateItem>)(catStore.GetValue (iter, 2))) { - iconView.AddIcon (new Gtk.Image (ImageService.GetPixbuf (item.Template.Icon, Gtk.IconSize.Dnd)), GettextCatalog.GetString (item.Name), item); + iconView.Add (item); } } @@ -354,13 +357,16 @@ namespace MonoDevelop.Ide.Projects TemplateItem sel = (TemplateItem)iconView.CurrentlySelected; if (sel == null) { okButton.Sensitive = false; + infoLabel.Text = string.Empty; + labelTemplateTitle.Text = string.Empty; return; } FileTemplate item = sel.Template; if (item != null) { - infoLabel.Text = item.Description; + labelTemplateTitle.Markup = "<b>" + GettextCatalog.GetString (item.Name) + "</b>"; + infoLabel.Text = GettextCatalog.GetString (item.Description); //desensitise the text entry if the name is fixed //careful to store user-entered text so we can replace it if they change their selection @@ -387,6 +393,8 @@ namespace MonoDevelop.Ide.Projects } else { nameEntry.Sensitive = true; okButton.Sensitive = false; + infoLabel.Text = string.Empty; + labelTemplateTitle.Text = string.Empty; } } catch (Exception ex) { LoggingService.LogError (ex.ToString ()); @@ -522,6 +530,10 @@ namespace MonoDevelop.Ide.Projects void InitializeComponents () { + iconView = new TemplateView (); + iconView.ShowAll (); + boxTemplates.PackStart (iconView, true, true, 0); + catStore = new TreeStore (typeof(string), typeof(List<Category>), typeof(List<TemplateItem>), typeof(Pixbuf)); TreeViewColumn treeViewColumn = new TreeViewColumn (); @@ -540,11 +552,14 @@ namespace MonoDevelop.Ide.Projects nameEntry.Changed += new EventHandler (NameChanged); nameEntry.Activated += new EventHandler (OpenEvent); + infoLabel.Text = string.Empty; + labelTemplateTitle.Text = string.Empty; + ReadOnlyCollection<Project> projects = null; if (parentProject == null) projects = IdeApp.Workspace.GetAllProjects (); - if (projects != null) { + if (projects != null && projects.Count > 0) { Project curProject = IdeApp.ProjectOperations.CurrentSelectedProject; boxProject.Visible = true; @@ -590,13 +605,22 @@ namespace MonoDevelop.Ide.Projects catView.Selection.Changed += new EventHandler (CategoryChange); catView.RowActivated += new RowActivatedHandler (CategoryActivated); - iconView.IconSelected += new EventHandler (SelectedIndexChange); - iconView.IconDoubleClicked += new EventHandler (OpenEvent); + iconView.SelectionChanged += new EventHandler (SelectedIndexChange); + iconView.DoubleClicked += new EventHandler (OpenEvent); InitializeDialog (false); InitializeView (); UpdateOkStatus (); } + protected virtual void OnScrolledInfoSizeAllocated (object o, Gtk.SizeAllocatedArgs args) + { + if (infoLabel.WidthRequest != scrolledInfo.Allocation.Width) { + infoLabel.WidthRequest = scrolledInfo.Allocation.Width; + labelTemplateTitle.WidthRequest = scrolledInfo.Allocation.Width; + } + } + + class Category { List<Category> categories = new List<Category> (); @@ -630,7 +654,106 @@ namespace MonoDevelop.Ide.Projects set { hasSelectedTemplate = value; } } } + + class TemplateView: ScrolledWindow + { + TemplateTreeView tree; + + public TemplateView () + { + tree = new TemplateTreeView (); + tree.Selection.Changed += delegate { + if (SelectionChanged != null) + SelectionChanged (this, EventArgs.Empty); + }; + tree.RowActivated += delegate { + if (DoubleClicked != null) + DoubleClicked (this, EventArgs.Empty); + }; + Add (tree); + HscrollbarPolicy = PolicyType.Automatic; + VscrollbarPolicy = PolicyType.Automatic; + ShadowType = ShadowType.In; + ShowAll (); + } + + public TemplateItem CurrentlySelected { + get { return tree.CurrentlySelected; } + set { tree.CurrentlySelected = value; } + } + + public void Add (TemplateItem templateItem) + { + tree.Add (templateItem); + } + + public void Clear () + { + tree.Clear (); + } + + public event EventHandler SelectionChanged; + public event EventHandler DoubleClicked; + } + + class TemplateTreeView: TreeView + { + Gtk.ListStore templateStore; + + public TemplateTreeView () + { + HeadersVisible = false; + templateStore = new ListStore (typeof(string), typeof(string), typeof(TemplateItem)); + Model = templateStore; + + TreeViewColumn col = new TreeViewColumn (); + CellRendererIcon crp = new CellRendererIcon (); + crp.StockSize = (uint) Gtk.IconSize.Dnd; + crp.Ypad = 2; + col.PackStart (crp, false); + col.AddAttribute (crp, "stock-id", 0); + + CellRendererText crt = new CellRendererText (); + col.PackStart (crt, false); + col.AddAttribute (crt, "markup", 1); + + AppendColumn (col); + ShowAll (); + } + + public TemplateItem CurrentlySelected { + get { + Gtk.TreeIter iter; + if (!Selection.GetSelected (out iter)) + return null; + return (TemplateItem) templateStore.GetValue (iter, 2); + } + set { + Gtk.TreeIter iter; + if (templateStore.GetIterFirst (out iter)) { + do { + TemplateItem t = (TemplateItem) templateStore.GetValue (iter, 2); + if (t == value) { + Selection.SelectIter (iter); + return; + } + } while (templateStore.IterNext (ref iter)); + } + } + } + + public void Add (TemplateItem templateItem) + { + string name = GLib.Markup.EscapeText (GettextCatalog.GetString (templateItem.Name)); + if (!string.IsNullOrEmpty (templateItem.Language)) + name += "\n<span foreground='darkgrey'><small>" + templateItem.Language + "</small></span>"; + templateStore.AppendValues (templateItem.Template.Icon.IsNull ? "md-project" : templateItem.Template.Icon.ToString (), name, templateItem); + } + + public void Clear () + { + templateStore.Clear (); + } + } } - - } diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.NavigateToDialog.NavigateToDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.NavigateToDialog.NavigateToDialog.cs index 6362644f70..36c670fb8b 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.NavigateToDialog.NavigateToDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.NavigateToDialog.NavigateToDialog.cs @@ -89,7 +89,6 @@ namespace MonoDevelop.Ide.NavigateToDialog global::Gtk.HButtonBox w7 = this.ActionArea; w7.Name = "dialog1_ActionArea"; w7.Spacing = 10; - w7.BorderWidth = ((uint)(5)); w7.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild this.buttonCancel = new global::Gtk.Button (); @@ -119,8 +118,8 @@ namespace MonoDevelop.Ide.NavigateToDialog if ((this.Child != null)) { this.Child.ShowAll (); } - this.DefaultWidth = 565; - this.DefaultHeight = 438; + this.DefaultWidth = 597; + this.DefaultHeight = 465; this.label1.MnemonicWidget = this.matchEntry; this.labelResults.MnemonicWidget = this.scrolledwindow1; this.Hide (); diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.NewFileDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.NewFileDialog.cs index 43699a7bdf..8834e2f8b4 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.NewFileDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.NewFileDialog.cs @@ -6,17 +6,21 @@ namespace MonoDevelop.Ide.Projects { private global::Gtk.VBox vbox2; - private global::Gtk.HBox hbox1; + private global::Gtk.HPaned hpaned1; private global::Gtk.ScrolledWindow scrolledwindow1; private global::Gtk.TreeView catView; - private global::MonoDevelop.Components.IconView iconView; + private global::Gtk.HPaned panedTemplates; - private global::Gtk.Frame frame1; + private global::Gtk.VBox boxTemplates; - private global::Gtk.Alignment GtkAlignment2; + private global::Gtk.ScrolledWindow scrolledInfo; + + private global::Gtk.VBox boxInfo; + + private global::Gtk.Label labelTemplateTitle; private global::Gtk.Label infoLabel; @@ -65,10 +69,11 @@ namespace MonoDevelop.Ide.Projects this.vbox2.Spacing = 6; this.vbox2.BorderWidth = ((uint)(6)); // Container child vbox2.Gtk.Box+BoxChild - this.hbox1 = new global::Gtk.HBox (); - this.hbox1.Name = "hbox1"; - this.hbox1.Spacing = 6; - // Container child hbox1.Gtk.Box+BoxChild + this.hpaned1 = new global::Gtk.HPaned (); + this.hpaned1.CanFocus = true; + this.hpaned1.Name = "hpaned1"; + this.hpaned1.Position = 192; + // Container child hpaned1.Gtk.Paned+PanedChild this.scrolledwindow1 = new global::Gtk.ScrolledWindow (); this.scrolledwindow1.CanFocus = true; this.scrolledwindow1.Name = "scrolledwindow1"; @@ -80,50 +85,80 @@ namespace MonoDevelop.Ide.Projects this.catView.Name = "catView"; this.catView.HeadersVisible = false; this.scrolledwindow1.Add (this.catView); - this.hbox1.Add (this.scrolledwindow1); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1])); - w3.Position = 0; - w3.Expand = false; - w3.Fill = false; - // Container child hbox1.Gtk.Box+BoxChild - this.iconView = new global::MonoDevelop.Components.IconView (); - this.iconView.CanFocus = true; - this.iconView.Name = "iconView"; - this.hbox1.Add (this.iconView); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.iconView])); - w4.Position = 1; - this.vbox2.Add (this.hbox1); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1])); - w5.Position = 0; - // Container child vbox2.Gtk.Box+BoxChild - this.frame1 = new global::Gtk.Frame (); - this.frame1.Name = "frame1"; - this.frame1.ShadowType = ((global::Gtk.ShadowType)(1)); - // Container child frame1.Gtk.Container+ContainerChild - this.GtkAlignment2 = new global::Gtk.Alignment (0f, 0f, 1f, 1f); - this.GtkAlignment2.Name = "GtkAlignment2"; - // Container child GtkAlignment2.Gtk.Container+ContainerChild + this.hpaned1.Add (this.scrolledwindow1); + global::Gtk.Paned.PanedChild w3 = ((global::Gtk.Paned.PanedChild)(this.hpaned1[this.scrolledwindow1])); + w3.Resize = false; + // Container child hpaned1.Gtk.Paned+PanedChild + this.panedTemplates = new global::Gtk.HPaned (); + this.panedTemplates.CanFocus = true; + this.panedTemplates.Name = "panedTemplates"; + this.panedTemplates.Position = 292; + // Container child panedTemplates.Gtk.Paned+PanedChild + this.boxTemplates = new global::Gtk.VBox (); + this.boxTemplates.Name = "boxTemplates"; + this.boxTemplates.Spacing = 6; + this.panedTemplates.Add (this.boxTemplates); + global::Gtk.Paned.PanedChild w4 = ((global::Gtk.Paned.PanedChild)(this.panedTemplates[this.boxTemplates])); + w4.Resize = false; + // Container child panedTemplates.Gtk.Paned+PanedChild + this.scrolledInfo = new global::Gtk.ScrolledWindow (); + this.scrolledInfo.CanFocus = true; + this.scrolledInfo.Name = "scrolledInfo"; + this.scrolledInfo.HscrollbarPolicy = ((global::Gtk.PolicyType)(2)); + this.scrolledInfo.ShadowType = ((global::Gtk.ShadowType)(1)); + // Container child scrolledInfo.Gtk.Container+ContainerChild + global::Gtk.Viewport w5 = new global::Gtk.Viewport (); + w5.ShadowType = ((global::Gtk.ShadowType)(0)); + // Container child GtkViewport.Gtk.Container+ContainerChild + this.boxInfo = new global::Gtk.VBox (); + this.boxInfo.Name = "boxInfo"; + this.boxInfo.Spacing = 6; + this.boxInfo.BorderWidth = ((uint)(3)); + // Container child boxInfo.Gtk.Box+BoxChild + this.labelTemplateTitle = new global::Gtk.Label (); + this.labelTemplateTitle.WidthRequest = 145; + this.labelTemplateTitle.Name = "labelTemplateTitle"; + this.labelTemplateTitle.Xalign = 0f; + this.labelTemplateTitle.LabelProp = global::MonoDevelop.Core.GettextCatalog.GetString ("<b>Console Project</b>"); + this.labelTemplateTitle.UseMarkup = true; + this.labelTemplateTitle.Wrap = true; + this.boxInfo.Add (this.labelTemplateTitle); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.boxInfo[this.labelTemplateTitle])); + w6.Position = 0; + w6.Expand = false; + w6.Fill = false; + // Container child boxInfo.Gtk.Box+BoxChild this.infoLabel = new global::Gtk.Label (); + this.infoLabel.WidthRequest = 145; this.infoLabel.Name = "infoLabel"; this.infoLabel.Xalign = 0f; - this.infoLabel.Ellipsize = ((global::Pango.EllipsizeMode)(3)); - this.GtkAlignment2.Add (this.infoLabel); - this.frame1.Add (this.GtkAlignment2); - this.vbox2.Add (this.frame1); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.frame1])); - w8.Position = 1; - w8.Expand = false; - w8.Fill = false; + this.infoLabel.Yalign = 0f; + this.infoLabel.LabelProp = global::MonoDevelop.Core.GettextCatalog.GetString ("Creates a new C# Project"); + this.infoLabel.Wrap = true; + this.boxInfo.Add (this.infoLabel); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.boxInfo[this.infoLabel])); + w7.Position = 1; + w7.Expand = false; + w7.Fill = false; + w5.Add (this.boxInfo); + this.scrolledInfo.Add (w5); + this.panedTemplates.Add (this.scrolledInfo); + global::Gtk.Paned.PanedChild w10 = ((global::Gtk.Paned.PanedChild)(this.panedTemplates[this.scrolledInfo])); + w10.Resize = false; + this.hpaned1.Add (this.panedTemplates); + this.vbox2.Add (this.hpaned1); + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hpaned1])); + w12.Position = 0; // Container child vbox2.Gtk.Box+BoxChild this.label1 = new global::Gtk.Label (); this.label1.WidthRequest = 1; this.label1.HeightRequest = 1; this.label1.Name = "label1"; this.vbox2.Add (this.label1); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.label1])); - w9.Position = 2; - w9.Expand = false; - w9.Fill = false; + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.label1])); + w13.Position = 1; + w13.Expand = false; + w13.Fill = false; // Container child vbox2.Gtk.Box+BoxChild this.hbox2 = new global::Gtk.HBox (); this.hbox2.Name = "hbox2"; @@ -133,10 +168,10 @@ namespace MonoDevelop.Ide.Projects this.label2.Name = "label2"; this.label2.LabelProp = global::MonoDevelop.Core.GettextCatalog.GetString ("Name:"); this.hbox2.Add (this.label2); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.label2])); - w10.Position = 0; - w10.Expand = false; - w10.Fill = false; + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.label2])); + w14.Position = 0; + w14.Expand = false; + w14.Fill = false; // Container child hbox2.Gtk.Box+BoxChild this.nameEntry = new global::Gtk.Entry (); this.nameEntry.CanFocus = true; @@ -144,13 +179,13 @@ namespace MonoDevelop.Ide.Projects this.nameEntry.IsEditable = true; this.nameEntry.InvisibleChar = '●'; this.hbox2.Add (this.nameEntry); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.nameEntry])); - w11.Position = 1; + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.nameEntry])); + w15.Position = 1; this.vbox2.Add (this.hbox2); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox2])); - w12.Position = 3; - w12.Expand = false; - w12.Fill = false; + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox2])); + w16.Position = 2; + w16.Expand = false; + w16.Fill = false; // Container child vbox2.Gtk.Box+BoxChild this.boxProject = new global::Gtk.VBox (); this.boxProject.Name = "boxProject"; @@ -167,21 +202,21 @@ namespace MonoDevelop.Ide.Projects this.projectAddCheckbox.DrawIndicator = true; this.projectAddCheckbox.UseUnderline = true; this.hbox3.Add (this.projectAddCheckbox); - global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.projectAddCheckbox])); - w13.Position = 0; - w13.Expand = false; - w13.Fill = false; + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.projectAddCheckbox])); + w17.Position = 0; + w17.Expand = false; + w17.Fill = false; // Container child hbox3.Gtk.Box+BoxChild this.projectAddCombo = global::Gtk.ComboBox.NewText (); this.projectAddCombo.Name = "projectAddCombo"; this.hbox3.Add (this.projectAddCombo); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.projectAddCombo])); - w14.Position = 1; + global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.projectAddCombo])); + w18.Position = 1; this.boxProject.Add (this.hbox3); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.boxProject[this.hbox3])); - w15.Position = 0; - w15.Expand = false; - w15.Fill = false; + global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.boxProject[this.hbox3])); + w19.Position = 0; + w19.Expand = false; + w19.Fill = false; // Container child boxProject.Gtk.Box+BoxChild this.hbox4 = new global::Gtk.HBox (); this.hbox4.Name = "hbox4"; @@ -191,35 +226,35 @@ namespace MonoDevelop.Ide.Projects this.projectPathLabel.Name = "projectPathLabel"; this.projectPathLabel.LabelProp = global::MonoDevelop.Core.GettextCatalog.GetString ("Path:"); this.hbox4.Add (this.projectPathLabel); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.projectPathLabel])); - w16.Position = 0; - w16.Expand = false; - w16.Fill = false; + global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.projectPathLabel])); + w20.Position = 0; + w20.Expand = false; + w20.Fill = false; // Container child hbox4.Gtk.Box+BoxChild this.projectFolderEntry = new global::MonoDevelop.Components.FolderEntry (); this.projectFolderEntry.Name = "projectFolderEntry"; this.hbox4.Add (this.projectFolderEntry); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.projectFolderEntry])); - w17.Position = 1; + global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.projectFolderEntry])); + w21.Position = 1; this.boxProject.Add (this.hbox4); - global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.boxProject[this.hbox4])); - w18.Position = 1; - w18.Expand = false; - w18.Fill = false; + global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.boxProject[this.hbox4])); + w22.Position = 1; + w22.Expand = false; + w22.Fill = false; this.vbox2.Add (this.boxProject); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.boxProject])); - w19.Position = 4; - w19.Expand = false; - w19.Fill = false; + global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.boxProject])); + w23.Position = 3; + w23.Expand = false; + w23.Fill = false; w1.Add (this.vbox2); - global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(w1[this.vbox2])); - w20.Position = 0; + global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(w1[this.vbox2])); + w24.Position = 0; // Internal child MonoDevelop.Ide.Projects.NewFileDialog.ActionArea - global::Gtk.HButtonBox w21 = this.ActionArea; - w21.Name = "dialog1_ActionArea"; - w21.Spacing = 6; - w21.BorderWidth = ((uint)(5)); - w21.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); + global::Gtk.HButtonBox w25 = this.ActionArea; + w25.Name = "dialog1_ActionArea"; + w25.Spacing = 6; + w25.BorderWidth = ((uint)(5)); + w25.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild this.cancelButton = new global::Gtk.Button (); this.cancelButton.CanDefault = true; @@ -229,9 +264,9 @@ namespace MonoDevelop.Ide.Projects this.cancelButton.UseUnderline = true; this.cancelButton.Label = "gtk-cancel"; this.AddActionWidget (this.cancelButton, -6); - global::Gtk.ButtonBox.ButtonBoxChild w22 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w21[this.cancelButton])); - w22.Expand = false; - w22.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w26 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w25[this.cancelButton])); + w26.Expand = false; + w26.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild this.okButton = new global::Gtk.Button (); this.okButton.CanDefault = true; @@ -240,18 +275,19 @@ namespace MonoDevelop.Ide.Projects this.okButton.UseStock = true; this.okButton.UseUnderline = true; this.okButton.Label = "gtk-new"; - w21.Add (this.okButton); - global::Gtk.ButtonBox.ButtonBoxChild w23 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w21[this.okButton])); - w23.Position = 1; - w23.Expand = false; - w23.Fill = false; + w25.Add (this.okButton); + global::Gtk.ButtonBox.ButtonBoxChild w27 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w25[this.okButton])); + w27.Position = 1; + w27.Expand = false; + w27.Fill = false; if ((this.Child != null)) { this.Child.ShowAll (); } - this.DefaultWidth = 597; - this.DefaultHeight = 370; + this.DefaultWidth = 718; + this.DefaultHeight = 524; this.boxProject.Hide (); this.Show (); + this.scrolledInfo.SizeAllocated += new global::Gtk.SizeAllocatedHandler (this.OnScrolledInfoSizeAllocated); } } } diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.NewProjectDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.NewProjectDialog.cs index 919181494f..daad18135c 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.NewProjectDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.NewProjectDialog.cs @@ -148,6 +148,7 @@ namespace MonoDevelop.Ide.Projects this.boxInfo = new global::Gtk.VBox (); this.boxInfo.Name = "boxInfo"; this.boxInfo.Spacing = 6; + this.boxInfo.BorderWidth = ((uint)(3)); // Container child boxInfo.Gtk.Box+BoxChild this.labelTemplateTitle = new global::Gtk.Label (); this.labelTemplateTitle.WidthRequest = 30; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic index 80d9410b15..6ca300edba 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic @@ -5,7 +5,6 @@ <target-gtk-version>2.12</target-gtk-version> </configuration> <import> - <widget-library name="Mono.Addins.Gui, Version=0.5.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> <widget-library name="../../../../build/bin/Mono.TextEditor.dll" /> <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" internal="true" /> </import> @@ -324,6 +323,7 @@ <widget class="Gtk.VBox" id="boxInfo"> <property name="MemberName" /> <property name="Spacing">6</property> + <property name="BorderWidth">3</property> <signal name="SizeAllocated" handler="OnBoxInfoSizeAllocated" /> <child> <widget class="Gtk.Label" id="labelTemplateTitle"> @@ -950,7 +950,6 @@ <property name="MemberName" /> <property name="CanFocus">True</property> <property name="Type">Custom</property> - <property name="Label">View Conflicts</property> <property name="UseMarkup">False</property> </widget> <packing> @@ -3183,7 +3182,7 @@ Months</property> </widget> </child> </widget> - <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Projects.NewFileDialog" design-size="597 370"> + <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Projects.NewFileDialog" design-size="718 524"> <property name="MemberName" /> <property name="GeneratePublic">False</property> <property name="Title" translatable="yes">New File</property> @@ -3202,9 +3201,10 @@ Months</property> <property name="Spacing">6</property> <property name="BorderWidth">6</property> <child> - <widget class="Gtk.HBox" id="hbox1"> + <widget class="Gtk.HPaned" id="hpaned1"> <property name="MemberName" /> - <property name="Spacing">6</property> + <property name="CanFocus">True</property> + <property name="Position">192</property> <child> <widget class="Gtk.ScrolledWindow" id="scrolledwindow1"> <property name="MemberName" /> @@ -3220,52 +3220,92 @@ Months</property> </child> </widget> <packing> - <property name="Position">0</property> - <property name="AutoSize">False</property> - <property name="Expand">False</property> - <property name="Fill">False</property> + <property name="Resize">False</property> </packing> </child> <child> - <widget class="MonoDevelop.Components.IconView" id="iconView"> + <widget class="Gtk.HPaned" id="panedTemplates"> <property name="MemberName" /> <property name="CanFocus">True</property> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">False</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Frame" id="frame1"> - <property name="MemberName" /> - <property name="ShadowType">In</property> - <child> - <widget class="Gtk.Alignment" id="GtkAlignment2"> - <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="Yalign">0</property> + <property name="Position">292</property> <child> - <widget class="Gtk.Label" id="infoLabel"> + <widget class="Gtk.VBox" id="boxTemplates"> <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="Ellipsize">End</property> + <property name="Spacing">6</property> + <child> + <placeholder /> + </child> + <child> + <placeholder /> + </child> + </widget> + </child> + <child> + <widget class="Gtk.ScrolledWindow" id="scrolledInfo"> + <property name="MemberName" /> + <property name="CanFocus">True</property> + <property name="HscrollbarPolicy">Never</property> + <property name="ShadowType">In</property> + <signal name="SizeAllocated" handler="OnScrolledInfoSizeAllocated" /> + <child> + <widget class="Gtk.Viewport" id="GtkViewport"> + <property name="MemberName" /> + <property name="ShadowType">None</property> + <child> + <widget class="Gtk.VBox" id="boxInfo"> + <property name="MemberName" /> + <property name="Spacing">6</property> + <property name="BorderWidth">3</property> + <child> + <widget class="Gtk.Label" id="labelTemplateTitle"> + <property name="MemberName" /> + <property name="WidthRequest">145</property> + <property name="Xalign">0</property> + <property name="LabelProp" translatable="yes"><b>Console Project</b></property> + <property name="UseMarkup">True</property> + <property name="Wrap">True</property> + </widget> + <packing> + <property name="Position">0</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <widget class="Gtk.Label" id="infoLabel"> + <property name="MemberName" /> + <property name="WidthRequest">145</property> + <property name="Xalign">0</property> + <property name="Yalign">0</property> + <property name="LabelProp" translatable="yes">Creates a new C# Project</property> + <property name="Wrap">True</property> + </widget> + <packing> + <property name="Position">1</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <placeholder /> + </child> + </widget> + </child> + </widget> + </child> </widget> + <packing> + <property name="Resize">False</property> + </packing> </child> </widget> </child> </widget> <packing> - <property name="Position">1</property> + <property name="Position">0</property> <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> </packing> </child> <child> @@ -3275,7 +3315,7 @@ Months</property> <property name="HeightRequest">1</property> </widget> <packing> - <property name="Position">2</property> + <property name="Position">1</property> <property name="AutoSize">True</property> <property name="Expand">False</property> <property name="Fill">False</property> @@ -3311,7 +3351,7 @@ Months</property> </child> </widget> <packing> - <property name="Position">3</property> + <property name="Position">2</property> <property name="AutoSize">True</property> <property name="Expand">False</property> <property name="Fill">False</property> @@ -3396,7 +3436,7 @@ Months</property> </child> </widget> <packing> - <property name="Position">4</property> + <property name="Position">3</property> <property name="AutoSize">True</property> <property name="Expand">False</property> <property name="Fill">False</property> @@ -11143,7 +11183,7 @@ Visual Studio generates a default ID for embedded resources, instead of simply u </widget> </child> </widget> - <widget class="Gtk.Dialog" id="MonoDevelop.Ide.NavigateToDialog.NavigateToDialog" design-size="565 438"> + <widget class="Gtk.Dialog" id="MonoDevelop.Ide.NavigateToDialog.NavigateToDialog" design-size="597 465"> <property name="MemberName" /> <property name="Visible">False</property> <property name="GeneratePublic">False</property> @@ -11243,7 +11283,6 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <widget class="Gtk.HButtonBox" id="dialog1_ActionArea"> <property name="MemberName" /> <property name="Spacing">10</property> - <property name="BorderWidth">5</property> <property name="Size">2</property> <property name="LayoutStyle">End</property> <child> |