mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-23 01:18:46 +00:00
Changed: #1307 Fixing a bug with the extraction options
This commit is contained in:
parent
6d9feeccac
commit
65d3ff8966
4 changed files with 7 additions and 7 deletions
|
@ -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())
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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))
|
||||||
{
|
{
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue