summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5f1fd16)
In OS3.9 and others a different font is used which screws up the layout
for the PiStorm GUI gadgets. We now fix this to Topaz 8 so that it is
the same as other Amiga OS versions.
Also fix Disk.info to show all files and rebuild the hdf.
extern unsigned int pistorm_base_addr;
struct ReqToolsBase *ReqToolsBase;
extern unsigned int pistorm_base_addr;
struct ReqToolsBase *ReqToolsBase;
-#define VERSION "v0.3.3"
+#define VERSION "v0.3.4"
#define button1w 54
#define button1h 11
#define button1w 54
#define button1h 11
#define statusbarw 507
#define statusbarh 10
#define statusbarw 507
#define statusbarh 10
+struct TextAttr font =
+{
+ "topaz.font",
+ 8,
+ FS_NORMAL,
+ 0
+};
+
SHORT SharedBordersPairs0[] =
{
0, 0, 0, button1h - 1, 1, button1h - 2, 1, 0, button1w - 2, 0
SHORT SharedBordersPairs0[] =
{
0, 0, 0, button1h - 1, 1, button1h - 2, 1, 0, button1w - 2, 0
struct IntuiText KickstartCommit_text =
{
struct IntuiText KickstartCommit_text =
{
- 1, 0, JAM2, 2, 2, NULL, (UBYTE *)"Commit", NULL
+ 1, 0, JAM2, 2, 2, &font, (UBYTE *)"Commit", NULL
};
#define GADKICKSTARTCOMMIT 14
};
#define GADKICKSTARTCOMMIT 14
struct IntuiText KickstartFile_text =
{
struct IntuiText KickstartFile_text =
{
- 1, 0, JAM2, 0, -10, NULL, "Kickstart file:", NULL
+ 1, 0, JAM2, 0, -10, &font, "Kickstart file:", NULL
};
#define GADKICKSTARTFILE 13
};
#define GADKICKSTARTFILE 13
struct IntuiText ShutdownButton_text =
{
struct IntuiText ShutdownButton_text =
{
- 1, 0, JAM2, 2, 2, NULL, (UBYTE *)"Shutdown Pi", NULL
+ 1, 0, JAM2, 2, 2, &font, (UBYTE *)"Shutdown Pi", NULL
};
#define GADSHUTDOWN 12
};
#define GADSHUTDOWN 12
struct IntuiText Destination_text[] =
{
struct IntuiText Destination_text[] =
{
- 1, 0, JAM2, -98, 1, NULL, "Destination:", &Destination_text[1],
- 1, 0, JAM2, 1, 1, NULL, DestinationValue_buf, NULL,
+ 1, 0, JAM2, -98, 1, &font, "Destination:", &Destination_text[1],
+ 1, 0, JAM2, 1, 1, &font, DestinationValue_buf, NULL,
};
#define GADGETDESTINATION 11
};
#define GADGETDESTINATION 11
struct IntuiText RebootButton_text =
{
struct IntuiText RebootButton_text =
{
- 1, 0, JAM2, 2, 2, NULL, (UBYTE *)"Reboot", NULL
+ 1, 0, JAM2, 2, 2, &font, (UBYTE *)"Reboot", NULL
struct IntuiText StatusBar_text =
{
struct IntuiText StatusBar_text =
{
- 1, 0, JAM2, 4, 2, NULL, (UBYTE *)StatusBar_buf, NULL
+ 1, 0, JAM2, 4, 2, &font, (UBYTE *)StatusBar_buf, NULL
};
#define GADSTATUSBAR 9
};
#define GADSTATUSBAR 9
struct IntuiText RetrieveButton_text =
{
struct IntuiText RetrieveButton_text =
{
- 1, 0, JAM2, 10, 2, NULL, (UBYTE *)"Retrieve", NULL
+ 1, 0, JAM2, 10, 2, &font, (UBYTE *)"Retrieve", NULL
};
#define GADRETRIEVEBUTTON 8
};
#define GADRETRIEVEBUTTON 8
struct IntuiText GetFile_text[] =
{
struct IntuiText GetFile_text[] =
{
- 1, 0, JAM2, -98, -10, NULL, "Get file from PiStorm:", &GetFile_text[1],
- 1, 0, JAM2, -59, 1, NULL, "Source:", NULL,
+ 1, 0, JAM2, -98, -10, &font, "Get file from PiStorm:", &GetFile_text[1],
+ 1, 0, JAM2, -59, 1, &font, "Source:", NULL,
struct IntuiText ConfigDefault_text =
{
struct IntuiText ConfigDefault_text =
{
- 1, 0, JAM2, 2, 2, NULL, (UBYTE *)"Load Default", NULL
+ 1, 0, JAM2, 2, 2, &font, (UBYTE *)"Load Default", NULL
};
#define GADCONFIGDEFAULT 6
};
#define GADCONFIGDEFAULT 6
struct IntuiText ConfigCommit_text =
{
struct IntuiText ConfigCommit_text =
{
- 1, 0, JAM2, 2, 2, NULL, (UBYTE *)"Commit", NULL
+ 1, 0, JAM2, 2, 2, &font, (UBYTE *)"Commit", NULL
};
#define GADCONFIGCOMMIT 5
};
#define GADCONFIGCOMMIT 5
struct IntuiText ConfigFile_text =
{
struct IntuiText ConfigFile_text =
{
- 1, 0, JAM2, 0, -10, NULL, "Config file:", NULL
+ 1, 0, JAM2, 0, -10, &font, "Config file:", NULL
};
#define GADCONFIGFILE 4
};
#define GADCONFIGFILE 4
struct IntuiText RTGStatus_text =
{
struct IntuiText RTGStatus_text =
{
- 1, 0, JAM2, 1, 1, NULL, (UBYTE *)RTGStatus_buf, NULL
+ 1, 0, JAM2, 1, 1, &font, (UBYTE *)RTGStatus_buf, NULL
};
#define GADRTGSTATUS 3
struct Gadget RTGStatus =
{
};
#define GADRTGSTATUS 3
struct Gadget RTGStatus =
{
- &ConfigFile, 10, 15, tbox1w, tbox1h,
+ &ConfigFile, 10, 20, tbox1w, tbox1h,
GADGHIMAGE,
0,
BOOLGADGET,
GADGHIMAGE,
0,
BOOLGADGET,
struct IntuiText RTG_text =
{
struct IntuiText RTG_text =
{
- 1, 0, JAM2, 8, 2, NULL, (UBYTE *)RTG_buf, NULL
+ 1, 0, JAM2, 8, 2, &font, (UBYTE *)RTG_buf, NULL
};
#define GADRTGBUTTON 2
struct Gadget RTGButton =
{
};
#define GADRTGBUTTON 2
struct Gadget RTGButton =
{
- &RTGStatus, 144, 14, button3w, button3h,
+ &RTGStatus, 144, 19, button3w, button3h,
GADGHIMAGE,
RELVERIFY,
BOOLGADGET,
GADGHIMAGE,
RELVERIFY,
BOOLGADGET,
struct IntuiText AboutButton_text =
{
struct IntuiText AboutButton_text =
{
- 1, 0, JAM2, 8, 2, NULL, (UBYTE *)"About", NULL
+ 1, 0, JAM2, 8, 2, &font, (UBYTE *)"About", NULL
struct IntuiText QuitButton_text =
{
struct IntuiText QuitButton_text =
{
- 1, 0, JAM2, 12, 2, NULL, (UBYTE *)"Quit", NULL
+ 1, 0, JAM2, 12, 2, &font, (UBYTE *)"Quit", NULL
static struct IntuiText pos;
struct IntuiText msg[] =
{
static struct IntuiText pos;
struct IntuiText msg[] =
{
- 1, 0, JAM2, 0, 0, NULL, "You need reqtools.library V38 or higher!.", &msg[1],
- 1, 0, JAM2, 0, 10, NULL, "Please install it in your Libs: drirectory.", NULL,
+ 1, 0, JAM2, 0, 0, &font, "You need reqtools.library V38 or higher!.", &msg[1],
+ 1, 0, JAM2, 0, 10, &font, "Please install it in your Libs: drirectory.", NULL,
};
AutoRequest(NULL, msg, NULL, &pos, 0, 0, 0, 0);
return RETURN_FAIL;
};
AutoRequest(NULL, msg, NULL, &pos, 0, 0, 0, 0);
return RETURN_FAIL;