Skip to content
This repository was archived by the owner on Jan 11, 2021. It is now read-only.

Commit bcdb113

Browse files
committed
Some adjustments to the GUI
1 parent 4763a13 commit bcdb113

20 files changed

+26
-17
lines changed

DMX/Tabs/TabLaserMovinghead.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
mc:Ignorable="d"
7-
d:DesignHeight="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Parent.ActualHeight}"
8-
d:DesignWidth="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Parent.ActualWidth}"
97
Header="{Binding Path=Name}">
108
<Grid Background="#FFEEEEEE">
119
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">

DMX/Tabs/TabLedMovinghead.xaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
77
mc:Ignorable="d"
8-
d:DesignHeight="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Parent.ActualHeight}"
9-
d:DesignWidth="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Parent.ActualWidth}"
108
Header="{Binding Path=Name}">
119
<Grid Background="#FFEEEEEE">
1210
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
@@ -136,7 +134,7 @@
136134
</StackPanel>
137135
<StackPanel>
138136
<GroupBox Header="Gobo's" Margin="5" Width="80">
139-
<ScrollViewer Height="320" VerticalScrollBarVisibility="Hidden">
137+
<ScrollViewer Height="318" VerticalScrollBarVisibility="Hidden">
140138
<StackPanel>
141139
<RadioButton Name="rbC13_1" VerticalContentAlignment="Center" Checked="Rb_GobosChecked">
142140
<Image Source="/DMX;component/Resources/Images/Gobo Open.PNG" Height="40" Width="50"/>

DMX/Tabs/TabLedScanner.xaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
mc:Ignorable="d"
7-
d:DesignHeight="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Parent.ActualHeight}"
8-
d:DesignWidth="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Parent.ActualWidth}"
97
Header="{Binding Path=Name}">
108
<Grid Background="#FFEEEEEE">
119
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
@@ -149,4 +147,3 @@
149147
</ScrollViewer>
150148
</Grid>
151149
</TabItem>
152-

DMX/Tabs/TabLedSpot.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
mc:Ignorable="d"
7-
d:DesignHeight="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Parent.ActualHeight}"
8-
d:DesignWidth="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Parent.ActualWidth}"
97
Header="{Binding Path=Name}">
108
<Grid Background="#FFEEEEEE">
119
<StackPanel Orientation="Horizontal">

DMX/bin/Debug/DMX.dll

0 Bytes
Binary file not shown.

DMX/bin/Debug/DMX.pdb

0 Bytes
Binary file not shown.

DmxInstaller/Debug/DmxInstaller.msi

10 KB
Binary file not shown.

Logger/bin/Debug/Logger.dll

0 Bytes
Binary file not shown.

Logger/bin/Debug/Logger.pdb

0 Bytes
Binary file not shown.

Project DMX 2.0/MainWindow.xaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,15 @@
3838
</DockPanel>
3939

4040
<DockPanel Margin="0,23">
41-
<TabControl Name="tctDeviceTabs" HorizontalAlignment="Left" SelectionChanged="TctDeviceTabs_SelectionChanged" MinWidth="337"/>
41+
<TabControl Name="tctDeviceTabs" HorizontalAlignment="Left" SelectionChanged="TctDeviceTabs_SelectionChanged" MinWidth="340" MaxWidth="680">
42+
<TabControl.Background>
43+
<ImageBrush ImageSource="Resources/Images/background.png" Stretch="None" AlignmentX="Left" AlignmentY="Top"/>
44+
</TabControl.Background>
45+
</TabControl>
4246
</DockPanel>
4347

4448
<DockPanel Height="23" VerticalAlignment="Bottom">
45-
<StatusBar Width="{Binding ActualWidth, ElementName=tctDeviceTabs}">
49+
<StatusBar>
4650
<StatusBarItem VerticalContentAlignment="Center" HorizontalAlignment="Left" Padding="5,0" Content="COM Port:"/>
4751
<StatusBarItem VerticalContentAlignment="Center" HorizontalAlignment="Left" Padding="0" Width="50" Name="sbiComPort" Content=""/>
4852
<Separator/>

0 commit comments

Comments
 (0)