archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Added the svn revision number to the splash screen (when buildinfo is

Browse Source 
enabled). Also fixed cmake so buildinfo works.


Note to all:
** Please mention the revision number when making a bug report **
This commit is contained in:
Matt Ebb
2010-01-08 05:51:51 +00:00
parent 59a8c295c6
commit ce538a0694
4 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/CMakeLists.txt
View File

@@ -89,10 +89,9 @@ IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC})
ENDIF(WIN32)
# TODO buildinfo
IF(BF_BUILDINFO)
IF(WITH_BUILDINFO)
ADD_DEFINITIONS(-DNAN_BUILDINFO)
ENDIF(BF_BUILDINFO)
ENDIF(WITH_BUILDINFO)
BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")

5
source/blender/editors/screen/CMakeLists.txt
View File

@@ -70,10 +70,9 @@ IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC})
ENDIF(WIN32)
# TODO buildinfo
IF(BF_BUILDINFO)
IF(WITH_BUILDINFO)
ADD_DEFINITIONS(-DNAN_BUILDINFO)
ENDIF(BF_BUILDINFO)
ENDIF(WITH_BUILDINFO)
BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")

5
source/blender/windowmanager/CMakeLists.txt
View File

@@ -81,9 +81,8 @@ IF(WITH_COCOA)
LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
ENDIF(WITH_COCOA)
# TODO buildinfo
IF(BF_BUILDINFO)
IF(WITH_BUILDINFO)
ADD_DEFINITIONS(-DNAN_BUILDINFO)
ENDIF(BF_BUILDINFO)
ENDIF(WITH_BUILDINFO)
BLENDERLIB_NOLIST(bf_windowmanager "${SRC}" "${INC}")

35
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -42,6 +42,8 @@
#include "MEM_guardedalloc.h"
#include "BLF_api.h"
#include "PIL_time.h"
#include "BLI_blenlib.h"
@@ -932,7 +934,35 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *arg_unuse
uiLayout *layout, *split, *col;
uiStyle *style= U.uistyles.first;
struct RecentFile *recent;
int i;
int i, ver_width, rev_width;
char *version_str = NULL;
char *revision_str = NULL;
#ifdef NAN_BUILDINFO
char version_buf[128];
char revision_buf[128];
extern char * build_rev;
char *cp;
version_str = &version_buf[0];
revision_str = &revision_buf[0];
sprintf(version_str, "%d.%02d.%d", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
sprintf(revision_str, "r%s", build_rev);
/* here on my system I get ugly double quotes around the revision number.
* if so, clip it off: */
cp = strchr(revision_str, '"');
if (cp) {
memmove(cp, cp+1, strlen(cp+1));
cp = strchr(revision_str, '"');
if (cp)
*cp = 0;
}
ver_width = BLF_width(version_str);
rev_width = BLF_width(revision_str)-7;
#endif NAN_BUILDINFO
block= uiBeginBlock(C, ar, "_popup", UI_EMBOSS);
uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN|UI_BLOCK_RET_1);
@@ -940,6 +970,9 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *arg_unuse
but= uiDefBut(block, BUT_IMAGE, 0, "", 0, 10, 501, 282, NULL, 0.0, 0.0, 0, 0, "");
uiButSetFunc(but, wm_block_splash_close, block, NULL);
uiDefBut(block, LABEL, 0, version_str, 500-ver_width, 282-24, ver_width, 20, NULL, 0, 0, 0, 0, NULL);
uiDefBut(block, LABEL, 0, revision_str, 500-rev_width, 282-36, rev_width, 20, NULL, 0, 0, 0, 0, NULL);
uiBlockSetEmboss(block, UI_EMBOSSP);
layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_MENU, 10, 10, 480, 110, style);