Skip to content

Commit

Permalink
implement ui for server list #83
Browse files Browse the repository at this point in the history
  • Loading branch information
@VShawn
VShawn committed May 10, 2021
1 parent 6aa1ac8 commit 9619d6e
Show file tree
Hide file tree
Showing 18 changed files with 597 additions and 338 deletions.
4 changes: 2 additions & 2 deletions PRM.Core/Languages/de-de.json
View file
Expand Up @@ -8,6 +8,7 @@
"word_exit": "Beenden",
"word_close": "Schließen",
"word_add": "Hinzufügen",
"word_edit": "Bearbeiten",
"word_save": "Speichern",
"word_save_as": "Speichern als...",
"word_back": "Zurück",
Expand Down Expand Up @@ -132,7 +133,6 @@

// server operate
"server_card_operate_conn": "Verbinden",
"server_card_operate_edit": "Bearbeiten",
"server_card_operate_duplicate": "Duplizieren",
"server_card_operate_copy_address": "Server-Adresse in die Zwischenablage kopieren",
"server_card_operate_copy_username": "Benutzername in die Zwischenablage kopieren",
Expand All @@ -141,7 +141,7 @@
"managementpage_delete_selected_confirm": "Wirklich alle markierten Einträge löschen?",
"managementpage_import_dialog_title": "Dateiauswahl",
"managementpage_import_from_json": "von einer JSON-Datei",
"managementpage_import_from_mremoteng_csv": "mRemoteNG CSV-Datei",
"phrase_import_from_mremoteng_csv": "mRemoteNG CSV-Datei",
"managementpage_import_done": "Erfolgreich importiert, {0} Element hinzugefügt.",
"managementpage_import_error": "Falsches Datenformat!",
"managementpage_edit_selected": "Ausgewähltes bearbeiten",
Expand Down
2 changes: 1 addition & 1 deletion PRM.Core/Languages/de-de.xaml
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions PRM.Core/Languages/en-us.json
View file
Expand Up @@ -8,6 +8,7 @@
"word_exit": "Exit",
"word_close": "Close",
"word_add": "Add",
"word_edit": "Edit",
"word_save": "Save",
"word_save_as": "Save as...",
"word_back": "Back",
Expand Down Expand Up @@ -132,7 +133,6 @@

// server operate
"server_card_operate_conn": "Connect",
"server_card_operate_edit": "Edit",
"server_card_operate_duplicate": "Duplicate",
"server_card_operate_copy_address": "Copy address to clipboard",
"server_card_operate_copy_username": "Copy username to clipboard",
Expand All @@ -141,7 +141,7 @@
"managementpage_delete_selected_confirm": "Sure to delete all selected?",
"managementpage_import_dialog_title": "Select a file",
"managementpage_import_from_json": "from json",
"managementpage_import_from_mremoteng_csv": "from mRemoteNG csv",
"phrase_import_from_mremoteng_csv": "from mRemoteNG csv",
"managementpage_import_done": "Imported successfully, {0} item added.",
"managementpage_import_error": "Error data format!",
"managementpage_edit_selected": "Edit selected",
Expand Down
2 changes: 1 addition & 1 deletion PRM.Core/Languages/en-us.xaml
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions PRM.Core/Languages/zh-cn.json
View file
Expand Up @@ -8,6 +8,7 @@
"word_exit": "退出",
"word_close": "关闭",
"word_add": "添加",
"word_edit": "编辑",
"word_save": "保存",
"word_save_as": "保存到...",
"word_back": "返回",
Expand Down Expand Up @@ -132,7 +133,6 @@

// server operate
"server_card_operate_conn": "连接",
"server_card_operate_edit": "编辑",
"server_card_operate_duplicate": "创建副本",
"server_card_operate_copy_address": "复制地址到剪贴板",
"server_card_operate_copy_username": "复制用户名到剪贴板",
Expand All @@ -141,7 +141,7 @@
"managementpage_delete_selected_confirm": "确认要删除所选全部项目吗？",
"managementpage_import_dialog_title": "选择导入文件",
"managementpage_import_from_json": "从 json",
"managementpage_import_from_mremoteng_csv": "从 mRemoteNG csv",
"phrase_import_from_mremoteng_csv": "从 mRemoteNG csv",
"managementpage_import_done": "已导入{0}条记录.",
"managementpage_import_error": "导入0条，输入的数据文件格式有误!",
"managementpage_edit_selected": "编辑选中",
Expand Down
2 changes: 1 addition & 1 deletion PRM.Core/Languages/zh-cn.xaml
View file

