Skip to content

Commit

Permalink
Merge pull request #30 from SLICAN/scrshar
Browse files Browse the repository at this point in the history 
Udostępnianie ekranu
  • Loading branch information
@MrTytek
MrTytek committed Jan 6, 2020
2 parents f13f839 + bd9cde6 commit 95b6739
Show file tree
Hide file tree
Showing 28 changed files with 558 additions and 204 deletions.
36 changes: 22 additions & 14 deletions BzComWpf/ActiveUsersxaml.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<TextBlock HorizontalAlignment="Left" FontSize="13" Margin="0,3,5,0" Height="22" Foreground="White" Text="Dodaj osoby do nowej konwersacji" TextAlignment="Center" VerticalAlignment="Top" Width="204">

</TextBlock>
<Button x:Name="zamknijOkno" BorderThickness="0" Click="zamknijOkno_Click">
<Button Cursor="Hand" x:Name="zamknijOkno" BorderThickness="0" Click="zamknijOkno_Click">
<Button.Style>
<Style TargetType="{x:Type Button}">
<Setter Property="Background" Value="#202020"/>
Expand Down Expand Up @@ -79,19 +79,27 @@
</ListView>
</DockPanel>
<DockPanel VerticalAlignment="Bottom" Height="38" Margin="0,0,0,0">
<Button x:Name="emotikonaButton" Content="Dodaj" Height="22" BorderThickness="0" Background="#41AECF" Click="EmotikonaButton_Click" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="12" Width="100" >
<Button.Template>
<ControlTemplate>
<Border CornerRadius="7" Background="#41AECF">
<TextBlock Text="Dodaj" Foreground="Black"
HorizontalAlignment="Center"
Margin="0,0,0,0"
Height="20"

FontSize="15"></TextBlock>
</Border>
</ControlTemplate>
</Button.Template>
<Button Cursor="Hand" x:Name="emotikonaButton" Height="22" BorderThickness="0" Click="EmotikonaButton_Click" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="12" Width="214" Margin="0,8" >
<Button.Style>
<Style TargetType="{x:Type Button}">
<Setter Property="Background" Value="#383838"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border CornerRadius="5" Background="{TemplateBinding Background}">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#41AECF"/>
</Trigger>
</Style.Triggers>
</Style>
</Button.Style>
<TextBlock Text="Dodaj osoby" Foreground="White" FontSize="12px"></TextBlock>
</Button>
</DockPanel>
</Grid>
Expand Down
24 changes: 12 additions & 12 deletions BzComWpf/AddressBookForm.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
</Image>
<Label HorizontalAlignment="Left" FontWeight="Bold" Height="23" FontFamily="arial" Foreground="Silver" VerticalContentAlignment="Center" FontSize="8pt" Content="BzCOM" Width="58" />

<Button ToolTip="Minimalizuj" x:Name="buttonMinimize" Width="27" BorderBrush="{x:Null}" Foreground="{x:Null}" BorderThickness="0" HorizontalAlignment="Right" Click="ButtonMinimize_Click" >

<Button Cursor="Hand" ToolTip="Minimalizuj" x:Name="buttonMinimize" Width="27" BorderBrush="{x:Null}" Foreground="{x:Null}" BorderThickness="0" HorizontalAlignment="Right" Click="ButtonMinimize_Click" >


<Button.Style>
Expand Down Expand Up @@ -318,27 +318,27 @@
</Grid>

<DockPanel VerticalAlignment="Bottom" Background="#171717" Height="40" Grid.ColumnSpan="2" >
<Button ToolTip="Lista używtkowników" x:Name="ButtonAdd" Background="#151515" BorderThickness="0" Click="ButtonAdd_Click" Foreground="Black" HorizontalAlignment="Left" Width="30" Height="30" VerticalAlignment="Bottom" Margin="8,0,15,5" MouseEnter="ButtonAdd_MouseEnter" MouseLeave="ButtonAdd_MouseLeave" >
<Button Cursor="Hand" ToolTip="Lista używtkowników" x:Name="ButtonAdd" Background="#151515" BorderThickness="0" Click="ButtonAdd_Click" Foreground="Black" HorizontalAlignment="Left" Width="30" Height="30" VerticalAlignment="Bottom" Margin="8,0,15,5" MouseEnter="ButtonAdd_MouseEnter" MouseLeave="ButtonAdd_MouseLeave" >
<Image Source="Images/GrafikiMenu/listing-optionSilver.png" Stretch="None" x:Name="UserList" ></Image>
</Button>
<Button ToolTip="Konwersacja" x:Name="ButtonTeam" Background="#151515" BorderThickness="0" Click="ButtonTeam_Click" Foreground="Black" HorizontalAlignment="Left" Width="30" Height="30" VerticalAlignment="Bottom" Margin="0,0,15,5" MouseEnter="ButtonTeam_MouseEnter" MouseLeave="ButtonTeam_MouseLeave">

<Button Cursor="Hand" ToolTip="Konwersacja" x:Name="ButtonTeam" Background="#151515" BorderThickness="0" Click="ButtonTeam_Click" Foreground="Black" HorizontalAlignment="Left" Width="30" Height="30" VerticalAlignment="Bottom" Margin="0,0,15,5" MouseEnter="ButtonTeam_MouseEnter" MouseLeave="ButtonTeam_MouseLeave">
<Image Source="Images/GrafikiMenu/groupSilver.png" x:Name="Team" Stretch="None" />
</Button>
<Button x:Name="ButtonArchive" Background="#151515" BorderThickness="0" Click="ButtonArchive_Click" Foreground="Black" HorizontalAlignment="Left" Width="30" Height="30" VerticalAlignment="Bottom" Margin="0,0,15,5" MouseEnter="ButtonArchive_MouseEnter" MouseLeave="ButtonArchive_MouseLeave">
<Image Source="Images/GrafikiMenu/foldermenuSilver.png" x:Name="Archive" Stretch="None" />

<Button Cursor="Hand" x:Name="ButtonArchive" ToolTip="Udostępnianie ekranu" Background="#151515" BorderThickness="0" Click="ButtonArchive_Click" Foreground="Black" HorizontalAlignment="Left" Width="30" Height="30" VerticalAlignment="Bottom" Margin="0,0,15,5" MouseEnter="ButtonArchive_MouseEnter" MouseLeave="ButtonArchive_MouseLeave">
<Image Source="Images/GrafikiMenu/screenSilver.png" x:Name="Archive" Stretch="None" />
</Button>



<Button ToolTip="Informacje o programie" x:Name="ButtonFav" Background="#151515" BorderThickness="0" Click="ButtonFav_Click" Foreground="Black" HorizontalAlignment="Left" Width="30" Height="30" VerticalAlignment="Bottom" Margin="0,0,15,5" MouseEnter="ButtonFav_MouseEnter" MouseLeave="ButtonFav_MouseLeave" >

<Button Cursor="Hand" ToolTip="Informacje o programie" x:Name="ButtonFav" Background="#151515" BorderThickness="0" Click="ButtonFav_Click" Foreground="Black" HorizontalAlignment="Left" Width="30" Height="30" VerticalAlignment="Bottom" Margin="0,0,15,5" MouseEnter="ButtonFav_MouseEnter" MouseLeave="ButtonFav_MouseLeave" >
<Image Source="Images/GrafikiMenu/infoSilver.png" x:Name="UserInfo" Stretch="None"/>
</Button>



<Button ToolTip="Wyloguj" x:Name="Logout" Background="#151515" BorderThickness="0" Click="Logout_Click" Foreground="Black" HorizontalAlignment="Left" Width="30" Height="30" VerticalAlignment="Bottom" Margin="65,0,0,5" Grid.Column="1" MouseEnter="Logout_MouseEnter" MouseLeave="Logout_MouseLeave">

<Button Cursor="Hand" ToolTip="Wyloguj" x:Name="Logout" Background="#151515" BorderThickness="0" Click="Logout_Click" Foreground="Black" HorizontalAlignment="Left" Width="30" Height="30" VerticalAlignment="Bottom" Margin="65,0,0,5" Grid.Column="1" MouseEnter="Logout_MouseEnter" MouseLeave="Logout_MouseLeave">


<Image Source="Images/GrafikiMenu/logoutSilver.png" x:Name="logout" Stretch="None" />
Expand Down
9 changes: 6 additions & 3 deletions BzComWpf/AddressBookForm.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@ public AddressBookForm()
conversationConnections = new List<ConversationPage>();
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]);

Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
}

