diff --git a/Telegram/Resources/art/fonts/OpenSans-Bold.ttf b/Telegram/Resources/fonts/OpenSans-Bold.ttf
similarity index 100%
rename from Telegram/Resources/art/fonts/OpenSans-Bold.ttf
rename to Telegram/Resources/fonts/OpenSans-Bold.ttf
diff --git a/Telegram/Resources/art/fonts/OpenSans-Regular.ttf b/Telegram/Resources/fonts/OpenSans-Regular.ttf
similarity index 100%
rename from Telegram/Resources/art/fonts/OpenSans-Regular.ttf
rename to Telegram/Resources/fonts/OpenSans-Regular.ttf
diff --git a/Telegram/Resources/art/fonts/OpenSans-Semibold.ttf b/Telegram/Resources/fonts/OpenSans-Semibold.ttf
similarity index 100%
rename from Telegram/Resources/art/fonts/OpenSans-Semibold.ttf
rename to Telegram/Resources/fonts/OpenSans-Semibold.ttf
diff --git a/Telegram/Resources/qmime/freedesktop.org.xml b/Telegram/Resources/qrc/qmime/freedesktop.org.xml
similarity index 100%
rename from Telegram/Resources/qmime/freedesktop.org.xml
rename to Telegram/Resources/qrc/qmime/freedesktop.org.xml
diff --git a/Telegram/Resources/qrc/telegram.qrc b/Telegram/Resources/qrc/telegram.qrc
index e1db7041b..bd68d3b96 100644
--- a/Telegram/Resources/qrc/telegram.qrc
+++ b/Telegram/Resources/qrc/telegram.qrc
@@ -1,24 +1,24 @@
- art/fonts/OpenSans-Regular.ttf
- art/fonts/OpenSans-Bold.ttf
- art/fonts/OpenSans-Semibold.ttf
- art/newmsg.wav
- art/bg.jpg
- art/bg_initial.jpg
- art/icon256.png
- art/iconbig256.png
- art/sunrise.jpg
+ ../fonts/OpenSans-Regular.ttf
+ ../fonts/OpenSans-Bold.ttf
+ ../fonts/OpenSans-Semibold.ttf
+ ../art/newmsg.wav
+ ../art/bg.jpg
+ ../art/bg_initial.jpg
+ ../art/icon256.png
+ ../art/iconbig256.png
+ ../art/sunrise.jpg
qmime/freedesktop.org.xml
- langs/lang_it.strings
- langs/lang_es.strings
- langs/lang_de.strings
- langs/lang_nl.strings
- langs/lang_pt_BR.strings
- langs/lang_ko.strings
+ ../langs/lang_it.strings
+ ../langs/lang_es.strings
+ ../langs/lang_de.strings
+ ../langs/lang_nl.strings
+ ../langs/lang_pt_BR.strings
+ ../langs/lang_ko.strings
diff --git a/Telegram/Resources/qrc/telegram_emoji.qrc b/Telegram/Resources/qrc/telegram_emoji.qrc
index 9082b5167..bb9ce0a73 100644
--- a/Telegram/Resources/qrc/telegram_emoji.qrc
+++ b/Telegram/Resources/qrc/telegram_emoji.qrc
@@ -1,8 +1,8 @@
- art/emoji.webp
- art/emoji_125x.webp
- art/emoji_150x.webp
- art/emoji_200x.webp
+ ../art/emoji.webp
+ ../art/emoji_125x.webp
+ ../art/emoji_150x.webp
+ ../art/emoji_200x.webp
diff --git a/Telegram/Resources/qrc/telegram_emoji_large.qrc b/Telegram/Resources/qrc/telegram_emoji_large.qrc
index f7fc1b06a..193f65fe4 100644
--- a/Telegram/Resources/qrc/telegram_emoji_large.qrc
+++ b/Telegram/Resources/qrc/telegram_emoji_large.qrc
@@ -1,5 +1,5 @@
- art/emoji_250x.webp
+ ../art/emoji_250x.webp
diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc
index a228646fb..0554fa179 100644
--- a/Telegram/Resources/qrc/telegram_linux.qrc
+++ b/Telegram/Resources/qrc/telegram_linux.qrc
@@ -1,5 +1,5 @@
- etc/qt_linux.conf
+ ../etc/qt_linux.conf
diff --git a/Telegram/Resources/qrc/telegram_wnd.qrc b/Telegram/Resources/qrc/telegram_wnd.qrc
index f09424af0..447387bfb 100644
--- a/Telegram/Resources/qrc/telegram_wnd.qrc
+++ b/Telegram/Resources/qrc/telegram_wnd.qrc
@@ -1,5 +1,5 @@
- etc/qt_win.conf
+ ../etc/qt_win.conf
diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
index bfae27a63..abfcd27e4 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -23,34 +23,36 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
namespace Fonts {
- bool Started = false;
- void start() {
- if (!Started) {
- Started = true;
+bool Started = false;
+void start() {
+ if (!Started) {
+ Started = true;
- QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/OpenSans-Regular.ttf"));
- QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/OpenSans-Bold.ttf"));
- QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/OpenSans-Semibold.ttf"));
- }
+ QFontDatabase::addApplicationFont(qsl(":/gui/fonts/OpenSans-Regular.ttf"));
+ QFontDatabase::addApplicationFont(qsl(":/gui/fonts/OpenSans-Bold.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();
- for (int i = 0; i < children.size(); ++i) {
- QWidget *child = static_cast(children.at(i));
- if (child->isWidgetType() && !child->isWindow() && child->testAttribute(Qt::WA_PendingResizeEvent)) {
- _sendResizeEvents(child);
- }
+void _sendResizeEvents(QWidget *target) {
+ QResizeEvent e(target->size(), QSize());
+ QApplication::sendEvent(target, &e);
+
+ const QObjectList children = target->children();
+ for (int i = 0; i < children.size(); ++i) {
+ QWidget *child = static_cast(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()));
}
diff --git a/Telegram/gyp/telegram_qrc.gypi b/Telegram/gyp/telegram_qrc.gypi
index 1d40bf6e6..7ad44018b 100644
--- a/Telegram/gyp/telegram_qrc.gypi
+++ b/Telegram/gyp/telegram_qrc.gypi
@@ -20,30 +20,30 @@
{
'variables': {
'qrc_files': [
- '<(res_loc)/telegram.qrc',
- '<(res_loc)/telegram_emoji.qrc',
- '<(res_loc)/telegram_emoji_large.qrc',
+ '<(res_loc)/qrc/telegram.qrc',
+ '<(res_loc)/qrc/telegram_emoji.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',
],
}
}],