Commit 424bac85 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Interface improvements (changed call button, ...)

parent 7adb70e7
No preview for this file type
......@@ -19,14 +19,6 @@ namespace Linphone
/// <returns>The root frame of the Phone Application.</returns>
public static PhoneApplicationFrame RootFrame { get; private set; }
/// <summary>
/// Hack to override some system defined colors (in this case the background of a focused PhoneTextBox.
/// </summary>
private void OverrideColorsViaCode()
{
(App.Current.Resources["PhoneTextBoxEditBackgroundBrush"] as SolidColorBrush).Color = Color.FromArgb(0, 0, 0, 0);
}
/// <summary>
/// Constructor for the Application object.
/// </summary>
......@@ -41,9 +33,6 @@ namespace Linphone
// Phone-specific initialization
InitializePhoneApplication();
// Override some system defined colors
OverrideColorsViaCode();
// Language display initialization
InitializeLanguage();
......
......@@ -11,19 +11,7 @@
Foreground="{StaticResource PhoneForegroundBrush}"
d:DesignHeight="100" d:DesignWidth="480">
<UserControl.Resources>
<ImageBrush ImageSource="/Assets/dialer_address_background.png" x:Key="FieldBackground"/>
<Style TargetType="ContentControl" x:Key="HintWhiteStyle">
<Setter Property="Foreground" Value="White"></Setter>
</Style>
<Style TargetType="toolkit:PhoneTextBox" x:Key="TransparentFocus">
<Setter Property="Background" Value="Transparent"></Setter>
<Setter Property="Foreground" Value="White"></Setter>
<Setter Property="CaretBrush" Value="White"></Setter>
</Style>
</UserControl.Resources>
<Grid x:Name="LayoutRoot" VerticalAlignment="Center" Background="{StaticResource FieldBackground}">
<Grid x:Name="LayoutRoot" VerticalAlignment="Center">
<toolkit:PhoneTextBox
x:Name="address"
Text="{Binding Text}"
......@@ -31,8 +19,6 @@
Margin="0, 0, 95, 0"
AcceptsReturn="False"
BorderThickness="0"
Style="{StaticResource TransparentFocus}"
HintStyle="{StaticResource HintWhiteStyle}"
Hint="{Binding Path=LocalizedResources.AddressHint, Source={StaticResource LocalizedStrings}}"/>
<Button ClickMode="Press" Click="backspace_Click_1">
......@@ -46,7 +32,6 @@
Hold="backspace_Hold_1"
ManipulationStarted="Image_ManipulationStarted_1"
ManipulationCompleted="Image_ManipulationCompleted_1"
VerticalAlignment="Center"
HorizontalAlignment="Right"
Margin="0,0,20,0"/>
</ControlTemplate>
......
......@@ -14,7 +14,7 @@
<Button x:Name="button">
<Button.Template>
<ControlTemplate>
<Image Stretch="UniformToFill" Source="{Binding DefaultImage}"
<Image Stretch="None" Source="{Binding DefaultImage}"
ManipulationStarted="Image_ManipulationStarted_1"
ManipulationCompleted="Image_ManipulationCompleted_1"/>
</ControlTemplate>
......
......@@ -232,8 +232,8 @@
<Content Include="Assets\background.png" />
<Content Include="Assets\backspace_default.png" />
<Content Include="Assets\backspace_over.png" />
<Content Include="Assets\call_default.png" />
<Content Include="Assets\call_over.png" />
<Content Include="Assets\call_answer_default.png" />
<Content Include="Assets\call_answer_over.png" />
<Content Include="Assets\call_status_incoming.png" />
<Content Include="Assets\call_status_missed.png" />
<Content Include="Assets\call_status_outgoing.png" />
......
......@@ -132,6 +132,15 @@ namespace Linphone.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Dialer.
/// </summary>
public static string DialerMenu {
get {
return ResourceManager.GetString("DialerMenu", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to History.
/// </summary>
......
......@@ -158,4 +158,7 @@
<data name="ContactsMenu" xml:space="preserve">
<value>Contacts</value>
</data>
<data name="DialerMenu" xml:space="preserve">
<value>Dialer</value>
</data>
</root>
\ No newline at end of file
......@@ -21,7 +21,7 @@
</Grid.RowDefinitions>
<!--TitlePanel contains the name of the application and page title-->
<StackPanel Grid.Row="0" Margin="12,17,0,28">
<StackPanel Grid.Row="0" Margin="12,17,0,0">
<!--<TextBlock Foreground="Black" Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>-->
<TextBlock Text="{Binding Path=LocalizedResources.AboutMenu, Source={StaticResource LocalizedStrings}}" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
</StackPanel>
......
......@@ -22,7 +22,7 @@
</Grid.RowDefinitions>
<!--TitlePanel contains the name of the application and page title-->
<StackPanel Grid.Row="0" Margin="12,17,0,28">
<StackPanel Grid.Row="0" Margin="12,17,0,0">
<!--<TextBlock Foreground="Black" Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>-->
<TextBlock Text="{Binding Path=LocalizedResources.ContactsMenu, Source={StaticResource LocalizedStrings}}" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
</StackPanel>
......
......@@ -23,9 +23,9 @@
</Grid.RowDefinitions>
<!--TitlePanel contains the name of the application and page title-->
<!--<StackPanel x:Name="TitlePanel" Grid.Row="0" Margin="12,0,0,28">
<TextBlock Foreground="Black" Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
</StackPanel>-->
<StackPanel x:Name="TitlePanel" Grid.Row="0" Margin="12,0,0,0">
<TextBlock Text="{Binding Path=LocalizedResources.DialerMenu, Source={StaticResource LocalizedStrings}}" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
</StackPanel>
<!--ContentPanel - place additional content here-->
<Grid x:Name="ContentPanel" Grid.Row="1">
......@@ -39,21 +39,19 @@
x:Name="sipAddress"
Grid.Row="0"
BorderThickness="0"
FontSize="50"/>
FontSize="40"/>
<controls:Numpad x:Name="numpad" Grid.Row="1"/>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<controls:TwoStateButton Grid.Column="1"
<controls:TwoStateButton
x:Name="call"
DefaultImage="/Assets/call_default.png"
OverImage="/Assets/call_over.png"/>
DefaultImage="/Assets/call_answer_default.png"
OverImage="/Assets/call_answer_over.png"/>
</Grid>
</Grid>
......
......@@ -22,7 +22,7 @@
</Grid.RowDefinitions>
<!--TitlePanel contains the name of the application and page title-->
<StackPanel Grid.Row="0" Margin="12,17,0,28">
<StackPanel Grid.Row="0" Margin="12,17,0,0">
<!--<TextBlock Foreground="Black" Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>-->
<TextBlock Text="{Binding Path=LocalizedResources.HistoryMenu, Source={StaticResource LocalizedStrings}}" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
</StackPanel>
......
......@@ -22,7 +22,7 @@
</Grid.RowDefinitions>
<!--TitlePanel contains the name of the application and page title-->
<StackPanel Grid.Row="0" Margin="12,17,0,28">
<StackPanel Grid.Row="0" Margin="12,17,0,0">
<!--<TextBlock Foreground="Black" Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}" Style="{StaticResource PhoneTextNormalStyle}"/>-->
<TextBlock Text="{Binding Path=LocalizedResources.SettingsMenu, Source={StaticResource LocalizedStrings}}" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
</StackPanel>
......
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