Commit 909542ca authored by Margaux Clerc's avatar Margaux Clerc

Fix ui details and add delete account

parent c87800ce
......@@ -115,7 +115,13 @@ namespace Linphone.Controls
private void video_Click_1(object sender, RoutedEventArgs e)
{
bool isVideoToggled = (bool)video.IsChecked;
video.IsChecked = isVideoToggled;
if (!isVideoToggled)
{
video.IsEnabled = false;
} else
{
video.IsChecked = isVideoToggled;
}
VideoClick(this, isVideoToggled);
}
......
......@@ -18,6 +18,7 @@ using BelledonneCommunications.Linphone.Native;
using System;
using System.Collections.Generic;
using System.Linq;
using Windows.ApplicationModel.Resources;
namespace Linphone.Model
{
......@@ -46,8 +47,7 @@ namespace Linphone.Model
string lastText = Messages.Last().Text;
if (lastText == null || lastText.Length <= 0)
{
return null;
//return Resources.AppResources.ImageMessageReceived;
return ResourceLoader.GetForCurrentView().GetString("ImageMessageReceived");
}
return lastText;
}
......
......@@ -474,6 +474,16 @@ namespace Linphone.Model
}
}
}
public void Delete()
{
ProxyConfig cfg = LinphoneManager.Instance.Core.DefaultProxyConfig;
if (cfg != null)
{
LinphoneManager.Instance.Core.ClearProxyConfig();
LinphoneManager.Instance.Core.ClearAllAuthInfo();
}
}
#endregion
#region Accessors
......
......@@ -4,7 +4,7 @@
<mp:PhoneIdentity PhoneProductId="ed47fa26-a45b-4bda-82e1-cdc792d1d9bd" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Linphone</DisplayName>
<PublisherDisplayName>Belledonne Communications</PublisherDisplayName>
<PublisherDisplayName>Belledonne Communications SARL</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
<Dependencies>
......
......@@ -143,7 +143,7 @@
<data name="HistoryMenu.Text" xml:space="preserve">
<value>HISTORY</value>
</data>
<data name="SaveSettings" xml:space="preserve">
<data name="SaveSettings.Label" xml:space="preserve">
<value>Save</value>
</data>
<data name="SettingsMenu.Text" xml:space="preserve">
......
......@@ -41,7 +41,7 @@
TextAlignment="Center"
Style="{StaticResource ListItemStyle}"
Margin="0,10,0,0">
<Run Text="Linphone Windows Phone"/>
<Run Text="Linphone Windows 10"/>
<Run x:Name="AppVersion"/>
</TextBlock>
<TextBlock
......
......@@ -158,7 +158,6 @@
<CommandBar Grid.Row="2" VerticalAlignment="Bottom">
<AppBarButton Icon="Save" Label="Save" Click="save_Click_1"/>
<AppBarButton Icon="Cancel" Label="Cancel" Click="cancel_Click_1" />
<AppBarButton Label="Linphone" Click="linphone_Click_1">
<AppBarButton.Content>
<Grid>
......@@ -166,6 +165,8 @@
</Grid>
</AppBarButton.Content>
</AppBarButton>
<AppBarButton Icon="Delete" Label="Delete" Click="delete_Click_1" />
</CommandBar>
</Grid>
......
......@@ -16,11 +16,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
using BelledonneCommunications.Linphone.Native;
using Linphone.Model;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Windows;
using System.Windows.Input;
using Windows.ApplicationModel.Resources;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
......@@ -111,9 +107,9 @@ namespace Linphone.Views
base.OnNavigatingFrom(e);
}
private void cancel_Click_1(object sender, RoutedEventArgs e)
private void delete_Click_1(object sender, RoutedEventArgs e)
{
saveSettingsOnLeave = false;
_settings.Delete();
if (Frame.CanGoBack)
{
Frame.GoBack();
......
......@@ -269,7 +269,7 @@
HorizontalAlignment="Right"
Style="{StaticResource TextStyle}"
FontSize="12"
Padding="0,5,12,0"/>
Padding="2,5,10,0"/>
</Grid>
</AppBarButton.Content>
</AppBarButton>
......@@ -287,7 +287,7 @@
HorizontalAlignment="Right"
Style="{StaticResource TextStyle}"
FontSize="12"
Padding="0,5,12,0"/>
Padding="2,5,10,0"/>
</Grid>
</AppBarButton.Content>
</AppBarButton>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment