Skip to content

Commit 4bcc4df

Browse files
dimeversedimeverse
authored
Merge pull request #33 from EverseDevelopment/develop
sculpted version
2 parents e423f39 + c3de283 commit 4bcc4df

File tree

11 files changed

+519
-526
lines changed

11 files changed

+519
-526
lines changed

‎e-verse.Navisworks.SelectByRevitId.Common/Images/RID_32.jpg‎

-223 Bytes
Loading

‎e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/ExitDialog.xaml‎

Lines changed: 105 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,21 @@
1010
DialogTitle="[ProductName] Setup"
1111
mc:Ignorable="d">
1212

13-
14-
<Border
13+
<Viewbox>
14+
<Border
15+
Width="497"
16+
Height="409"
1517
Margin="5,5,5,5"
1618
Background="{DynamicResource BackgroundColor}"
1719
BorderBrush="Transparent"
1820
BorderThickness="1"
1921
CornerRadius="15,15,15,15"
2022
HorizontalAlignment="Stretch"
2123
VerticalAlignment="Stretch">
22-
<!--<Border.Effect>
23-
<DropShadowEffect BlurRadius="20"
24-
Color="Gray"
25-
Opacity="0.3"
26-
ShadowDepth="0"
27-
Direction="0"></DropShadowEffect>
28-
</Border.Effect>-->
2924

30-
<Grid x:Name="Root" Background="Transparent" Margin="-1,0,-1,0">
25+
<Grid x:Name="Root" Background="Transparent">
3126

32-
<Button
27+
<Button
3328
Style="{DynamicResource CloseButtonStyle}"
3429
Name="TitleButton"
3530
Foreground="Black"
@@ -40,11 +35,11 @@
4035
FontSize="20"
4136
FontWeight="Light"
4237
Margin="20,10,362,0" VerticalAlignment="Top">
43-
<Button.Template>
44-
<ControlTemplate TargetType="Button">
45-
<Border x:Name="border" Width="290" Background="Transparent">
46-
<Grid>
47-
<Image Name="SlideUp_Image"
38+
<Button.Template>
39+
<ControlTemplate TargetType="Button">
40+
<Border x:Name="border" Width="290" Background="Transparent">
41+
<Grid>
42+
<Image Name="SlideUp_Image"
4843
Visibility="Visible"
4944
Source="/e-verse.Navisworks.SelectByRevitId.Installer;component/Resources/SelectByRevitId.png"
5045
HorizontalAlignment="Left"
@@ -53,46 +48,45 @@
5348
RenderOptions.BitmapScalingMode="HighQuality"
5449
RenderOptions.EdgeMode="Aliased"
5550
Margin="2,5,0,5"/>
56-
</Grid>
57-
</Border>
58-
<ControlTemplate.Triggers >
59-
<Trigger Property="IsDefaulted" Value="True">
60-
</Trigger>
61-
<Trigger Property="IsMouseOver" Value="True">
62-
<Setter Property="Opacity" TargetName="border" Value="0.5"/>
63-
</Trigger>
64-
<Trigger Property="IsPressed" Value="True">
65-
<Setter Property="Opacity" TargetName="border" Value="0.2"/>
66-
</Trigger>
67-
</ControlTemplate.Triggers>
68-
</ControlTemplate>
69-
</Button.Template>
70-
</Button>
71-
72-
<Button
51+
</Grid>
52+
</Border>
53+
<ControlTemplate.Triggers >
54+
<Trigger Property="IsDefaulted" Value="True">
55+
</Trigger>
56+
<Trigger Property="IsMouseOver" Value="True">
57+
<Setter Property="Opacity" TargetName="border" Value="0.5"/>
58+
</Trigger>
59+
<Trigger Property="IsPressed" Value="True">
60+
<Setter Property="Opacity" TargetName="border" Value="0.2"/>
61+
</Trigger>
62+
</ControlTemplate.Triggers>
63+
</ControlTemplate>
64+
</Button.Template>
65+
</Button>
66+
67+
<Button
7368
Style="{DynamicResource CloseButtonStyle}"
74-
Margin="332,376,13,0"
69+
Margin="325,367,20,20"
7570
Background="Transparent"
7671
Click="Contact_Link"
7772
FontWeight="Light"
7873
FontSize="12"
79-
Foreground="{DynamicResource MainGray}"
80-
VerticalAlignment="Top" Height="20">
81-
<Button.Template>
82-
<ControlTemplate TargetType="Button">
83-
<Border x:Name="border" Background="Transparent" Margin="0,0,3,0">
84-
<Grid>
85-
<Grid.ColumnDefinitions>
86-
<ColumnDefinition Width="243*"/>
87-
<ColumnDefinition Width="47*"/>
88-
</Grid.ColumnDefinitions>
89-
<TextBlock
74+
Foreground="{DynamicResource MainGray}" Height="NaN">
75+
<Button.Template>
76+
<ControlTemplate TargetType="Button">
77+
<Border x:Name="border" Background="Transparent" Margin="0,0,3,0">
78+
<Grid>
79+
<Grid.ColumnDefinitions>
80+
<ColumnDefinition Width="243*"/>
81+
<ColumnDefinition Width="47*"/>
82+
</Grid.ColumnDefinitions>
83+
<TextBlock
9084
Text="Made with by e-verse"
9185
Margin="0,1,5,-1"
9286
FontWeight="Bold" Grid.ColumnSpan="2">
93-
</TextBlock>
87+
</TextBlock>
9488

95-
<Image Name="heartImage"
89+
<Image Name="heartImage"
9690
Visibility="Visible"
9791
Source="/e-verse.Navisworks.SelectByRevitId.Installer;component/Resources/Heart.png"
9892
HorizontalAlignment="Left"
@@ -101,32 +95,32 @@
10195
RenderOptions.BitmapScalingMode="HighQuality"
10296
RenderOptions.EdgeMode="Aliased"
10397
Margin="63,0,0,3" RenderTransformOrigin="0.5,0.5">
104-
<Image.RenderTransform>
105-
<TransformGroup>
106-
<ScaleTransform ScaleY="1"/>
107-
<SkewTransform/>
108-
<RotateTransform/>
109-
<TranslateTransform/>
110-
</TransformGroup>
111-
</Image.RenderTransform>
112-
</Image>
113-
</Grid>
114-
</Border>
115-
<ControlTemplate.Triggers >
116-
<Trigger Property="IsDefaulted" Value="True">
117-
</Trigger>
118-
<Trigger Property="IsMouseOver" Value="True">
119-
<Setter Property="Opacity" TargetName="border" Value="0.5"/>
120-
</Trigger>
121-
<Trigger Property="IsPressed" Value="True">
122-
<Setter Property="Opacity" TargetName="border" Value="0.2"/>
123-
</Trigger>
124-
</ControlTemplate.Triggers>
125-
</ControlTemplate>
126-
</Button.Template>
127-
</Button>
128-
129-
<TextBlock
98+
<Image.RenderTransform>
99+
<TransformGroup>
100+
<ScaleTransform ScaleY="1"/>
101+
<SkewTransform/>
102+
<RotateTransform/>
103+
<TranslateTransform/>
104+
</TransformGroup>
105+
</Image.RenderTransform>
106+
</Image>
107+
</Grid>
108+
</Border>
109+
<ControlTemplate.Triggers >
110+
<Trigger Property="IsDefaulted" Value="True">
111+
</Trigger>
112+
<Trigger Property="IsMouseOver" Value="True">
113+
<Setter Property="Opacity" TargetName="border" Value="0.5"/>
114+
</Trigger>
115+
<Trigger Property="IsPressed" Value="True">
116+
<Setter Property="Opacity" TargetName="border" Value="0.2"/>
117+
</Trigger>
118+
</ControlTemplate.Triggers>
119+
</ControlTemplate>
120+
</Button.Template>
121+
</Button>
122+
123+
<TextBlock
130124
x:Name="DialogDescription"
131125
Margin="34,112,34,188"
132126
Background="Transparent"
@@ -137,9 +131,9 @@
137131
LineHeight="20"
138132
TextWrapping="WrapWithOverflow">
139133
[ExitDialogDescription]
140-
</TextBlock>
134+
</TextBlock>
141135

142-
<!--<Label
136+
<!--<Label
143137
x:Name="DialogNextProjects1"
144138
Margin="38,180,34,200"
145139
Background="Transparent"
@@ -156,29 +150,29 @@
156150
Content="projects?"
157151
HorizontalContentAlignment="Center"></Label>-->
158152

