From 4495a27d6d5bd5eb919711df545b6e10ac8a5866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Cuevas=20Albadalejo?= Date: Tue, 15 Jul 2014 11:55:16 +0200 Subject: [PATCH] Added default icon size and improved a bit more the setup.py installation file --- res/jsoninspector.glade | 1 - res/jsoninspector48x48.png | Bin 0 -> 5462 bytes setup.py | 14 ++++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 res/jsoninspector48x48.png diff --git a/res/jsoninspector.glade b/res/jsoninspector.glade index 9970013..57b7344 100644 --- a/res/jsoninspector.glade +++ b/res/jsoninspector.glade @@ -174,7 +174,6 @@ False JSON Inspector center - jsoninspector.png diff --git a/res/jsoninspector48x48.png b/res/jsoninspector48x48.png new file mode 100644 index 0000000000000000000000000000000000000000..f7f74f2652ea5b42518acfc88a812102475de371 GIT binary patch literal 5462 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%0AbTbC|f zGCDds>I-IjdpoMtD!RJ56d^=!+_>>K9(?e@;cPYw!!R_Z6p2IvnM?*+>yMO8Y_A`c z+ohBcQi4F@#(0Q-{}(P=B>-}#nL%6tE;MRjWCl*pllaR&+KBGXZ1lDN^e5`E#~yoz z5Hj1>*C$J*(!xhfGcz;DWHQ9IZLPIlee&eVp`%BSW`iKmj4{F(gX_8&85vmuGOobK zZ9JMkhgR@>iSPZp7CibSg)lN8C^Q-xXaP_F(2k_K$%h69?ag0!@i!m+nDqm}h9J(^#!>m~QhS7-|%x_0x2AN`p1!;T;bh~qd~Yt5#nrk)=j9{%=~D_6J> z!VJTZ4h;?A(xpoadf}r$FSgrw1T=y`;;;X(TR;78@8b07 zNypj;bhT1MCfl+Eqw#SBIOiGw=H}+m+1dFWDdkVQy1HJvapT6?nVA`D*REYir_*|H za1g%llVYl%yzTnrf8Cm^t?@W+i z_BKfT&#vpTbULl(iG6B(eEjLz+1Uqbwc4tySFd7la1iIupU3Unx94XTOJv14Z>;W_ zOa@!GZpHTP+p%TKJ#X*bJMeNkm-{P&kYMK8>!!8#VIk+{&{`<`%imV{kj6$fn}zTD zc;ST?@a(hC#>;ztVq&5_ilQ$}Pfy=9K0dzj^5x6-o;Y!WzWeUG#P@w@t>YIx^wzCg zwc|JkySuyJ+rNK*v})C=H`lFOcfq#pIYNjJ0Pd~VknZ^`{<+8h2Sn-UMw$>u?f?J) M07*qoM6N<$f}o~SM*si- literal 0 HcmV?d00001 diff --git a/setup.py b/setup.py index fb4748e..72ee9ec 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -import ez_setup, sys, shutil, os +import ez_setup, sys, shutil, os, os.path ez_setup.use_setuptools() from setuptools import setup, find_packages @@ -14,20 +14,24 @@ class CustomInstall(install): # Now we do our own magic if sys.platform != 'win32' and sys.platform != 'darwin': try: + print "Creating shared directory..." os.mkdir("/usr/local/share/jsoninspector", mode = 0755) except: - print "Warning: Couldn't create /usr/local/share/jsoninspector" + if not os.path.exists("/usr/local/share/jsoninspector"): + print "Warning: Couldn't create /usr/local/share/jsoninspector" # Copy the translations try: + print "Installing translations..." copy_tree('locale/po/', '/usr/share/locale/') except: print "Warning: error copying translation files." # Copy the icons - for icon_size in ['16x16', '32x32', '64x64', '128x128']: + print "Installing application icons..." + for icon_size in ['16x16', '32x32', '48x48', '64x64', '128x128']: try: shutil.copyfile('res/jsoninspector' + icon_size + ".png", '/usr/share/icons/hicolor/' + icon_size + "/apps/jsoninspector.png") @@ -36,12 +40,14 @@ class CustomInstall(install): print "Warning: error copying icon {size}.".format(icon_size) try: + print "Installing glade file..." shutil.copyfile('res/jsoninspector.glade', '/usr/local/share/jsoninspector/jsoninspector.desktop') except: - print "Warning: error copyin .glade file." + print "Warning: error copying .glade file." try: + print "Installing desktop entry..." shutil.copyfile('res/jsoninspector.desktop', '/usr/share/applications/jsoninspector.desktop') except: