[Ide] Separate template name and category in the new project dialog model

Previously we have been using the same tree model column
for the template name and category, depending on the purpose.
Since our UI tests rely on the template name to be set in this
column, with this change we do a clear separation between those.

Author: sevoku

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.UI.cs

@@ -58,11 +58,18 @@ partial class GtkNewProjectDialogBackend : IdeDialog
 		TreeStore templateCategoriesTreeStore =
 			new TreeStore(typeof (string), typeof (Xwt.Drawing.Image), typeof(TemplateCategory));
 		TreeView templatesTreeView;
+		// DO NOT REMOVE
+		// This column is not used here, but is required for
+		// external UI tests which need a plain string name inside the model
+		// This is a reminder to not remove or abuse this column for other purposes
+		const int TemplateNameColumn = 0;
+		// DO NOT REMOVE
 		const int TemplateIconColumn = 1;
 		const int TemplateColumn = 2;
-		const int TemplateA11yLanguageName = 3;
+		const int TemplateOwnCategoryNameColumn = 3;
+		const int TemplateA11yLanguageNameColumn = 4;
 		TreeStore templatesTreeStore =
-			new TreeStore(typeof (string), typeof (Xwt.Drawing.Image), typeof(SolutionTemplate), typeof (string));
+			new TreeStore(typeof (string), typeof (Xwt.Drawing.Image), typeof(SolutionTemplate), typeof (string), typeof (string));
 		VBox templateVBox;
 		ImageView templateImage;
 		Label templateNameLabel;

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs

@@ -54,7 +54,7 @@ public GtkNewProjectDialogBackend ()
 			// Set up the list store so the test framework can work out the correct columns
 			SemanticModelAttribute modelAttr = new SemanticModelAttribute ("templateCategoriesListStore__Name", "templateCategoriesListStore__Icon", "templateCategoriesListStore__Category");
 			TypeDescriptor.AddAttributes (templateCategoriesTreeStore, modelAttr);
-			modelAttr = new SemanticModelAttribute ("templateListStore__Name", "templateListStore__Icon", "templateListStore__Template");
+			modelAttr = new SemanticModelAttribute ("templateListStore__Name", "templateListStore__Icon", "templateListStore__Template", "templateListStore__Category", "templateListStore__Language");
 			TypeDescriptor.AddAttributes (templatesTreeStore, modelAttr);
 
 			templateCategoriesTreeView.Selection.Changed += TemplateCategoriesTreeViewSelectionChanged;
@@ -138,13 +138,13 @@ static void SetTemplateTextCellData (TreeViewColumn col, CellRenderer renderer,
 			var templateTextRenderer = (GtkTemplateCellRenderer)renderer;
 			templateTextRenderer.Template = template;
 			templateTextRenderer.TemplateIcon = model.GetValue (it, TemplateIconColumn) as Xwt.Drawing.Image;
-			templateTextRenderer.TemplateCategory = model.GetValue (it, TemplateCategoryNameColumn) as string;
+			templateTextRenderer.TemplateCategory = model.GetValue (it, TemplateOwnCategoryNameColumn) as string;
 		}
 
 		static void SetLanguageCellData (TreeViewColumn col, CellRenderer renderer, TreeModel model, TreeIter it)
 		{
 			var template = (SolutionTemplate)model.GetValue (it, TemplateColumn);
-			var language = (string)model.GetValue (it, TemplateA11yLanguageName);
+			var language = (string)model.GetValue (it, TemplateA11yLanguageNameColumn);
 			var languageRenderer = (LanguageCellRenderer)renderer;
 			languageRenderer.Template = template;
 			languageRenderer.SelectedLanguage = language ?? template?.Language ?? string.Empty;
@@ -231,7 +231,7 @@ void AddLanguageMenuItems (Xwt.Menu menu, SolutionTemplate template)
 					controller.SelectedLanguage = language;
 					templatesTreeView.QueueDraw ();
 					if (templatesTreeView.Selection.GetSelected (out var selIter))
-						templatesTreeStore.SetValue (selIter, TemplateA11yLanguageName, languageCellRenderer.SelectedLanguage);
+						templatesTreeStore.SetValue (selIter, TemplateA11yLanguageNameColumn, languageCellRenderer.SelectedLanguage);
 					ShowSelectedTemplate ();
 				};
 				menu.Items.Add (menuItem);
