diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 74c4e8e4d..6f1ae5363 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -134,7 +134,6 @@ A23547E211CD0B090046EAE6 /* cache.cc in Sources */ = {isa = PBXBuildFile; fileRef = A23547E011CD0B090046EAE6 /* cache.cc */; }; A23547E311CD0B090046EAE6 /* cache.h in Headers */ = {isa = PBXBuildFile; fileRef = A23547E111CD0B090046EAE6 /* cache.h */; }; A2385DD40BFE06C800B24EF6 /* DragOverlayWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.mm */; }; - A238D49F21CDA1A5006B03EA /* InfoTabMatrix.mm in Sources */ = {isa = PBXBuildFile; fileRef = A238D49E21CDA1A5006B03EA /* InfoTabMatrix.mm */; }; A23F29A1132A447400E9A83B /* announcer-common.h in Headers */ = {isa = PBXBuildFile; fileRef = A23F299F132A447400E9A83B /* announcer-common.h */; }; A23F29A2132A447400E9A83B /* announcer-http.cc in Sources */ = {isa = PBXBuildFile; fileRef = A23F29A0132A447400E9A83B /* announcer-http.cc */; }; A23F4FF20D1D98AD002FCB97 /* PrefsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A23F4FF00D1D98AD002FCB97 /* PrefsWindow.xib */; }; @@ -158,7 +157,6 @@ A259317E0A73B2CC002F4FE7 /* TransmissionHelp in Resources */ = {isa = PBXBuildFile; fileRef = A259316A0A73B2CC002F4FE7 /* TransmissionHelp */; }; A25964A6106D73A800453B31 /* announcer.cc in Sources */ = {isa = PBXBuildFile; fileRef = A25964A4106D73A800453B31 /* announcer.cc */; }; A25964A7106D73A800453B31 /* announcer.h in Headers */ = {isa = PBXBuildFile; fileRef = A25964A5106D73A800453B31 /* announcer.h */; }; - A25BB02A12F4F517004B724E /* InfoTabButtonBack.mm in Sources */ = {isa = PBXBuildFile; fileRef = A25BB02912F4F517004B724E /* InfoTabButtonBack.mm */; }; A25BFD69167BED3B0039D1AA /* variant-benc.cc in Sources */ = {isa = PBXBuildFile; fileRef = A25BFD63167BED3B0039D1AA /* variant-benc.cc */; }; A25BFD6A167BED3B0039D1AA /* variant-common.h in Headers */ = {isa = PBXBuildFile; fileRef = A25BFD64167BED3B0039D1AA /* variant-common.h */; }; A25BFD6B167BED3B0039D1AA /* variant-json.cc in Sources */ = {isa = PBXBuildFile; fileRef = A25BFD65167BED3B0039D1AA /* variant-json.cc */; }; @@ -242,7 +240,6 @@ A2D8CFBA15F82DFA0056E93D /* NSApplicationAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A29D84031049C25600D1987A /* NSApplicationAdditions.mm */; }; A2D8CFBB15F82E030056E93D /* NSStringAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4DE5CC9C0980656F00BE280E /* NSStringAdditions.mm */; }; A2DF37070C220D03006523C1 /* CreatorWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2DF37050C220D03006523C1 /* CreatorWindowController.mm */; }; - A2E23AC60CB5E1930002BB25 /* InfoTabButtonCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2E23AC40CB5E1930002BB25 /* InfoTabButtonCell.mm */; }; A2E384DA130DFB3A001F501B /* templates.h in Headers */ = {isa = PBXBuildFile; fileRef = A2E384D2130DFB3A001F501B /* templates.h */; }; A2E384DC130DFB3A001F501B /* utp_config.h in Headers */ = {isa = PBXBuildFile; fileRef = A2E384D4130DFB3A001F501B /* utp_config.h */; }; A2E384DD130DFB3A001F501B /* utp_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2E384D5130DFB3A001F501B /* utp_utils.cpp */; }; @@ -682,8 +679,6 @@ A236D19615F6BD9C000C3DD4 /* it */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DragOverlayWindow.mm; sourceTree = ""; }; A2385DD30BFE06C800B24EF6 /* DragOverlayWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DragOverlayWindow.h; sourceTree = ""; }; - A238D49D21CDA1A5006B03EA /* InfoTabMatrix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InfoTabMatrix.h; sourceTree = ""; }; - A238D49E21CDA1A5006B03EA /* InfoTabMatrix.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = InfoTabMatrix.mm; sourceTree = ""; }; A23F299F132A447400E9A83B /* announcer-common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "announcer-common.h"; sourceTree = ""; }; A23F29A0132A447400E9A83B /* announcer-http.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "announcer-http.cc"; sourceTree = ""; }; A23F526D0F14395900AA02E3 /* PredicateEditorRowTemplateAny.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PredicateEditorRowTemplateAny.h; sourceTree = ""; }; @@ -709,8 +704,6 @@ A259316A0A73B2CC002F4FE7 /* TransmissionHelp */ = {isa = PBXFileReference; lastKnownFileType = folder; path = TransmissionHelp; sourceTree = ""; }; A25964A4106D73A800453B31 /* announcer.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = announcer.cc; sourceTree = ""; }; A25964A5106D73A800453B31 /* announcer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = announcer.h; sourceTree = ""; }; - A25BB02812F4F517004B724E /* InfoTabButtonBack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InfoTabButtonBack.h; sourceTree = ""; }; - A25BB02912F4F517004B724E /* InfoTabButtonBack.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = InfoTabButtonBack.mm; sourceTree = ""; }; A25BFD63167BED3B0039D1AA /* variant-benc.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "variant-benc.cc"; sourceTree = ""; }; A25BFD64167BED3B0039D1AA /* variant-common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "variant-common.h"; sourceTree = ""; }; A25BFD65167BED3B0039D1AA /* variant-json.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "variant-json.cc"; sourceTree = ""; }; @@ -888,8 +881,6 @@ A2D8CFBF15FA177A0056E93D /* ru */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; A2DF37040C220D03006523C1 /* CreatorWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CreatorWindowController.h; sourceTree = ""; }; A2DF37050C220D03006523C1 /* CreatorWindowController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CreatorWindowController.mm; sourceTree = ""; }; - A2E23AC30CB5E1930002BB25 /* InfoTabButtonCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InfoTabButtonCell.h; sourceTree = ""; }; - A2E23AC40CB5E1930002BB25 /* InfoTabButtonCell.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = InfoTabButtonCell.mm; sourceTree = ""; }; A2E384D2130DFB3A001F501B /* templates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = templates.h; sourceTree = ""; }; A2E384D3130DFB3A001F501B /* utp_config_example.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = utp_config_example.h; sourceTree = ""; }; A2E384D4130DFB3A001F501B /* utp_config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = utp_config.h; sourceTree = ""; }; @@ -1758,41 +1749,35 @@ E1B6FBF80C0D719B0015FE4D /* Info Window */ = { isa = PBXGroup; children = ( - A247A442114C701800547DFC /* InfoViewController.h */, - A209EAC41142CF28002B02D1 /* InfoGeneralViewController.h */, - A209EAC51142CF28002B02D1 /* InfoGeneralViewController.mm */, A209EAC21142CF28002B02D1 /* InfoActivityViewController.h */, A209EAC31142CF28002B02D1 /* InfoActivityViewController.mm */, - A209EAFF1142D3A5002B02D1 /* InfoTrackersViewController.h */, - A209EB001142D3A5002B02D1 /* InfoTrackersViewController.mm */, - A209EB9B1142E59A002B02D1 /* InfoPeersViewController.h */, - A209EB9C1142E59A002B02D1 /* InfoPeersViewController.mm */, A209EBCC1142F2B4002B02D1 /* InfoFileViewController.h */, A209EBCD1142F2B4002B02D1 /* InfoFileViewController.mm */, + A209EAC41142CF28002B02D1 /* InfoGeneralViewController.h */, + A209EAC51142CF28002B02D1 /* InfoGeneralViewController.mm */, A209EBF71142FEEE002B02D1 /* InfoOptionsViewController.h */, A209EBF81142FEEE002B02D1 /* InfoOptionsViewController.mm */, - A257C17F0CAD3003004E121C /* PeerTableView.h */, - A257C1800CAD3003004E121C /* PeerTableView.mm */, - A2E23AC30CB5E1930002BB25 /* InfoTabButtonCell.h */, - A2E23AC40CB5E1930002BB25 /* InfoTabButtonCell.mm */, - A238D49D21CDA1A5006B03EA /* InfoTabMatrix.h */, - A238D49E21CDA1A5006B03EA /* InfoTabMatrix.mm */, - A25BB02812F4F517004B724E /* InfoTabButtonBack.h */, - A25BB02912F4F517004B724E /* InfoTabButtonBack.mm */, + A209EB9B1142E59A002B02D1 /* InfoPeersViewController.h */, + A209EB9C1142E59A002B02D1 /* InfoPeersViewController.mm */, + A263CFBE10DD67670038DE27 /* InfoTextField.h */, + A263CFBF10DD67670038DE27 /* InfoTextField.mm */, + A209EAFF1142D3A5002B02D1 /* InfoTrackersViewController.h */, + A209EB001142D3A5002B02D1 /* InfoTrackersViewController.mm */, + A247A442114C701800547DFC /* InfoViewController.h */, A200B8390A2263BA007BBB1E /* InfoWindowController.h */, A200B83A0A2263BA007BBB1E /* InfoWindowController.mm */, A2A1CB770BF29D5500AE959F /* PeerProgressIndicatorCell.h */, A2A1CB780BF29D5500AE959F /* PeerProgressIndicatorCell.mm */, + A257C17F0CAD3003004E121C /* PeerTableView.h */, + A257C1800CAD3003004E121C /* PeerTableView.mm */, A2AA579A0ADFCAB400CA59F6 /* PiecesView.h */, A2AA579B0ADFCAB400CA59F6 /* PiecesView.mm */, - A2725D5B0DE7507C003445E7 /* TrackerTableView.h */, - A2725D5C0DE7507C003445E7 /* TrackerTableView.mm */, A21A9D3F106EC2E800F1C3C1 /* TrackerCell.h */, A21A9D40106EC2E800F1C3C1 /* TrackerCell.mm */, + A2725D5B0DE7507C003445E7 /* TrackerTableView.h */, + A2725D5C0DE7507C003445E7 /* TrackerTableView.mm */, A2D7744F154CC25700A62B93 /* WebSeedTableView.h */, A2D77450154CC25700A62B93 /* WebSeedTableView.mm */, - A263CFBE10DD67670038DE27 /* InfoTextField.h */, - A263CFBF10DD67670038DE27 /* InfoTextField.mm */, ); name = "Info Window"; sourceTree = ""; @@ -2544,7 +2529,6 @@ A2085DDC0C53BC74000BC3B7 /* AboutWindowController.mm in Sources */, A21282A80CA6C66800EAEE0F /* StatusBarView.mm in Sources */, A257C1820CAD3003004E121C /* PeerTableView.mm in Sources */, - A2E23AC60CB5E1930002BB25 /* InfoTabButtonCell.mm in Sources */, A2A6321B0CD9751700E3DA60 /* BadgeView.mm in Sources */, A2ED7D8F0CEF431B00970975 /* FilterButton.mm in Sources */, A25892640CF1F7E800CCCDDF /* StatsWindowController.mm in Sources */, @@ -2576,14 +2560,12 @@ A209EBF91142FEEE002B02D1 /* InfoOptionsViewController.mm in Sources */, A21F15AC11729A8B00CF5A9C /* AddMagnetWindowController.mm in Sources */, A2661D6112D0E8D9004F69D5 /* FilterBarView.mm in Sources */, - A25BB02A12F4F517004B724E /* InfoTabButtonBack.mm in Sources */, A2F7CF5F13035FFD0016FF10 /* URLSheetWindowController.mm in Sources */, A2E57ABB1310822C00A7DAB1 /* StatusBarController.mm in Sources */, A2E57BA713109E6B00A7DAB1 /* FilterBarController.mm in Sources */, A2B5B4E91880665E0071A66A /* ShareTorrentFileHelper.mm in Sources */, A22BAE281388040500FB022F /* NSMutableArrayAdditions.mm in Sources */, A2966E8713DAF74C007B52DF /* GlobalOptionsPopoverViewController.mm in Sources */, - A238D49F21CDA1A5006B03EA /* InfoTabMatrix.mm in Sources */, A234EA541453563B000F3E97 /* NSImageAdditions.mm in Sources */, A2AB883E16A399A6008FAD50 /* VDKQueue.m in Sources */, A2451E6916ACE4EB00586E0E /* FileRenameSheetController.mm in Sources */, diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt index 4805dbf84..a9eaa0091 100644 --- a/macosx/CMakeLists.txt +++ b/macosx/CMakeLists.txt @@ -73,8 +73,6 @@ set(${PROJECT_NAME}_SOURCES InfoGeneralViewController.mm InfoOptionsViewController.mm InfoPeersViewController.mm - InfoTabButtonBack.mm - InfoTabButtonCell.mm InfoTextField.mm InfoTrackersViewController.mm InfoWindowController.mm @@ -145,8 +143,6 @@ set(${PROJECT_NAME}_HEADERS InfoGeneralViewController.h InfoOptionsViewController.h InfoPeersViewController.h - InfoTabButtonBack.h - InfoTabButtonCell.h InfoTextField.h InfoTrackersViewController.h InfoViewController.h diff --git a/macosx/InfoTabButtonBack.h b/macosx/InfoTabButtonBack.h deleted file mode 100644 index 45c1d1109..000000000 --- a/macosx/InfoTabButtonBack.h +++ /dev/null @@ -1,29 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - *****************************************************************************/ - -#import - -@interface InfoTabButtonBack : NSView -{ -} - -@end diff --git a/macosx/InfoTabButtonBack.mm b/macosx/InfoTabButtonBack.mm deleted file mode 100644 index 8ef468caf..000000000 --- a/macosx/InfoTabButtonBack.mm +++ /dev/null @@ -1,88 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2011-2012 Transmission authors and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - *****************************************************************************/ - -#import "InfoTabButtonBack.h" -#import "NSApplicationAdditions.h" - -@implementation InfoTabButtonBack - -- (void)drawRect:(NSRect)rect -{ - NSInteger count = 0; - NSRect gridRects[2]; - NSColor* colorRects[2]; - - NSRect lineBorderRect = NSMakeRect(NSMinX(rect), NSHeight(self.bounds) - 1.0, NSWidth(rect), 1.0); - if (NSIntersectsRect(lineBorderRect, rect)) - { - gridRects[count] = lineBorderRect; - if (@available(macOS 10.14, *)) - { - colorRects[count] = NSColor.separatorColor; - } - else - { - colorRects[count] = NSColor.grayColor; - } - ++count; - - rect.size.height -= 1.0; - } - - lineBorderRect.origin.y = 0.0; - if (NSIntersectsRect(lineBorderRect, rect)) - { - gridRects[count] = lineBorderRect; - if (@available(macOS 10.14, *)) - { - colorRects[count] = NSColor.separatorColor; - } - else - { - colorRects[count] = NSColor.grayColor; - } - ++count; - - rect.origin.y += 1.0; - rect.size.height -= 1.0; - } - - NSRectFillListWithColors(gridRects, colorRects, count); - - NSGradient* gradient; - - if (NSApp.isDarkMode) - { - NSColor* darkColor = [NSColor colorWithCalibratedRed:60.0 / 255.0 green:60.0 / 255.0 blue:60.0 / 255.0 alpha:1.0]; - NSColor* lightColor = [NSColor colorWithCalibratedRed:90.0 / 255.0 green:90.0 / 255.0 blue:90.0 / 255.0 alpha:1.0]; - gradient = [[NSGradient alloc] initWithStartingColor:lightColor endingColor:darkColor]; - } - else - { - NSColor* lightColor = [NSColor colorWithCalibratedRed:245.0 / 255.0 green:245.0 / 255.0 blue:245.0 / 255.0 alpha:1.0]; - NSColor* darkColor = [NSColor colorWithCalibratedRed:215.0 / 255.0 green:215.0 / 255.0 blue:215.0 / 255.0 alpha:1.0]; - gradient = [[NSGradient alloc] initWithStartingColor:lightColor endingColor:darkColor]; - } - [gradient drawInRect:rect angle:270.0]; -} - -@end diff --git a/macosx/InfoTabButtonCell.h b/macosx/InfoTabButtonCell.h deleted file mode 100644 index 588e73370..000000000 --- a/macosx/InfoTabButtonCell.h +++ /dev/null @@ -1,36 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - *****************************************************************************/ - -#import - -@interface InfoTabButtonCell : NSButtonCell -{ - NSImage* fIcon; - - BOOL fSelected; -} - -- (void)setSelectedTab:(BOOL)selected; - -- (void)reloadAppearance; - -@end diff --git a/macosx/InfoTabButtonCell.mm b/macosx/InfoTabButtonCell.mm deleted file mode 100644 index af434d555..000000000 --- a/macosx/InfoTabButtonCell.mm +++ /dev/null @@ -1,160 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2007-2012 Transmission authors and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - *****************************************************************************/ - -#import "InfoTabButtonCell.h" -#import "NSApplicationAdditions.h" - -@implementation InfoTabButtonCell - -- (void)awakeFromNib -{ - if (!NSApp.onMojaveOrBetter) - { - NSNotificationCenter* nc = NSNotificationCenter.defaultCenter; - [nc addObserver:self selector:@selector(updateControlTint:) name:NSControlTintDidChangeNotification object:NSApp]; - } - - fSelected = NO; - - //expects the icon to currently be set as the image - fIcon = self.image; -} - -- (void)dealloc -{ - [NSNotificationCenter.defaultCenter removeObserver:self]; -} - -- (void)setControlView:(NSView*)controlView -{ - BOOL const hadControlView = self.controlView != nil; - - super.controlView = controlView; - - if (!hadControlView) - { - [(NSMatrix*)self.controlView setToolTip:self.title forCell:self]; - [self setSelectedTab:fSelected]; - } -} - -- (void)setSelectedTab:(BOOL)selected -{ - fSelected = selected; - - [self reloadAppearance]; -} - -- (void)reloadAppearance -{ - if (self.controlView == nil) - { - return; - } - - NSInteger row, col; - [(NSMatrix*)self.controlView getRow:&row column:&col ofCell:self]; - NSRect tabRect = [(NSMatrix*)self.controlView cellFrameAtRow:row column:col]; - tabRect.origin.x = 0.0; - tabRect.origin.y = 0.0; - - NSImage* tabImage = [[NSImage alloc] initWithSize:tabRect.size]; - - [tabImage lockFocus]; - - NSGradient* gradient; - if (fSelected) - { - NSColor *lightColor, *darkColor; - if (@available(macOS 10.14, *)) - { - lightColor = [NSColor.controlAccentColor blendedColorWithFraction:0.35 ofColor:NSColor.whiteColor]; - darkColor = [NSColor.controlAccentColor blendedColorWithFraction:0.15 ofColor:NSColor.whiteColor]; - } - else - { - lightColor = [NSColor colorForControlTint:NSColor.currentControlTint]; - darkColor = [lightColor blendedColorWithFraction:0.2 ofColor:NSColor.blackColor]; - } - gradient = [[NSGradient alloc] initWithStartingColor:lightColor endingColor:darkColor]; - } - else - { - if (NSApp.isDarkMode) - { - NSColor* darkColor = [NSColor colorWithCalibratedRed:60.0 / 255.0 green:60.0 / 255.0 blue:60.0 / 255.0 alpha:1.0]; - NSColor* lightColor = [NSColor colorWithCalibratedRed:90.0 / 255.0 green:90.0 / 255.0 blue:90.0 / 255.0 alpha:1.0]; - gradient = [[NSGradient alloc] initWithStartingColor:lightColor endingColor:darkColor]; - } - else - { - NSColor* lightColor = [NSColor colorWithCalibratedRed:245.0 / 255.0 green:245.0 / 255.0 blue:245.0 / 255.0 alpha:1.0]; - NSColor* darkColor = [NSColor colorWithCalibratedRed:215.0 / 255.0 green:215.0 / 255.0 blue:215.0 / 255.0 alpha:1.0]; - gradient = [[NSGradient alloc] initWithStartingColor:lightColor endingColor:darkColor]; - } - } - - if (@available(macOS 10.14, *)) - { - [NSColor.separatorColor set]; - } - else - { - [NSColor.grayColor set]; - } - NSRectFill(NSMakeRect(0.0, 0.0, NSWidth(tabRect), 1.0)); - NSRectFill(NSMakeRect(0.0, NSHeight(tabRect) - 1.0, NSWidth(tabRect), 1.0)); - NSRectFill(NSMakeRect(NSWidth(tabRect) - 1.0, 1.0, NSWidth(tabRect) - 1.0, NSHeight(tabRect) - 2.0)); - - tabRect = NSMakeRect(0.0, 1.0, NSWidth(tabRect) - 1.0, NSHeight(tabRect) - 2.0); - - [gradient drawInRect:tabRect angle:270.0]; - - if (fIcon) - { - NSSize const iconSize = fIcon.size; - - NSRect const iconRect = NSMakeRect( - NSMinX(tabRect) + floor((NSWidth(tabRect) - iconSize.width) * 0.5), - NSMinY(tabRect) + floor((NSHeight(tabRect) - iconSize.height) * 0.5), - iconSize.width, - iconSize.height); - - [fIcon drawInRect:iconRect fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0]; - } - - [tabImage unlockFocus]; - - self.image = tabImage; -} - -- (void)updateControlTint:(NSNotification*)notification -{ - NSAssert(!NSApp.onMojaveOrBetter, @"should not be observing control tint color when accent color is available"); - - if (fSelected) - { - [self setSelectedTab:YES]; - } -} - -@end diff --git a/macosx/InfoTabMatrix.h b/macosx/InfoTabMatrix.h deleted file mode 100644 index 5c0135726..000000000 --- a/macosx/InfoTabMatrix.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// InfoTabMatrix.h -// Transmission -// -// Created by Mitchell Livingston on 12/21/18. -// Copyright © 2018 The Transmission Project. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface InfoTabMatrix : NSMatrix - -@end - -NS_ASSUME_NONNULL_END diff --git a/macosx/InfoTabMatrix.mm b/macosx/InfoTabMatrix.mm deleted file mode 100644 index c81301ec3..000000000 --- a/macosx/InfoTabMatrix.mm +++ /dev/null @@ -1,22 +0,0 @@ -// -// InfoTabMatrix.m -// Transmission -// -// Created by Mitchell Livingston on 12/21/18. -// Copyright © 2018 The Transmission Project. All rights reserved. -// - -#import "InfoTabMatrix.h" -#import "InfoTabButtonCell.h" - -@implementation InfoTabMatrix - -- (void)viewDidChangeEffectiveAppearance; -{ - for (InfoTabButtonCell* cell in self.cells) - { - [cell reloadAppearance]; - } -} - -@end diff --git a/macosx/InfoWindow.xib b/macosx/InfoWindow.xib index 6ebeb76fc..f85288e4e 100644 --- a/macosx/InfoWindow.xib +++ b/macosx/InfoWindow.xib @@ -1,8 +1,8 @@ - + - + @@ -12,23 +12,23 @@ - + - - - + + + - + - + @@ -36,7 +36,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -52,111 +52,61 @@ - + - - + + - + - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - + - - - - - - - + + - + - - - - - - + + + + + + diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h index 1a0db31f1..b9cdb74f1 100644 --- a/macosx/InfoWindowController.h +++ b/macosx/InfoWindowController.h @@ -39,7 +39,7 @@ NSViewController* fViewController; NSInteger fCurrentTabTag; - IBOutlet NSMatrix* fTabMatrix; + IBOutlet NSSegmentedControl* fTabs; InfoGeneralViewController* fGeneralViewController; InfoActivityViewController* fActivityViewController; diff --git a/macosx/InfoWindowController.mm b/macosx/InfoWindowController.mm index 00c0ee929..0fd360925 100644 --- a/macosx/InfoWindowController.mm +++ b/macosx/InfoWindowController.mm @@ -28,7 +28,7 @@ #import "InfoPeersViewController.h" #import "InfoFileViewController.h" #import "InfoOptionsViewController.h" -#import "InfoTabButtonCell.h" +#import "NSImageAdditions.h" #import "NSApplicationAdditions.h" #import "NSStringAdditions.h" #import "Torrent.h" @@ -91,12 +91,31 @@ typedef NS_ENUM(unsigned int, tabTag) { window.becomesKeyOnlyIfNeeded = YES; //set tab tooltips - [fTabMatrix setToolTip:NSLocalizedString(@"General Info", "Inspector -> tab") forCell:[fTabMatrix cellWithTag:TAB_GENERAL_TAG]]; - [fTabMatrix setToolTip:NSLocalizedString(@"Activity", "Inspector -> tab") forCell:[fTabMatrix cellWithTag:TAB_ACTIVITY_TAG]]; - [fTabMatrix setToolTip:NSLocalizedString(@"Trackers", "Inspector -> tab") forCell:[fTabMatrix cellWithTag:TAB_TRACKERS_TAG]]; - [fTabMatrix setToolTip:NSLocalizedString(@"Peers", "Inspector -> tab") forCell:[fTabMatrix cellWithTag:TAB_PEERS_TAG]]; - [fTabMatrix setToolTip:NSLocalizedString(@"Files", "Inspector -> tab") forCell:[fTabMatrix cellWithTag:TAB_FILE_TAG]]; - [fTabMatrix setToolTip:NSLocalizedString(@"Options", "Inspector -> tab") forCell:[fTabMatrix cellWithTag:TAB_OPTIONS_TAG]]; + [fTabs.cell setToolTip:NSLocalizedString(@"General Info", "Inspector -> tab") forSegment:TAB_GENERAL_TAG]; + [fTabs.cell setToolTip:NSLocalizedString(@"Activity", "Inspector -> tab") forSegment:TAB_ACTIVITY_TAG]; + [fTabs.cell setToolTip:NSLocalizedString(@"Trackers", "Inspector -> tab") forSegment:TAB_TRACKERS_TAG]; + [fTabs.cell setToolTip:NSLocalizedString(@"Peers", "Inspector -> tab") forSegment:TAB_PEERS_TAG]; + [fTabs.cell setToolTip:NSLocalizedString(@"Files", "Inspector -> tab") forSegment:TAB_FILE_TAG]; + [fTabs.cell setToolTip:NSLocalizedString(@"Options", "Inspector -> tab") forSegment:TAB_OPTIONS_TAG]; + + [fTabs setImage:[NSImage systemSymbol:@"info.circle" + withFallback:@"InfoGeneral"] + forSegment:TAB_GENERAL_TAG]; + [fTabs setImage:[NSImage systemSymbol:@"square.grid.3x3.square" + withFallback:@"InfoActivity"] + forSegment:TAB_ACTIVITY_TAG]; + [fTabs setImage:[NSImage systemSymbol:@"antenna.radiowaves.left.and.right" + withFallback:@"InfoTracker"] + forSegment:TAB_TRACKERS_TAG]; + [fTabs setImage:[NSImage systemSymbol:@"person.2" + withFallback:@"InfoPeers"] + forSegment:TAB_PEERS_TAG]; + [fTabs setImage:[NSImage systemSymbol:@"doc.on.doc" + withFallback:@"InfoFiles"] + forSegment:TAB_FILE_TAG]; + [fTabs setImage:[NSImage systemSymbol:@"gearshape" + withFallback:@"InfoOptions"] + forSegment:TAB_OPTIONS_TAG]; //set selected tab fCurrentTabTag = INVALID; @@ -131,7 +150,11 @@ typedef NS_ENUM(unsigned int, tabTag) { [NSUserDefaults.standardUserDefaults setObject:TAB_INFO_IDENT forKey:@"InspectorSelected"]; tag = TAB_GENERAL_TAG; } - [fTabMatrix selectCellWithTag:tag]; + + fTabs.target = self; + fTabs.action = @selector(setTab:); + + fTabs.selectedSegment = tag; [self setTab:nil]; //set blank inspector @@ -184,7 +207,7 @@ typedef NS_ENUM(unsigned int, tabTag) { - (void)setTab:(id)sender { NSInteger const oldTabTag = fCurrentTabTag; - fCurrentTabTag = [fTabMatrix selectedTag]; + fCurrentTabTag = fTabs.selectedTag; if (fCurrentTabTag == oldTabTag) { return; @@ -194,9 +217,6 @@ typedef NS_ENUM(unsigned int, tabTag) { CGFloat oldHeight = 0; if (oldTabTag != INVALID) { - //deselect old tab item - [(InfoTabButtonCell*)[fTabMatrix cellWithTag:oldTabTag] setSelectedTab:NO]; - if ([fViewController respondsToSelector:@selector(saveViewSize)]) { [fViewController saveViewSize]; @@ -290,9 +310,6 @@ typedef NS_ENUM(unsigned int, tabTag) { window.title = [NSString stringWithFormat:@"%@ - %@", fViewController.title, NSLocalizedString(@"Torrent Inspector", "Inspector -> title")]; - //selected tab item - [(InfoTabButtonCell*)fTabMatrix.selectedCell setSelectedTab:YES]; - NSView* view = fViewController.view; [fViewController updateInfo]; @@ -340,7 +357,7 @@ typedef NS_ENUM(unsigned int, tabTag) { views:@{ @"view" : view }]]; [window.contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[tabs]-0-[view]-0-|" options:0 metrics:nil - views:@{ @"tabs" : fTabMatrix, @"view" : view }]]; + views:@{ @"tabs" : fTabs, @"view" : view }]]; if ((fCurrentTabTag == TAB_FILE_TAG || oldTabTag == TAB_FILE_TAG) && ([QLPreviewPanel sharedPreviewPanelExists] && [QLPreviewPanel sharedPreviewPanel].visible)) @@ -351,25 +368,25 @@ typedef NS_ENUM(unsigned int, tabTag) { - (void)setNextTab { - NSInteger tag = [fTabMatrix selectedTag] + 1; - if (tag >= fTabMatrix.numberOfColumns) + NSInteger tag = fTabs.selectedSegment + 1; + if (tag >= fTabs.segmentCount) { tag = 0; } - [fTabMatrix selectCellWithTag:tag]; + fTabs.selectedSegment = tag; [self setTab:nil]; } - (void)setPreviousTab { - NSInteger tag = [fTabMatrix selectedTag] - 1; + NSInteger tag = fTabs.selectedSegment - 1; if (tag < 0) { - tag = fTabMatrix.numberOfColumns - 1; + tag = fTabs.segmentCount - 1; } - [fTabMatrix selectCellWithTag:tag]; + fTabs.selectedSegment = tag; [self setTab:nil]; } diff --git a/macosx/NSImageAdditions.h b/macosx/NSImageAdditions.h index 284dd878c..864157ada 100644 --- a/macosx/NSImageAdditions.h +++ b/macosx/NSImageAdditions.h @@ -26,4 +26,6 @@ - (NSImage*)imageWithColor:(NSColor*)color; ++ (NSImage*)systemSymbol:(NSString*)symbolName withFallback:(NSString*)fallbackName; + @end diff --git a/macosx/NSImageAdditions.mm b/macosx/NSImageAdditions.mm index 03d32b7d6..8ef6005b4 100644 --- a/macosx/NSImageAdditions.mm +++ b/macosx/NSImageAdditions.mm @@ -40,4 +40,14 @@ return coloredImage; } ++ (NSImage*)systemSymbol:(NSString*)symbolName withFallback:(NSString*)fallbackName +{ + if (@available(macOS 11.0, *)) + { + return [NSImage imageWithSystemSymbolName:symbolName accessibilityDescription:nil]; + } + + return [NSImage imageNamed:fallbackName]; +} + @end diff --git a/macosx/TrackerCell.mm b/macosx/TrackerCell.mm index eb12f219f..ccb9d7b1f 100644 --- a/macosx/TrackerCell.mm +++ b/macosx/TrackerCell.mm @@ -209,7 +209,22 @@ NSMutableSet* fTrackerIconLoading; } } - return (icon && icon != [NSNull null]) ? icon : [NSImage imageNamed:@"FavIcon"]; + if ((icon && icon != [NSNull null])) + { + return icon; + } + + if (@available(macOS 11.0, *)) { + NSImage* result = [NSImage imageWithSystemSymbolName:@"globe" accessibilityDescription:nil]; + [result lockFocus]; + [NSColor.textColor set]; + NSRect imageRect = {NSZeroPoint, [result size]}; + NSRectFillUsingOperation(imageRect, NSCompositingOperationSourceIn); + [result unlockFocus]; + return result; + } + + return [NSImage imageNamed:@"FavIcon"]; } #warning better favicon detection diff --git a/macosx/da.lproj/InfoOptionsView.xib b/macosx/da.lproj/InfoOptionsView.xib index a8d452dc1..2f92da61c 100644 --- a/macosx/da.lproj/InfoOptionsView.xib +++ b/macosx/da.lproj/InfoOptionsView.xib @@ -1,8 +1,8 @@ - + - + @@ -40,11 +40,11 @@ - + - + @@ -61,7 +61,7 @@ - - + + - - + + @@ -121,7 +121,7 @@ - + @@ -129,32 +129,32 @@ - - + + - - + + - - + + - - + + @@ -162,7 +162,7 @@ - + @@ -178,40 +178,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -223,7 +223,7 @@ - + @@ -231,16 +231,16 @@ - - + + - - + + @@ -249,7 +249,7 @@ - + @@ -257,32 +257,32 @@ - - + + - - + + - - + + - - + + @@ -294,7 +294,7 @@ - + @@ -302,8 +302,8 @@ - - + + @@ -311,7 +311,7 @@ - + @@ -327,15 +327,15 @@ - - + + - + diff --git a/macosx/de.lproj/InfoOptionsView.xib b/macosx/de.lproj/InfoOptionsView.xib index 732b057ef..f6c7c1f27 100644 --- a/macosx/de.lproj/InfoOptionsView.xib +++ b/macosx/de.lproj/InfoOptionsView.xib @@ -1,8 +1,8 @@ - + - + @@ -40,11 +40,11 @@ - + - + @@ -61,7 +61,7 @@ - - + + - - + + @@ -121,7 +121,7 @@ - + @@ -129,32 +129,32 @@ - - + + - - + + - - + + - - + + @@ -162,7 +162,7 @@ - + @@ -178,40 +178,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -223,7 +223,7 @@ - + @@ -231,16 +231,16 @@ - - + + - - + + @@ -249,7 +249,7 @@ - + @@ -257,32 +257,32 @@ - - + + - - + + - - + + - - + + @@ -294,7 +294,7 @@ - + @@ -302,8 +302,8 @@ - - + + @@ -311,7 +311,7 @@ - + @@ -327,15 +327,15 @@ - - + + - + @@ -434,7 +434,7 @@ - + diff --git a/macosx/en.lproj/InfoOptionsView.xib b/macosx/en.lproj/InfoOptionsView.xib index d242b7c9d..020e31c26 100644 --- a/macosx/en.lproj/InfoOptionsView.xib +++ b/macosx/en.lproj/InfoOptionsView.xib @@ -1,8 +1,8 @@ - + - + @@ -40,11 +40,11 @@ - + - + @@ -61,7 +61,7 @@ - - + + - - + + @@ -121,7 +121,7 @@ - + @@ -129,32 +129,32 @@ - - + + - - + + - - + + - - + + @@ -162,7 +162,7 @@ - + @@ -178,40 +178,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -223,7 +223,7 @@ - + @@ -231,16 +231,16 @@ - - + + - - + + @@ -249,7 +249,7 @@ - + @@ -257,32 +257,32 @@ - - + + - - + + - - + + - - + + @@ -294,7 +294,7 @@ - + @@ -302,8 +302,8 @@ - - + + @@ -311,7 +311,7 @@ - + @@ -327,15 +327,15 @@ - - + + - + @@ -434,7 +434,7 @@ - + diff --git a/macosx/es.lproj/InfoOptionsView.xib b/macosx/es.lproj/InfoOptionsView.xib index 4e20944ac..dcbd05589 100644 --- a/macosx/es.lproj/InfoOptionsView.xib +++ b/macosx/es.lproj/InfoOptionsView.xib @@ -1,8 +1,8 @@ - + - + @@ -40,11 +40,11 @@ - + - + @@ -61,7 +61,7 @@ - - + + - - + + @@ -121,7 +121,7 @@ - + @@ -129,32 +129,32 @@ - - + + - - + + - - + + - - + + @@ -162,7 +162,7 @@ - + @@ -178,40 +178,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -223,7 +223,7 @@ - + @@ -231,16 +231,16 @@ - - + + - - + + @@ -249,7 +249,7 @@ - + @@ -257,32 +257,32 @@ - - + + - - + + - - + + - - + + @@ -294,7 +294,7 @@ - + @@ -302,8 +302,8 @@ - - + + @@ -311,7 +311,7 @@ - + @@ -327,15 +327,15 @@ - - + + - + @@ -434,7 +434,7 @@ - + diff --git a/macosx/fr.lproj/InfoOptionsView.xib b/macosx/fr.lproj/InfoOptionsView.xib index 1eae37eff..a0bd9548c 100644 --- a/macosx/fr.lproj/InfoOptionsView.xib +++ b/macosx/fr.lproj/InfoOptionsView.xib @@ -1,8 +1,8 @@ - + - + @@ -40,11 +40,11 @@ - + - + @@ -61,7 +61,7 @@ - - + + - - + + @@ -121,7 +121,7 @@ - + @@ -129,32 +129,32 @@ - - + + - - + + - - + + - - + + @@ -162,7 +162,7 @@ - + @@ -178,40 +178,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -223,7 +223,7 @@ - + @@ -231,16 +231,16 @@ - - + + - - + + @@ -249,7 +249,7 @@ - + @@ -257,32 +257,32 @@ - - + + - - + + - - + + - - + + @@ -294,7 +294,7 @@ - + @@ -302,8 +302,8 @@ - - + + @@ -311,7 +311,7 @@ - + @@ -327,15 +327,15 @@ - - + + - + diff --git a/macosx/it.lproj/InfoOptionsView.xib b/macosx/it.lproj/InfoOptionsView.xib index 32e52c1b1..d3744d767 100644 --- a/macosx/it.lproj/InfoOptionsView.xib +++ b/macosx/it.lproj/InfoOptionsView.xib @@ -1,8 +1,8 @@ - + - + @@ -40,11 +40,11 @@ - + - + @@ -61,7 +61,7 @@ - - + + - - + + @@ -121,7 +121,7 @@ - + @@ -129,32 +129,32 @@ - - + + - - + + - - + + - - + + @@ -162,7 +162,7 @@ - + @@ -178,40 +178,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -223,7 +223,7 @@ - + @@ -231,16 +231,16 @@ - - + + - - + + @@ -249,7 +249,7 @@ - + @@ -257,32 +257,32 @@ - - + + - - + + - - + + - - + + @@ -294,7 +294,7 @@ - + @@ -302,8 +302,8 @@ - - + + @@ -311,7 +311,7 @@ - + @@ -327,15 +327,15 @@ - - + + - + @@ -434,7 +434,7 @@ - + diff --git a/macosx/nl.lproj/InfoOptionsView.xib b/macosx/nl.lproj/InfoOptionsView.xib index a04fe0d3c..91844069a 100644 --- a/macosx/nl.lproj/InfoOptionsView.xib +++ b/macosx/nl.lproj/InfoOptionsView.xib @@ -1,8 +1,8 @@ - + - + @@ -40,11 +40,11 @@ - + - + @@ -61,7 +61,7 @@ - - + + - - + + @@ -121,7 +121,7 @@ - + @@ -129,32 +129,32 @@ - - + + - - + + - - + + - - + + @@ -162,7 +162,7 @@ - + @@ -178,40 +178,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -223,7 +223,7 @@ - + @@ -231,16 +231,16 @@ - - + + - - + + @@ -249,7 +249,7 @@ - + @@ -257,32 +257,32 @@ - - + + - - + + - - + + - - + + @@ -294,7 +294,7 @@ - + @@ -302,8 +302,8 @@ - - + + @@ -311,7 +311,7 @@ - + @@ -327,15 +327,15 @@ - - + + - + diff --git a/macosx/pt_PT.lproj/InfoOptionsView.xib b/macosx/pt_PT.lproj/InfoOptionsView.xib index 9d23a5fc6..524b122b0 100644 --- a/macosx/pt_PT.lproj/InfoOptionsView.xib +++ b/macosx/pt_PT.lproj/InfoOptionsView.xib @@ -1,8 +1,8 @@ - + - + @@ -40,11 +40,11 @@ - + - + @@ -61,7 +61,7 @@ - - + + - - + + @@ -121,7 +121,7 @@ - + @@ -129,32 +129,32 @@ - - + + - - + + - - + + - - + + @@ -162,7 +162,7 @@ - + @@ -178,40 +178,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -223,7 +223,7 @@ - + @@ -231,16 +231,16 @@ - - + + - - + + @@ -249,7 +249,7 @@ - + @@ -257,32 +257,32 @@ - - + + - - + + - - + + - - + + @@ -294,7 +294,7 @@ - + @@ -302,8 +302,8 @@ - - + + @@ -311,7 +311,7 @@ - + @@ -327,15 +327,15 @@ - - + + - + diff --git a/macosx/ru.lproj/InfoOptionsView.xib b/macosx/ru.lproj/InfoOptionsView.xib index 693040904..4190f931f 100644 --- a/macosx/ru.lproj/InfoOptionsView.xib +++ b/macosx/ru.lproj/InfoOptionsView.xib @@ -1,8 +1,8 @@ - + - + @@ -40,11 +40,11 @@ - + - + @@ -61,7 +61,7 @@ - - + + - - + + @@ -121,7 +121,7 @@ - + @@ -129,32 +129,32 @@ - - + + - - + + - - + + - - + + @@ -162,7 +162,7 @@ - + @@ -178,40 +178,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -223,7 +223,7 @@ - + @@ -231,16 +231,16 @@ - - + + - - + + @@ -249,7 +249,7 @@ - + @@ -257,32 +257,32 @@ - - + + - - + + - - + + - - + + @@ -294,7 +294,7 @@ - + @@ -302,8 +302,8 @@ - - + + @@ -311,7 +311,7 @@ - + @@ -327,15 +327,15 @@ - - + + - + @@ -434,7 +434,7 @@ - + diff --git a/macosx/tr.lproj/InfoOptionsView.xib b/macosx/tr.lproj/InfoOptionsView.xib index a331d8cb4..68dc08ac3 100644 --- a/macosx/tr.lproj/InfoOptionsView.xib +++ b/macosx/tr.lproj/InfoOptionsView.xib @@ -1,8 +1,8 @@ - + - + @@ -40,11 +40,11 @@ - + - + @@ -61,7 +61,7 @@ - - + + - - + + @@ -121,7 +121,7 @@ - + @@ -129,32 +129,32 @@ - - + + - - + + - - + + - - + + @@ -162,7 +162,7 @@ - + @@ -178,40 +178,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -223,7 +223,7 @@ - + @@ -231,16 +231,16 @@ - - + + - - + + @@ -249,7 +249,7 @@ - + @@ -257,32 +257,32 @@ - - + + - - + + - - + + - - + + @@ -294,7 +294,7 @@ - + @@ -302,8 +302,8 @@ - - + + @@ -311,7 +311,7 @@ - + @@ -327,15 +327,15 @@ - - + + - +