Skip to content

fixes a typo in the Settings window #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fixes a typo in the Settings window #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c51955
fixes a typo in Settings window
buddax2 Oct 2, 2014
c493a6d
fixes a typo in the Settings window
buddax2 Oct 3, 2014
3007c4e
show short unread count
buddax2 Oct 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions TelegramTest/DialogTableItemView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ - (void)draw {
NSSize size = self.undreadSize;

float width = MAX(22, size.width + 14);
[self setFrame:NSMakeRect(62 - width, 6, width, 22)];
[self setFrame:NSMakeRect(62 - width, 40, width, 22)];
[self setNeedsDisplay:YES];
}

Expand All @@ -71,7 +71,8 @@ - (void)drawRect:(NSRect)dirtyRect {
[[NSColor whiteColor] setStroke];
[path stroke];

[NSColorFromRGB(0x60b8ea) setFill];
// [NSColorFromRGB(0x60b8ea) setFill];
[NSColorFromRGB(0xf73B39) setFill];
[path fill];

[[NSColor whiteColor] set];
Expand Down Expand Up @@ -365,7 +366,8 @@ - (void)drawUnreadCount {
[NSColorFromRGB(0xffffff) set];

} else {
[NSColorFromRGB(0x60b8ea) set];
// [NSColorFromRGB(0x60b8ea) set];
[NSColorFromRGB(0xf73B39) set];
}
[path fill];
[path closePath];
Expand Down Expand Up @@ -408,7 +410,7 @@ - (void)setItem:(id)item selected:(BOOL)isSelected {
- (void)redrawRow {
[super redrawRow];

// [self.shortUnreadCount draw];
self.shortUnreadCount.unreadCount = [self rowItem].unreadTextCount;

DialogTableItem *item = [self rowItem];

Expand Down
2 changes: 1 addition & 1 deletion TelegramTest/SettingsWindowController.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<textField appearanceType="aqua" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" id="B2E-J8-GiB">
<rect key="frame" x="237" y="44" width="298" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Logs out all devices expect for the current one" id="0pP-3M-fyL">
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Logs out all devices except for the current one" id="0pP-3M-fyL">
<font key="font" metaFont="system"/>
<color key="textColor" white="0.54790145990000005" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
Expand Down
Binary file modified TelegramTest/de.lproj/Localizable.strings
View file
Open in desktop
Binary file not shown.
Binary file modified TelegramTest/en.lproj/Localizable.strings
View file
Open in desktop
Binary file not shown.
Binary file modified TelegramTest/ru.lproj/Localizable.strings
View file
Open in desktop
Binary file not shown.