Finalize rename / move of files.

Telegram/Resources/qrc/telegram.qrc

@@ -1,24 +1,24 @@
 <RCC>
   <qresource prefix="/gui">
-    <file>art/fonts/OpenSans-Regular.ttf</file>
+    <file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file>
-    <file>art/fonts/OpenSans-Bold.ttf</file>
+    <file alias="fonts/OpenSans-Bold.ttf">../fonts/OpenSans-Bold.ttf</file>
-    <file>art/fonts/OpenSans-Semibold.ttf</file>
+    <file alias="fonts/OpenSans-Semibold.ttf">../fonts/OpenSans-Semibold.ttf</file>
-    <file>art/newmsg.wav</file>
+    <file alias="art/newmsg.wav">../art/newmsg.wav</file>
-    <file>art/bg.jpg</file>
+    <file alias="art/bg.jpg">../art/bg.jpg</file>
-    <file>art/bg_initial.jpg</file>
+    <file alias="art/bg_initial.jpg">../art/bg_initial.jpg</file>
-    <file>art/icon256.png</file>
+    <file alias="art/icon256.png">../art/icon256.png</file>
-    <file>art/iconbig256.png</file>
+    <file alias="art/iconbig256.png">../art/iconbig256.png</file>
-    <file>art/sunrise.jpg</file>
+    <file alias="art/sunrise.jpg">../art/sunrise.jpg</file>
   </qresource>
   <qresource prefix="/qt-project.org">
     <file>qmime/freedesktop.org.xml</file>
   </qresource>
   <qresource prefix="/langs">
-    <file alias="lang_it.strings">langs/lang_it.strings</file>
+    <file alias="lang_it.strings">../langs/lang_it.strings</file>
-    <file alias="lang_es.strings">langs/lang_es.strings</file>
+    <file alias="lang_es.strings">../langs/lang_es.strings</file>
-    <file alias="lang_de.strings">langs/lang_de.strings</file>
+    <file alias="lang_de.strings">../langs/lang_de.strings</file>
-    <file alias="lang_nl.strings">langs/lang_nl.strings</file>
+    <file alias="lang_nl.strings">../langs/lang_nl.strings</file>
-    <file alias="lang_pt_BR.strings">langs/lang_pt_BR.strings</file>
+    <file alias="lang_pt_BR.strings">../langs/lang_pt_BR.strings</file>
-    <file alias="lang_ko.strings">langs/lang_ko.strings</file>
+    <file alias="lang_ko.strings">../langs/lang_ko.strings</file>
   </qresource>
 </RCC>

Telegram/Resources/qrc/telegram_emoji.qrc

@@ -1,8 +1,8 @@
 <RCC>
   <qresource prefix="/gui">
-    <file>art/emoji.webp</file>
+    <file alias="art/emoji.webp">../art/emoji.webp</file>
-    <file>art/emoji_125x.webp</file>
+    <file alias="art/emoji_125x.webp">../art/emoji_125x.webp</file>
-    <file>art/emoji_150x.webp</file>
+    <file alias="art/emoji_150x.webp">../art/emoji_150x.webp</file>
-    <file>art/emoji_200x.webp</file>
+    <file alias="art/emoji_200x.webp">../art/emoji_200x.webp</file>
   </qresource>
 </RCC>

Telegram/Resources/qrc/telegram_emoji_large.qrc

@@ -1,5 +1,5 @@
 <RCC>
   <qresource prefix="/gui">
-    <file>art/emoji_250x.webp</file>
+    <file alias="art/emoji_250x.webp">../art/emoji_250x.webp</file>
   </qresource>
 </RCC>

Telegram/Resources/qrc/telegram_linux.qrc

@@ -1,5 +1,5 @@
 <RCC>
   <qresource prefix="/qt">
-    <file alias="etc/qt.conf">etc/qt_linux.conf</file>
+    <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
   </qresource>
 </RCC>

Telegram/Resources/qrc/telegram_wnd.qrc

@@ -1,5 +1,5 @@
 <RCC>
   <qresource prefix="/qt">
-    <file alias="etc/qt.conf">etc/qt_win.conf</file>
+    <file alias="etc/qt.conf">../etc/qt_win.conf</file>
   </qresource>
 </RCC>

Telegram/SourceFiles/ui/twidget.cpp

@@ -23,34 +23,36 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace Fonts {
 
-	bool Started = false;
+bool Started = false;
-	void start() {
+void start() {
-		if (!Started) {
+	if (!Started) {
-			Started = true;
+		Started = true;
 
-			QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/OpenSans-Regular.ttf"));
+		QFontDatabase::addApplicationFont(qsl(":/gui/fonts/OpenSans-Regular.ttf"));
-			QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/OpenSans-Bold.ttf"));
+		QFontDatabase::addApplicationFont(qsl(":/gui/fonts/OpenSans-Bold.ttf"));
-			QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/OpenSans-Semibold.ttf"));
+		QFontDatabase::addApplicationFont(qsl(":/gui/fonts/OpenSans-Semibold.ttf"));
-		}
 	}
-
 }
 
+} // Fonts
+
 namespace {
-	void _sendResizeEvents(QWidget *target) {
-		QResizeEvent e(target->size(), QSize());
-		QApplication::sendEvent(target, &e);
 
-		const QObjectList children = target->children();
+void _sendResizeEvents(QWidget *target) {
-		for (int i = 0; i < children.size(); ++i) {
+	QResizeEvent e(target->size(), QSize());
-			QWidget *child = static_cast<QWidget*>(children.at(i));
+	QApplication::sendEvent(target, &e);
-			if (child->isWidgetType() && !child->isWindow() && child->testAttribute(Qt::WA_PendingResizeEvent)) {
+
-				_sendResizeEvents(child);
+	const QObjectList children = target->children();
-			}
+	for (int i = 0; i < children.size(); ++i) {
+		QWidget *child = static_cast<QWidget*>(children.at(i));
+		if (child->isWidgetType() && !child->isWindow() && child->testAttribute(Qt::WA_PendingResizeEvent)) {
+			_sendResizeEvents(child);
 		}
 	}
 }
 
+} // namespace
+
 bool TWidget::inFocusChain() const {
 	return !isHidden() && App::wnd() && (App::wnd()->focusWidget() == this || isAncestorOf(App::wnd()->focusWidget()));
 }

Telegram/gyp/telegram_qrc.gypi

@@ -20,30 +20,30 @@
 {
   'variables': {
     'qrc_files': [
-      '<(res_loc)/telegram.qrc',
+      '<(res_loc)/qrc/telegram.qrc',
-      '<(res_loc)/telegram_emoji.qrc',
+      '<(res_loc)/qrc/telegram_emoji.qrc',
-      '<(res_loc)/telegram_emoji_large.qrc',
+      '<(res_loc)/qrc/telegram_emoji_large.qrc',
     ],
   },
   'conditions': [
     [ 'build_linux', {
       'variables': {
         'qrc_files': [
-          '<(res_loc)/telegram_linux.qrc',
+          '<(res_loc)/qrc/telegram_linux.qrc',
         ],
       }
     }],
     [ 'build_mac', {
       'variables': {
         'qrc_files': [
-          '<(res_loc)/telegram_mac.qrc',
+          '<(res_loc)/qrc/telegram_mac.qrc',
         ],
       },
     }],
     [ 'build_win', {
       'variables': {
         'qrc_files': [
-          '<(res_loc)/telegram_wnd.qrc',
+          '<(res_loc)/qrc/telegram_wnd.qrc',
         ],
       }
     }],