From: <mrj...@us...> - 2008-03-26 04:22:41
|
Revision: 2635 http://tora.svn.sourceforge.net/tora/?rev=2635&view=rev Author: mrjohnson0 Date: 2008-03-25 21:22:42 -0700 (Tue, 25 Mar 2008) Log Message: ----------- set the window title "Untitled" for new docs Modified Paths: -------------- trunk/tora/src/totool.cpp trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/totool.cpp =================================================================== --- trunk/tora/src/totool.cpp 2008-03-26 03:53:32 UTC (rev 2634) +++ trunk/tora/src/totool.cpp 2008-03-26 04:22:42 UTC (rev 2635) @@ -237,7 +237,7 @@ if (icon) newWin->setWindowIcon(*icon); toToolWidget *tool = dynamic_cast<toToolWidget *>(newWin); - if (tool) + if(tool && tool->windowTitle().isEmpty()) toToolCaption(tool, name()); newWin->show(); Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-03-26 03:53:32 UTC (rev 2634) +++ trunk/tora/src/toworksheet.cpp 2008-03-26 04:22:42 UTC (rev 2635) @@ -577,6 +577,8 @@ list.append(1); list.append(0); EditSplitter->setSizes(list); + + setCaption(); } toWorksheet::toWorksheet(QWidget *main, toConnection &connection, bool autoLoad) @@ -1810,13 +1812,18 @@ void toWorksheet::setCaption(void) { QString name = WorksheetTool.name(); - if (! Editor->filename().isEmpty()) { + + QString filename; + if(!Editor->filename().isNull() && !Editor->filename().isEmpty()) { QFileInfo file(Editor->filename()); - name += (Editor->isModified() ? - QString(" *") : - QString(" ")) + - file.fileName(); + filename = file.fileName(); } + else + filename = "Untitled"; + + name += (Editor->isModified() ? + QString(" - *") : + QString(" - ")) + filename; toToolCaption(this, name); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |