Changed: #1307 Fixing a bug with the extraction options
This commit is contained in:
parent
501d2f9b90
commit
c9edb0d4b3
4 changed files with 7 additions and 7 deletions
|
@ -243,7 +243,7 @@ void CEditorWorksheet::worksheetEditorChanged(QTableWidgetItem * item)
|
|||
{
|
||||
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())
|
||||
|
|
|
@ -80,11 +80,11 @@ public:
|
|||
|
||||
void redo()
|
||||
{
|
||||
m_item->setText(m_ccontent);
|
||||
//m_item->setText(m_ccontent);
|
||||
}
|
||||
void undo()
|
||||
{
|
||||
m_item->setText(m_ocontent);
|
||||
//m_item->setText(m_ocontent);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -34,7 +34,6 @@ namespace Plugin {
|
|||
bool CSheetWordListBuilder::buildWordList(std::vector<string> &allWords, string workSheetFileName)
|
||||
{
|
||||
SheetExt= toLower(SheetExt);
|
||||
nlinfo("aaaa");
|
||||
// verify the directory is correct
|
||||
if(!CFile::isDirectory(SheetPath))
|
||||
{
|
||||
|
|
|
@ -483,7 +483,7 @@ CEditor *CMainWindow::getEditorByWindowFilePath(const QString &fileName)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
CEditorWorksheet *CMainWindow::getEditorByWorksheetType(const QString &type = NULL)
|
||||
CEditorWorksheet *CMainWindow::getEditorByWorksheetType(const QString &type)
|
||||
{
|
||||
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")
|
||||
{
|
||||
CEditorWorksheet *editor = qobject_cast<CEditorWorksheet *>(currentEditor);
|
||||
if(!type.isNull())
|
||||
if(type != NULL) {
|
||||
if(editor->isSheetTable(type))
|
||||
{
|
||||
return editor;
|
||||
}
|
||||
else
|
||||
} else {
|
||||
if(editor->isBotNamesTable())
|
||||
{
|
||||
return editor;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue