From 7c20e4773d3aefc8505b86846f5f7d28eb4150a0 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 17 Dec 2014 20:55:32 +0300 Subject: [PATCH 1/2] added photo switch by scroll gestures for os x in mediaview --- Telegram/SourceFiles/mediaview.cpp | 17 +++++++++++++++++ Telegram/SourceFiles/mediaview.h | 1 + .../src/plugins/platforms/cocoa/qnsview.mm | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index c8e19a2a17..2b679a3d51 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -1194,6 +1194,23 @@ bool MediaView::event(QEvent *e) { return true; } } + } else if (e->type() == QEvent::Wheel) { + QWheelEvent *ev = static_cast(e); + if (ev->phase() == Qt::ScrollBegin) { + _accumScroll = ev->angleDelta(); + LOG(("Scrolling begin: %1 sum %2").arg(ev->angleDelta().x()).arg(_accumScroll.x())); + } else { + _accumScroll += ev->angleDelta(); + if (ev->phase() == Qt::ScrollEnd) { + LOG(("Scrolling end: %1 sum %2").arg(ev->angleDelta().x()).arg(_accumScroll.x())); + if (ev->orientation() == Qt::Horizontal) { + if (_accumScroll.x() * _accumScroll.x() > _accumScroll.y() * _accumScroll.y() && _accumScroll.x() != 0) { + moveToPhoto(_accumScroll.x() > 0 ? -1 : 1); + } + _accumScroll = QPoint(); + } + } + } } return QWidget::event(e); } diff --git a/Telegram/SourceFiles/mediaview.h b/Telegram/SourceFiles/mediaview.h index 33d90fba68..41ac66f48a 100644 --- a/Telegram/SourceFiles/mediaview.h +++ b/Telegram/SourceFiles/mediaview.h @@ -135,6 +135,7 @@ private: bool _touchPress, _touchMove, _touchRightButton; QTimer _touchTimer; QPoint _touchStart; + QPoint _accumScroll; QString _saveMsgFilename; uint64 _saveMsgStarted; diff --git a/Telegram/_qt_5_3_1_patch/qtbase/src/plugins/platforms/cocoa/qnsview.mm b/Telegram/_qt_5_3_1_patch/qtbase/src/plugins/platforms/cocoa/qnsview.mm index 1d8787ce62..1ca8105a3f 100644 --- a/Telegram/_qt_5_3_1_patch/qtbase/src/plugins/platforms/cocoa/qnsview.mm +++ b/Telegram/_qt_5_3_1_patch/qtbase/src/plugins/platforms/cocoa/qnsview.mm @@ -1248,7 +1248,7 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent) #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 if (QSysInfo::QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) { // On 10.8 and above, MayBegin is likely to happen. We treat it the same as an actual begin. - if (phase == NSEventPhaseMayBegin) + if (phase == NSEventPhaseMayBegin || phase == NSEventPhaseBegan) ph = Qt::ScrollBegin; } else #endif From f6e15c1d37fd23161d89a88a2f297cc0adaee850 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 18 Dec 2014 23:15:58 +0300 Subject: [PATCH 2/2] fixed new langs for os x --- Telegram/SourceFiles/_other/genlang.cpp | 6 ++--- Telegram/SourceFiles/pspecific_mac_p.mm | 11 ++++----- Telegram/Telegram.xcodeproj/project.pbxproj | 26 ++++++++++++++------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Telegram/SourceFiles/_other/genlang.cpp b/Telegram/SourceFiles/_other/genlang.cpp index 64323e39aa..2400321651 100644 --- a/Telegram/SourceFiles/_other/genlang.cpp +++ b/Telegram/SourceFiles/_other/genlang.cpp @@ -173,7 +173,7 @@ void readKeyValue(const char *&from, const char *end) { i = tags.insert(tagName, tagsOrder.size()); tagsOrder.push_back(tagName); } - if (0x0020 + *i > 0x00F7) throw Exception(QString("Too many different tags in key '%1'").arg(QLatin1String(varName))); + if (0x0020 + *i > 0x007F) throw Exception(QString("Too many different tags in key '%1'").arg(QLatin1String(varName))); QString tagReplacer(4, TextCommand); tagReplacer[1] = TextCommandLangTag; @@ -266,7 +266,7 @@ QString escapeCpp(const QByteArray &key, QString value, bool wideChar) { res.reserve(value.size() * 10); bool instr = false; for (const QChar *ch = value.constData(), *e = value.constData() + value.size(); ch != e; ++ch) { - if (ch->unicode() > 0x00F7) { + if (ch->unicode() > 0x007F) { if (instr) { res.append('"'); instr = false; @@ -300,7 +300,7 @@ QString escapeCpp(const QByteArray &key, QString value, bool wideChar) { } } else if (ch->unicode() < 0x0020) { if (*ch == TextCommand) { - if (ch + 3 >= e || (ch + 1)->unicode() != TextCommandLangTag || (ch + 2)->unicode() > 0x00F7 || (ch + 2)->unicode() < 0x0020 || *(ch + 3) != TextCommand) { + if (ch + 3 >= e || (ch + 1)->unicode() != TextCommandLangTag || (ch + 2)->unicode() > 0x007F || (ch + 2)->unicode() < 0x0020 || *(ch + 3) != TextCommand) { throw Exception(QString("Bad value for key '%1'").arg(QLatin1String(key))); } else { res.append('\\').append('x').append(QString("%1").arg(ch->unicode(), 2, 16, QChar('0'))); diff --git a/Telegram/SourceFiles/pspecific_mac_p.mm b/Telegram/SourceFiles/pspecific_mac_p.mm index 6e0cd9ff0e..332d109504 100644 --- a/Telegram/SourceFiles/pspecific_mac_p.mm +++ b/Telegram/SourceFiles/pspecific_mac_p.mm @@ -70,9 +70,6 @@ private: QNSString objc_lang(LangKey key) { return QNSString(lang(key)); } -QNSString objc_lang(LangKey key, LangTag tag1, const QString &replacement1 { - return QNSString(lang(key, tag1, replacement1)); -} QString objcString(NSString *str) { return QString::fromUtf8([str cStringUsingEncoding:NSUTF8StringEncoding]); } @@ -532,7 +529,7 @@ void objc_openFile(const QString &f, bool openwith) { [button setFrame:alwaysRect]; [button setAutoresizingMask:NSViewMinXMargin|NSViewMaxXMargin]; NSTextField *goodLabel = [[NSTextField alloc] init]; - [goodLabel setStringValue:objc_lang(lng_mac_this_app_can_open, lngtag_file, objcString(name)).s()]; + [goodLabel setStringValue:QNSString(lng_mac_this_app_can_open(lt_file, objcString(name))).s()]; [goodLabel setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; [goodLabel setBezeled:NO]; [goodLabel setDrawsBackground:NO]; @@ -545,7 +542,7 @@ void objc_openFile(const QString &f, bool openwith) { [goodLabel setFrame:goodFrame]; NSTextField *badLabel = [[NSTextField alloc] init]; - [badLabel setStringValue:objc_lang(lng_mac_not_known_app, lngtag_file, objcString(name)).s()]; + [badLabel setStringValue:QNSString(lng_mac_not_known_app(lt_file, objcString(name))).s()]; [badLabel setFont:[goodLabel font]]; [badLabel setBezeled:NO]; [badLabel setDrawsBackground:NO]; @@ -575,7 +572,7 @@ void objc_openFile(const QString &f, bool openwith) { [openPanel setAllowsMultipleSelection:NO]; [openPanel setResolvesAliases:YES]; [openPanel setTitle:objc_lang(lng_mac_choose_app).s()]; - [openPanel setMessage:objc_lang(lng_mac_choose_text, lngtag_file, objcString(name)).s()]; + [openPanel setMessage:QNSString(lng_mac_choose_text(lt_file, objcString(name))).s()]; NSArray *appsPaths = [[NSFileManager defaultManager] URLsForDirectory:NSApplicationDirectory inDomains:NSLocalDomainMask]; if ([appsPaths count]) [openPanel setDirectoryURL:[appsPaths firstObject]]; @@ -655,7 +652,7 @@ BOOL _execUpdater(BOOL update = YES) { [args addObject:QNSString(cDataFile()).s()]; } - DEBUG_LOG(("Application Info: executing %1 %2").arg(objcString(path)).arg(objcString([[args componentsJoinedByString:@" "]))); + DEBUG_LOG(("Application Info: executing %1 %2").arg(objcString(path)).arg(objcString([args componentsJoinedByString:@" "]))); if (![NSTask launchedTaskWithLaunchPath:path arguments:args]) { LOG(("Task not launched while executing %1 %2").arg(objcString(path)).arg(objcString([args componentsJoinedByString:@" "]))); return NO; diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index d640872587..3d29ad9cee 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -38,6 +38,9 @@ 02F93BF511880983D3C57B84 /* dialogswidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = E466873F01ABA1E55E914489 /* dialogswidget.cpp */; settings = {ATTRIBUTES = (); }; }; 03270F718426CFE84729079E /* flattextarea.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 5C7FD422BBEDA858D7237AE9 /* flattextarea.cpp */; settings = {ATTRIBUTES = (); }; }; 06EABCC49D2EEE4076322BE7 /* moc_mtp.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 924D4939FD169BB4B8AEB1C9 /* moc_mtp.cpp */; settings = {ATTRIBUTES = (); }; }; + 07080BCC1A4357F300741A51 /* lang.strings in Resources */ = {isa = PBXBuildFile; fileRef = 07080BCB1A4357F300741A51 /* lang.strings */; }; + 07080BCF1A43588C00741A51 /* lang_auto.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07080BCD1A43588C00741A51 /* lang_auto.cpp */; }; + 07080BD21A436A5000741A51 /* lang.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07080BD01A436A5000741A51 /* lang.cpp */; }; 0732E4A9199E262300D50FE7 /* overviewwidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0732E4A7199E262300D50FE7 /* overviewwidget.cpp */; }; 0732E4AC199E268A00D50FE7 /* moc_overviewwidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0732E4AB199E268A00D50FE7 /* moc_overviewwidget.cpp */; }; 074756191A1372C600CA07F7 /* moc_types.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 074756181A1372C600CA07F7 /* moc_types.cpp */; }; @@ -208,7 +211,6 @@ F4D3747C3A03B25EDC9057BB /* qwebp in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = ADC6308023253CEA51F86E21 /* qwebp */; }; F8B465CE34D8DF87AAE95913 /* CoreFoundation.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 4D765E1B1EA6C757220C63E7 /* CoreFoundation.framework */; }; F8ED42CF8679BF83227DAFC4 /* Carbon.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 9DFF62A901D70814B8A323D4 /* Carbon.framework */; }; - F91C59BECCE70070B06E8385 /* lang.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 4B6C62A2448B708B3FF40411 /* lang.cpp */; settings = {ATTRIBUTES = (); }; }; FA603B17F803E8D6B55C2F2B /* pspecific_mac_p.mm in Compile Sources */ = {isa = PBXBuildFile; fileRef = 73737DC91E390C4AB18FB595 /* pspecific_mac_p.mm */; settings = {ATTRIBUTES = (); }; }; FBD56E2AC34F76BFFDB68619 /* qmng in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 83D37373949868693FB7816D /* qmng */; }; FCC949FEA178F9F5D7478027 /* moc_flattextarea.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = D12A6BD8EE80B8B308E481AD /* moc_flattextarea.cpp */; settings = {ATTRIBUTES = (); }; }; @@ -248,6 +250,11 @@ 060A694B42A4555240009936 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri"; sourceTree = ""; }; 06E379415713F34B83F99C35 /* app.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = app.cpp; path = SourceFiles/app.cpp; sourceTree = ""; }; 07055CC3194EE85B0008DEF6 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "./../../Libraries/openssl-xcode/libcrypto.a"; sourceTree = ""; }; + 07080BCB1A4357F300741A51 /* lang.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang.strings; path = Resources/lang.strings; sourceTree = SOURCE_ROOT; }; + 07080BCD1A43588C00741A51 /* lang_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lang_auto.cpp; path = GeneratedFiles/lang_auto.cpp; sourceTree = SOURCE_ROOT; }; + 07080BCE1A43588C00741A51 /* lang_auto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lang_auto.h; path = GeneratedFiles/lang_auto.h; sourceTree = SOURCE_ROOT; }; + 07080BD01A436A5000741A51 /* lang.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lang.cpp; path = SourceFiles/lang.cpp; sourceTree = SOURCE_ROOT; }; + 07080BD11A436A5000741A51 /* lang.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lang.h; path = SourceFiles/lang.h; sourceTree = SOURCE_ROOT; }; 07084684195445A600B5AE3A /* Updater.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = Updater.xcodeproj; sourceTree = SOURCE_ROOT; }; 0732E4A7199E262300D50FE7 /* overviewwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = overviewwidget.cpp; path = SourceFiles/overviewwidget.cpp; sourceTree = SOURCE_ROOT; }; 0732E4A8199E262300D50FE7 /* overviewwidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overviewwidget.h; path = SourceFiles/overviewwidget.h; sourceTree = SOURCE_ROOT; }; @@ -267,7 +274,6 @@ 07BE85111A20961F008ACB9F /* moc_localstorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_localstorage.cpp; path = GeneratedFiles/Debug/moc_localstorage.cpp; sourceTree = SOURCE_ROOT; }; 07C3AF24194335ED0016CFF1 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Telegram/Images.xcassets; sourceTree = SOURCE_ROOT; }; 07C3AF27194336B90016CFF1 /* pspecific_mac_p.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pspecific_mac_p.h; path = SourceFiles/pspecific_mac_p.h; sourceTree = SOURCE_ROOT; }; - 07C3AF2819433ABF0016CFF1 /* lang.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = lang.txt; path = Resources/lang.txt; sourceTree = SOURCE_ROOT; }; 07C3AF2919433ABF0016CFF1 /* style_classes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = style_classes.txt; path = Resources/style_classes.txt; sourceTree = SOURCE_ROOT; }; 07C3AF2A19433ABF0016CFF1 /* style.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = style.txt; path = Resources/style.txt; sourceTree = SOURCE_ROOT; }; 07C475391967DF1C00CAAFE9 /* switcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = switcher.cpp; path = SourceFiles/gui/switcher.cpp; sourceTree = SOURCE_ROOT; }; @@ -369,7 +375,6 @@ 4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "/usr/local/Qt-5.3.1/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = ""; }; 48003469151B9DDE82E851FB /* moc_profilewidget.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_profilewidget.cpp; path = GeneratedFiles/Debug/moc_profilewidget.cpp; sourceTree = ""; }; 4AF15B5A0A43EB62D6DAF211 /* libexif.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexif.a; path = "../../Libraries/libexif-0.6.20/libexif/.libs/libexif.a"; sourceTree = ""; }; - 4B6C62A2448B708B3FF40411 /* lang.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lang.cpp; path = GeneratedFiles/lang.cpp; sourceTree = ""; }; 4C6C71914B1926119120DACD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri"; sourceTree = ""; }; 4D1099F2D3696E8A0E17D37D /* mtpSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mtpSession.h; path = SourceFiles/mtproto/mtpSession.h; sourceTree = ""; }; 4D504A849F15EB58E53A4E5F /* title.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = title.h; path = SourceFiles/title.h; sourceTree = ""; }; @@ -601,7 +606,6 @@ E432DA897A5F027987342E8F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri"; sourceTree = ""; }; E466873F01ABA1E55E914489 /* dialogswidget.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dialogswidget.cpp; path = SourceFiles/dialogswidget.cpp; sourceTree = ""; }; E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri"; sourceTree = ""; }; - E55D7EB1AAD7FB1CA69BA9E4 /* lang.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = lang.h; path = GeneratedFiles/lang.h; sourceTree = ""; }; E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri"; sourceTree = ""; }; E7B2F248E3F7970788F35BF5 /* Qt5PlatformSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PlatformSupport; path = "/usr/local/Qt-5.3.1/lib/libQt5PlatformSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = ""; }; E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri"; sourceTree = ""; }; @@ -708,9 +712,9 @@ 130BDDB6FC4D60CF394D95AF /* GeneratedFiles */ = { isa = PBXGroup; children = ( - 4B6C62A2448B708B3FF40411 /* lang.cpp */, + 07080BCD1A43588C00741A51 /* lang_auto.cpp */, + 07080BCE1A43588C00741A51 /* lang_auto.h */, 99B8D38F7F5858601230911E /* style_auto.cpp */, - E55D7EB1AAD7FB1CA69BA9E4 /* lang.h */, 9EFD7CB36012BFC00CC79434 /* style_auto.h */, 39C1ADF085370E033CB7E7E1 /* style_classes.h */, ); @@ -852,6 +856,7 @@ 9B36BB8C5B8CA7B07F3F35F0 /* fileuploader.cpp */, 26B83A58EE268598E703875D /* history.cpp */, A83D2C19F756D3371E5999A8 /* historywidget.cpp */, + 07080BD01A436A5000741A51 /* lang.cpp */, AF5776B0652744978B7DF6D3 /* langloaderplain.cpp */, 5A9B4C6C59856143F3D0DE53 /* layerwidget.cpp */, 07A69330199277BA0099CB9F /* mediaview.cpp */, @@ -885,6 +890,7 @@ 8A9D926C08392F7A9BC83B0C /* fileuploader.h */, CF1690B68F3B278E78823DB9 /* history.h */, C63C6D083EBEB13A60256DF3 /* historywidget.h */, + 07080BD11A436A5000741A51 /* lang.h */, 25CA12A22B83B0B038C5B5DE /* langloaderplain.h */, 6C86B6E6AB1857B735B720D6 /* layerwidget.h */, 07A69331199277BA0099CB9F /* mediaview.h */, @@ -1105,7 +1111,7 @@ 87DF60DE337FB58864343E39 /* Resources */ = { isa = PBXGroup; children = ( - 07C3AF2819433ABF0016CFF1 /* lang.txt */, + 07080BCB1A4357F300741A51 /* lang.strings */, 07C3AF2919433ABF0016CFF1 /* style_classes.txt */, 07C3AF2A19433ABF0016CFF1 /* style.txt */, 07C3AF24194335ED0016CFF1 /* Images.xcassets */, @@ -1313,6 +1319,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 07080BCC1A4357F300741A51 /* lang.strings in Resources */, 0749CE69194D723400345D61 /* Images.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1402,7 +1409,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "open ../Mac/DebugLang/MetaLang.app --args -lang_in \"../../Telegram/Resources/lang.txt\" -lang_out \"../../Telegram/GeneratedFiles/lang\""; + shellScript = "open ../Mac/DebugLang/MetaLang.app --args -lang_in \"../../Telegram/Resources/lang.strings\" -lang_out \"../../Telegram/GeneratedFiles/lang_auto\""; }; 7EF0942E79C014DCEC8976BC /* Qt Preprocessors */ = { isa = PBXShellScriptBuildPhase; @@ -1472,7 +1479,6 @@ 074FCB8E19D36851004C6EB2 /* contextmenu.cpp in Compile Sources */, 3AA6E7264581F82856FB37F7 /* text.cpp in Compile Sources */, FCE6518C548DF7BC82228A4A /* twidget.cpp in Compile Sources */, - F91C59BECCE70070B06E8385 /* lang.cpp in Compile Sources */, E9F1CE7F9B18C7C85A50E62D /* style_auto.cpp in Compile Sources */, EBE29731916DB43BF49FE7A4 /* aboutbox.cpp in Compile Sources */, 4426AF526AAD86D6F73CE36F /* addcontactbox.cpp in Compile Sources */, @@ -1515,6 +1521,7 @@ 06EABCC49D2EEE4076322BE7 /* moc_mtp.cpp in Compile Sources */, 8F6F5D7F82036331E8C6DAE6 /* moc_mtpConnection.cpp in Compile Sources */, B780F9E21269259B90A1F32A /* moc_mtpDC.cpp in Compile Sources */, + 07080BCF1A43588C00741A51 /* lang_auto.cpp in Compile Sources */, 07539B1D1A1416AF00083EFC /* moc_history.cpp in Compile Sources */, 2A500B102B7CE80F3EB6E13E /* moc_mtpFileLoader.cpp in Compile Sources */, 07A6933519927B160099CB9F /* moc_mediaview.cpp in Compile Sources */, @@ -1552,6 +1559,7 @@ 2EF5D0AC9A18F9FE9B8A1ACA /* moc_introsignup.cpp in Compile Sources */, 8C4BA0DB55E2C40DE5F5E990 /* moc_pspecific_mac.cpp in Compile Sources */, FA603B17F803E8D6B55C2F2B /* pspecific_mac_p.mm in Compile Sources */, + 07080BD21A436A5000741A51 /* lang.cpp in Compile Sources */, ); name = "Compile Sources"; runOnlyForDeploymentPostprocessing = 0;