Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-uwp
Commits
fac013fe
Commit
fac013fe
authored
Nov 23, 2016
by
Nicolas Jager
Browse files
devices menu : visual improvments
Change-Id: I978b8eeb5c92f8b71c3418fb3b4bf1c9d6af78a5 Tuleap: #790
parent
a4d062af
Changes
2
Hide whitespace changes
Inline
Side-by-side
SmartPanel.xaml
View file @
fac013fe
...
...
@@ -915,34 +915,57 @@
<RowDefinition Height="*"/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<ScrollViewer x:Name="_scrollViewerDevicesMenu_"
Grid.Row="0"
MaxHeight="400">
<Grid Background="#FFE4F1F9">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<TextBlock Text="Device ID:"
Margin="10"
Grid.Row="0"
HorizontalAlignment="Center"/>
<!-- about this device -->
<StackPanel Orientation="Horizontal"
Grid.Row="0"
Margin="10,20">
<TextBlock Style="{StaticResource TextSegoeStyle-20pt-black}"
Margin="0,0,10,0"
Text=""/>
<TextBlock Text="Your device ID"/>
</StackPanel>
<TextBlock x:Name="_deviceId_"
Margin="10"
Text="[TEXT_MISSING]"
TextTrimming="CharacterEllipsis"
FontSize="12"
Grid.Row="1"
IsTextSelectionEnabled="True"
HorizontalAlignment="Center"/>
<TextBlock x:Name="_waitingDevicesList_"
<!-- about linked devices -->
<StackPanel Orientation="Horizontal"
Grid.Row="2"
Margin="10,20">
<TextBlock Style="{StaticResource TextSegoeStyle-20pt-black}"
Margin="0,0,10,0"
Text=""/>
<TextBlock Text="other linked devices"/>
</StackPanel>
<TextBlock x:Name="_waitingDevicesList_"
Text="waiting for devices list..."
Grid.Row="
2
"
Grid.Row="
3
"
IsTextSelectionEnabled="True"
HorizontalAlignment="Center"/>
<ListBox x:Name="_devicesIdList_"
Visibility="Collapsed"
Grid.Row="2"/>
Padding="10,0"
Background="#FFE4F1F9"
Grid.Row="3"/>
</Grid>
</ScrollViewer>
<!-- button to add device. -->
<Button x:Name="_addDevice_"
Grid.Row="1"
VerticalAlignment="Center"
...
...
SmartPanel.xaml.cpp
View file @
fac013fe
...
...
@@ -826,8 +826,15 @@ void RingClientUWP::Views::SmartPanel::_devicesMenuButton__Checked(Platform::Obj
_waitingDevicesList_
->
Visibility
=
Windows
::
UI
::
Xaml
::
Visibility
::
Visible
;
_devicesIdList_
->
Visibility
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
auto
accountId
=
AccountListItemsViewModel
::
instance
->
_selectedItem
->
_account
->
accountID_
;
RingD
::
instance
->
askToRefreshKnownDevices
(
accountId
);
auto
account
=
AccountListItemsViewModel
::
instance
->
_selectedItem
->
_account
;
_deviceId_
->
Text
=
account
->
_deviceId
;
if
(
_deviceId_
->
Text
->
IsEmpty
())
{
_deviceId_
->
Text
=
"No device id found!"
;
ERR_
(
"device Id not found for account "
+
Utils
::
toString
(
account
->
_deviceId
));
}
RingD
::
instance
->
askToRefreshKnownDevices
(
account
->
accountID_
);
_shareMenuGrid_
->
Visibility
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
_accountsMenuGrid_
->
Visibility
=
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment