From 93e2321f381ed34de36c088a4f50a7550e148652 Mon Sep 17 00:00:00 2001 From: David Llewellyn-Jones Date: Sun, 30 Mar 2014 00:38:10 +0000 Subject: [PATCH] Added About page. --- OpenVPNUI.png | Bin 2965 -> 0 bytes OpenVPNUI.pro | 23 ++- OpenVPNUI.pro.user | 4 +- bin/ovpnpermit | Bin 5891 -> 9267 bytes ...NUI.desktop => harbour-openvpn-rig.desktop | 6 +- qml/filebrowse/pages/AboutPage.qml | 58 ------ ...{OpenVPNUI.qml => harbour-openvpn-rig.qml} | 0 qml/images/openvpn-rig.png | Bin 0 -> 4422 bytes qml/images/ovpn-title.png | Bin 0 -> 7637 bytes qml/pages/AboutPage.qml | 182 ++++++++++++++++++ qml/pages/ConnectPage.qml | 6 +- ...penVPNUI.spec => harbour-openvpn-rig.spec} | 29 +-- ...penVPNUI.yaml => harbour-openvpn-rig.yaml} | 27 +-- src/{OpenVPNUI.cpp => openvpn-rig.cpp} | 6 +- src/vpncontrol.cpp | 2 +- 15 files changed, 240 insertions(+), 103 deletions(-) delete mode 100644 OpenVPNUI.png rename OpenVPNUI.desktop => harbour-openvpn-rig.desktop (50%) delete mode 100644 qml/filebrowse/pages/AboutPage.qml rename qml/{OpenVPNUI.qml => harbour-openvpn-rig.qml} (100%) create mode 100644 qml/images/openvpn-rig.png create mode 100644 qml/images/ovpn-title.png create mode 100644 qml/pages/AboutPage.qml rename rpm/{OpenVPNUI.spec => harbour-openvpn-rig.spec} (92%) rename rpm/{OpenVPNUI.yaml => harbour-openvpn-rig.yaml} (89%) rename src/{OpenVPNUI.cpp => openvpn-rig.cpp} (96%) diff --git a/OpenVPNUI.png b/OpenVPNUI.png deleted file mode 100644 index 4c883a0ec7f3c6c6c18fa9e376d98d9d2520c161..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2965 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 LNkvXXu0mjfbPB7e diff --git a/OpenVPNUI.pro b/OpenVPNUI.pro index b0eed47..e1e09ae 100644 --- a/OpenVPNUI.pro +++ b/OpenVPNUI.pro @@ -6,11 +6,11 @@ # - desktop icon filename must be changed # - desktop filename must be changed # - icon definition filename in desktop file must be changed -TARGET = OpenVPNUI +TARGET = harbour-openvpn-rig CONFIG += sailfishapp -SOURCES += src/OpenVPNUI.cpp \ +SOURCES += \ src/vpncontrol.cpp \ src/filebrowse/searchworker.cpp \ src/filebrowse/searchengine.cpp \ @@ -18,13 +18,12 @@ SOURCES += src/OpenVPNUI.cpp \ src/filebrowse/fileworker.cpp \ src/filebrowse/filemodel.cpp \ src/filebrowse/fileinfo.cpp \ - src/filebrowse/engine.cpp + src/filebrowse/engine.cpp \ + src/openvpn-rig.cpp -OTHER_FILES += qml/OpenVPNUI.qml \ +OTHER_FILES += qml/harbour-openvpn-rig.qml \ qml/cover/CoverPage.qml \ - rpm/OpenVPNUI.spec \ - rpm/OpenVPNUI.yaml \ - OpenVPNUI.desktop \ + rpm/harbour-openvpn-rig.spec \ qml/pages/ConnectPage.qml \ qml/pages/ConfigurePage.qml \ OpenVPN-help.txt \ @@ -60,7 +59,6 @@ OTHER_FILES += qml/OpenVPNUI.qml \ qml/filebrowse/pages/DirectoryPage.qml \ qml/filebrowse/pages/CreateFolderDialog.qml \ qml/filebrowse/pages/ConsolePage.qml \ - qml/filebrowse/pages/AboutPage.qml \ qml/filebrowse/components/Spacer.qml \ qml/filebrowse/components/ProgressPanel.qml \ qml/filebrowse/components/NotificationPanel.qml \ @@ -70,7 +68,14 @@ OTHER_FILES += qml/OpenVPNUI.qml \ qml/filebrowse/components/DirPopup.qml \ qml/filebrowse/components/CenteredField.qml \ qml/components/ValueButtonAlignRight.qml \ - bin/ovpnpermit + bin/ovpnpermit \ + qml/harbour-openvpn-rig.qml \ + harbour-openvpn-rig.desktop \ + rpm/harbour-openvpn-rig.spec \ + rpm/harbour-openvpn-rig.yaml \ + qml/images/openvpn-rig.png \ + qml/images/ovpn-title.png \ + qml/pages/AboutPage.qml HEADERS += \ src/vpncontrol.h \ diff --git a/OpenVPNUI.pro.user b/OpenVPNUI.pro.user index c471047..e62ae15 100644 --- a/OpenVPNUI.pro.user +++ b/OpenVPNUI.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -54,7 +54,7 @@ MerSDK-SailfishOS-armv7hl MerSDK-SailfishOS-armv7hl {d2cef3cf-98e6-437c-a097-b7f269d12d9c} - 0 + 1 2 0 diff --git a/bin/ovpnpermit b/bin/ovpnpermit index 5f570706de295693b7b78d37275541e419a14a47..bd19a0eb928f5f0253e55d85079a8acc3d08dbe7 100755 GIT binary patch literal 9267 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 delta 2441 zcmZuye@L8l7=PY-@4X++Gf%yH&w1`n&&HfnwzkEBAZ-igGD;{g=1MmQlN?^H7>vQ4 z&Bg>P-B-e3GN~9w5r*@hSTqA0M1M3WSp8+2R(}*&ji`|9^LgL<+S}1{eDC>wp6{>c z`8?0}`_3Ia*D{vawKOcUM?}(L5uabIJ(8A?Y?CcgBZf$}D#57|a4>$G^M$$o#&Q-uG6H%zypSjmqB}mhIW5lT$&g@T2+A zFjt0+w!F0NtfP&)(x!!T!)noJy68*ij%q7(6m0};`J8L4fa*uP<-tz@U-jVAz}G$a zFz}iOXMtBeSO)r!o_ewGSW{EWslk@})n(s<>Q~=^Tu1xE`=7n9h15}e|M?kUU(pG zpTVdq|G}_)_WJG6=cBjB)YJYO#sO7l?GLZMf{YDg19j3$!Ss6@x#)$z*K^Dxr5npy)nXvi$S6wDCU6Qukh>VEhGwQ~pqa1DXeU%OXgB6x zb~Cp$BvJzFB-$o4@(@F#AY93+&Y&Ic#-2=Jhk8C}M|S|Nudff%hgIl=`XyMYW`jvI z|Gg|GEz_9!zYQyf=0++?4E0uUo7!1*)tFW*RjDxD%A?XIRV0=QC$KzWA}MNbEY-|o zcL1faJByCTFeu6yG_Z}t!AZ>PP(!hdMYp@vyXcXW33U@a#~t-2dSpAK>f)IIsk&>a zL-G2+8oFzidLdpPcJ2}m3aP1h%IY~U(xVpQ8Oymk=-C(TQtJew1*3Mx8bEJ=X7vQ@ z&XrQVuxC*TSv7**GIRb=z&9GRk+g$qcoT+B-drZzC&0+$tP)8PrcY>YGgZrMWb^x7e!bKtin_ENo_2rSu?;IJ%6V_iiqv_(7JI##Cd=<)-iN>#&cNDN+qp^B%J+p zmIPVi8>z7YjF_Ks9wgWy5t+w-cVR<)z_8~4I>_7PN`)+Vuz}+^P6u2`$Py`O9xdA8 zM-L|Ld`Vr2NT=#eR_@ZJ$4BfZ3~6it^9)TIUK;s}SnW-va=O0oeoGQg=uib~nt{EZ zw*u<|#fQS7nlFtjrOqj{9!x*=w~o(tJJ##^O(RuL8n|J40$n_g2@K4Seg&v~30PM( z@mb*Og#$SMO<*l)bY_b1HDFzj6;dXj0((EkUm3_guK^E?;u_q+gk{eGzX5BH%i%Gf zUY)CQ6iXSfF21PGmKxyq3%TTY2AG-b!~P6lchUGmIT*a3_fBB%0Y`w>JPr*OZE&Ut ob3ZM7fyROV-OrXuVBWS{7^6eh6but{$Lp@(Bju}89ho2g0Wz{fVE_OC diff --git a/OpenVPNUI.desktop b/harbour-openvpn-rig.desktop similarity index 50% rename from OpenVPNUI.desktop rename to harbour-openvpn-rig.desktop index 245e577..22dccc4 100644 --- a/OpenVPNUI.desktop +++ b/harbour-openvpn-rig.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application X-Nemo-Application-Type=silica-qt5 -Name=OpenVPNUI -Icon=OpenVPNUI -Exec=OpenVPNUI +Name=OpenVPN Rig +Icon=harbour-openvpn-rig +Exec=harbour-openvpn-rig diff --git a/qml/filebrowse/pages/AboutPage.qml b/qml/filebrowse/pages/AboutPage.qml deleted file mode 100644 index c3f3701..0000000 --- a/qml/filebrowse/pages/AboutPage.qml +++ /dev/null @@ -1,58 +0,0 @@ -import QtQuick 2.0 -import Sailfish.Silica 1.0 - -Page { - id: page - allowedOrientations: Orientation.All - - SilicaFlickable { - id: flickable - anchors.fill: parent - contentHeight: column.height - VerticalScrollDecorator { flickable: flickable } - - Column { - id: column - anchors.left: parent.left - anchors.right: parent.right - anchors.leftMargin: Theme.paddingLarge - anchors.rightMargin: Theme.paddingLarge - - PageHeader { title: qsTr("Public Domain") } - - Label { - width: parent.width - wrapMode: Text.Wrap - font.pixelSize: Theme.fontSizeSmall - color: Theme.highlightColor - text: "This is free and unencumbered software released into the public domain."+ - "\n\n"+ - "Anyone is free to copy, modify, publish, use, compile, sell, or "+ - "distribute this software, either in source code form or as a compiled "+ - "binary, for any purpose, commercial or non-commercial, and by any "+ - "means."+ - "\n\n"+ - "In jurisdictions that recognize copyright laws, the author or authors "+ - "of this software dedicate any and all copyright interest in the "+ - "software to the public domain. We make this dedication for the benefit "+ - "of the public at large and to the detriment of our heirs and "+ - "successors. We intend this dedication to be an overt act of "+ - "relinquishment in perpetuity of all present and future rights to this "+ - "software under copyright law."+ - "\n\n"+ - "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, "+ - "EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF "+ - "MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. "+ - "IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR "+ - "OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, "+ - "ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR "+ - "OTHER DEALINGS IN THE SOFTWARE."+ - "\n\n"+ - "For more information, please refer to " - } - } - } - -} - - diff --git a/qml/OpenVPNUI.qml b/qml/harbour-openvpn-rig.qml similarity index 100% rename from qml/OpenVPNUI.qml rename to qml/harbour-openvpn-rig.qml diff --git a/qml/images/openvpn-rig.png b/qml/images/openvpn-rig.png new file mode 100644 index 0000000000000000000000000000000000000000..ea08e45302f6a3dce8808e87caa57a0021a7c337 GIT binary patch literal 4422 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 M07*qoM6N<$g7X`lK>z>% literal 0 HcmV?d00001 diff --git a/qml/images/ovpn-title.png b/qml/images/ovpn-title.png new file mode 100644 index 0000000000000000000000000000000000000000..af86e1f445067d80221beeb75a784dda001de183 GIT binary patch literal 7637 zcmW+*2RK{r_m2@HMvb6qHLblz5xccY5jAU5t-XR6wW(R7zO*Pojhd}dThUlm6w%l- zD2*AlOYy(I|9$R!@4fGH-gDmbIiL5Oq{oPdbdXyR5C}x4tD|WQ0+I9q_vTa-z}YB% zV-2{F`>X4kQUO~S)$>H)nHs5M=??-il>hG_LG|2m1RB{ebMy2+wU*s8{$5K5f7LtrnQYs5_2}>5g7Km@1JMLS@L{syic}Bnmsa zC<*z2^e5^+2{=ZLEu2TF9=7qcHF5elZ=muOe+Ox1Io*p9oViIAbv$pkP4{=1)PhQM zD3U(>G85ieJ6#s4%>BCjnz2ctPw*zq4poOlq}QtJ`b9KNG)>fYBJM-l)N!yf_ZSFg zop2K@LKga-3txaKeH9eO)Jnd4TS5TA_N1e50A~?vx=fl@pA!<075k;Fxtv+O>N0BC zLO-0-LSC=uiMGY54ZhdObGye8pY-oI`088+2}Xuy#l8(+fmEKTM^4X51K)9R%^kAi zQOT7aPP%7rM3nSz;xcWE9XyKhVMlpuVffosLGd6D5+2GckTL>lqXYGvei^P(!0-2N zy@M;xv>M)2sw5-&dxU+E{Up&WYMRuV1Q&f7O$4=&yoOYcG8*rSl`_fB!I_k(Dw{vf zCn~Z(+1xU!qehaRCw<(L#{@e_I7k%ZZ(!>CHdSQjfBiYiXv4^0w&D-X$pf_>T8H#= zXB~RxM@Zz5@8o^mps7qF6R$X!aP5Bjx7ueg|C|`%=E3101n)@fmqY(Nv~Ks^{N{*m3t%`C5G#iMTT3rsJqejWUr|!M_G-% zloxJ!b2&mk>O;f8t!(KS2x2;D7=DzA?bPh{)$Fbc-~dJhnrAj0<8(~w^d8CB_btyd z9W%$+z|17ByYekq&MX$Sb8eSfS?dIVk>YdZTwu>EzLi)}YWdL&q^$#KozgzD0}tLC zHt8quG>Bdb;!GMz>G-~|K+>F~>s4S1@zeax*X54R)}!;LI>(CTSt%)>{9XN88=0A- z^%5>(YLd!k##vyK{1{~imm?wMp(wTCP{#iC+yG#3x&bq9S~naT}UF*KK9sGX7k2V3LyV?&KgayxCwg_w(7e;;--3 zj9OqADC}*6C$5UY*nnJIdwB#gma+d!lsX%gm(90AhS5h+>_k#mULEG!i&yeP%zv<{ zR7@z2Jf+`Re4uoJZUQFj(2{@rQ5-34a?l^R6`~Rh?6EfP5SVcYU5AEdoLLMWntO5N2zM?|w zqE*+ByHc2D`f2~}T~>d&-mB|@EY0p4NhWNkmfIFHz7MjO$4I-LKOMdYn`~89C>QoL zENbu&Z$b7CVcOKIDlM7JukWi$Ur<%1xo+iuOm`1O^=u4UGTABqNY9JT!v-Z-lUQ%4 z-2moZ9^Xo_D78JKaX9Un8vX+KIS_^uoPo5)b)(|Nnn}E2kg_Q+9q>o`4w^I7eUQ;U zU9m%cuGcMIeo(@cmnNmRX10CK=Ua81&#dDew;3)JY!u%J5o}TvEve6*kI11`ZytpP zmwv^qTQYI~$F~BrWI}+KV$*WLgi;RBXWlRhIQ`769OpfTfYrg{zdbKU&oQ!^-IUvM zrRwGn3t9KZh%qYOXQD<9%;(kUf3c?zhd19Y-i1`!C10&de<&Ohd*xS=KGbM8A)9c| z=>C13raOwyj!pq5wtSArial)*CI8n9`+CJ!M;_erPGdr#*B?7@KHd|I_bh(z_VoU= zJ_x}JiP+YAjFx2Q3h@zcW`8G>Z}rFBGk>>3l)4bM!3m6_!R74BpiZ~#$7_s{;m2^Bkf!=xCxExA(4FsdB+M^|6XNB#@o zz(&tTrK%6j$C;W9ik~AltN&B4s+XO|_A#Z<9Tr9sB{u+&c-N-CG(ArIZxUN2D?l%E z^}yk!BfXJJX2Ae~Dl@Gwgz!0qI)LLRnH=R6b|T%LM=DM*$F7C37trjTogoQw7WAzH ziK|7i^3xue9qrEIO4AJ_)jnOLcO{KnaZ3zUZ+&@smD}=#$8R+yEwE}#ggu&46QhJJ z8u$9l+wm;tk0Dv+E9Z9wqYeUCsFMetHkS+H-`|XRU7_ZQBXY)FhTBfsd^ z>h>FK&hhvdgQz5Gwe@#eG6fDVdHr#MO`4*9TFr)Z*;YJ3I*9JOH3sXNxGr+kfR&Yd zavHGHp#b_}jk>^h;Tl+Cr@)s&hJfP!2Nd7TyOS|$*bHPq*&VVSLnx*}i?pJ8r|;NxPJ8Waa0g3{COS<3VQ+}; ziiYP$sY?62d;OQGeWNs+=ha$L%;_=mtD-`hpzF_sqGg804=?0XIL3?anDEn7dO|Lg zq>!fxFXV{P1fqa-^I(JU_Hz~dC1BQ3FTxkhDU=<}w{kjOWJ2;!U8hO=g6J=G$Q8Z) zFfh@m4ua%A|8B#_u2_nKGcc5!B;kA*$^ke6_iY~duEN7J;Fo%;8`gcBfv)}08snSO zW=ao9{=E^*vG}8EfDgbt+?FdI`|HZQt=zzC1Nl*p-rMok(`jOD-7s^8ZqQT8XLwy4;`OsSsl4=e6rvn-s z=}r)&(tI!jSx?46A#S5c`@4h)^|HVfaXG=?#J^zzAU!pG>kj@$=9L^2z1D{hMz!yX7$Bm=@$R z!wXWYlkykua?XjN@<@53{kwP%Lb;IjdXjC$6l@8BHW%Zx6{vl1`tHJQF}^XAZ>3kg zO0A?snEzwqRSXZ};ZNv1Z+?VdqI_1)7wuD+%F2D%WIX_8_AM}l!u!i(1tO&(hFP)l z&bsi`B&q3k6$qd}ZJhw=cE{V^3KQ#Gnov(jSQ+VBA(`rZH1{&I%gh~w%<9n>j2)(d zWe3S%ge^^*9%e3=U@m7|SMO-f=TRPpORKfXr_S}1saLhUCte%8fS#GmUWV$F-#PHU zw;tQdf8OOU!AMhv@IUUqnW|2Jqyg!dc_rDy#S3TBGpxd>iJw3zehQ$xR{!)}Sbf@1}gwg;Vb5cj@kH z8KJM^FM7?JH;sok%|x{G-6R7!U~k=mJB@*01m)^hWVlob;IGrsIj&3J3WQBA5(xND zgxtPaOkM-8vKzrlqwvftq%^=$s*cU~JaH{xcif57EY|SigT=KUemTp3dQY_v7q^%c zBL?_qe*2I_tSNI;zGzuieG6->smL??o{i7;n@Du>ESXUWBI!Mm66lvEU%6FGkyepr z@#Yylo{eyjef*hsK|rr3G~U|9(m1t72~~OjKN8A&tIy$Y;GM~WGd!OR3Bt6kB1Ux- zzV0T31*O#^r(!(o&K`NE2CDZzLTnVj6wM-X@(nv-M};HsL3U}*PquYd4Z*vK-u@x- zD=+ZBp<}l%6VtZ{9oY^g-+K!W53;3pM;&hLETQlIFip^x;p_DfW?+)+^3S>Vty+vX#LaY+%zwm>fdN9so;MM!Ik(K4UU;dA6;h4Ug#B#h@FIxpEdM% z%zbat8Ag47G4WQ+RWSa9XmN0?gBQx&CbRC6a|V5+t=9&2 zo$ZniO6+v?0b2WFz}Br7D;zAyg- z0QBy<&ar*^dZpnHenIcu;?55(raVStgQzO?c`6=iwVLY4f^Fx$hSeH)!?15v^1th8 z=)ZZRD%rSHyX=iimld%^NNtYpGuW(-(z}dxyWlpon zf@hwFlfn9lF)bxdeV!FRVcZX(oL1fKU-G&H^cc$l`XeF~$kxE#9yh`_dCM&2|C#WH zLyfjHg%~y*@n1JUeK33Rp;6*3uI>%%>kP)bR5pp1EMSby!wu;A0DyI&G?eFHSOSukxD?KCDRpi z17+hF^gq3Awr?cSB~8+e{xYx!!=*4fmnWXBzUlqvt%SJ|Ur&m!l1LuM})q2BV4lw&^^Rh$xC>6v>+V3 zc-_Du@}B0{)`NQ9kDbBtM_%+^#m}V0dfX9uGGU$7DF>Kwld^l)GPlce>dtPWhA|Q2 z{@je&0-Bkz$tv}1?XnNv$8{tdPxuCwxF@tqwQD++PDc<#A3h2E7X@!(A?F!ElR`U# zRCuSEy-5%2h6R^|*y{H*)#CL+Q_cS7nvelYXnYWb3H>OT>O8ld(@}zjUjIZmjB+k+ zBUXR-kaPbfz&Z6$+1d6ioSpo1jQ>WJlIKyG7D;=B@*D|g(&47wD^bi1y!Tk;E2B*4 zzSWS0y%*L9i4y_dITQ=c=_MG2)xvF4^2|kE{$en^i@5mIa6ePBjZ(4rfkBR!jN(Jj zDACe6(iyDdNFG2r0@>Ju7SuJ=Ut2Pbg7w>3j>G*@fxf7G-HVTY>L*nA`aVK0NP?NH zS>Ip0df}Ob`)d5Jv5DFlb|u`#sdQY15Wqx;wh;JeqAx%5+8DRMymHV?L9E7|ZPI!n zn44QdHhWGgd7F0PoR(aXCezB)JG(^sdrW~pJN|BLp=}6M% z!HoT`b~^T+TFLD+lejt4v70aR?5s2CG*p6=W*VwGJ=GO8UX<1U^y;@D-7!SV?e@+V zy4GJPLDH6z1nY$KDo9rXv-K0ZNmRv4-5>eo zNUdQ7qK_Zd$gqZ2o+G>ebfOYZq1^0X=IBYzomtlxmEy|eVTth0`hklpicckkTqO|; zTzsaWI64ek7a7+Kbz%*K9kPpF`?Sdf(tW4=iwc%#Z(R8ppZx~?=uhUdCaNT^(9{JH zkkY%DeR_Tm2g}`AUqw*`a*^d?CNU9xZnfvNO@|IkuRI#3}D%FC(B{2DE4bm+C!zD>}|O+4ofC+2ICQMpdfr*@_Yi;4tW9N3Gp1`*jUlcOu!wlVHPc!PQFN95wTCNi^pSn3E|sSKT~@3`^C!K(N=*`OATh?C zv`}0!Bmh<0W~XVaI4=BE^3!W{xAbiL1FCF0z`fZ3awHB!bR(T(89WWRd`FL2=?e9f z)2eI`JkJc?W-gDD{s6p}ye5nMHh!g{prqHcI;sk>d)ajs)IE|m#hye%sBu4l?4zHC zSCoe!NL97!4+_Re1k61UF2IjAIsr88B`>M1X)33H42>>DFD#@He>x5gC8j+b);VDj z=PJHm$dtU43Hm4B&aK@ii*r9>k@XSc})#J-eERIOv@$lW1ra1b#uDZrf=`Z0HJzcsOh*gFTYeBj^yM$i z8Kh19p_Oa87ui&#`L~~f(5GNR@nOLc|J_5cngQ!dE|w4sQ*@dE%Ou9A7zjA&w({!r z_>>IG>zf)w_p?N)zh?0jz0kIU?!?bG^RX$|49m3s%UxAxHNc$oIhVu)Xk^8XS?&F< zEGR7Iv7(^gWmr2R!7Cx**MLbzl&TPi5kn!@iD$_&!4&3FvCLoI(GPLk;}e9 z>iIS;4UiIHZXK2-d~ofxBi?q~2t;~$szyfl{&v*JkQ5^U@7X3)nC`mte58~yYl zt)lNa`F?Wyh~#@VftCaSrSxu`{CTq`tba@3h?~hp1@~8i4&OVQKHZO>uC(ksC(o2llJqR7TlcU&b2Eehiu7xNI93rP4 zN#MV=hfD1;4f0{YRWxtxG2bg^nUG#R+WYrlLN52Go;R5LgT(;7by#a-I z`l|}l>nXok=TW>u9{T!|15f5-$4UD7SKgy$|3;Kc;^3XP7GtV;Dx^zaXe<>i;?!tO z{YDPxr4YZ1C#h^4nX0PhVC|3l+-)N71AWR$`>MY#5aV3w8 z?5?lvt$Dgnpndhn3b=vA ze?F!uVBRQel-|f+d0l+G8d2dkULD#8KGVEqXy)pBmb@)j0unbwO<(vWN53a#db9&N z31|Og=l^w`dqffD?#Z=!7ekq3lAT-2J@)v#i2ND-daa4o8FJGB$!#@Q;UhE!l}E5K zfpO8>(E)U)H=zk<(7K1<-F$Cye)dscTgBCkC&=2sU!=IDmyzJ9d+0;-%GpX1&Lb(N zAsXWs_xTB_EkFf?V3Q*ldit!xbyl+b0G_A)&%z$NLG(dIzHeyUs1Q82=_uA_#B?Sdi$zT+8`Nq zGng@$$2TOi(~W!VzTYjR#-MBg@@XQ;z|)}Vx9xJJq~4&wrkp2@f7G7<(E!K`tJL`= zIk|r^WVLiQie>=A_Cp#C{iSyBzu3UZoqiep0Z?96^9Qs>7(;sBrWXCqK2XauEL;(nl|$5mmmqzvLS}gVh9Qt`-W-Xe9tU*N{8(E|Rq}IVM1VHE#ww9(lzURPh<{6;GOPb?z74XZ7-f$H_K-|DREra)`0-CS? zH=wzF`f=c*%$>W&AfRYdT`^kqzh>p@ZbbVh(pXauQfpF^gTh+y)P1E^*@J9Q0r$b9 qaTN#~hz2l1)$ecrU$!Lvjl@6WNxk1Eegc$WLAqK9%^G!wnEwOtkFN0m literal 0 HcmV?d00001 diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml new file mode 100644 index 0000000..da6fabb --- /dev/null +++ b/qml/pages/AboutPage.qml @@ -0,0 +1,182 @@ +/* + Copyright (C) 2014 David Llewellyn-Jones + Contact: David Llewellyn-Jones + All rights reserved. + + You may use this file under the terms of BSD license as follows: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the Jolla Ltd nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Built using the standard template from Jolla + Copyright (C) 2013 Jolla Ltd. + Contact: Thomas Perl +*/ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +Page { + id: aboutPage + + SilicaFlickable { + width: parent.width + height: parent.height + interactive: true + + anchors.fill: parent + contentHeight: aboutColumn.height + Theme.paddingLarge + + VerticalScrollDecorator {} + + Column { + id: aboutColumn + width: parent.width + spacing: Theme.paddingLarge + + PageHeader { + title: "About OpenVPN Rig" + } + + Image { + width: 452 + height: 86 + anchors.topMargin: Theme.paddingLarge + anchors.horizontalCenter: parent.horizontalCenter + source : "../images/ovpn-title.png" + } + + Label { + text: "OpenVPN client configuration" + wrapMode: Text.WordWrap + font.pixelSize: Theme.fontSizeSmall + anchors { + leftMargin: Theme.paddingLarge + rightMargin: Theme.paddingLarge + left: parent.left + right: parent.right + } + } + Label { + text: "Version:\t0.5.0" + wrapMode: Text.WordWrap + font.pixelSize: Theme.fontSizeSmall + horizontalAlignment: Text.AlignLeft + anchors { + leftMargin: Theme.paddingLarge + rightMargin: Theme.paddingLarge + left: parent.left + right: parent.right + } + } + Label { + text: "Author:\tDavid Llewellyn-Jones" + wrapMode: Text.WordWrap + font.pixelSize: Theme.fontSizeSmall + horizontalAlignment: Text.AlignLeft + anchors { + leftMargin: Theme.paddingLarge + rightMargin: Theme.paddingLarge + left: parent.left + right: parent.right + } + } + Label { + text: "Licence:\tBSD" + wrapMode: Text.WordWrap + font.pixelSize: Theme.fontSizeSmall + horizontalAlignment: Text.AlignLeft + anchors { + leftMargin: Theme.paddingLarge + rightMargin: Theme.paddingLarge + left: parent.left + right: parent.right + } + } + Label { + text: "Credits" + color: Theme.highlightColor + font.family: Theme.fontFamilyHeading + horizontalAlignment: Text.AlignRight + anchors { + margins: Theme.paddingLarge + left: parent.left + right: parent.right + } + } + + Label { + text: "File Browser code by Kari with public domain licence" + wrapMode: Text.WordWrap + font.pixelSize: Theme.fontSizeSmall + anchors { + leftMargin: Theme.paddingLarge + rightMargin: Theme.paddingLarge + left: parent.left + right: parent.right + } + } + + Label { + text: "OpenVPN and the OpenVPN logo are trademarks of OpenVPN Technologies, Inc." + wrapMode: Text.WordWrap + font.pixelSize: Theme.fontSizeSmall + anchors { + leftMargin: Theme.paddingLarge + rightMargin: Theme.paddingLarge + left: parent.left + right: parent.right + } + } + + Label { + text: "Links" + color: Theme.highlightColor + font.family: Theme.fontFamilyHeading + horizontalAlignment: Text.AlignRight + anchors { + margins: Theme.paddingLarge + left: parent.left + right: parent.right + } + } + + Row { + spacing: Theme.paddingLarge + anchors.horizontalCenter: parent.horizontalCenter + Button { + id: connect + text: "Website" + enabled: true + onClicked: Qt.openUrlExternally("http://www.flypig.co.uk/?to=openvpnrig") + } + Button { + id : disconnect + text: "Email" + enabled: true + onClicked: Qt.openUrlExternally("mailto:david@flypig.co.uk") + } + } + } + } + +} diff --git a/qml/pages/ConnectPage.qml b/qml/pages/ConnectPage.qml index 08cbdb6..c0175f4 100644 --- a/qml/pages/ConnectPage.qml +++ b/qml/pages/ConnectPage.qml @@ -92,6 +92,10 @@ Page { // PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView PullDownMenu { + MenuItem { + text: "About" + onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml")) + } MenuItem { text: "Configure" onClicked: pageStack.push(Qt.resolvedUrl("ConfigurePage.qml")) @@ -113,7 +117,7 @@ Page { spacing: Theme.paddingLarge PageHeader { - title: "OpenVPN Control" + title: "OpenVPN Rig" } Row { spacing: Theme.paddingLarge diff --git a/rpm/OpenVPNUI.spec b/rpm/harbour-openvpn-rig.spec similarity index 92% rename from rpm/OpenVPNUI.spec rename to rpm/harbour-openvpn-rig.spec index 25569f4..2e30e4f 100644 --- a/rpm/OpenVPNUI.spec +++ b/rpm/harbour-openvpn-rig.spec @@ -3,7 +3,7 @@ # Generated by: spectacle version 0.27 # -Name: OpenVPNUI +Name: harbour-openvpn-rig # >> macros # << macros @@ -19,12 +19,13 @@ Group: Qt/Qt License: BSD Licence URL: http://example.org/ Source0: %{name}-%{version}.tar.bz2 -Source100: OpenVPNUI.yaml +Source100: harbour-openvpn-rig.yaml Requires: sailfishsilica-qt5 >= 0.10.9 -BuildRequires: pkgconfig(sailfishapp) >= 0.0.10 -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) +Requires: openvpn >= 2.2.2 BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(sailfishapp) >= 0.0.10 BuildRequires: desktop-file-utils %description @@ -63,15 +64,15 @@ desktop-file-install --delete-original \ %files %defattr(-,root,root,-) -/usr/share/icons/hicolor/86x86/apps -/usr/share/applications -/usr/share/OpenVPNUI -/usr/bin -%attr(4755,root,root) %{_datadir}/%{name}/bin/ovpnpermit -%{_datadir}/%{name}/bin -%{_datadir}/icons/hicolor/86x86/apps/%{name}.png -%{_datadir}/applications/%{name}.desktop -%{_datadir}/%{name}/qml %{_bindir} +%{_datadir}/%{name}/qml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/86x86/apps/%{name}.png +%{_datadir}/%{name}/bin +%attr(4755,root,root) %{_datadir}/%{name}/bin/ovpnpermit +/usr/bin +/usr/share/harbour-openvpn-rig +/usr/share/applications +/usr/share/icons/hicolor/86x86/apps # >> files # << files diff --git a/rpm/OpenVPNUI.yaml b/rpm/harbour-openvpn-rig.yaml similarity index 89% rename from rpm/OpenVPNUI.yaml rename to rpm/harbour-openvpn-rig.yaml index e899975..33b4ca5 100644 --- a/rpm/OpenVPNUI.yaml +++ b/rpm/harbour-openvpn-rig.yaml @@ -1,4 +1,4 @@ -Name: OpenVPNUI +Name: harbour-openvpn-rig Summary: OpenVPN User Interface Version: 0.1 Release: 1 @@ -12,21 +12,22 @@ Description: | Configure: none Builder: qtc5 PkgConfigBR: -- sailfishapp >= 0.0.10 -- Qt5Core -- Qt5Qml - Qt5Quick +- Qt5Qml +- Qt5Core +- sailfishapp >= 0.0.10 Requires: - sailfishsilica-qt5 >= 0.10.9 +- openvpn >= 2.2.2 Files: -- /usr/share/icons/hicolor/86x86/apps -- /usr/share/applications -- /usr/share/OpenVPNUI -- /usr/bin -- '%attr(4755,root,root) %{_datadir}/%{name}/bin/ovpnpermit' -- '%{_datadir}/%{name}/bin' -- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' -- '%{_datadir}/applications/%{name}.desktop' -- '%{_datadir}/%{name}/qml' - '%{_bindir}' +- '%{_datadir}/%{name}/qml' +- '%{_datadir}/applications/%{name}.desktop' +- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' +- '%{_datadir}/%{name}/bin' +- '%attr(4755,root,root) %{_datadir}/%{name}/bin/ovpnpermit' +- /usr/bin +- /usr/share/harbour-openvpn-rig +- /usr/share/applications +- /usr/share/icons/hicolor/86x86/apps PkgBR: [] diff --git a/src/OpenVPNUI.cpp b/src/openvpn-rig.cpp similarity index 96% rename from src/OpenVPNUI.cpp rename to src/openvpn-rig.cpp index 2df2800..adfb69b 100644 --- a/src/OpenVPNUI.cpp +++ b/src/openvpn-rig.cpp @@ -34,6 +34,8 @@ #ifdef QT_QML_DEBUG #include +#else +#include #endif #include @@ -69,11 +71,11 @@ int main(int argc, char *argv[]) // /home/nemo/.local/share/flypig/OpenVPNUI.conf QCoreApplication::setOrganizationName("flypig"); QCoreApplication::setOrganizationDomain("www.flypig.co.uk"); - QCoreApplication::setApplicationName("OpenVPNUI"); + QCoreApplication::setApplicationName("OpenVPN Rig"); QScopedPointer view(SailfishApp::createView()); - view->setSource(SailfishApp::pathTo("qml/OpenVPNUI.qml")); + view->setSource(SailfishApp::pathTo("qml/harbour-openvpn-rig.qml")); VPNControl * vpnControl = new VPNControl (); diff --git a/src/vpncontrol.cpp b/src/vpncontrol.cpp index 3f80913..d3ec771 100644 --- a/src/vpncontrol.cpp +++ b/src/vpncontrol.cpp @@ -211,7 +211,7 @@ void VPNControl::vpnConnect() { } else { vpnProcess = new QProcess(); - QString program = "/usr/share/OpenVPNUI/bin/ovpnpermit"; + QString program = "/usr/share/harbour-openvpn-rig/bin/ovpnpermit"; collectArguments (); vpnProcess->setReadChannel(QProcess::StandardOutput); connect(vpnProcess, SIGNAL(error(QProcess::ProcessError)), this, SLOT(readError(QProcess::ProcessError))); -- 2.25.1