diff options
| author | Mike Krüger <mkrueger@novell.com> | 2011-04-14 11:00:58 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2011-04-14 11:00:58 +0400 |
| commit | 2730578977526fd7b552aaa72248ef5a80ca0291 (patch) | |
| tree | baa135ff5dc26de3b43943727c744b0da7ab38e8 /main/src/core/MonoDevelop.Ide/gtk-gui | |
| parent | ecdda146a1a40436b27dde91b1204bc7265bc3f6 (diff) | |
| parent | 3215812310ee4df1f5538b257bdeae69f8796418 (diff) | |
Merge branch 'master' into mkrueger/newNRefactory
Conflicts:
main/src/core/Mono.Texteditor/Mono.TextEditor/Document.cs
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/gtk-gui')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Updater.UpdateDialog.cs | 2 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Updater.UpdateDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Updater.UpdateDialog.cs index efa92a309c..20c79482cb 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Updater.UpdateDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Updater.UpdateDialog.cs @@ -156,7 +156,7 @@ namespace MonoDevelop.Ide.Updater if ((this.Child != null)) { this.Child.ShowAll (); } - this.DefaultWidth = 450; + this.DefaultWidth = 508; this.DefaultHeight = 373; this.label1.MnemonicWidget = this.updateLevelCombo; this.Hide (); diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic index 6aedcbe2b7..27025de84b 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic @@ -6466,6 +6466,7 @@ All solutions</property> <property name="MemberName" /> <property name="CanFocus">True</property> <property name="Label" translatable="yes">Delete the project file and the whole project directory:</property> + <property name="Active">True</property> <property name="DrawIndicator">True</property> <property name="HasLabel">True</property> <property name="UseUnderline">True</property> @@ -11346,7 +11347,7 @@ Visual Studio generates a default ID for embedded resources, instead of simply u </widget> </child> </widget> - <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Updater.UpdateDialog" design-size="450 373"> + <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Updater.UpdateDialog" design-size="508 373"> <property name="MemberName" /> <property name="Visible">False</property> <property name="GeneratePublic">False</property> @@ -12376,4 +12377,4 @@ please quit MonoDevelop before installing them.</property> </widget> </child> </widget> -</stetic-interface> +</stetic-interface>
\ No newline at end of file |