Author: mkrueger
Date: 2007-05-27 03:07:50 -0400 (Sun, 27 May 2007)
New Revision: 77998
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Components/gtk-gui/objects.xml
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/AddNewFilesToProjectDialog.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/FolderNodeBuilder.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/SystemFileNodeBuilder.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.DeleteFileDialog.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.ExportProjectDialog.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.FeatureSelectorDialog.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewProjectDialog.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.OpenFileInSolutionDialog.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.RenameItemDialog.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Pads.SolutionViewPad.AddNewFilesToProjectDialog.cs
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/gui.stetic
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/objects.xml
Log:
Worked on project browser.
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Components/gtk-gui/objects.xml
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Components/gtk-gui/objects.xml
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Components/gtk-gui/objects.xml
2007-05-27 07:07:50 UTC (rev 77998)
@@ -1,4 +1,14 @@
<objects>
+ <object type="MonoDevelop.Components.IconView" palette-category="widget"
allow-children="false" base-type="Gtk.ScrolledWindow">
+ <itemgroups/>
+ <signals>
+ <itemgroup label="Icon Signals">
+ <signal name="IconSelected" />
+ <signal name="IconDoubleClicked" />
+ </itemgroup>
+ </signals>
+ </object>
+
<object type="MonoDevelop.Components.FileEntry" palette-category="widget"
allow-children="false" base-type="Gtk.Container">
<itemgroups>
<itemgroup label="BaseFileEntry Properties">
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -402,7 +402,8 @@
}
try {
- if (!item.Create (project, path,
titem.Language, nameEntry.Text))
+ string[] files = item.Create (path,
titem.Language, nameEntry.Text);
+ if (files == null)
return;
} catch (Exception ex) {
Services.MessageService.ShowError (ex);
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/AddNewFilesToProjectDialog.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/AddNewFilesToProjectDialog.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/AddNewFilesToProjectDialog.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -27,21 +27,150 @@
//
using System;
+using System.Collections.Generic;
+using Gtk;
+
using MonoDevelop.Components;
using MonoDevelop.Core;
+using MonoDevelop.Ide.Templates;
namespace MonoDevelop.Ide.Gui.Pads.SolutionViewPad
{
public partial class AddNewFilesToProjectDialog : Gtk.Dialog
{
- IconView iconView;
+ TreeStore categoryTreeStore = new Gtk.TreeStore
(typeof(string), typeof(Category));
+ List<Category> categories = new List<Category> ();
+ string language;
+ string path;
+ string[] createdFiles;
- public AddNewFilesToProjectDialog()
+ public string[] CreatedFiles {
+ get {
+ return this.createdFiles;
+ }
+ }
+
+ public AddNewFilesToProjectDialog (string language, string path)
{
+ this.language = language;
+ this.path = path;
+
this.Build();
- iconView = new IconView ();
- scrolledwindowIcon.Add (iconView);
+
+ LoadTemplates ();
+ CreateCategoryItems ();
+
+ this.labelName.Text = GettextCatalog.GetString
("Name:");
+ this.Title = GettextCatalog.GetString ("Add
new File");
+
+ this.buttonNew.Sensitive = false;
+ this.buttonNew.Clicked += new EventHandler
(FileCreationRequested);
+
+ this.buttonCancel.Clicked += delegate {
+ this.Respond (Gtk.ResponseType.Cancel);
+ this.Destroy ();
+ };
+
+ this.treeviewCatalog.HeadersVisible = false;
+ this.treeviewCatalog.Selection.Changed += delegate {
+ TreeModel model;
+ TreeIter iter;
+ if (this.treeviewCatalog.Selection.GetSelected
(out model, out iter)) {
+ ShowCategory
(this.categoryTreeStore.GetValue (iter, 1) as Category);
+ }
+ };
+ this.entryName.Changed += new EventHandler
(DialogStateChanged);
+ this.iconView.IconSelected += new EventHandler
(DialogStateChanged);
+ iconView.IconDoubleClicked += new EventHandler
(FileCreationRequested);
}
+
+ void DialogStateChanged (object sender, EventArgs e)
+ {
+ FileTemplate currentTemplate = (FileTemplate)
iconView.CurrentlySelected;
+ if (currentTemplate == null) {
+ this.buttonNew.Sensitive = false;
+ return;
+ }
+ this.labelInfo.Text = GettextCatalog.GetString
(currentTemplate.Description);
+ this.buttonNew.Sensitive = currentTemplate.IsValidName
(this.entryName.Text, language);
+ }
+
+ void FileCreationRequested (object sender, EventArgs e)
+ {
+ FileTemplate currentTemplate = (FileTemplate)
iconView.CurrentlySelected;
+ if (currentTemplate == null)
+ return;
+
+ this.createdFiles = currentTemplate.Create (this.path,
this.language, this.entryName.Text);
+
+ this.Respond (Gtk.ResponseType.Ok);
+ this.Destroy ();
+ }
+
+ void ShowCategory (Category category)
+ {
+ iconView.Clear ();
+ foreach (FileTemplate template in category.Templates) {
+ iconView.AddIcon (new Gtk.Image
(Services.Resources.GetBitmap (template.Icon, Gtk.IconSize.Dnd)),
template.Name, template);
+ }
+ }
+
+ void CreateCategoryItems ()
+ {
+ categoryTreeStore.SetSortColumnId (0,
SortType.Ascending);
+ this.treeviewCatalog.Model = categoryTreeStore;
+
+ if (categories.Count == 0)
+ return;
+
+ foreach (Category category in this.categories)
+ categoryTreeStore.AppendValues (category.Name,
category);
+
+ this.treeviewCatalog.AppendColumn (null, new
CellRendererText (), "text", 0);
+ }
+
+ void LoadTemplates ()
+ {
+ foreach (FileTemplate fileTemplate in
FileTemplate.FileTemplates) {
+ if (fileTemplate.LanguageName != "*" &&
fileTemplate.LanguageName != this.language)
+ continue;
+ Category category = GetCategory
(fileTemplate.Category);
+ category.Templates.Add (fileTemplate);
+ }
+ }
+
+ Category GetCategory (string name)
+ {
+ foreach (Category category in this.categories)
+ if (category.Name == name)
+ return category;
+ Category result = new Category (name);
+ this.categories.Add (result);
+ return result;
+ }
+
+ class Category
+ {
+ string name;
+ List<FileTemplate> templates = new List<FileTemplate>
();
+
+ public string Name {
+ get {
+ return this.name;
+ }
+ }
+
+ public List<FileTemplate> Templates {
+ get {
+ return templates;
+ }
+ }
+
+ public Category (string name)
+ {
+ this.name = name;
+ }
+ }
}
}
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/FolderNodeBuilder.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/FolderNodeBuilder.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/FolderNodeBuilder.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -158,18 +158,53 @@
FolderNode folderNode = CurrentNode.DataItem as
FolderNode;
if (folderNode == null)
return;
- using (AddNewFilesToProjectDialog dialog = new
AddNewFilesToProjectDialog ()) {
+ using (AddNewFilesToProjectDialog dialog = new
AddNewFilesToProjectDialog ("C#", folderNode.Path)) {
dialog.Run ();
+ if (dialog.CreatedFiles != null)
+ foreach (string fileName in
dialog.CreatedFiles)
+
folderNode.Project.Project.Items.Add (new ProjectFile (fileName,
SystemFileNodeCommandHandler.GetFileType (fileName, folderNode.Project)));
}
-/* using (NewFileDialog nfd = new NewFileDialog (null,
folderNode.Project.Project.BasePath)) {
- nfd.Run ();
-
- }*/
ProjectService.SaveProject (folderNode.Project.Project);
+ CurrentNode.Expanded = true;
+ }
+
+ [CommandHandler (ProjectCommands.NewFolder)]
+ public void AddNewFolder ()
+ {
+ FolderNode folderNode = CurrentNode.DataItem as
FolderNode;
+ if (folderNode == null)
+ return;
+ string baseFolderPath = folderNode.Path;
+ string directoryName = Path.Combine (baseFolderPath,
GettextCatalog.GetString("New Folder"));
+ int index = -1;
+
+ if (Directory.Exists(directoryName)) {
+ while (Directory.Exists(directoryName +
(++index + 1)))
+ ;
+ }
+
+ if (index >= 0) {
+ directoryName += index + 1;
+ }
+
+ Directory.CreateDirectory (directoryName);
+ folderNode.Project.Project.Items.Add (new ProjectFile
(directoryName, FileType.Folder));
+
+ ProjectService.SaveProject (folderNode.Project.Project);
CurrentNode.Expanded = true;
}
+ [CommandHandler (SearchCommands.FindInFiles)]
+ public void OnFindInFiles ()
+ {
+ FolderNode folderNode = CurrentNode.DataItem as
FolderNode;
+ if (folderNode == null)
+ return;
+
SearchReplaceInFilesManager.SearchOptions.SearchDirectory = folderNode.Path;
+ SearchReplaceInFilesManager.ShowFindDialog ();
+ }
+
}
}
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/SystemFileNodeBuilder.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/SystemFileNodeBuilder.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.SolutionPad/SystemFileNodeBuilder.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -87,20 +87,24 @@
public class SystemFileNodeCommandHandler: FileNodeCommandHandler
{
+ public static FileType GetFileType (string fileName,
SolutionProject project)
+ {
+ BackendBindingCodon codon =
BackendBindingService.GetBackendBindingCodon (project);
+ if (codon != null && codon.IsCompileable (fileName))
+ return FileType.Compile;
+ return FileType.Content;
+ }
+
[CommandHandler (ProjectCommands.IncludeToProject)]
public void IncludeToProject ()
{
SystemFileNode systemFileNode = CurrentNode.DataItem as
SystemFileNode;
if (systemFileNode == null)
return;
- FileType fileType = FileType.Content;
- BackendBindingCodon codon =
BackendBindingService.GetBackendBindingCodon (systemFileNode.Project);
- if (codon != null && codon.IsCompileable
(systemFileNode.FileName))
- fileType = FileType.Compile;
string relativePath =
Runtime.FileService.AbsoluteToRelativePath
(systemFileNode.Project.Project.BasePath, systemFileNode.FileName);
if (relativePath.StartsWith ("." +
Path.DirectorySeparatorChar))
relativePath = relativePath.Substring (2);
- systemFileNode.Project.Project.Items.Add (new
ProjectFile (relativePath, fileType));
+ systemFileNode.Project.Project.Items.Add (new
ProjectFile (relativePath, GetFileType (systemFileNode.FileName,
systemFileNode.Project)));
ProjectService.SaveProject
(systemFileNode.Project.Project);
}
}
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -9,6 +9,7 @@
using System.IO;
using System.Xml;
using System.Collections;
+using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
using System.Reflection;
@@ -127,6 +128,12 @@
}
}
+ public static ArrayList FileTemplates {
+ get {
+ return fileTemplates;
+ }
+ }
+
static FileTemplate LoadFileTemplate (RuntimeAddin addin,
string filename)
{
Stream stream = addin.GetResource (filename);
@@ -230,7 +237,7 @@
return list;
}
- public virtual bool Create (Project project, string directory,
string language, string name)
+ public virtual string[] Create (string directory, string
language, string name)
{
if (WizardPath != null) {
//IProperties customizer = new
DefaultProperties();
@@ -240,11 +247,12 @@
//if (wizard.ShowDialog() == DialogResult.OK) {
//DialogResult = DialogResult.OK;
//}
- return false;
+ return null;
} else {
+ List<string> results = new List<string> ();
foreach (FileDescriptionTemplate newfile in
Files)
- CreateFile (newfile, project,
directory, language, name);
- return true;
+ results.Add (CreateFile (newfile,
directory, language, name));
+ return results.ToArray ();
}
}
@@ -258,38 +266,35 @@
return valid;
}
- protected virtual void CreateFile (FileDescriptionTemplate
newfile, Project project, string directory, string language, string name)
+ protected virtual string CreateFile (FileDescriptionTemplate
newfile, string directory, string language, string name)
{
- if (project != null) {
- newfile.AddToProject (project, language,
directory, name);
- newfile.Show ();
- } else {
- SingleFileDescriptionTemplate singleFile =
newfile as SingleFileDescriptionTemplate;
- if (singleFile == null)
- throw new InvalidOperationException
("Single file template expected");
-
- if (directory != null) {
- string fileName = singleFile.SaveFile
(project, language, directory, name);
- IdeApp.Workbench.OpenDocument
(fileName);
- } else {
- string fileName =
singleFile.GetFileName (project, language, directory, name);
- Stream stream = singleFile.CreateFile
(project, language, fileName);
-
- // Guess the mime type of the new file
- string fn = Path.GetTempFileName ();
- string ext = Path.GetExtension
(fileName);
- int n=0;
- while (File.Exists (fn + n + ext))
- n++;
- Runtime.FileService.MoveFile (fn, fn +
n + ext);
- string mimeType =
Gnome.Vfs.MimeType.GetMimeTypeForUri (fn + n + ext);
- Runtime.FileService.DeleteFile (fn + n
+ ext);
- if (mimeType == null || mimeType == "")
- mimeType = "text";
-
- IdeApp.Workbench.NewDocument (fileName,
mimeType, stream);
- }
- }
+ SingleFileDescriptionTemplate singleFile = newfile as
SingleFileDescriptionTemplate;
+ if (singleFile == null)
+ throw new InvalidOperationException ("Single
file template expected");
+
+ if (directory != null) {
+ string result = singleFile.SaveFile (null,
language, directory, name);
+ IdeApp.Workbench.OpenDocument (result);
+ return result;
+ }
+
+ string fileName = singleFile.GetFileName (null,
language, directory, name);
+ Stream stream = singleFile.CreateFile (null, language,
fileName);
+
+ // Guess the mime type of the new file
+ string fn = Path.GetTempFileName ();
+ string ext = Path.GetExtension (fileName);
+ int n=0;
+ while (File.Exists (fn + n + ext))
+ n++;
+ Runtime.FileService.MoveFile (fn, fn + n + ext);
+ string mimeType = Gnome.Vfs.MimeType.GetMimeTypeForUri
(fn + n + ext);
+ Runtime.FileService.DeleteFile (fn + n + ext);
+ if (mimeType == null || mimeType == "")
+ mimeType = "text";
+
+ IdeApp.Workbench.NewDocument (fileName, mimeType,
stream);
+ return fileName;
}
protected virtual bool IsValidForProject (Project project)
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.DeleteFileDialog.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.DeleteFileDialog.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.DeleteFileDialog.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -33,9 +33,7 @@
this.Events = ((Gdk.EventMask)(256));
this.Name = "MonoDevelop.Ide.Gui.Dialogs.DeleteFileDialog";
this.Title = Mono.Unix.Catalog.GetString("Delete File");
- this.WindowPosition = ((Gtk.WindowPosition)(4));
this.BorderWidth = ((uint)(6));
- this.HasSeparator = false;
// Internal child MonoDevelop.Ide.Gui.Dialogs.DeleteFileDialog.VBox
Gtk.VBox w1 = this.VBox;
w1.Events = ((Gdk.EventMask)(256));
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.ExportProjectDialog.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.ExportProjectDialog.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.ExportProjectDialog.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -35,8 +35,6 @@
this.Events = ((Gdk.EventMask)(256));
this.Name = "MonoDevelop.Ide.Gui.Dialogs.ExportProjectDialog";
this.Title = Mono.Unix.Catalog.GetString("Export Project");
- this.WindowPosition = ((Gtk.WindowPosition)(4));
- this.HasSeparator = false;
// Internal child
MonoDevelop.Ide.Gui.Dialogs.ExportProjectDialog.VBox
Gtk.VBox w1 = this.VBox;
w1.Events = ((Gdk.EventMask)(256));
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.FeatureSelectorDialog.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.FeatureSelectorDialog.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.FeatureSelectorDialog.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -28,8 +28,6 @@
// Widget MonoDevelop.Ide.Gui.Dialogs.FeatureSelectorDialog
this.Name = "MonoDevelop.Ide.Gui.Dialogs.FeatureSelectorDialog";
this.Title = Mono.Unix.Catalog.GetString("New Project Features");
- this.WindowPosition = ((Gtk.WindowPosition)(4));
- this.HasSeparator = false;
// Internal child
MonoDevelop.Ide.Gui.Dialogs.FeatureSelectorDialog.VBox
Gtk.VBox w1 = this.VBox;
w1.Name = "dialog1_VBox";
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewProjectDialog.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewProjectDialog.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewProjectDialog.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -88,7 +88,6 @@
this.TypeHint = ((Gdk.WindowTypeHint)(1));
this.WindowPosition = ((Gtk.WindowPosition)(1));
this.DestroyWithParent = true;
- this.HasSeparator = false;
// Internal child MonoDevelop.Ide.Gui.Dialogs.NewProjectDialog.VBox
Gtk.VBox w1 = this.VBox;
w1.Name = "dialog-vbox1";
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.OpenFileInSolutionDialog.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.OpenFileInSolutionDialog.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.OpenFileInSolutionDialog.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -41,8 +41,6 @@
this.Events = ((Gdk.EventMask)(256));
this.Name = "MonoDevelop.Ide.Gui.Dialogs.OpenFileInSolutionDialog";
this.Title = Mono.Unix.Catalog.GetString("Open File in Solution");
- this.WindowPosition = ((Gtk.WindowPosition)(4));
- this.HasSeparator = false;
// Internal child
MonoDevelop.Ide.Gui.Dialogs.OpenFileInSolutionDialog.VBox
Gtk.VBox w1 = this.VBox;
w1.Events = ((Gdk.EventMask)(256));
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.RenameItemDialog.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.RenameItemDialog.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.RenameItemDialog.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -30,8 +30,6 @@
// Widget MonoDevelop.Ide.Gui.Dialogs.RenameItemDialog
this.Name = "MonoDevelop.Ide.Gui.Dialogs.RenameItemDialog";
this.Title = Mono.Unix.Catalog.GetString("Rename {0}");
- this.WindowPosition = ((Gtk.WindowPosition)(4));
- this.HasSeparator = false;
// Internal child MonoDevelop.Ide.Gui.Dialogs.RenameItemDialog.VBox
Gtk.VBox w1 = this.VBox;
w1.Name = "dialog1_VBox";
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Pads.SolutionViewPad.AddNewFilesToProjectDialog.cs
===================================================================
---
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Pads.SolutionViewPad.AddNewFilesToProjectDialog.cs
2007-05-27 06:49:10 UTC (rev 77997)
+++
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Pads.SolutionViewPad.AddNewFilesToProjectDialog.cs
2007-05-27 07:07:50 UTC (rev 77998)
@@ -19,7 +19,7 @@
private Gtk.TreeView treeviewCatalog;
- private Gtk.ScrolledWindow scrolledwindowIcon;
+ private MonoDevelop.Components.IconView iconView;
private Gtk.Frame frame1;
@@ -27,15 +27,15 @@
private Gtk.Label labelInfo;
- private Gtk.HBox hbox2;
+ private Gtk.HBox hboxName;
- private Gtk.Label label1;
+ private Gtk.Label labelName;
- private Gtk.TextView textview1;
+ private Gtk.Entry entryName;
private Gtk.Button buttonCancel;
- private Gtk.Button buttonOk;
+ private Gtk.Button buttonNew;
protected virtual void Build() {
Stetic.Gui.Initialize();
@@ -43,9 +43,11 @@
this.Name =
"MonoDevelop.Ide.Gui.Pads.SolutionViewPad.AddNewFilesToProjectDialog";
this.Title = Mono.Unix.Catalog.GetString("Add new File");
this.TypeHint = ((Gdk.WindowTypeHint)(1));
- this.WindowPosition = ((Gtk.WindowPosition)(4));
this.Modal = true;
- this.HasSeparator = false;
+ this.Resizable = false;
+ this.AllowGrow = false;
+ this.DefaultWidth = 460;
+ this.DefaultHeight = 300;
// Internal child
MonoDevelop.Ide.Gui.Pads.SolutionViewPad.AddNewFilesToProjectDialog.VBox
Gtk.VBox w1 = this.VBox;
w1.Name = "dialog1_VBox";
@@ -66,18 +68,20 @@
Gtk.Box.BoxChild w2 =
((Gtk.Box.BoxChild)(this.hbox1[this.treeviewCatalog]));
w2.Position = 0;
// Container child hbox1.Gtk.Box+BoxChild
- this.scrolledwindowIcon = new Gtk.ScrolledWindow();
- this.scrolledwindowIcon.CanFocus = true;
- this.scrolledwindowIcon.Name = "scrolledwindowIcon";
- this.scrolledwindowIcon.VscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindowIcon.HscrollbarPolicy = ((Gtk.PolicyType)(1));
- this.scrolledwindowIcon.ShadowType = ((Gtk.ShadowType)(1));
- this.hbox1.Add(this.scrolledwindowIcon);
- Gtk.Box.BoxChild w3 =
((Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindowIcon]));
+ this.iconView = new MonoDevelop.Components.IconView();
+ this.iconView.WidthRequest = 289;
+ this.iconView.HeightRequest = 200;
+ this.iconView.Name = "iconView";
+ this.hbox1.Add(this.iconView);
+ Gtk.Box.BoxChild w3 =
((Gtk.Box.BoxChild)(this.hbox1[this.iconView]));
w3.Position = 1;
+ w3.Expand = false;
+ w3.Fill = false;
this.vbox2.Add(this.hbox1);
Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
w4.Position = 0;
+ w4.Expand = false;
+ w4.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
this.frame1 = new Gtk.Frame();
this.frame1.Name = "frame1";
@@ -98,33 +102,37 @@
w7.Expand = false;
w7.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
- this.hbox2 = new Gtk.HBox();
- this.hbox2.Name = "hbox2";
- this.hbox2.Spacing = 6;
- // Container child hbox2.Gtk.Box+BoxChild
- this.label1 = new Gtk.Label();
- this.label1.Name = "label1";
- this.label1.LabelProp = Mono.Unix.Catalog.GetString("Name:");
- this.hbox2.Add(this.label1);
- Gtk.Box.BoxChild w8 =
((Gtk.Box.BoxChild)(this.hbox2[this.label1]));
+ this.hboxName = new Gtk.HBox();
+ this.hboxName.Name = "hboxName";
+ this.hboxName.Spacing = 6;
+ // Container child hboxName.Gtk.Box+BoxChild
+ this.labelName = new Gtk.Label();
+ this.labelName.Name = "labelName";
+ this.labelName.LabelProp = Mono.Unix.Catalog.GetString("Name:");
+ this.hboxName.Add(this.labelName);
+ Gtk.Box.BoxChild w8 =
((Gtk.Box.BoxChild)(this.hboxName[this.labelName]));
w8.Position = 0;
w8.Expand = false;
w8.Fill = false;
- // Container child hbox2.Gtk.Box+BoxChild
- this.textview1 = new Gtk.TextView();
- this.textview1.CanFocus = true;
- this.textview1.Name = "textview1";
- this.hbox2.Add(this.textview1);
- Gtk.Box.BoxChild w9 =
((Gtk.Box.BoxChild)(this.hbox2[this.textview1]));
+ // Container child hboxName.Gtk.Box+BoxChild
+ this.entryName = new Gtk.Entry();
+ this.entryName.CanFocus = true;
+ this.entryName.Name = "entryName";
+ this.entryName.IsEditable = true;
+ this.entryName.InvisibleChar = '●';
+ this.hboxName.Add(this.entryName);
+ Gtk.Box.BoxChild w9 =
((Gtk.Box.BoxChild)(this.hboxName[this.entryName]));
w9.Position = 1;
- this.vbox2.Add(this.hbox2);
- Gtk.Box.BoxChild w10 =
((Gtk.Box.BoxChild)(this.vbox2[this.hbox2]));
+ this.vbox2.Add(this.hboxName);
+ Gtk.Box.BoxChild w10 =
((Gtk.Box.BoxChild)(this.vbox2[this.hboxName]));
w10.Position = 2;
w10.Expand = false;
w10.Fill = false;
w1.Add(this.vbox2);
Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
w11.Position = 0;
+ w11.Expand = false;
+ w11.Fill = false;
// Internal child
MonoDevelop.Ide.Gui.Pads.SolutionViewPad.AddNewFilesToProjectDialog.ActionArea
Gtk.HButtonBox w12 = this.ActionArea;
w12.Name = "dialog1_ActionArea";
@@ -144,23 +152,21 @@
w13.Expand = false;
w13.Fill = false;
// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
- this.buttonOk = new Gtk.Button();
- this.buttonOk.CanDefault = true;
- this.buttonOk.CanFocus = true;
- this.buttonOk.Name = "buttonOk";
- this.buttonOk.UseStock = true;
- this.buttonOk.UseUnderline = true;
- this.buttonOk.Label = "gtk-new";
- this.AddActionWidget(this.buttonOk, 0);
- Gtk.ButtonBox.ButtonBoxChild w14 =
((Gtk.ButtonBox.ButtonBoxChild)(w12[this.buttonOk]));
+ this.buttonNew = new Gtk.Button();
+ this.buttonNew.CanDefault = true;
+ this.buttonNew.CanFocus = true;
+ this.buttonNew.Name = "buttonNew";
+ this.buttonNew.UseStock = true;
+ this.buttonNew.UseUnderline = true;
+ this.buttonNew.Label = "gtk-new";
+ this.AddActionWidget(this.buttonNew, 0);
+ Gtk.ButtonBox.ButtonBoxChild w14 =
((Gtk.ButtonBox.ButtonBoxChild)(w12[this.buttonNew]));
w14.Position = 1;
w14.Expand = false;
w14.Fill = false;
if ((this.Child != null)) {
this.Child.ShowAll();
}
- this.DefaultWidth = 470;
- this.DefaultHeight = 328;
this.Show();
}
}
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/gui.stetic
===================================================================
--- branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/gui.stetic
2007-05-27 06:49:10 UTC (rev 77997)
+++ branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/gui.stetic
2007-05-27 07:07:50 UTC (rev 77998)
@@ -1197,11 +1197,15 @@
</widget>
</child>
</widget>
- <widget class="Gtk.Dialog"
id="MonoDevelop.Ide.Gui.Pads.SolutionViewPad.AddNewFilesToProjectDialog"
design-size="470 328">
+ <widget class="Gtk.Dialog"
id="MonoDevelop.Ide.Gui.Pads.SolutionViewPad.AddNewFilesToProjectDialog"
design-size="459 339">
<property name="MemberName" />
<property name="Title" translatable="yes">Add new File</property>
<property name="TypeHint">Dialog</property>
<property name="Modal">True</property>
+ <property name="Resizable">False</property>
+ <property name="AllowGrow">False</property>
+ <property name="DefaultWidth">460</property>
+ <property name="DefaultHeight">300</property>
<property name="Buttons">2</property>
<property name="HelpButton">False</property>
<child internal-child="VBox">
@@ -1227,31 +1231,24 @@
</packing>
</child>
<child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindowIcon">
+ <widget class="MonoDevelop.Components.IconView"
id="iconView">
<property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="VscrollbarPolicy">Automatic</property>
- <property name="HscrollbarPolicy">Automatic</property>
- <property name="ShadowType">In</property>
- <child>
- <widget class="Gtk.Viewport" id="GtkViewport">
- <property name="MemberName" />
- <property name="ShadowType">None</property>
- <child>
- <placeholder />
- </child>
- </widget>
- </child>
+ <property name="WidthRequest">289</property>
+ <property name="HeightRequest">200</property>
</widget>
<packing>
<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">True</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
</packing>
</child>
<child>
@@ -1281,11 +1278,11 @@
</packing>
</child>
<child>
- <widget class="Gtk.HBox" id="hbox2">
+ <widget class="Gtk.HBox" id="hboxName">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
- <widget class="Gtk.Label" id="label1">
+ <widget class="Gtk.Label" id="labelName">
<property name="MemberName" />
<property name="LabelProp"
translatable="yes">Name:</property>
</widget>
@@ -1297,10 +1294,11 @@
</packing>
</child>
<child>
- <widget class="Gtk.TextView" id="textview1">
+ <widget class="Gtk.Entry" id="entryName">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Text" translatable="yes" />
+ <property name="IsEditable">True</property>
+ <property name="InvisibleChar">●</property>
</widget>
<packing>
<property name="Position">1</property>
@@ -1319,6 +1317,8 @@
<packing>
<property name="Position">0</property>
<property name="AutoSize">True</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
</packing>
</child>
</widget>
@@ -1348,7 +1348,7 @@
</packing>
</child>
<child>
- <widget class="Gtk.Button" id="buttonOk">
+ <widget class="Gtk.Button" id="buttonNew">
<property name="MemberName" />
<property name="CanDefault">True</property>
<property name="CanFocus">True</property>
Modified:
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/objects.xml
===================================================================
--- branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/objects.xml
2007-05-27 06:49:10 UTC (rev 77997)
+++ branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/gtk-gui/objects.xml
2007-05-27 07:07:50 UTC (rev 77998)
@@ -1,8 +1,19 @@
<objects>
<object type="MonoDevelop.Ide.Gui.Dialogs.CombineEntryFeatureSelector"
palette-category="widget" allow-children="false" base-type="Gtk.Widget">
<itemgroups>
+ <itemgroup label="Container Properties">
+ <property name="BorderWidth" />
+ <property name="FocusHadjustment" />
+ <property name="FocusVadjustment" />
+ </itemgroup>
</itemgroups>
<signals>
+ <itemgroup label="Container Signals">
+ <signal name="ResizeChecked" />
+ <signal name="Removed" />
+ <signal name="FocusChildSet" />
+ <signal name="Added" />
+ </itemgroup>
</signals>
</object>
</objects>
\ No newline at end of file
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
