summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xamiga/gui.c33
-rwxr-xr-xamiga/pkg/makereslinks1
-rw-r--r--amiga/resources/splash.pngbin0 -> 29458 bytes
-rw-r--r--amiga/version.c2
4 files changed, 31 insertions, 5 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 9fa5b233d..2aaa5b94a 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -155,6 +155,9 @@ const char tree_content_icon_name[] = "def_project.info";
static struct DrawInfo *dri;
+const char * const versvn;
+const char * const verdate;
+
void ami_update_buttons(struct gui_window_2 *);
void ami_scroller_hook(struct Hook *,Object *,struct IntuiMessage *);
void ami_switch_tab(struct gui_window_2 *gwin,bool redraw);
@@ -3927,20 +3930,22 @@ BOOL ami_gadget_hit(Object *obj, int x, int y)
Object *ami_gui_splash_open(void)
{
- Object *win_obj;
+ Object *win_obj, *bm_obj;
struct Window *win;
struct Screen *wbscreen = LockPubScreen("Workbench");
+ uint32 top = 0, left = 0;
+ STRPTR ver_string;
win_obj = WindowObject,
- WA_Title, "Initialising...",
+ WA_Borderless, TRUE,
WA_ToolBox, TRUE,
WA_BusyPointer, TRUE,
WINDOW_Position, WPOS_CENTERSCREEN,
WINDOW_LockWidth, TRUE,
WINDOW_LockHeight, TRUE,
WINDOW_ParentGroup, LayoutObject,
- LAYOUT_AddImage, BitMapObject,
- BITMAP_SourceFile, "PROGDIR:Resources/netsurf.png",
+ LAYOUT_AddImage, bm_obj = BitMapObject,
+ BITMAP_SourceFile, "PROGDIR:Resources/splash.png",
BITMAP_Screen, wbscreen,
BitMapEnd,
LayoutEnd,
@@ -3948,6 +3953,26 @@ Object *ami_gui_splash_open(void)
win = RA_OpenWindow(win_obj);
+ GetAttrs(bm_obj, IA_Top, &top,
+ IA_Left, &left,
+ TAG_DONE);
+
+ SetDrMd(win->RPort, LEVELS);
+
+ Move(win->RPort, left + 5, top + 20);
+ Text(win->RPort, "Initialising...", strlen("Initialising..."));
+
+#ifdef NDEBUG
+ ver_string = ASPrintf("NetSurf %s", netsurf_version);
+#else
+ ver_string = ASPrintf("NetSurf %s (%s)", versvn, verdate);
+#endif
+
+ Move(win->RPort, left + 185, top + 220);
+ Text(win->RPort, ver_string, strlen(ver_string));
+
+ FreeVec(ver_string);
+
UnlockPubScreen(NULL, wbscreen);
return win_obj;
diff --git a/amiga/pkg/makereslinks b/amiga/pkg/makereslinks
index 528c7d327..bf2d0f738 100755
--- a/amiga/pkg/makereslinks
+++ b/amiga/pkg/makereslinks
@@ -18,5 +18,6 @@ makelink nl /!NetSurf/Resources/nl soft
makelink Pointers /amiga/resources/Pointers soft
makelink quirks.css /!NetSurf/Resources/Quirks,f79 soft
makelink SearchEngines /amiga/resources/SearchEngines soft
+makelink splash.png /amiga/resources/splash.png soft
makelink Themes /amiga/resources/Themes soft
makelink mimetypes /amiga/resources/mimetypes soft
diff --git a/amiga/resources/splash.png b/amiga/resources/splash.png
new file mode 100644
index 000000000..569cb08fa
--- /dev/null
+++ b/amiga/resources/splash.png
Binary files differ
diff --git a/amiga/version.c b/amiga/version.c
index abf96b73f..362155c49 100644
--- a/amiga/version.c
+++ b/amiga/version.c
@@ -21,7 +21,7 @@
#define NETSURF_VERSION_MAJOR "3"
static const __attribute__((used)) char *verstag = "\0$VER: NetSurf " NETSURF_VERSION_MAJOR "." WT_REVID " (" WT_COMPILEDATE ")\0";
-const char * const versvn = "SVN " WT_REVID;
+const char * const versvn = "r" WT_REVID;
const char * const verdate = WT_COMPILEDATE;
const char * const verarexx = NETSURF_VERSION_MAJOR "." WT_REVID;
const char * const wt_revid = WT_REVID;