Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/ytmdesktop/ytmdesktop …
Browse files Browse the repository at this point in the history 
…into development
  • Loading branch information
@adlerluiz
adlerluiz committed Aug 3, 2020
2 parents a586f5d + 5292d84 commit 043c064
Show file tree
Hide file tree
Showing 12 changed files with 321 additions and 350 deletions.
6 changes: 4 additions & 2 deletions main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,11 +967,13 @@ function createWindow() {
),
width: settingsProvider.get('settings-miniplayer-size'),
height: settingsProvider.get('settings-miniplayer-size'),
backgroundColor: '#000000',
backgroundColor: '#232323',
minWidth: 100,
minHeight: 100,
autoHideMenuBar: true,
skipTaskbar: false,
skipTaskbar: !settingsProvider.get(
'settings-miniplayer-show-task'
),
webPreferences: {
nodeIntegration: true,
},
Expand Down
505 changes: 224 additions & 281 deletions package-lock.json
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,35 @@
}
},
"devDependencies": {
"electron": "^9.1.1",
"electron-builder": "^22.7.0",
"electron": "^9.1.2",
"electron-builder": "^22.8.0",
"electron-rebuild": "^1.11.0",
"husky": "^4.2.5",
"prettier": "^2.0.5",
"pretty-quick": "^2.0.1"
},
"dependencies": {
"ace-builds": "^1.4.12",
"discord-rpc": "^3.1.1",
"discord-rpc": "^3.1.3",
"electron-canvas-to-buffer": "^2.0.0",
"electron-clipboard-watcher": "^1.0.1",
"electron-google-analytics": "^1.0.0",
"electron-is-dev": "^1.2.0",
"electron-localshortcut": "^3.2.1",
"electron-native-notification": "^1.2.1",
"electron-store": "^5.2.0",
"electron-updater": "^4.3.1",
"electron-store": "^6.0.0",
"electron-updater": "^4.3.4",
"i18n": "^0.10.0",
"image-to-base64": "^2.1.0",
"js-base64": "^2.5.3",
"image-to-base64": "^2.1.1",
"js-base64": "^3.3.3",
"markdown": "^0.5.0",
"node-fetch": "^2.6.0",
"node-vibrant": "^3.1.5",
"qrcode-generator": "^1.4.4",
"register-scheme": "0.0.2",
"scribble": "0.0.5",
"socket.io": "^2.3.0",
"uuid": "^8.2.0",
"uuid": "^8.3.0",
"ws": "^7.3.1"
},
"optionalDependencies": {
Expand Down
17 changes: 9 additions & 8 deletions src/locales/en.json
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
{
"DOUBLE_CLICK_TO_RESET_POSITION": "Double Click to Reset Position",
"LABEL_CHANGELOG": "What's new",
"LABEL_EXIT": "Exit",
"LABEL_SAVE": "Save",
"LABEL_SAVED": "Saved",
"LABEL_GUEST": "Guest",
"LABEL_LOADING": "Loading...",
"LABEL_LYRICS": "Lyrics",
"LABEL_LYRICS_NOT_FOUND": "Lyrics not found",
"LABEL_MINIPLAYER": "Miniplayer",
"LABEL_PLAY_MUSIC": "Play music",
"LABEL_SAVE": "Save",
"LABEL_SAVED": "Saved",
"LABEL_SETTINGS": "Settings",
"LABEL_SETTINGS_DISCORD": "Discord settings",
"LABEL_SETTINGS_DISCORD_SHOW_TITLE": "Show title",
"LABEL_SETTINGS_DISCORD_SHOW_ARTIST": "Show artist",
"LABEL_SETTINGS_DISCORD_SHOW_TIME": "Show track time",
"LABEL_SETTINGS_DISCORD_SHOW_IDLE": "Show track when playback is paused",
"LABEL_SETTINGS_DISCORD_SHOW_TIME": "Show track time",
"LABEL_SETTINGS_DISCORD_SHOW_TITLE": "Show title",
"LABEL_SETTINGS_RELAUNCH": "Apply and restart",
"LABEL_SETTINGS_SHOW_HIDE_WINDOW": "Show/Hide Main Window",
"LABEL_SETTINGS_TAB_ABOUT": "About",
"LABEL_SETTINGS_TAB_APPEARANCE_TASKBAR_PROGRESSBAR": "Show track progress on taskbar",
"LABEL_SETTINGS_TAB_APPEARENCE": "Appearance",
"LABEL_SETTINGS_TAB_GENERAL": "General",
"LABEL_SETTINGS_TAB_GENERAL_AUDIO_NO_DEVICES_FOUND": "No devices found",
"LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER": "Remote Control",
"LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER_INFO": "Click here and scan QR Code",
"LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER_PROTECT": "Protect remote control with password",
"LABEL_SETTINGS_TAB_GENERAL_CONTINUE_WHERE_LEFT_OF": "Continue where you left off",
"LABEL_SETTINGS_TAB_GENERAL_CUSTOM_THEME": "Custom theme",
"LABEL_SETTINGS_TAB_GENERAL_DISABLE_HARDWARE_ACCELERATION": "Disable hardware acceleration",
"LABEL_SETTINGS_TAB_GENERAL_DISCORD_RICH_PRESENCE": "Discord Rich Presence",
"LABEL_SETTINGS_TAB_GENERAL_KEEP_BACKGROUND": "Keep YTMDesktop on background when window close",
"LABEL_SETTINGS_TAB_GENERAL_PAGE_ZOOM": "Page zoom",
Expand All @@ -40,7 +43,6 @@
"LABEL_SETTINGS_TAB_GENERAL_SHOW_NOTIFICATIONS": "Show notifications",
"LABEL_SETTINGS_TAB_GENERAL_START_MINIMIZED": "Start minimized",
"LABEL_SETTINGS_TAB_GENERAL_START_ON_BOOT": "Start on Boot (Mac/Win)",
"LABEL_SETTINGS_TAB_GENERAL_AUDIO_NO_DEVICES_FOUND": "No devices found",
"LABEL_SETTINGS_TAB_INTEGRATION": "Integration",
"LABEL_SETTINGS_TAB_LAST_FM_SCROBBLER": "Last FM (Scrobbler)",
"LABEL_SETTINGS_TAB_LAST_FM_SCROBBLER_AUTHORIZE": "Save and authorize",
Expand All @@ -54,6 +56,7 @@
"LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_LARGE": "Large",
"LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_NORMAL": "Normal",
"LABEL_SETTINGS_TAB_MINIPLAYER_SELECT_SIZE_SMALL": "Small",
"LABEL_SETTINGS_TAB_MINIPLAYER_SHOW_TASK": "Show on taskbar",
"LABEL_SETTINGS_TAB_RAINMETER_WEB_NOW_PLAYING": "Rainmeter (WebNowPlaying)",
"LABEL_SETTINGS_TAB_READ_CLIPBOARD": "Read clipboard for youtube links",
"LABEL_SETTINGS_TAB_SHORTCUTS": "Shortcuts",
Expand All @@ -71,8 +74,6 @@
"MEDIA_CONTROL_SHUFFLE": "Shuffle",
"MEDIA_CONTROL_THUMBS_DOWN": "Thumbs Down",
"MEDIA_CONTROL_THUMBS_UP": "Thumbs Up",
"LABEL_CHANGELOG": "What's new",
"MEDIA_CONTROL_VOLUME_UP": "Increase volume",
"MEDIA_CONTROL_VOLUME_DOWN": "Decrease volume",
"LABEL_SETTINGS_TAB_GENERAL_DISABLE_HARDWARE_ACCELERATION": "Disable hardware acceleration"
"MEDIA_CONTROL_VOLUME_UP": "Increase volume"
}
17 changes: 9 additions & 8 deletions src/locales/pt.json
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
{
"DOUBLE_CLICK_TO_RESET_POSITION": "Clique duplo para resetar a posição",
"LABEL_CHANGELOG": "O que há de novo",
"LABEL_EXIT": "Sair",
"LABEL_SAVE": "Salvar",
"LABEL_SAVED": "Salvo",
"LABEL_GUEST": "Convidado",
"LABEL_LOADING": "Carregando...",
"LABEL_LYRICS": "Letra da Música",
"LABEL_LYRICS_NOT_FOUND": "Letra não encontrada",
"LABEL_MINIPLAYER": "Miniplayer",
"LABEL_PLAY_MUSIC": "Inicie uma música",
"LABEL_SAVE": "Salvar",
"LABEL_SAVED": "Salvo",
"LABEL_SETTINGS": "Configurações",
"LABEL_SETTINGS_DISCORD": "Configurações Discord",
"LABEL_SETTINGS_DISCORD_SHOW_TITLE": "Mostrar título",
"LABEL_SETTINGS_DISCORD_SHOW_ARTIST": "Mostrar artista",
"LABEL_SETTINGS_DISCORD_SHOW_TIME": "Mostrar duração da faixa",
"LABEL_SETTINGS_DISCORD_SHOW_IDLE": "Mostrar faixa quando estiver pausado",
"LABEL_SETTINGS_DISCORD_SHOW_TIME": "Mostrar duração da faixa",
"LABEL_SETTINGS_DISCORD_SHOW_TITLE": "Mostrar título",
"LABEL_SETTINGS_RELAUNCH": "Aplicar e reiniciar",
"LABEL_SETTINGS_SHOW_HIDE_WINDOW": "Mostrar/Ocultar janela principal",
"LABEL_SETTINGS_TAB_ABOUT": "Sobre",
"LABEL_SETTINGS_TAB_APPEARANCE_TASKBAR_PROGRESSBAR": "Mostrar o progresso da faixa na barra de tarefas",
"LABEL_SETTINGS_TAB_APPEARENCE": "Aparência",
"LABEL_SETTINGS_TAB_GENERAL": "Geral",
"LABEL_SETTINGS_TAB_GENERAL_AUDIO_NO_DEVICES_FOUND": "Nenhum dispositivo encontrado",
"LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER": "Controle Remoto",
"LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER_INFO": "Clique aqui e escaneie o QR Code",
"LABEL_SETTINGS_TAB_GENERAL_COMPANION_SERVER_PROTECT": "Proteger controle remoto com senha",
"LABEL_SETTINGS_TAB_GENERAL_CONTINUE_WHERE_LEFT_OF": "Continuar de onde parou",
"LABEL_SETTINGS_TAB_GENERAL_CUSTOM_THEME": "Tema customizado",
"LABEL_SETTINGS_TAB_GENERAL_DISABLE_HARDWARE_ACCELERATION": "Desabilitar aceleração de hardware",
"LABEL_SETTINGS_TAB_GENERAL_DISCORD_RICH_PRESENCE": "Discord Rich Presence",
"LABEL_SETTINGS_TAB_GENERAL_KEEP_BACKGROUND": "Manter YTMDesktop em segundo plano quando fechar a janela principal",
"LABEL_SETTINGS_TAB_GENERAL_PAGE_ZOOM": "Zoom da página",
Expand All @@ -40,7 +43,6 @@
"LABEL_SETTINGS_TAB_GENERAL_SHOW_NOTIFICATIONS": "Mostrar notificações",
"LABEL_SETTINGS_TAB_GENERAL_START_MINIMIZED": "Iniciar minimizado",
"LABEL_SETTINGS_TAB_GENERAL_START_ON_BOOT": "Iniciar com o sistema (Mac/Win)",
"LABEL_SETTINGS_TAB_GENERAL_AUDIO_NO_DEVICES_FOUND": "Nenhum dispositivo encontrado",
"LABEL_SETTINGS_TAB_INTEGRATION": "Integração",
"LABEL_SETTINGS_TAB_LAST_FM_SCROBBLER": "Last FM (Scrobbler)",
"LABEL_SETTINGS_TAB_LAST_FM_SCROBBLER_AUTHORIZE": "Salvar e autorizar",
Expand All @@ -50,6 +52,7 @@
"LABEL_SETTINGS_TAB_MINIPLAYER_ALWAYS_SHOW_CONTROLS": "Sempre mostrar os controles",
"LABEL_SETTINGS_TAB_MINIPLAYER_PAINT_CONTROLS": "Colorir os controles com as cores do álbum",
"LABEL_SETTINGS_TAB_MINIPLAYER_RESIZABLE": "Permitir redimensionar",
"LABEL_SETTINGS_TAB_MINIPLAYER_SHOW_TASK": "Mostrar na barra de tarefas",
"LABEL_SETTINGS_TAB_RAINMETER_WEB_NOW_PLAYING": "Rainmeter (WebNowPlaying)",
"LABEL_SETTINGS_TAB_READ_CLIPBOARD": "Leia a área de transferência para obter links do Youtube",
"LABEL_SETTINGS_TAB_SHORTCUTS": "Atalhos",
Expand All @@ -67,8 +70,6 @@
"MEDIA_CONTROL_SHUFFLE": "Misturar",
"MEDIA_CONTROL_THUMBS_DOWN": "Descurtir",
"MEDIA_CONTROL_THUMBS_UP": "Curtir",
"LABEL_CHANGELOG": "O que há de novo",
"MEDIA_CONTROL_VOLUME_UP": "Aumentar volume",
"MEDIA_CONTROL_VOLUME_DOWN": "Diminuir volume",
"LABEL_SETTINGS_TAB_GENERAL_DISABLE_HARDWARE_ACCELERATION": "Desabilitar aceleração de hardware"
"MEDIA_CONTROL_VOLUME_UP": "Aumentar volume"
}
1 change: 1 addition & 0 deletions src/locales/scaffold.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"LABEL_SETTINGS_TAB_MINIPLAYER_ALWAYS_SHOW_CONTROLS": "Always show controls",
"LABEL_SETTINGS_TAB_MINIPLAYER_PAINT_CONTROLS": "Paint controls with album color",
"LABEL_SETTINGS_TAB_MINIPLAYER_RESIZABLE": "Allow resizing",
"LABEL_SETTINGS_TAB_MINIPLAYER_SHOW_TASK": "Show on taskbar",
"LABEL_SETTINGS_TAB_RAINMETER_WEB_NOW_PLAYING": "Rainmeter (WebNowPlaying)",
"LABEL_SETTINGS_TAB_READ_CLIPBOARD": "Read clipboard for youtube links",
"LABEL_SETTINGS_TAB_SHORTCUTS": "Shortcuts",
Expand Down
11 changes: 8 additions & 3 deletions src/pages/miniplayer/miniplayer.css
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
body {
background-repeat: no-repeat;
background-size: 100vmin;
}

body:hover .player-info,
body:hover .cmd-btn,
body.showinfo .player-info,
Expand All @@ -18,12 +23,12 @@ body.showinfo #background {

.player-info {
filter: opacity(0);
height: 78vmin
height: 78vmin;
}

.cmd-bar {
margin: 4px 4px 0;
height: 10vmin
height: 10vmin;
}

#btn-drag {
Expand Down Expand Up @@ -108,7 +113,7 @@ body.showinfo #background {
.progress-bar {
margin-top: 1.4vmin;
height: 0.6vmin;
width: 100vw;
width: 100vmin;
}

#progress {
Expand Down
4 changes: 0 additions & 4 deletions src/pages/miniplayer/miniplayer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@

<div id="background"></div>
<div id="secondsEffect"></div>
<!--div class="hover-top"></div>
<div class="hover-left"></div>
<div class="hover-right"></div>
<div class="hover-bottom"></div-->
</body>

<script src="./miniplayer.js"></script>
Expand Down
1 change: 1 addition & 0 deletions src/pages/miniplayer/miniplayer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ document.addEventListener('dblclick', (ev) => {

function setPlayerInfo(data) {
document.title = `${data.track.title} - ${data.track.author}`
body.style.backgroundImage = `url(${data.track.cover})`
background.style.backgroundImage = `url(${data.track.cover})`
title.innerHTML = data.track.title || 'Title'
author.innerHTML = data.track.author || 'Author'
Expand Down
88 changes: 53 additions & 35 deletions src/pages/settings/settings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,25 @@
</td>
</tr>

<tr>
<td>
<span
i18n="i18n_LABEL_SETTINGS_TAB_GENERAL_DISABLE_HARDWARE_ACCELERATION"
></span>
</td>
<td class="right">
<div class="switch">
<label>
<input
type="checkbox"
id="settings-disable-hardware-acceleration"
/>
<span class="lever"></span>
</label>
</div>
</td>
</tr>

<tr>
<td>
<span
Expand All @@ -203,30 +222,24 @@
</td>
<td>
<select id="settings-app-language">
<option value="en"
>English</option
<option value="id"
>Bahasa Indonesia</option
>
<option value="de"
>Deutsch</option
>
<option value="en"
>English</option
>
<option value="es"
>Español</option
>
<option value="fr"
>Français</option
>
<option value="id"
>Bahasa Indonesia</option
>
<option value="it"
>Italiano</option
>
<option value="ja"
>日本語</option
>
<option value="ko"
>한국어</option
>
<option value="nl"
>Nederlands</option
>
Expand All @@ -236,20 +249,26 @@
<option value="pt"
>Português</option
>
<option value="ru"
>Русский</option
>
<option value="tr"
>Türkçe</option
>
<option value="ru"
>Русский</option
>
<option value="uk"
>Українська</option
>
<option value="ar"
>العربية</option
>
<option value="ja"
>日本語</option
>
<option value="zh"
>简体中文</option
>
<option value="ar"
>العربية</option
<option value="ko"
>한국어</option
>
</select>
</td>
Expand All @@ -268,25 +287,6 @@
</td>
</tr>

<tr>
<td>
<span
i18n="i18n_LABEL_SETTINGS_TAB_GENERAL_DISABLE_HARDWARE_ACCELERATION"
></span>
</td>
<td class="right">
<div class="switch">
<label>
<input
type="checkbox"
id="settings-disable-hardware-acceleration"
/>
<span class="lever"></span>
</label>
</div>
</td>
</tr>

<tr class="macos-specific">
<td colspan="2">
<div
Expand Down Expand Up @@ -394,6 +394,24 @@
</div>
</td>
</tr>
<tr>
<td>
<span
i18n="i18n_LABEL_SETTINGS_TAB_MINIPLAYER_SHOW_TASK"
></span>
</td>
<td class="right">
<div class="switch">
<label>
<input
type="checkbox"
id="settings-miniplayer-show-task"
/>
<span class="lever"></span>
</label>
</div>
</td>
</tr>
</tbody>
</table>
</div>
Expand Down
Loading

0 comments on commit 043c064

Please sign in to comment.