Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
Thick-Common
Commits
24021e1a
Commit
24021e1a
authored
Aug 12, 2019
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'gitlab/feature-graphReverse-20190808'
parents
ec98dc2a
d3b51cfb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
1 deletion
+12
-1
StringResource.en-US.xaml
....Base/FLY.Thick.Base.UI/Culture/StringResource.en-US.xaml
+1
-0
StringResource.zh-CN.xaml
....Base/FLY.Thick.Base.UI/Culture/StringResource.zh-CN.xaml
+1
-0
Window_MainSet.xaml
...Thick.Base/FLY.Thick.Base.UI/MainEdit/Window_MainSet.xaml
+4
-0
FLYLayout.cs
...ct.FLY.Thick.Base/FLY.Thick.Base.UI/UIModule/FLYLayout.cs
+6
-1
No files found.
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Culture/StringResource.en-US.xaml
View file @
24021e1a
...
...
@@ -289,6 +289,7 @@
<sys:String x:Key="strTipErrorComponentAdd">Out of range,or Overlap with other!</sys:String>
<sys:String x:Key="strTipNoTabItem">No TabItem!</sys:String>
<sys:String x:Key="strVisible">Visible</sys:String>
<sys:String x:Key="strGraphReverse">GraphReverse</sys:String>
<sys:String x:Key="strScan">Scan</sys:String>
...
...
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Culture/StringResource.zh-CN.xaml
View file @
24021e1a
...
...
@@ -293,6 +293,7 @@
<sys:String x:Key="strTipErrorComponentAdd">超出范围,或与其它控件有重叠!</sys:String>
<sys:String x:Key="strTipNoTabItem">没有页面!</sys:String>
<sys:String x:Key="strVisible">显示</sys:String>
<sys:String x:Key="strGraphReverse">图像反向</sys:String>
<sys:String x:Key="strScan">扫描</sys:String>
<sys:String x:Key="strHistory">历史</sys:String>
...
...
Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/Window_MainSet.xaml
View file @
24021e1a
...
...
@@ -78,6 +78,10 @@
</StackPanel>
</Button>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strGraphReverse}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsGraphReverse}" HorizontalAlignment="Left"/>
</StackPanel>
</StackPanel>
</GroupBox>
<StackPanel Orientation="Horizontal" Margin="3" HorizontalAlignment="Right">
...
...
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UIModule/FLYLayout.cs
View file @
24021e1a
...
...
@@ -54,6 +54,11 @@ namespace ThickTcpUiInWindow.UIModule
/// </summary>
public
bool
IsDynAreaVisible
{
get
;
set
;
}
=
true
;
/// <summary>
/// 曲线反向显示
/// </summary>
public
bool
IsGraphReverse
{
get
;
set
;
}
=
false
;
/// <summary>
/// 隐藏 logo
/// </summary>
...
...
@@ -132,7 +137,7 @@ namespace ThickTcpUiInWindow.UIModule
"Items"
,
"ControllerStates"
,
"DynAreaItems"
,
"DynAreaWidth"
,
"IsDynAreaVisible"
,
"DynAreaWidth"
,
"IsDynAreaVisible"
,
"IsGraphReverse"
,
"Left"
,
"Top"
,
"Width"
,
"Height"
,
"WindowState"
,
"IsLogoHidden"
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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