Sankore-655 little fixes

preferencesAboutTextFull
Ilia Ryabokon 12 years ago
parent bcdd655b78
commit 4c1e1ee95c
  1. 6
      src/board/UBBoardPaletteManager.cpp
  2. 3
      src/gui/UBFeaturesWidget.cpp
  3. 2
      src/gui/gui.pri

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

@ -1395,6 +1395,7 @@ QString UBFeaturesItemDelegate::displayText ( const QVariant & value, const QLoc
Q_UNUSED(locale) Q_UNUSED(locale)
QString text = value.toString(); QString text = value.toString();
text = text.replace(".wgt", "");
if (listView) if (listView)
{ {
const QFontMetrics fm = listView->fontMetrics(); const QFontMetrics fm = listView->fontMetrics();
@ -1423,7 +1424,7 @@ void UBFeaturesPathItemDelegate::paint( QPainter *painter, const QStyleOptionVie
QRect rect = option.rect; QRect rect = option.rect;
if ( !feature.getFullPath().isEmpty() ) if ( !feature.getFullPath().isEmpty() )
{ {
painter->drawPixmap( rect.left() - 10, rect.center().y() - 5, *arrowPixmap ); painter->drawPixmap( rect.left() - 10, rect.center().y() - 5, *arrowPixmap );
} }
painter->drawImage( rect.left() + 5, rect.center().y() - 5, feature.getThumbnail().scaledToHeight( 30, Qt::SmoothTransformation ) ); painter->drawImage( rect.left() + 5, rect.center().y() - 5, feature.getThumbnail().scaledToHeight( 30, Qt::SmoothTransformation ) );
} }

@ -35,10 +35,8 @@ HEADERS += src/gui/UBThumbnailView.h \
src/gui/UBLeftPalette.h \ src/gui/UBLeftPalette.h \
src/gui/UBRightPalette.h \ src/gui/UBRightPalette.h \
src/gui/UBPageNavigationWidget.h \ src/gui/UBPageNavigationWidget.h \
src/gui/UBLibWidget.h \
src/gui/UBMagnifer.h \ src/gui/UBMagnifer.h \
src/gui/UBCachePropertiesWidget.h \ src/gui/UBCachePropertiesWidget.h \
src/gui/UBLibWebView.h \
src/gui/UBDownloadWidget.h \ src/gui/UBDownloadWidget.h \
src/gui/UBDockDownloadWidget.h \ src/gui/UBDockDownloadWidget.h \
src/gui/UBFeaturesWidget.h \ src/gui/UBFeaturesWidget.h \

Loading…
Cancel
Save