diff --git a/HiperStrings/Views/ZFFileExportCell.m b/HiperStrings/Views/ZFFileExportCell.m index 0924876..e73f16c 100644 --- a/HiperStrings/Views/ZFFileExportCell.m +++ b/HiperStrings/Views/ZFFileExportCell.m @@ -24,7 +24,7 @@ @implementation ZFFileExportCell - (void)awakeFromNib { [super awakeFromNib]; - NSRect rect = self.titleLbl.frame; + NSRect rect = self.detailLbl.frame; rect.size.width -= BTN_W; NSRect btnRect = NSMakeRect(rect.size.width, rect.origin.y, BTN_W, self.bounds.size.height); diff --git a/HiperStrings/Views/ZFFileViewCell.m b/HiperStrings/Views/ZFFileViewCell.m index 4c387df..59616a1 100644 --- a/HiperStrings/Views/ZFFileViewCell.m +++ b/HiperStrings/Views/ZFFileViewCell.m @@ -10,18 +10,42 @@ #import "ZFFileViewCell.h" +@interface ZFFileViewCell () + +@property (nonatomic, strong) NSImageView *iOSIcon; +@property (nonatomic, strong) NSImageView *androidIcon; + +@end + @implementation ZFFileViewCell - (void)awakeFromNib { [super awakeFromNib]; - NSRect frame = self.bounds; + CGRect labelFrame; + CGRect iconFrame; + CGRect frame = self.bounds; frame.size.height = ceil(frame.size.height /2); - self.titleLbl = [[NSTextField alloc] initWithFrame:frame]; - [self addSubview:self.titleLbl]; - frame.origin.y += frame.size.height; - self.detailLbl = [[NSTextField alloc] initWithFrame:frame]; + CGRectDivide(frame, &iconFrame, &labelFrame, 30, CGRectMinXEdge); + + self.detailLbl = [[NSTextField alloc] initWithFrame:labelFrame]; + [self.detailLbl setBordered:NO]; [self addSubview:self.detailLbl]; + + self.androidIcon = [[NSImageView alloc] initWithFrame:iconFrame]; + [self.androidIcon setImage:[NSImage imageNamed:@"android_icon"]]; + [self addSubview:self.androidIcon]; + + labelFrame.origin.y += labelFrame.size.height; + self.titleLbl = [[NSTextField alloc] initWithFrame:labelFrame]; + [self.titleLbl setBordered:NO]; + [self addSubview:self.titleLbl]; + + iconFrame.origin.y += iconFrame.size.height; + self.iOSIcon = [[NSImageView alloc] initWithFrame:iconFrame]; + [self.iOSIcon setImage:[NSImage imageNamed:@"iOS_icon"]]; + [self addSubview:self.iOSIcon]; + } @@ -29,11 +53,7 @@ - (void)setLangFile:(ZFTranslationFile *)langFile { _langFile = langFile; if (_langFile.iOSName.length > 0) [self.titleLbl setStringValue:_langFile.iOSName]; if (_langFile.androidName.length > 0) [self.detailLbl setStringValue:_langFile.androidName]; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - // Drawing code here. + [self setNeedsDisplay:YES]; } @end diff --git a/HiperStrings/en.lproj/MainMenu.xib b/HiperStrings/en.lproj/MainMenu.xib index 4233ba8..1205907 100644 --- a/HiperStrings/en.lproj/MainMenu.xib +++ b/HiperStrings/en.lproj/MainMenu.xib @@ -26,7 +26,6 @@ NSTableColumn NSTableHeaderView NSTableView - NSTextField NSTextFieldCell NSView NSWindowTemplate @@ -1331,7 +1330,7 @@ {269, 694} - + _NS:13 YES NO @@ -1407,7 +1406,7 @@ MC41AA - 52 + 60 -700448768 @@ -1429,7 +1428,7 @@ 6 System controlBackgroundColor - + 3 MC42NjY2NjY2NjY3AA @@ -1483,14 +1482,14 @@ {{-1, -11}, {271, 712}} - + _NS:9 133682 - QSAAAEEgAABCWAAAQlgAAA + QSAAAEEgAABCeAAAQngAAA 0.25 4 1 @@ -1509,7 +1508,7 @@ {721, 633} - + _NS:13 YES NO @@ -1642,6 +1641,7 @@ {{1, 119}, {223, 15}} + _NS:60 NO 1 @@ -1668,7 +1668,7 @@ {{278, -1}, {723, 651}} - + _NS:9 133682 @@ -1777,7 +1777,7 @@ {450, 312} - + _NS:13 YES NO @@ -1902,7 +1902,7 @@ {{-1, 49}, {452, 330}} - + _NS:9 133682 @@ -1945,6 +1945,7 @@ {{229, 7}, {213, 32}} + _NS:9 YES @@ -2744,45 +2745,6 @@ 719 - - - textField - - - 274 - - - - 266 - {{0, 18}, {266, 17}} - - - {250, 750} - YES - - 67108928 - 272631808 - Table View Cell - - - - 6 - System - controlColor - - - - - NO - - - {{1, 1}, {266, 52}} - - - - - 618 - dataSource @@ -2839,40 +2801,6 @@ 699 - - - textField - - - 274 - - - - 266 - {{0, 17}, {447, 17}} - - - {250, 750} - YES - - 67108928 - 272631808 - Table View Cell - - - - - - NO - - - {{1, 1}, {447, 50}} - - - - - 684 - exportAction: @@ -4141,7 +4069,13 @@ - + + + 274 + + {{1, 1}, {266, 60}} + + @@ -4168,87 +4102,9 @@ 615 - - - - - 5 - 0 - - 5 - 1 - - 3 - - 1000 - - 8 - 29 - 3 - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 5 - 22 - 2 - - - - 6 - 0 - - 6 - 1 - - 3 - - 1000 - - 8 - 29 - 3 - - + - - 616 - - - - - - - - 617 - - - - - 619 - - - - - 620 - - - - - 621 - - - 624 @@ -4553,7 +4409,13 @@ - + + + 274 + + {{1, 1}, {447, 50}} + + @@ -4570,87 +4432,9 @@ 681 - - - - - 6 - 0 - - 6 - 1 - - 3 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 3 - - 1000 - - 8 - 29 - 3 - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 5 - 22 - 2 - - + - - 682 - - - - - - - - 683 - - - - - 685 - - - - - 686 - - - - - 687 - - - 680 @@ -4959,19 +4743,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin ZFFileViewCell - - - - - com.apple.InterfaceBuilder.CocoaPlugin langCell - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5027,19 +4800,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin ZFFileExportCell - - - - - com.apple.InterfaceBuilder.CocoaPlugin langExportCell - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin