From 493d79d33d6a064b100c59e065ebcfa23e376466 Mon Sep 17 00:00:00 2001 From: Molunerfinn Date: Thu, 7 Dec 2017 14:33:14 +0800 Subject: [PATCH] Added: iconfont --- src/main/index.js | 1 + src/renderer/assets/fonts/iconfont.css | 23 +++++++++++++ src/renderer/assets/fonts/iconfont.eot | Bin 0 -> 2728 bytes src/renderer/assets/fonts/iconfont.svg | 42 ++++++++++++++++++++++++ src/renderer/assets/fonts/iconfont.ttf | Bin 0 -> 2560 bytes src/renderer/assets/fonts/iconfont.woff | Bin 0 -> 1820 bytes src/renderer/components/SettingPage.vue | 4 +-- src/renderer/components/TrayPage.vue | 4 +++ src/renderer/main.js | 1 + 9 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 src/renderer/assets/fonts/iconfont.css create mode 100644 src/renderer/assets/fonts/iconfont.eot create mode 100644 src/renderer/assets/fonts/iconfont.svg create mode 100644 src/renderer/assets/fonts/iconfont.ttf create mode 100644 src/renderer/assets/fonts/iconfont.woff diff --git a/src/main/index.js b/src/main/index.js index f91fefd..b371e24 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -190,6 +190,7 @@ const toggleWindow = () => { const showWindow = () => { const position = getWindowPosition() window.setPosition(position.x, position.y, false) + window.webContents.send('updateFiles') window.show() window.focus() } diff --git a/src/renderer/assets/fonts/iconfont.css b/src/renderer/assets/fonts/iconfont.css new file mode 100644 index 0000000..ca8fca2 --- /dev/null +++ b/src/renderer/assets/fonts/iconfont.css @@ -0,0 +1,23 @@ + +@font-face {font-family: "iconfont"; + src: url('iconfont.eot?t=1512627299425'); /* IE9*/ + src: url('iconfont.eot?t=1512627299425#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'), + url('iconfont.ttf?t=1512627299425') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('iconfont.svg?t=1512627299425#iconfont') format('svg'); /* iOS 4.1- */ +} + +[class*=" el-icon-ui"], [class^=el-icon-ui] { + font-family:"iconfont" !important; + font-size:16px; + font-style:normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.el-icon-ui-weibo:before { content: "\e61c"; } + +.el-icon-ui-upload:before { content: "\e61b"; } + +.el-icon-ui-qiniu:before { content: "\e601"; } + diff --git a/src/renderer/assets/fonts/iconfont.eot b/src/renderer/assets/fonts/iconfont.eot new file mode 100644 index 0000000000000000000000000000000000000000..2e61730d0f83dc0607b42e0034ecdab0840ca3e0 GIT binary patch literal 2728 zcmcgueQaCR6+h?R_u=^CId<&ld^vgfsNJpMIdxpSw8iPtlJF4`Mj&g%q}Fwu#F0NT z$4OJE6_z$W#YB-%1^j^m0`Vab2n767gfu4YpYRWw(4=jQZd0^r>L#Xvv>}|G``)t( zZU5%^-TQv$ch0%@o_nwFJ+HU{fC>U5094D|0>oTEfu`@a<*T(tlbF)X%U9VJYKJ1^ zp$ZjPwCXx3G`I%}umtN+f*jO{(P5658my7Eur**mm@rD38~GD0I`u#UIE+rs-Z$}9 z^PMY19wc^RW;T(W`{!+KB%dRBE?>^ACRaXrj^w{ld2Ok5c5$}yJBpHTQF(p2kX!J7 zko|~kKc|vjCPMv;KScNvmEq-beY4~5gaCg_Rj5?W=kR~*Kjixq$=-5qa}~pImh_z@ z8*XkerVfbBuHqqX3F?QbAZNN_@5&@_d(R}-nEr!_3rj|PC zKk_AbY}-%o`X(<7?eFfE1pE|UcHSSl{%h;t;;2`v(XR*UvHk$;UBKn53klx>s#3HyuxfFzRd)jdPH?>u)e-nsxs zVRNU~j-NN6K?Y9rqAO1GEWWKmP!=?m5u3&p$9{oW;W$sHV<8gAM_AY~()0;iv}a3bzxT%p{(JBDx(>Y-bJXF*0&F^khPdMtu`oM5b`h(x z(`y%N#)az!_Tew^Q?Y8hm-!{$2_3MP{>;aL&J9%d;h@H%I1o>nY#)XP-n&5aEt({Yo<@jxoe4r5Y}B6jt3&j$DO2KfbacgFi3 zY~I0Mz;ORiuRnWJ^Y)SPP}1mdo$&^PUBTevE=87Ij7feC%MrazZgVTm7iE8U_)`B5 zSU-BZ;@#8pKBFg?dn8qf?uoP^HX7K`V`wjr2f73Fp6k{-f?aC6&(+!O8yXJbnZJ5E zJG{}@UqsBbdv<@rzvA%V#4k1>2+!O8Mbj^ex0%P`4bz>r*Sr$okgqO z>c6R|WKnm&*Nkb+EaRtPbSTmuTm{Dk^4r4f^ z(=JJ84vbNiPGD?M#b0B)?}#rD@E!36n)l1--`+;QEH}T{-fn)8k*~b{_7&NxztT8s z_uOw8;=HGwaqV%h;jMWCh=HyE)#M<5yMdM``Tskhd$fz9n~R!94?OSl*=H617kf`! zW|&q~T~P<)w1N>DuPHW!^=9;RCX4Y@%-#UPKpz`U^WS%LO6*Vno%xZrH!3&Qk?Fqk zk0}9fXl8cqq|X;Zmu_U-T7F-sN2C1(+iX37lJ+ajKYCO-nQq9EfBOB2A7ALZxsS2v z=*`diRCjRjmjPeE7d$`X@%~xtUw|Nd=A5bkVUq1bNt~2n2QyG1>R?X%u!AMSbeCAI z$aEv89IOyO?qE0UgDD4l=sc*2lUt(u8GZ;4IvDAqf78K?5`+&O%!&Wl!4ly=I#{Ov z+7$;Y(2m@}ZkWRk2YVofMfb5WER;%BW3^UYDdg+sa=pHKD3K5y3Es?C z%XC2 + + + + +Created by iconfont + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/renderer/assets/fonts/iconfont.ttf b/src/renderer/assets/fonts/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..0276b8f4eaa7628b4b2d4536a6e1cbe13428e6db GIT binary patch literal 2560 zcmcguYit`u5T4n+hvUaNcII}7RMdGy0^(zlXq6w`%l>bBZR0ChhAE6kS`D(`&K{~AD(@OLfH+46$Esy?pN>_wLK!sM}t=>CcQXthehc67a($+JI3l9^pxb0w|^= zSUbG{>!w`S+o1~v0Iwb0e;f6zJFaUmpPNk+XGx?JS|kQdkM(&X{{v6cC^mMAt&;xH zdW+vf45=>znOmc6Xl|alZW{K$@>*v-eqMztnOM<_p*XFxXd8u~ENChNbsCRa_S3|Q zo&(fUgv3iA_TNUYh~*Eb1}R@(Ek4ua?mM?~fJy|32=&26URt z9*Y+nuxu5Y;+j>&#;kSJi`bR5&U*Pf|CX=|@5PH^*Vez}7kDeQz-HJ+S%0%w=PlT) zu^{$@;}Nz6{XMcj;L~`xFWjT{^+x#B80b}edMptS1r$|rqekwAdSZ!igoSZ?JjHfl zOb;Tqb+k`-H+6dXX|%V7yY8#q$eu-icVDMFwY7G`z_2f7wAhY0z1}vj_hFkN%QnU& zw}yp)-Xu5KmD+Q%yWM}G`wG^L&bDy-{wbHy;Y~jnF9tUSnh>j1Z0Rtx7lu9U9{NtS z>n+|kwb^BBZFlwc`|#K|j@A}uF!Z%pF3O(u_xP`T3Ur9TKDZq+kf&&UN^dBf?2BMn z-5$YsVwi#nY*Twf+v7=W#Y*$h18Lg zmH>$wh8xSpFKfDni0ssit;y+ZvYmLIpK)kR8jeb`LnC7B5OW{v3dJLw=ML_CZ2a6G z3I_fh+i{Q~A2=Kt?x{U__luJB;@wqIuk4*-Y-;a_s1NAD;6O0QdK_-IL&`tOX&B9~ zF_d1qr_1e7e@Qm$Up3B}9e0?9IOS+&TzlAQILl5CqNmM6HFc2x>7db*`v2_F9oiW& z%o)w0d!BK*>Sq=Ik-ZLslo1I<)fKfjOgk8$`9?%Sm|s#)BvTlUhw2F+4D_M?1pm0D zRbrq2Hhzt^IVe{bk?F3J4=Em}Z+v3%kjv#mn{FiST4sx{L!S8Q7c-2!b)$Z+m#N+a~yeG#U&aXuN0(jvw>r@5slUzTP#7XJ5 zFas5W7UsnFTUa7YcZummrW-kKVTJf%3)^7}j9J)0=RsMV+!Ec-a3$PlVT5LQ*}@Do zc+0|^`1dU=5&qP|GX2&rSy+K)9HBo92IT0dC_xcs%(_B$8<|_leijz# zKuME_joOX!Bw3eXf$W4=gAU#ZCEiA>F|sO}mK*1@082DljAmJ(IT=*ShM@Bl5P(qpRWn7kz WWphVL%Hn*!l%AIF$`x~q0Dl2HGlBg8 literal 0 HcmV?d00001 diff --git a/src/renderer/assets/fonts/iconfont.woff b/src/renderer/assets/fonts/iconfont.woff new file mode 100644 index 0000000000000000000000000000000000000000..dbb1dab238534a619e8cedc6d370c142cbe156ca GIT binary patch literal 1820 zcmY*ZcT|(-8vnio2!SvKv{yzz1*)|{D98$X7EORKDl;J@EE9qRNdQY&L6l(_D$7+0 z$}oxr0~Lwvc|~jm1!T&Wq9RKJ_oKb{kNceSJMZ)Rz0Ww$d(QL5;vF0S5P%G!3P|sr zQouia&;NgOBzW3Dmy(cb0Kw+L&ZGBu0!AOw%pq3G`v9Pzos+0K}D`I1B_Mxh9L&P)LNdy;`ae4kO;exuG;B3(|-X z-v>cy-vR)fjU?~IF(HoH1Go)aqmfupUvUn^H6WltWq?g5(I}913+inT05F<`$Ib;t zWHgi~F%QM;&0*I%dbo~NLM8?ii4#Fr$O9xIGwKtPG(jYiIKUMY8ApxNaz*vPdmeJa zWYN@=i!k8QAvhlRJ7=fgI4P+hDdk??0tybdwM?ZZ^b^~JUgoZ$wu|^AhwXsZfiG<`p&QF($!a^lxY7TwQj$efb|}3ST5Uf zH)c2?zWtg*49h+y?ml}U(Y_bxMHszR6o-aom7I3(zpQGn#P|Nw6KgQ$j~#nSz-o+q zY8Yv%Exs{U`gWx)3)_f9772A-resadws5V`aq>p-&Rv{~8g`l2?6Ea>oa`_r^G9?P zp7bS7Jll+t(M$#v9IL!l+|7SxiWZyh$2D)*D&0;@)ZB0uFBmZQanO0uD+&5?WINS= zOVMqUcBQ|pU1BIQQ|jNmPn|JgnDr?fi<i2kyaunLb_?A09r?XdCCl$uDl7-x6IWEP8E}S@y*)NHx5I=k7buOtp{Z^UA=8DP9>e~@b@y?3D0-R zjWN()2nl{o3STy|dWX=&=MCe6ZtEM0cN3g@o+t%t@+v;s(oMwD&+#l9CIHTOQ*Q54 zoJH)kbZtdcH7ZW(Pr+eaBq{pwq@$*$_sN?g#^&d7)Mz43W30_e1;b5QUz_%gRerZp z6UF_a<8UAcR~^E_vEJU9o2;i66`gwz*Wyo7vaPpf`?>c{G(N%UT~8(_Y-QdltjIUF zROY|eDE$lE3inGm7=HDQFJ}I8q3XE$)Kc*;YMHSP#X}Vu&m4;ALU83|&JPrHnG<%S z8-7k<;chb3?b1NWa{W!485j5o`K~Otsb4sn8?MNEXIjeKBV5m?GM!7R*N?PeSIv%o z1?;Br8b*dc|e zTpRhV-GgWsdC}|ZUp*>yH|LtUm{oR8b}S%0JsaOQSUTCUb-a~<*70#pio_Vld@oAV zW>p}hc5f8BJbzTfI;H$+Id+LZ8m1aSTt2S$rOj3P{M?1!2dFQzt}hb{_+R8y%I_ZE z+mXNj0$?h=G0=Bvi}qBX@koy&G;D6}mfYTjsYuL0dh%(3+lVs7%Dcq$8Sx-cSENuy|H&hK!=E``jw?Qzaj3KA z4>&_TTZlAai`f8g zL6#$Cz0(U*5^(RGb^GmZtvr+FGoKn|Z?KK=8$$`FS%>>Kgx{ zZA(DB7q)+n>8td|Zgd(5TYK(DXsjJ%o8ptOfd}1Vn8)b7H}Zer1@t>B*4hNTs`s#2 z1dS-(*$Q!fFET83L!5R2qz}CddhWe<4&ngcODuB=cp1DxUK+1}mzDG|xz60s;M相册 - + 微博设置 - + 七牛设置 diff --git a/src/renderer/components/TrayPage.vue b/src/renderer/components/TrayPage.vue index acb2f9e..02756ef 100644 --- a/src/renderer/components/TrayPage.vue +++ b/src/renderer/components/TrayPage.vue @@ -60,11 +60,15 @@ }) this.files = this.$db.read().get('uploaded').slice().reverse().slice(0, 5).value() }) + this.$electron.ipcRenderer.on('updateFiles', (event) => { + this.getData() + }) }, beforeDestroy () { this.$electron.ipcRenderer.removeAllListeners('dragFiles') this.$electron.ipcRenderer.removeAllListeners('clipboardFiles') this.$electron.ipcRenderer.removeAllListeners('uploadClipboardFiles') + this.$electron.ipcRenderer.removeAllListeners('updateFiles') }, methods: { getData () { diff --git a/src/renderer/main.js b/src/renderer/main.js index b7b28e5..70cccf7 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -6,6 +6,7 @@ import App from './App' import router from './router' import store from './store' import db from '../datastore/index' +import './assets/fonts/iconfont.css' Vue.use(ElementUI) if (!process.env.IS_WEB) Vue.use(require('vue-electron'))