From fab99330706d3446947f1e93c4ea6015d62caa4d Mon Sep 17 00:00:00 2001 From: Evgeny Pokhilko Date: Fri, 29 Mar 2024 23:16:07 +1100 Subject: [PATCH] New icons from Breeze project --- .../{gtk-convert.svg => dialog-layers.svg} | 2 +- .../dark/document-edit-sign-encrypt.svg | 11 - images/breeze/dark/document-new.svg | 13 - images/breeze/dark/im-user.svg | 14 - images/breeze/dark/network-vpn.svg | 14 - images/breeze/dark/package-new.svg | 11 - images/breeze/dark/redeyes.svg | 16 - images/breeze/dark/view-visible.svg | 21 - .../{gtk-convert.svg => dialog-layers.svg} | 2 +- .../light/document-edit-sign-encrypt.svg | 11 - images/breeze/light/document-new.svg | 13 - images/breeze/light/im-user.svg | 14 - images/breeze/light/network-vpn.svg | 14 - images/breeze/light/package-new.svg | 11 - images/breeze/light/redeyes.svg | 16 - images/breeze/light/view-visible.svg | 21 - images/famfamfam/arrow_redo.png | Bin 625 -> 0 bytes images/famfamfam/arrow_switch.png | Bin 683 -> 0 bytes images/famfamfam/arrow_undo.png | Bin 631 -> 0 bytes images/famfamfam/cross.png | Bin 655 -> 0 bytes images/famfamfam/cut.png | Bin 648 -> 0 bytes images/famfamfam/disk.png | Bin 620 -> 0 bytes images/famfamfam/disk_multiple.png | Bin 691 -> 0 bytes images/famfamfam/find.png | Bin 659 -> 0 bytes images/famfamfam/folder_page_white.png | Bin 639 -> 0 bytes images/famfamfam/key.png | Bin 612 -> 0 bytes images/famfamfam/key_add.png | Bin 703 -> 0 bytes images/famfamfam/key_delete.png | Bin 724 -> 0 bytes images/famfamfam/lock.png | Bin 749 -> 0 bytes images/famfamfam/lock_delete.png | Bin 815 -> 0 bytes images/famfamfam/magnifier.png | Bin 615 -> 0 bytes images/famfamfam/magnifier_zoom_in.png | Bin 680 -> 0 bytes images/famfamfam/magnifier_zoom_out.png | Bin 657 -> 0 bytes images/famfamfam/page_copy.png | Bin 663 -> 0 bytes images/famfamfam/page_paste.png | Bin 703 -> 0 bytes images/famfamfam/page_white.png | Bin 294 -> 0 bytes images/famfamfam/page_white_gear.png | Bin 402 -> 0 bytes images/famfamfam/page_white_key.png | Bin 616 -> 0 bytes images/famfamfam/page_white_text.png | Bin 342 -> 0 bytes images/famfamfam/read_only.png | Bin 750 -> 0 bytes images/famfamfam/user_suit.png | Bin 748 -> 0 bytes images/famfamfam/wrap.png | Bin 342 -> 0 bytes qt_ui/EncryptPad.qrc | 44 +- qt_ui/application.cpp | 2 +- qt_ui/application.h | 2 +- qt_ui/file_encryption_dialog.ui | 8 - qt_ui/main.cpp | 2 +- qt_ui/mainwindow.cpp | 52 +- qt_ui/mainwindow.h | 4 +- qt_ui/preferences_dialog.ui | 868 ++++++++++-------- 50 files changed, 498 insertions(+), 688 deletions(-) rename images/breeze/dark/{gtk-convert.svg => dialog-layers.svg} (57%) delete mode 100644 images/breeze/dark/document-edit-sign-encrypt.svg delete mode 100644 images/breeze/dark/document-new.svg delete mode 100644 images/breeze/dark/im-user.svg delete mode 100644 images/breeze/dark/network-vpn.svg delete mode 100644 images/breeze/dark/package-new.svg delete mode 100644 images/breeze/dark/redeyes.svg delete mode 100644 images/breeze/dark/view-visible.svg rename images/breeze/light/{gtk-convert.svg => dialog-layers.svg} (57%) delete mode 100644 images/breeze/light/document-edit-sign-encrypt.svg delete mode 100644 images/breeze/light/document-new.svg delete mode 100644 images/breeze/light/im-user.svg delete mode 100644 images/breeze/light/network-vpn.svg delete mode 100644 images/breeze/light/package-new.svg delete mode 100644 images/breeze/light/redeyes.svg delete mode 100644 images/breeze/light/view-visible.svg delete mode 100644 images/famfamfam/arrow_redo.png delete mode 100644 images/famfamfam/arrow_switch.png delete mode 100644 images/famfamfam/arrow_undo.png delete mode 100644 images/famfamfam/cross.png delete mode 100644 images/famfamfam/cut.png delete mode 100644 images/famfamfam/disk.png delete mode 100644 images/famfamfam/disk_multiple.png delete mode 100644 images/famfamfam/find.png delete mode 100644 images/famfamfam/folder_page_white.png delete mode 100644 images/famfamfam/key.png delete mode 100644 images/famfamfam/key_add.png delete mode 100644 images/famfamfam/key_delete.png delete mode 100644 images/famfamfam/lock.png delete mode 100644 images/famfamfam/lock_delete.png delete mode 100644 images/famfamfam/magnifier.png delete mode 100644 images/famfamfam/magnifier_zoom_in.png delete mode 100644 images/famfamfam/magnifier_zoom_out.png delete mode 100644 images/famfamfam/page_copy.png delete mode 100644 images/famfamfam/page_paste.png delete mode 100644 images/famfamfam/page_white.png delete mode 100644 images/famfamfam/page_white_gear.png delete mode 100644 images/famfamfam/page_white_key.png delete mode 100644 images/famfamfam/page_white_text.png delete mode 100644 images/famfamfam/read_only.png delete mode 100644 images/famfamfam/user_suit.png delete mode 100644 images/famfamfam/wrap.png diff --git a/images/breeze/dark/gtk-convert.svg b/images/breeze/dark/dialog-layers.svg similarity index 57% rename from images/breeze/dark/gtk-convert.svg rename to images/breeze/dark/dialog-layers.svg index 96129d4f..d9ac2cf0 100644 --- a/images/breeze/dark/gtk-convert.svg +++ b/images/breeze/dark/dialog-layers.svg @@ -7,7 +7,7 @@ diff --git a/images/breeze/dark/document-edit-sign-encrypt.svg b/images/breeze/dark/document-edit-sign-encrypt.svg deleted file mode 100644 index f08deeca..00000000 --- a/images/breeze/dark/document-edit-sign-encrypt.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/images/breeze/dark/document-new.svg b/images/breeze/dark/document-new.svg deleted file mode 100644 index 31601727..00000000 --- a/images/breeze/dark/document-new.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/images/breeze/dark/im-user.svg b/images/breeze/dark/im-user.svg deleted file mode 100644 index df21ae2b..00000000 --- a/images/breeze/dark/im-user.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/images/breeze/dark/network-vpn.svg b/images/breeze/dark/network-vpn.svg deleted file mode 100644 index d2d8f0ca..00000000 --- a/images/breeze/dark/network-vpn.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/images/breeze/dark/package-new.svg b/images/breeze/dark/package-new.svg deleted file mode 100644 index 7e029d7d..00000000 --- a/images/breeze/dark/package-new.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/images/breeze/dark/redeyes.svg b/images/breeze/dark/redeyes.svg deleted file mode 100644 index c9305e37..00000000 --- a/images/breeze/dark/redeyes.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/images/breeze/dark/view-visible.svg b/images/breeze/dark/view-visible.svg deleted file mode 100644 index 96c03651..00000000 --- a/images/breeze/dark/view-visible.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - diff --git a/images/breeze/light/gtk-convert.svg b/images/breeze/light/dialog-layers.svg similarity index 57% rename from images/breeze/light/gtk-convert.svg rename to images/breeze/light/dialog-layers.svg index ce4c7fa3..e254494a 100644 --- a/images/breeze/light/gtk-convert.svg +++ b/images/breeze/light/dialog-layers.svg @@ -7,7 +7,7 @@ diff --git a/images/breeze/light/document-edit-sign-encrypt.svg b/images/breeze/light/document-edit-sign-encrypt.svg deleted file mode 100644 index 05b29d04..00000000 --- a/images/breeze/light/document-edit-sign-encrypt.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/images/breeze/light/document-new.svg b/images/breeze/light/document-new.svg deleted file mode 100644 index 6434a18e..00000000 --- a/images/breeze/light/document-new.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/images/breeze/light/im-user.svg b/images/breeze/light/im-user.svg deleted file mode 100644 index cdb5eae8..00000000 --- a/images/breeze/light/im-user.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/images/breeze/light/network-vpn.svg b/images/breeze/light/network-vpn.svg deleted file mode 100644 index 4a6dda09..00000000 --- a/images/breeze/light/network-vpn.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/images/breeze/light/package-new.svg b/images/breeze/light/package-new.svg deleted file mode 100644 index bb0e8dfe..00000000 --- a/images/breeze/light/package-new.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/images/breeze/light/redeyes.svg b/images/breeze/light/redeyes.svg deleted file mode 100644 index 01141526..00000000 --- a/images/breeze/light/redeyes.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/images/breeze/light/view-visible.svg b/images/breeze/light/view-visible.svg deleted file mode 100644 index 6052204e..00000000 --- a/images/breeze/light/view-visible.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - diff --git a/images/famfamfam/arrow_redo.png b/images/famfamfam/arrow_redo.png deleted file mode 100644 index fdc394c7c59b83cc2b876abc41064c75eb365877..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 625 zcmV-%0*?KOP)FZj9*=u@@4&g|7erBn|Ebu&JU%m$={t4j zMA?=F80s{QH%n(hsfF%mohhehBz1^t6ID+NGJzBtYm#sZbA{ZEu?vrT)(Lb!?K~){ zH(Aw`uB}Xq9=*Zczi=_)|A3QuQ}znM~D7~ zjUb95oVKv23l4|e@$lZ*dJFeEA1zqO!B_8JKbXnR;M>>lDE=(2>_dXN zph(~A3WJ2dfsV78ToP)wU4~UJxT^#Yl8pW;T)B2y+W_BqqmW z&#t|w0SE!KR$a#7aL!?!V{G>0(f7&GF0n$i_yAiovkXpE$M|c8KDe}2*w(W8jK3Y2*x)V03j=u2XF48q6F<0_UD&z zFmi~T?K=p$491faq~>RsPR$VB89_xzOpK2V+=|x$1lD3~x!;g2Mz5ELE831k>xd528II@{FM*4t5cwMI2$KMmfFm;RN43xW+e;$tzEyd|PV<@i4gUfKh|U-I$hymfQ} zt?kWDj37pE;wZ>1WHG%+SvbnRqEaTN#u*-slSm{u7_C6WGBh|el4$>24G=QE;Y9f< z)G2BOvC3T5Jn;{4ig%R|E{ITA5W$|ds8uW$Z^f(HeLnnp>dACn(D>^wEGjH6Et2~F zjpx1H%%|rOCx{iqDPk27MT{DNK*OCgPK;oDLHt!jVx&(zZS&Lq>Ld9Y&Ck!LvbvJw zmn1{|Z(}o^vo(KE_?L`NY~_X_4^RN+9OmbDu*=G*+_}E z3jR}&gbG0=R0#?Z-=09KI|YP8=#E5@+>uO|=1VUCOole%Li*0J2^Gy8+;b?&km6gg zf;aDGp1r#I_V|We$e$~WifFF9R7MCMwsmwsME9<<@yx?a+v)qKuKbNe>k1{IrVt}k zbbSs~bXr8Se}V_b4opa0GhLA`RHceaP=N}IElbSa8@d(ij1Q|4CvOirm9uEoyT++I zn$b9r%cFfhHe2K68PkBu*@^<$y+7xQ$wJ~;c5aBx$R=xq*41Wo zhwQus_VOgm0hughj}MhOvs#{>Vg09Y8WxjWUJY5YW zJ?&8eG!59Cz=|E%Ns@013KLWOLV)CObIIj_5{>{#k%TEAMs_GbdDV`x-iYsGH z#=Z{USAQA>NY(}X7=3{K8#Sxb0Y6MkDSd{nPwTp^L>b`TxVmKBiF^NLQ>My+_!0?|)hBPe_#}P$?rlUF;M20U z`oNWE|K(DrsR+gN%g)?+`OfqmmmiA8O_U(YfPnV(E$8mN{jZQVJ-L7LxzmTQJ^!PS zHqDyoKn&^H)Oq>Q$Nzns&wsn~^6P)|vPC&W#R9Kw95|FC`?q!91!~-K_R;^uDLWSs zj7A}sG%2IZxvQP(HeS-nn71T-`ku2F9(?#8KXKbp!Qe&~yaot4r%3=c-cDF`=YPn& z3!hUrzxqFO*Ny)VU;p?Y-nniMuVuI+UIUD>=B$ZZdhM^2Z-JeJcbDl-H)3?9>AG_?ve_7A86r2Wlb?y7)ShoTkzeah}rl)Oq{=a0=sekDkpZ?d4n{v>% zcgJPxg7sgx4Lmup8sO5j^?B5iYcCv|)*VgT_U6A?-trsfIcr`APCfD&B(EM;R_0K# z{lAb!kTg~UrQ ilDgypkCC?sx*7n~H+MJzd|s z^YP1Hc07G_>)Lgir!F1{Qn4GcTg%?koHo<=1qRN{}nPDolOeI^o4N5I>! zU$N=L=sg~ zDx#dOA*B0N~cqPsWI(^rbbkh)DS0_H_UN0C4l_kvWIm2#Kyy6%BCh z(yIUf003&1xdx>t$*eR2ZvXxT0001Z_R$y3Iju92q*wg58};}zm(OaAH=p|y0002M zh5O5#fxp|~jc?yi@+7$`d4Q6Hl%z;WiWG??NXR{Hx%)pMd~SE0000OQI diff --git a/images/famfamfam/disk_multiple.png b/images/famfamfam/disk_multiple.png deleted file mode 100644 index fc5a52f5e4a7e8eb54bcd59728e88a2db5f046ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 691 zcmV;k0!;mhP)h|XiB@gI zjUjC!t---iaHXP+)r{6Ojx+c3eOp)#T8qGEea`PZ=iwYN#&8(f07GMovvqMO`yt0_ zV{GIqh=SUrg*L*EVuk5U_QA?{|KdLZm9oqA&I{b?sAXd2Gmr0G+E?`AZ62*91#}$* zh%tuyPiAI&x-YV_mTQj!pIA(Bw8r7bRXMZUbwz}06c5|lmvZ$Nsq_x5imrlk>1*KX6(-bq8O z2^19ECQj9aBx7KUR8RS!t_)7SYimBz-4JgeVb>Gt0MQyT5n9SDtu2!)2FyRdD{|O( Z{ssThAulbFM%4fS002ovPDHLkV1fh$IWzzO diff --git a/images/famfamfam/find.png b/images/famfamfam/find.png deleted file mode 100644 index 1547479646722bda4647df52cf3e8bc9b77428c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 659 zcmV;E0&M+>P)IO9T&v~?D!=C@G6X*U1@h2}>2WE%HrrsjTfQsh6N9%SR25A5rkWp0g zzi;-6|3HJE;58sAyX1e@^d7EwiKQLb00%dp|5+t<{|l;G!D3eSuFDma zRCxr2MVY_`ELgLXqo}ssqp5E;*r|opZT~&|!~VN?1^mw`Yxp0VmiIp*r|Ey~#AW|W zTBd;IxVd?%*x1<_!3Ip2yP9Rn!u1aqt=siKx4a3At0%7dKV|u@|9wlg|7x7R;eT!K z{QuFp&Huxb3&AdAW?^~2z`(!^HUQ{cR*=op7H|BYU0VMi3A-|5H&#ol!zs_8lnTUg>C+WwLc_Qfq*FlK?}j&#@fb05W&WX zs7RER>}K7~?sqveuf<-nYKRA3hB+LbdC!>{CyArNId=s(54dp(7#BBzuaY8?jufy` zmStgPnpU3Y+S=OM1eO4Q9AMSVG#Cuj?RM2}x7BPmWoGL4``X^#-UOE1F)gf`*=sW+ z#)z3w6a|Zmi<6o(O>cSr6G@Wby(dW$vMi(1>CkGm4j~_2th}9>UtV@@nkAk+xY-;z zAxV<4E1Ywf*&)EmU%$NexaOQ2%~;?ZS9y7HsvVLf!8teCPXL&5Vwn{`9ump~{5;Mz z@X5m8Gx-NJ1XRw)P+&z3MNzfi)BpaF#%_}@J99_@SqVgZeE}3mPMzk`-KQgf(~Lq+ zHE^grpz4XUYa1-47pTvjWcrrICx3pvKJCDh&Yol8#yuc{goqS7_vxoKQ21lGv)3LW zi4Z~$2q~4MkQ4jwQ0So0MYd02b*e#*$A(}6F$T)kF1@{P%ChV>&`c?iq7kc~$T~xa z?Ngt1kh!5F8K^?BqTZ-6lX;W$X4pb0IRdg4vi+e#2jXA^>!R=rg##3GP!2ZvRHQ0n z+xmO;s&}G6Ym@RLIIS>4_D^{q3B6vEDiyAvGHkpeHC#BN8{LcEx^4hiFz_l Z{RV0XY_dNf>knmX^MrbE*gmZ6|p*GkKoxa?X?hD9M+@sRvFH{EqYA??u6x z2pu{uGnrwz*>rh zfvUA@7b#acN?M*mBG3rQV?e^+0R5m3YXWyRZL5Bt@3vAw{9JaEW$}=f4bXO52yBH{ z;G~ZN|GLn>k~{On3Swd-Sy(gFkOdyw-RP%&exwl01RJRp))TI*SsngruhZksQ*NT%!X?K00007oX;fYS5fR?a$bad^&iuHSu~`3%VTtO}r!shMd`!61c%6R9aJGSh8X%)P*raU)hwAiO6D z)GH7M>Os=K8*y(FIo?C~yJ{<%*U%nBM$Zz%Wh5q=k@+A)HgpoHzyZX@8&HV#!QWjA z`_+cv-}i0Xg^24s7I-VE#u4*AQoR#N?{>t-#LOH})WMk9;P)owvi_IE6!o^=Lf3R#&PVCy|Gc4obnhMMwvBLinP_YpwW)P1ST? zrfe04-x)FNzro&t&e;ir^8^J56p&nqIY_fO@GcRuAKQt!4<44sunkb-j=jm5S_@$&_dyonDz^$r}kLbDn<^FJI)(KksQ7G*l%&dIcv63Kcm5d9~ zQDnp25a#b;Oe2ojja#pmUoF|#dr&8W-hPZ#rZfF!J@DLVkx!Vn%)K#giqbQ`G;LE> ldR%0)iYQ5Amu3}R{|RMS>3;1N)RF)I002ovPDHLkV1l&ZPDKC! diff --git a/images/famfamfam/key_delete.png b/images/famfamfam/key_delete.png deleted file mode 100644 index 00dec80d84e295960ce1dc1e67697a8069cb7a81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 724 zcmV;_0xSKAP)=9*v8X6NkdoU^aazxO>Vty1fS|IPFA`#=BZd0!0x%|@E*DQYFc zidz4?|1UTlpHa1z$-iOIg+%ZnQjsB2R#X#Tr{Ted2AOdDs}+f*j@9m<$JfEa*}}fu z$Uu!uVR`;0;@|EO4KAB>8K9(jc-t7&WL*OqnZl|T>Q$3eco5NP3qIQ<&p8a!QIGS6W&aB5E#BpfI5WT`4B&yh2*=4=+qeq6S+tU zjo@mtVQtBbHKz~paBq_C0>lQ|ub z=4%l8pochl2-25Zn0s1)*=J>VcWxI34LaCQZ%qyuwbiOY=1)rmIuZ4hkWM*>a`}+` zW{jB`eyBpfxcN{3dS$(N!tr`6)T-XByta8oe|tv9>?g+k#9o0pTxd@;_sq{kwlU;^VvV*?BV8P@}BoaZTQUROpWV6|-M`|^n&)=+8tHo3*<<$NU zU`%V~ZF;?hBSYsjJ6%JzV}E(D{pOLqQklliUf9um_tGl-wty`y*p?eYNW56P>X@1s zZs7KrRZKtmV7Lqj^5Fgr7_`LjhdJK@ltF&O`j7?*NUM$KvmNGz)3WjM?V$vHlPT0AFyF?kLE<#HZabCSW3-oa*6;Z zrXD`Ulwd<^2glP%1Y1Kc1Ij%DU^=ME(jKf6APNlA$Uu;J4bVilQHSWX5uJ$9Zsp4M z0%!@LvyTxz=Z6stxlichODIY+yNGt%RM;m`>H4LOKLFs9Y%b5aUN|2|{0Zw|<_~i} fmXz*V19AKYa5&PNmf`5mIF?X(>Nr_OzAky>%LC^xjHsh2Y&83|M~y#eBXD@6&Pcv9797xHKu7^ zH4LMjVgm&zeo~C-x<1g;)AOscUZ?~Jg+e>2`EEl)gWv6TLli~O8pUD}sZnrfJSVp4c1)t9s z&@>IvXmlo<%_=mv@!<2Rsi`>*OzZ+AC0Op0%M(hryId~BVlhzD(O@u`sF0fI@9*zO zBoYxtQLNhk0n~HNbQ+(>@z>xv&W_g*+xj&g%)UCq#$v6Q&p0j3$J)jrF%8Vn!SvN{fuF<+_4FOc_Bsec4HZ@aP7kF`AfJJ;^aX0+8%#Y9r#}d$mMQ>Y|L@r?0{8Z$n|?5h5=~G1^ge$$AHj+-1zLv@U!O6N`8BLUfo#6Qx24@sY;} z9O#B4_6)+{Nw{Y2L20T56WC?B48XNAlHl2@KyuX*fQsf*=h3X`cyeMGj!k~x@RikT zm9P6CnS!zcpppkB8N@x9B!G2*gN&4Il-D7-?Z}58qWZx_V)Pw(>d7uiFeJ>a0&ofT z#gNuvOO$0ks zMIj=HnnBRUR?tKXG11rxCU4&7dG4NbuvR2_mEvc)n?Cow;~Wve|KR^>9@p5l)|QB+ z$jmun3q#x>;ss-PW_mnr2MHVzLAl1RW&0?VkixF*4t!St0YVb2wnKdU(kmOHiL;aW zK8Xte%(k>MVGG$E4no6dcNnb>BhVHHGD&1pv4YZ68kE2V03t5#PCEFm7=ad$6)+3B zTCmn*?A?=u(o~ET7~-7g0)ZB=6|lumi4}B}MLgy~Ysy6)Q5%Al7|05&1z3Jpu>cF8 z3?VXs*3<}%h3`5Wld)N2zJnk%Agw<~3k)sPTLFd=F5;d8-bj-09SkQuynfflNcZLN z!^_37fdZvzrq=9~mp*($%mcDRKC&qvaaZuX+C=AT6O*~tHl>0mcP<_q>-z%$xO(@! zYluq5a8VQI$S@4?r*v;gPo!QQ%pX3A#>xx4t=w-L6COWx?aj&`f+!YePsFtj=hOQR zP3=E2j@9L7s8;T^&s?u(Hdpu?CubjMrGn{t_37>9$|AD)QE08weJlKn8|OyjL~7oP zC8mPT`jzuH*Dh^I0048RGafUIT)4H~*m8m>egI0iH=(LB%b@@O002ovPDHLkV1lw0 B3FJNMp+(Bt!=q9U!ZZOlw$c zuAy5i+nTd|<_>NivLu&tYWf+obh7aHN%Hi45`pBR)x`tA#^U98gM4FFC6h~&)aWQw>e5Y84Gj%C?Fa5wL3#v12nvm3<6OafjJt}U((Qj zn8!nMmXr-qoCO7XcZRS8(x9RlIA>F^1(GoPldw}sc)rpQ>IL9yYf!7MN);5mno3dL zFr9-f3^@5I0h2d@QBNW#I`RB4IwvonO1T#W1?;?jrZNjp_!1ar;E|a)8g&BH^;Scq zt%uAgf}pb+yKn5ouFDnCJb}hGpY=s(m>77B`PIn4hUqw48S;@<+#YViwZYT4_>vEC z?=frJc<3Fn+HA3jXTwUklhgJ-dYkmNL^YBTW!uzZM O00008VI0S0!CoiyA}k0DS`b78y(oGU6a>AkUK9~n*^7|=kr7cwRFWv6%Z}9bXJxHq zv!bQ7t!|lawm;5>vpILy?iOC&HfG!Hc8BBJ-HKqfMb?WCJa0aq=l6SfssL2|4?ho1 zYF_hZS|)5^i5(2(3eSVtLjTwt+viCU4@P*+9|NQ!zmCYHkC8wnWH2cSOj5$smpmL3 zY1}4f$SympsTgoXWWvkj!KP${W<>az96Yfc0&EV^Sqav$1oSUxqGI6Xq{vddRFu7n z`2LdsHzi;=Dtr$y0$QI$*opyl-1%;k%_tFkSWDaJm;MHp-}I<6Z; z`=uSavTxAsh-+>P#z@O32VYD;@Uw_<1$Q)qo>w&5O)gAWuE2V33*Ucwqps{ny7nxp zX|aTf%a1~AQ*W?v_D-PC*yD@0=#7-ucnX}S5B~d&FdbXR-#fBe_gkP615I1CPtR;N z4-*FwcN*ZjSr5aZ75rZZR34vLukCGEW45>LLezQ{#QvpNP(bBYeXX{uZkgF|xEA`o r)y)eIsC4dIvZ!Ov;+nFL_^*5eZM*&99^@R5;6Z z(>-WZK@^7J_sq=QY_e{46@P+~LNG}sRzZsxQHvCsN*h5ir6^j7pq-$xu$N#V1gx}9 zClV7;5)7zih-s3DB)G=7|99>ji@So7-P24n=VQ(@GctDX!^_@$bj%oviY6e4Dh;od zooe%Wvs8LEKQ&&bL&@bwi=STIAI@!-gB2jC5+?y?VR~VkrNxam-`6*8&po|RZ5LpS zNKdJ%c4bTX`XjKsnecf%W>1%6WT?pKNdLLq{=(f(Col?P1+oq@R>)W(n=x!|*BIIh z6DJGw_w`)u6yN|vAhMteYK5#b%r5^v+VCFl1IGssaclZZMS{vs-LJ2$)n7DAr6==K z<29#%AXsBsDoO}SBaXR#_Ap!JKx)(1)3O2pj0_dYWz5By*X74fRT01$Fk%P_RzOMDtV?GU{nsYq#K8iy zb6qzLYDj`_f5$BwC*WE(t0m#xYJ*=jC2|HQYHh=pf#QG7oowi`h!L!{DB$8|qY{~X zu8@sU1tWq;n$XThR0%;45mdqXM892|{CJ@0DS*}>?ami06Q_^tvM~Y3K(_-`#m!8f z8f!QIrH4y#61;0Ym0cCoLl8{IPombPHtnn7%SbTdI&G-d>ZQo!_wBMF9nzX!g8HVY xYTJPGciz9XMh3w2fmZ(7v{)r*QZD48?mrio{~IaoqAVs!l4K}n~L(tL`6d4Up4iSWnZ3Qg~4n+_J zDGk-qQdogO5JUtO-d5pRp7Nd7_r1^a|M&Zq%mn9Oe((|e0sw%Ur!K7T1pojj=U#f? zQM`qbQrM^DPkwa?DK_be^~z<~RgSMIa<`xP_4P7gg2jCwJ{9^k!fsU=#Ti|%I3p;>90Qd+7|~0h&mIklA#nb>ATL2+v$&u)OBgB z;nsHb)I&QRKeX40H~~cIZxCd}5C} z=79lXoXK%6YlyLtsV$~bSm?Upq|DJh#{|*a7XMm`4QJWZ>s6nL2R1|&J z0VPEwJ9?!n`o5PKAjc->P1Gi8BY*%!5&FVp=#)$mMJYul1Jton}gujiUf??eOy!x&!tsjxy;=Q3_DdcXx=a^OBhW0N~`A@4xB0a*%F? l+@c^sQA%W+?pa#c`9H5UNfS6T{e=Jk002ovPDHLkV1grvM=byV diff --git a/images/famfamfam/page_white.png b/images/famfamfam/page_white.png deleted file mode 100644 index 8b8b1ca0000bc8fa8d0379926736029f8fabe364..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-&H;pyTSqH(@-Vl>|&1p(LP>kg~E zYiz5X^`c$+%8#zC{u)yfe-5 zmgid={Z3k(ERKCKrE7DF;=x4^O+ pzO8rLO8p|Ip=x)jHOtWj`bJBmKdh_V<`47(gQu&X%Q~loCIFbEay|e6 diff --git a/images/famfamfam/page_white_gear.png b/images/famfamfam/page_white_gear.png deleted file mode 100644 index 106f5aa3611a4807ec8c21701c631730275089a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmV;D0d4+?P)<@FR}JvtGRKa0_WfK^c7uXaFH3q@Y!Hnl8VySc`OtkPN3;#l*y*l23+99h*9JzA00}rAC!#M1dZ#v9YOBH|eC*${MmzzYjBu!!-< zK8tujf&(6i)1biy*F>4{f*Kd(IU-JsG&#b_@NgTnx@40)2@2%c;*=?-2Za=}O}7&( w%_K#(S>e1j&gfY?mR})n>>0+8p`iTe2d1K2h8#$+)&Kwi07*qoM6N<$f(2cptN;K2 diff --git a/images/famfamfam/page_white_key.png b/images/famfamfam/page_white_key.png deleted file mode 100644 index d61648452284da1bc28b10385f95b5d2bf027901..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 616 zcmV-u0+;=XP)-tZUVHjYHp;RjQ0M0pRlXN=mLv{hk9Ebp9&~+Wj-T9IkpzWPWd#fZ)d=zV^~S`;LE*!C#5QQ<|d}62BjvZR2H60wE-%6;pyTSA|c6o&@eC9QG)Hj&ExYL zO&oVL^)+cM^qd@ApywS>pwx0H@RDN}hq;7mU-SKczYQ-hnrr=;iDAQMZQ+*g=YOM= z!QlMQEn7FbaD->uKAYgo_j9)W&$$zS*W9}m(ey0q$&7l-XEWO0Y(9M=SnhLbwy;d>@~SY$Ku*0xPvIOQeV1x7u_z-2-X>_74(yfh7C znXL|3GZ+d2`3re2hs?MKWW=I5Rl}zuENrQ28Pt;CX(qKOcDU|M8F&Z%jVGSZA7t& zSX&s1bi|{*v*DgAz3ST9+K6Us3~0Q9*~BWe6PID=&0x|wWdf!IWgI(}6lv9v-FpSS zw1U9OL{Ex%ACuJL>=wxTZg0 zEf8`!jsrze5UvA~SqG-HeEY!{P)iC{?3#nq?S616TB~hnMW{0-6j9tLvf?&u+XiC{ z?O_E0jiYQZlqIojGL$5a1qk9N)mlxpmZq1W6gHT`ec`8K>j$jl3}`WfukS z{=!u2#P1a^U!H8Xl5T`7??NT1t zUc_pqB=&-xQ}oxwg~5^6HaUDuDLGXE;y3!@QP_pOFSc-kKKIu gX8xa5{%_a#2W_ovs9z>%07*qoM6N<$f|edvg8%>k diff --git a/images/famfamfam/user_suit.png b/images/famfamfam/user_suit.png deleted file mode 100644 index b3454e15fb60fe8704a574b0ac35c4d0c902d738..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 748 zcmV|@r@oVseQC_m=rUfa}difiP=7Q#%M zshc`Wm&;AX{0?nQQx{}VMAAhV>V;rJ@&0>zF9w3lqKhA#^YHwCJm(xv5P+cnVawvp ztLfDxoZV2f8Bnl7AZ12EoSxeFR|2V6RIW~mf*~;sdI}9M6f$-Qvg7taoFz1FDj&57n{Mq4D7Y_TdR9C(EO|SzKHEmo zPOn#{+hEQ;;thBNzT#Oh`*z)EZQ(_1cpLEJT{q48TPx~`^I%-$NUju1T~|0)V}~FC6c#zk#8D6LRk;) zT0D?8Orf&Nhs26LtPbknDLzd41-|Ax#58f}=OyC^;x)af?Do-=bq|KvhRQT^vI!{Etph8?pu}_aNTs(DyPV4JItQk zytYVV!gI?_I=d|#Kh+-Jl$4`oC{=9xP?|ke?Em{q=e*4W?9~JgE4w^TNm#}^@nEjP zyLojn%(vbh@$-;rsax{CvG=oZ%Utst!p50p%#W`r>|1Fl;-PPy7gQ(g*yNwobWd-$ hLFyKB&x`vr<6meVT^Lv3q7U>CgQu&X%Q~loCIIFIelP$4 diff --git a/qt_ui/EncryptPad.qrc b/qt_ui/EncryptPad.qrc index f1f9de57..7a4f70c9 100644 --- a/qt_ui/EncryptPad.qrc +++ b/qt_ui/EncryptPad.qrc @@ -1,40 +1,12 @@ - ../images/famfamfam/cut.png - ../images/famfamfam/disk.png - ../images/famfamfam/disk_multiple.png - ../images/famfamfam/find.png - ../images/famfamfam/folder_page_white.png - ../images/famfamfam/key.png - ../images/famfamfam/key_add.png - ../images/famfamfam/key_delete.png - ../images/famfamfam/lock.png - ../images/famfamfam/lock_delete.png - ../images/famfamfam/magnifier.png - ../images/famfamfam/magnifier_zoom_in.png - ../images/famfamfam/page_copy.png - ../images/famfamfam/page_paste.png - ../images/famfamfam/page_white.png - ../images/famfamfam/magnifier_zoom_out.png ../images/application_icon.png - ../images/famfamfam/cross.png - ../images/famfamfam/page_white_gear.png - ../images/famfamfam/arrow_redo.png - ../images/famfamfam/arrow_undo.png - ../images/famfamfam/read_only.png - ../images/famfamfam/arrow_switch.png - ../images/famfamfam/wrap.png - ../images/famfamfam/user_suit.png - ../images/famfamfam/page_white_text.png - ../images/famfamfam/page_white_key.png ../images/breeze/light/configure.svg ../images/breeze/light/dialog-cancel.svg ../images/breeze/light/document-decrypt.svg ../images/breeze/light/document-edit-decrypt.svg ../images/breeze/light/document-edit-encrypt.svg - ../images/breeze/light/document-edit-sign-encrypt.svg ../images/breeze/light/document-encrypted.svg - ../images/breeze/light/document-new.svg ../images/breeze/light/document-open.svg ../images/breeze/light/document-print.svg ../images/breeze/light/document-properties.svg @@ -49,28 +21,21 @@ ../images/breeze/light/format-font-size-less.svg ../images/breeze/light/format-font-size-more.svg ../images/breeze/light/format-font-size-reset.svg - ../images/breeze/light/gtk-convert.svg - ../images/breeze/light/im-user.svg ../images/breeze/light/meeting-organizer.svg - ../images/breeze/light/network-vpn.svg - ../images/breeze/light/package-new.svg - ../images/breeze/light/redeyes.svg ../images/breeze/light/snap-page.svg ../images/breeze/light/text-wrap.svg ../images/breeze/light/view-readermode.svg - ../images/breeze/light/view-visible.svg ../images/breeze/light/key-add.svg ../images/breeze/light/key-remove.svg ../images/breeze/light/key.svg ../images/breeze/light/file-encryption.svg + ../images/breeze/light/dialog-layers.svg ../images/breeze/dark/configure.svg ../images/breeze/dark/dialog-cancel.svg ../images/breeze/dark/document-decrypt.svg ../images/breeze/dark/document-edit-decrypt.svg ../images/breeze/dark/document-edit-encrypt.svg - ../images/breeze/dark/document-edit-sign-encrypt.svg ../images/breeze/dark/document-encrypted.svg - ../images/breeze/dark/document-new.svg ../images/breeze/dark/document-open.svg ../images/breeze/dark/document-print.svg ../images/breeze/dark/document-properties.svg @@ -85,19 +50,14 @@ ../images/breeze/dark/format-font-size-less.svg ../images/breeze/dark/format-font-size-more.svg ../images/breeze/dark/format-font-size-reset.svg - ../images/breeze/dark/gtk-convert.svg - ../images/breeze/dark/im-user.svg ../images/breeze/dark/meeting-organizer.svg - ../images/breeze/dark/network-vpn.svg - ../images/breeze/dark/package-new.svg - ../images/breeze/dark/redeyes.svg ../images/breeze/dark/snap-page.svg ../images/breeze/dark/text-wrap.svg ../images/breeze/dark/view-readermode.svg - ../images/breeze/dark/view-visible.svg ../images/breeze/dark/key-add.svg ../images/breeze/dark/key-remove.svg ../images/breeze/dark/key.svg ../images/breeze/dark/file-encryption.svg + ../images/breeze/dark/dialog-layers.svg diff --git a/qt_ui/application.cpp b/qt_ui/application.cpp index a0a461e8..def0b97c 100644 --- a/qt_ui/application.cpp +++ b/qt_ui/application.cpp @@ -67,7 +67,7 @@ void Application::setMainWindow(MainWindow *window) mainWindow = window; } -ThemeAppearance Application::getThemeAppearance() const +ThemeAppearance Application::getAutoThemeAppearance() const { auto palette = this->palette(); const QColor textColor = palette.color(QPalette::WindowText); diff --git a/qt_ui/application.h b/qt_ui/application.h index 1420c726..b8b7ec14 100644 --- a/qt_ui/application.h +++ b/qt_ui/application.h @@ -30,7 +30,7 @@ class Application : public QApplication Application(int &argc, char **argv); void setMainWindow(MainWindow *); MainWindow *getMainWindow(); - ThemeAppearance getThemeAppearance() const; + ThemeAppearance getAutoThemeAppearance() const; protected: bool event(QEvent *); void loadFile(const QString &fileName); diff --git a/qt_ui/file_encryption_dialog.ui b/qt_ui/file_encryption_dialog.ui index fbc7fc08..5a0118d6 100644 --- a/qt_ui/file_encryption_dialog.ui +++ b/qt_ui/file_encryption_dialog.ui @@ -378,10 +378,6 @@ Encrypt - - - :/images/famfamfam/page_white_key.png:/images/famfamfam/page_white_key.png - true @@ -392,10 +388,6 @@ Decrypt - - - :/images/famfamfam/page_white_text.png:/images/famfamfam/page_white_text.png - diff --git a/qt_ui/main.cpp b/qt_ui/main.cpp index 8cbef204..f5c2cf27 100644 --- a/qt_ui/main.cpp +++ b/qt_ui/main.cpp @@ -230,7 +230,7 @@ int main(int argc, char *argv[]) app.setApplicationName("EncryptPad"); MainWindow mainWin; - mainWin.setThemeAppearance(app.getThemeAppearance()); + mainWin.setAutoThemeAppearance(app.getAutoThemeAppearance()); app.setMainWindow(&mainWin); mainWin.show(); diff --git a/qt_ui/mainwindow.cpp b/qt_ui/mainwindow.cpp index 0cffb2b0..6372fefe 100644 --- a/qt_ui/mainwindow.cpp +++ b/qt_ui/mainwindow.cpp @@ -813,52 +813,52 @@ void MainWindow::openPreferences() void MainWindow::createActions() { - newAct = new QAction(QIcon(":/images/famfamfam/page_white.png"), tr("&New"), this); + newAct = new QAction(tr("&New"), this); newAct->setShortcuts(QKeySequence::New); newAct->setStatusTip(tr("Create a new file")); connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); - openAct = new QAction(QIcon(":/images/famfamfam/folder_page_white.png"), tr("&Open..."), this); + openAct = new QAction(tr("&Open..."), this); openAct->setShortcuts(QKeySequence::Open); openAct->setStatusTip(tr("Open an existing file")); connect(openAct, SIGNAL(triggered()), this, SLOT(open())); - saveAct = new QAction(QIcon(":/images/famfamfam/disk.png"), tr("&Save"), this); + saveAct = new QAction(tr("&Save"), this); saveAct->setShortcuts(QKeySequence::Save); saveAct->setStatusTip(tr("Save the document to disk")); connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); - saveAsAct = new QAction(QIcon(":/images/famfamfam/disk_multiple.png"), tr("Save &As..."), this); + saveAsAct = new QAction(tr("Save &As..."), this); saveAsAct->setShortcuts(QKeySequence::SaveAs); saveAsAct->setStatusTip(tr("Save the document under a new name")); connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs())); - setFilePropertiesAct = new QAction(QIcon(":/images/famfamfam/page_white_gear.png"), tr("File &Properties..."), this); + setFilePropertiesAct = new QAction(tr("File &Properties..."), this); setFilePropertiesAct->setStatusTip(tr("Set file properties")); connect(setFilePropertiesAct, SIGNAL(triggered()), this, SLOT(setFileProperties())); - closeAndResetAct = new QAction(QIcon(":/images/famfamfam/cross.png"), tr("&Close and Reset"), this); + closeAndResetAct = new QAction(tr("&Close and Reset"), this); closeAndResetAct->setShortcuts(QKeySequence::Close); closeAndResetAct->setStatusTip(tr("Close and reset security settings")); connect(closeAndResetAct, SIGNAL(triggered()), this, SLOT(closeAndReset())); - createNewKeyAct = new QAction(QIcon(":/images/famfamfam/key_add.png"), tr("Generate Key..."), this); + createNewKeyAct = new QAction(tr("Generate Key..."), this); createNewKeyAct->setStatusTip(tr("Generate a new key file")); connect(createNewKeyAct, SIGNAL(triggered()), this, SLOT(createNewKey())); - setPassphraseAct = new QAction(QIcon(":/images/famfamfam/lock.png"), tr("Set &Passphrase..."), this); + setPassphraseAct = new QAction(tr("Set &Passphrase..."), this); setPassphraseAct->setStatusTip(tr("Set passphrase for encryption and decryption")); connect(setPassphraseAct, SIGNAL(triggered()), this, SLOT(setPassphrase())); - setEncryptionKeyAct = new QAction(QIcon(":/images/famfamfam/key.png"), tr("Set &Encryption Key..."), this); + setEncryptionKeyAct = new QAction(tr("Set &Encryption Key..."), this); setEncryptionKeyAct->setStatusTip(tr("Set encryption key file")); connect(setEncryptionKeyAct, SIGNAL(triggered()), this, SLOT(setEncryptionKey())); - clearEncryptionKeyAct = new QAction(QIcon(":/images/famfamfam/key_delete.png"), tr("Clear &Encryption Key"), this); + clearEncryptionKeyAct = new QAction(tr("Clear &Encryption Key"), this); clearEncryptionKeyAct->setStatusTip(tr("Clear encryption key file. Passphrase only (if set).")); connect(clearEncryptionKeyAct, SIGNAL(triggered()), this, SLOT(clearEncryptionKey())); - clearPassphraseAct = new QAction(QIcon(":/images/famfamfam/lock_delete.png"), tr("&Clear Passphrase"), this); + clearPassphraseAct = new QAction(tr("&Clear Passphrase"), this); clearPassphraseAct->setStatusTip(tr("Save without passphrase protected encryption. Encryption with file key only (if enabled).")); connect(clearPassphraseAct, SIGNAL(triggered()), this, SLOT(clearPassphrase())); @@ -868,29 +868,29 @@ void MainWindow::createActions() exitAct->setStatusTip(tr("Exit the application")); connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); - undoAct = new QAction(QIcon(":/images/famfamfam/arrow_undo.png"), tr("Undo"), this); + undoAct = new QAction(tr("Undo"), this); undoAct->setShortcuts(QKeySequence::Undo); undoAct->setStatusTip(tr("Undo")); connect(undoAct, SIGNAL(triggered()), textEdit, SLOT(undo())); - redoAct = new QAction(QIcon(":/images/famfamfam/arrow_redo.png"), tr("Redo"), this); + redoAct = new QAction(tr("Redo"), this); redoAct->setShortcuts(QKeySequence::Redo); redoAct->setStatusTip(tr("Redo")); connect(redoAct, SIGNAL(triggered()), textEdit, SLOT(redo())); - cutAct = new QAction(QIcon(":/images/famfamfam/cut.png"), tr("Cu&t"), this); + cutAct = new QAction(tr("Cu&t"), this); cutAct->setShortcuts(QKeySequence::Cut); cutAct->setStatusTip(tr("Cut the current selection's contents to the " "clipboard")); connect(cutAct, SIGNAL(triggered()), textEdit, SLOT(cut())); - copyAct = new QAction(QIcon(":/images/famfamfam/page_copy.png"), tr("&Copy"), this); + copyAct = new QAction(tr("&Copy"), this); copyAct->setShortcuts(QKeySequence::Copy); copyAct->setStatusTip(tr("Copy the current selection's contents to the " "clipboard")); connect(copyAct, SIGNAL(triggered()), textEdit, SLOT(copy())); - pasteAct = new QAction(QIcon(":/images/famfamfam/page_paste.png"), tr("&Paste"), this); + pasteAct = new QAction(tr("&Paste"), this); pasteAct->setShortcuts(QKeySequence::Paste); pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " "selection")); @@ -901,7 +901,7 @@ void MainWindow::createActions() selectAllAct->setStatusTip(tr("Select all text")); connect(selectAllAct, SIGNAL(triggered()), textEdit, SLOT(selectAll())); - searchAct = new QAction(QIcon(":/images/famfamfam/find.png"), tr("&Find..."), this); + searchAct = new QAction(tr("&Find..."), this); searchAct->setShortcuts(QKeySequence::Find); searchAct->setStatusTip(tr("Find in text")); connect(searchAct, SIGNAL(triggered()), this, SLOT(search())); @@ -911,7 +911,7 @@ void MainWindow::createActions() gotoAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_G)); connect(gotoAct, SIGNAL(triggered()), this, SLOT(gotoTriggered())); - generatePassphraseAct = new QAction(QIcon(":/images/famfamfam/user_suit.png"), tr("&Generate Passphrase..."), this); + generatePassphraseAct = new QAction(tr("&Generate Passphrase..."), this); generatePassphraseAct->setStatusTip(tr("Generate passphrase")); connect(generatePassphraseAct, SIGNAL(triggered()), this, SLOT(generatePassphrase())); @@ -920,29 +920,29 @@ void MainWindow::createActions() replaceAct->setStatusTip(tr("Find and replace text")); connect(replaceAct, SIGNAL(triggered()), this, SLOT(replace())); - readOnlyAct = new QAction(QIcon(":/images/famfamfam/read_only.png"), tr("Read Only"), this); + readOnlyAct = new QAction(tr("Read Only"), this); readOnlyAct->setCheckable(true); readOnlyAct->setStatusTip(tr("Enable Read Only mode")); connect(readOnlyAct, SIGNAL(toggled(bool)), this, SLOT(readOnlyToggled(bool))); connect(readOnlyAct, SIGNAL(toggled(bool)), replaceAct, SLOT(setDisabled(bool))); connect(readOnlyAct, SIGNAL(toggled(bool)), generatePassphraseAct, SLOT(setDisabled(bool))); - wordWrapAct = new QAction(QIcon(":/images/famfamfam/wrap.png"), tr("Word Wrap"), this); + wordWrapAct = new QAction(tr("Word Wrap"), this); wordWrapAct->setCheckable(true); wordWrapAct->setStatusTip(tr("Enable Word Wrap")); connect(wordWrapAct, SIGNAL(toggled(bool)), this, SLOT(wordWrapToggled(bool))); - zoomInAct = new QAction(QIcon(":/images/famfamfam/magnifier_zoom_in.png"), tr("&Zoom In"), this); + zoomInAct = new QAction(tr("&Zoom In"), this); zoomInAct->setShortcuts(QKeySequence::ZoomIn); zoomInAct->setStatusTip(tr("Zoom In")); connect(zoomInAct, SIGNAL(triggered()), this, SLOT(zoomIn())); - zoomOutAct = new QAction(QIcon(":/images/famfamfam/magnifier_zoom_out.png"), tr("&Zoom Out"), this); + zoomOutAct = new QAction(tr("&Zoom Out"), this); zoomOutAct->setShortcuts(QKeySequence::ZoomOut); zoomOutAct->setStatusTip(tr("Zoom Out")); connect(zoomOutAct, SIGNAL(triggered()), this, SLOT(zoomOut())); - resetZoomAct = new QAction(QIcon(":/images/famfamfam/magnifier.png"), tr("&Reset Zoom"), this); + resetZoomAct = new QAction(tr("&Reset Zoom"), this); resetZoomAct->setShortcut(QKeySequence("Ctrl+0")); resetZoomAct->setStatusTip(tr("Reset Zoom")); connect(resetZoomAct, SIGNAL(triggered()), this, SLOT(resetZoom())); @@ -960,7 +960,7 @@ void MainWindow::createActions() openPreferencesAct->setStatusTip(tr("Application preferences")); connect(openPreferencesAct, SIGNAL(triggered()), this, SLOT(openPreferences())); - openFileEncryptionAct = new QAction(QIcon(":/images/famfamfam/arrow_switch.png"), tr("File Encryption..."), this); + openFileEncryptionAct = new QAction(tr("File Encryption..."), this); openFileEncryptionAct->setStatusTip(tr("File encryption")); connect(openFileEncryptionAct, SIGNAL(triggered()), this, SLOT(openFileEncryption())); @@ -1812,12 +1812,12 @@ void MainWindow::showHelp() } -ThemeAppearance MainWindow::getThemeAppearance() const +ThemeAppearance MainWindow::getAutoThemeAppearance() const { return themeAppearance; } -void MainWindow::setThemeAppearance(ThemeAppearance value) +void MainWindow::setAutoThemeAppearance(ThemeAppearance value) { themeAppearance = value; std::string prefix = value == ThemeAppearance::Light ? ":/images/breeze/light/" : ":/images/breeze/dark/"; diff --git a/qt_ui/mainwindow.h b/qt_ui/mainwindow.h index 7eddd070..4993ac29 100644 --- a/qt_ui/mainwindow.h +++ b/qt_ui/mainwindow.h @@ -64,8 +64,8 @@ class MainWindow : public QMainWindow { void setEncryptionKeyFile(const QString &file, bool clearKFKeyService = true); const QString &getEncryptionKeyFile() const; void showHelp(); - ThemeAppearance getThemeAppearance() const; - void setThemeAppearance(ThemeAppearance value); + ThemeAppearance getAutoThemeAppearance() const; + void setAutoThemeAppearance(ThemeAppearance value); protected: void closeEvent(QCloseEvent *event) override; diff --git a/qt_ui/preferences_dialog.ui b/qt_ui/preferences_dialog.ui index 576aa3b9..e1ea7799 100644 --- a/qt_ui/preferences_dialog.ui +++ b/qt_ui/preferences_dialog.ui @@ -6,326 +6,262 @@ 0 0 - 500 - 614 + 580 + 560 - - - 474 - 503 - - - - - 500 - 650 - + + + 0 + 0 + Preferences - - - - 10 + + + + Qt::NoFocus - - 10 + + Qt::Horizontal - - 10 + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - 10 + + + + + + + 0 + 0 + - - 10 + + + 562 + 512 + - - - - + + Qt::LeftToRight + + + 0 + + + + General + + + + - Key file encryption properties: + Edit... + + + + + + + Tab size: - uiEditKeyFileProperties + uiTabSize - - - - - - Retain last used directory between EncryptPad sessions - - - Save last used directory - - - - - - - Browse... - - - - - - - 0 - - - - - - 60 - 16777215 - + + + + + 32 + + + + + 64 + + + + + 128 + + + + + 256 + + + + + + + + Path to libCURL executable - - 10 + + Libcurl path: + + + uiLibcurl + + + + + + + Enable FakeVim (restart required) + + + + + + + Edit... - - + + + + 0 + + + + 1 + + + + + 2 + + + + + 8 + + + + + 16 + + + + + 32 + + + + + 128 + + + + + + + + Display line numbers + + + + + Qt::Horizontal - - - 40 - 20 - + + + + + + Qt::Horizontal - + - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Font... - - - - - - - Key file random sequence length (bytes): - - - uiKeyFileLength - - - - - - - - 0 - 0 - - - - Qt::TabFocus - - - Qt::LeftToRight - - - [example: Monospace (Size: 12)] - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Create .bak files - - - - - - - Edit... - - - - - - - Libcurl command line parameters - - - Parameters: - - - uiLibcurlParameters - - - - - - - - - 1 - - - 40 - - - 4 + + + + Libcurl command line parameters + + + Parameters: + + + uiLibcurlParameters + + + + + + + "Windows" end of line: CR+LF + + + "Windows" end of line: CR+LF - - + + Qt::Horizontal - - - 40 - 20 - + + + + + + + + 1 + + + 40 + + + 4 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Browse... - + - - - - - - Enable FakeVim (restart required) - - - - - - - + + + + Retain last used directory between EncryptPad sessions + + + Save last used directory + + - - - - - - 0 - - - - 1 - - - - - 2 - - - - - 8 - - - - - 32 - - - - - 128 - - - - - - - - Path to libCURL executable - - - Libcurl path: - - - uiLibcurl - - - - - - - - 0 - 35 - - - - Qt::NoFocus - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - Qt::Horizontal - - - - - - - Qt::LeftToRight - - - Word wrap - - - - - - - Qt::Horizontal - - - - - - + Default file properties: @@ -335,34 +271,159 @@ - - - - - - Edit... - - - - - - - - 0 - 0 - - - - Recent files: - - - uiRecentFiles - - - - - - + + + + + 0 + 0 + + + + Qt::TabFocus + + + Qt::LeftToRight + + + [example: Monospace (Size: 12)] + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::LeftToRight + + + Word wrap + + + + + + + + + + + 0 + 0 + + + + Recent files: + + + uiRecentFiles + + + + + + + + 0 + 0 + + + + Font: + + + uiSelectFont + + + + + + + Qt::Horizontal + + + + + + + Create .bak files + + + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Font... + + + + + + + 0 + + + + + + 60 + 16777215 + + + + 10 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Key file encryption properties: + + + uiEditKeyFileProperties + + + + This controls how many times you can save without entering a passphrase @@ -375,94 +436,90 @@ + + + + Key file random sequence length (bytes): + + + uiKeyFileLength + + + + + + + + Appearance + + + + + + + + Icon theme + + + uiIconTheme + + + + + + + + Auto + + + + + Light + + + + + Dark + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - - - "Windows" end of line: CR+LF - - - "Windows" end of line: CR+LF - - - - - - - - 32 - - - - - 64 - - - - - 128 - - - - - 256 - - - - - - - - Qt::Horizontal - - - - - - - Tab size: - - - uiTabSize - - - - - - - - 0 - 0 - - - - Font: - - - - - - - Qt::Horizontal - - - - - - - - - - Display line numbers - - - - + + + tabWidget uiFontFamily uiSelectFont uiDisplayLineNumbers @@ -480,6 +537,7 @@ uiEditKeyFileProperties uiS2KResultsPoolSize uiKeyFileLength + uiIconTheme @@ -490,8 +548,8 @@ accept() - 305 - 478 + 326 + 695 157 @@ -506,8 +564,8 @@ reject() - 373 - 478 + 394 + 695 286 @@ -522,8 +580,8 @@ selectFont() - 454 - 41 + 481 + 66 240 @@ -538,8 +596,8 @@ editKeyFileProperties() - 454 - 371 + 481 + 586 291 @@ -554,8 +612,8 @@ editDefaultFileProperties() - 454 - 338 + 481 + 554 291