New I-Nex Logo

Makefile

@@ -110,7 +110,7 @@ self:
 	$(INSTALL) 0755 i-nex-glinfo inex$(bindir)
 	$(INSTALL) 0755 i-nex-uname inex$(bindir)
 	$(INSTALL) 0755 src/i-nex/i-nex.gambas inex$(bindir)
-	$(INSTALL) 0755 pixmaps/pixmaps/i-nex.xpm inex/usr/share/pixmaps/
+	$(INSTALL) 0755 pixmaps/i-nex-128.png inex/usr/share/pixmaps/
 	$(INSTALL) 0755 debian/i-nex.desktop inex/usr/share/applications/
 	$(INSTALL) 0755 debian/check_kernel inex/usr/bin/
 	$(INSTALL) 0755 debian/i-nex-lspci inex/usr/bin/

debian/i-nex.desktop

@@ -152,7 +152,7 @@ GenericName[vi]=I-Nex Viewing System Device Information.
 GenericName[zh_CN]=I-Nex Viewing System Device Information.
 GenericName[zh_TW]=I-Nex Viewing System Device Information.
 Exec=/usr/bin/i-nex.gambas
-Icon=i-nex
+Icon=/usr/share/pixmaps/i-nex-128.png
 Terminal=false
 StartupNotify=true
 Type=Application

debian/i-nex.triggers

@@ -1,4 +1,4 @@
 activate /usr/share/menu
 activate /usr/share/applications
+activate /usr/share/pixmaps
 activate /usr/share/man
-activate /usr/share/icons/hicolor

debian/menu

@@ -1,8 +0,0 @@
-?package(i-nex): needs="X11" \
-                     section="Applications/System/Hardware" \
-                     title="i-nex" \
-                     longtitle="I-Nex Viewing System Device Information." \
-                     icon="/usr/share/pixmaps/i-nex.xpm" \
-                     icon32x32="/usr/share/pixmaps/i-nex-32.xpm" \
-                     icon16x16="/usr/share/pixmaps/i-nex-16.xpm" \
-                     command="/usr/bin/i-nex.gambas"

debian/postinst

@@ -1,4 +0,0 @@
-#!/bin/bash
-if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
-	update-menus
-fi

debian/postrm

@@ -1,4 +0,0 @@
-#!/bin/bash
-if [ -x "`which update-menus 2>/dev/null`" ]; then 
-	update-menus ; 
-fi

install-self-inex

@@ -13,8 +13,9 @@ bindir="/usr/bin/"
 	install -m 0755 usr/bin/i-nex-usage $bindir
 	install -m 0755 usr/bin/i-nex-cpusage $bindir
 	install -m 0755 usr/bin/i-nex-glinfo $bindir
+	install -m 0755 usr/bin/i-nex-uname $bindir
 	install -m 0755 usr/bin/i-nex.gambas $bindir
-	install -m 0755 usr/share/pixmaps/i-nex.xpm /usr/share/pixmaps/
+	install -m 0755 usr/share/pixmaps/i-nex-128.png /usr/share/pixmaps/
 	install -m 0755 usr/share/applications/i-nex.desktop /usr/share/applications/
 	install -m 0755 usr/bin/check_kernel /usr/bin/
 	install -m 0755 usr/bin/i-nex-lspci /usr/bin/

pixmaps/Makefile

@@ -3,45 +3,26 @@ INSTALL = install
 MKDIR_P = mkdir -p
 datarootdir = /usr/share
 make: 
-	${MKDIR_P} 16x16
-	${MKDIR_P} 22x22
-	${MKDIR_P} 32x32
-	${MKDIR_P} 48x48
-	${MKDIR_P} pixmaps
-	convert i-nex.png -resize 16x16 16x16/i-nex.xpm
-	convert i-nex.png -resize 32x32 32x32/i-nex.xpm
-	convert i-nex.png -resize 22x22 22x22/i-nex.xpm
-	convert i-nex.png -resize 48x48 48x48/i-nex.xpm
-	convert i-nex.png -resize 96x96 pixmaps/i-nex.xpm
+
+	convert i-nex.png -resize 16x16 i-nex-16.png
+	convert i-nex.png -resize 32x32 i-nex-32.png
+	convert i-nex.png -resize 128x128 i-nex-128.png
 	
 install:
 	${MKDIR_P} ${DESTDIR}${datarootdir}/pixmaps
