Stable version 0.10: langs updated, video player design improvements.

This commit is contained in:
John Preston 2016-08-03 12:02:53 +01:00
parent d155967149
commit 12bcc88839
18 changed files with 116 additions and 54 deletions

View File

@ -934,7 +934,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram Desktop was updated to version {version}\n\n{changes}\n\nFull version history is available here:\n{link}";
"lng_new_version_minor" = "— Bug fixes and other minor improvements";
"lng_new_version_text" = "— Fixed photo viewer to handle screen resolution change correctly\n— Fixed forwarding photos via drag-n-drop\n— Various design improvements and other bug fixes";
"lng_new_version_text" = "— Trending stickers. Check out and install noteworthy sticker packs from the new tab in Settings.\n— Archived stickers. Unused stickers are now archived automatically when you go over the 200 limit.\n— Group previews. Preview groups before joining them via invite link see who else is in the group before joining.\n— New internal video player.\n— Improved design for chats.";
"lng_menu_insert_unicode" = "Insert Unicode control character";

View File

@ -671,6 +671,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_emoji_category6" = "Objekte";
"lng_emoji_category7" = "Symbole & Flaggen";
"lng_recent_stickers" = "Häufig genutzt";
"lng_switch_stickers" = "Sticker";
"lng_switch_stickers_gifs" = "GIFs & Sticker";
"lng_switch_emoji" = "Emoji";
@ -694,7 +695,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_stickers_you_have" = "Sticker-Pakete verwalten";
"lng_stickers_packs" = "Sticker-Pakete";
"lng_stickers_reorder" = "Paket gedrückt halten und verschieben um die Anordnung zu ändern";
"lng_stickers_featured" = "Besondere Sticker";
"lng_stickers_featured" = "Angesagte Sticker";
"lng_stickers_clear_recent" = "Leeren";
"lng_stickers_clear_recent_sure" = "Zuletzt benutzte Sticker leeren?";
"lng_stickers_remove" = "Löschen";
@ -933,12 +934,19 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram Desktop wurde aktualisiert auf Version {version}\n\n{changes}\n\nGesamter Versionsverlauf:\n{link}";
"lng_new_version_minor" = "— Fehlerbehebungen und Softwareoptimierungen";
"lng_new_version_text" = "— Fehlerbehebung: Bildbetrachter sollte Änderungen der Bildschirmauflösung korrekt handhaben\n— Fehlerbehebung: Bilder per DragnDrop weiterleiten\n— Verschiedene optische Verbesserungen und sonstige Fehlerbehebungen";
"lng_new_version_text" = "— Angesagte Sticker: In den Einstellungen, im Bereich Sticker, stehen interessante Stickerpakete bereit.\n— Archivierte Sticker: Unbenutze Sticker werden automatisch archiviert, sobald das Limit (200) erreicht wird.\n— Gruppenvorschau: Vor dem Betreten der Gruppe wird dir angezeigt, wer bereits Mitglied ist.\n— Neuer interner Videoplayer.\n— Verbessertes Chatdesign.";
"lng_menu_insert_unicode" = "Unicode-Steuerzeichen einfügen";
"lng_full_name" = "{first_name} {last_name}";
"lng_confirm_phone_link_invalid" = "Dieser Link ist abgelaufen oder ungültig.";
"lng_confirm_phone_title" = "Zurücksetzung abbrechen";
"lng_confirm_phone_about" = "Jemand mit Zugang zu deiner Telefonnummer {phone} hat die Kontolöschung und Zurücksetzung der zweistufige Bestätigung beantragt.\n\nWenn du das nicht selbst gewesen bist, tippe den Code der SMS ein, den wir dir gerade gesendet haben.";
"lng_confirm_phone_success" = "Geschafft!\n\nDer Löschvorgang für dein Konto {phone} wurde abgebrochen. Du kannst dieses Fenster jetzt schließen.";
"lng_confirm_phone_send" = "Senden";
"lng_confirm_phone_enter_code" = "Bitte den Code eingeben.";
// Not used
"lng_topbar_info" = "Info";

View File

