RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

This commit is contained in:
John Preston 2016-10-07 19:47:16 +03:00
parent f1d52c12ae 4a9821117b
commit b298c72b52
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/settings/settings_notifications_widget.cpp
View File

@ -62,6 +62,15 @@ void NotificationsWidget::createControls() {
addChildRow(_playSound, margin, lang(lng_settings_sound_notify), SLOT(onPlaySound()), Global::SoundNotify()); addChildRow(_playSound, margin, lang(lng_settings_sound_notify), SLOT(onPlaySound()), Global::SoundNotify());
addChildRow(_includeMuted, margin, lang(lng_settings_include_muted), SLOT(onIncludeMuted()), Global::IncludeMuted()); addChildRow(_includeMuted, margin, lang(lng_settings_include_muted), SLOT(onIncludeMuted()), Global::IncludeMuted());
if (cPlatform() != dbipMac) {
createNotificationsControls();
}
}
void NotificationsWidget::createNotificationsControls() {
style::margins margin(0, 0, 0, st::settingsSkip);
style::margins slidedPadding(0, margin.bottom() / 2, 0, margin.bottom() - (margin.bottom() / 2));
QString nativeNotificationsLabel; QString nativeNotificationsLabel;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if (App::wnd()->psHasNativeNotifications()) { if (App::wnd()->psHasNativeNotifications()) {

1
Telegram/SourceFiles/settings/settings_notifications_widget.h
View File

@ -41,6 +41,7 @@ private slots:
private: private:
void createControls(); void createControls();
void createNotificationsControls();
void desktopEnabledUpdated(); void desktopEnabledUpdated();
void viewParamUpdated(); void viewParamUpdated();

12
Telegram/build/deploy.sh
View File

@ -181,20 +181,18 @@ fi
if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ] || [ "$BuildTarget" == "mac" ]; then if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ] || [ "$BuildTarget" == "mac" ]; then
if [ "$BuildTarget" != "mac" ] || [ "$DeployMac" == "1" ]; then if [ "$BuildTarget" != "mac" ] || [ "$DeployMac" == "1" ]; then
scp "$DeployPath/$UpdateFile" "tmaster:tdesktop/www/$RemoteFolder/" rsync -av --progress "$DeployPath/$UpdateFile" "$DeployPath/$SetupFile" "tmaster:tdesktop/www/$RemoteFolder/"
scp "$DeployPath/$SetupFile" "tmaster:tdesktop/www/$RemoteFolder/"
fi fi
if [ "$BuildTarget" == "mac" ]; then if [ "$BuildTarget" == "mac" ]; then
if [ "$DeployMac32" == "1" ]; then if [ "$DeployMac32" == "1" ]; then
scp "$Mac32DeployPath/$Mac32UpdateFile" "tmaster:tdesktop/www/$Mac32RemoteFolder/" rsync -av --progress "$Mac32DeployPath/$Mac32UpdateFile" "$Mac32DeployPath/$Mac32SetupFile" "tmaster:tdesktop/www/$Mac32RemoteFolder/"
scp "$Mac32DeployPath/$Mac32SetupFile" "tmaster:tdesktop/www/$Mac32RemoteFolder/"
fi fi
if [ "$DeployWin" == "1" ]; then if [ "$DeployWin" == "1" ]; then
scp "$WinDeployPath/$WinUpdateFile" "tmaster:tdesktop/www/$WinRemoteFolder/"
if [ "$BetaVersion" == "0" ]; then if [ "$BetaVersion" == "0" ]; then
scp "$WinDeployPath/$WinSetupFile" "tmaster:tdesktop/www/$WinRemoteFolder/" rsync -av --progress "$WinDeployPath/$WinUpdateFile" "$WinDeployPath/$WinSetupFile" "$WinDeployPath/$WinPortableFile" "tmaster:tdesktop/www/$WinRemoteFolder/"
else
rsync -av --progress "$WinDeployPath/$WinUpdateFile" "$WinDeployPath/$WinPortableFile" "tmaster:tdesktop/www/$WinRemoteFolder/"
fi fi
scp "$WinDeployPath/$WinPortableFile" "tmaster:tdesktop/www/$WinRemoteFolder/"
fi fi
if [ "$DeployMac" == "1" ]; then if [ "$DeployMac" == "1" ]; then