← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric-updates

« back to all changes in this revision

Viewing changes to src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2009-02-18 08:40:51 UTC
  • mfrom: (1.2.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090218084051-gh8m6ukvokbwj7cf
Tags: 1.9.2+dfsg-1ubuntu1
https://launchpad.net/bugs/330519
* Merge from Debian Experimental (LP: #330519), remaining Ubuntu changes:
  + debian/control:
    - Update for Gnome# 2.24
    - Add libmono-cairo1.0-cil to build-deps to fool pkg-config check

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs
32
32
using Gtk;
33
33
using MonoDevelop.DesignerSupport;
34
34
using MonoDevelop.Core;
 
35
using MonoDevelop.Core.Gui;
35
36
using MonoDevelop.Core.Gui.ProgressMonitoring;
36
37
using MonoDevelop.Components;
37
38
using MonoDevelop.Ide.Gui;
58
59
                
59
60
                public ComponentSelectorDialog (IToolboxConsumer currentConsumer)
60
61
                {
61
 
                        using (IProgressMonitor monitor = new MessageDialogProgressMonitor (true, false, false, true)) {
 
62
                        using (IProgressMonitor monitor = new MessageDialogProgressMonitor (true, true, false, true)) {
62
63
                                index = DesignerSupport.Service.ToolboxService.GetComponentIndex (monitor);
63
64
                        }
64
65
                        
157
158
                                        while (store.IterNext (ref it));
158
159
                                }
159
160
                                if (!found)
160
 
                                        it = store.AppendValues (false, co.Category, "", "", "", null, null, false, (int)Pango.Weight.Bold);
161
 
                                store.AppendValues (it, currentItems.ContainsKey (co), co.Label, "", ifile.Name, ifile.Location, img, co, true, (int)Pango.Weight.Normal);
 
161
                                        it = store.AppendValues (false, co.Category, string.Empty, string.Empty, string.Empty, null, null, false, (int)Pango.Weight.Bold);
 
162
                                store.AppendValues (it, currentItems.ContainsKey (co), co.Name, string.Empty, ifile.Name, ifile.Location, img, co, true, (int)Pango.Weight.Normal);
162
163
                        }
163
164
                        else
164
 
                                store.AppendValues (currentItems.ContainsKey (co), co.Label, "", ifile.Name, ifile.Location, img, co, true, (int)Pango.Weight.Normal);
 
165
                                store.AppendValues (currentItems.ContainsKey (co), co.Name, string.Empty, ifile.Name, ifile.Location, img, co, true, (int)Pango.Weight.Normal);
165
166
                }
166
167
 
167
168
                protected virtual void OnComboTypeChanged (object sender, System.EventArgs e)
217
218
                                                                        currentItems.Add (it, it);
218
219
                                                        }
219
220
                                                        else
220
 
                                                                IdeApp.Services.MessageService.ShowWarning (GettextCatalog.GetString ("The file '{0}' does not contain any component.", s));
 
221
                                                                MessageService.ShowWarning (GettextCatalog.GetString ("The file '{0}' does not contain any component.", s));
221
222
                                                }
222
223
                                        }
223
224
                                        Fill ();