@ -671,6 +671,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_emoji_category6" = "Objetos";
"lng_emoji_category7" = "Símbolos y banderas";
"lng_recent_stickers" = "Uso frecuente";
"lng_switch_stickers" = "Stickers";
"lng_switch_stickers_gifs" = "GIF y stickers";
"lng_switch_emoji" = "Emoji";
@ -933,12 +934,19 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram Desktop ha sido actualizada a la versión {version}\n\n{changes}\n\nEl historial completo está disponible aquí:\n{link}";
"lng_new_version_minor" = "— Corrección de errores y otras mejoras menores";
"lng_new_version_text" = "— Corrección en el visor de fotos, para manejar correctamente el cambio de la resolución de la pantalla\n— Corrección en el reenvío de fotos a través de arrastrar y soltar \n— Varias mejoras de diseño y corrección de otros errores";
"lng_new_version_text" = "— Stickers destacados. Mira e instala packs de stickers desde la nueva pestaña en Ajustes.\n— Stickers archivados. Ahora, los packs de stickers que no usas, se archivan automáticamente cuando superas el límite de 200.\n— Vista previa de grupos. Mira un grupo antes de unirte a él a través del enlace de invitación. Mira quién está en el grupo antes de unirte.\n— Nuevo reproductor interno de vídeo.\n— Diseño mejorado de chats.";
"lng_menu_insert_unicode" = "Insertar caracteres de control Unicode";
"lng_full_name" = "{first_name} {last_name}";
"lng_confirm_phone_link_invalid" = "El enlace está roto o ha expirado.";
"lng_confirm_phone_title" = "No restablecer la cuenta";
"lng_confirm_phone_about" = "Alguien, con acceso a tu número de teléfono {phone}, solicitó eliminar tu cuenta de Telegram y restablecer tu contraseña de la verificación en dos pasos.\n\nSi no eras tú, por favor, inserta el código que enviamos por SMS a tu número.";
"lng_confirm_phone_success" = "¡Listo!\n\nEl proceso de eliminación de la cuenta {phone} fue cancelado. Puedes cerrar esta ventana ahora.";
"lng_confirm_phone_send" = "Enviar";
"lng_confirm_phone_enter_code" = "Por favor, pon el código.";
// Not used
"lng_topbar_info" = "Información";

View File

@ -671,6 +671,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_emoji_category6" = "Oggetti";
"lng_emoji_category7" = "Simboli e bandiere";
"lng_recent_stickers" = "Usati di frequente";
"lng_switch_stickers" = "Sticker";
"lng_switch_stickers_gifs" = "GIF e Sticker";
"lng_switch_emoji" = "Emoji";
@ -933,12 +934,19 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram Desktop si è aggiornato alla versione {version}\n\n{changes}\n\nLa cronologia degli aggiornamenti è disponibile qui:\n{link}";
"lng_new_version_minor" = "— Risoluzione di problemi e altri miglioramenti minori";
"lng_new_version_text" = "— Il visualizzatore delle foto ora gestisce i cambi di risoluzione dello schermo correttamente\n— Risolto l'inoltro di foto via drag-n-drop\n— Miglioramenti di design e risoluzione di problemi";
"lng_new_version_text" = "— Sticker in primo piano. Visualizza e installa set di sticker degni di nota dalla nuova scheda nelle Impostazioni.\n— Sticker archiviati. Gli sticker non utilizzati sono ora archiviati automaticamente quando vai oltre il limite dei 200 set.\n— Anteprime dei gruppi. Visualizza l'anteprima dei gruppi prima di unirti tramite link di invito - guarda chi è nel gruppo prima di unirti.\n— Nuovo lettore video interno.\n— Design migliorato per le chat.";
"lng_menu_insert_unicode" = "Inserisci carattere di controllo Unicode";
"lng_full_name" = "{first_name} {last_name}";
"lng_confirm_phone_link_invalid" = "Questo link non funziona o è scaduto.";
"lng_confirm_phone_title" = "Annulla ripristino account";
"lng_confirm_phone_about" = "Qualcuno con accesso al tuo numero di telefono {phone} ha richiesto l'eliminazione del tuo account Telegram e il ripristino della password della verifica in due passaggi.\n\nSe non sei stato tu, per favore inserisci il codice che abbiamo appena inviato come SMS al tuo numero.";
"lng_confirm_phone_success" = "Fatto!\n\nIl processo di eliminazione per il tuo account {phone} è stato annullato. Puoi chiudere questa finestra ora.";
"lng_confirm_phone_send" = "Invia";
"lng_confirm_phone_enter_code" = "Per favore inserisci il codice.";
// Not used
"lng_topbar_info" = "Info";

View File

@ -671,6 +671,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_emoji_category6" = "물건";
"lng_emoji_category7" = "심볼 및 국기";
"lng_recent_stickers" = "자주 사용";
"lng_switch_stickers" = "스티커";
"lng_switch_stickers_gifs" = "GIF & 스티커";
"lng_switch_emoji" = "이모티콘";
@ -694,7 +695,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_stickers_you_have" = "스티커팩 관리 및 변경";
"lng_stickers_packs" = "스티커팩";
"lng_stickers_reorder" = "클릭과 드래그를 통하여 스태커 팩을 변경하세요";
"lng_stickers_featured" = "사용중인 스티커";
"lng_stickers_featured" = "인 스티커";
"lng_stickers_clear_recent" = "초기화";
"lng_stickers_clear_recent_sure" = "자주 사용하는 스티커 리스트를 초기화 하겠습니까?";
"lng_stickers_remove" = "삭제";
@ -933,12 +934,19 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "텔레그램 데스크탑은 {version} 버전으로 업데이트 되었습니다.\n\n{changes}\n\n전체 버전 히스토리는 아래에서 확인 가능합니다:\n{link}";
"lng_new_version_minor" = "— 버그 수정 및 일부 기능 향상";
"lng_new_version_text" = "— 해상도 변경에 따라 사진 뷰어가 정상적으로 표시되도록 수정\n— 드래그앤드롭으로 사진 전송 수정\n— 디자인 및 버그 수정";
"lng_new_version_text" = "— 인기스티커. 설정내 새로운 탭으로 인기있는 스티커를 확인하고 설치\n— 보관스티커. 스티커 개수가 200개 이상일 경우 미사용 스티커는 보관으로 자동이관\n— 그룹방 미리보기. 초대링크로 입장하기전에 미리보기 - 그룹방 참여인원 확인가능\n— 새로운 내부 비디오 플레이어\n— 대화 디자인 향상";
"lng_menu_insert_unicode" = "유니코드 문자를 입력하세요.";
"lng_full_name" = "{last_name} {first_name}";
"lng_confirm_phone_link_invalid" = "링크가 깨졌거나 폐기되었습니다.";
"lng_confirm_phone_title" = "계정 초기화 취소";
"lng_confirm_phone_about" = "{phone} 번호에 접근이 가능한 누군가가 해당 계정 및 2단계 비밀번호 초기화를 요청하였습니다.\n\n만약 본인이 아니실 경우 방금 보내드린 코드를 본인 번호에 SMS로 전송해주세요.";
"lng_confirm_phone_success" = "성공!\n\n{phone} 계정에 대한 삭제 프로세스가 취소 되었습니다. 이창을 당으셔도 됩니다.";
"lng_confirm_phone_send" = "보내기";
"lng_confirm_phone_enter_code" = "코드를 입력해주세요";
// Not used
"lng_topbar_info" = "정보";

View File

