summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am8
-rw-r--r--icons/48x48/apps/qphotorec.pngbin0 -> 3492 bytes
-rw-r--r--icons/Makefile.am22
-rw-r--r--icons/scalable/apps/qphotorec.svg115
-rw-r--r--linux/qphotorec.desktop10
-rw-r--r--linux/testdisk.spec.in29
6 files changed, 179 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 64bfeb5..88d7483 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST = AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS compile.s
documentation.html \
dos/readme.txt \
linux/testdisk.spec.in \
+ linux/qphotorec.desktop \
src/icon_ph.rc src/icon_qph.rc src/icon_tst.rc \
src/photorec_64x64.png \
src/gnome/README \
@@ -26,9 +27,16 @@ AUTOMAKE_OPTIONS = gnits
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(docdir)
$(INSTALL_DATA) $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog $(top_srcdir)/NEWS $(top_srcdir)/README $(top_srcdir)/THANKS $(top_srcdir)/documentation.html $(DESTDIR)$(docdir)
+if USEQT
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applications
+ $(INSTALL_DATA) $(top_srcdir)/linux/qphotorec.desktop $(DESTDIR)$(datadir)/applications
+endif
uninstall-hook:
rm -rf $(DESTDIR)$(docdir)
+if USEQT
+ rm -f $(DESTDIR)$(datadir)/applications/qphotorec.desktop
+endif
static:
rm -f src/testdisk src/testdisk.exe src/photorec src/photorec.exe src/fidentify src/fidentify.exe src/qphotorec src/qphotorec.exe
diff --git a/icons/48x48/apps/qphotorec.png b/icons/48x48/apps/qphotorec.png
new file mode 100644
index 0000000..7ccce3b
--- /dev/null
+++ b/icons/48x48/apps/qphotorec.png
Binary files differ
diff --git a/icons/Makefile.am b/icons/Makefile.am
index c260fa0..f6cfdd6 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1 +1,23 @@
EXTRA_DIST = photorec.ico testdisk.ico
+
+iconsdir = $(datadir)/icons/hicolor
+
+nobase_dist_icons_DATA = 48x48/apps/qphotorec.png \
+ scalable/apps/qphotorec.svg
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)
+if USEQT
+ UPDATE_ICON_CACHE=update-icon-cache
+endif
+
+install-data-hook: $(UPDATE_ICON_CACHE)
+uninstall-hook: $(UPDATE_ICON_CACHE)
+
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating GTK icon cache."; \
+ $(gtk_update_icon_cache) || : ; \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
diff --git a/icons/scalable/apps/qphotorec.svg b/icons/scalable/apps/qphotorec.svg
new file mode 100644
index 0000000..f76140d
--- /dev/null
+++ b/icons/scalable/apps/qphotorec.svg
@@ -0,0 +1,115 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="94.883331" height="94.883331" id="svg3309" enable-background="new">
+ <defs id="defs3311">
+ <linearGradient id="linearGradient3286">
+ <stop id="stop3288" offset="0" style="stop-color:#b3b3b3;stop-opacity:1"/>
+ <stop id="stop3313" offset="0.5" style="stop-color:#e6e6e6;stop-opacity:1"/>
+ <stop id="stop3315" offset="0.89887643" style="stop-color:#ffffff;stop-opacity:1"/>
+ <stop id="stop3290" offset="1" style="stop-color:#ffffff;stop-opacity:1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3261">
+ <stop id="stop3263" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
+ <stop id="stop3265" offset="0.33418018" style="stop-color:#ffffff;stop-opacity:1"/>
+ <stop id="stop3267" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3233">
+ <stop id="stop3242" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
+ <stop id="stop3244" offset="0.75" style="stop-color:#ffffff;stop-opacity:1"/>
+ <stop id="stop3237" offset="1" style="stop-color:#000000;stop-opacity:1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4174">
+ <stop id="stop3323" offset="0" style="stop-color:#000000;stop-opacity:0"/>
+ <stop id="stop4178" offset="1" style="stop-color:#ffffff;stop-opacity:1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4124">
+ <stop id="stop4126" offset="0" style="stop-color:#000000;stop-opacity:0"/>
+ <stop id="stop4132" offset="0.64999998" style="stop-color:#ffffff;stop-opacity:0"/>
+ <stop id="stop4134" offset="0.95442492" style="stop-color:#ffffff;stop-opacity:0.69999999"/>
+ <stop id="stop4128" offset="1" style="stop-color:#ffffff;stop-opacity:0"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4106">
+ <stop id="stop4114" offset="0" style="stop-color:#ffffff;stop-opacity:0"/>
+ <stop id="stop4120" offset="0.88999999" style="stop-color:#666666;stop-opacity:0"/>
+ <stop id="stop4116" offset="1" style="stop-color:#333333;stop-opacity:1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4068">
+ <stop id="stop4070" offset="0" style="stop-color:#ff0000;stop-opacity:1"/>
+ <stop id="stop4076" offset="0.5" style="stop-color:#f2ff00;stop-opacity:1"/>
+ <stop id="stop4078" offset="0.56741571" style="stop-color:#86ff00;stop-opacity:1"/>
+ <stop id="stop4084" offset="0.96111602" style="stop-color:#02a2ff;stop-opacity:1"/>
+ <stop id="stop4080" offset="1" style="stop-color:#6d36ff;stop-opacity:1"/>
+ </linearGradient>
+ <linearGradient x1="11.583031" y1="1004.9205" x2="83.425392" y2="1004.9205" id="linearGradient4100" xlink:href="#linearGradient4068" gradientUnits="userSpaceOnUse"/>
+ <radialGradient cx="47.504211" cy="1004.9205" r="35.921181" fx="47.504211" fy="1004.9205" id="radialGradient4118" xlink:href="#linearGradient4106" gradientUnits="userSpaceOnUse"/>
+ <radialGradient cx="47.504211" cy="1004.9205" r="31.961046" fx="47.504211" fy="1004.9205" id="radialGradient4130" xlink:href="#linearGradient4124" gradientUnits="userSpaceOnUse"/>
+ <linearGradient x1="24.904339" y1="988.94238" x2="70.10408" y2="988.94238" id="linearGradient4326" xlink:href="#linearGradient4174" gradientUnits="userSpaceOnUse"/>
+ <filter color-interpolation-filters="sRGB" id="filter3353">
+ <feBlend in2="BackgroundImage" mode="lighten" id="feBlend3355"/>
+ </filter>
+ <linearGradient x1="24.904339" y1="988.94238" x2="70.10408" y2="988.94238" id="linearGradient3239" xlink:href="#linearGradient4174" gradientUnits="userSpaceOnUse"/>
+ <radialGradient cx="47.504211" cy="968.4248" r="24.679482" fx="47.504211" fy="968.4248" id="radialGradient3273" xlink:href="#linearGradient3261" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.0587749e-6,0.609653,-0.9522188,3.2146281e-6,969.65639,948.51477)"/>
+ <mask id="mask3269">
+ <rect width="47.008537" height="19.651985" x="23.995932" y="972.90875" id="rect3271" fill="url(#radialGradient3273)"/>
+ </mask>
+ <mask id="mask3279">
+ <path d="m53.783543 1003.8133a6.3762002 6.3762002 0 1 1-5.172117-5.17216l-1.107215 6.27936z" transform="matrix(4.6501196,0,0,4.6501196,-165.39605,-3676.0799)" id="path3281" fill="#fff"/>
+ </mask>
+ <linearGradient x1="47.504211" y1="1004.9205" x2="47.504211" y2="968.21008" id="linearGradient3357" xlink:href="#linearGradient3286" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0297027,0,0,1.984915,0.4703387,-953.41447)"/>
+ <mask id="mask3353">
+ <rect width="93.884247" height="72.521454" x="0.4703387" y="968.74597" id="rect3355" style="enable-background:new;fill:url(#linearGradient3357)"/>
+ </mask>
+ <radialGradient cx="47.504211" cy="1004.9205" r="31.961046" fx="47.504211" fy="1004.9205" id="radialGradient3360" xlink:href="#linearGradient4124" gradientUnits="userSpaceOnUse"/>
+ <radialGradient cx="47.504211" cy="1004.9205" r="35.921181" fx="47.504211" fy="1004.9205" id="radialGradient3362" xlink:href="#linearGradient4106" gradientUnits="userSpaceOnUse"/>
+ </defs>
+ <metadata id="metadata3314">
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>
+ image/svg+xml
+ </dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="translate(-0.06254578,-957.47881)" id="layer2">
+ <path d="m94.945877 1004.9205a47.441666 47.441666 0 1 1-94.88333122 0 47.441666 47.441666 0 1 1 94.88333122 0z" id="path3902" fill="#fff"/>
+ <path d="m91.938427 1004.9205a44.434216 44.434216 0 1 1-88.8684311 0 44.434216 44.434216 0 1 1 88.8684311 0z" id="path3900" fill="#000"/>
+ <path d="m83.425392 1004.9205a35.921181 35.921181 0 1 1-71.842361 0 35.921181 35.921181 0 1 1 71.842361 0z" id="path3914" fill="url(#linearGradient4100)"/>
+ <path d="m65.701572 1004.9205a18.197361 18.197361 0 1 1-36.394722 0 18.197361 18.197361 0 1 1 36.394722 0z" mask="url(#mask3279)" id="path3912" fill="#000"/>
+ <path d="m51.221839 1004.9205a3.7176273 3.7176273 0 1 1-7.435255 0 3.7176273 3.7176273 0 1 1 7.435255 0zM53.880412 1004.9205 53.880412 1004.9205 53.880412 1004.9205 53.880412 1004.9205" id="path3906" fill="#fff"/>
+ <path d="m53.880412 1004.9205a6.3762002 6.3762002 0 1 1-12.752401 0 6.3762002 6.3762002 0 1 1 12.752401 0z" transform="translate(8,-8)" id="path3910" fill="#fff"/>
+ <path d="m32.218113 1018.1054-8.879585 7.6254M30.923656 1016.4353l-9.628013 6.6555M30.923656 1016.4353l-9.628013 6.6555M30.923656 1016.4353l-9.628013 6.6555M30.923656 1016.4353l-9.628013 6.6555" id="path3930" style="fill:none;stroke:#fff"/>
+ <path d="m30.923656 1016.4353-9.628013 6.6555" id="path3934" style="fill:none;stroke:#fff"/>
+ <path d="m29.810864 1014.6391-10.270959 5.6126" id="path3936" style="fill:none;stroke:#fff"/>
+ <path d="m28.891922 1012.7364-10.80137 4.5082" id="path3938" style="fill:none;stroke:#fff"/>
+ <path d="m28.1769 1010.7481-11.213434 3.3544" id="path3940" style="fill:none;stroke:#fff"/>
+ <path d="m27.673629 1008.6959-11.502636 2.1639" id="path3942" style="fill:none;stroke:#fff"/>
+ <path d="m27.387628 1006.6024-11.665812 0.9497" id="path3944" style="fill:none;stroke:#fff"/>
+ <path d="m27.322024 1004.4904-11.701176-0.2749" id="path3946" style="fill:none;stroke:#fff"/>
+ <path d="m27.477544 1002.3831-11.608341-1.4965" id="path3948" style="fill:none;stroke:#fff"/>
+ <path d="M27.852485 1000.3036 16.464162 997.60194" id="path3950" style="fill:none;stroke:#fff"/>
+ <path d="M28.442739 998.27473 17.399202 994.39746" id="path3952" style="fill:none;stroke:#fff"/>
+ <path d="M29.241834 996.31867 18.66408 991.30828" id="path3954" style="fill:none;stroke:#fff"/>
+ <path d="m30.241015 994.45685-9.996079-6.08862" id="path3956" style="fill:none;stroke:#fff"/>
+ <path d="M31.429336 992.70968 22.12445 985.60954" id="path3958" style="fill:none;stroke:#fff"/>
+ <path d="M32.793817 991.09629 24.28207 983.06242" id="path3960" style="fill:none;stroke:#fff"/>
+ <path d="m57.359032 987.30271 5.736056-10.20249" id="path3962" style="fill:none;stroke:#fff"/>
+ <path d="m59.146609 988.42933 6.771084-9.54702" id="path3964" style="fill:none;stroke:#fff"/>
+ <path d="m63.459449 992.55382 9.266499-7.15019" id="path3966" style="fill:none;stroke:#fff"/>
+ <path d="m64.664717 994.28934 9.963134-6.1424" id="path4002" style="fill:none;stroke:#fff"/>
+ <path d="m65.681971 996.14134 10.55061-5.06732" id="path4004" style="fill:none;stroke:#fff"/>
+ <path d="m66.500065 998.08953 11.022492-3.93672" id="path4006" style="fill:none;stroke:#fff"/>
+ <path d="m67.110037 1000.1126 11.373608-2.76303" id="path4008" style="fill:none;stroke:#fff"/>
+ <path d="m67.505199 1002.1883 11.600117-1.559" id="path4010" style="fill:none;stroke:#fff"/>
+ <path d="m62.453612 1018.4859 8.650626 7.8842" id="path4012" style="fill:none;stroke:#fff"/>
+ <path d="m63.684972 1016.9906 9.366467 7.0188" id="path4020" style="fill:none;stroke:#fff"/>
+ <path d="m64.767345 1015.3842 9.996068 6.0887" id="path4022" style="fill:none;stroke:#fff"/>
+ <path d="m65.690768 1013.6814 10.533624 5.1026" id="path4024" style="fill:none;stroke:#fff"/>
+ <path d="m66.446734 1011.898 10.974192 4.0695" id="path4026" style="fill:none;stroke:#fff"/>
+ <path d="m67.028288 1010.0503 11.313714 2.999" id="path4028" style="fill:none;stroke:#fff"/>
+ <path d="m67.430071 1008.1554 11.549069 1.9008" id="path4030" style="fill:none;stroke:#fff"/>
+ <path d="m67.648386 1006.2307 11.678083 0.7851" id="path4032" style="fill:none;stroke:#fff"/>
+ <path d="m67.681221 1004.2939 11.699568-0.3378" id="path4034" style="fill:none;stroke:#fff"/>
+ <path d="m24.904339 982.3206a31.961046 31.961046 0 0 1 45.199744 0l-22.599872 22.5999z" transform="matrix(1.05,0,0,1.05,-2.3752106,-50.246024)" mask="url(#mask3269)" id="path4122" style="fill:url(#radialGradient3360);filter:url(#filter3353)"/>
+ <path d="m83.425392 1004.9205a35.921181 35.921181 0 1 1-71.842361 0 35.921181 35.921181 0 1 1 71.842361 0z" transform="matrix(1.01,0,0,1.01,-0.4750421,-10.049205)" mask="url(#mask3353)" id="path4102" style="enable-background:new;fill:url(#radialGradient3362)"/>
+ </g>
+</svg>
diff --git a/linux/qphotorec.desktop b/linux/qphotorec.desktop
new file mode 100644
index 0000000..003a33f
--- /dev/null
+++ b/linux/qphotorec.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=QPhotoRec
+GenericName=Data Recovery Utility
+Icon=qphotorec
+TryExec=/usr/bin/qphotorec
+Exec=/usr/bin/qphotorec %F
+Terminal=false
+Categories=System;Filesystem;Qt;
diff --git a/linux/testdisk.spec.in b/linux/testdisk.spec.in
index 09672a7..b200b3a 100644
--- a/linux/testdisk.spec.in
+++ b/linux/testdisk.spec.in
@@ -21,14 +21,12 @@ BuildRequires: libewf-devel
BuildRequires: libjpeg-devel
BuildRequires: libuuid-devel
BuildRequires: ncurses-devel >= 5.2
-%ifnarch ppc ppc64
-#BuildRequires: ntfsprogs-devel
BuildRequires: ntfs-3g-devel
-%endif
-BuildRequires: openssl-devel
BuildRequires: zlib-devel
+BuildRequires: qt-devel
+BuildRequires: desktop-file-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: testdisk-doc
+Obsoletes: testdisk-doc < 6.12
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%description
@@ -86,17 +84,38 @@ make DESTDIR="$RPM_BUILD_ROOT" install
%clean
rm -rf $RPM_BUILD_ROOT
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/qphotorec.desktop
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%defattr(644,root,root,755)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_mandir}/man8/fidentify.8*
%{_mandir}/man8/photorec.8*
+%{_mandir}/man8/qphotorec.8*
%{_mandir}/man8/testdisk.8*
%{_mandir}/zh_CN/man8/fidentify.8*
%{_mandir}/zh_CN/man8/photorec.8*
+%{_mandir}/zh_CN/man8/qphotorec.8*
%{_mandir}/zh_CN/man8/testdisk.8*
+%{_datadir}/applications/qphotorec.desktop
+%{_datadir}/icons/hicolor/48x48/apps/qphotorec.png
+%{_datadir}/icons/hicolor/scalable/apps/qphotorec.svg
%attr(755,root,root) %{_bindir}/fidentify
%attr(755,root,root) %{_bindir}/photorec
+%attr(755,root,root) %{_bindir}/qphotorec
%attr(755,root,root) %{_bindir}/testdisk
%changelog