From fac013feeeb4e29bfd0c4339e351113249e6e00c Mon Sep 17 00:00:00 2001 From: Nicolas Jager <nicolas.jager@savoirfairelinux.com> Date: Wed, 23 Nov 2016 14:16:13 -0500 Subject: [PATCH] devices menu : visual improvments Change-Id: I978b8eeb5c92f8b71c3418fb3b4bf1c9d6af78a5 Tuleap: #790 --- SmartPanel.xaml | 37 ++++++++++++++++++++++++++++++------- SmartPanel.xaml.cpp | 11 +++++++++-- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/SmartPanel.xaml b/SmartPanel.xaml index 21387c0..d4bb6fe 100644 --- a/SmartPanel.xaml +++ b/SmartPanel.xaml @@ -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" diff --git a/SmartPanel.xaml.cpp b/SmartPanel.xaml.cpp index 6543735..4ca7e9c 100644 --- a/SmartPanel.xaml.cpp +++ b/SmartPanel.xaml.cpp @@ -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; -- GitLab