LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

fix tray icons, download icons, and fix embed route

Browse source
This commit is contained in:
Sean Yesmunt 2019-12-20 11:26:55 -05:00
parent f534d3548e
commit 662cf9c906
6 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
electron-builder.json
View file

@ -19,6 +19,16 @@
"from": "./static/daemon/", "from": "./static/daemon/",
"to": "static/daemon/", "to": "static/daemon/",
"filter": ["**/*"] "filter": ["**/*"]
},
{
"from": "./static/img",
"to": "static/img",
"filter": ["**/*"]
},
{
"from": "./static/font",
"to": "static/font",
"filter": ["**/*"]
} }
], ],
"publish": [ "publish": [

6
electron/createWindow.js
View file

@ -32,7 +32,7 @@ export default appState => {
// If state is undefined, create window as maximized. // If state is undefined, create window as maximized.
width: windowState.width === undefined ? width : windowState.width, width: windowState.width === undefined ? width : windowState.width,
height: windowState.height === undefined ? height : windowState.height, height: windowState.height === undefined ? height : windowState.height,
icon: 'static/img/tray/windows/tray.png', icon: 'static/img/tray/default/tray.png',
webPreferences: { webPreferences: {
// Disable renderer process's webSecurity on development to enable CORS. // Disable renderer process's webSecurity on development to enable CORS.
webSecurity: !isDev, webSecurity: !isDev,
@ -133,8 +133,8 @@ export default appState => {
// A backup incase https://github.com/electron/electron/issues/7779 happens // A backup incase https://github.com/electron/electron/issues/7779 happens
window.webContents.once('dom-ready', () => { window.webContents.once('dom-ready', () => {
startMinimized && window.hide() startMinimized && window.hide();
}) });
window.webContents.on('did-finish-load', () => { window.webContents.on('did-finish-load', () => {
window.webContents.session.setUserAgent(`LBRY/${app.getVersion()}`); window.webContents.session.setUserAgent(`LBRY/${app.getVersion()}`);

2
lbrytv/src/routes.js
View file

@ -6,7 +6,7 @@ const send = require('koa-send');
const router = new Router(); const router = new Router();
router.get(`/embed/:claimName/:claimId`, async ctx => { router.get(`/$/embed/:claimName/:claimId`, async ctx => {
const { claimName, claimId } = ctx.params; const { claimName, claimId } = ctx.params;
const streamUrl = generateStreamUrl(claimName, claimId, LBRY_TV_API); const streamUrl = generateStreamUrl(claimName, claimId, LBRY_TV_API);
ctx.redirect(streamUrl); ctx.redirect(streamUrl);

2
package.json
View file

@ -205,7 +205,7 @@
"yarn": "^1.3" "yarn": "^1.3"
}, },
"lbrySettings": { "lbrySettings": {
"lbrynetDaemonVersion": "0.50.0", "lbrynetDaemonVersion": "0.50.1",
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip", "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
"lbrynetDaemonDir": "static/daemon", "lbrynetDaemonDir": "static/daemon",
"lbrynetDaemonFileName": "lbrynet" "lbrynetDaemonFileName": "lbrynet"

1
ui/scss/component/_file-properties.scss
View file

@ -7,7 +7,6 @@
.icon { .icon {
margin-bottom: -1px; margin-bottom: -1px;
stroke: var(--color-subtitle);
} }
& > *:not(:last-child) { & > *:not(:last-child) {

2
ui/util/lbrytv.js
View file

@ -6,7 +6,7 @@ function generateStreamUrl(claimName, claimId, apiUrl) {
} }
function generateEmbedUrl(claimName, claimId) { function generateEmbedUrl(claimName, claimId) {
return `${URL}/embed/${claimName}/${claimId}`; return `${URL}/$/embed/${claimName}/${claimId}`;
} }
// module.exports needed since the web server imports this function // module.exports needed since the web server imports this function