@ -671,6 +671,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_emoji_category6" = "Objecten";
"lng_emoji_category7" = "Symbolen en vlaggen";
"lng_recent_stickers" = "Veelgebruikt";
"lng_switch_stickers" = "Stickers";
"lng_switch_stickers_gifs" = "GIF's & stickers";
"lng_switch_emoji" = "Emoji";
@ -694,7 +695,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_stickers_you_have" = "Beheer en sorteer stickerbundels";
"lng_stickers_packs" = "Stickerbundels";
"lng_stickers_reorder" = "Klik en sleep om stickerbundels te herschikken";
"lng_stickers_featured" = "Uitgelichte stickers";
"lng_stickers_featured" = "Populaire stickers";
"lng_stickers_clear_recent" = "Wissen";
"lng_stickers_clear_recent_sure" = "Lijst met veelgebruikte stickers echt wissen?";
"lng_stickers_remove" = "Verwijder";
@ -933,12 +934,19 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram is bijgewerkt naar versie {version}\n\n{changes} \n\nVolledige versiegeschiedenis is hier te vinden:\n{link}";
"lng_new_version_minor" = "— Probleemoplossing en andere kleine verbeteringen";
"lng_new_version_text" = "— Probleem met foto-weergave opgelost\n— Probleem met doorsturen via slepen opgelost\n— Diverse designverbeteringen en andere opgeloste problemen";
"lng_new_version_text" = "— Populaire stickers. Zoek je nieuwe stickerbundels om te installeren? Populaire stickerbundels zijn nu te vinden onder instellingen.\n— Gearchiveerde stickers. Ongebruikte stickers archiveren we automatisch als je over de limiet van 200 stickerbundels gaat.\n— Voorvertoningen van groepen. Bekijk een groep voordat je besluit lid te worden.\n— Nieuwe ingebouwde videospeler.\n— Designverbeteringen voor de chatinterface.";
"lng_menu_insert_unicode" = "Unicode-besturingsteken invoegen";
"lng_full_name" = "{first_name} {last_name}";
"lng_confirm_phone_link_invalid" = "Deze link is defect of verlopen.";
"lng_confirm_phone_title" = "Account reset annuleren";
"lng_confirm_phone_about" = "Iemand met toegang tot nummer {phone} heeft geprobeerd om je Telegram account te verwijderen en je twee-staps-verificatie wachtwoord te resetten.\n\nAls jij dit niet was, geef dan de code in die we zojuist per SMS hebben gestuurd.";
"lng_confirm_phone_success" = "De verwijdering van account: {phone} is geannuleerd.\nJe kunt dit venster nu sluiten.";
"lng_confirm_phone_send" = "Stuur";
"lng_confirm_phone_enter_code" = "Geef de code in.";
// Not used
"lng_topbar_info" = "Info";

View File

@ -194,7 +194,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_signin_reset_in_days" = "{count_days:0 dia|# dia|# dias} {count_hours:0 hora|# hora|# horas} {count_minutes:0 minuto|# minuto|# minutos}";
"lng_signin_reset_in_hours" = "{count_hours:0 hora|# hora|# horas} {count_minutes:0 minuto|# minuto|# minutos}";
"lng_signin_reset_in_minutes" = "{count_minutes:0 minuto|# minuto|# minutos}";
"lng_signin_reset_cancelled" = "Sua tentativa recente de restaurar essa conta foi cancelada pelo usuário ativo. Tente novamente em 7 dias.";
"lng_signin_reset_cancelled" = "Suas tentativas recentes de restaurar essa conta foram canceladas pelo usuário ativo. Tente novamente em 7 dias.";
"lng_signup_title" = "Informação e foto";
"lng_signup_desc" = "Por favor, insira nome e\ncarregue uma foto.";
@ -219,7 +219,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_settings_uploading_photo" = "Carregando foto...";
"lng_username_title" = "Nome de usuário";
"lng_username_about" = "Você pode escolher um nome de usuário no Telegram.\nAssim, outras pessoas poderão te encontrar\npelo nome de usuário e entrar em contato\nsem precisar saber seu telefone.\n\nVocê pode usar a-z, 0-9 e underline.\nO tamanho mínimo é 5 caracteres.";
"lng_username_about" = "Você pode escolher um nome de usuário.\nAssim, outras pessoas poderão encontrar\nvocê pelo nome de usuário e entrar em\ncontato sem precisar saber seu telefone.\n\nVocê pode usar a-z, 0-9 e underline.\nO tamanho mínimo é de 5 caracteres.";
"lng_username_choose" = "Escolha seu nome de usuário";
"lng_username_invalid" = "Nome de usuário inválido.";
"lng_username_occupied" = "Nome de usuário ocupado.";
@ -662,7 +662,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_media_auto_groups" = "Grupos e canais";
"lng_media_auto_play" = "Reproduzir automaticamente";
"lng_emoji_category0" = "Frequentemente usado";
"lng_emoji_category0" = "Usados frequentemente";
"lng_emoji_category1" = "Pessoas";
"lng_emoji_category2" = "Natureza";
"lng_emoji_category3" = "Comidas e Bebidas";
@ -671,6 +671,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_emoji_category6" = "Objetos";
"lng_emoji_category7" = "Símbolos e Bandeiras";
"lng_recent_stickers" = "Usados frequentemente";
"lng_switch_stickers" = "Stickers";
"lng_switch_stickers_gifs" = "GIFs e Stickers";
"lng_switch_emoji" = "Emoji";
@ -694,7 +695,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_stickers_you_have" = "Gerenciar e reordenar os pacotes de sticker";
"lng_stickers_packs" = "Pacotes de Sticker";
"lng_stickers_reorder" = "Clique e arraste para reordenar os pacotes";
"lng_stickers_featured" = "Stickers em Destaque";
"lng_stickers_featured" = "Stickers Populares";
"lng_stickers_clear_recent" = "Limpar";
"lng_stickers_clear_recent_sure" = "Você tem certeza que deseja limpar seu histórico de stickers frequentes?";
"lng_stickers_remove" = "Remover";
@ -933,12 +934,19 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram Desktop foi atualizado para a versão {version}\n\n{changes}\n\nHistórico completo de mudanças disponível aqui:\n{link}";
"lng_new_version_minor" = "— Resolução de bugs e outras melhorias menores";
"lng_new_version_text" = "— O visualizador de fotos agora maneja corretamente a mudança de resolução da tela\n— O bug ao encaminhar fotos arrastando e soltando foi resolvido. \n— Várias melhorias de design e outras resoluções de bugs";
"lng_new_version_text" = "— Stickers populares. Veja e instale pacotes de stickers em destaque através da nova aba em Configurações.\n— Stickers arquivados. Stickers sem uso agora são arquivados automaticamente quando você chegar ao limite dos 200.\n— Pré-visualização de grupos. Visualize os grupos antes de entrar através do link de convite - veja quem mais está no grupo antes de entrar.\n— Novo reprodutor de vídeo interno.\n— Design melhorado nas conversas.";
"lng_menu_insert_unicode" = "Inserir caractere de controle Unicode";
"lng_full_name" = "{first_name} {last_name}";
"lng_confirm_phone_link_invalid" = "Esse link está quebrado ou expirado.";
"lng_confirm_phone_title" = "Cancelar exclusão da conta";
"lng_confirm_phone_about" = "Alguém com acesso ao seu número de telefone {phone} solicitou a exclusão de sua conta do Telegram e redefiniu sua senha de Verificação em Duas Etapas.\n\nSe não foi você, por favor insira o código que te enviamos via SMS.";
"lng_confirm_phone_success" = "Sucesso!\n\nO processo de exclusão foi cancelado em sua conta {phone}. Você pode fechar essa janela agora.";
"lng_confirm_phone_send" = "Enviar";
"lng_confirm_phone_enter_code" = "Por favor, insira o código.";
// Not used
"lng_topbar_info" = "Info";

View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,61,1
PRODUCTVERSION 0,9,61,1
FILEVERSION 0,10,0,0
PRODUCTVERSION 0,10,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.9.61.1"
VALUE "FileVersion", "0.10.0.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.61.1"
VALUE "ProductVersion", "0.10.0.0"
END
END
BLOCK "VarFileInfo"

View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,61,1
PRODUCTVERSION 0,9,61,1
FILEVERSION 0,10,0,0
PRODUCTVERSION 0,10,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Updater"
VALUE "FileVersion", "0.9.61.1"
VALUE "FileVersion", "0.10.0.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.61.1"
VALUE "ProductVersion", "0.10.0.0"
END
END
BLOCK "VarFileInfo"

View File

@ -26,6 +26,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#endif
#include "styles/style_overview.h"
#include "styles/style_mediaview.h"
#include "lang.h"
#include "data/data_abstract_structure.h"
#include "history/history_service_layout.h"
@ -2169,7 +2170,7 @@ namespace {
prepareCorners(InShadowCorners, st::msgRadius, st::msgInShadow);
prepareCorners(InSelectedShadowCorners, st::msgRadius, st::msgInShadowSelected);
prepareCorners(ForwardCorners, st::msgRadius, st::forwardBg);
prepareCorners(MediaviewSaveCorners, st::msgRadius, st::medviewSaveMsg);
prepareCorners(MediaviewSaveCorners, st::mediaviewControllerRadius, st::medviewSaveMsg);
prepareCorners(EmojiHoverCorners, st::buttonRadius, st::emojiPanHover);
prepareCorners(StickerHoverCorners, st::buttonRadius, st::emojiPanHover);
prepareCorners(BotKeyboardCorners, st::buttonRadius, st::botKbBg);

View File

@ -1053,7 +1053,7 @@ void AppClass::checkMapVersion() {
QString versionFeatures;
if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9058) {
versionFeatures = QString::fromUtf8("\xe2\x80\x94 Alpha version of an embedded video player");
} else if (Local::oldMapVersion() < 9056) {
} else if (Local::oldMapVersion() < 10000) {
versionFeatures = langNewVersionText();
} else {
versionFeatures = lang(lng_new_version_minor).trimmed();

View File

@ -22,9 +22,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "core/basic_types.h"
#define BETA_VERSION_MACRO (9061001ULL)
#define BETA_VERSION_MACRO (0ULL)
constexpr int AppVersion = 9061;
constexpr str_const AppVersionStr = "0.9.61";
constexpr int AppVersion = 10000;
constexpr str_const AppVersionStr = "0.10";
constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

View File

@ -183,17 +183,17 @@ void Controller::grabFinish() {
void Controller::resizeEvent(QResizeEvent *e) {
int playTop = (height() - _playPauseResume->height()) / 2;
_playPauseResume->moveToLeft(playTop, playTop);
_playPauseResume->moveToLeft(st::mediaviewPlayPauseLeft, playTop);
int fullScreenTop = (height() - _fullScreenToggle->height()) / 2;
_fullScreenToggle->moveToRight(fullScreenTop, fullScreenTop);
_fullScreenToggle->moveToRight(st::mediaviewPlayPauseLeft, fullScreenTop);
_volumeController->moveToRight(fullScreenTop + _fullScreenToggle->width() + fullScreenTop, (height() - _volumeController->height()) / 2);
_playback->resize(width() - playTop - _playPauseResume->width() - playTop - fullScreenTop - _volumeController->width() - fullScreenTop - _fullScreenToggle->width() - fullScreenTop, _volumeController->height());
_playback->moveToLeft(playTop + _playPauseResume->width() + playTop, st::mediaviewPlaybackTop);
_volumeController->moveToRight(st::mediaviewPlayPauseLeft + _fullScreenToggle->width() + st::mediaviewVolumeLeft, (height() - _volumeController->height()) / 2);
_playback->resize(width() - st::mediaviewPlayPauseLeft - _playPauseResume->width() - playTop - fullScreenTop - _volumeController->width() - st::mediaviewVolumeLeft - _fullScreenToggle->width() - st::mediaviewPlayPauseLeft, st::mediaviewSeekSize.height());
_playback->moveToLeft(st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop, st::mediaviewPlaybackTop);
_playedAlready->moveToLeft(playTop + _playPauseResume->width() + playTop, st::mediaviewPlayProgressTop);
_toPlayLeft->moveToRight(width() - (playTop + _playPauseResume->width() + playTop) - _playback->width(), st::mediaviewPlayProgressTop);
_playedAlready->moveToLeft(st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop, st::mediaviewPlayProgressTop);
_toPlayLeft->moveToRight(width() - (st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop) - _playback->width(), st::mediaviewPlayProgressTop);
}
void Controller::paintEvent(QPaintEvent *e) {

View File

@ -61,6 +61,7 @@ void Playback::updateState(const AudioPlaybackState &playbackState, bool reset)
_position = position;
_duration = duration;
}
update();
}
void Playback::setFadeOpacity(float64 opacity) {
@ -87,7 +88,9 @@ void Playback::paintEvent(QPaintEvent *e) {
p.setPen(Qt::NoPen);
p.setRenderHint(QPainter::HighQualityAntialiasing);
auto over = _a_over.current(getms(), _over ? 1. : 0.);
auto ms = getms();
_a_progress.step(ms);
auto over = _a_over.current(ms, _over ? 1. : 0.);
int skip = (st::mediaviewSeekSize.width() / 2);
int length = (width() - st::mediaviewSeekSize.width());
float64 prg = _mouseDown ? _downProgress : a_progress.current();
@ -104,11 +107,17 @@ void Playback::paintEvent(QPaintEvent *e) {
p.setBrush(st::mediaviewPlaybackInactive);
p.drawRoundedRect(mid - radius, (height() - st::mediaviewPlaybackWidth) / 2, width() - (mid - radius), st::mediaviewPlaybackWidth, radius, radius);
}
int x = mid - skip;
p.setClipRect(rect());
p.setOpacity(_fadeOpacity * (over * st::mediaviewActiveOpacity + (1. - over) * st::mediaviewInactiveOpacity));
p.setBrush(st::mediaviewPlaybackActive);
p.drawRoundedRect(x, (height() - st::mediaviewSeekSize.height()) / 2, st::mediaviewSeekSize.width(), st::mediaviewSeekSize.height(), st::mediaviewSeekSize.width() / 2, st::mediaviewSeekSize.width() / 2);
if (over > 0) {
int x = mid - skip;
p.setClipRect(rect());
p.setOpacity(_fadeOpacity * st::mediaviewActiveOpacity);
auto seekButton = QRect(x, (height() - st::mediaviewSeekSize.height()) / 2, st::mediaviewSeekSize.width(), st::mediaviewSeekSize.height());
int remove = ((1. - over) * st::mediaviewSeekSize.width()) / 2.;
if (remove * 2 < st::mediaviewSeekSize.width()) {
p.setBrush(st::mediaviewPlaybackActive);
p.drawEllipse(seekButton.marginsRemoved(QMargins(remove, remove, remove, remove)));
}
}
}
void Playback::mouseMoveEvent(QMouseEvent *e) {

View File

@ -40,7 +40,7 @@ void VolumeController::setVolume(float64 volume) {
void VolumeController::paintEvent(QPaintEvent *e) {
Painter p(this);
int32 top = (height() - st::mediaviewVolumeIcon.height()) / 2;
int32 top = st::mediaviewVolumeIconTop;
int32 left = (width() - st::mediaviewVolumeIcon.width()) / 2;
int32 mid = left + qRound(st::mediaviewVolumeIcon.width() * _volume);
int32 right = left + st::mediaviewVolumeIcon.width();

View File

@ -31,7 +31,7 @@ mediaviewPlayProgressLabel: LabelSimple(defaultLabelSimple) {
font: semiboldFont;
textFg: #ffffffc7;
}
mediaviewPlayProgressTop: 8px;
mediaviewPlayProgressTop: 11px;
mediaviewPlayButton: IconButton {
width: 25px;
height: 24px;
@ -50,6 +50,8 @@ mediaviewPlayButton: IconButton {
mediaviewPauseIcon: icon {
{ "media_pause", #ffffff, point(1px, 1px) }
};
mediaviewPlayPauseLeft: 17px;
mediaviewVolumeLeft: 15px;
mediaviewFullScreenButton: IconButton(mediaviewPlayButton) {
icon: icon {
@ -65,13 +67,15 @@ mediaviewFullScreenOutIcon: icon {
mediaviewPlaybackActive: #ffffff;
mediaviewPlaybackInactive: #474747;
mediaviewPlaybackWidth: 3px;
mediaviewPlaybackTop: 23px;
mediaviewSeekSize: size(2px, 13px);
mediaviewPlaybackTop: 28px;
mediaviewSeekSize: size(11px, 11px);
mediaviewVolumeSize: size(44px, 12px);
mediaviewVolumeSize: size(44px, 18px);
mediaviewVolumeIcon: icon {
{ "media_volume", mediaviewPlaybackInactive, point(0px, 0px) },
};
mediaviewVolumeOnIcon: icon {
{ "media_volume", mediaviewPlaybackActive, point(0px, 0px) },
};
mediaviewVolumeIconTop: 6px;
mediaviewControllerRadius: 25px;

View File

@ -2558,8 +2558,8 @@
QT_PATH = "/usr/local/tdesktop/Qt-5.6.0";
SDKROOT = macosx;
SYMROOT = ./../Mac;
TDESKTOP_MAJOR_VERSION = 0.9;
TDESKTOP_VERSION = 0.9.61;
TDESKTOP_MAJOR_VERSION = 0.10;
TDESKTOP_VERSION = 0.10;
};
name = Release;
};
@ -2699,8 +2699,8 @@
QT_PATH = "/usr/local/tdesktop/Qt-5.6.0";
SDKROOT = macosx;
SYMROOT = ./../Mac;
TDESKTOP_MAJOR_VERSION = 0.9;
TDESKTOP_VERSION = 0.9.61;
TDESKTOP_MAJOR_VERSION = 0.10;
TDESKTOP_VERSION = 0.10;
};
name = Debug;
};

View File

@ -1,6 +1,6 @@
AppVersion 9061
AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.61
AppVersionStr 0.9.61
AppVersion 10000
AppVersionStrMajor 0.10
AppVersionStrSmall 0.10
AppVersionStr 0.10.0
AlphaChannel 0
BetaVersion 9061001
BetaVersion 0