universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:alcexhim/UniversalEditor

Browse Source
This commit is contained in:
Michael Becker 2015-05-05 22:22:11 -04:00
commit 885b6820b1
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/NewDialog.cs
View File

@ -21,6 +21,8 @@ namespace UniversalEditor.UserInterface.WindowsForms.Dialogs
RefreshProjectTemplates();
tvProject.Sort();
// UseThemeBackground = true;
}
private NewDialogMode mvarMode = NewDialogMode.File;

6
CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Controls/DocumentTypeSelector.cs
View File

@ -17,6 +17,12 @@ namespace UniversalEditor.UserInterface.WindowsForms.Controls
{
InitializeComponent();
txtSearch.BackColor = AwesomeControls.Theming.Theme.CurrentTheme.ColorTable.WindowBackground;
txtSearch.ForeColor = AwesomeControls.Theming.Theme.CurrentTheme.ColorTable.WindowForeground;
tvObjectModels.BackColor = AwesomeControls.Theming.Theme.CurrentTheme.ColorTable.WindowBackground;
tvObjectModels.ForeColor = AwesomeControls.Theming.Theme.CurrentTheme.ColorTable.WindowForeground;
imlLargeIcons.PopulateSystemIcons();
imlSmallIcons.PopulateSystemIcons();
}

20
CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Editors/FileSystemEditor.cs
View File

@ -199,9 +199,12 @@ namespace UniversalEditor.UserInterface.WindowsForms.Editors
private void RecursiveLoadFile(File file, AwesomeControls.ListView.ListViewItem parent)
{
if (!String.IsNullOrEmpty(txtFilter.Text) && !(file.Name.ToLower().Contains(txtFilter.Text.ToLower())
/* || !file.Name.ToLower().Match(txtFilter.Text.ToLower()) */
)) return;
AwesomeControls.ListView.ListViewItem lvi = new AwesomeControls.ListView.ListViewItem();
if (!String.IsNullOrEmpty(txtFilter.Text) && (file.Name.Contains(txtFilter.Text) || !file.Name.Match(txtFilter.Text))) return;
lvi.Data = file;
lvi.ImageKey = "generic-file";
lvi.Text = file.Name;
@ -273,7 +276,7 @@ namespace UniversalEditor.UserInterface.WindowsForms.Editors
private void RecursiveLoadListViewFolder(Folder folder, AwesomeControls.ListView.ListViewItem parent)
{
if (String.IsNullOrEmpty(txtFilter.Text) || !(folder.Name.ToLower().Contains(txtFilter.Text.ToLower())
if (!String.IsNullOrEmpty(txtFilter.Text) && !(folder.Name.ToLower().Contains(txtFilter.Text.ToLower())
/* || !folder.Name.ToLower().Match(txtFilter.Text.ToLower()) */
)) return;
@ -298,6 +301,12 @@ namespace UniversalEditor.UserInterface.WindowsForms.Editors
{
lv.Items.Add(lvi);
}
if (lv.Items.Count == 1)
{
lv.SelectedItems.Clear();
lv.Items[0].Selected = true;
}
}
private void tv_AfterSelect(object sender, TreeViewEventArgs e)
@ -965,13 +974,14 @@ namespace UniversalEditor.UserInterface.WindowsForms.Editors
string[] files = System.IO.Directory.GetFiles(path, "*.*", System.IO.SearchOption.AllDirectories);
foreach (string file in files)
{
string fileName = file.Substring(path.Length + 1);
if (mvarCurrentFolder == null)
{
fsom.AddFile(file, System.IO.File.ReadAllBytes(file));
fsom.AddFile(fileName, System.IO.File.ReadAllBytes(file));
}
else
{
mvarCurrentFolder.AddFile(file, System.IO.File.ReadAllBytes(file));
mvarCurrentFolder.AddFile(fileName, System.IO.File.ReadAllBytes(file));
}
}