Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1307 Fixing a bug with the extraction options

Browse source
This commit is contained in:
cemycc 2011-07-13 10:39:39 +03:00
parent 6d9feeccac
commit 65d3ff8966
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp
View file

@ -243,7 +243,7 @@ void CEditorWorksheet::worksheetEditorChanged(QTableWidgetItem * item)
{ {
if(temp_content != item->text()) if(temp_content != item->text())
{ {
current_stack->push(new CUndoWorksheetCommand(table_editor, item, temp_content)); //current_stack->push(new CUndoWorksheetCommand(table_editor, item, temp_content));
} }
if(!isWindowModified()) if(!isWindowModified())

4
code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.h
View file

@ -80,11 +80,11 @@ public:
void redo() void redo()
{ {
m_item->setText(m_ccontent); //m_item->setText(m_ccontent);
} }
void undo() void undo()
{ {
m_item->setText(m_ocontent); //m_item->setText(m_ocontent);
} }

1
code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.cpp
View file

@ -34,7 +34,6 @@ namespace Plugin {
bool CSheetWordListBuilder::buildWordList(std::vector<string> &allWords, string workSheetFileName) bool CSheetWordListBuilder::buildWordList(std::vector<string> &allWords, string workSheetFileName)
{ {
SheetExt= toLower(SheetExt); SheetExt= toLower(SheetExt);
nlinfo("aaaa");
// verify the directory is correct // verify the directory is correct
if(!CFile::isDirectory(SheetPath)) if(!CFile::isDirectory(SheetPath))
{ {

7
code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.cpp
View file

@ -483,7 +483,7 @@ CEditor *CMainWindow::getEditorByWindowFilePath(const QString &fileName)
return NULL; return NULL;
} }
CEditorWorksheet *CMainWindow::getEditorByWorksheetType(const QString &type = NULL) CEditorWorksheet *CMainWindow::getEditorByWorksheetType(const QString &type)
{ {
Q_FOREACH(QMdiSubWindow *subWindow, _ui.mdiArea->subWindowList()) Q_FOREACH(QMdiSubWindow *subWindow, _ui.mdiArea->subWindowList())
{ {
@ -491,18 +491,19 @@ CEditorWorksheet *CMainWindow::getEditorByWorksheetType(const QString &type = NU
if(QString(currentEditor->widget()->metaObject()->className()) == "QTableWidget") if(QString(currentEditor->widget()->metaObject()->className()) == "QTableWidget")
{ {
CEditorWorksheet *editor = qobject_cast<CEditorWorksheet *>(currentEditor); CEditorWorksheet *editor = qobject_cast<CEditorWorksheet *>(currentEditor);
if(!type.isNull()) if(type != NULL) {
if(editor->isSheetTable(type)) if(editor->isSheetTable(type))
{ {
return editor; return editor;
} }
else } else {
if(editor->isBotNamesTable()) if(editor->isBotNamesTable())
{ {
return editor; return editor;
} }
} }
} }
}
return NULL; return NULL;
} }