diff --git a/BzComWpf/ActiveUsersxaml.xaml b/BzComWpf/ActiveUsersxaml.xaml index 2174d75..11d41c0 100644 --- a/BzComWpf/ActiveUsersxaml.xaml +++ b/BzComWpf/ActiveUsersxaml.xaml @@ -15,7 +15,7 @@ - + + + diff --git a/BzComWpf/AddressBookForm.xaml b/BzComWpf/AddressBookForm.xaml index 8fb273a..46ae8f0 100644 --- a/BzComWpf/AddressBookForm.xaml +++ b/BzComWpf/AddressBookForm.xaml @@ -141,8 +141,8 @@ - - + + @@ -318,27 +318,27 @@ - + - - + + - - - + + + - - + + - - + + diff --git a/BzComWpf/AddressBookForm.xaml.cs b/BzComWpf/AddressBookForm.xaml.cs index ab54ab1..0e409d6 100644 --- a/BzComWpf/AddressBookForm.xaml.cs +++ b/BzComWpf/AddressBookForm.xaml.cs @@ -61,10 +61,12 @@ public AddressBookForm() conversationConnections = new List(); AdressBookPage adressBookPage = new AdressBookPage(messageForm, openedConnections, conversationConnections,myNumber); conversationList = new ListConversation(messageForm, openedConnections, conversationConnections, adressBookPage.ListViewAddressBook,myNumber); + ScreenSharing screenSharing = new ScreenSharing(); informationPage = new Information(); pages.Add(adressBookPage); pages.Add(conversationList); pages.Add(informationPage); + pages.Add(screenSharing); _mainFrame.Navigate(pages[0]); @@ -327,7 +329,8 @@ private void ButtonTeam_Click(object sender, RoutedEventArgs e) private void ButtonArchive_Click(object sender, RoutedEventArgs e) { - } + _mainFrame.Navigate(pages[3]); + } private void ButtonSetting_Click(object sender, RoutedEventArgs e) { @@ -376,13 +379,13 @@ private void ButtonAdd_MouseLeave(object sender, MouseEventArgs e) private void ButtonArchive_MouseEnter(object sender, MouseEventArgs e) { - Archive.Source = new BitmapImage(new Uri(@"/Images/GrafikiMenu/foldermenuWhite.png", UriKind.Relative)); + Archive.Source = new BitmapImage(new Uri(@"/Images/GrafikiMenu/screenWhite.png", UriKind.Relative)); Archive.Stretch = Stretch.None; } private void ButtonArchive_MouseLeave(object sender, MouseEventArgs e) { - Archive.Source = new BitmapImage(new Uri(@"/Images/GrafikiMenu/foldermenuSilver.png", UriKind.Relative)); + Archive.Source = new BitmapImage(new Uri(@"/Images/GrafikiMenu/screenSilver.png", UriKind.Relative)); Archive.Stretch = Stretch.None; } diff --git a/BzComWpf/AxInterop.RDPCOMAPILib.dll b/BzComWpf/AxInterop.RDPCOMAPILib.dll new file mode 100644 index 0000000..1e0c92d Binary files /dev/null and b/BzComWpf/AxInterop.RDPCOMAPILib.dll differ diff --git a/BzComWpf/BzCOMWpf.csproj b/BzComWpf/BzCOMWpf.csproj index 9025f0a..d39a05b 100644 --- a/BzComWpf/BzCOMWpf.csproj +++ b/BzComWpf/BzCOMWpf.csproj @@ -16,7 +16,7 @@ true - AnyCPU + x86 true full false @@ -24,6 +24,7 @@ DEBUG;TRACE prompt 4 + true AnyCPU @@ -35,6 +36,9 @@ 4 + + .\AxInterop.RDPCOMAPILib.dll + ..\packages\Google.Apis.1.41.1\lib\net45\Google.Apis.dll @@ -90,6 +94,9 @@ Information.xaml + + ScreenSharing.xaml + ListConversation.xaml @@ -117,6 +124,9 @@ + + ScreenViewer.xaml + @@ -131,6 +141,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -166,6 +180,10 @@ LoginForm.xaml Code + + Designer + MSBuild:Compile + @@ -239,18 +257,9 @@ - - - - - - - - - @@ -272,9 +281,6 @@ - - - @@ -297,10 +303,6 @@ - - - - @@ -317,5 +319,25 @@ + + + {CC802D05-AE07-4C15-B496-DB9D22AA0A84} + 1 + 0 + 0 + tlbimp + False + True + + + + + + + + + + + \ No newline at end of file diff --git a/BzComWpf/ChatMessage.xaml b/BzComWpf/ChatMessage.xaml index fb53752..8d6ff60 100644 --- a/BzComWpf/ChatMessage.xaml +++ b/BzComWpf/ChatMessage.xaml @@ -46,7 +46,7 @@ - + - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -132,14 +132,14 @@ - + + + - + + - - - @@ -147,18 +147,13 @@ - + - - - - - diff --git a/BzComWpf/ChatPage.xaml.cs b/BzComWpf/ChatPage.xaml.cs index ab9039c..c580c2c 100644 --- a/BzComWpf/ChatPage.xaml.cs +++ b/BzComWpf/ChatPage.xaml.cs @@ -300,17 +300,7 @@ private void SendButton_MouseLeave(object sender, MouseEventArgs e) send.Stretch = Stretch.None; } - private void EmotikonaButton_MouseEnter(object sender, MouseEventArgs e) - { - emotikona.Source = new BitmapImage(new Uri(@"/Images/ChatPage/emotikonaWhite.png", UriKind.Relative)); - emotikona.Stretch = Stretch.None; - } - - private void EmotikonaButton_MouseLeave(object sender, MouseEventArgs e) - { - emotikona.Source = new BitmapImage(new Uri(@"/Images/ChatPage/emotikonaSilver.png", UriKind.Relative)); - emotikona.Stretch = Stretch.None; - } + private void ClipButton_Click(object sender, RoutedEventArgs e) { diff --git a/BzComWpf/ConversationPage.xaml b/BzComWpf/ConversationPage.xaml index 8bcf9b2..cc2f3b1 100644 --- a/BzComWpf/ConversationPage.xaml +++ b/BzComWpf/ConversationPage.xaml @@ -132,14 +132,14 @@ - + - + - - - + + + @@ -147,18 +147,13 @@ - + - - - - - diff --git a/BzComWpf/ConversationPage.xaml.cs b/BzComWpf/ConversationPage.xaml.cs index a2dc82c..7499c4a 100644 --- a/BzComWpf/ConversationPage.xaml.cs +++ b/BzComWpf/ConversationPage.xaml.cs @@ -300,17 +300,7 @@ private void SendButton_MouseLeave(object sender, MouseEventArgs e) send.Stretch = Stretch.None; } - private void EmotikonaButton_MouseEnter(object sender, MouseEventArgs e) - { - emotikona.Source = new BitmapImage(new Uri(@"/Images/ChatPage/emotikonaWhite.png", UriKind.Relative)); - emotikona.Stretch = Stretch.None; - } - - private void EmotikonaButton_MouseLeave(object sender, MouseEventArgs e) - { - emotikona.Source = new BitmapImage(new Uri(@"/Images/ChatPage/emotikonaSilver.png", UriKind.Relative)); - emotikona.Stretch = Stretch.None; - } + //Gooogle Drive transfer plikow diff --git a/BzComWpf/Images/GrafikiMenu/a.png b/BzComWpf/Images/GrafikiMenu/a.png deleted file mode 100644 index abe6571..0000000 Binary files a/BzComWpf/Images/GrafikiMenu/a.png and /dev/null differ diff --git a/BzComWpf/Images/GrafikiMenu/adduser.png b/BzComWpf/Images/GrafikiMenu/adduser.png deleted file mode 100644 index 0363ec7..0000000 Binary files a/BzComWpf/Images/GrafikiMenu/adduser.png and /dev/null differ diff --git a/BzComWpf/Images/GrafikiMenu/avatar.png b/BzComWpf/Images/GrafikiMenu/avatar.png deleted file mode 100644 index b2eaa03..0000000 Binary files a/BzComWpf/Images/GrafikiMenu/avatar.png and /dev/null differ diff --git a/BzComWpf/Images/GrafikiMenu/b.png b/BzComWpf/Images/GrafikiMenu/b.png deleted file mode 100644 index fb42963..0000000 Binary files a/BzComWpf/Images/GrafikiMenu/b.png and /dev/null differ diff --git a/BzComWpf/Images/GrafikiMenu/create.png b/BzComWpf/Images/GrafikiMenu/create.png new file mode 100644 index 0000000..906e56d Binary files /dev/null and b/BzComWpf/Images/GrafikiMenu/create.png differ diff --git a/BzComWpf/Images/GrafikiMenu/folder.png b/BzComWpf/Images/GrafikiMenu/folder.png deleted file mode 100644 index f5b6e43..0000000 Binary files a/BzComWpf/Images/GrafikiMenu/folder.png and /dev/null differ diff --git a/BzComWpf/Images/GrafikiMenu/logout.png b/BzComWpf/Images/GrafikiMenu/logout.png deleted file mode 100644 index dea6198..0000000 Binary files a/BzComWpf/Images/GrafikiMenu/logout.png and /dev/null differ diff --git a/BzComWpf/Images/GrafikiMenu/screenSilver.png b/BzComWpf/Images/GrafikiMenu/screenSilver.png new file mode 100644 index 0000000..d4b93fb Binary files /dev/null and b/BzComWpf/Images/GrafikiMenu/screenSilver.png differ diff --git a/BzComWpf/Images/GrafikiMenu/screenWhite.png b/BzComWpf/Images/GrafikiMenu/screenWhite.png new file mode 100644 index 0000000..0635bf4 Binary files /dev/null and b/BzComWpf/Images/GrafikiMenu/screenWhite.png differ diff --git a/BzComWpf/Images/GrafikiMenu/settings.png b/BzComWpf/Images/GrafikiMenu/settings.png deleted file mode 100644 index e882ca9..0000000 Binary files a/BzComWpf/Images/GrafikiMenu/settings.png and /dev/null differ diff --git a/BzComWpf/Images/GrafikiMenu/user.png b/BzComWpf/Images/GrafikiMenu/user.png deleted file mode 100644 index 2a6d1e9..0000000 Binary files a/BzComWpf/Images/GrafikiMenu/user.png and /dev/null differ diff --git a/BzComWpf/Interop.RDPCOMAPILib.dll b/BzComWpf/Interop.RDPCOMAPILib.dll new file mode 100644 index 0000000..5d66599 Binary files /dev/null and b/BzComWpf/Interop.RDPCOMAPILib.dll differ diff --git a/BzComWpf/ListConversation.xaml b/BzComWpf/ListConversation.xaml index 932c347..769cea3 100644 --- a/BzComWpf/ListConversation.xaml +++ b/BzComWpf/ListConversation.xaml @@ -38,7 +38,7 @@ - + @@ -52,22 +52,31 @@ - - - - - - - - + + + + + + - + @@ -77,11 +86,11 @@ - + - + diff --git a/BzComWpf/LoginForm.xaml b/BzComWpf/LoginForm.xaml index 1e80e89..7a46de0 100644 --- a/BzComWpf/LoginForm.xaml +++ b/BzComWpf/LoginForm.xaml @@ -18,19 +18,28 @@ - - - - - - - - + + + + + + @@ -70,7 +79,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BzComWpf/ScreenSharing.xaml.cs b/BzComWpf/ScreenSharing.xaml.cs new file mode 100644 index 0000000..1485809 --- /dev/null +++ b/BzComWpf/ScreenSharing.xaml.cs @@ -0,0 +1,79 @@ +using System; +using System.Windows; +using System.Windows.Controls; +using RDPCOMAPILib; + +namespace BzCOMWpf +{ + /// + /// Logika interakcji dla klasy AdressBookPage.xaml + /// + public partial class ScreenSharing : Page + { + ScreenViewer xy; + RDPSession x; + public ScreenSharing() + { + InitializeComponent(); + + } + private void Incoming(object Guest) + { + IRDPSRAPIAttendee MyGuest = (IRDPSRAPIAttendee)Guest;//??? + MyGuest.ControlLevel = CTRL_LEVEL.CTRL_LEVEL_INTERACTIVE; + } + private void Button_Viewer_Click(object sender, RoutedEventArgs e) + { + try + { + string Invitation = textBox_Link.Text; + xy = new ScreenViewer(); + xy.Connection(Invitation);// Do ogarnięcia - wychodzi poza zakres ??? + xy.Show(); + Button_StopViewing.Visibility = Visibility.Visible; + Button_Viewer.IsEnabled = false; + } + catch(ArgumentException) + { + textBox_Link.Text = "Błędne zaproszenie"; + } + } + private void Button_StopSharing_Click(object sender, RoutedEventArgs e) + { + x.Close(); + x = null; + Button_StopSharing.Visibility = Visibility.Hidden; + Button_Copy.Visibility = Visibility.Hidden; + Button_Paste.Visibility = Visibility.Visible; + Button_Host.IsEnabled = true; + } + private void Button_Copy_Click(object sender, RoutedEventArgs e) + { + string Invitation = textBox_Link.Text; + Clipboard.SetText(Invitation); + } + private void Button_StopViewing_Click(object sender, RoutedEventArgs e) + { + xy.Disconnection(); + xy.Close(); + Button_StopViewing.Visibility = Visibility.Hidden; + Button_Viewer.IsEnabled = true; + } + private void Button_Host_Click(object sender, RoutedEventArgs e) + { + x = new RDPSession(); + x.OnAttendeeConnected += Incoming; + x.Open(); + IRDPSRAPIInvitation Invitation = x.Invitations.CreateInvitation("Trial", "MyGroup", "", 10); + textBox_Link.Text = Invitation.ConnectionString; + Button_StopSharing.Visibility = Visibility.Visible; + Button_Copy.Visibility = Visibility.Visible; + Button_Paste.Visibility = Visibility.Hidden; + Button_Host.IsEnabled = false; + } + private void Button_Paste_Click(object sender, RoutedEventArgs e) + { + textBox_Link.Text = Clipboard.GetText(); + } + } +} \ No newline at end of file diff --git a/BzComWpf/ScreenViewer.xaml b/BzComWpf/ScreenViewer.xaml new file mode 100644 index 0000000..ab2cccb --- /dev/null +++ b/BzComWpf/ScreenViewer.xaml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + diff --git a/BzComWpf/ScreenViewer.xaml.cs b/BzComWpf/ScreenViewer.xaml.cs new file mode 100644 index 0000000..3c90bb1 --- /dev/null +++ b/BzComWpf/ScreenViewer.xaml.cs @@ -0,0 +1,37 @@ +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.Navigation; +using System.Windows.Shapes; + + +namespace BzCOMWpf +{ + /// + /// Logika interakcji dla klasy ScreenViewer.xaml + /// + public partial class ScreenViewer : Window + { + public ScreenViewer() + { + InitializeComponent(); + } + public void Connection(String Invitation) { + //RdpViewer.Connect(Invitation, "User1", ""); + String inv = Invitation; + RdpViewer.Connect(inv, "User1", ""); + } + public void Disconnection() { + RdpViewer.Disconnect(); + } + } +}