| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<000001426d657188-d8322dda-573e-4dc2-9c28-31ecdd8ccaa3-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/16a34e7e0599...710e04007b0a
Commit: 710e04007b0a26912b1393dcaa988bf9ad3af906
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-18 22:45:33 GMT
URL: https://github.com/mono/monodevelop/commit/710e04007b0a26912b1393dcaa988bf9ad3af906
[WebReferences] Possibility to choose visibility
Either generate the service as a public or internal service.
Changed paths:
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
M main/src/addins/MonoDevelop.WebReferences/gtk-gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs
M main/src/addins/MonoDevelop.WebReferences/gtk-gui/gui.stetic
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
===================================================================
@@ -45,6 +45,11 @@ public WCFConfigWidget (ClientOptions options)
dictTypes = new List<Type> (DefaultDictionaryTypes);
PopulateBox (dictionaryCollection, "Dictionary", dictTypes);
+
+ foreach (var access in AccessGenerationTypes)
+ listAccess.AppendText (access);
+
+ listAccess.Active = options.GenerateInternalTypes ? 1 : 0;
}
public ClientOptions Options {
@@ -71,6 +76,11 @@ public WCFConfigWidget (ClientOptions options)
typeof (System.Collections.Specialized.ListDictionary),
typeof (System.Collections.Specialized.OrderedDictionary)
};
+
+ static readonly List<string> AccessGenerationTypes = new List<string> {
+ "Public",
+ "Internal"
+ };
public bool Modified {
get;
@@ -162,6 +172,11 @@ internal void Update ()
{
UpdateBox (listCollection, "List", listTypes);
UpdateBox (dictionaryCollection, "Dictionary", dictTypes);
+
+ if (listAccess.Active != (Options.GenerateInternalTypes ? 1 : 0)) {
+ Options.GenerateInternalTypes = !Options.GenerateInternalTypes;
+ Modified = true;
+ }
}
}
}
Modified: main/src/addins/MonoDevelop.WebReferences/gtk-gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs
===================================================================
@@ -9,8 +9,10 @@ public partial class WCFConfigWidget
private global::Gtk.ComboBox dictionaryCollection;
private global::Gtk.Label label1;
private global::Gtk.Label label2;
+ private global::Gtk.Label label3;
+ private global::Gtk.ComboBox listAccess;
private global::Gtk.ComboBox listCollection;
-
+
protected virtual void Build ()
{
global::Stetic.Gui.Initialize (this);
@@ -58,17 +60,38 @@ protected virtual void Build ()
w3.XOptions = ((global::Gtk.AttachOptions)(4));
w3.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child wcfOptions.Gtk.Table+TableChild
+ this.label3 = new global::Gtk.Label ();
+ this.label3.Name = "label3";
+ this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Access level:");
+ this.wcfOptions.Add (this.label3);
+ global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.wcfOptions [this.label3]));
+ w4.TopAttach = ((uint)(2));
+ w4.BottomAttach = ((uint)(3));
+ w4.XOptions = ((global::Gtk.AttachOptions)(4));
+ w4.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child wcfOptions.Gtk.Table+TableChild
+ this.listAccess = global::Gtk.ComboBox.NewText ();
+ this.listAccess.Name = "listAccess";
+ this.wcfOptions.Add (this.listAccess);
+ global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.wcfOptions [this.listAccess]));
+ w5.TopAttach = ((uint)(2));
+ w5.BottomAttach = ((uint)(3));
+ w5.LeftAttach = ((uint)(1));
+ w5.RightAttach = ((uint)(2));
+ w5.XOptions = ((global::Gtk.AttachOptions)(7));
+ w5.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child wcfOptions.Gtk.Table+TableChild
this.listCollection = global::Gtk.ComboBox.NewText ();
this.listCollection.Name = "listCollection";
this.wcfOptions.Add (this.listCollection);
- global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.wcfOptions [this.listCollection]));
- w4.LeftAttach = ((uint)(1));
- w4.RightAttach = ((uint)(2));
- w4.XOptions = ((global::Gtk.AttachOptions)(7));
- w4.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.wcfOptions [this.listCollection]));
+ w6.LeftAttach = ((uint)(1));
+ w6.RightAttach = ((uint)(2));
+ w6.XOptions = ((global::Gtk.AttachOptions)(7));
+ w6.YOptions = ((global::Gtk.AttachOptions)(4));
this.dialog1_VBox.Add (this.wcfOptions);
- global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.dialog1_VBox [this.wcfOptions]));
- w5.Position = 0;
+ global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.dialog1_VBox [this.wcfOptions]));
+ w7.Position = 0;
this.Add (this.dialog1_VBox);
if ((this.Child != null)) {
this.Child.ShowAll ();
Modified: main/src/addins/MonoDevelop.WebReferences/gtk-gui/gui.stetic
===================================================================
@@ -646,12 +646,6 @@
<placeholder />
</child>
<child>
- <placeholder />
- </child>
- <child>
- <placeholder />
- </child>
- <child>
<widget class="Gtk.ComboBox" id="dictionaryCollection">
<property name="MemberName" />
<property name="IsTextCombo">True</property>
@@ -712,6 +706,47 @@
</packing>
</child>
<child>
+ <widget class="Gtk.Label" id="label3">
+ <property name="MemberName" />
+ <property name="LabelProp" translatable="yes">Access level:</property>
+ </widget>
+ <packing>
+ <property name="TopAttach">2</property>
+ <property name="BottomAttach">3</property>
+ <property name="AutoSize">True</property>
+ <property name="XOptions">Fill</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">False</property>
+ <property name="XFill">True</property>
+ <property name="XShrink">False</property>
+ <property name="YExpand">False</property>
+ <property name="YFill">True</property>
+ <property name="YShrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.ComboBox" id="listAccess">
+ <property name="MemberName" />
+ <property name="IsTextCombo">True</property>
+ <property name="Items" translatable="yes" />
+ </widget>
+ <packing>
+ <property name="TopAttach">2</property>
+ <property name="BottomAttach">3</property>
+ <property name="LeftAttach">1</property>
+ <property name="RightAttach">2</property>
+ <property name="AutoSize">False</property>
+ <property name="XOptions">Expand, Shrink, Fill</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">True</property>
+ <property name="XFill">True</property>
+ <property name="XShrink">True</property>
+ <property name="YExpand">False</property>
+ <property name="YFill">True</property>
+ <property name="YShrink">False</property>
+ </packing>
+ </child>
+ <child>
<widget class="Gtk.ComboBox" id="listCollection">
<property name="MemberName" />
<property name="IsTextCombo">True</property>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches