Neu ist Immer Besser

This commit is contained in:
Waldi
2017-10-06 12:08:05 +02:00
parent 706f83ccd9
commit e85dbfa970
17 changed files with 939 additions and 474 deletions

View File

@@ -8,6 +8,6 @@
mc:Ignorable="d" WindowStartupLocation="CenterScreen"
Title="ownChat Desktop" Height="700" Width="900" x:Name="MainView" Closed="MainWindow_OnClosed">
<Grid>
<cc:ChatMainControl x:Name="ChatMainControl" OnEmojii="ChatMainControl_OnOnEmojii" ></cc:ChatMainControl>
<cc:ChatMainControl x:Name="ChatMainControl" OnClose="ChatMainControl_OnOnClose" OnEmojii="ChatMainControl_OnOnEmojii" ></cc:ChatMainControl>
</Grid>
</Window>

View File

@@ -71,10 +71,10 @@ namespace ownChat
ChatMainControl.InitMitChatdaten(x);
ChatMainControl.SetzteStyleAufNull();
//ChatMainControl.AddContextMenu("In Dokumentation übernehmen", ChatMainControl_OnClickContextMenuItem);
}
private void ChatMainControl_OnOnEmojii(System.Windows.Controls.Button emojiButton)
@@ -113,7 +113,14 @@ namespace ownChat
private void MainWindow_OnClosed(object sender, EventArgs e)
{
_emojiView = null;
Environment.Exit(0);
// Environment.Exit(0);
LoginMaske newLogin = new LoginMaske();
newLogin.Show();
}
private void ChatMainControl_OnOnClose()
{
this.Close();
}
}