diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 25291b87..d6a4012e 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -243,7 +243,7 @@ void UBBoardPaletteManager::setupPalettes() mStylusPalette->stackUnder(mZoomPalette); - mTipPalette = new UBStartupHintsPalette(mContainer); + //mTipPalette = new UBStartupHintsPalette(mContainer); QList backgroundsActions; backgroundsActions << UBApplication::mainWindow->actionPlainLightBackground; diff --git a/src/gui/UBDocumentTreeWidget.cpp b/src/gui/UBDocumentTreeWidget.cpp index 749878b8..7254a68f 100644 --- a/src/gui/UBDocumentTreeWidget.cpp +++ b/src/gui/UBDocumentTreeWidget.cpp @@ -261,7 +261,7 @@ void UBDocumentTreeWidget::dropEvent(QDropEvent *event) UBDocumentProxyTreeItem* pi = dynamic_cast(ti); if (pi) { - if (mSelectedProxyTi->proxy()->metaData(UBSettings::documentUpdatedAt).toString() >= pi->proxy()->metaData(UBSettings::documentUpdatedAt).toString()) + if (mSelectedProxyTi->proxy()->metaData(UBSettings::documentDate).toString() >= pi->proxy()->metaData(UBSettings::documentDate).toString()) { break; } @@ -380,7 +380,7 @@ void UBDocumentTreeWidget::documentUpdated(UBDocumentProxy *pDocument) UBDocumentProxyTreeItem* pi = dynamic_cast(ti); if (pi) { - if (pDocument->metaData(UBSettings::documentUpdatedAt).toString() >= pi->proxy()->metaData(UBSettings::documentUpdatedAt).toString()) + if (pDocument->metaData(UBSettings::documentDate).toString() >= pi->proxy()->metaData(UBSettings::documentDate).toString()) { bool selected = treeItem->isSelected(); parent->removeChild(treeItem); @@ -416,7 +416,7 @@ UBDocumentProxyTreeItem::UBDocumentProxyTreeItem(QTreeWidgetItem * parent, UBDoc UBDocumentProxyTreeItem* pi = dynamic_cast(ti); if (pi) { - if (proxy->metaData(UBSettings::documentUpdatedAt).toString() >= pi->proxy()->metaData(UBSettings::documentUpdatedAt).toString()) + if (proxy->metaData(UBSettings::documentDate).toString() >= pi->proxy()->metaData(UBSettings::documentDate).toString()) { break; }