Skip to content

Commit d98e0c2

Browse files
Francois NormandinFrancois Normandin
authored andcommitted
1.3.1 Removed package incompatibility
1 parent b33d584 commit d98e0c2

2 files changed

Lines changed: 34 additions & 19 deletions

File tree

.vipb

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="0.5" Created_Date="2014-03-29 09:11:27" Modified_Date="2014-03-29 11:18:08" Creator="Francois Normandin" Comments="" ID="6f3bbe0079a2ffbce4b838e14d3b7b49">
1+
<VI_Package_Builder_Settings Version="0.6" Created_Date="2014-03-29 09:11:27" Modified_Date="2015-04-01 21:42:06" Creator="Francois Normandin" Comments="" ID="c1ebd1312e78f146c8d166cb41e4b15c">
22
<Library_General_Settings>
33
<Package_File_Name>lavag_lib_ui_tools_controls_addon</Package_File_Name>
4-
<Library_Version>1.3.0.13</Library_Version>
4+
<Library_Version>1.3.1.14</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>.</Library_Source_Folder>
77
<Library_Output_Folder>..</Library_Output_Folder>
@@ -13,6 +13,7 @@
1313
<Package_Icon>00000D7E002800000C9A00000400000200020022002200080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA0000888888888888000077777777777700005555555555550000444444444444000022222222222200001111111111110000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0BFFFF0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0BFFFFFF0B0BFF0BFF0B0BFFFFFF0B0BFFFF0B0B0BFFFF0B0BFF0B0B0B0BFFFFFFFFFFFF0B0BFF0BFF0B0B0BFF0B0BFF0B0BFF0BFF0B0BFF0BFF0B0B0BFF0B0B0BFFFFFF0B0BFF0BFF0B0B0BFF0B0BFF0B0BFF0BFF0B0BFF0BFF0B0B0B0BFFFF0BFFFFFF0B0BFF0BFF0B0B0BFF0B0BFF0B0BFF0BFF0B0BFF0BFF0B0B0B0B0B0BFFFFFF0BFFFF0B0BFF0B0B0BFF0B0B0BFFFF0B0B0BFFFF0B0BFFFFFF0BFFFFFF0BFFFF0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0BFFFF0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000000000000000000000000FFFF000000000000000000000000000000000000000000000000000000000000FFFF000000000000000000000000000000000000FEFEFEFE0000000000000000FFFF0000000000000000000000000000FEFE00FE00000000FE00000000000000FFFF0000000000000000000000000000000000FE00000000FE00000000000000FFFF000000000000FF05000000000000FEFE00FE00000000FE00000000000000FFFF000000FF0000FF0500FF00000000000000FEFEFEFEFEFE00000000000000FFFF00000000FF00FF05FF0000000000FEFE00FED3D3D3D3FE00000000000000FFFF000000000000FF05000000000000000000FED3D3D3D3FE00000000000000FFFF0000FFFFFFFF0505FFFFFF000000FEFE00FED3D3D3D3FE00000000000000FFFF000005050505050505050000000000000000FEFEFEFE0000000000000000FFFF00000000FF00FF05000000000000000000000000000000FEFEFE00000000FFFF000000FF0000FF050000000000000000000000000000FEF6F6F6FE000000FFFF000000000000FF0500000000000000000000000000FEF695CB9556FE0000FFFF000000000000000000000000000000000000000000FEF6CB95C556FE0000FFFF000000000000000000000000000000000000000000FEF695C5C556FE0000FFFF00000000000000000000000000000000000000000000FE565656FE000000FFFF0000000000000000000000000000000000000000000000FEFEFE00000000FFFF000000000000000000000000000000000000000000000000000000000000FFFF000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002900000012000000020000000D01000000000100000000000A000000080000000000240024002900000012000000020000000D00B2B2B900010000000000100000001000000002002300000000000000000023002900000012000000020000000D00FCFCFD00010000000000100000001000000002002200010001000100010022002900000012000000020000000D00B2B2B900010000000000100000001000000002000000240024002400240000002900000012000000020000000D0080808A00010000000000100000001000000002000100230023002300230001</Package_Icon>
1414
<Product_Name>UI Tools Controls Addon</Product_Name>
1515
<Was_Built>true</Was_Built>
16+
<Target>LabVIEW</Target>
1617
</Library_General_Settings>
1718
<Advanced_Settings>
1819
<Package_Dependencies>
@@ -26,7 +27,6 @@
2627
<External_Dependencies>oglib_string &gt;= 4.1.0.12</External_Dependencies>
2728
<External_Dependencies>oglib_variantconfig &gt;= 4.0.0.5</External_Dependencies>
2829
<External_Dependencies>vug_lib_bitman &gt;= 1.0.1.0</External_Dependencies>
29-
<Package_Conflicts>lava_lib_ui_tools_control_class_addon &gt;=1.0.0.0</Package_Conflicts>
3030
<Direct_Dependencies>jki_lib_state_machine-2.0.0-1</Direct_Dependencies>
3131
<Direct_Dependencies>lava_lib_ui_tools-1.3.0.70</Direct_Dependencies>
3232
<Direct_Dependencies>oglib_appcontrol-4.1.0.7</Direct_Dependencies>
@@ -53,13 +53,8 @@
5353
<Copyright/>
5454
<Packager/>
5555
<URL/>
56-
<Release_Notes>v1.3.0:
57-
58-
-Renamed package and moved templates to vi.lib to remove the need to rely on system files (outside of LabVIEW folder structure).
59-
-Upgraded source code to 2012. Older versions not supported anymore.
60-
-Changed the namespacing and added an incompatibility with previous versions of this package.
61-
-Integrated into the palette of UI Tools (base package on LVTN 1.3.0.59+)
62-
-Fixed issue with scaling factor for True decal button</Release_Notes>
56+
<Release_Notes>v1.3.1:
57+
- Removed package incompatibility that created self-conflict on new installs.</Release_Notes>
6358
</Description>
6459
<Destinations>
6560
<Toolkit_VIs>
@@ -131,25 +126,25 @@
131126
<Source_Files>
132127
<Destination_Overrides>
133128
<Path>.</Path>
134-
<Destination>Toolkit VIs</Destination>
129+
<Destination>0</Destination>
135130
<Additional_Destination>false</Additional_Destination>
136131
<Additional_Destination_Index>0</Additional_Destination_Index>
137132
</Destination_Overrides>
138133
<Destination_Overrides>
139134
<Path>Control Generator</Path>
140-
<Destination>Toolkit VIs</Destination>
135+
<Destination>0</Destination>
141136
<Additional_Destination>true</Additional_Destination>
142137
<Additional_Destination_Index>0</Additional_Destination_Index>
143138
</Destination_Overrides>
144139
<Destination_Overrides>
145140
<Path>_Control Generator</Path>
146-
<Destination>Toolkit VIs</Destination>
141+
<Destination>0</Destination>
147142
<Additional_Destination>true</Additional_Destination>
148143
<Additional_Destination_Index>0</Additional_Destination_Index>
149144
</Destination_Overrides>
150145
<Destination_Overrides>
151146
<Path>_Control Templates</Path>
152-
<Destination>Toolkit VIs</Destination>
147+
<Destination>0</Destination>
153148
<Additional_Destination>true</Additional_Destination>
154149
<Additional_Destination_Index>1</Additional_Destination_Index>
155150
</Destination_Overrides>
@@ -190,6 +185,11 @@
190185
<Phone_Activation_Number/>
191186
<Auto_Activation_URL/>
192187
<Library_Protection_Password>&lt;random:32&gt;</Library_Protection_Password>
188+
<Enable_Deactivation>false</Enable_Deactivation>
189+
<Encryption_key_id/>
190+
<Client_key/>
191+
<Server_key/>
192+
<License_Sublibraries>false</License_Sublibraries>
193193
</Licensing_and_Activation>
194194
<Palette_Sets>
195195
<Palette_Set_Name>Default</Palette_Set_Name>
@@ -207,6 +207,8 @@
207207
<Syncing_MNU_file>&lt;vi.lib&gt;\addons\LAVA\dir.mnu</Syncing_MNU_file>
208208
</Functions_Palette_Information>
209209
<Apply_Short_Names_to_VI_Titles>false</Apply_Short_Names_to_VI_Titles>
210+
<Apply_Short_Names_to_VI_Titles_2>false</Apply_Short_Names_to_VI_Titles_2>
211+
<Library_or_Class_Nmae/>
210212
</Palette_Sets>
211213
<Install_Requirements>
212214
<All_Windows>true</All_Windows>
@@ -217,11 +219,24 @@
217219
<Linux>true</Linux>
218220
<Built_LV_Version>false</Built_LV_Version>
219221
<Built_LV_Version_or_greater>true</Built_LV_Version_or_greater>
222+
<Windows_8>true</Windows_8>
223+
<OS_32-Bit>true</OS_32-Bit>
224+
<OS_64-Bit>true</OS_64-Bit>
225+
<LV_32-Bit>true</LV_32-Bit>
226+
<LV_64-Bit>true</LV_64-Bit>
220227
</Install_Requirements>
221228
<LabVIEW>
222-
<Shutdown_LabVIEW_Before_Package_Install>false</Shutdown_LabVIEW_Before_Package_Install>
223-
<Start_LabVIEW_After_Package_Install>false</Start_LabVIEW_After_Package_Install>
229+
<close_labview_before_install>false</close_labview_before_install>
230+
<restart_labview_after_install>false</restart_labview_after_install>
231+
<skip_mass_compile_after_install>false</skip_mass_compile_after_install>
224232
</LabVIEW>
233+
<VI_Docs>
234+
<Edit_VI_Description>false</Edit_VI_Description>
235+
<Text_to_Add>{product_name} {version_number}
236+
{author_name} - {company_name}
237+
{copyright}</Text_to_Add>
238+
</VI_Docs>
239+
<System_Destinations/>
225240
</Advanced_Settings>
226241
<Library_Palette_Definition>
227242
<Functions_Palette_Data>
@@ -313,7 +328,7 @@
313328
<Path>Create Control (to dir).vi</Path>
314329
<VI_Title/>
315330
</Items_Data>
316-
<GUID>42FA5D0C335E02DDEE30A5189EF95E5B</GUID>
331+
<GUID>474A456D47321BEA31813E73DA4470F3</GUID>
317332
</Functions_Palette_Data>
318333
<Functions_Palette_Data>
319334
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -698,7 +713,7 @@
698713
<Path>Properties\Write Text Font.vi</Path>
699714
<VI_Title/>
700715
</Items_Data>
701-
<GUID>CDF7C3A416197A3455E2A3A1743FCEFC</GUID>
716+
<GUID>1877672BA5FD710D5CC04A93AD0C9E58</GUID>
702717
</Functions_Palette_Data>
703718
</Library_Palette_Definition>
704719
</VI_Package_Builder_Settings>

Control_class.aliases

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[My Computer]
2-
My Computer = "169.254.159.55"
2+
My Computer = "192.168.42.70"
33

0 commit comments

Comments
 (0)