mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

[macOS] Fix Group auto-assigning based on NSPredicate (#3289) 

* [macOS] Fix Group NSPredicate

Property was renames, but previously saved predicates were not updated.

* [macOS] Update xibs for creating Group NSPredicate with new name.

* [macOS] Allow execution for Group NSPredicate restored secured storage.
This commit is contained in:
Dzmitry Neviadomski 2022-06-14 18:17:02 +03:00 committed by GitHub
parent 438653a4ee
commit c806a1435e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macosx/GroupsController.mm
View File

@ -424,6 +424,7 @@ GroupsController* fGroupsInstance = nil;
}
NSPredicate* predicate = [self autoAssignRulesForIndex:index];
[predicate allowEvaluation];
BOOL eval = NO;
@try
{

6
macosx/Torrent.mm
View File

@ -2175,4 +2175,10 @@ bool trashDataFile(char const* filename, tr_error** error)
}
}
// For backward comatibility for previously saved Group Predicates.
- (NSArray<FileListNode*>*)fFlatFileList
{
return self.flatFileList;
}
@end

4
macosx/da.lproj/GroupRules.xib
View File

@ -135,7 +135,7 @@ Gw
<predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
<array key="leftExpressionObject">
<expression type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
<expression type="keyPath">
<string key="keyPath">allTrackersFlat</string>
@ -148,7 +148,7 @@ Gw
<items>
<menuItem title="Enhver fil" state="on" id="161">
<expression key="representedObject" type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
</menuItem>
<menuItem title="Enhver tracker" id="162">

4
macosx/de.lproj/GroupRules.xib
View File

@ -135,7 +135,7 @@ Gw
<predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
<array key="leftExpressionObject">
<expression type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
<expression type="keyPath">
<string key="keyPath">allTrackersFlat</string>
@ -148,7 +148,7 @@ Gw
<items>
<menuItem title="Name einer Datei" state="on" id="161">
<expression key="representedObject" type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
</menuItem>
<menuItem title="Genutzter Tracker" id="162">

4
macosx/en.lproj/GroupRules.xib
View File

@ -135,7 +135,7 @@ Gw
<predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
<array key="leftExpressionObject">
<expression type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
<expression type="keyPath">
<string key="keyPath">allTrackersFlat</string>
@ -148,7 +148,7 @@ Gw
<items>
<menuItem title="Any File" state="on" id="161">
<expression key="representedObject" type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
</menuItem>
<menuItem title="Any Tracker" id="162">

4
macosx/es.lproj/GroupRules.xib
View File

@ -135,7 +135,7 @@ Gw
<predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
<array key="leftExpressionObject">
<expression type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
<expression type="keyPath">
<string key="keyPath">allTrackersFlat</string>
@ -148,7 +148,7 @@ Gw
<items>
<menuItem title="Cualquier archivo" state="on" id="161">
<expression key="representedObject" type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
</menuItem>
<menuItem title="Cualquier tracker" id="162">

4
macosx/fr.lproj/GroupRules.xib
View File

@ -135,7 +135,7 @@ Gw
<predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
<array key="leftExpressionObject">
<expression type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
<expression type="keyPath">
<string key="keyPath">allTrackersFlat</string>
@ -148,7 +148,7 @@ Gw
<items>
<menuItem title="Un fichier" state="on" id="161">
<expression key="representedObject" type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
</menuItem>
<menuItem title="Un trackeur" id="162">

4
macosx/it.lproj/GroupRules.xib
View File

@ -135,7 +135,7 @@ Gw
<predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
<array key="leftExpressionObject">
<expression type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
<expression type="keyPath">
<string key="keyPath">allTrackersFlat</string>
@ -148,7 +148,7 @@ Gw
<items>
<menuItem title="Un qualsiasi file" state="on" id="161">
<expression key="representedObject" type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
</menuItem>
<menuItem title="Un qualsiasi server traccia" id="162">

4
macosx/nl.lproj/GroupRules.xib
View File

@ -135,7 +135,7 @@ Gw
<predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
<array key="leftExpressionObject">
<expression type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
<expression type="keyPath">
<string key="keyPath">allTrackersFlat</string>
@ -148,7 +148,7 @@ Gw
<items>
<menuItem title="Elk bestand" state="on" id="161">
<expression key="representedObject" type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
</menuItem>
<menuItem title="Elke tracker" id="162">

4
macosx/pt_PT.lproj/GroupRules.xib
View File

@ -135,7 +135,7 @@ Gw
<predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
<array key="leftExpressionObject">
<expression type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
<expression type="keyPath">
<string key="keyPath">allTrackersFlat</string>
@ -148,7 +148,7 @@ Gw
<items>
<menuItem title="Qualquer ficheiro" state="on" id="161">
<expression key="representedObject" type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
</menuItem>
<menuItem title="Qualquer tracker" id="162">

4
macosx/ru.lproj/GroupRules.xib
View File

@ -135,7 +135,7 @@ Gw
<predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
<array key="leftExpressionObject">
<expression type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
<expression type="keyPath">
<string key="keyPath">allTrackersFlat</string>
@ -148,7 +148,7 @@ Gw
<items>
<menuItem title="Любой файл" state="on" id="161">
<expression key="representedObject" type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
</menuItem>
<menuItem title="Любой трекер" id="162">

4
macosx/tr.lproj/GroupRules.xib
View File

@ -135,7 +135,7 @@ Gw
<predicateEditorRowTemplate rowType="simple" id="147" customClass="PredicateEditorRowTemplateAny">
<array key="leftExpressionObject">
<expression type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
<expression type="keyPath">
<string key="keyPath">allTrackersFlat</string>
@ -148,7 +148,7 @@ Gw
<items>
<menuItem title="Dosya" state="on" id="161">
<expression key="representedObject" type="keyPath">
<string key="keyPath">fFlatFileList.name</string>
<string key="keyPath">flatFileList.name</string>
</expression>
</menuItem>
<menuItem title="İzleyici" id="162">