@@ -394,19 +394,21 @@ void ShowTemplatesForCategory (TemplateCategory category)
 			languageCellRenderer.RenderRecentTemplate = false;
 			foreach (TemplateCategory subCategory in category.Categories) {
 				var iter = templatesTreeStore.AppendValues (
-					MarkupTopLevelCategoryName (subCategory.Name),
+					subCategory.Name,
 					null,
 					null,
+					subCategory.Name,
 					null);
 
 				foreach (SolutionTemplate template in subCategory.Templates) {
 					if (template.HasProjects || controller.IsNewSolution) {
 						string language = GetLanguageForTemplate (template);
 						templatesTreeStore.AppendValues (
 							iter,
-							subCategory.Name,
+							template.Name,
 							GetIcon (template.IconId, IconSize.Dnd),
 							template,
+							subCategory.Name,
 							language);
 					}
 				}
@@ -427,19 +429,22 @@ string GetLanguageForTemplate (SolutionTemplate template)
 		void ShowRecentTemplates ()
 		{
 			templateTextRenderer.RenderRecentTemplate = true;
-			languageCellRenderer.RenderRecentTemplate = true;
+			languageCellRenderer.RenderRecentTemplate = true;
+			var subCategoryName = Core.GettextCatalog.GetString ("Recently used templates");
 			var iter = templatesTreeStore.AppendValues (
-				MarkupTopLevelCategoryName (Core.GettextCatalog.GetString ("Recently used templates")),
+				subCategoryName,
 				null,
 				null,
+				subCategoryName,
 				null);
 			foreach (SolutionTemplate template in controller.RecentTemplates) {
 				if (template.HasProjects || controller.IsNewSolution) {
 					templatesTreeStore.AppendValues (
 						iter,
-						controller.GetCategoryPathText (template),
+						template.Name,
 						GetIcon (template.IconId, IconSize.Dnd),
 						template,
+						controller.GetCategoryPathText (template),
 						template.Language);
 				}
 			}
@@ -483,7 +488,7 @@ void ShowTemplate (SolutionTemplate template)
 
 			TreeIter item;
 			if (templatesTreeView.Selection.GetSelected (out item)) {
-				templatesTreeStore.SetValue (item, TemplateA11yLanguageName, language);
+				templatesTreeStore.SetValue (item, TemplateA11yLanguageNameColumn, language);
 			}
 
 			templateNameLabel.Markup = MarkupTemplateName (template.Name);

main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkTemplateCellRenderer.cs

@@ -73,11 +73,11 @@ public string TemplateCategory {
 
 		void SetAccessibilityText ()
 		{
-			if (template != null) {
-				var text = template.Name;
-				if (!string.IsNullOrEmpty (templateCategory))
-					text += ", " + templateCategory.Replace ("→", "–"); // we don't want narrators to read "right arrow"
-				Text = text;
+			Text = template?.Name ?? string.Empty;
+			if (!string.IsNullOrEmpty (templateCategory)) {
+				if (!string.IsNullOrEmpty (Text))
+					Text += ", ";
+				Text += templateCategory.Replace ("→", "–"); // we don't want narrators to read "right arrow"
 			}
 		}
 
@@ -133,7 +133,7 @@ void DrawTemplateCategoryText (Drawable window, Widget widget, Rectangle cell_ar
 				int textPixelWidth = widget.Allocation.Width - ((int)Xpad * 2);
 				layout.Width = (int)(textPixelWidth * Pango.Scale.PangoScale);
 
-				layout.SetMarkup (TemplateCategory);
+				layout.SetMarkup (MarkupTopLevelCategoryName (TemplateCategory));
 
 				int w, h;
 				layout.GetPixelSize (out w, out h);
@@ -213,6 +213,11 @@ static StateType GetState (Widget widget, CellRendererState flags)
 				stateType = widget.HasFocus ? StateType.Selected : StateType.Active;
 			return stateType;
 		}
+
+		static string MarkupTopLevelCategoryName (string name)
+		{
+			return "<span font_weight='bold'>" + GLib.Markup.EscapeText (name) + "</span>";
+		}
 	}
 }