diff options
author | Lluis Sanchez Gual <lluis@novell.com> | 2011-05-11 15:44:44 +0400 |
---|---|---|
committer | Lluis Sanchez Gual <lluis@novell.com> | 2011-05-11 15:44:44 +0400 |
commit | e7f323ddf57d12838ab136b73c2e3229ec5ac430 (patch) | |
tree | 6586e327ec7ce03a8fdb15ba34c0757a85158900 /main/src/core/MonoDevelop.Ide/gtk-gui | |
parent | 7f14f07f7dfd7db8ddcceae49df1627e716735bc (diff) |
Added search support to edit references. Improved gui.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/gtk-gui')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs | 212 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic | 180 |
2 files changed, 261 insertions, 131 deletions
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs index fe06a6b222..462288f4f7 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs @@ -5,18 +5,23 @@ namespace MonoDevelop.Ide.Projects internal partial class SelectReferenceDialog { private global::Gtk.VBox vbox5; - private global::Gtk.VPaned vpaned1; + private global::Gtk.HPaned hpaned1; + private global::Gtk.VBox vbox2; + private global::Gtk.HBox hbox1; + private global::Gtk.Label label1; + private global::MonoDevelop.Components.SearchEntry searchentry; + private global::Gtk.Label label2; private global::Gtk.Notebook mainBook; private global::Gtk.Label label7; private global::Gtk.Label label6; - private global::Gtk.VBox vbox76; + private global::Gtk.VBox boxRefs; + private global::Gtk.HBox hbox2; + private global::Gtk.VBox vbox3; private global::Gtk.Label label114; + private global::Gtk.Button RemoveReferenceButton; private global::Gtk.HBox hbox4; private global::Gtk.ScrolledWindow scrolledwindow2; private global::Gtk.TreeView ReferencesTreeView; - private global::Gtk.VBox vbox70; - private global::Gtk.Button RemoveReferenceButton; - private global::Gtk.Image but; private global::Gtk.Button cancelbutton; private global::Gtk.Button okbutton; @@ -31,8 +36,6 @@ namespace MonoDevelop.Ide.Projects this.TypeHint = ((global::Gdk.WindowTypeHint)(1)); this.Modal = true; this.BorderWidth = ((uint)(6)); - this.DefaultWidth = 520; - this.DefaultHeight = 570; this.DestroyWithParent = true; // Internal child MonoDevelop.Ide.Projects.SelectReferenceDialog.VBox global::Gtk.VBox w1 = this.VBox; @@ -44,10 +47,54 @@ namespace MonoDevelop.Ide.Projects this.vbox5.Spacing = 12; this.vbox5.BorderWidth = ((uint)(6)); // Container child vbox5.Gtk.Box+BoxChild - this.vpaned1 = new global::Gtk.VPaned (); - this.vpaned1.Name = "vpaned1"; - this.vpaned1.Position = 256; - // Container child vpaned1.Gtk.Paned+PanedChild + this.hpaned1 = new global::Gtk.HPaned (); + this.hpaned1.CanFocus = true; + this.hpaned1.Name = "hpaned1"; + this.hpaned1.Position = 527; + // Container child hpaned1.Gtk.Paned+PanedChild + this.vbox2 = new global::Gtk.VBox (); + this.vbox2.Name = "vbox2"; + this.vbox2.Spacing = 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.label1 = new global::Gtk.Label (); + this.label1.Name = "label1"; + this.label1.LabelProp = global::MonoDevelop.Core.GettextCatalog.GetString ("Filter:"); + this.hbox1.Add (this.label1); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label1])); + w2.Position = 0; + w2.Expand = false; + w2.Fill = false; + // Container child hbox1.Gtk.Box+BoxChild + this.searchentry = new global::MonoDevelop.Components.SearchEntry (); + this.searchentry.Name = "searchentry"; + this.searchentry.ForceFilterButtonVisible = false; + this.searchentry.IsCheckMenu = false; + this.searchentry.ActiveFilterID = 0; + this.searchentry.Ready = true; + this.searchentry.HasFocus = true; + this.hbox1.Add (this.searchentry); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.searchentry])); + w3.Position = 1; + // Container child hbox1.Gtk.Box+BoxChild + this.label2 = new global::Gtk.Label (); + this.label2.WidthRequest = 100; + this.label2.Name = "label2"; + this.label2.LabelProp = ""; + this.hbox1.Add (this.label2); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label2])); + w4.Position = 2; + w4.Expand = false; + w4.Fill = false; + this.vbox2.Add (this.hbox1); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); + w5.Position = 0; + w5.Expand = false; + w5.Fill = false; + // Container child vbox2.Gtk.Box+BoxChild this.mainBook = new global::Gtk.Notebook (); this.mainBook.Name = "mainBook"; this.mainBook.CurrentPage = 0; @@ -66,25 +113,59 @@ namespace MonoDevelop.Ide.Projects this.label6.LabelProp = "label6"; this.mainBook.SetTabLabel (this.label7, this.label6); this.label6.ShowAll (); - this.vpaned1.Add (this.mainBook); - global::Gtk.Paned.PanedChild w3 = ((global::Gtk.Paned.PanedChild)(this.vpaned1 [this.mainBook])); - w3.Resize = false; - w3.Shrink = false; - // Container child vpaned1.Gtk.Paned+PanedChild - this.vbox76 = new global::Gtk.VBox (); - this.vbox76.Name = "vbox76"; - this.vbox76.Spacing = 6; - // Container child vbox76.Gtk.Box+BoxChild + this.vbox2.Add (this.mainBook); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.mainBook])); + w7.Position = 1; + this.hpaned1.Add (this.vbox2); + global::Gtk.Paned.PanedChild w8 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.vbox2])); + w8.Resize = false; + // Container child hpaned1.Gtk.Paned+PanedChild + this.boxRefs = new global::Gtk.VBox (); + this.boxRefs.Name = "boxRefs"; + this.boxRefs.Spacing = 6; + // Container child boxRefs.Gtk.Box+BoxChild + this.hbox2 = new global::Gtk.HBox (); + this.hbox2.Name = "hbox2"; + this.hbox2.Spacing = 6; + // Container child hbox2.Gtk.Box+BoxChild + this.vbox3 = new global::Gtk.VBox (); + this.vbox3.Name = "vbox3"; + this.vbox3.Spacing = 6; + // Container child vbox3.Gtk.Box+BoxChild this.label114 = new global::Gtk.Label (); this.label114.Name = "label114"; this.label114.Xalign = 0F; this.label114.LabelProp = global::MonoDevelop.Core.GettextCatalog.GetString ("Selected references:"); - this.vbox76.Add (this.label114); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox76 [this.label114])); - w4.Position = 0; - w4.Expand = false; - w4.Fill = false; - // Container child vbox76.Gtk.Box+BoxChild + this.vbox3.Add (this.label114); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label114])); + w9.PackType = ((global::Gtk.PackType)(1)); + w9.Position = 0; + w9.Expand = false; + w9.Fill = false; + this.hbox2.Add (this.vbox3); + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vbox3])); + w10.Position = 0; + w10.Expand = false; + w10.Fill = false; + // Container child hbox2.Gtk.Box+BoxChild + this.RemoveReferenceButton = new global::Gtk.Button (); + this.RemoveReferenceButton.TooltipMarkup = "Remove"; + this.RemoveReferenceButton.Name = "RemoveReferenceButton"; + this.RemoveReferenceButton.UseStock = true; + this.RemoveReferenceButton.UseUnderline = true; + this.RemoveReferenceButton.Label = "gtk-remove"; + this.hbox2.Add (this.RemoveReferenceButton); + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.RemoveReferenceButton])); + w11.PackType = ((global::Gtk.PackType)(1)); + w11.Position = 1; + w11.Expand = false; + w11.Fill = false; + this.boxRefs.Add (this.hbox2); + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.boxRefs [this.hbox2])); + w12.Position = 0; + w12.Expand = false; + w12.Fill = false; + // Container child boxRefs.Gtk.Box+BoxChild this.hbox4 = new global::Gtk.HBox (); this.hbox4.HeightRequest = 150; this.hbox4.Name = "hbox4"; @@ -96,53 +177,29 @@ namespace MonoDevelop.Ide.Projects // Container child scrolledwindow2.Gtk.Container+ContainerChild this.ReferencesTreeView = new global::Gtk.TreeView (); this.ReferencesTreeView.Name = "ReferencesTreeView"; + this.ReferencesTreeView.HeadersVisible = false; this.scrolledwindow2.Add (this.ReferencesTreeView); this.hbox4.Add (this.scrolledwindow2); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.scrolledwindow2])); - w6.Position = 0; - // Container child hbox4.Gtk.Box+BoxChild - this.vbox70 = new global::Gtk.VBox (); - this.vbox70.Name = "vbox70"; - // Container child vbox70.Gtk.Box+BoxChild - this.RemoveReferenceButton = new global::Gtk.Button (); - this.RemoveReferenceButton.TooltipMarkup = "Remove"; - this.RemoveReferenceButton.Name = "RemoveReferenceButton"; - // Container child RemoveReferenceButton.Gtk.Container+ContainerChild - this.but = new global::Gtk.Image (); - this.but.Name = "but"; - this.but.Xalign = 0F; - this.but.Yalign = 0F; - this.but.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-remove", global::Gtk.IconSize.Button); - this.RemoveReferenceButton.Add (this.but); - this.RemoveReferenceButton.Label = null; - this.vbox70.Add (this.RemoveReferenceButton); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox70 [this.RemoveReferenceButton])); - w8.Position = 0; - w8.Expand = false; - w8.Fill = false; - this.hbox4.Add (this.vbox70); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.vbox70])); - w9.Position = 1; - w9.Expand = false; - w9.Fill = false; - this.vbox76.Add (this.hbox4); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox76 [this.hbox4])); - w10.Position = 1; - this.vpaned1.Add (this.vbox76); - global::Gtk.Paned.PanedChild w11 = ((global::Gtk.Paned.PanedChild)(this.vpaned1 [this.vbox76])); - w11.Resize = false; - this.vbox5.Add (this.vpaned1); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.vpaned1])); - w12.Position = 0; + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.scrolledwindow2])); + w14.Position = 0; + this.boxRefs.Add (this.hbox4); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.boxRefs [this.hbox4])); + w15.Position = 1; + this.hpaned1.Add (this.boxRefs); + global::Gtk.Paned.PanedChild w16 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.boxRefs])); + w16.Resize = false; + this.vbox5.Add (this.hpaned1); + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hpaned1])); + w17.Position = 0; w1.Add (this.vbox5); - global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5])); - w13.Position = 0; + global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5])); + w18.Position = 0; // Internal child MonoDevelop.Ide.Projects.SelectReferenceDialog.ActionArea - global::Gtk.HButtonBox w14 = this.ActionArea; - w14.Name = "dialog-action_area2"; - w14.Spacing = 10; - w14.BorderWidth = ((uint)(5)); - w14.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); + global::Gtk.HButtonBox w19 = this.ActionArea; + w19.Name = "dialog-action_area2"; + w19.Spacing = 10; + w19.BorderWidth = ((uint)(5)); + w19.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog-action_area2.Gtk.ButtonBox+ButtonBoxChild this.cancelbutton = new global::Gtk.Button (); this.cancelbutton.Name = "cancelbutton"; @@ -150,9 +207,9 @@ namespace MonoDevelop.Ide.Projects this.cancelbutton.UseUnderline = true; this.cancelbutton.Label = "gtk-cancel"; this.AddActionWidget (this.cancelbutton, -6); - global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w14 [this.cancelbutton])); - w15.Expand = false; - w15.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w20 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w19 [this.cancelbutton])); + w20.Expand = false; + w20.Fill = false; // Container child dialog-action_area2.Gtk.ButtonBox+ButtonBoxChild this.okbutton = new global::Gtk.Button (); this.okbutton.Name = "okbutton"; @@ -160,14 +217,17 @@ namespace MonoDevelop.Ide.Projects this.okbutton.UseUnderline = true; this.okbutton.Label = "gtk-ok"; this.AddActionWidget (this.okbutton, -5); - global::Gtk.ButtonBox.ButtonBoxChild w16 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w14 [this.okbutton])); - w16.Position = 1; - w16.Expand = false; - w16.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w21 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w19 [this.okbutton])); + w21.Position = 1; + w21.Expand = false; + w21.Fill = false; if ((this.Child != null)) { this.Child.ShowAll (); } + this.DefaultWidth = 837; + this.DefaultHeight = 551; this.Hide (); + this.searchentry.Changed += new global::System.EventHandler (this.OnSearchentryChanged); this.RemoveReferenceButton.Clicked += new global::System.EventHandler (this.RemoveReference); } } diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic index d2b1b14070..c924184701 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic @@ -10947,7 +10947,7 @@ Visual Studio generates a default ID for embedded resources, instead of simply u </widget> </child> </widget> - <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Projects.SelectReferenceDialog" design-size="646 547"> + <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Projects.SelectReferenceDialog" design-size="837 551"> <property name="MemberName" /> <property name="WidthRequest">640</property> <property name="HeightRequest">520</property> @@ -10957,8 +10957,6 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <property name="TypeHint">Dialog</property> <property name="Modal">True</property> <property name="BorderWidth">6</property> - <property name="DefaultWidth">520</property> - <property name="DefaultHeight">570</property> <property name="DestroyWithParent">True</property> <property name="Buttons">2</property> <property name="HelpButton">False</property> @@ -10972,51 +10970,155 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <property name="Spacing">12</property> <property name="BorderWidth">6</property> <child> - <widget class="Gtk.VPaned" id="vpaned1"> + <widget class="Gtk.HPaned" id="hpaned1"> <property name="MemberName" /> - <property name="Position">256</property> + <property name="CanFocus">True</property> + <property name="Position">527</property> <child> - <widget class="Gtk.Notebook" id="mainBook"> + <widget class="Gtk.VBox" id="vbox2"> <property name="MemberName" /> - <property name="CurrentPage">0</property> + <property name="Spacing">6</property> <child> - <widget class="Gtk.Label" id="label7"> + <widget class="Gtk.HBox" id="hbox1"> <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="Yalign">0</property> - <property name="LabelProp">label7</property> + <property name="Spacing">6</property> + <child> + <widget class="Gtk.Label" id="label1"> + <property name="MemberName" /> + <property name="LabelProp" translatable="yes">Filter:</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="MonoDevelop.Components.SearchEntry" id="searchentry"> + <property name="MemberName" /> + <property name="ForceFilterButtonVisible">False</property> + <property name="IsCheckMenu">False</property> + <property name="ActiveFilterID">0</property> + <property name="Ready">True</property> + <property name="HasFocus">True</property> + <signal name="Changed" handler="OnSearchentryChanged" /> + </widget> + <packing> + <property name="Position">1</property> + <property name="AutoSize">True</property> + </packing> + </child> + <child> + <widget class="Gtk.Label" id="label2"> + <property name="MemberName" /> + <property name="WidthRequest">100</property> + </widget> + <packing> + <property name="Position">2</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> </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="label6"> + <widget class="Gtk.Notebook" id="mainBook"> <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="Yalign">0</property> - <property name="LabelProp">label6</property> + <property name="CurrentPage">0</property> + <child> + <widget class="Gtk.Label" id="label7"> + <property name="MemberName" /> + <property name="Xalign">0</property> + <property name="Yalign">0</property> + <property name="LabelProp">label7</property> + </widget> + </child> + <child> + <widget class="Gtk.Label" id="label6"> + <property name="MemberName" /> + <property name="Xalign">0</property> + <property name="Yalign">0</property> + <property name="LabelProp">label6</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> </widget> <packing> - <property name="type">tab</property> + <property name="Position">1</property> + <property name="AutoSize">False</property> </packing> </child> </widget> <packing> <property name="Resize">False</property> - <property name="Shrink">False</property> </packing> </child> <child> - <widget class="Gtk.VBox" id="vbox76"> + <widget class="Gtk.VBox" id="boxRefs"> <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.Label" id="label114"> + <widget class="Gtk.HBox" id="hbox2"> <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="LabelProp" translatable="yes">Selected references:</property> + <property name="Spacing">6</property> + <child> + <widget class="Gtk.VBox" id="vbox3"> + <property name="MemberName" /> + <property name="Spacing">6</property> + <child> + <widget class="Gtk.Label" id="label114"> + <property name="MemberName" /> + <property name="Xalign">0</property> + <property name="LabelProp" translatable="yes">Selected references:</property> + </widget> + <packing> + <property name="PackType">End</property> + <property name="Position">0</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + </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.Button" id="RemoveReferenceButton"> + <property name="MemberName" /> + <property name="Tooltip">Remove</property> + <property name="UseStock">True</property> + <property name="Type">StockItem</property> + <property name="StockId">gtk-remove</property> + <signal name="Clicked" handler="RemoveReference" /> + <property name="label">gtk-remove</property> + </widget> + <packing> + <property name="PackType">End</property> + <property name="Position">1</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> </widget> <packing> <property name="Position">0</property> - <property name="AutoSize">False</property> + <property name="AutoSize">True</property> <property name="Expand">False</property> <property name="Fill">False</property> </packing> @@ -11033,6 +11135,7 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <child> <widget class="Gtk.TreeView" id="ReferencesTreeView"> <property name="MemberName" /> + <property name="HeadersVisible">False</property> </widget> </child> </widget> @@ -11041,39 +11144,6 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <property name="AutoSize">False</property> </packing> </child> - <child> - <widget class="Gtk.VBox" id="vbox70"> - <property name="MemberName" /> - <child> - <widget class="Gtk.Button" id="RemoveReferenceButton"> - <property name="MemberName" /> - <property name="Tooltip">Remove</property> - <property name="Type">Custom</property> - <signal name="Clicked" handler="RemoveReference" /> - <child> - <widget class="Gtk.Image" id="but"> - <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="Yalign">0</property> - <property name="Pixbuf">stock:gtk-remove Button</property> - </widget> - </child> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">False</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">False</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> </widget> <packing> <property name="Position">1</property> |