Expand Down
Binary file added BzComWpf/AxInterop.RDPCOMAPILib.dll
View file
Binary file not shown.
56 changes: 39 additions & 17 deletions BzComWpf/BzCOMWpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -35,6 +36,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AxInterop.RDPCOMAPILib">
<HintPath>.\AxInterop.RDPCOMAPILib.dll</HintPath>
</Reference>
<Reference Include="Google.Apis, Version=1.41.1.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.1.41.1\lib\net45\Google.Apis.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -90,6 +94,9 @@
<Compile Include="Information.xaml.cs">
<DependentUpon>Information.xaml</DependentUpon>
</Compile>
<Compile Include="ScreenSharing.xaml.cs">
<DependentUpon>ScreenSharing.xaml</DependentUpon>
</Compile>
<Compile Include="ListConversation.xaml.cs">
<DependentUpon>ListConversation.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -117,6 +124,9 @@
<Compile Include="Parsers\XMLCreator.cs" />
<Compile Include="Parsers\XMLInterpreter.cs" />
<Compile Include="SaveToJSON.cs" />
<Compile Include="ScreenViewer.xaml.cs">
<DependentUpon>ScreenViewer.xaml</DependentUpon>
</Compile>
<Compile Include="TrafficController.cs" />
<Compile Include="User.cs" />
<Page Include="ActiveUsersxaml.xaml">
Expand All @@ -131,6 +141,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ScreenSharing.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="ListConversation.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand Down Expand Up @@ -166,6 +180,10 @@
<DependentUpon>LoginForm.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="ScreenViewer.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Modules\Message.cs" />
Expand Down Expand Up @@ -239,18 +257,9 @@
<ItemGroup>
<Resource Include="Images\GrafikiMenu\avatar_placeholder.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\GrafikiMenu\adduser.png" />
<Resource Include="Images\GrafikiMenu\folder.png" />
<Resource Include="Images\GrafikiMenu\settings.png" />
<Resource Include="Images\GrafikiMenu\user.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\GrafikiMenu\team.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\GrafikiMenu\avatar.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\ChatPage\clipWhite.png" />
</ItemGroup>
Expand All @@ -272,9 +281,6 @@
<ItemGroup>
<Resource Include="Images\GrafikiMenu\chat.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\GrafikiMenu\logout.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\GrafikiMenu\peopleList.png" />
</ItemGroup>
Expand All @@ -297,10 +303,6 @@
<ItemGroup>
<Resource Include="Images\GrafikiMenu\StatusGreen.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\GrafikiMenu\a.png" />
<Resource Include="Images\GrafikiMenu\b.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\AdressBookPage\statusBusy.png" />
<Resource Include="Images\AdressBookPage\statusOfline.png" />
Expand All @@ -317,5 +319,25 @@
<Resource Include="Images\GrafikiMenu\statusBUSYperson.png" />
<Resource Include="Images\GrafikiMenu\statusUNAperson.png" />
</ItemGroup>
<ItemGroup>
<COMReference Include="RDPCOMAPILib">
<Guid>{CC802D05-AE07-4C15-B496-DB9D22AA0A84}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<ItemGroup>
<Resource Include="Images\GrafikiMenu\screenWhite.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\GrafikiMenu\screenSilver.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\GrafikiMenu\create.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
6 changes: 3 additions & 3 deletions BzComWpf/ChatMessage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</Image>
<Label HorizontalAlignment="Left" FontWeight="Bold" Height="23" FontFamily="arial" Foreground="Silver" VerticalContentAlignment="Center" FontSize="8pt" Content="BzCOM" Width="58" />

<Button ToolTip="Zamknij czat" x:Name="buttonExit" Width="27" BorderBrush="{x:Null}" Foreground="{x:Null}" BorderThickness="0" DockPanel.Dock="Right" Click="ButtonExit_Click" >
<Button Cursor="Hand" ToolTip="Zamknij czat" x:Name="buttonExit" Width="27" BorderBrush="{x:Null}" Foreground="{x:Null}" BorderThickness="0" DockPanel.Dock="Right" Click="ButtonExit_Click" >
<Button.Style>
<Style TargetType="{x:Type Button}">
<Setter Property="Background" Value="#282828"/>
Expand All @@ -71,7 +71,7 @@


</Button>
<Button ToolTip="Minimalizuj" x:Name="buttonMinimize" Width="27" BorderBrush="{x:Null}" Foreground="{x:Null}" BorderThickness="0" HorizontalAlignment="Right" Click="ButtonMinimize_Click" >
<Button Cursor="Hand" ToolTip="Minimalizuj" x:Name="buttonMinimize" Width="27" BorderBrush="{x:Null}" Foreground="{x:Null}" BorderThickness="0" HorizontalAlignment="Right" Click="ButtonMinimize_Click" >


<Button.Style>
Expand Down Expand Up @@ -104,7 +104,7 @@
<Border>


<DockPanel Background="#FF444444" Height="415" VerticalAlignment="Bottom">
<DockPanel Background="#202020" Height="415" VerticalAlignment="Bottom">
<ListView BorderThickness="0" Background="#282828" x:Name="ConnectionsListView" Width="200" MouseDoubleClick="ConnectionsListView_MouseDoubleClick" HorizontalAlignment="Left">
<ListView.ItemTemplate>
<DataTemplate>
Expand Down

0 comments on commit 95b6739

Please sign in to comment.