From c1d1f5c52fb07bdf21f3f5d8126816f97ccf9719 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Thu, 25 Feb 1999 22:03:09 +0000 Subject: [PATCH] Integrate new Tigert Icon for PhotoShop files --- configure.in | 2 +- gnome/gdesktop.h | 1 + gnome/gpopup.c | 9 +++++---- gnome/mc.keys.in.in | 3 +++ new_icons/Makefile.in | 1 + new_icons/gnome-image-psd.png | Bin 0 -> 1845 bytes po/mc.pot | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 new_icons/gnome-image-psd.png diff --git a/configure.in b/configure.in index 8e7e08dfd..0e97afbad 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_INIT(create_vcs) AC_CONFIG_HEADER(config.h) PACKAGE=mc -VERSION=4.5.20 +VERSION=4.5.21 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(VERSION) diff --git a/gnome/gdesktop.h b/gnome/gdesktop.h index 1544c9939..a2bbaf023 100644 --- a/gnome/gdesktop.h +++ b/gnome/gdesktop.h @@ -44,6 +44,7 @@ typedef struct { char *url; /* URL this icon points to */ int selected : 1; /* Is the icon selected? */ int tmp_selected : 1; /* Temp storage for original selection while rubberbanding */ + int requires_terminal : 1; /* True if this requires a terminal to run */ } DesktopIconInfo; void desktop_icon_info_open (DesktopIconInfo *dii); diff --git a/gnome/gpopup.c b/gnome/gpopup.c index 7a7a6677c..e39a8c1bb 100644 --- a/gnome/gpopup.c +++ b/gnome/gpopup.c @@ -34,7 +34,8 @@ enum { F_PANEL = 1 << 6, /* Applies to files from a panel window */ F_MOUNTABLE = 1 << 7, /* Only if the device is mountable */ F_UNMOUNTABLE = 1 << 8, /* Only if the device is unmountable */ - F_EJECTABLE = 1 << 9 /* Only if the device is ejectable */ + F_EJECTABLE = 1 << 9, /* Only if the device is ejectable */ + F_LOCAL = 1 << 10 /* File must be on a local file system */ }; struct action { @@ -260,9 +261,9 @@ static struct action file_actions[] = { { N_("Unmount device"), F_SINGLE|F_UNMOUNTABLE|F_DICON, (GtkSignalFunc) dicon_unmount }, { N_("Eject device"), F_SINGLE|F_EJECTABLE|F_DICON, (GtkSignalFunc) dicon_eject }, { "", F_SINGLE, NULL }, - { N_("Open"), F_PANEL | F_ALL, (GtkSignalFunc) panel_action_open }, - { N_("Open"), F_DICON | F_ALL, (GtkSignalFunc) dicon_execute }, - { N_("Open with"), F_PANEL | F_ALL, (GtkSignalFunc) panel_action_open_with }, + { N_("Open"), F_LOCAL| F_PANEL | F_ALL, (GtkSignalFunc) panel_action_open }, + { N_("Open"), F_LOCAL | F_DICON | F_ALL, (GtkSignalFunc) dicon_execute }, + { N_("Open with"), F_LOCAL | F_PANEL | F_ALL, (GtkSignalFunc) panel_action_open_with }, { N_("View"), F_PANEL | F_NOTDIR, (GtkSignalFunc) panel_action_view }, { N_("View unfiltered"), F_PANEL | F_NOTDIR, (GtkSignalFunc) panel_action_view_unfiltered }, { N_("Edit"), F_PANEL | F_NOTDIR, (GtkSignalFunc) panel_action_edit }, diff --git a/gnome/mc.keys.in.in b/gnome/mc.keys.in.in index 929e5cc2c..e951281cf 100644 --- a/gnome/mc.keys.in.in +++ b/gnome/mc.keys.in.in @@ -225,6 +225,9 @@ video/x-ms-video: image/*: icon-filename=@icondir@/gnome-image-generic.png +image/x-psd: + icon-filename=@icondir@/gnome-image-psd.png + text/*: icon-filename=@icondir@/gnome-textfile.png open=gnome-edit %f \ No newline at end of file diff --git a/new_icons/Makefile.in b/new_icons/Makefile.in index f7df2198b..50c54b445 100644 --- a/new_icons/Makefile.in +++ b/new_icons/Makefile.in @@ -52,6 +52,7 @@ ALLICONS = \ gnome-textfile.png \ gnome-tex.png \ gnome-audio.png \ + gnome-image-psd.png \ gnome-image-xcf.png all: diff --git a/new_icons/gnome-image-psd.png b/new_icons/gnome-image-psd.png new file mode 100644 index 0000000000000000000000000000000000000000..6e3a04b33f76752111ce5be2f65f3070347c96fc GIT binary patch literal 1845 zcmV-52g>+~P)H#RAu}PVA<%T86AfrdrcG^l6Ls3U zNt-rBi;`@4c(H$AL+Oj;#U!Li-IlG})L7B9yx88+H&Fsr(IDGeC9O0dA$x$pO27^^ z=E27Hy=O1(#W)1WHPGe7_)0%r9s8bhzTfkEIOkm0#x}OGjsF)2+qM+)Ru8xe1Ry#) zJL&A~1bA;N2UoXpFdI97H-L8mIy*ZFhr<{~j%0F{ii(P3)6>&iHrZAP_%`szrAB*u zJBJS+rn$KpMNu#e10hUIQ^n))aOlvN>FRp#4Dikt%#F0cegdGfvJ!w3Cr;4V*vQVE zA%w8P+%!#0Q`k=vAq1vr5R1h)d-mLB=6(W2d!V|yT3otxiLx>;vMi&jDwlkFpL~Rm<3P64jqyA z4nTcrSDPgd&OIQa(I|WO?j@Hq2#3SG|9%g;?#1UTLzWd}Sq7v6vZmEBA5Qi_ z!tz*seLdaX-6^1NGXflWAQTGG($az~%gC~frfH8X5=$0zcafd2r?darNp|B9RFF{e48EQM$Ui@cDdbnugEkLs3)~O5FUb zu9Trjjt^d);NyLRe7x^3{HONssM-Raj0;!Vo6i|p&U;}I`13{uI4Nb~^y$;2(`izv z6ha96em{P{A5~SUsj1=7t1S$+)dP=!3E9%CeO07^9=2c&@{5C(U5dlte;K%pw-NWzqQ&+beT`#4ostS+C!%XE%OuAmQ zxK7GI2y3m&0Pxza5Z3u31nk~3fG-e7QDhWF=D>k3($LWGlZ}uEhgE1{Vd1TF=gy(3 zDrIFpJRT2$Kn0(;kB~~2!UB*5vJ$$c@zSRWUKuN8Z}J6dltp%H^V9$pfFDo|4>O56 zWZ4R%+S*!f+_=#Q{Ha(0j&@?hFwk`!m&=7|TJ;^^@xvX~2r3YR`gn|EqeFIl?*euq zCJyq21J|k4CambnLbdWwMwG7tR+-(u|798*8^1F&H1yqK1vuWwgb;YWUUa>b($Z4K zXTw&$j$!5N5F9io(KHVwB^n-&8@JoC)bKtSvfmpA?eQF{s@SF?%Q6=(T!0PS7aR+i zot;J3bxKMs0UkV7(J2t%&bn~BJ*cYnbh}-+-7b`v0)zH@6F>}9)rG3MP!t(eRj976 zqNC%dP~<7qseqqfyLJs-*KIH8ywaG07-$J7pM$y_On(^4uez$LxLj^rE;m(ue}fTQ z>=nmDza?d5thh< zbTH0&?9g6xxE0Chd`5oCZ1zA=Ig?18+UIhmW=s1KV zNwO~`%g?p`UnwF}7bfw|cG9&$WII%>#g**7P}nV-&5}sWIO644Kq0xc$u48=Y&oXT z$nM!k&TnmiifOQVmt`@1eSKWKc#)~8DR2-%MR{Oldp!|Gn-|k81=B28^<}avSN;C| z`} zi`LfG)ksHyQ_qp}lW1#e%agu&^QP$N=va;PZ-B2qPoC>xt?>9IaOgSmDhdMlHSmq+ jO=KI}*v2-tu_62yuK;%#*>&;C00000NkvXXu0mjf|4(pu literal 0 HcmV?d00001 diff --git a/po/mc.pot b/po/mc.pot index 1dbfe8995..dbc50813e 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-02-25 00:35-0600\n" +"POT-Creation-Date: 1999-02-25 00:53-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"