Commit c622c389 authored by Clément Fauconnier's avatar Clément Fauconnier

fixed shortcut issue and focus error on OSX

parent 5f27f424
......@@ -1924,7 +1924,7 @@ void UBDocumentController::setupViews()
}
}
#ifdef Q_WS_MAC
#ifdef Q_OS_OSX
mMainWindow->actionDelete->setShortcut(QKeySequence(Qt::Key_Backspace));
#endif
......@@ -3019,10 +3019,12 @@ void UBDocumentController::focusChanged(QWidget *old, QWidget *current)
if (current == mDocumentUI->thumbnailWidget)
{
if (mDocumentUI->thumbnailWidget->selectedItems().count() > 0)
mSelectionType = Page;
else
mSelectionType = None;
/*
if (mDocumentUI->thumbnailWidget->selectedItems().count() > 0)
mSelectionType = Page;
else
mSelectionType = None;
*/
}
else if (current == mDocumentUI->documentTreeView)
{
......@@ -3080,6 +3082,10 @@ void UBDocumentController::updateActions()
}
//N/C - NNE - 20140408 : END
#ifdef Q_OS_OSX
mMainWindow->actionDelete->setShortcut(QKeySequence(Qt::Key_Backspace));
#endif
QModelIndex selectedIndex = firstSelectedTreeIndex();
UBDocumentProxy *selectedProxy = docModel->proxyData(selectedIndex);
int pageCount = -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment