From 5b81a7c4be061953320ed76841675fdc11720bec Mon Sep 17 00:00:00 2001 From: neil Date: Thu, 14 May 2009 01:21:42 +0000 Subject: [PATCH] - Tidied alignment and grouping of GUI elements. - Removed leading zeros from BAR sizes. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@31219 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/common/hidd.pci/pcitool/main.c | 150 +++++++++++++++--------------------- 1 file changed, 61 insertions(+), 89 deletions(-) diff --git a/arch/common/hidd.pci/pcitool/main.c b/arch/common/hidd.pci/pcitool/main.c index bb39a8d4c..5bac66e3b 100644 --- a/arch/common/hidd.pci/pcitool/main.c +++ b/arch/common/hidd.pci/pcitool/main.c @@ -26,7 +26,7 @@ #include "support.h" #define APPNAME "PCITool" -#define VERSION "PCITool 0.2 (20.4.2009)" +#define VERSION "PCITool 0.3 (13.5.2009)" static const char version[] = "$VER: " VERSION "\n"; @@ -102,7 +102,7 @@ void cleanup(CONST_STRPTR message) Object *MakeLabel(STRPTR str) { - return (MUI_MakeObject(MUIO_Label, str, 0)); + return (MUI_MakeObject(MUIO_Label, str, 0)); } LONG xget(Object * obj, ULONG attr) @@ -119,7 +119,7 @@ Object *StrDriverName, *StrDriverHWName, *StrDriverDirect; Object *StrDescription, *VendorID, *ProductID, *RevisionID; Object *VendorName, *ProductName, *SubsystemName; -Object *Interface, *_Class, *SubClass, *IRQLine; +Object *_Class, *SubClass, *Interface, *IRQLine; Object *ROMBase, *ROMSize; Object *RangeList; Object *Status; @@ -167,14 +167,14 @@ void memoryPrint(STRPTR buffer, unsigned int bar, unsigned int base, unsigned in { if(type & ADDRF_IO) { - snprintf(buffer, 59, "Bar%d: %s%s at 0x%04x (size 0x%04x)", bar, + snprintf(buffer, 59, "Bar%d: %s%s at 0x%04x (size 0x%x)", bar, (type & ADDRF_PREFETCH) ? "Prefetchable " :"", (type & ADDRF_IO)?"I/O":"Memory", base, size); } else { - snprintf(buffer, 59, "Bar%d: %s%s at 0x%08x (size 0x%08x)", bar, + snprintf(buffer, 59, "Bar%d: %s%s at 0x%08x (size 0x%x)", bar, (type & ADDRF_PREFETCH) ? "Prefetchable " :"", (type & ADDRF_IO)?"I/O":"Memory", base, size); @@ -408,7 +408,7 @@ BOOL GUIinit() app = ApplicationObject, MUIA_Application_Title, (IPTR)APPNAME, MUIA_Application_Version, (IPTR)VERSION, - MUIA_Application_Copyright, (IPTR)"© 2004, The AROS Development Team", + MUIA_Application_Copyright, (IPTR)"© 2004-2009, The AROS Development Team", MUIA_Application_Author, (IPTR)"Michal Schulz", MUIA_Application_Base, (IPTR)APPNAME, MUIA_Application_Description, __(MSG_DESCRIPTION), @@ -487,98 +487,70 @@ BOOL GUIinit() MUIA_Text_Contents, "", End, End, - Child, HGroup, - Child, ColGroup(2), - Child, Label(_(MSG_VENDORID)), - Child, VendorID = TextObject, - TextFrame, - MUIA_Background, MUII_TextBack, - MUIA_Text_SetMax, FALSE, - MUIA_Text_Contents, "0x0000", - End, + Child, ColGroup(6), + Child, Label(_(MSG_VENDORID)), + Child, VendorID = TextObject, + TextFrame, + MUIA_Background, MUII_TextBack, + MUIA_Text_SetMax, FALSE, + MUIA_Text_Contents, "0x0000", End, - Child, ColGroup(2), - Child, Label(_(MSG_PRODUCTID)), - Child, ProductID = TextObject, - TextFrame, - MUIA_Background, MUII_TextBack, - MUIA_Text_SetMax, FALSE, - MUIA_Text_Contents, "0x0000", - End, + Child, Label(_(MSG_PRODUCTID)), + Child, ProductID = TextObject, + TextFrame, + MUIA_Background, MUII_TextBack, + MUIA_Text_SetMax, FALSE, + MUIA_Text_Contents, "0x0000", End, - Child, ColGroup(2), - Child, Label(_(MSG_REVISIONID)), - Child, RevisionID = TextObject, - TextFrame, - MUIA_Background, MUII_TextBack, - MUIA_Text_SetMax, FALSE, - MUIA_Text_Contents, "0x0000", - End, + Child, Label(_(MSG_REVISIONID)), + Child, RevisionID = TextObject, + TextFrame, + MUIA_Background, MUII_TextBack, + MUIA_Text_SetMax, FALSE, + MUIA_Text_Contents, "0x0000", End, - End, - Child, HGroup, - Child, ColGroup(2), - MUIA_Weight, 0, - Child, Label(_(MSG_INTERFACE)), - Child, Interface = TextObject, - TextFrame, - MUIA_Background, MUII_TextBack, - MUIA_Text_SetMax, FALSE, - MUIA_Text_Contents, "0x00", - End, + Child, Label(_(MSG_CLASS)), + Child, _Class = TextObject, + TextFrame, + MUIA_Background, MUII_TextBack, + MUIA_Text_SetMax, FALSE, + MUIA_Text_Contents, "0x00", End, - Child, ColGroup(2), - MUIA_Weight, 0, - Child, Label(_(MSG_CLASS)), - Child, _Class = TextObject, - TextFrame, - MUIA_Background, MUII_TextBack, - MUIA_Text_SetMax, FALSE, - MUIA_Text_Contents, "0x00", - End, + Child, Label(_(MSG_SUBCLASS)), + Child, SubClass = TextObject, + TextFrame, + MUIA_Background, MUII_TextBack, + MUIA_Text_SetMax, FALSE, + MUIA_Text_Contents, "0x00", End, - Child, ColGroup(2), - MUIA_Weight, 0, - Child, Label(_(MSG_SUBCLASS)), - Child, SubClass = TextObject, - TextFrame, - MUIA_Background, MUII_TextBack, - MUIA_Text_SetMax, FALSE, - MUIA_Text_Contents, "0x00", - End, + Child, Label(_(MSG_INTERFACE)), + Child, Interface = TextObject, + TextFrame, + MUIA_Background, MUII_TextBack, + MUIA_Text_SetMax, FALSE, + MUIA_Text_Contents, "0x00", End, - Child, ColGroup(2), - Child, Label(_(MSG_IRQ)), - Child, IRQLine = TextObject, - TextFrame, - MUIA_Background, MUII_TextBack, - MUIA_Text_SetMax, FALSE, - MUIA_Text_Contents, "15", - End, + Child, Label(_(MSG_ROM_BASE)), + Child, ROMBase = TextObject, + TextFrame, + MUIA_Background, MUII_TextBack, + MUIA_Text_SetMax, FALSE, + MUIA_Text_Contents, "0x00000000", End, - End, - Child, HGroup, - Child, ColGroup(2), - MUIA_Weight, 0, - Child, Label(_(MSG_ROM_BASE)), - Child, ROMBase = TextObject, - TextFrame, - MUIA_Background, MUII_TextBack, - MUIA_Text_SetMax, FALSE, - MUIA_Text_Contents, "0x00000000", - End, + Child, Label(_(MSG_ROM_SIZE)), + Child, ROMSize = TextObject, + TextFrame, + MUIA_Background, MUII_TextBack, + MUIA_Text_SetMax, FALSE, + MUIA_Text_Contents, "0x00000000", End, - Child, ColGroup(2), - MUIA_Weight, 0, - Child, Label(_(MSG_ROM_SIZE)), - Child, ROMSize = TextObject, - TextFrame, - MUIA_Background, MUII_TextBack, - MUIA_Text_SetMax, FALSE, - MUIA_Text_Contents, "0x00000000", - End, + Child, Label(_(MSG_IRQ)), + Child, IRQLine = TextObject, + TextFrame, + MUIA_Background, MUII_TextBack, + MUIA_Text_SetMax, FALSE, + MUIA_Text_Contents, "15", End, - Child, HVSpace, End, Child, HGroup, Child, RangeList = ListviewObject, -- 2.11.4.GIT