diff --git a/Telegram/Resources/art/uwp/logo.png b/Telegram/Resources/art/uwp/logo.png
deleted file mode 100644
index 7c2cf4eb4..000000000
Binary files a/Telegram/Resources/art/uwp/logo.png and /dev/null differ
diff --git a/Telegram/Resources/default.tdesktop-theme b/Telegram/Resources/default.tdesktop-theme
index f89d21451..532b1d704 100644
--- a/Telegram/Resources/default.tdesktop-theme
+++ b/Telegram/Resources/default.tdesktop-theme
@@ -124,8 +124,6 @@ boxTextFgGood: #4ab44a;
boxTextFgError: #d84d4d;
boxTitleFg: #404040;
boxSearchBg: boxBg;
-boxSearchCancelIconFg: cancelIconFg;
-boxSearchCancelIconFgOver: cancelIconFgOver;
boxTitleAdditionalFg: #808080;
boxTitleCloseFg: cancelIconFg;
boxTitleCloseFgOver: cancelIconFgOver;
@@ -196,7 +194,6 @@ dialogsUnreadFgActive: dialogsBgActive;
dialogsForwardBg: dialogsBgActive;
dialogsForwardFg: dialogsNameFgActive;
searchedBarBg: windowBgOver;
-searchedBarBorder: shadowFg;
searchedBarFg: windowSubTextFgOver;
topBarBg: windowBg;
emojiPanBg: windowBg;
@@ -218,9 +215,6 @@ historyIconFgInverted: windowFgActive;
historySendingOutIconFg: #98d292;
historySendingInIconFg: #a0adb5;
historySendingInvertedIconFg: #ffffffc8;
-historySystemBg: #89a0b47f;
-historySystemBgSelected: #bbc8d4a2;
-historySystemFg: windowFgActive;
historyUnreadBarBg: #fcfbfa;
historyUnreadBarBorder: shadowFg;
historyUnreadBarFg: #538bb4;
diff --git a/Telegram/Resources/uwp/appxmanifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
similarity index 64%
rename from Telegram/Resources/uwp/appxmanifest.xml
rename to Telegram/Resources/uwp/AppX/AppxManifest.xml
index 2bcdefb90..85f202906 100644
--- a/Telegram/Resources/uwp/appxmanifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,15 +9,15 @@
Version="1.0.6.0" />
Telegram Desktop
- Reserved
- No description entered
- Assets\logo.png
+ Telegram Messenger LLP
+ Telegram Desktop official messenger
+ Assets\logo\logo.png
-
+
@@ -25,11 +25,16 @@
+
+
+
+
+
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-100.png b/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-100.png
new file mode 100644
index 000000000..5ff79c99e
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-100.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-125.png b/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-125.png
new file mode 100644
index 000000000..a1f842947
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-125.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-150.png b/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-150.png
new file mode 100644
index 000000000..e3a61a16a
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-150.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-200.png b/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-200.png
new file mode 100644
index 000000000..b46a33922
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-200.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-400.png b/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-400.png
new file mode 100644
index 000000000..55d4963bd
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo/logo.scale-400.png differ
diff --git a/Telegram/Resources/art/uwp/logo150.png b/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-100.png
similarity index 100%
rename from Telegram/Resources/art/uwp/logo150.png
rename to Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-100.png
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-125.png b/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-125.png
new file mode 100644
index 000000000..6fefb3856
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-125.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-150.png b/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-150.png
new file mode 100644
index 000000000..881585324
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-150.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-200.png b/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-200.png
new file mode 100644
index 000000000..177f7a6c8
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-200.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-400.png b/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-400.png
new file mode 100644
index 000000000..b4e393621
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo150/logo150.scale-400.png differ
diff --git a/Telegram/Resources/art/uwp/logo44.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-100.png
similarity index 100%
rename from Telegram/Resources/art/uwp/logo44.png
rename to Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-100.png
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-125.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-125.png
new file mode 100644
index 000000000..34537f51b
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-125.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-150.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-150.png
new file mode 100644
index 000000000..1f470c296
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-150.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-200.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-200.png
new file mode 100644
index 000000000..d0e25282b
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-200.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-400.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-400.png
new file mode 100644
index 000000000..b5fb2e5ea
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.scale-400.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-16.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-16.png
new file mode 100644
index 000000000..a1fdc9354
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-16.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-16_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-16_altform-unplated.png
new file mode 100644
index 000000000..a1fdc9354
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-16_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-20.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-20.png
new file mode 100644
index 000000000..acc27ab55
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-20.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-20_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-20_altform-unplated.png
new file mode 100644
index 000000000..acc27ab55
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-20_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-24.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-24.png
new file mode 100644
index 000000000..e58368176
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-24.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-24_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-24_altform-unplated.png
new file mode 100644
index 000000000..e58368176
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-24_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-256.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-256.png
new file mode 100644
index 000000000..d2cebf7c2
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-256.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-256_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-256_altform-unplated.png
new file mode 100644
index 000000000..d2cebf7c2
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-256_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-30.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-30.png
new file mode 100644
index 000000000..0899fb66d
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-30.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-30_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-30_altform-unplated.png
new file mode 100644
index 000000000..0899fb66d
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-30_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-32.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-32.png
new file mode 100644
index 000000000..03533b807
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-32.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-32_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-32_altform-unplated.png
new file mode 100644
index 000000000..03533b807
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-32_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-36.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-36.png
new file mode 100644
index 000000000..f948fa26d
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-36.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-36_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-36_altform-unplated.png
new file mode 100644
index 000000000..f948fa26d
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-36_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-40.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-40.png
new file mode 100644
index 000000000..62495a084
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-40.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-40_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-40_altform-unplated.png
new file mode 100644
index 000000000..62495a084
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-40_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-48.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-48.png
new file mode 100644
index 000000000..799335ef6
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-48.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-48_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-48_altform-unplated.png
new file mode 100644
index 000000000..799335ef6
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-48_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-60.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-60.png
new file mode 100644
index 000000000..1d6c56ee1
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-60.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-60_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-60_altform-unplated.png
new file mode 100644
index 000000000..1d6c56ee1
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-60_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-64.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-64.png
new file mode 100644
index 000000000..b9b419bfa
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-64.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-64_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-64_altform-unplated.png
new file mode 100644
index 000000000..b9b419bfa
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-64_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-72.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-72.png
new file mode 100644
index 000000000..a1b27f7d5
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-72.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-72_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-72_altform-unplated.png
new file mode 100644
index 000000000..a1b27f7d5
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-72_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-80.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-80.png
new file mode 100644
index 000000000..1a0b1a4a4
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-80.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-80_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-80_altform-unplated.png
new file mode 100644
index 000000000..1a0b1a4a4
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-80_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-96.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-96.png
new file mode 100644
index 000000000..1684f47f7
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-96.png differ
diff --git a/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-96_altform-unplated.png b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-96_altform-unplated.png
new file mode 100644
index 000000000..1684f47f7
Binary files /dev/null and b/Telegram/Resources/uwp/AppX/Assets/logo44/logo44.targetsize-96_altform-unplated.png differ
diff --git a/Telegram/Resources/uwp/mapping b/Telegram/Resources/uwp/mapping
deleted file mode 100644
index 52a4b0d5b..000000000
--- a/Telegram/Resources/uwp/mapping
+++ /dev/null
@@ -1,6 +0,0 @@
-[Files]
-"..\out\Release\Telegram.exe" "Telegram.exe"
-"Resources\uwp\appxmanifest.xml" "AppxManifest.xml"
-"Resources\art\uwp\logo.png" "Assets\logo.png"
-"Resources\art\uwp\logo44.png" "Assets\logo44.png"
-"Resources\art\uwp\logo150.png" "Assets\logo150.png"
diff --git a/Telegram/Resources/uwp/priconfig.xml b/Telegram/Resources/uwp/priconfig.xml
new file mode 100644
index 000000000..e478fcd59
--- /dev/null
+++ b/Telegram/Resources/uwp/priconfig.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Telegram/SourceFiles/window/window_theme.cpp b/Telegram/SourceFiles/window/window_theme.cpp
index a9c9cb016..ef8e04f30 100644
--- a/Telegram/SourceFiles/window/window_theme.cpp
+++ b/Telegram/SourceFiles/window/window_theme.cpp
@@ -54,16 +54,16 @@ NeverFreedPointer instance;
QByteArray readThemeContent(const QString &path) {
QFile file(path);
if (!file.exists()) {
- LOG(("Error: theme file not found: %1").arg(path));
+ LOG(("Theme Error: theme file not found: %1").arg(path));
return QByteArray();
}
if (file.size() > kThemeFileSizeLimit) {
- LOG(("Error: theme file too large: %1 (should be less than 5 MB, got %2)").arg(path).arg(file.size()));
+ LOG(("Theme Error: theme file too large: %1 (should be less than 5 MB, got %2)").arg(path).arg(file.size()));
return QByteArray();
}
if (!file.open(QIODevice::ReadOnly)) {
- LOG(("Warning: could not open theme file: %1").arg(path));
+ LOG(("Theme Warning: could not open theme file: %1").arg(path));
return QByteArray();
}
@@ -94,36 +94,36 @@ bool readNameAndValue(const char *&from, const char *end, QLatin1String *outName
*outName = readName(from, end);
if (outName->size() == 0) {
- LOG(("Error: Could not read name in the color scheme."));
+ LOG(("Theme Error: Could not read name in the color scheme."));
return false;
}
if (!skipWhitespaces(from, end)) {
- LOG(("Error: Unexpected end of the color scheme."));
+ LOG(("Theme Error: Unexpected end of the color scheme."));
return false;
}
if (*from != ':') {
- LOG(("Error: Expected ':' between each name and value in the color scheme."));
+ LOG(("Theme Error: Expected ':' between each name and value in the color scheme."));
return false;
}
if (!skipWhitespaces(++from, end)) {
- LOG(("Error: Unexpected end of the color scheme."));
+ LOG(("Theme Error: Unexpected end of the color scheme."));
return false;
}
auto valueStart = from;
if (*from == '#') ++from;
if (readName(from, end).size() == 0) {
- LOG(("Error: Expected a color value in #rrggbb or #rrggbbaa format in the color scheme."));
+ LOG(("Theme Error: Expected a color value in #rrggbb or #rrggbbaa format in the color scheme."));
return false;
}
*outValue = QLatin1String(valueStart, from - valueStart);
if (!skipWhitespaces(from, end)) {
- LOG(("Error: Unexpected end of the color scheme."));
+ LOG(("Theme Error: Unexpected end of the color scheme."));
return false;
}
if (*from != ';') {
- LOG(("Error: Expected ';' after each value in the color scheme."));
+ LOG(("Theme Error: Expected ';' after each value in the color scheme."));
return false;
}
++from;
@@ -146,7 +146,7 @@ SetResult setColorSchemeValue(QLatin1String name, QLatin1String value, Instance
auto b = readHexUchar(data[5], data[6], error);
auto a = (size == 9) ? readHexUchar(data[7], data[8], error) : uchar(255);
if (error) {
- LOG(("Error: Expected a color value in #rrggbb or #rrggbbaa format in the color scheme (while applying '%1: %2')").arg(QLatin1String(name)).arg(QLatin1String(value)));
+ LOG(("Theme Error: Expected a color value in #rrggbb or #rrggbbaa format in the color scheme (while applying '%1: %2')").arg(QLatin1String(name)).arg(QLatin1String(value)));
return SetResult::Bad;
} else if (out) {
found = out->palette.setColor(name, r, g, b, a);
@@ -165,7 +165,7 @@ SetResult setColorSchemeValue(QLatin1String name, QLatin1String value, Instance
bool loadColorScheme(const QByteArray &content, Instance *out = nullptr) {
if (content.size() > kThemeSchemeSizeLimit) {
- LOG(("Error: color scheme file too large (should be less than 1 MB, got %2)").arg(content.size()));
+ LOG(("Theme Error: color scheme file too large (should be less than 1 MB, got %2)").arg(content.size()));
return false;
}
@@ -188,7 +188,7 @@ bool loadColorScheme(const QByteArray &content, Instance *out = nullptr) {
if (result == SetResult::Bad) {
return false;
} else if (result == SetResult::NotFound) {
- LOG(("Warning: unexpected name or value in the color scheme (while applying '%1: %2')").arg(name).arg(value));
+ LOG(("Theme Warning: unexpected name or value in the color scheme (while applying '%1: %2')").arg(name).arg(value));
unsupported.insert(name, value);
}
}
@@ -248,7 +248,7 @@ LoadResult loadBackgroundFromFile(zlib::FileToRead &file, const char *filename,
file.clearError();
return LoadResult::NotFound;
}
- LOG(("Error: could not read '%1' in the theme file.").arg(filename));
+ LOG(("Theme Error: could not read '%1' in the theme file.").arg(filename));
return LoadResult::Failed;
}
@@ -277,7 +277,7 @@ bool loadTheme(const QByteArray &content, Cached &cache, Instance *out = nullptr
if (file.error() == UNZ_OK) {
auto schemeContent = file.readFileContent("colors.tdesktop-theme", zlib::kCaseInsensitive, kThemeSchemeSizeLimit);
if (file.error() != UNZ_OK) {
- LOG(("Error: could not read 'colors.tdesktop-theme' in the theme file."));
+ LOG(("Theme Error: could not read 'colors.tdesktop-theme' in the theme file."));
return false;
}
if (!loadColorScheme(schemeContent, out)) {
@@ -293,12 +293,12 @@ bool loadTheme(const QByteArray &content, Cached &cache, Instance *out = nullptr
if (!backgroundContent.isEmpty()) {
auto background = App::readImage(backgroundContent);
if (background.isNull()) {
- LOG(("Error: could not read background image in the theme file."));
+ LOG(("Theme Error: could not read background image in the theme file."));
return false;
}
QBuffer buffer(&cache.background);
if (!background.save(&buffer, "BMP")) {
- LOG(("Error: could not write background image as a BMP to cache."));
+ LOG(("Theme Error: could not write background image as a BMP to cache."));
return false;
}
cache.tiled = backgroundTiled;
@@ -587,7 +587,7 @@ ChatBackground *Background() {
bool Load(const QString &pathRelative, const QString &pathAbsolute, const QByteArray &content, Cached &cache) {
if (content.size() < 4) {
- LOG(("Error: Could not load theme from '%1' (%2)").arg(pathRelative).arg(pathAbsolute));
+ LOG(("Theme Error: Could not load theme from '%1' (%2)").arg(pathRelative).arg(pathAbsolute));
return false;
}
@@ -662,7 +662,7 @@ void Revert() {
bool LoadFromFile(const QString &path, Instance *out, QByteArray *outContent) {
*outContent = readThemeContent(path);
if (outContent->size() < 4) {
- LOG(("Error: Could not load theme from %1").arg(path));
+ LOG(("Theme Error: Could not load theme from %1").arg(path));
return false;
}
diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat
index c3b94b835..1ff61a7d0 100644
--- a/Telegram/build/build.bat
+++ b/Telegram/build/build.bat
@@ -89,7 +89,7 @@ if %BetaVersion% neq 0 (
echo Can not build UWP version from an alpha!
exit /b 1
)
- if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%\uwp\ (
+ if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%\AppX\ (
echo UWP deploy folder for version %AppVersionStr% already exists!
exit /b 1
)
@@ -148,14 +148,7 @@ cd "%ReleasePath%"
call "%SignPath%" "%BinaryName%.exe"
if %errorlevel% neq 0 goto error
-if %BuildUWP% neq 0 (
- cd "%HomePath%"
-
- MakeAppx.exe pack /f Resources\uwp\mapping /l /p ..\out\Release\%BinaryName%.appx
- if %errorlevel% neq 0 goto error
-
- call "%SignAppxPath%" "..\out\Release\%BinaryName%.appx"
-) else (
+if %BuildUWP% equ 0 (
call "%SignPath%" "Updater.exe"
if %errorlevel% neq 0 goto error
@@ -203,11 +196,24 @@ move "%ReleasePath%\%BinaryName%.exe.sym" %DropboxSymbolsPath%\%BinaryName%.exe.
echo Done!
if %BuildUWP% neq 0 (
- mkdir "%DeployPath%\uwp"
- move "%ReleasePath%\%BinaryName%.exe" "%DeployPath%\uwp\"
- xcopy "%ReleasePath%\%BinaryName%.pdb" "%DeployPath%\uwp\"
- move "%ReleasePath%\%BinaryName%.exe.pdb" "%DeployPath%\uwp\"
- move "%ReleasePath%\Telegram.appx" "%DeployPath%\uwp\"
+ cd "%HomePath%"
+
+ mkdir "%DeployPath%\AppX"
+ xcopy /e "Resources\uwp\AppX\*" "%DeployPath%\AppX\"
+
+ makepri new /pr Resources\uwp\AppX\ /cf Resources\uwp\priconfig.xml /mn %DeployPath%\AppX\AppxManifest.xml /of %DeployPath%\AppX\resources.pri
+ if %errorlevel% neq 0 goto error
+
+ move "%ReleasePath%\%BinaryName%.exe" "%DeployPath%\AppX\"
+
+ MakeAppx.exe pack /d "%DeployPath%\AppX" /l /p ..\out\Release\%BinaryName%.appx
+ if %errorlevel% neq 0 goto error
+
+ call "%SignAppxPath%" "..\out\Release\%BinaryName%.appx"
+
+ xcopy "%ReleasePath%\%BinaryName%.pdb" "%DeployPath%\AppX\"
+ move "%ReleasePath%\%BinaryName%.exe.pdb" "%DeployPath%\AppX\"
+ move "%ReleasePath%\%BinaryName%.appx" "%DeployPath%\AppX\"
) else (
if not exist "%ReleasePath%\deploy" mkdir "%ReleasePath%\deploy"
if not exist "%ReleasePath%\deploy\%AppVersionStrMajor%" mkdir "%ReleasePath%\deploy\%AppVersionStrMajor%"