Skip to content

Commit

Permalink
conditional uses of uwuagroup
Browse files Browse the repository at this point in the history
  • Loading branch information
@htouvet
htouvet committed Dec 20, 2018
1 parent 92e0e53 commit 1c5dc5e
Show file tree
Hide file tree
Showing 12 changed files with 65 additions and 162 deletions.
43 changes: 30 additions & 13 deletions languages/waptconsole.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,16 @@ msgstr "Annuler"
msgid "Import packages"
msgstr ""

#: tvisimportpackage.cbfilterpackagesarch.caption
msgctxt "tvisimportpackage.cbfilterpackagesarch.caption"
msgid "Architecture"
msgstr ""

#: tvisimportpackage.cbfilterpackageslocales.caption
msgctxt "tvisimportpackage.cbfilterpackageslocales.caption"
msgid "Locale"
msgstr ""

#: tvisimportpackage.cbnewerthanmine.caption
msgid "Newer packages than mine only"
msgstr ""
Expand Down Expand Up @@ -816,6 +826,7 @@ msgid "Software Version"
msgstr ""

#: tvispackagewizard.edversion.text
msgctxt "tvispackagewizard.edversion.text"
msgid "0"
msgstr ""

Expand Down Expand Up @@ -1697,6 +1708,10 @@ msgctxt "TVISWAPTGUI.ACTTRIGGERWAPTWUA_SCAN.CAPTION"
msgid "Trigger the scan of missing Windows Updates"
msgstr ""

#: tviswaptgui.actveyon.caption
msgid "Connect via Veyon"
msgstr ""

#: tviswaptgui.actvnc.caption
msgctxt "tviswaptgui.actvnc.caption"
msgid "Connect via VNC"
Expand Down Expand Up @@ -1862,6 +1877,7 @@ msgid "Architecture"
msgstr ""

#: tviswaptgui.cbfilterpackageslocales.caption
msgctxt "tviswaptgui.cbfilterpackageslocales.caption"
msgid "Locale"
msgstr ""

Expand Down Expand Up @@ -2373,6 +2389,16 @@ msgstr ""
msgid "Classifications"
msgstr ""

#: tviswuagroup.actbuilduploadpackage.caption
msgctxt "tviswuagroup.actbuilduploadpackage.caption"
msgid "Save"
msgstr ""

#: tviswuagroup.actloadpackage.caption
msgctxt "tviswuagroup.actloadpackage.caption"
msgid "Refresh"
msgstr ""

#: tviswuagroup.actwuaallowselectedupdates.caption
msgctxt "tviswuagroup.actwuaallowselectedupdates.caption"
msgid "Allow Selected Updates"
Expand All @@ -2388,11 +2414,6 @@ msgctxt "tviswuagroup.actwuaforbidselectedupdates.caption"
msgid "Forbid Selected Updates"
msgstr ""

#: tviswuagroup.actwualoadgroup.caption
msgctxt "tviswuagroup.actwualoadgroup.caption"
msgid "Refresh"
msgstr ""

#: tviswuagroup.actwualoadupdates.caption
msgid "Load updates"
msgstr ""
Expand Down Expand Up @@ -2432,11 +2453,6 @@ msgctxt "tviswuagroup.actwuaresetselectedupdates.caption"
msgid "Reset Selected"
msgstr ""

#: tviswuagroup.actwuasaveupdatesgroup.caption
msgctxt "tviswuagroup.actwuasaveupdatesgroup.caption"
msgid "Save"
msgstr ""

#: tviswuagroup.caption
msgid "Edit Windows updates Group"
msgstr ""
Expand Down Expand Up @@ -2466,8 +2482,9 @@ msgctxt "tviswuagroup.cbwuother.caption"
msgid "Other"
msgstr ""

#: tviswuagroup.combobox1.text
msgid "ComboBox1"
#: tviswuagroup.edpackageversion.text
msgctxt "tviswuagroup.edpackageversion.text"
msgid "0"
msgstr ""

#: tviswuagroup.label1.caption
Expand All @@ -2489,7 +2506,7 @@ msgid "Description"
msgstr ""

#: tviswuagroup.label4.caption
msgid "Maturity"
msgid "Package filename : "
msgstr ""