-	${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps
-	${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/16x16/apps
-	${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/32x32/apps
-	${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps
-	${INSTALL} -m 644 pixmaps/i-nex.xpm "${DESTDIR}${datarootdir}/pixmaps/"
-	${INSTALL} -m 644 16x16/i-nex.xpm "${DESTDIR}${datarootdir}/pixmaps/i-nex-16.xpm"
-	${INSTALL} -m 644 32x32/i-nex.xpm "${DESTDIR}${datarootdir}/pixmaps/i-nex-32.xpm"
-	${INSTALL} -m 644 16x16/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/16x16/apps/"
-	${INSTALL} -m 644 22x22/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps/"
-	${INSTALL} -m 644 32x32/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/32x32/apps/"
-	${INSTALL} -m 644 48x48/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/"
+	${INSTALL} -m 644 i-nex.png "${DESTDIR}${datarootdir}/pixmaps/"
+	${INSTALL} -m 644 i-nex-16.png "${DESTDIR}${datarootdir}/pixmaps/"
+	${INSTALL} -m 644 i-nex-32.png "${DESTDIR}${datarootdir}/pixmaps/"
+	${INSTALL} -m 644 i-nex-128.png "${DESTDIR}${datarootdir}/pixmaps/"
 	
 uninstall:
 
-	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/16x16/apps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/16x16/apps/i-nex.xpm" ; fi
-	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps/i-nex.xpm" ; fi
-	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/32x32/apps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/32x32/apps/i-nex.xpm" ; fi
-	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/i-nex.xpm" ; fi
-	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex.xpm" ; fi
-	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex-16.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex-16.xpm" ; fi
-	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex-32.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex-32.xpm" ; fi
-
+	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex-16.png" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex-16.png" ; fi
+	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex-32.png" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex-32.png" ; fi
+	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex-128.png" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex-128.png" ; fi
+	
 clean:
 	
-	rm -Rf pixmaps
-	rm -Rf 16x16
-	rm -Rf 22x22
-	rm -Rf 32x32
-	rm -Rf 48x48
+	rm i-nex-16.png
+	rm i-nex-32.png
+	rm i-nex-128.png

src/i-nex/.settings

@@ -24,9 +24,9 @@ SearchComment=False
 SearchString=True
 
 [OpenFile]
-Active=1
 File[1]=".src/Finfosys.form"
 File[2]=".src/Global.class:15.70"
+Active=3
 File[3]=".src/About.form"
 File[4]=".src/About.class:17.16"
 File[5]=".src/battery.module:15.70"
@@ -55,42 +55,41 @@ File[27]=".src/FDF.class:15.70"
 File[28]=".src/FNET_R_T.form"
 File[29]=".src/FNET_R_T.class:15.70"
 File[30]=".src/FGraphic.module:15.70"
-File[31]="logo/fb.png"
-File[32]=".src/FCPU.module:15.70"
-File[33]=".src/FUdisks.form"
-File[34]=".src/FUdisks.class:15.70"
-File[35]=".src/FCpudb.module:15.70"
-File[36]=".src/JSON.module:109.7"
-File[37]=".src/Settings.class:15.70"
-File[38]=".src/Main.module:15.70"
-File[39]=".src/_Settings_Keys.class:15.70"
-File[40]=".src/FDirDialog.form"
-File[41]=".src/FFileDialog.form"
-File[42]=".src/Dialog.class:15.70"
-File[43]=".src/Mdecode.module:15.70"
-File[44]=".src/Reports/MCPU_REPORT.module:48.53"
-File[45]=".src/Reports/MMOBO_REPORT.module:20.60"
-File[46]=".src/Reports/MGPU_REPORT.module:24.35"
-File[47]=".src/Reports/MSOUND_REPORT.module:13.14"
-File[48]=".src/Reports/MPastebinit.module:22.35"
-File[49]=".src/Reports/MSYSTEM_REPORT.module:39.1"
-File[50]=".src/Reports/MKERNEL_REPORT.module:19.1"
-File[51]=".src/Reports/MInclude.module:72.15"
-File[52]=".src/Reports/MDRIVES_REPORT.module:12.40"
-File[53]=".src/FInputDate.form"
-File[54]=".src/MInit.module:15.70"
-File[55]=".src/FEDID.form"
-File[56]=".src/FEDID.class:15.70"
-File[57]=".src/Logger.class:15.70"
-File[58]=".src/Formatter.module:15.70"
-File[59]=".src/FDirDialog.class:15.70"
-File[60]=".src/FFileDialog.class:15.70"
-File[61]=".src/FInputDate.class:15.70"
-File[62]=".src/FDIMM.form"
-File[63]=".src/FDIMM.class:15.70"
-File[64]=".src/Reports/FCPUID_REPORT.module:2.0"
-File[65]=".src/MCPUSAGE.module:31.0"
-Count=65
+File[31]=".src/FCPU.module:15.70"
+File[32]=".src/FUdisks.form"
+File[33]=".src/FUdisks.class:15.70"
+File[34]=".src/FCpudb.module:15.70"
+File[35]=".src/JSON.module:109.7"
+File[36]=".src/Settings.class:15.70"
+File[37]=".src/Main.module:15.70"
+File[38]=".src/_Settings_Keys.class:15.70"
+File[39]=".src/FDirDialog.form"
+File[40]=".src/FFileDialog.form"
+File[41]=".src/Dialog.class:15.70"
+File[42]=".src/Mdecode.module:15.70"
+File[43]=".src/Reports/MCPU_REPORT.module:48.53"
+File[44]=".src/Reports/MMOBO_REPORT.module:20.60"
+File[45]=".src/Reports/MGPU_REPORT.module:24.35"
+File[46]=".src/Reports/MSOUND_REPORT.module:13.14"
+File[47]=".src/Reports/MPastebinit.module:22.35"
+File[48]=".src/Reports/MSYSTEM_REPORT.module:39.1"
+File[49]=".src/Reports/MKERNEL_REPORT.module:19.1"
+File[50]=".src/Reports/MInclude.module:72.15"
+File[51]=".src/Reports/MDRIVES_REPORT.module:12.40"
+File[52]=".src/FInputDate.form"
+File[53]=".src/MInit.module:15.70"
+File[54]=".src/FEDID.form"
+File[55]=".src/FEDID.class:15.70"
+File[56]=".src/Logger.class:15.70"
+File[57]=".src/Formatter.module:15.70"
+File[58]=".src/FDirDialog.class:15.70"
+File[59]=".src/FFileDialog.class:15.70"
+File[60]=".src/FInputDate.class:15.70"
+File[61]=".src/FDIMM.form"
+File[62]=".src/FDIMM.class:15.70"
+File[63]=".src/Reports/FCPUID_REPORT.module:2.0"
+File[64]=".src/MCPUSAGE.module:31.0"
+Count=64
 
 [Watches]
 Count=0

src/i-nex/.src/About.form

@@ -20,13 +20,14 @@
     Text = ("Main")
     Picture = Picture["AppIcons/gtk-info.png"]
     { PictureBox1 PictureBox
-      Move(0,0,258,264)
+      Move(0,0,256,256)
       Picture = Picture["logo/i-nex.0.4.x.png"]
       Stretch = True
     }
     { TextLabel1 TextLabel
-      Move(264,0,198,234)
+      Move(266,7,198,234)
       #Translate = False
+      Font = Font["8"]
       Text = "I-Nex is an application that gathers information for hardware components available on your system and displays it using an user interface similar to the popular Windows tool CPU-Z.\n\nI-Nex can display information for the following components: CPU, GPU, Motherboard, Sound, Hard disks, RAM, Network and USB as well as some system info like the hostname, Linux distribution and version, Xorg, GCC, GLX versions and Linux Kernel info.\n\n"
     }
     { ToolButton1 ToolButton
@@ -37,6 +38,7 @@
     }
     { TextLabel6 TextLabel
       Move(6,258,456,138)
+      Font = Font["8"]
       Text = ("\nThe difference between I-Nex and the other hardware information GUI tools available for Linux is that the information is better organized and is displayed faster (than lshw-gtk for instance). Also, the hardware information is presented in a way that’s easier to understand than other such tools.\n\nBesides being able to display hardware information, I-Nex can also generate an advanced report for which you can select what to include and optionally send the report to a service such as Pastebin (and others). It also features an option to take a screenshot of the I-Nex window directly from the application.")
     }
     Index = 1