onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-22 11:17:31 +01:00
Code Issues Releases Wiki Activity

* FWWindow.cpp (loadFile): fixed #1612 "File/Open should create

Browse Source 
new project panel". If user has some unsaved changes in the
default project panel (the one with no associated file) and then
uses File/Open menu to open another data file, the file should
open in a new project panel.
This commit is contained in:
Vadim Kurland 2010-07-21 23:40:35 +00:00
parent d870730db2
commit b48d84e6ab
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 3124
#define BUILD_NUM 3125

8
doc/ChangeLog
View File

@ -1,3 +1,11 @@
2010-07-21 Vadim Kurland <vadim@vk.crocodile.org>
* FWWindow.cpp (loadFile): fixed #1612 "File/Open should create
new project panel". If user has some unsaved changes in the
default project panel (the one with no associated file) and then
uses File/Open menu to open another data file, the file should
open in a new project panel.
2010-07-20 Vadim Kurland <vadim@vk.crocodile.org>
* FWWindow.cpp (FWWindow::showEvent): default main window geometry

8
src/gui/FWWindow.cpp
View File

@ -683,9 +683,13 @@ bool FWWindow::loadFile(const QString &file_name, bool load_rcs_head)
// if the only project panel window that we have shows
// default object tree (i.e. its filename is empty), then load file
// into. Otherwise create new project window.
if (activeProject() && activeProject()->getFileName().isEmpty())
//
// However if the only project panel has default tree with unsaved
// changes then we open new project window.
proj = activeProject();
if (proj && proj->getFileName().isEmpty() && !proj->db()->isDirty())
{
proj = activeProject();
if (!proj->loadFile(file_name, load_rcs_head)) return false;
} else
{