#: tviswuagroup.tabsheet1.caption
Expand Down
2 changes: 1 addition & 1 deletion wapt-get/WaptGuiHelper.lpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<MinorVersionNr Value="7" />
<RevisionNr Value="2" />
<StringTable FileDescription="WAPT GUI Helper for python dialogs" LegalCopyright="Tranquil IT Systems 2012-2018" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.2" />
<BuildNr Value="0" /></VersionInfo>
<BuildNr Value="1" /></VersionInfo>
<BuildModes Count="1">
<Item1 Default="True" Name="Default" />
</BuildModes>
Expand Down
90 changes: 2 additions & 88 deletions wapt-get/waptget.lpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<MajorVersionNr Value="1"/>
<MinorVersionNr Value="7"/>
<RevisionNr Value="2"/>
<BuildNr Value="1"/>
<BuildNr Value="2"/>
<StringTable CompanyName="Tranquil IT Systems" LegalCopyright="Tranquil IT Systems 2012-2018" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.2"/>
</VersionInfo>
<BuildModes Count="1" Active="Default">
Expand Down Expand Up @@ -69,75 +69,7 @@
<DefaultSyntaxHighlighter Value="Delphi"/>
</Unit0>
</Units>
<JumpHistory Count="17" HistoryIndex="16">
<Position1>
<Filename Value="waptget.lpr"/>
<Caret Line="316" Column="26" TopLine="306"/>
</Position1>
<Position2>
<Filename Value="waptget.lpr"/>
<Caret Line="395" Column="31" TopLine="405"/>
</Position2>
<Position3>
<Filename Value="waptget.lpr"/>
</Position3>
<Position4>
<Filename Value="waptget.lpr"/>
<Caret Line="441" Column="74" TopLine="420"/>
</Position4>
<Position5>
<Filename Value="waptget.lpr"/>
<Caret Line="463" Column="28" TopLine="473"/>
</Position5>
<Position6>
<Filename Value="waptget.lpr"/>
<Caret Line="834" Column="17" TopLine="774"/>
</Position6>
<Position7>
<Filename Value="waptget.lpr"/>
<Caret Line="199" TopLine="184"/>
</Position7>
<Position8>
<Filename Value="waptget.lpr"/>
<Caret Line="218" Column="10" TopLine="196"/>
</Position8>
<Position9>
<Filename Value="waptget.lpr"/>
<Caret Line="842" Column="17" TopLine="824"/>
</Position9>
<Position10>
<Filename Value="waptget.lpr"/>
<Caret Line="843" Column="39" TopLine="824"/>
</Position10>
<Position11>
<Filename Value="waptget.lpr"/>
<Caret Line="862" Column="72" TopLine="841"/>
</Position11>
<Position12>
<Filename Value="waptget.lpr"/>
<Caret Line="875" Column="20" TopLine="854"/>
</Position12>
<Position13>
<Filename Value="waptget.lpr"/>
<Caret Line="880" Column="22" TopLine="859"/>
</Position13>
<Position14>
<Filename Value="waptget.lpr"/>
<Caret Line="884" Column="24" TopLine="863"/>
</Position14>
<Position15>
<Filename Value="waptget.lpr"/>
<Caret Line="891" Column="14" TopLine="869"/>
</Position15>
<Position16>
<Filename Value="waptget.lpr"/>
<Caret Line="899" Column="39" TopLine="877"/>
</Position16>
<Position17>
<Filename Value="waptget.lpr"/>
<Caret Line="906" Column="34" TopLine="884"/>
</Position17>
</JumpHistory>
<JumpHistory HistoryIndex="-1"/>
</ProjectOptions>
<CompilerOptions>
<Version Value="11"/>
Expand Down Expand Up @@ -173,22 +105,4 @@
<CustomOptions Value="-dUseCThreads -dENTERPRISE"/>
</Other>
</CompilerOptions>
<Debugging>
<BreakPoints Count="2">
<Item1>
<Kind Value="bpkSource"/>
<WatchScope Value="wpsLocal"/>
<WatchKind Value="wpkWrite"/>
<Source Value="waptget.lpr"/>
<Line Value="834"/>
</Item1>
<Item2>
<Kind Value="bpkSource"/>
<WatchScope Value="wpsLocal"/>
<WatchKind Value="wpkWrite"/>
<Source Value="waptget.lpr"/>
<Line Value="75"/>
</Item2>
</BreakPoints>
</Debugging>
</CONFIG>
2 changes: 1 addition & 1 deletion waptconsole.sha256
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,4 +274,4 @@ b82530c2be48521581d729f28632de588be52692acd8105adceee6b1a89e0942 lib\_weakrefse
70397333c555cb731d571e2d119e31355a0b38177e9ac4e0db1bb7a1902e86fa waptpackage.py
5c09a644cc39c757e22a5f2fae3089111d5b6e97e052fba6371c1086eadc7611 waptenterprise\licencing.py
3d992828423d12e5a18fe78bb783e4417b4b8e2e70b94c5ab7c8c49f0c98028e waptenterprise\__init__.py
a0b2813ed672151976626d9f74f969c92df2a2c217d715b761e8d91dc791c79a waptutils.py
695a30c87852245196b80750a8794b3cc50062e5d3f3b200e07f2b7488935f73 waptutils.py
5 changes: 4 additions & 1 deletion waptconsole/uwaptconsole.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,10 @@ implementation
uvisgroupchoice, uvistriggerhostsaction, uVisAPropos,
uVisImportPackage, PythonEngine, Clipbrd, RegExpr, tisinifiles, IdURI,
uVisPackageWizard, uVisChangeKeyPassword, uVisDisplayPreferences,
uvisrepositories, uVisHostDelete, windirs,winutils,uWaptPythonUtils,uVisWUAGroup
uvisrepositories, uVisHostDelete, windirs,winutils,uWaptPythonUtils
{$ifdef ENTERPRISE}
,uVisWUAGroup
{$endif}
{$ifdef wsus},uVisWAPTWUAProducts, uviswuapackageselect,
uVisWUAClassificationsSelect
{$endif};
Expand Down
73 changes: 21 additions & 52 deletions waptconsole/waptconsole.lpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<MajorVersionNr Value="1"/>
<MinorVersionNr Value="7"/>
<RevisionNr Value="2"/>
<BuildNr Value="1"/>
<BuildNr Value="2"/>
<StringTable LegalCopyright="Tranquil IT Systems 2012-2018" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.2"/>
</VersionInfo>
<BuildModes Count="1">
Expand Down Expand Up @@ -81,7 +81,7 @@
<PackageName Value="LCL"/>
</Item12>
</RequiredPackages>
<Units Count="27">
<Units Count="22">
<Unit0>
<Filename Value="waptconsole.lpr"/>
<IsPartOfProject Value="True"/>
Expand Down Expand Up @@ -194,87 +194,49 @@
<UnitName Value="uWaptConsoleRes"/>
</Unit15>
<Unit16>
<Filename Value="uviswuagroup.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="VisWUAGroup"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="uVisWUAGroup"/>
</Unit16>
<Unit17>
<Filename Value="uviswaptwuaproducts.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="VisWUAProducts"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="uVisWAPTWUAProducts"/>
</Unit17>
<Unit18>
<Filename Value="uviswuarules.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="VisWUARules"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
</Unit18>
<Unit19>
<Filename Value="uviswuaclassificationsselect.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="VisWUAClassificationsSelect"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="uVisWUAClassificationsSelect"/>
</Unit19>
<Unit20>
<Filename Value="uviswuapackageselect.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="VisWUAPackageSelect"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
</Unit20>
<Unit21>
<Filename Value="uvispackagewizard.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="VisPackageWizard"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="uVisPackageWizard"/>
</Unit21>
<Unit22>
</Unit16>
<Unit17>
<Filename Value="uvischangekeypassword.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="VisChangeKeyPassword"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="uVisChangeKeyPassword"/>
</Unit22>
<Unit23>
</Unit17>
<Unit18>
<Filename Value="uvisrepositories.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="VisRepositories"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
</Unit23>
<Unit24>
</Unit18>
<Unit19>
<Filename Value="uvisdisplaypreferences.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="VisDisplayPreferences"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="uVisDisplayPreferences"/>
</Unit24>
<Unit25>
</Unit19>
<Unit20>
<Filename Value="uvishostdelete.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="VisHostDelete"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="uVisHostDelete"/>
</Unit25>
<Unit26>
</Unit20>
<Unit21>
<Filename Value="..\wapt-get\uwaptpythonutils.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="uWaptPythonUtils"/>
</Unit26>
</Unit21>
</Units>
</ProjectOptions>
<CompilerOptions>
Expand All @@ -285,7 +247,7 @@
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<OtherUnitFiles Value="..\wapt-get"/>
<OtherUnitFiles Value="..\wapt-get;..\waptenterprise\includes"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<CodeGeneration>
Expand Down Expand Up @@ -313,4 +275,11 @@
<CustomOptions Value="-dUseCThreads -dENTERPRISE"/>
</Other>
</CompilerOptions>
<Debugging>
<Exceptions Count="1">
<Item1>
<Name Value="EConvertError"/>
</Item1>
</Exceptions>
</Debugging>
</CONFIG>
2 changes: 1 addition & 1 deletion waptconsolepostconf/waptconsolepostconf.lpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<MajorVersionNr Value="1"/>
<MinorVersionNr Value="7"/>
<RevisionNr Value="2"/>
<BuildNr Value="1"/>
<BuildNr Value="2"/>
<StringTable LegalCopyright="Tranquil IT Systems 2012-2018" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.2"/>
</VersionInfo>
<BuildModes Count="1">
Expand Down
2 changes: 1 addition & 1 deletion waptdeploy/waptdeploy.lpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<MajorVersionNr Value="1"/>
<MinorVersionNr Value="7"/>
<RevisionNr Value="2"/>
<BuildNr Value="1"/>
<BuildNr Value="2"/>
<StringTable CompanyName="Tranquil IT Systems" FileDescription="WAPT auto deploy" LegalCopyright="Tranquil IT Systems 2012-2018" ProductName="WAPT Enterprise Edition" ProductVersion="1.7.2"/>
</VersionInfo>
<BuildModes Count="1">
Expand Down
Loading

0 comments on commit 1c5dc5e

Please sign in to comment.