Revision: 18956
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18956
Author: ton
Date: 2009-02-13 14:33:01 +0100 (Fri, 13 Feb 2009)
Log Message:
-----------
2.5
feature restored: window title shows file name,
if saved/loaded.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c
branches/blender2.5/blender/source/blender/windowmanager/wm_window.h
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
2009-02-13 13:04:48 UTC (rev 18955)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
2009-02-13 13:33:01 UTC (rev 18956)
@@ -318,8 +318,6 @@
/* free G.main Main database */
clear_global();
- if(mode!='u') G.save_over = 1;
-
G.main= bfd->main;
CTX_data_main_set(C, G.main);
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
2009-02-13 13:04:48 UTC (rev 18955)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
2009-02-13 13:33:01 UTC (rev 18956)
@@ -93,6 +93,7 @@
#include "WM_api.h"
#include "WM_types.h"
#include "wm.h"
+#include "wm_window.h"
/***/
@@ -521,6 +522,7 @@
wm_window_match_init(C, &wmbase);
retval= BKE_read_file(C, name, NULL, reports);
+ G.save_over = 1;
/* match the read WM with current WM */
wm_window_match_do(C, &wmbase);
@@ -865,10 +867,9 @@
G.relbase_valid = 1;
strcpy(G.main->name, di); /* is guaranteed current file */
-// XXX mainwindow_set_filename_to_title(G.main->name);
-
G.save_over = 1;
-
+ wm_window_titles(CTX_wm_manager(C));
+
writeBlog();
}
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c
2009-02-13 13:04:48 UTC (rev 18955)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c
2009-02-13 13:33:01 UTC (rev 18956)
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include "DNA_listBase.h"
#include "DNA_screen_types.h"
@@ -180,6 +181,21 @@
WM_exit(C);
}
+void wm_window_titles(wmWindowManager *wm)
+{
+ if(G.save_over) {
+ wmWindow *win;
+ char *str= MEM_mallocN(strlen(G.sce) + 16, "title");
+
+ sprintf(str, "Blender [%s]", G.sce);
+
+ for(win= wm->windows.first; win; win= win->next)
+ GHOST_SetTitle(win->ghostwin, str);
+
+ MEM_freeN(str);
+ }
+}
+
/* belongs to below */
static void wm_window_add_ghostwindow(wmWindowManager *wm, char *title,
wmWindow *win)
{
@@ -267,15 +283,16 @@
if(win->eventstate==NULL)
win->eventstate= MEM_callocN(sizeof(wmEvent), "window event
state");
-
/* add keymap handlers (1 handler for all keys in map!) */
keymap= WM_keymap_listbase(wm, "Window", 0, 0);
WM_event_add_keymap_handler(&win->handlers, keymap);
keymap= WM_keymap_listbase(wm, "Screen", 0, 0);
WM_event_add_keymap_handler(&win->handlers, keymap);
-
}
+
+ wm_window_titles(wm);
+
}
/* new window, no screen yet, but we open ghostwindow for it */
@@ -632,11 +649,6 @@
/* ************************************ */
-void wm_window_set_title(wmWindow *win, char *title)
-{
- GHOST_SetTitle(win->ghostwin, title);
-}
-
void wm_window_get_position(wmWindow *win, int *posx_r, int *posy_r)
{
*posx_r= win->posx;
Modified: branches/blender2.5/blender/source/blender/windowmanager/wm_window.h
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/wm_window.h
2009-02-13 13:04:48 UTC (rev 18955)
+++ branches/blender2.5/blender/source/blender/windowmanager/wm_window.h
2009-02-13 13:33:01 UTC (rev 18956)
@@ -36,6 +36,8 @@
wmWindow *wm_window_new (bContext *C);
void wm_window_free (bContext *C, wmWindow *win);
+
+void wm_window_titles (wmWindowManager *wm);
void wm_window_add_ghostwindows (wmWindowManager *wm);
void wm_window_process_events (const bContext *C);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
