From 7ca82a1e156d5ff60ac474b426a84fd1fd81ea7c Mon Sep 17 00:00:00 2001 From: Ivan Ilin Date: Fri, 30 Sep 2011 13:21:12 +0300 Subject: [PATCH] protractor symbol fixed --- src/board/UBLibraryController.cpp | 1 - src/domain/UBGraphicsAudioItemDelegate.cpp | 30 ++++++------------ src/domain/UBGraphicsVideoItemDelegate.cpp | 37 +++++++--------------- src/frameworks/UBPlatformUtils_linux.cpp | 1 - src/gui/UBKeyboardPalette.cpp | 10 +++--- src/tools/UBGraphicsProtractor.cpp | 2 +- 6 files changed, 26 insertions(+), 55 deletions(-) diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index 9a7e1c9c..1a4a42a1 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -91,7 +91,6 @@ void UBLibraryController::createInternalWidgetItems() mInternalLibElements << newTool; } - } void UBLibraryController::createNewFolder(QString name, UBLibElement *parentElem) diff --git a/src/domain/UBGraphicsAudioItemDelegate.cpp b/src/domain/UBGraphicsAudioItemDelegate.cpp index 461a0445..93c9fd60 100644 --- a/src/domain/UBGraphicsAudioItemDelegate.cpp +++ b/src/domain/UBGraphicsAudioItemDelegate.cpp @@ -66,39 +66,27 @@ void UBGraphicsAudioItemDelegate::togglePlayPause() { Phonon::MediaObject* media = mDelegated->mediaObject(); - if ( media->state() == Phonon::StoppedState ) - { + if ( media->state() == Phonon::StoppedState ) { media->play(); - } - else if ( media->state() == Phonon::PlayingState ) - { - if ( media->remainingTime() <= 0 ) - { + } else if ( media->state() == Phonon::PlayingState ) { + if ( media->remainingTime() <= 0 ) { media->stop(); media->play(); - } - else - { + } else { media->pause(); if ( mDelegated->scene() ) mDelegated->scene()->setModified ( true ); } - } - else if ( media->state() == Phonon::PausedState ) - { - if ( media->remainingTime() <= 0 ) - { + } else if ( media->state() == Phonon::PausedState ) { + if ( media->remainingTime() <= 0 ) { media->stop(); } - media->play(); - } - else if ( media->state() == Phonon::LoadingState ){ + } else if ( media->state() == Phonon::LoadingState ) { mDelegated->mediaObject()->setCurrentSource(mDelegated->mediaFileUrl()); media->play(); - } - else{ - qDebug() << "Media state "<< media->state() << " not supported"; + } else if (media->state() == Phonon::ErrorState){ + qDebug() << "Error appeared." << media->errorString(); } } } diff --git a/src/domain/UBGraphicsVideoItemDelegate.cpp b/src/domain/UBGraphicsVideoItemDelegate.cpp index a3d340e0..429194b0 100644 --- a/src/domain/UBGraphicsVideoItemDelegate.cpp +++ b/src/domain/UBGraphicsVideoItemDelegate.cpp @@ -145,48 +145,34 @@ UBGraphicsVideoItem* UBGraphicsVideoItemDelegate::delegated() void UBGraphicsVideoItemDelegate::togglePlayPause() { - if (delegated() && delegated()->mediaObject()) - { - Phonon::MediaObject* media = delegated()->mediaObject(); + if (delegated() && delegated()->mediaObject()) { - if (media->state() == Phonon::StoppedState) - { + Phonon::MediaObject* media = delegated()->mediaObject(); + if (media->state() == Phonon::StoppedState) { media->play(); - } - else if (media->state() == Phonon::PlayingState) - { - if (media->remainingTime() <= 0) - { + } else if (media->state() == Phonon::PlayingState) { + if (media->remainingTime() <= 0) { media->stop(); media->play(); - } - else - { + } else { media->pause(); if(delegated()->scene()) delegated()->scene()->setModified(true); } - } - else if (media->state() == Phonon::PausedState) - { - if (media->remainingTime() <= 0) - { + } else if (media->state() == Phonon::PausedState) { + if (media->remainingTime() <= 0) { media->stop(); } - media->play(); - } - else if ( media->state() == Phonon::LoadingState ){ + } else if ( media->state() == Phonon::LoadingState ) { delegated()->mediaObject()->setCurrentSource(delegated()->mediaFileUrl()); media->play(); - } - else{ - qDebug() << "Media state "<< media->state() << " not supported"; + } else if (media->state() == Phonon::ErrorState){ + qDebug() << "Error appeared." << media->errorString(); } } } - void UBGraphicsVideoItemDelegate::mediaStateChanged ( Phonon::State newstate, Phonon::State oldstate ) { Q_UNUSED(newstate); @@ -338,7 +324,6 @@ void DelegateVideoControl::seekToMousePos(QPointF mousePos) } } - void DelegateVideoControl::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { mDisplayCurrentTime = false; diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp index a3fb372c..e9bb2d90 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp @@ -26,7 +26,6 @@ void UBPlatformUtils::init() initializeKeyboardLayouts(); } - QString UBPlatformUtils::applicationResourcesDirectory() { return QApplication::applicationDirPath(); diff --git a/src/gui/UBKeyboardPalette.cpp b/src/gui/UBKeyboardPalette.cpp index 14a647a9..cf4f3b85 100644 --- a/src/gui/UBKeyboardPalette.cpp +++ b/src/gui/UBKeyboardPalette.cpp @@ -86,7 +86,7 @@ UBKeyboardPalette* UBKeyboardPalette::create(QWidget *parent) instance->move(firstKeyboard->m_pos); connect(UBSettings::settings()->boardKeyboardPaletteKeyBtnSize, SIGNAL(changed(QVariant)), instance, SLOT(keyboardPaletteButtonSizeChanged(QVariant))); - connect(UBApplication::mainWindow->actionVirtualKeyboard, SIGNAL(triggered(bool)), instance, SLOT(showKeyboard(bool))); + connect(UBApplication::mainWindow->actionVirtualKeyboard, SIGNAL(triggered(bool)), instance, SLOT(showKeyboard(bool))); // connect(instance, SIGNAL(moved(const QPoint&)), instance, SLOT(syncPosition(const QPoint&))); connect(instance, SIGNAL(closed()), instance, SLOT(hideKeyboard())); @@ -109,10 +109,10 @@ UBKeyboardPalette* UBKeyboardPalette::create(QWidget *parent) return instance; } -void UBKeyboardPalette::showKeyboard(bool show) -{ - m_isVisible = show; -} +void UBKeyboardPalette::showKeyboard(bool show) +{ + m_isVisible = show; +} void UBKeyboardPalette::hideKeyboard() diff --git a/src/tools/UBGraphicsProtractor.cpp b/src/tools/UBGraphicsProtractor.cpp index b75c2689..43a84af1 100644 --- a/src/tools/UBGraphicsProtractor.cpp +++ b/src/tools/UBGraphicsProtractor.cpp @@ -508,7 +508,7 @@ void UBGraphicsProtractor::paintAngleMarker(QPainter *painter) if (angle != 0) { - QString ang = QString("%1?°").arg(angle,0, 'f', 1); + QString ang = QString("%1°").arg(angle,0, 'f', 1); QFont font2 = painter->font(); font2.setBold(true); QFontMetricsF fm2(font2);