From 4f8a5479acc83f12bec368e476f12fcc4134086f Mon Sep 17 00:00:00 2001 From: Paul Dicker Date: Tue, 15 Apr 2025 09:25:39 +0200 Subject: [PATCH] Rework icon handling and convert to svg --- .gitignore | 2 +- GNUmakefile.template | 29 +- configure | 8 +- icons/README | 4 - icons/blank-mask.ppm | Bin 81 -> 0 bytes icons/blank.png | Bin 757 -> 0 bytes icons/cd.png | Bin 1498 -> 0 bytes icons/cd.svg | 87 ++++++ icons/create.fig | 20 -- icons/create.png | Bin 1090 -> 0 bytes icons/create.svg | 14 + icons/fix.png | Bin 801 -> 0 bytes icons/fix.svg | 3 + icons/gtk-help.png | Bin 1728 -> 0 bytes icons/gtk-index.png | Bin 753 -> 0 bytes icons/gtk-preferences.png | Bin 1691 -> 0 bytes icons/gtk-quit.png | Bin 967 -> 0 bytes icons/gtk-stop.png | Bin 1043 -> 0 bytes icons/help.svg | 75 +++++ icons/icons.gresource.xml | 20 ++ icons/image.fig | 12 - icons/log.svg | 64 ++++ icons/nothing.png | Bin 193 -> 0 bytes icons/open-ecc.png | Bin 1152 -> 0 bytes icons/open-ecc.svg | 42 +++ icons/open-img.png | Bin 1215 -> 0 bytes icons/open-img.svg | 34 +++ icons/preferences.svg | 41 +++ icons/puzzle.fig | 35 --- icons/quit.svg | 31 ++ icons/read-symbolic.svg | 5 + icons/read.png | Bin 781 -> 0 bytes icons/scan.fig | 35 --- icons/scan.png | Bin 406 -> 0 bytes icons/scan.svg | 4 + icons/source/medium.svg | 626 -------------------------------------- icons/stop.svg | 169 ++++++++++ icons/strip.png | Bin 8279 -> 0 bytes icons/strip.svg | 17 ++ icons/tooltip.png | Bin 421 -> 0 bytes icons/verify.fig | 27 -- icons/verify.png | Bin 969 -> 0 bytes icons/verify.svg | 18 ++ src/closure.c | 4 - src/dvdisaster.h | 8 - src/icon-factory.c | 91 ------ src/main-window.c | 28 +- src/menubar.c | 12 +- src/rs02-window.c | 28 +- 49 files changed, 666 insertions(+), 927 deletions(-) delete mode 100644 icons/README delete mode 100644 icons/blank-mask.ppm delete mode 100644 icons/blank.png delete mode 100644 icons/cd.png create mode 100644 icons/cd.svg delete mode 100644 icons/create.fig delete mode 100644 icons/create.png create mode 100644 icons/create.svg delete mode 100644 icons/fix.png create mode 100644 icons/fix.svg delete mode 100644 icons/gtk-help.png delete mode 100644 icons/gtk-index.png delete mode 100644 icons/gtk-preferences.png delete mode 100644 icons/gtk-quit.png delete mode 100644 icons/gtk-stop.png create mode 100644 icons/help.svg create mode 100644 icons/icons.gresource.xml delete mode 100644 icons/image.fig create mode 100644 icons/log.svg delete mode 100644 icons/nothing.png delete mode 100644 icons/open-ecc.png create mode 100644 icons/open-ecc.svg delete mode 100644 icons/open-img.png create mode 100644 icons/open-img.svg create mode 100644 icons/preferences.svg delete mode 100644 icons/puzzle.fig create mode 100644 icons/quit.svg create mode 100644 icons/read-symbolic.svg delete mode 100644 icons/read.png delete mode 100644 icons/scan.fig delete mode 100644 icons/scan.png create mode 100644 icons/scan.svg delete mode 100644 icons/source/medium.svg create mode 100644 icons/stop.svg delete mode 100644 icons/strip.png create mode 100644 icons/strip.svg delete mode 100644 icons/tooltip.png delete mode 100644 icons/verify.fig delete mode 100644 icons/verify.png create mode 100644 icons/verify.svg delete mode 100644 src/icon-factory.c diff --git a/.gitignore b/.gitignore index bb6a18c..86a98e8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ locale/Makefile GNUmakefile .gitignore simple-md5sum -inlined-icons.h +inlined-icons.c help-dialogs.h dvdisaster build.h diff --git a/GNUmakefile.template b/GNUmakefile.template index 10c80b1..df6c772 100644 --- a/GNUmakefile.template +++ b/GNUmakefile.template @@ -122,10 +122,6 @@ ${BUILDTMP}/closure.o : src/closure.c $(ICONS) @echo "Compiling:" src/closure.c @$(CC) $(COPTS) -c src/closure.c -o $@ -${BUILDTMP}/icon-factory.o : src/icon-factory.c $(ICONS) - @echo "Compiling:" src/icon-factory.c - @$(CC) $(COPTS) -c src/icon-factory.c -o $@ - # Building the dvdisaster binary dvdisaster: $(ICONS) $(OFILES) @@ -141,28 +137,9 @@ dvdisaster: $(ICONS) $(OFILES) else $(MAKE) --no-print-directory -C locale; \ fi -# gdk-pixbuf-csource sometimes produces truncated output, so we have to ensure the output -# is valid before appending it to inlined-icons.h: -src/inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png icons/strip.png icons/open-ecc.png icons/open-img.png icons/cd.png icons/gtk-help.png icons/gtk-index.png icons/gtk-preferences.png icons/gtk-quit.png icons/gtk-stop.png icons/tooltip.png icons/nothing.png - @echo "Building:" src/inlined-icons.h - @rm -f src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_read icons/read.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_create icons/create.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_scan icons/scan.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_fix icons/fix.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_verify icons/verify.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_strip icons/strip.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_cd icons/cd.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help icons/gtk-help.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index icons/gtk-index.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_tooltip icons/tooltip.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @while gdk-pixbuf-csource --raw --name=dvdisaster_nothing icons/nothing.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h - @rm -f src/.icons.tmp +src/inlined-icons.c: icons/icons.gresource.xml icons/cd.svg icons/create.svg icons/fix.svg icons/help.svg icons/log.svg icons/open-ecc.svg icons/open-img.svg icons/preferences.svg icons/quit.svg icons/read-symbolic.svg icons/scan.svg icons/stop.svg icons/strip.svg icons/verify.svg + @echo "Generating:" $(ICONS) + glib-compile-resources --generate-source --target=$(ICONS) --sourcedir=icons icons/icons.gresource.xml $(BUILDTMP)/rs-encoder-sse2.o: src/rs-encoder-sse2.c @echo "Compiling:" src/rs-encoder-sse2.c diff --git a/configure b/configure index d2d5937..972f225 100755 --- a/configure +++ b/configure @@ -155,9 +155,9 @@ if ! EXECUTE_PROGRAM "xgettext --help" xgettext \ fi if test "$cfg_with_gui" == "yes"; then - if ! EXECUTE_PROGRAM "gdk-pixbuf-csource --help" gdk_pixbuf_csource ; then - echo "* gdk-pixbuf not installed" - echo "* or path to gdk-pixbuf-csource is missing." + if ! EXECUTE_PROGRAM "glib-compile-resources --help" gdk_pixbuf_csource ; then + echo "* glib-compile-resources not installed" + echo "* or path to glib-compile-resources is missing." exit 1 fi fi @@ -233,7 +233,7 @@ echo echo -e "\nCFG_CFILES = $cfiles" >> Makefile.config echo "CFG_OFILES = $ofiles" >> Makefile.config if test "$cfg_with_gui" == "yes"; then - echo "ICONS = src/inlined-icons.h" >> Makefile.config + echo "ICONS = src/inlined-icons.c" >> Makefile.config fi # Create the method wrapper diff --git a/icons/README b/icons/README deleted file mode 100644 index 91822aa..0000000 --- a/icons/README +++ /dev/null @@ -1,4 +0,0 @@ -Files starting with "gtk-" have been taken from -the GTK+ 2.18 distribution in order to override -theming and keep the GUI consistent with the -online documentation. diff --git a/icons/blank-mask.ppm b/icons/blank-mask.ppm deleted file mode 100644 index 403850153f6b80dbd2fb6fd6889bea763d09cd00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 fcmWGA;W9E&Ff!p{fC2tL3@GUT2Yw20&+=2K~#9!y_LUi6G0Hhe|sUe?;yFOxCo_7o2N*Tju!|84?#(b z=<@)UC{oby5>Vj+5rs%dq@r*{6eNO#ZF2VR48`rO&wnmXKw_oU?#)Tx%zX3BEd0my z1kgL~7r@$W9q8%lsg6b?UA2m$(6h5MJvcZ};2qEc%relrQAeW@aU9<&nqIF*k|eCJ zud})|k7k~*4Oldz>1=xn8=_~+C+s`yM?uFc6N5y%5$loD0A}0IXAlDq1VLwU#v9z_|$`ZU(QJA~f8i3b?9) zSD3Zd*R1?bH#bR=ggf=YUDw8g`!{D`eMDYYs47-Mb5bZJlk}R zC|U~~JLi16mY`GRv7!d9?A+=6(YXe!FjEhX}{kGm6G2E z3bcN&y%7q2@@jJiz4vcPTBhVW6xbl@Bla`6{AU8+6{x82;p1^*k39X0N55%510K!4 n$&sIcoBnS8p`ovVpTPAW0imSp`U<|}00000NkvXXu0mjfNm*BB diff --git a/icons/cd.png b/icons/cd.png deleted file mode 100644 index a808e21e3fc169ce155e6d747dfee34c3635be80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1498 zcmV<01tt24P)KYK~#9!t(IMERL2>HpP6&^?Ai4%Y}1yI6t5`3#VL|qIdlakNQg>= zqEI5IQj654F)DQHMy0VDwOnvfK%i*VpQz#jq*m=kBohg0sYD7Df;a@lu?#I>7nd~{ z2Vrk*@2+>f>vPV`^uny;IBhOaU+GArbMbuh^S$#9e1`Vy+0(UU%a&^!H*TB;Oyz59 zYn$G-ZQH=nqep+hqbQk7CM&Rk{sA*OGHP;}yqO-)nX&Y^={a-G96z2~D0ukr;pG2f ziKRbUTU#&o_4RGOJ#>p|H%fV`M5MZgP$Z16H5%|Wl;(VU1t9eU!t|Ob*Qhe zZ#!^jF;6bxoBjLuZyx-xpUl8@hW_?GrTh%WXoM69DKG+z(F95}>nT>QUe7z1K4A6g z)s2mfjUNC{E(ThaL3?}q#g>+qRmqoL=Ej?EF?shcPPCe6T|JT78XVWfNP#w>3=~Qp z(}f};B#;q@jn8i8bG0>9#+a??bo#_6R&eatv1E65_vYWFe#6Y&439UhC+s@-GgHhJ zW(ejyjMfMt5K^MFp-?JgEQ1}EIIfM1xP0SVyEuRT{Q46oP9&F}fw_F~J=Q(dNdBV? z{%nc-gE4ORzsJh8&8%qpDxZI96<87tWG0IYk3B$J3b)!J8VM0{B(807>*_yve#bW# z*s`OeqYI#E-P25uWszYQx3-r0CmLA0;aOHZ(?ql(MoE_``LkpuA7I&KZ0QlHaj2;Y zQysObi#SxdAzGek2B5REvkO2D4Gn$&?Q?Gf0%6-2Es>6kTVKzY+P+TYvB$W0=@PM6 zj94s2JRaxT)dAKve1VnAt5{wgrZy5L8n$t4i44ITzkh>tI{h60DW!b8Y2DLIP2@2l ziINg6CARBQRvxEMpQgRN9U%U2+3}q_cXH**mE!Vf6*UnD#}*i)&?Z3ZfcTmQip63> zWuMGcCdW*+gg_vKKnkd?j}YJyi^VGN#r@p?jO21ze5=fyUq%~^)*53pexO*h;wu2c zo(;H40MfSY(Obhe z5jGg9!7^YQ=8R8OO$|GC?4YNo=kCKI1{gVV zXGyvI0`4LVumo5rEEM+bG; zuEMn|gWlfWrrzFOlh5b*ZpZfsPzb?-@r=?KG2gaEN-Q@_s5Xks7Py!9=y|`73l}b^ zAP9c+S%D*ZdU|fJc_Pm6)j=#IQh-tcfez4S-b?_}u?cL4D-$_>^7`v&t(^b diff --git a/icons/cd.svg b/icons/cd.svg new file mode 100644 index 0000000..fd5475c --- /dev/null +++ b/icons/cd.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/create.fig b/icons/create.fig deleted file mode 100644 index 9572455..0000000 --- a/icons/create.fig +++ /dev/null @@ -1,20 +0,0 @@ -#FIG 3.2 -Landscape -Center -Metric -A4 -100.00 -Single --2 -1200 2 -5 1 0 20 0 7 50 0 -1 0.000 0 1 0 0 6300.000 8775.000 6300 6525 4050 8775 6300 11025 -5 1 0 20 0 7 50 0 -1 0.000 0 0 0 0 6300.000 4275.000 6300 2025 8550 4275 6300 6525 -5 1 0 1 0 7 50 0 10 0.000 0 1 0 0 11474.998 10456.000 11475 10119 11138 10457 11475 10793 -5 1 0 1 0 7 55 0 20 0.000 0 0 0 0 11475.002 9782.000 11475 9445 11812 9781 11475 10119 -5 1 0 1 0 7 59 0 10 0.000 0 0 0 0 11475.000 10125.000 11475 9450 12150 10125 11475 10800 -1 3 0 20 0 7 50 0 -1 0.000 1 0.0000 6300 4275 569 569 6300 4275 6869 4275 -1 3 0 20 0 7 50 0 -1 0.000 1 0.0000 6300 8775 544 544 6300 8775 6844 8775 -1 3 0 20 0 7 50 0 -1 0.000 1 0.0000 6300 6525 4494 4494 6300 6525 10794 6525 -1 3 0 1 0 7 50 0 10 0.000 1 0.0000 11475 9781 85 85 11475 9781 11560 9781 -1 3 0 1 0 7 45 0 20 0.000 1 0.0000 11475 10457 81 81 11475 10457 11557 10457 -1 1 0 1 0 7 60 0 20 0.000 1 0.0000 11475 10125 675 673 11475 10125 12149 10125 diff --git a/icons/create.png b/icons/create.png deleted file mode 100644 index fc2230c19df1750aba9fbf50071fc70acc22d5b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1090 zcmV-I1ikx-P)ctO0_`B-y;gi~zB&YL-Po-3-Z0s7pvhjbuyq z4-?c8qdyFZA>jUq^Ah5Qkq{*#gjp9CVJ4*m$0c2>a%pLi0%I*b{;(~V7E1Q~Jnwm* zb9>+9NbF7?@Cr}~WB>wC16p7jxB`3&+)m<&BOmB87!0DJp+Ss|jfu_pd_GZES0^M% z5|ScK09}!sJ@Gp5Yg=2JNJd{@pHQjwqM)=@AZJZPa(Cqn(B<`dlggtsH#ZBd-YhC# zo)IV?ABi{;QU`n)3P2;}M?CxLzXE0XNW`^;Lf{vl z&zDf{a5#igohPbmJ)*kSBb4eq;cz%&@uH$4aqvi=Fu%4es$QBE$k`JSCyK}d=Q}z& zp4RDf36JJ>yHTpMk!20CtU;;H#_e{;;%c>;P;eOlr8Fz_ zCo3z5HJ$+=g{#cY{u7I3Wul+EorPJv~X|=@J@G zmoPm&85_6T?JNfF-y#PnD1M^^I3WT3E|;r1H#axg8gYa|Aqol#&=}8ASaNDhY;AR( z!OMjM3Lx!XqezmJbYn_3N;Qs}ni_uS9p_Nh z)woC86XBIr1rXR=(^1;n+v)jnlp`+;-IIK6bsmKOZyCs!Wx3L9HgB15)bczfhrcE@ zZU6t93EgG#<^>k!htXv`f~1glU0`bL3;gpxUr5+!PN$QHi=U(N_;4&?u;)q2%hCWC z{v$xev1_|7u({DDfIFR?ow4B1&=4u98`t8QyH1vI5u441&1NIZxQJ)&`i}CyoV~C< zJ_<}kANXv2eZ9@^_XDtR-#)_OwOE2ilg+|{pFki$AP`_-!H-6holqXS8({RewZ!>$VH$vI=;OJT7h1J!EnuDvEUki zAJ5$HN#(Ao?-{sMHc4pY`2Tku%eDFPFSrePEyyW8c#5c@1 zFA}^n_7!jraBdeR>-Ffjr3zFg6dCs+DT0IpD~Ny#MAC1|e-MQJhMa}>L;wH)07*qo IM6N<$f}no!H2?qr diff --git a/icons/create.svg b/icons/create.svg new file mode 100644 index 0000000..3b8c039 --- /dev/null +++ b/icons/create.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/icons/fix.png b/icons/fix.png deleted file mode 100644 index 53c519b4a57417f7aa78ea7876cdf33751dff4ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 801 zcmV++1K#|JP)>-FQ#V_#w6X}(Fcpz7N8cAAWnI)=Mbu3$peCA-NDT)?N%bPX;6k1x*I=G(_j?vibwI;fNhylU8mf-H%F}Gp z0kEs|n!LM1_rSX}`yBZ3rz{~AX;I4By(|nMDK?_kl*xf@$-cZOj?(~&Xg(Nlf45t@ zt8#J=0}u$fSg?Ke0^z82*^$jw@?^lY`k? zb7(G=#8AkGvDbikqRlN=Xq1WCS^_r971}2UYPzyBRR#DwmaXQ=XGz7!2k&AUZfXYf z0ly;ys09{dZU=C2XR*Gur1D-`zx@7XY0%@I$_4CeU7|oJ~)uN;-4EPsf`h59>yTaj6na^uowp?4RRG8WER%XYa5(v1+&99-LBtR;O{92vOH*x;QGzyLTFY+q_^^Y0A0>Q0myTlgneGz~X-fOC-{ zG6meQTY7q24kO79G${m8DMcJGh86^Q(i?g|j?3_R<}vo({O#vrrUYC98Y5J>ASm~n zMjo#8gv0s?;0kaevc@Wl%*AM^fLp-zINlm%&wGH1xVRqZ0s12EF47p#$*^ib|5wXR fBpw2$*F*dlT#MWu**bvc00000NkvXXu0mjf+2e4* diff --git a/icons/fix.svg b/icons/fix.svg new file mode 100644 index 0000000..19b453b --- /dev/null +++ b/icons/fix.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/gtk-help.png b/icons/gtk-help.png deleted file mode 100644 index b00fbd8c1282499bab0abfd25a6c8df1ca2d7f50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1728 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 diff --git a/icons/gtk-preferences.png b/icons/gtk-preferences.png deleted file mode 100644 index 2596f3cc5eb500a4b866146ef4f2b1706b72aae4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1691 zcmV;M24wk(P)=DcaWxi`ep6rD=zgT=e~d=}J9qD}F$_7s`q|YEizS5|`skn}iemkqnuhA>Od1<& z=YcQ>WkT0iZmPWbV2+uh-byL8_=oQjLC}*;zuzomWMsVd>efH}ZYuNorrL6oIjMW? znu z41xgw9vKz^GrPEWi7*-oA~F_6Vv?E3$;q+mz&20RaP^I~Jj=4(E1oXTk|YW3U$pnJ zEE6yq41(EYg4vV=_Z_#UD9W)1&8y$8PBgK?^E{tGDL_O?L@*FSzq?RW!s;astnJYp^X-R2bN=hP949J?SuC07++xh!lQcAI>;f(^8WiLFv;wb~mvXidCk?Dl0sMz=BzGyTWS(lmN z=wx|xl$Mm{XU~|ywYZwaKp@bqC`yY)nH!a_R=Or#h5B6QY_Kecru~g$Nr{QRvSnp69NF1iOKYb?m#;8nq}$Qn-i9ZhSOAB^0axn@F&GSeX*O6^ zO=ms{FkNilv2`=Ya@F?COvB&_R#VE_lM+e_OwEcSlKYZ!b45N-c>PSl{TvcRe z{`~1Bl+PKFjOy^M;gOM9&#hf0*fMOeB&On%BZtM}qGDZURu)4w4euOyC)(fN-*o7M zzf?^LDBO7V7aWUsE0(4kiwn}on55v&&^_$`;G~*BrJN^c4!+3qeD&IjH9}gN6=}&< zgu+3H(ik*N1IH#{Z^K?O5{VQX{`g4${Ta;L*pd9>SI!-`S`yyf_Tp?)QGOZ;kIDFM zD1wWZZ>vNZJ9_o#7XO?3-hN9I#RF&0oD*X)2_D}7Mk8SagCX1t-Giczqj*UXuhZ%N z1OOZW8)S zHh%sO($Ui1C12>dbbX-fy?OvbTzXknxWf5`1%W^yb>_?*)?hGV?wmZ{JLFjdptZB3 z`BBL0xKoPgn2XR~~QeV6I-fA>O^#_A6y9AjWHGTx#F7>!&lb zGM!hiT(ghM5=*H@`}+DuJs!`YyFPyifE))<5+5297YiW4GG|$CY@jzFia`Q^kBf~9 z6QG|iU6Pw$khewCXwJ92msfm!p~nMY9Dp*>0il$F5Q6wACm_rNh7+2|PXH(Y4S<^E l$YMN$9w~0B#@8tT`frm{0s2>vdAk4r002ovPDHLkV1m?gC#wJe diff --git a/icons/gtk-quit.png b/icons/gtk-quit.png deleted file mode 100644 index 0c9de64ba7f04127f8ee339ec6682c629c40935b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 967 zcmV;&133JNP)6jvC>fA7uAnq*hEnpLb2vr14K(pCy4=8{7Z z54}|^@o0lZu#}cwdaw(HNDnFXP`ng+E_x9PMM{fAq_k#jQ;nh9)MN>%!C13#cTGBP zW@p~(p=5U_-DI`J|7n=_ec$imeVT|Ef%HHVkj$>on7Sa+30iY35JUsx|B;eYx5CilcCY4G72FsR6TOcGD z4BCVso7QhUA|u4knB)AIP>N(SiSK)8qtPZL3;F zD9_F|Z*wCD=Y)7{*>=^5ZQDr8vbLquV({!)uDpJn-Y-6fGUpu$hd^4E#C$(g#ydjENC5p7-QJd z-OZ6>$N2WlyL676gSHkXCVxY@9{Jh%DxgqWsOC9#EDG@Qc~mY3mIXo}gusL$S}9ht zSrP*SytsQew?D|R^ZduW)N`QfU{!_kgX(ijtSt)Au8TJ_g9*dv0EHmY-_LTX#GQPe zUGKkxaU6Pj_S4a^gXNXwIzY`qqBR)>0Bju`j271#e{K#p9_Q-V7+oKIh}_>rsZ^wq z>K%l-)~F3|@zN!)KG=~`96xa)wi1ssn$2?X{3qD^x+s+!7hellyX37wbTmm|YH4AC zE7z~{+Ql!i_NFPW)A_2F%JoZjYJiL}k<4Ks2(@;;8yzi=?mMt$sIQlY5C2@Z@alaM zU2;6)pi$OiKM0O2B@#C`Dt!O`BGc1<5Z@*vfQC!1lW*YFj4|Vv`}!Lep2^Sg^Y{eF zkkku4*7ipf%C(s167A~)GRFJ`jIVvKwP9l7SFT?B9%MkT9H}+0;2tLFWEBRE=|#w*rVK1Dt;QJzCmq_8yAi#_j>F?BJDVX;0=r pYt6m+c>t#GQtj$#B%bwe%iotkSZmpk*i=ts*=>y;9@)z9CyZk zT?`oLj8PWNm1Z$BZ_au5&bwDArFfm;d98H7+vvqazZg)6IfZII4j>Q}ff~C0SS`A~ zcPr6EzZf{-)$R>m8IiIheC!U5tsDz?zcH$oIqW8J2oA%8!8WLrY4n!_K(h~B-)<;5 zA~=A5B7?FOc3)r?b+lILDlm%%T5Aye0d%9t!rgBj5|0x;B4wZj^dhB4PguWo2P3lv zRqM!QWY$=}b%)ZUC!iORfffd@jK~vS?cPMc7;p#_Vs3Ewnhg3SqFA7`oTd11jqb_Y z6c#fWnWtcxV3`=1rxX@5bWh%<_;8KVau!i65cEq1hp$P6nA_)i4+N@NcJ{!tHOw7@ ztsj4(d-7|1mo5=bPm@btg<2JW!qO_?^fX#DO2^HcYK$D%}e-4ea52_X@h3xHw zYL#3vNjROhCDYRYb$BkBBoyzp*IE_`;lMcshjt;)hHOb9Y417~vro^;3c2J}LhnTE zHI`|A`$~en4C=90ch{&@?e+WdY8hCdY5*92{7vEUUxa7u5}7M20BEro;h8kKL=tK> zR9bi^ZQ&0gq@VdS495EU1J8d{j0GISK`+(l0HNLtS{u`x1A zs81qK`|6!6Px}b#+OqV;QU|SXst=@ei6` zbEFPn?%GXB>}_<9VBv=;$FOTWuJxd@80|1qk!y+ zG=SS- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/icons.gresource.xml b/icons/icons.gresource.xml new file mode 100644 index 0000000..ade7388 --- /dev/null +++ b/icons/icons.gresource.xml @@ -0,0 +1,20 @@ + + + + cd.svg + create.svg + fix.svg + help.svg + log.svg + open-ecc.svg + open-img.svg + preferences.svg + quit.svg + read-symbolic.svg + scan.svg + stop.svg + strip.svg + verify.svg + + + diff --git a/icons/image.fig b/icons/image.fig deleted file mode 100644 index 1606d16..0000000 --- a/icons/image.fig +++ /dev/null @@ -1,12 +0,0 @@ -#FIG 3.2 -Landscape -Center -Metric -A4 -100.00 -Single --2 -1200 2 -4 0 0 50 -1 18 160 0.0000 4 1695 6750 1980 8235 00111\001 -4 0 0 50 -1 18 160 0.0000 4 1695 6750 1935 3240 01110\001 -4 0 0 50 -1 18 160 0.0000 4 1695 6750 1935 5670 10011\001 diff --git a/icons/log.svg b/icons/log.svg new file mode 100644 index 0000000..edf0748 --- /dev/null +++ b/icons/log.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/nothing.png b/icons/nothing.png deleted file mode 100644 index ac4fd070ec19a8f3a5aaff46bea25d92e7f327a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>?NMQuIx{lL#`~WpF9n*-;OXk;vd$@?2>@vBHShoc diff --git a/icons/open-ecc.png b/icons/open-ecc.png deleted file mode 100644 index 3f7f346ee1a99b984271701d015d2b111c824a36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1152 zcmV-`1b_R9P)lN3Gf3}Hqe=e8jr`x z%gehjYx?^72m}K7d_JnHs{!%=d)l+KcxG-E0$0_v77=XQrl_ch($Z4e+S&l_0=ct2 z@ytQW0xTkkm<)aA&N#WbxfB)_Qdd{U;lqak;)_2DJFoyzaT9BV z!a^^@*Lo-}@*yh3VlfuwE+#)epVG>0^!A>oq+}V3{Qi4T-mC;8BiE^Vq6%XSVqEJ* zg+mAS^4{BJe6oKxDnfVn_pB)2h^X?&@(|&HCp~$=<+Ii!{C+!x*O!MFgQDEJ?W3@ufIuLSftNFfz%#cs!j~@5+4UV0lQ~RG2xXP^ ztg2p(5lP=krQCX1lD~Li0>?Nw#&I{QbatNPbWehH8+KDXqv(tnP`6)H1;0;F)IDD) zM5$B?F$Uu}jE|3VvU`+uHH{>bac+!UB$Z4cBBE z7|xtMOL^7vhzeJKIY9k$lSKLtqUu_!(*Q&_&ktuf zeY%yK*Gs`#LS8OBRBW^5nGnxz+700L3QUi3ou8oZ;yD6-D{Unxi+vU^zgXwaCEV%g z{!7sN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/open-img.png b/icons/open-img.png deleted file mode 100644 index a7adbcae91c00b568ca4e5a307f2f9fd58ca1548..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1215 zcmV;w1VH2N2SO88-j`1WZXp zK~#9!y_Q{UlVudgf8Dg5W46_83~zv9a2M5N30xRH5{yf>7#sQ6%uL*-5uAxP8yAR@ zkSO5>tZZJ13xk1*Nf)9CBSBrV0b^NQx6FnWUJ|lp9UxK%p7;NM&N=`0yf6HZ_7))jaC`>j|6Ky{`Ft`rHz$v?g@pw%3`6Sb>ICQm%z){! z1buydQe9mw`}XY<5s|A`uS!!>QySRqc1urBkBEp23=GKV=%|d1jisU~cpQmr+O$co zU%xJ!H*c1qp&@B*ZWgE0DIy|WU0t$%{d)0uJff76-rioBn3#~+*;#3CZ%>gtwU{I? z)46;1E@fq9EMLBySS-eoBS!$xTC;WQ8*JRTG3^I~_b4bRz-F^iSy`FdJGVHJECPqa z!TIy&F${xMt5%`4P6MXq311P7MzL5d0F;)NvSrH_PM$mo-~lXul`gq))FudMju3fu^)|&3_ zbF{U6i55*Le4o$VUvR1aGFoZ0Xf9m5gvDaP;c(!5@g?5dxs&JDI8sng=hUFHvy`B7zT!6;BvVrFE1w;4AOC|9RQ^im9M_S_U+r# z0?4!{mU=1db~`gOGtA7)V7J=|g+f_=N>#Dg!$h5uR#;g0Xo8ZG5{in7*s$ScPMkQw z{{8!LyWLDrPg7rCPenxqE6PeyO0ja~%ADsO7A?!d%TZA%6#Vlst`}%siY24Wi-~h&RB2Y@DfinTMR^;X7r*o{7N}f(oT4hK&8!xNK{r&yy*ip-_ z_dh@>#h#BoW=GANT)cD{tum?G2ptNFSWCWkjht`_$@o~IfFVSc; zM@3l#;cytM)r!?>B@hT;v)Qm(t%Sp2o?B6pZgxs3T(4JSHk%QxdDdQ(UXw?q$mw+A z@pu>*7{KLnaplStIy*aYI-QG}oko&=qP?h$dg-NA6p2JQe*8FV*RG}fg*Du~HO=7Q zAPo%-M8fy@eL9%vp2ao*&Yt^;*QzUt$K!^j(3+f^{=*;2 dJTME){{i72z2V*@r>Xz|002ovPDHLkV1kEIKvn<% diff --git a/icons/open-img.svg b/icons/open-img.svg new file mode 100644 index 0000000..01a86dd --- /dev/null +++ b/icons/open-img.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/preferences.svg b/icons/preferences.svg new file mode 100644 index 0000000..00abbca --- /dev/null +++ b/icons/preferences.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/puzzle.fig b/icons/puzzle.fig deleted file mode 100644 index 9dfdf44..0000000 --- a/icons/puzzle.fig +++ /dev/null @@ -1,35 +0,0 @@ -#FIG 3.2 -Landscape -Center -Metric -A4 -100.00 -Single --2 -1200 2 -2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 - 4950 2700 9450 2700 9450 7650 4950 7650 4950 2700 -2 1 0 20 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3150 2700 10845 2700 -2 1 0 20 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 3150 7650 10800 7650 -2 1 0 20 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 - 4950 900 4950 9000 -2 1 0 20 0 7 5 -1 -1 0.000 0 0 -1 0 0 2 - 9450 900 9450 9045 -3 0 0 20 0 7 50 -1 -1 0.000 0 0 0 7 - 6525 2700 6300 2250 6300 1575 7200 1080 8100 1575 8100 2250 - 7875 2700 - 0.000 1.000 1.000 1.000 1.000 1.000 0.000 -3 0 0 20 0 7 50 -1 -1 0.000 0 0 0 7 - 4950 4275 4500 4050 3825 4050 3330 4950 3825 5850 4500 5850 - 4950 5625 - 0.000 1.000 1.000 1.000 1.000 1.000 0.000 -3 0 0 20 0 7 50 -1 -1 0.000 0 0 0 7 - 9450 4320 9000 4095 8325 4095 7830 4995 8325 5895 9000 5895 - 9450 5670 - 0.000 1.000 1.000 1.000 1.000 1.000 0.000 -3 0 0 20 0 7 50 -1 -1 0.000 0 0 0 7 - 6525 7650 6300 7200 6300 6525 7200 6030 8100 6525 8100 7200 - 7875 7650 - 0.000 1.000 1.000 1.000 1.000 1.000 0.000 diff --git a/icons/quit.svg b/icons/quit.svg new file mode 100644 index 0000000..d76ae07 --- /dev/null +++ b/icons/quit.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/read-symbolic.svg b/icons/read-symbolic.svg new file mode 100644 index 0000000..b51940e --- /dev/null +++ b/icons/read-symbolic.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/icons/read.png b/icons/read.png deleted file mode 100644 index a28fafad1e9b7bffedc4cf3015be447fef02c600..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 781 zcmV+o1M>WdP)*1C z_Z`a2yKoqzcrhXlWM&6<<7h-Ifz0e;D_)L>RfR3U!`KrM>k4}c`!ItYUA%fGcNOYyo>edG}xyY$FD^`hJ&~s58#Ck*5X7&OyfMpBVreJH$)<0J09=D?!og7 zG>+Ng`Vwn97(%Z}8ZvnNgR6s6n8?i4SX|>l<207kR!!i$PVM&-n8K?OF*PWAeftW& z#*^6JiHKuZj%5)s+2ntYm33wxssa0+h~wi)l>WJA6M$MBh&@dQ>k4K$2NJcwz0 zUpYImp=|gC9<7!nwiIOe|75- zT%MVqR86j^Gv^3a;kV4Zvg-79IZS3=h3$A6E4nyuPP?c&H}$my5!~=#>`xUYbs}8fv9ukG>+n9JcfJmRsC@sA5`E^B+#Nm@-phg3*L4rG|^AH5%{e>?n5o zleIm2`}Ojz*KTF!{`;!FrDgG+2S=|QJaGQZV!7HEj^!OD4pTP>6~fxeM6)0q)*{3k}@?6ejP%Et}?>KF2DV=KJ-+u zzdvMk%fNrr-`h#~p$FYNtdk6V{nfl=kEj&-pGo@}V!hG%i?C>t*6X+kRZAtl&el1< z*1n&!Lm_Lkn)tnKvz(+(7W)aByc0fKIf47elZ`W%OnUBe_Y`-`iQoDs?m9M^_AD1R w%AUHEIoJH|>g!x>_viK|{cPSn|0e%lrsw+J8CygSi-3aH)78&qol`;+09q!aNdN!< diff --git a/icons/scan.svg b/icons/scan.svg new file mode 100644 index 0000000..e109341 --- /dev/null +++ b/icons/scan.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/source/medium.svg b/icons/source/medium.svg deleted file mode 100644 index 86de240..0000000 --- a/icons/source/medium.svg +++ /dev/null @@ -1,626 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/stop.svg b/icons/stop.svg new file mode 100644 index 0000000..09ebbe8 --- /dev/null +++ b/icons/stop.svg @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/icons/strip.png b/icons/strip.png deleted file mode 100644 index f0f7b30a2f4d5caefa46b46ef2718a2981262cad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8279 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 DPt6wV diff --git a/icons/strip.svg b/icons/strip.svg new file mode 100644 index 0000000..39e51ab --- /dev/null +++ b/icons/strip.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/icons/tooltip.png b/icons/tooltip.png deleted file mode 100644 index e7716ed75b04cd95e3c3de87f1148b053153a0c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 421 zcmV;W0b2fvP)XI zLg^d86Hr29Noi+?iMhmvvABQ9-g*)fCi#=Qnfd?B&i-reP8w!b0{6gJ0N4tz?!Idg z+#QJ+Fav5}2P}XGVWC{D9y{_9@)Gz0ra(}>2lVtEfVo7LQ6vh?M7~ZY>I3gWKgo~c zB=PvA64ThE!T|UX23hS0*8ZUvOBOk#dTCQf={z^;T=*E%gmaO#Ar3WA~~{wH<>UczAfu z`JZzh{^vaBv25A8komOVm~9h1Gptg1|?SDIS|!#T>;&qf3v>;4B$SH13cpYCKg~Z-~<#f4fqQv2mS7ez%F`!Qt zK)UY92Mz)Y{|kyglkO`_2e8%D)O-zmBEWK?XSQ(vIba7mfg)YkkDGkGz!6|MaATkv zlme51bwDdn0W1>kzXHAh#slA&{5-%>;5+ddu*k!t#|>aA@Bru#dkcWB>mgGO+!A~< zaN$E7+JIVMxX>^II1StddVqG(1N4lIzf&+qr2tE;Q) z3j_kHv9VG4e7=Nc8+Hg7H`w4Aa`PnsE|;sSzP`R!iG;&pWf+Ev$K%R3XN4L!Y2_23 z=wpLxz#*Bm06uf@&dyFXaY~h%HG8>IN~!JJcc?EHbgNG%EbRh3){ht^KL8Iyx%gV}Tnn7N#m)6Vs z(KL;4ILwJAgAsX7?3$CD+|r7H64c5+p_|7-K|z7V4C?CYA{Y#E=gvKj1)h;TX6@fy zk(oO&U4l*Wm{z=_PbLzH{=?zJf3R&=2P4Lmm&dYiWtW+wQt_D#ls(MF%BNPfH z03wkHwY%HM%U?rpDn=^#^t~WPw4*g$g1x3GYL=dchK3`tSd8Z8X0k>WWAxm@Uv!cj z$DX%=Pp=VvaN>Y)%9)2XvkXVJ@3rwsi0c=ZoqZO$Fb^;+|Kcxj1FN#!g%uue raUm9B#`E^8j~@mPD%JO!d}6!;9@H`AC0m^A00000NkvXXu0mjf?Jcjy diff --git a/icons/verify.svg b/icons/verify.svg new file mode 100644 index 0000000..08b6a77 --- /dev/null +++ b/icons/verify.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/closure.c b/src/closure.c index 98a30ff..4bdf28f 100644 --- a/src/closure.c +++ b/src/closure.c @@ -24,10 +24,6 @@ #include "dvdisaster.h" -#ifdef WITH_GUI_YES - #include "inlined-icons.h" -#endif - #ifdef SYS_MINGW #include diff --git a/src/dvdisaster.h b/src/dvdisaster.h index 454e8a2..dba460a 100644 --- a/src/dvdisaster.h +++ b/src/dvdisaster.h @@ -877,14 +877,6 @@ int SearchPlausibleSector(struct _RawBuffer*, int); int BruteForceSearchPlausibleSector(struct _RawBuffer*); int AckHeuristic(struct _RawBuffer*); -/*** - *** icon-factory.c - ***/ - -#ifdef WITH_GUI_YES -void GuiCreateIconFactory(); -#endif - /*** *** image.c ***/ diff --git a/src/icon-factory.c b/src/icon-factory.c deleted file mode 100644 index 26cf084..0000000 --- a/src/icon-factory.c +++ /dev/null @@ -1,91 +0,0 @@ -/* dvdisaster: Additional error correction for optical media. - * Copyright (C) 2004-2017 Carsten Gnoerlich. - * Copyright (C) 2019-2021 The dvdisaster development team. - * - * Email: support@dvdisaster.org - * - * This file is part of dvdisaster. - * - * dvdisaster is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * dvdisaster is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with dvdisaster. If not, see . - */ - -/*** src type: only GUI code ***/ - -#ifdef WITH_GUI_YES -#include "dvdisaster.h" - -#include "inlined-icons.h" - -/*** - *** Create our icon factory - ***/ - -static GdkPixbuf* create_icon(GtkIconFactory *ifact, char *name, const guint8 *inline_data) -{ GdkPixbuf *pb; - GtkIconSet *iset; - int width, height, rowstride; - - /* gdk_pixbuf_new_from_inline() deprecated; recommended to replace with GResource XML crap. - One day I'll get rid of GTK+. I swear. - - pb = gdk_pixbuf_new_from_inline(-1, inline_data, FALSE, NULL); - */ - - rowstride = (inline_data[12] << 24) + (inline_data[13] << 16) + (inline_data[14] << 8) + inline_data[15]; - width = (inline_data[16] << 24) + (inline_data[17] << 16) + (inline_data[18] << 8) + inline_data[19]; - height = (inline_data[20] << 24) + (inline_data[21] << 16) + (inline_data[22] << 8) + inline_data[23]; - - pb = gdk_pixbuf_new_from_data(inline_data+24, GDK_COLORSPACE_RGB, TRUE, 8, - width, height, rowstride, NULL, NULL); - - iset = gtk_icon_set_new_from_pixbuf(pb); - - gtk_icon_factory_add(ifact, name, iset); - return pb; -} - -void GuiCreateIconFactory() -{ GtkIconFactory *ifact; - - /*** Create and register our icon factory */ - - ifact = gtk_icon_factory_new(); - gtk_icon_factory_add_default(ifact); - - /*** Our action icons */ - - create_icon(ifact, "dvdisaster-open-ecc", dvdisaster_open_ecc); - create_icon(ifact, "dvdisaster-open-img", dvdisaster_open_img); - create_icon(ifact, "dvdisaster-cd", dvdisaster_cd); - - create_icon(ifact, "dvdisaster-read", dvdisaster_read); - Closure->windowIcon = create_icon(ifact, "dvdisaster-create", dvdisaster_create); - create_icon(ifact, "dvdisaster-scan", dvdisaster_scan); - create_icon(ifact, "dvdisaster-fix", dvdisaster_fix); - create_icon(ifact, "dvdisaster-verify", dvdisaster_verify); - create_icon(ifact, "dvdisaster-strip", dvdisaster_strip); - - /*** Tooltip icon in preferences */ - create_icon(ifact, "dvdisaster-tooltip", dvdisaster_tooltip); - create_icon(ifact, "dvdisaster-nothing", dvdisaster_nothing); - - /*** Stock GTK icons to defeat theming */ - - create_icon(ifact, "dvdisaster-gtk-help", dvdisaster_gtk_help); - create_icon(ifact, "dvdisaster-gtk-index", dvdisaster_gtk_index); - create_icon(ifact, "dvdisaster-gtk-preferences", dvdisaster_gtk_preferences); - create_icon(ifact, "dvdisaster-gtk-quit", dvdisaster_gtk_quit); - create_icon(ifact, "dvdisaster-gtk-stop", dvdisaster_gtk_stop); -} -#endif /* WITH_GUI_YES */ diff --git a/src/main-window.c b/src/main-window.c index cd7804b..b5778ee 100644 --- a/src/main-window.c +++ b/src/main-window.c @@ -250,14 +250,13 @@ void GuiContinueWithAction(int action) * Create the action buttons and the associated notebook pages */ -static GtkWidget *create_button(char *label, char *icon) +static GtkWidget *create_button(char *label, char *icon, gint scale) { GtkWidget *button,*box,*image,*lab; char *utf_label = g_locale_to_utf8(label, -1, NULL, NULL, NULL); - button = gtk_button_new(); box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_LARGE_TOOLBAR); + image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_LARGE_TOOLBAR); lab = gtk_label_new(utf_label); g_free(utf_label); @@ -275,6 +274,8 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook) int window_number = FIRST_CREATE_WINDOW; unsigned int i; + gint scale = gtk_widget_get_scale_factor(GTK_WIDGET(notebook)); + outer_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); gtk_box_set_homogeneous(GTK_BOX(outer_vbox), TRUE); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); /* needed for vertical spacing */ @@ -282,7 +283,7 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook) /*** Read */ - Closure->readButton = wid = create_button(_("button|Read"), "dvdisaster-read"); + Closure->readButton = wid = create_button(_("button|Read"), "read", scale); g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(action_cb), (gpointer)ACTION_READ); gtk_box_pack_start(GTK_BOX(vbox), wid, FALSE, FALSE, 0); GuiAttachTooltip(wid, _("tooltip|Read Image"), @@ -300,7 +301,7 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook) /*** Create */ - Closure->createButton = wid = create_button(_("button|Create"), "dvdisaster-create"); + Closure->createButton = wid = create_button(_("button|Create"), "create", scale); g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(action_cb), (gpointer)ACTION_CREATE); gtk_box_pack_start(GTK_BOX(vbox), wid, FALSE, FALSE, 0); GuiAttachTooltip(wid, _("tooltip|Create error correction data"), @@ -308,7 +309,7 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook) /*** Scan */ - Closure->scanButton = wid = create_button(_("button|Scan"), "dvdisaster-scan"); + Closure->scanButton = wid = create_button(_("button|Scan"), "scan", scale); g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(action_cb), (gpointer)ACTION_SCAN); gtk_box_pack_start(GTK_BOX(vbox), wid, FALSE, FALSE, 0); GuiAttachTooltip(wid, _("tooltip|Scan medium"), @@ -316,7 +317,7 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook) /*** Fix */ - Closure->fixButton = wid = create_button(_("button|Fix"), "dvdisaster-fix"); + Closure->fixButton = wid = create_button(_("button|Fix"), "fix", scale); g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(action_cb), (gpointer)ACTION_FIX); gtk_box_pack_start(GTK_BOX(vbox), wid, FALSE, FALSE, 0); GuiAttachTooltip(wid, _("tooltip|Repair image"), @@ -324,7 +325,7 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook) /*** Verify */ - Closure->testButton = wid = create_button(_("button|Verify"), "dvdisaster-verify"); + Closure->testButton = wid = create_button(_("button|Verify"), "verify", scale); g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(action_cb), (gpointer)ACTION_VERIFY); gtk_box_pack_start(GTK_BOX(vbox), wid, FALSE, FALSE, 0); GuiAttachTooltip(wid, _("tooltip|Consistency check"), @@ -332,7 +333,7 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook) /*** Strip */ - Closure->stripButton = wid = create_button(_("button|Strip"), "dvdisaster-strip"); + Closure->stripButton = wid = create_button(_("button|Strip"), "strip", scale); g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(action_cb), (gpointer)ACTION_STRIP); gtk_box_pack_start(GTK_BOX(vbox), wid, FALSE, FALSE, 0); GuiAttachTooltip(wid, _("tooltip|Strip ECC"), @@ -340,7 +341,7 @@ static GtkWidget* create_action_bar(GtkNotebook *notebook) /*** Stop */ - wid = create_button(_("button|Stop"), "dvdisaster-gtk-stop"); + wid = create_button(_("button|Stop"), "stop", scale); g_signal_connect(G_OBJECT(wid), "clicked", G_CALLBACK(action_cb), (gpointer)ACTION_STOP); gtk_box_pack_end(GTK_BOX(vbox), wid, FALSE, FALSE, 0); GuiAttachTooltip(wid, _("tooltip|Abort action"), @@ -409,9 +410,9 @@ void GuiCreateMainWindow(int *argc, char ***argv) gtk_init(argc, argv); - /*** Create our icons */ + /*** Set path to our icons */ - GuiCreateIconFactory(); + gtk_icon_theme_add_resource_path(gtk_icon_theme_get_default(), "/dvdisaster/"); /*** Open the main window */ @@ -495,8 +496,7 @@ void GuiCreateMainWindow(int *argc, char ***argv) box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add(GTK_CONTAINER(button), box); - icon = gtk_image_new_from_stock("dvdisaster-gtk-index", GTK_ICON_SIZE_SMALL_TOOLBAR); - + icon = gtk_image_new_from_icon_name("log", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_box_pack_start(GTK_BOX(box), icon, FALSE, FALSE, 2); wid = gtk_label_new(_utf("View log")); diff --git a/src/menubar.c b/src/menubar.c index c8fbc84..8afe27a 100644 --- a/src/menubar.c +++ b/src/menubar.c @@ -446,7 +446,7 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent) gtk_box_pack_start(GTK_BOX(box), ebox, FALSE, FALSE, 0); GuiAttachTooltip(ebox, _("tooltip|Drive selection"), _("Use the nearby drop-down list to select the input drive.")); - icon = gtk_image_new_from_stock("dvdisaster-cd", GTK_ICON_SIZE_LARGE_TOOLBAR); + icon = gtk_image_new_from_icon_name("cd", GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_container_add(GTK_CONTAINER(ebox), icon); Closure->driveCombo = combo_box = gtk_combo_box_text_new(); @@ -480,7 +480,7 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent) /*** Image file selection */ - icon = gtk_image_new_from_stock("dvdisaster-open-img", GTK_ICON_SIZE_LARGE_TOOLBAR); + icon = gtk_image_new_from_icon_name("open-img", GTK_ICON_SIZE_LARGE_TOOLBAR); button = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); gtk_container_add(GTK_CONTAINER(button), icon); @@ -508,7 +508,7 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent) /*** Ecc file selection */ - icon = gtk_image_new_from_stock("dvdisaster-open-ecc", GTK_ICON_SIZE_LARGE_TOOLBAR); + icon = gtk_image_new_from_icon_name("open-ecc", GTK_ICON_SIZE_LARGE_TOOLBAR); button = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); gtk_container_add(GTK_CONTAINER(button), icon); @@ -537,7 +537,7 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent) /*** Preferences button */ - icon = gtk_image_new_from_stock("dvdisaster-gtk-preferences", GTK_ICON_SIZE_LARGE_TOOLBAR); + icon = gtk_image_new_from_icon_name("preferences", GTK_ICON_SIZE_LARGE_TOOLBAR); Closure->prefsButton = prefs = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(prefs), GTK_RELIEF_NONE); gtk_container_add(GTK_CONTAINER(prefs), icon); @@ -549,7 +549,7 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent) /*** Help button */ - icon = gtk_image_new_from_stock("dvdisaster-gtk-help", GTK_ICON_SIZE_LARGE_TOOLBAR); + icon = gtk_image_new_from_icon_name("help", GTK_ICON_SIZE_LARGE_TOOLBAR); Closure->helpButton = help = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(help), GTK_RELIEF_NONE); gtk_container_add(GTK_CONTAINER(help), icon); @@ -560,7 +560,7 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent) /*** Quit button */ - icon = gtk_image_new_from_stock("dvdisaster-gtk-quit", GTK_ICON_SIZE_LARGE_TOOLBAR); + icon = gtk_image_new_from_icon_name("quit", GTK_ICON_SIZE_LARGE_TOOLBAR); quit = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(quit), GTK_RELIEF_NONE); gtk_container_add(GTK_CONTAINER(quit), icon); diff --git a/src/rs02-window.c b/src/rs02-window.c index baf66b5..042cc7c 100644 --- a/src/rs02-window.c +++ b/src/rs02-window.c @@ -825,7 +825,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->cdButtonA), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->cdButtonA, 3, 2, 1, 1); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->cdUndoButtonA = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->cdUndoButtonA), icon); g_signal_connect(G_OBJECT(wl->cdUndoButtonA), "clicked", G_CALLBACK(query_cb), wl); @@ -844,7 +844,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->cdButtonB), "clicked", G_CALLBACK(query_cb), wl); gtk_box_pack_start(GTK_BOX(hbox), wl->cdButtonB, FALSE, FALSE, 0); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->cdUndoButtonB = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->cdUndoButtonB), icon); g_signal_connect(G_OBJECT(wl->cdUndoButtonB), "clicked", G_CALLBACK(query_cb), wl); @@ -888,7 +888,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->dvdButton1A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->dvdButton1A, 3, 3, 1, 1); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->dvdUndoButton1A = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->dvdUndoButton1A), icon); g_signal_connect(G_OBJECT(wl->dvdUndoButton1A), "clicked", G_CALLBACK(query_cb), wl); @@ -907,7 +907,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->dvdButton1B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_pack_start(GTK_BOX(hbox), wl->dvdButton1B, FALSE, FALSE, 0); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->dvdUndoButton1B = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->dvdUndoButton1B), icon); g_signal_connect(G_OBJECT(wl->dvdUndoButton1B), "clicked", G_CALLBACK(query_cb), wl); @@ -951,7 +951,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->dvdButton2A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->dvdButton2A, 3, 4, 1, 1); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->dvdUndoButton2A = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->dvdUndoButton2A), icon); g_signal_connect(G_OBJECT(wl->dvdUndoButton2A), "clicked", G_CALLBACK(query_cb), wl); @@ -970,7 +970,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->dvdButton2B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_pack_start(GTK_BOX(hbox), wl->dvdButton2B, FALSE, FALSE, 0); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->dvdUndoButton2B = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->dvdUndoButton2B), icon); g_signal_connect(G_OBJECT(wl->dvdUndoButton2B), "clicked", G_CALLBACK(query_cb), wl); @@ -1014,7 +1014,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->bdButton1A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->bdButton1A, 3, 5, 1, 1); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->bdUndoButton1A = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->bdUndoButton1A), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton1A), "clicked", G_CALLBACK(query_cb), wl); @@ -1033,7 +1033,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->bdButton1B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_pack_start(GTK_BOX(hbox), wl->bdButton1B, FALSE, FALSE, 0); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->bdUndoButton1B = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->bdUndoButton1B), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton1B), "clicked", G_CALLBACK(query_cb), wl); @@ -1076,7 +1076,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->bdButton2A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->bdButton2A, 3, 6, 1, 1); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->bdUndoButton2A = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->bdUndoButton2A), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton2A), "clicked", G_CALLBACK(query_cb), wl); @@ -1095,7 +1095,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->bdButton2B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_pack_start(GTK_BOX(hbox), wl->bdButton2B, FALSE, FALSE, 0); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->bdUndoButton2B = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->bdUndoButton2B), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton2B), "clicked", G_CALLBACK(query_cb), wl); @@ -1138,7 +1138,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->bdButton3A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->bdButton3A, 3, 7, 1, 1); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->bdUndoButton3A = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->bdUndoButton3A), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton3A), "clicked", G_CALLBACK(query_cb), wl); @@ -1157,7 +1157,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->bdButton3B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_pack_start(GTK_BOX(hbox), wl->bdButton3B, FALSE, FALSE, 0); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->bdUndoButton3B = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->bdUndoButton3B), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton3B), "clicked", G_CALLBACK(query_cb), wl); @@ -1202,7 +1202,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->bdButton4A), "clicked", G_CALLBACK(query_cb), wl); gtk_grid_attach(GTK_GRID(grid), wl->bdButton4A, 3, 8, 1, 1); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->bdUndoButton4A = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->bdUndoButton4A), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton4A), "clicked", G_CALLBACK(query_cb), wl); @@ -1221,7 +1221,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) g_signal_connect(G_OBJECT(wl->bdButton4B), "clicked", G_CALLBACK(query_cb), wl); gtk_box_pack_start(GTK_BOX(hbox), wl->bdButton4B, FALSE, FALSE, 0); - icon = gtk_image_new_from_stock(GTK_STOCK_UNDO, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_SMALL_TOOLBAR); wl->bdUndoButton4B = gtk_button_new(); gtk_container_add(GTK_CONTAINER(wl->bdUndoButton4B), icon); g_signal_connect(G_OBJECT(wl->bdUndoButton4B), "clicked", G_CALLBACK(query_cb), wl);