Skip to content

Commit

Permalink
code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
MikePohatu committed Jul 23, 2017
1 parent 07097a7 commit 85c4a67
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 22 deletions.
13 changes: 13 additions & 0 deletions Visualizer/LoadingSplashWindow.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Window x:Class="Visualizer.LoadingSplashWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Visualizer"
mc:Ignorable="d"
Title="Loading" Height="200" Width="300" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" ShowInTaskbar="False" WindowStyle="None">
<Grid>
<Label Content="{Binding LoadingTitleText}"/>
<Label Content="{Binding LoadingNotificationText}"/>
</Grid>
</Window>
27 changes: 27 additions & 0 deletions Visualizer/LoadingSplashWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;

namespace Visualizer
{
/// <summary>
/// Interaction logic for LoadingSplashWindow.xaml
/// </summary>
public partial class LoadingSplashWindow : Window
{
public LoadingSplashWindow()
{
InitializeComponent();
}
}
}
22 changes: 0 additions & 22 deletions Visualizer/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,43 +70,21 @@ private void Startup(LoginWindow loginwindow, LoginViewModel loginviewmodel)
{
loginwindow.Close();
this._site = loginviewmodel.Site;
//this._connector.QueryAll(this._site);

this._devicepane = new DevicePane(this._connector);
this.devtab.DataContext = this._devicepane;
//TabItem devtabitem = new TabItem();
//devtabitem.Header = this._devicepane.Header;
//devtabitem.Content = this._devicepane.Pane;
//maintabctrl.Items.Add(devtabitem);


this._userpane = new UserPane(this._connector);
this.usertab.DataContext = this._userpane;
//TabItem usertabitem = new TabItem();
//usertabitem.Header = this._userpane.Header;
//usertabitem.Content = this._userpane.Pane;
//maintabctrl.Items.Add(usertabitem);

this._apppane = new ApplicationPane(this._connector);
this.apptab.DataContext = this._apppane;
//TabItem apptabitem = new TabItem();
//apptabitem.Header = this._apppane.Header;
//apptabitem.Content = this._apppane.Pane;
//maintabctrl.Items.Add(apptabitem);

this._packagespane = new PackagePane(this._connector);
this.packagetab.DataContext = this._packagespane;
//TabItem packagetabitem = new TabItem();
//packagetabitem.Header = this._packagespane.Header;
//packagetabitem.Content = this._packagespane.Pane;
//maintabctrl.Items.Add(packagetabitem);

this._deploymentpane = new DeploymentsPane(this._connector);
this.deploymenttab.DataContext = this._deploymentpane;
//TabItem deptabitem = new TabItem();
//deptabitem.Header = this._deploymentpane.Header;
//deptabitem.Content = this._deploymentpane.Pane;
//maintabctrl.Items.Add(deptabitem);
}
}
}

0 comments on commit 85c4a67

Please sign in to comment.