159-
<Button
153+
<Button
160154
Style="{DynamicResource CloseButtonStyle}"
161-
Margin="183,241,189,0"
155+
Margin="183,229,189,0"
162156
Background="Transparent"
163157
Click="Contact_Link"
164158
FontWeight="Light"
165159
FontSize="12"
166160
Foreground="{DynamicResource MainGray}"
167161
VerticalAlignment="Top" Height="26">
168-
<Button.Template>
169-
<ControlTemplate TargetType="Button">
170-
<Border x:Name="border" Background="Transparent" Margin="0,0,3,0">
171-
<Grid Margin="0,0,0,-4">
172-
<Grid.ColumnDefinitions>
173-
<ColumnDefinition Width="243*"/>
174-
<ColumnDefinition Width="47*"/>
175-
</Grid.ColumnDefinitions>
176-
<TextBlock
162+
<Button.Template>
163+
<ControlTemplate TargetType="Button">
164+
<Border x:Name="border" Background="Transparent" Margin="0,0,3,0">
165+
<Grid Margin="0,0,0,-4">
166+
<Grid.ColumnDefinitions>
167+
<ColumnDefinition Width="243*"/>
168+
<ColumnDefinition Width="47*"/>
169+
</Grid.ColumnDefinitions>
170+
<TextBlock
177171
Text="Drop us a line"
178172
Margin="31,0,11,13"
179173
FontWeight="Bold" Grid.ColumnSpan="2">
180-
</TextBlock>
181-
<Path
174+
</TextBlock>
175+
<Path
182176
x:Name="Cross"
183177
Data="M 0 0 L 80 0 M 70 10 L 80 0 L 70 -10"
184178
Stretch="Fill"
@@ -190,40 +184,38 @@
190184
VerticalAlignment="Bottom"
191185
Height="12" Grid.ColumnSpan="2"/>
192186

193-
</Grid>
194-
</Border>
195-
<ControlTemplate.Triggers >
196-
<Trigger Property="IsDefaulted" Value="True">
197-
</Trigger>
198-
<Trigger Property="IsMouseOver" Value="True">
199-
<Setter Property="Opacity" TargetName="border" Value="0.5"/>
200-
</Trigger>
201-
<Trigger Property="IsPressed" Value="True">
202-
<Setter Property="Opacity" TargetName="border" Value="0.2"/>
203-
</Trigger>
204-
</ControlTemplate.Triggers>
205-
</ControlTemplate>
206-
</Button.Template>
207-
208-
</Button>
209-
210-
<Button Style="{DynamicResource MainButtonStyle}"
187+
</Grid>
188+
</Border>
189+
<ControlTemplate.Triggers >
190+
<Trigger Property="IsDefaulted" Value="True">
191+
</Trigger>
192+
<Trigger Property="IsMouseOver" Value="True">
193+
<Setter Property="Opacity" TargetName="border" Value="0.5"/>
194+
</Trigger>
195+
<Trigger Property="IsPressed" Value="True">
196+
<Setter Property="Opacity" TargetName="border" Value="0.2"/>
197+
</Trigger>
198+
</ControlTemplate.Triggers>
199+
</ControlTemplate>
200+
</Button.Template>
201+
202+
</Button>
203+
204+
<Button Style="{DynamicResource MainButtonStyle}"
211205
x:Name="GoExit"
212206
Content="Finish"
213207
MinWidth="73"
214-
Margin="181,302,181,0"
215-
VerticalAlignment="Top">
216-
</Button>
208+
Margin="181,285,181,84"/>
217209

218-
<Button
210+
<Button
219211
Style="{DynamicResource TabCloseButtonStyle}"
220212
Name="Cancel"
221213
VerticalAlignment="Top"
222214
Margin="452,13,17,0"/>
223215

224-
</Grid>
225-
</Border>
226-
216+
</Grid>
217+
</Border>
218+
</Viewbox>
227219
<wixsharp:WpfDialog.Resources>
228220
<ResourceDictionary>
229221
<ResourceDictionary.MergedDictionaries>

‎e-verse.Navisworks.SelectByRevitId.Installer/Dialogs/ExitDialog.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void Init()
7979
if (DialogDescription.Text == "Click the Finish button to exit the Setup Wizard.")
8080
{
8181
DialogDescription.Text = "Congratulations! The process is complete. " +
82-
"\n Thanks for trusting in our heroine PRIS! " +
82+
"\n Thanks for trusting in our heroine Pris! " +
8383
"\n \n Are you interested in taking part in our next \n " +
8484
"projects?";
8585
}

0 commit comments

Comments
 (0)