Large diffs are not rendered by default.

39 changes: 13 additions & 26 deletions PRemoteM/Controls/ServerCard.xaml
View file
Expand Up @@ -18,16 +18,6 @@
<MouseBinding MouseAction="LeftDoubleClick" Command="{Binding CmdConnServer}"></MouseBinding>
<MouseBinding MouseAction="RightClick" Command="{Binding CmdEditServer}"></MouseBinding>
</Grid.InputBindings>
<Grid.Style>
<Style TargetType="Grid">
<Setter Property="Visibility" Value="Visible"></Setter>
<Style.Triggers>
<DataTrigger Binding="{Binding Server.Id}" Value="0">
<Setter Property="Visibility" Value="Hidden"></Setter>
</DataTrigger>
</Style.Triggers>
</Style>
</Grid.Style>

<!-- Card Bottom Layer - with shadow effect -->
<Border CornerRadius="5" BorderThickness="1" Background="Black" BorderBrush="{DynamicResource MainBgColorBrush}" Width="{StaticResource CardWidth}" Height="{StaticResource CardWidth}">
Expand Down Expand Up @@ -295,41 +285,38 @@
Click="BtnSettingMenu_OnClick">
<controls:ButtonEx.Style>
<Style TargetType="controls:ButtonEx" BasedOn="{StaticResource MainColor1Button}">
<Setter Property="Background" Value="{StaticResource MainColor2Brush}"></Setter>
<Setter Property="Foreground" Value="{StaticResource MainColor2ForegroundBrush}"></Setter>
<Setter Property="Visibility" Value="Hidden"></Setter>
<Setter Property="Padding" Value="5 6 5 3"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border Background="{DynamicResource MainColor2Brush}"
<Border Background="{TemplateBinding Background}"
BorderThickness="0"
Name="PART_Background">
<Path Margin="5 6 5 3"
<Path Margin="{TemplateBinding Padding}"
Name="Symbol"
Data="M 2.707031 0 L 49.97266 0 L 49.97266 5 L 2.707031 5 Z M 2.707031 20 L 49.97266 20 L 49.97266 25 L 2.707031 25 Z M 2.707031 40 L 49.97266 40 L 49.97266 45 L 2.707031 45 Z"
Fill="{DynamicResource MainColor1ForegroundBrush}"
Fill="{TemplateBinding Foreground}"
Stretch="Fill" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Symbol" Property="Margin" Value="4 5 4 2"></Setter>
</Trigger>
<DataTrigger Binding="{Binding ElementName=PopupCardSettingMenu,Path=IsOpen}" Value="True">
<Setter TargetName="Symbol" Property="Margin" Value="4 5 4 2"></Setter>
<Setter TargetName="PART_Background" Property="Button.Background" Value="{DynamicResource MainColor1DarkerBrush}" />
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Padding" Value="4 5 4 2"></Setter>
</Trigger>
<DataTrigger Binding="{Binding ElementName=CardRealBorder,Path=IsMouseOver}" Value="True">
<Setter Property="Visibility" Value="Visible"></Setter>
</DataTrigger>
<DataTrigger Binding="{Binding ElementName=PopupCardSettingMenu,Path=IsOpen}" Value="True">
<Setter Property="Visibility" Value="Visible"></Setter>
<Setter Property="Padding" Value="4 5 4 2"></Setter>
<Setter Property="Background" Value="{StaticResource MainColor1Brush}"></Setter>
<Setter Property="Foreground" Value="{StaticResource MainColor1ForegroundBrush}"></Setter>
</DataTrigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Visibility" Value="Visible"></Setter>
</Trigger>
</Style.Triggers>
</Style>
</controls:ButtonEx.Style>
Expand Down Expand Up @@ -359,7 +346,7 @@
</Border.Effect>
<Grid MinWidth="80" Background="{DynamicResource MainColor1DarkerBrush}">
<StackPanel>
<controls:ButtonEx Click="ButtonEditServer_OnClick" Content="{DynamicResource server_card_operate_edit}"></controls:ButtonEx>
<controls:ButtonEx Click="ButtonEditServer_OnClick" Content="{DynamicResource word_edit}"></controls:ButtonEx>
<controls:ButtonEx Click="ButtonDuplicateServer_OnClick" Content="{DynamicResource server_card_operate_duplicate}"></controls:ButtonEx>
</StackPanel>
</Grid>
Expand Down

0 comments on commit 9619d6e

Please sign in to comment.