From 2c51955b0c35d180be9803fa747b9471f8cf6067 Mon Sep 17 00:00:00 2001
From: Alexander Yakubchik <buddax2@gmail.com>
Date: Thu, 2 Oct 2014 22:23:14 +0300
Subject: [PATCH 1/3] fixes a typo in Settings window

---
 TelegramTest/SettingsWindowController.xib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TelegramTest/SettingsWindowController.xib b/TelegramTest/SettingsWindowController.xib
index 6ffe7768..5cc447e3 100644
--- a/TelegramTest/SettingsWindowController.xib
+++ b/TelegramTest/SettingsWindowController.xib
@@ -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"/>

From c493a6d2685b7859fc388ea15b5fa80c227a06c7 Mon Sep 17 00:00:00 2001
From: Alexander Yakubchik <buddax2@gmail.com>
Date: Fri, 3 Oct 2014 10:20:49 +0300
Subject: [PATCH 2/3] fixes a typo in the Settings window

---
 TelegramTest/de.lproj/Localizable.strings | Bin 38924 -> 38924 bytes
 TelegramTest/en.lproj/Localizable.strings | Bin 38926 -> 38926 bytes
 TelegramTest/ru.lproj/Localizable.strings | Bin 39278 -> 39278 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/TelegramTest/de.lproj/Localizable.strings b/TelegramTest/de.lproj/Localizable.strings
index 51c771113cd119b45a9928319bef13ca5cd9a20a..50ca6e154c067c7d909d7fd29d08f92a0de981e7 100644
GIT binary patch
delta 20
bcmeC#z|^yWX~UgL)?|iMhJwuxE4AeSS=k5`

delta 20
bcmeC#z|^yWX~UgL)&ho9hUCo;E4AeSS`7#l

diff --git a/TelegramTest/en.lproj/Localizable.strings b/TelegramTest/en.lproj/Localizable.strings
index 51b1844e51facf8d770775dd0148355f9fc06d20..b77f2d5b20f06eff615525ff9e57291d6857463e 100644
GIT binary patch
delta 20
bcmeC%z|^;aX~UgL)?|iMhJwuxD|O`nS|<n_

delta 20
bcmeC%z|^;aX~UgL)&ho9hUCo;D|O`nT3ZMk

diff --git a/TelegramTest/ru.lproj/Localizable.strings b/TelegramTest/ru.lproj/Localizable.strings
index 206fe7e41cd0a95d8b5213f310b6132c12feb2ef..7de35646ae1d8c6e97647568a67ce5b6d4ae57c0 100644
GIT binary patch
delta 20
bcmaF2iRs-YrVScZtjP?i3<aBYs~qJ4T#*Nk

delta 20
bcmaF2iRs-YrVScZtOX3I49S~ys~qJ4T*U{D


From 3007c4ef6219396c83449a82e775e6ce3e0c439c Mon Sep 17 00:00:00 2001
From: Alexander Yakubchik <buddax2@gmail.com>
Date: Fri, 3 Oct 2014 12:15:38 +0300
Subject: [PATCH 3/3] show short unread count

---
 TelegramTest/DialogTableItemView.m | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/TelegramTest/DialogTableItemView.m b/TelegramTest/DialogTableItemView.m
index c897ca6b..385713fc 100644
--- a/TelegramTest/DialogTableItemView.m
+++ b/TelegramTest/DialogTableItemView.m
@@ -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];
 }
 
@@ -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];
@@ -365,7 +366,8 @@ - (void)drawUnreadCount {
         [NSColorFromRGB(0xffffff) set];
 
     } else {
-        [NSColorFromRGB(0x60b8ea) set];
+//        [NSColorFromRGB(0x60b8ea) set];
+        [NSColorFromRGB(0xf73B39) set];
     }
     [path fill];
     [path closePath];
@@ -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];