Merge branch 'master' of github.com:Sankore/Sankore-3.1

preferencesAboutTextFull
Claudio Valerio 12 years ago
commit e21c3d4a99
  1. 6
      src/board/UBBoardPaletteManager.cpp
  2. 2
      src/board/UBFeaturesController.cpp
  3. 1
      src/gui/UBFeaturesWidget.cpp

@ -704,6 +704,7 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mAddItemPalette->setParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
mLeftPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
mRightPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
mStylusPalette->raise();
// Maybe threre is a reason to keep that functions but with them right palette in desktop mode is not interactable
// mRightPalette->lower();
// mLeftPalette->lower();
@ -724,7 +725,12 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mKeyboardPalette->show();
}
else
// In linux keyboard in desktop mode have to allways be with null parent
#ifdef Q_WS_X11
mKeyboardPalette->setParent(0);
#else
mKeyboardPalette->setParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
#endif //Q_WS_X11
#ifdef Q_WS_MAC
mKeyboardPalette->setWindowFlags(Qt::Dialog | Qt::Popup | Qt::FramelessWindowHint);
#endif

@ -160,7 +160,7 @@ void UBFeaturesComputingThread::run()
emit scanFinished();
mMutex.lock();
if (!restart) {
if (!abort) {
mWaitCondition.wait(&mMutex);
}
restart = false;

@ -1395,6 +1395,7 @@ QString UBFeaturesItemDelegate::displayText ( const QVariant & value, const QLoc
Q_UNUSED(locale)
QString text = value.toString();
text = text.replace(".wgt", "");
if (listView)
{
const QFontMetrics fm = listView->fontMetrics();

Loading…
Cancel
Save