Skip to content

Put app main window changes into main branch #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmcneill merged 2 commits into from
Sep 29, 2022
Merged

Put app main window changes into main branch #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa0cdd3
Initial changes to app main window
dmcneill Sep 29, 2022
9eabe51
Main window, scroll bars in datagridview
dmcneill Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions RemoteApplicationPublisher/Properties/DataSources/RemoteAppCollection.datasource
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="RemoteAppCollection" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>RemoteApplicationPublisher.RemoteAppCollection, RemoteApplicationPublisher, Version=255.255.65534.65534, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
676 changes: 314 additions & 362 deletions RemoteApplicationPublisher/RemoteAppMainWindow.Designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 82 additions & 44 deletions RemoteApplicationPublisher/RemoteAppMainWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ public partial class RemoteAppMainWindow : Form
public RemoteAppMainWindow()
{
InitializeComponent();
this.dataGrid.ColumnCount = 3;
this.dataGrid.Columns[0].Name = "Application Name";
this.dataGrid.Columns[1].Name = "Path";
this.dataGrid.Columns[2].Name = "Command Line";

this.dataGrid.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
this.dataGrid.MultiSelect = false;
}

private void RemoteAppMainWindow_Disposed(object sender, EventArgs e)
Expand All @@ -30,79 +37,109 @@ private void RemoteAppMainWindow_Load(object sender, EventArgs e)
ReloadApps();
}


public void ReloadApps()
{
AppList.Clear();
// AppList.Clear();

var systemApps = new SystemRemoteApps();
var apps = systemApps.GetAll();

this.dataGrid.Rows.Clear();

foreach (RemoteApp app in apps)
{
SmallIcons.Images.RemoveByKey(app.Name);
var iconBitmap = RemoteAppFunction.GetAppBitmap(app.Name);
var appItem = new ListViewItem(app.Name);
appItem.ToolTipText = app.FullName;
appItem.ImageIndex = 0;
SmallIcons.Images.Add(app.Name, iconBitmap);
appItem.ImageKey = app.Name;
AppList.Items.Add(appItem);
var columns = new string[3];
columns[0] = app.Name;
columns[1] = app.Path;
columns[2] = app.CommandLine;
this.dataGrid.Rows.Add(columns);
// SmallIcons.Images.RemoveByKey(app.Name);
// var iconBitmap = RemoteAppFunction.GetAppBitmap(app.Name);
// var appItem = new ListViewItem(app.Name);
// appItem.ToolTipText = app.FullName;
// appItem.ImageIndex = 0;
// SmallIcons.Images.Add(app.Name, iconBitmap);
// appItem.ImageKey = app.Name;
// AppList.Items.Add(appItem);
}


if (apps.Count == 0)
{
NoAppsLabel.Visible = true;
NoAppsLabel.Visible = true;
buttonRemove.Enabled = false;
buttonEdit.Enabled = false;
}
else
{
NoAppsLabel.Visible = false;
{
this.dataGrid.ClearSelection();
NoAppsLabel.Visible = false;
buttonRemove.Enabled = false;
buttonEdit.Enabled = false;
}

EditButton.Enabled = false;
DeleteButton.Enabled = false;
}

private void AppList_DoubleClick(object sender, EventArgs e)
{
if (AppList.SelectedItems.Count == 1)
{
EditRemoteApp(AppList.SelectedItems[0].Text);
}
}

private void AppList_SelectedIndexChanged(object sender, EventArgs e)
{
if (AppList.SelectedItems.Count == 1)
{
EditButton.Enabled = true;
DeleteButton.Enabled = true;
}
else
{
EditButton.Enabled = false;
DeleteButton.Enabled = false;
}
}
// buttonRemove.Enabled = false;
// buttonEdit.Enabled = false;
}

//private void AppList_DoubleClick(object sender, EventArgs e)
//{
// if (AppList.SelectedItems.Count == 1)
// {
// EditRemoteApp(AppList.SelectedItems[0].Text);
// }
//}

string SelectedApplicationName;

private void dataGrid_CellContentClick(object sender, DataGridViewCellEventArgs e)
{
if (e.RowIndex >= 0)
{
DataGridViewRow row = this.dataGrid.Rows[e.RowIndex];
SelectedApplicationName = row.Cells["Application Name"].Value.ToString();
this.buttonEdit.Enabled = true;
this.buttonRemove.Enabled = true;
}

}

//private void AppList_SelectedIndexChanged(object sender, EventArgs e)
//{
// if (AppList.SelectedItems.Count == 1)
// {
// buttonRemove.Enabled = true;
// buttonEdit.Enabled = true;
// }
// else
// {
// buttonRemove.Enabled = false;
// buttonEdit.Enabled = false;
// }
//}

private void EditButton_Click(object sender, EventArgs e)
{
if (AppList.SelectedItems.Count == 1)
{
EditRemoteApp(AppList.SelectedItems[0].Text);
}
{
EditRemoteApp(this.SelectedApplicationName);

//if (AppList.SelectedItems.Count == 1)
//{
// EditRemoteApp(AppList.SelectedItems[0].Text);
//}
}

private void EditRemoteApp(string AppName)
{
var sra = new SystemRemoteApps();
var remoteAppEditWindow = new RemoteAppEditWindow(this);
remoteAppEditWindow.EditRemoteApp(sra.GetApp(AppName));
ReloadApps();
}

private void DeleteButton_Click(object sender, EventArgs e)
{
DeleteRemoteApp(AppList.SelectedItems[0].Text);
ReloadApps();
DeleteRemoteApp(this.SelectedApplicationName);
}

private void DeleteRemoteApp(string AppName)
Expand All @@ -112,6 +149,7 @@ private void DeleteRemoteApp(string AppName)
var sra = new SystemRemoteApps();
sra.DeleteApp(AppName);
}
ReloadApps();
}

private void CreateButton_Click(object sender, EventArgs e)
Expand Down
Loading