From c9c1e2212e37fb03d5e4ce4192cfe3f8a7515c5c Mon Sep 17 00:00:00 2001 From: "Nickolay V. Shmyrev" Date: Tue, 2 May 2006 18:55:10 +0000 Subject: [PATCH] Evince use it's own icon. Fix for the bug #313392. * data/Makefile.am: * data/evince.png: * data/evince-16.png: * data/evince-22.png: * data/evince.svg: * shell/main.c: (main): Evince use it's own icon. Fix for the bug #313392. * shell/ev-window.c: (fullscreen_timeout_cb), (fullscreen_set_timeout), (fullscreen_clear_timeout), (ev_window_cmd_help_about), (ev_window_dispose): Simplify fullscreen timeout code. --- ChangeLog | 17 ++ data/Makefile.am | 25 ++- data/evince-16.png | Bin 0 -> 840 bytes data/evince-22.png | Bin 0 -> 1209 bytes data/evince.png | Bin 0 -> 3314 bytes data/evince.svg | 500 +++++++++++++++++++++++++++++++++++++++++++++ shell/ev-window.c | 36 ++-- shell/main.c | 2 +- 8 files changed, 557 insertions(+), 23 deletions(-) create mode 100644 data/evince-16.png create mode 100644 data/evince-22.png create mode 100644 data/evince.png create mode 100644 data/evince.svg diff --git a/ChangeLog b/ChangeLog index be35cf75..a9e97913 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2006-05-02 Nickolay V. Shmyrev + + * data/Makefile.am: + * data/evince.png: + * data/evince-16.png: + * data/evince-22.png: + * data/evince.svg: + * shell/main.c: (main): + + Evince use it's own icon. Fix for the bug #313392. + + * shell/ev-window.c: (fullscreen_timeout_cb), + (fullscreen_set_timeout), (fullscreen_clear_timeout), + (ev_window_cmd_help_about), (ev_window_dispose): + + Simplify fullscreen timeout code. + 2006-04-29 Carlos Garcia Campos * backend/ev-attachment.c: diff --git a/data/Makefile.am b/data/Makefile.am index d7d6dafe..39835b31 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -26,6 +26,16 @@ schema_in_files = evince.schemas.in schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_DATA = $(schema_in_files:.schemas.in=.schemas) +icon_16dir = $(datadir)/icons/hicolor/16x16/apps +icon_16_DATA = evince-16.png +icon_22dir = $(datadir)/icons/hicolor/22x22/apps +icon_22_DATA = evince-22.png +icondir = $(datadir)/icons/hicolor/48x48/apps +icon_DATA = evince.png +svgicondir = $(datadir)/icons/hicolor/scalable/apps +svgicon_DATA = evince.svg +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + install-data-local: if GCONF_SCHEMAS_INSTALL if test -z "$(DESTDIR)" ; then \ @@ -34,14 +44,27 @@ if GCONF_SCHEMAS_INSTALL done \ fi endif + if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi EXTRA_DIST = \ $(glade_DATA) \ $(ui_DATA) \ $(DESKTOP_IN_FILES) \ $(schema_in_files) \ - $(NULL) + $(icon_16_DATA) \ + $(icon_22_DATA) \ + $(icon_DATA) \ + $(svgicon_DATA) \ + $(NULL) DISTCLEANFILES = \ $(DESKTOP_FILES) \ $(schema_DATA) + + diff --git a/data/evince-16.png b/data/evince-16.png new file mode 100644 index 0000000000000000000000000000000000000000..e2e7fae1c43d3aa45fdfeaf4a3b78acc15ae1660 GIT binary patch literal 840 zcmV-O1GoH%P)%Q z+C-1pLrG%^RVwX4tWxZCscj*L<`5f6OI_V$)9mge+5PtId*dP1L=fjP!!YxMnfZ?r z5srNH?WpHE9|u7+7Ks>MU|OlR8`D2DTj7^?r{6EC{OK#BLj&nwK0W!Gm+em}rPPc1 z5fPS3HTi6&Xcv~(-c-lV%w79>{Oxz*aaWaVO^nvW9EEW-9iD?{G{$H|gw>kGwj+AG zJQ@uvCqMt`d);b>W7$0^Rr;?1D71ov=djmUoT&@cKX{jiM{?B9oFbb^q7^)f1ES^2f!1Ofn;b9u{^Hd52 z_Rr0+y3uBRBOnrpB6)HV^b^4DT`sk2R}pLJ$mOt$i2VsLhriiL935{80nG}*pR z?7e#!NAb)E-6u}4a``gl$w?B!!weJ(R2w1dzNNRzB~ktt`F)<|!U8R0fWd9RKb1}T z^RIH?`gK;Orl{Y(O<1pEdV1(6m8chs_*#=Zew@yHp7_uZe06slkc=Cml``=|hsfTz z0V3F?CE9Ciq|#|J(Nh#-_L-~K;tN6+NA{ z75-+6iEoNc8-y2C{`3_EyywQ8PhLtT4tuWC-YR|GR|>Wjno6y)V1w`r;Je4!CQw9s SIRXs;0000T literal 0 HcmV?d00001 diff --git a/data/evince-22.png b/data/evince-22.png new file mode 100644 index 0000000000000000000000000000000000000000..e8b8c12e5f305191774fca342a238ac33afec832 GIT binary patch literal 1209 zcmV;q1V;ObP)OKDG}9p>N)jA_!I+s}34-F^RcNGM6*w?A3>vj2frlg0s)l{?>o~z4m`Z zRoQuX@YSGWf1&7yMl}Q=JYE046a_4iw21ubX8be510A;kq~+6Jnm4U2x%AaXuLm3J zqLyXlVDd89>|#{88GB;-&s}vNO)u>l9_YC41Os-@v98^rb(ImhGr5ESwk7!|60#`@ z+5~NZu~GEN4BFJp)Iti+SBz1NDqE_{t#3Zr9s2Cl#U7x;@;r0!wc09)O)ZgjeKNk{ z`HBGRN*tUYzhnCCcJ6Ih%e|InV*B=zIsX&Y6-D?)$@ogzQyxw)(@I@uc_E>;mVJ2P+T>*;L%Q z!PwEGtncoo@=zz^vnkYdxxaru(XKA4y1E#jP2w2^)%<2%1$Ocs1nMG6tfK>f>fT-^ z=aQ6!15AB>m`H0Y>w9~dm`jmxeN+`gmaTxSLg&Geq5%G1S4qcWgc};r$~AHn$>_mt_bw!A(^g>~Vc9z*2H?T`f2{$$pX=|f+#|}c5I|K~PWenHGR!}U)3CYxMR4QhGRoaJR(m^lCzqI*OHoqf zP#SiKY}pQgZxqi{GSey2nFI?77tfHt)&;@$9xqc;TgA=0bHq~~mOwn|v6S+%!!NS( zX=rZDj4DQ-f(u$P6LRc&I%&PZM^M~uxKRnQJB@bSyoreb< zz?q8;Ir9&$7pIqIijA8J8{ZA9@q-{nEZeo5K*|mjCyOeom!sSFBqGsTcX*(~d$#9) XtJ00000NkvXXu0mjf*o;JW literal 0 HcmV?d00001 diff --git a/data/evince.png b/data/evince.png new file mode 100644 index 0000000000000000000000000000000000000000..f0b382fdcd2003fdd693936cad0c7b9201f6769f GIT binary patch literal 3314 zcmVyYaOd;LKF`N;Nd-gP~ue{g7xrQ{DD-TL#L zx8Jnbp5K{5h^Aa;et47Xv%rrrhOzN7|9AAF`^2|i$$NpmV`Tfb!`FOH|KL!{vDJ}p zJ+^V#l6hH9j1|dG`3MX`2&525L39j43MApV5JWQ+Ye|7^$@qQ|J<;_7$`y?oV$bP{7xay6-&U&PwHgW7mVEqy&FdERbhq;Q@f?C0 zU<3`b3QEMlQ;sClqR2QFR=G(2`Tsx{3Yc;kQ>lRGG3S$a;M{sU7bktDDghW1GH@&9`McMUN_YV%mu3tx>e{e_`Z7d-K##A*z zEHnw+u_V3oTgeQ6pA#Ey;?(clL;0PzL$l7C$AU*5Vb$Kf-1ycZZoZnMdvLIhKzjX# z@W4cRZv>rqCVjEaPgu0$$k6V@x7_OJ{CXo4DFjY zhZ{5@$7o%XX<2lC;R^@>t{)%-7!&P*#8>=m(>!{800B{VEQMfESBmthV~lRShw?k` z0HE61Sp3vebUpYGMo6@VimxeG0&GiSU%o(YXegGn;7eaZEm=yT?BfR}ev~jZ&|wft zZtR%@^9NcWhA&|0+%z0`iDP$v2IKnxWY(|eh94ZjWV09p<5M2RvX2m8D@j|%=F}fN zjB#Cr<1lAnfX@4W4{Z#&VkL%FgE~DLU29x7fhFB(Cq#c zxcf8c(i8wPm14zrzl)gD#bn9jQoe$eL>tY}k#X=|e~mMbJOY5TbScZfGlZ}maz&3) zC8&ekxM!}H%(O7tD4;!UGuJVk{LSAW$mQadg^xXs)3=7A>vM6!#bBa0D`Zm^8MnZR zEn6^^3U*HqAKASdHGdvOH(=tfAeNaZ@*2dua6rJ9H3>zM<`cxNVaOJ z=r_&Cm>BhRV##rhJz$vMkz#V_-|Ackple_oKj1gFtU}2lh=x^Okad?>Y%{Q}Z z-#)DQ3nDiwqct_~QNq@Y4DmJS&N|rE%(`w$z!*r`lJeOz)7GrTODI(|t`|fJoMLI0 z!^thbO@8-oGX4GZ?ca~cW+{|>F67FQ0!>ZJrnYC|tTai+KwHY9rz=IuR+wU8Mx0Gu zNXqcV<()r2ZB0)V33T|tw4+$sX>oen024cR(ls!^4F~=g(V8Vc<#G0EiNF|ioF)?= z*8xw=jH6iDlV#AJ4Wj--9fs=Vp*rn>4DEP z{=M(9`01ya|0jP67%t^qE>F7g`?KoKRkx@I9ujJ8QFLY<=Cs-bXU;ISYbWmTK?ES3 znG3?EF682l|MDyJZQV+5r^D&3_fXispOrgz(!OyMf!3V6 zT4J&k5&3*_?pZaCxFa&%F7p z+`WhQ@BDRw$w>gbbLSZS>}QeLEbhC9=^K6pXU!U1Uvu)(6cs;A+=Qu@Sv@rdQjR2> zvY6N2LU8;zg&i-Dd+9|?J|EW&b)!j1+k6uPr>{)Wk+sS6{{nqKev{G9ZDDF;1c1WJ z`vF+KV+VHMY65LIeYr%b62zsWNF-p6C2375vMGyfi^4y8gsI_!oZq((@5qrD^fchr zA!i+h41tEjrzcsxBune!rK}qMArt@puZ-SzUwq%mfdS4u{4n$W@Q;}L@sG1~{d&y& zg^`TtCavM z%5&4Q4pM>3*f+kx@^AhNE%=7iQYEjRkLlsKza zkzT)^)Vg(~)~>}`yci<{S{njw&_RPgUJn6;!5~=B(Slu^;M_xlEPCo`oLg_FO+e3A zpM}Xh3|6j1au z#t4?rofQFCxgf)wvC|ay?WO0r?P$y5_}MEQJ2i&qRmi3t7IwGOGp~b=)(mw)({gHc zbf6*d(56z`)&ejB&kqDU@6a<$%eOhg1q>Sx6O5CDn{Ln-b_-)JEIIQ<&UU z+J66G+(2{W_!wu##tDJ|Z6KE~ayd7_o9~XIbwF#{p)J!wTWcCA1%j}+kx~MJl3StT z`BXd~*9-8qVXEw-EQL}Q(y~!Xp_Co&L2W=7gfIk6T769kba+K%&mzRik5Vjq92&h$ zp;$&JE6P8rJr{`(K0-^1WuL;7%h|DUwAL7-<4`1o04b4DBBeq~g;EmBwqq?zC6UTP zNQICJslq9g#jI;$H`7kakzAf|Id-vtHVWHmK?OcqDRf|=br4OBiN8bOCdw14dA^96 zJz-NUj80N1q)-SYP|}J)D`jI@HmJ~Y)%`Ln0&kqi5on^eA_%Fl9EA`mz(ha;v>(Jo zLJ}qhk1+AZ6xF;Uaw(}KQYfTlg%(i~AtVS{*E6kddOh2E!1E14fUb7sFi}&>#Dt_! zSXT8dFA{HHY8s3Cp0%cLGO=sSjp~v->Jz?M5ztY8QbvzC_|l$QdlBl>g@#62&08D& z)+9a?F{@f1Cu-r_KYiDSvp_X-)Px{!`_!gdQtamB5DEK7Ch1`B}U7;-UYRKyXb0jTX4| zQ=4L~SG&~JMsMszu{TY3qI$rlejg-?`D$@rtCy!+pg8uP0=#JiMz(J=w>-EbFveIy zgscT1jN#Rn_r!oi0&T77JH4YklL3D5SMG{W8aHvH8zrNWj1oH_C|(+kJH<2o!SU{e z@zUC^tiz?e8$-F}mp9d-O@rUpYd`u$lYO8QzHqH*6rV?=y4oBrl@7nv?sK0(iCkB%!!cEi`NfhWhvDR3)>n77sFEb%q$F5`QWE)^zZzp?SJK_6& z@B#^soJPR&^%MWR^T!viOqAI4u^xIlQ*l&?1tx{pU8C;WOf#u~s+{EgrUCfE&J-Ir zEaXbQ%s=gVb1X38%SpU58oGaQ=;tgY4t(*x+p_&PEO2_dGR;zvpYAYl{^}GXM=n&J z{LZU|ApD#4Q1X_hu=)pwY)i=}EhX=)c>WsmfsNpw{19LqTOIZTv)2#wVz`8(Bu_13j$4s0&JiKaDY^F&5FLO;2Q{_qv;dI w@-pB?(~s7!d;By!y9zpKfh2g7m>+ulKXE|lfVnS+%>V!Z07*qoM6N<$g4ji76aWAK literal 0 HcmV?d00001 diff --git a/data/evince.svg b/data/evince.svg new file mode 100644 index 00000000..9b0332fb --- /dev/null +++ b/data/evince.svg @@ -0,0 +1,500 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Evince + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shell/ev-window.c b/shell/ev-window.c index 71cf0ec4..6ca0de64 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -127,7 +127,7 @@ struct _EvWindowPrivate { /* Fullscreen mode */ GtkWidget *fullscreen_toolbar; GtkWidget *fullscreen_popup; - GSource *fullscreen_timeout_source; + guint fullscreen_timeout_id; /* Popup link */ GtkWidget *view_popup; @@ -1563,8 +1563,8 @@ fullscreen_timeout_cb (gpointer data) g_object_set (window->priv->fullscreen_popup, "visible", FALSE, NULL); ev_view_hide_cursor (EV_VIEW (window->priv->view)); - g_source_unref (window->priv->fullscreen_timeout_source); - window->priv->fullscreen_timeout_source = NULL; + + window->priv->fullscreen_timeout_id = 0; return FALSE; } @@ -1572,28 +1572,22 @@ fullscreen_timeout_cb (gpointer data) static void fullscreen_set_timeout (EvWindow *window) { - GSource *source; - - if (window->priv->fullscreen_timeout_source != NULL) { - g_source_unref (window->priv->fullscreen_timeout_source); - g_source_destroy (window->priv->fullscreen_timeout_source); + if (window->priv->fullscreen_timeout_id != 0) { + g_source_remove (window->priv->fullscreen_timeout_id); } - - source = g_timeout_source_new (FULLSCREEN_TIMEOUT); - g_source_set_callback (source, fullscreen_timeout_cb, window, NULL); - g_source_attach (source, NULL); - window->priv->fullscreen_timeout_source = source; + + window->priv->fullscreen_timeout_id = + g_timeout_add (FULLSCREEN_TIMEOUT, fullscreen_timeout_cb, window); } static void fullscreen_clear_timeout (EvWindow *window) { - if (window->priv->fullscreen_timeout_source != NULL) { - g_source_unref (window->priv->fullscreen_timeout_source); - g_source_destroy (window->priv->fullscreen_timeout_source); + if (window->priv->fullscreen_timeout_id != 0) { + g_source_remove (window->priv->fullscreen_timeout_id); } - window->priv->fullscreen_timeout_source = NULL; + window->priv->fullscreen_timeout_id = 0; ev_view_show_cursor (EV_VIEW (window->priv->view)); } @@ -2428,6 +2422,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) "authors", authors, "documenters", documenters, "translator-credits", _("translator-credits"), + "logo-icon-name", "evince", NULL); g_free (comments); @@ -2809,10 +2804,9 @@ ev_window_dispose (GObject *object) priv->uri = NULL; } - if (window->priv->fullscreen_timeout_source) { - g_source_unref (window->priv->fullscreen_timeout_source); - g_source_destroy (window->priv->fullscreen_timeout_source); - window->priv->fullscreen_timeout_source = NULL; + if (priv->fullscreen_timeout_id) { + g_source_remove (priv->fullscreen_timeout_id); + priv->fullscreen_timeout_id = 0; } destroy_fullscreen_popup (window); diff --git a/shell/main.c b/shell/main.c index 3a24e058..b874b28b 100644 --- a/shell/main.c +++ b/shell/main.c @@ -288,7 +288,7 @@ main (int argc, char *argv[]) ev_file_helpers_init (); ev_debug_init (); ev_stock_icons_init (); - gtk_window_set_default_icon_name ("postscript-viewer"); + gtk_window_set_default_icon_name ("evince"); load_files (poptGetArgs (context)); -- 2.43.5