From 34e778e14e1d820b21f14e2f83e46f79bbfc03d4 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 3 Jan 2012 10:26:00 +0100 Subject: [PATCH 01/99] first draft of 'nouvelle barre du prof' --- src/board/UBBoardPaletteManager.cpp | 10 +- src/gui/UBDockPaletteWidget.cpp | 3 + src/gui/UBDockPaletteWidget.h | 4 + src/gui/UBTeacherBarWidget.cpp | 129 ++++++++++++++++++- src/gui/UBTeacherBarWidget.h | 28 +++++ src/gui/UBVideoPlayer.h | 5 + src/gui/gui.pri | 88 ++++++------- src/podcast/youtube/UBYouTubePublisher.cpp | 2 +- src/web/UBWebController.cpp | 136 +-------------------- src/web/UBWebController.h | 29 +++-- src/web/web.pri | 8 +- 11 files changed, 243 insertions(+), 199 deletions(-) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 483fbbac..eb10433f 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -199,6 +199,10 @@ void UBBoardPaletteManager::setupDockPaletteWidgets() mLeftPalette->registerWidget(mpPageNavigWidget); mLeftPalette->addTab(mpPageNavigWidget); + // The teacher bar widget will always be there + mLeftPalette->registerWidget(mpTeacherBarWidget); + mLeftPalette->addTab(mpTeacherBarWidget); + mLeftPalette->connectSignals(); mRightPalette = new UBRightPalette(mContainer); @@ -207,9 +211,6 @@ void UBBoardPaletteManager::setupDockPaletteWidgets() mRightPalette->addTab(mpLibWidget); // The cache widget will be visible only if a cache is put on the page mRightPalette->registerWidget(mpCachePropWidget); - // The teacher bar widget will always be there - mRightPalette->registerWidget(mpTeacherBarWidget); - mRightPalette->addTab(mpTeacherBarWidget); // The download widget will be part of the right palette but // will become visible only when the first download starts mRightPalette->registerWidget(mpDownloadWidget); @@ -820,9 +821,6 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is } else mKeyboardPalette->setParent(0); - -// mKeyboardPalette->update(); - } } break; diff --git a/src/gui/UBDockPaletteWidget.cpp b/src/gui/UBDockPaletteWidget.cpp index 16bcb322..32dbd286 100644 --- a/src/gui/UBDockPaletteWidget.cpp +++ b/src/gui/UBDockPaletteWidget.cpp @@ -27,6 +27,9 @@ QString UBDockPaletteWidget::name() return mName; } +/** + * When a widget registers a mode it means that it would be displayed on that mode + */ void UBDockPaletteWidget::registerMode(eUBDockPaletteWidgetMode mode) { if(!mRegisteredModes.contains(mode)) diff --git a/src/gui/UBDockPaletteWidget.h b/src/gui/UBDockPaletteWidget.h index fdf50a87..98768253 100644 --- a/src/gui/UBDockPaletteWidget.h +++ b/src/gui/UBDockPaletteWidget.h @@ -5,6 +5,10 @@ #include #include + +/** + * This enum defines the different mode availables. + */ typedef enum { eUBDockPaletteWidget_BOARD, diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 52c21bb2..75033ed9 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -32,6 +32,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpAction1(NULL) , mpAction2(NULL) , mpAction3(NULL) + , mpDropMediaZone(NULL) , mpContainer(NULL) , mpContainerLayout(NULL) { @@ -122,6 +123,10 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpLayout->addWidget(mpAction2); mpLayout->addWidget(mpAction3); + // Media + mpDropMediaZone = new UBTeacherBarDropMediaZone(); + mpLayout->addWidget(mpDropMediaZone); + populateCombos(); connect(UBApplication::boardController, SIGNAL(activeSceneWillChange()), this, SLOT(saveContent())); @@ -142,6 +147,11 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock UBTeacherBarWidget::~UBTeacherBarWidget() { + if(NULL != mpDropMediaZone) + { + delete mpDropMediaZone; + mpDropMediaZone = NULL; + } if(NULL != mpAction3) { delete mpAction3; @@ -356,9 +366,7 @@ UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent mpTeacherLayout = new QHBoxLayout(); - //TODO: I'm not able to translate this string using the normal way *qm file why? mpTeacherLabel = new QLabel(tr("Teacher"), this); -// mpTeacherLabel = new QLabel(tr("Enseignant"), this); mpTeacherLabel->setAlignment(Qt::AlignTop); mpTeacher = new QTextEdit(this); mpTeacher->setObjectName("TeacherStudentBox"); @@ -369,7 +377,6 @@ UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent mpStudentLayout = new QHBoxLayout(); mpStudentLabel = new QLabel(tr("Student"), this); -// mpStudentLabel = new QLabel(tr("Élève"), this); mpStudentLabel->setAlignment(Qt::AlignTop); mpStudent = new QTextEdit(this); mpStudent->setObjectName("TeacherStudentBox"); @@ -452,3 +459,119 @@ QTextEdit* UBTeacherStudentAction::student() { return mpStudent; } + +#include "gui/UBMediaPlayer.h" +#include "gui/UBVideoPlayer.h" +#include "frameworks/UBFileSystemUtils.h" + +UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char *name):QWidget(parent) + , mpTitleLabel(NULL) + , mpImageTab(NULL) + , mpTabWidget(NULL) + , mpLayout(NULL) +{ + setObjectName(name); + setAcceptDrops(true); + + setAttribute(Qt::WA_StyledBackground, true); + setStyleSheet(UBApplication::globalStyleSheet()); + + // Create the GUI + mpLayout = new QVBoxLayout(this); + setLayout(mpLayout); + + + mpImageTab = new QLabel(); + mpVideoTab = new UBMediaPlayer(); + mpAudioTab = new UBMediaPlayer(); + + mpTitleLabel = new QLabel(tr("Drop media here")); + mpLayout->addWidget(mpTitleLabel); + mpTabWidget = new QTabWidget(); + mpTabWidget->setMinimumHeight(200); + mpTabWidget->addTab(mpImageTab,QIcon(":images/toolbar/extraTool.png"),""); + mpTabWidget->addTab(mpVideoTab,QIcon(":images/libpalette/movieIcon.svg"),""); + mpTabWidget->addTab(mpAudioTab,QIcon(":images/libpalette/soundIcon.svg"),""); + mpLayout->addWidget(mpTabWidget); +} + +UBTeacherBarDropMediaZone::~UBTeacherBarDropMediaZone() +{ + if(NULL != mpTitleLabel) + { + delete mpTitleLabel; + mpTitleLabel = NULL; + } + if(NULL != mpImageTab) + { + delete mpImageTab; + mpImageTab = NULL; + } + if(NULL != mpVideoTab) + { + delete mpVideoTab; + mpVideoTab = NULL; + } + if(NULL != mpAudioTab) + { + delete mpAudioTab; + mpAudioTab = NULL; + } + if(NULL != mpTabWidget) + { + delete mpTabWidget; + mpTabWidget = NULL; + } + if(NULL != mpLayout) + { + delete mpLayout; + mpLayout = NULL; + } +} + + +void UBTeacherBarDropMediaZone::dragEnterEvent(QDragEnterEvent *pEvent) +{ + setBackgroundRole(QPalette::Highlight); + pEvent->acceptProposedAction(); +} + +void UBTeacherBarDropMediaZone::dragLeaveEvent(QDragLeaveEvent *pEvent) +{ + setBackgroundRole(QPalette::Dark); + pEvent->accept(); +} + +void UBTeacherBarDropMediaZone::dropEvent(QDropEvent *pEvent) +{ + setBackgroundRole(QPalette::Dark); + if(pEvent->mimeData()->hasHtml()) qDebug() << pEvent->mimeData()->html(); + if(pEvent->mimeData()->hasUrls()) qDebug() << pEvent->mimeData()->urls(); + if(pEvent->mimeData()->hasText()) qDebug() << pEvent->mimeData()->text(); + QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(pEvent->mimeData()->urls().at(0).toLocalFile()); + if(mimeType.contains("image")){ + QPixmap pix = QPixmap(pEvent->mimeData()->urls().at(0).toLocalFile()); + mpImageTab->setPixmap(pix); + mpTabWidget->setCurrentWidget(mpImageTab); + } + else if(mimeType.contains("video")){ + mpVideoTab->setFile(pEvent->mimeData()->urls().at(0).toLocalFile()); + mpVideoTab->playPause(); + + mpTabWidget->setCurrentWidget(mpVideoTab); + } + else if(mimeType.contains("audio")){ + mpVideoTab->setFile(pEvent->mimeData()->urls().at(0).toLocalFile()); + mpVideoTab->playPause(); + mpTabWidget->setCurrentWidget(mpAudioTab); + } + else{ + qWarning() << "bad idea to come here"; + } + pEvent->acceptProposedAction(); +} + +void UBTeacherBarDropMediaZone::dragMoveEvent(QDragMoveEvent *pEvent) +{ + pEvent->acceptProposedAction(); +} diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index a021027f..585e7f8a 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -1,6 +1,9 @@ #ifndef UBTEACHERBARWIDGET_H #define UBTEACHERBARWIDGET_H +class UBMediaPlayer; +class UBVideoPlayer; + #include #include #include @@ -39,6 +42,30 @@ private: QHBoxLayout* mpStudentLayout; }; + +class UBTeacherBarDropMediaZone : public QWidget +{ + Q_OBJECT + +public: + UBTeacherBarDropMediaZone(QWidget* parent=0, const char* name="UBTeacherBarDropMediaZone"); + ~UBTeacherBarDropMediaZone(); + +private: + QLabel* mpTitleLabel; + QLabel* mpImageTab; + UBMediaPlayer* mpVideoTab; + UBMediaPlayer* mpAudioTab; + QTabWidget* mpTabWidget; + QVBoxLayout* mpLayout; + +protected: + void dragEnterEvent(QDragEnterEvent* pEvent); + void dropEvent(QDropEvent *pEvent); + void dragMoveEvent(QDragMoveEvent* pEvent); + void dragLeaveEvent(QDragLeaveEvent* pEvent); +}; + class UBTeacherBarWidget : public UBDockPaletteWidget { Q_OBJECT @@ -75,6 +102,7 @@ private: UBTeacherStudentAction* mpAction1; UBTeacherStudentAction* mpAction2; UBTeacherStudentAction* mpAction3; + UBTeacherBarDropMediaZone* mpDropMediaZone; QWidget* mpContainer; QVBoxLayout* mpContainerLayout; }; diff --git a/src/gui/UBVideoPlayer.h b/src/gui/UBVideoPlayer.h index ced2cc3b..287ad382 100644 --- a/src/gui/UBVideoPlayer.h +++ b/src/gui/UBVideoPlayer.h @@ -35,6 +35,11 @@ class UBVideoPlayer : public QWidget return mVideoPlayer; } + void loadMedia(QUrl url) + { + mVideoPlayer->load(Phonon::MediaSource(url)); + } + protected: Phonon::VideoPlayer* mVideoPlayer; diff --git a/src/gui/gui.pri b/src/gui/gui.pri index 20075dfb..d1a187cd 100644 --- a/src/gui/gui.pri +++ b/src/gui/gui.pri @@ -26,27 +26,28 @@ HEADERS += src/gui/UBThumbnailView.h \ src/gui/UBActionPalette.h \ src/gui/UBFavoriteToolPalette.h \ src/gui/UBKeyboardPalette.h \ - src/gui/UBNavigatorPalette.h \ - src/gui/UBDocumentNavigator.h \ - src/gui/UBDockPalette.h \ - src/gui/UBPropertyPalette.h \ - src/gui/UBLibNavigatorWidget.h \ - src/gui/UBLibItemProperties.h \ - src/gui/UBLibActionBar.h \ - src/gui/UBLibraryWidget.h \ - src/gui/UBLibPathViewer.h \ - src/gui/UBUpdateDlg.h \ - src/gui/UBDockPaletteWidget.h \ - src/gui/UBLeftPalette.h \ - src/gui/UBRightPalette.h \ - src/gui/UBPageNavigationWidget.h \ - src/gui/UBLibWidget.h \ - src/gui/UBMagnifer.h \ - src/gui/UBCachePropertiesWidget.h \ - src/gui/UBTeacherBarWidget.h \ - src/gui/UBLibWebView.h \ - src/gui/UBDownloadWidget.h \ - src/gui/UBDockDownloadWidget.h + src/gui/UBNavigatorPalette.h \ + src/gui/UBDocumentNavigator.h \ + src/gui/UBDockPalette.h \ + src/gui/UBPropertyPalette.h \ + src/gui/UBLibNavigatorWidget.h \ + src/gui/UBLibItemProperties.h \ + src/gui/UBLibActionBar.h \ + src/gui/UBLibraryWidget.h \ + src/gui/UBLibPathViewer.h \ + src/gui/UBUpdateDlg.h \ + src/gui/UBDockPaletteWidget.h \ + src/gui/UBLeftPalette.h \ + src/gui/UBRightPalette.h \ + src/gui/UBPageNavigationWidget.h \ + src/gui/UBLibWidget.h \ + src/gui/UBMagnifer.h \ + src/gui/UBCachePropertiesWidget.h \ + src/gui/UBTeacherBarWidget.h \ + src/gui/UBLibWebView.h \ + src/gui/UBDownloadWidget.h \ + src/gui/UBDockDownloadWidget.h \ + src/gui/UBMediaPlayer.h SOURCES += src/gui/UBThumbnailView.cpp \ src/gui/UBFloatingPalette.cpp \ @@ -75,27 +76,28 @@ SOURCES += src/gui/UBThumbnailView.cpp \ src/gui/UBActionPalette.cpp \ src/gui/UBFavoriteToolPalette.cpp \ src/gui/UBKeyboardPalette.cpp \ - src/gui/UBNavigatorPalette.cpp \ - src/gui/UBDocumentNavigator.cpp \ - src/gui/UBDockPalette.cpp \ - src/gui/UBPropertyPalette.cpp \ - src/gui/UBLibNavigatorWidget.cpp \ - src/gui/UBLibItemProperties.cpp \ - src/gui/UBLibActionBar.cpp \ - src/gui/UBLibraryWidget.cpp \ - src/gui/UBLibPathViewer.cpp \ - src/gui/UBUpdateDlg.cpp \ - src/gui/UBDockPaletteWidget.cpp \ - src/gui/UBLeftPalette.cpp \ - src/gui/UBRightPalette.cpp \ - src/gui/UBPageNavigationWidget.cpp \ - src/gui/UBLibWidget.cpp \ - src/gui/UBMagnifer.cpp \ - src/gui/UBCachePropertiesWidget.cpp \ - src/gui/UBTeacherBarWidget.cpp \ - src/gui/UBLibWebView.cpp \ - src/gui/UBDownloadWidget.cpp \ - src/gui/UBDockDownloadWidget.cpp + src/gui/UBNavigatorPalette.cpp \ + src/gui/UBDocumentNavigator.cpp \ + src/gui/UBDockPalette.cpp \ + src/gui/UBPropertyPalette.cpp \ + src/gui/UBLibNavigatorWidget.cpp \ + src/gui/UBLibItemProperties.cpp \ + src/gui/UBLibActionBar.cpp \ + src/gui/UBLibraryWidget.cpp \ + src/gui/UBLibPathViewer.cpp \ + src/gui/UBUpdateDlg.cpp \ + src/gui/UBDockPaletteWidget.cpp \ + src/gui/UBLeftPalette.cpp \ + src/gui/UBRightPalette.cpp \ + src/gui/UBPageNavigationWidget.cpp \ + src/gui/UBLibWidget.cpp \ + src/gui/UBMagnifer.cpp \ + src/gui/UBCachePropertiesWidget.cpp \ + src/gui/UBTeacherBarWidget.cpp \ + src/gui/UBLibWebView.cpp \ + src/gui/UBDownloadWidget.cpp \ + src/gui/UBDockDownloadWidget.cpp \ + src/gui/UBMediaPlayer.cpp win32 { @@ -123,3 +125,5 @@ linux-g++-64 { SOURCES += src/gui/UBKeyboardPalette_linux.cpp } + + diff --git a/src/podcast/youtube/UBYouTubePublisher.cpp b/src/podcast/youtube/UBYouTubePublisher.cpp index 5cd44662..f160d4a4 100644 --- a/src/podcast/youtube/UBYouTubePublisher.cpp +++ b/src/podcast/youtube/UBYouTubePublisher.cpp @@ -24,7 +24,7 @@ #include "core/UBSetting.h" #include "gui/UBMainWindow.h" -#include "gui/UBVideoPlayer.h" +//#include "gui/UBVideoPlayer.h" #include "network/UBNetworkAccessManager.h" #include "network/UBServerXMLHttpRequest.h" diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp index f556872f..436397b3 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp @@ -14,8 +14,6 @@ */ #include -#include -#include #include "frameworks/UBPlatformUtils.h" @@ -62,6 +60,7 @@ UBWebController::UBWebController(UBMainWindow* mainWindow) // , mKeyboardCurrentPalette(0) , mToolsPalettePositionned(false) , mDownloadViewIsVisible(false) + { connect(mMainWindow->actionWebTools, SIGNAL(toggled(bool)), this, SLOT(toggleWebToolsPalette(bool))); @@ -73,13 +72,11 @@ UBWebController::UBWebController(UBMainWindow* mainWindow) mToolsPalettePositionnedList[i] = false; } - connect(&mOEmbedParser, SIGNAL(oembedParsed(QVector)), this, SLOT(onOEmbedParsed(QVector))); - - // TODO : Comment the next line to continue the Youtube button bugfix initialiazemOEmbedProviders(); } + UBWebController::~UBWebController() { // NOOP @@ -96,6 +93,7 @@ void UBWebController::initialiazemOEmbedProviders() mOEmbedProviders << "metacafe.com"; mOEmbedProviders << "qik.com"; mOEmbedProviders << "slideshare"; + mOEmbedProviders << "5min.com"; mOEmbedProviders << "twitpic.com"; mOEmbedProviders << "viddler.com"; mOEmbedProviders << "vimeo.com"; @@ -328,53 +326,16 @@ void UBWebController::activePageChanged() mTrapFlashController->updateTrapFlashFromPage((*mCurrentWebBrowser)->currentTabWebView()->page()->currentFrame()); } - - mMainWindow->actionWebTrap->setChecked(false); QUrl latestUrl = (*mCurrentWebBrowser)->currentTabWebView()->url(); - - // TODO : Uncomment the next line to continue the youtube button bugfix - //UBApplication::mainWindow->actionWebOEmbed->setEnabled(hasEmbeddedContent()); - // And remove this line once the previous one is uncommented UBApplication::mainWindow->actionWebOEmbed->setEnabled(isOEmbedable(latestUrl)); - UBApplication::mainWindow->actionEduMedia->setEnabled(isEduMedia(latestUrl)); emit activeWebPageChanged((*mCurrentWebBrowser)->currentTabWebView()); } } -bool UBWebController::hasEmbeddedContent() -{ - bool bHasContent = false; - if(mCurrentWebBrowser){ - QString html = (*mCurrentWebBrowser)->currentTabWebView()->webPage()->mainFrame()->toHtml(); - - // search the presence of "+oembed" - QString query = "\\+oembed([^>]*)>"; - QRegExp exp(query); - exp.indexIn(html); - QStringList results = exp.capturedTexts(); - if(2 <= results.size() && "" != results.at(1)){ - // An embedded content has been found, no need to check the other ones - bHasContent = true; - }else{ - QList contentUrls; - lookForEmbedContent(&html, "embed", "src", &contentUrls); - lookForEmbedContent(&html, "video", "src", &contentUrls); - lookForEmbedContent(&html, "object", "data", &contentUrls); - - // TODO: check the hidden iFrame - - if(!contentUrls.empty()){ - bHasContent = true; - } - } - } - - return bHasContent; -} QPixmap UBWebController::captureCurrentPage() { @@ -580,12 +541,9 @@ void UBWebController::showTabAtTop(bool attop) void UBWebController::captureoEmbed() { - if ( mCurrentWebBrowser && (*mCurrentWebBrowser) && (*mCurrentWebBrowser)->currentTabWebView()){ - // TODO : Uncomment the next lines to continue the youtube button bugfix - // getEmbeddableContent(); - - // And comment from here - + if ( mCurrentWebBrowser && (*mCurrentWebBrowser) + && (*mCurrentWebBrowser)->currentTabWebView()) + { QWebView* webView = (*mCurrentWebBrowser)->currentTabWebView(); QUrl currentUrl = webView->url(); @@ -599,56 +557,9 @@ void UBWebController::captureoEmbed() UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector); } } - // --> Until here } } -void UBWebController::lookForEmbedContent(QString* pHtml, QString tag, QString attribute, QList *pList) -{ - if(NULL != pHtml && NULL != pList){ - QVector urlsFound; - // Check for content - QRegExp exp(QString("<%0(.*)").arg(tag)); - exp.indexIn(*pHtml); - QStringList strl = exp.capturedTexts(); - if(2 <= strl.size() && strl.at(1) != ""){ - // Here we call this regular expression: - // src\s?=\s?['"]([^'"]*)['"] - // It says: give me all characters that are after src=" (or src = ") - QRegExp src(QString("%0\\s?=\\s?['\"]([^'\"]*)['\"]").arg(attribute)); - for(int i=1; iappend(QUrl(urls.at(1))); - } - } - } - } -} - -void UBWebController::checkForOEmbed(QString *pHtml) -{ - mOEmbedParser.parse(*pHtml); -} - -void UBWebController::getEmbeddableContent() -{ - // Get the source code of the page - if(mCurrentWebBrowser){ - QNetworkAccessManager* pNam = (*mCurrentWebBrowser)->currentTabWebView()->webPage()->networkAccessManager(); - if(NULL != pNam){ - QString html = (*mCurrentWebBrowser)->currentTabWebView()->webPage()->mainFrame()->toHtml(); - mOEmbedParser.setNetworkAccessManager(pNam); - - // First, we have to check if there is some oembed content - checkForOEmbed(&html); - - // Note: The other contents will be verified once the oembed ones have been checked - } - } -} void UBWebController::captureEduMedia() { @@ -809,38 +720,3 @@ void UBWebController::cut() act->trigger(); } } - -void UBWebController::onOEmbedParsed(QVector contents) -{ - QList urls; - - foreach(sOEmbedContent cnt, contents){ - urls << QUrl(cnt.url); - } - - // TODO : Implement this - //lookForEmbedContent(&html, "embed", "src", &urls); - //lookForEmbedContent(&html, "video", "src", &contentUrls); - //lookForEmbedContent(&html, "object", "data", &contentUrls); - - // TODO: check the hidden iFrame - - if(!urls.empty()){ - QUrl contentUrl; // The selected content url - - if(1 == urls.size()){ - contentUrl = urls.at(0); - }else{ - // TODO : Display a dialog box asking the user which content to get and set contentUrl to the selected content - - } - - UBGraphicsW3CWidgetItem * widget = UBApplication::boardController->activeScene()->addOEmbed(contentUrl); - - if(widget) - { - UBApplication::applicationController->showBoard(); - UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector); - } - } -} diff --git a/src/web/UBWebController.h b/src/web/UBWebController.h index 8faa752d..29640cbe 100644 --- a/src/web/UBWebController.h +++ b/src/web/UBWebController.h @@ -19,7 +19,6 @@ #include #include -#include "web/UBOEmbedParser.h" class WBBrowserWindow; class UBApplication; @@ -31,6 +30,7 @@ class WBWebView; class UBServerXMLHttpRequest; //class UBKeyboardPalette; + class UBWebController : public QObject { Q_OBJECT; @@ -88,9 +88,6 @@ class UBWebController : public QObject void captureEduMedia(); bool isOEmbedable(const QUrl& pUrl); - bool hasEmbeddedContent(); - void getEmbeddableContent(); - bool isEduMedia(const QUrl& pUrl); void copy(); @@ -98,36 +95,41 @@ class UBWebController : public QObject void cut(); private: - void initialiazemOEmbedProviders(); - void tutorialWebInstance(); - void webBrowserInstance(); - void paraschoolWebInstance(); - void lookForEmbedContent(QString* pHtml, QString tag, QString attribute, QList* pList); - void checkForOEmbed(QString* pHtml); - QStackedWidget mStackedWidget[TotalNumberOfWebInstances]; + UBMainWindow *mMainWindow; + WBBrowserWindow* mWebBrowserList[TotalNumberOfWebInstances]; WBBrowserWindow** mCurrentWebBrowser; + QWidget* mBrowserWidget; UBTrapFlashController* mTrapFlashController; UBWebToolsPalette** mToolsCurrentPalette; UBWebToolsPalette* mToolsPaletteList[TotalNumberOfWebInstances]; // UBKeyboardPalette** mKeyboardCurrentPalette; // UBKeyboardPalette* mKeyboardPaletteList[TotalNumberOfWebInstances]; + bool mToolsPalettePositionned; bool mToolsPalettePositionnedList[TotalNumberOfWebInstances]; + bool mDownloadViewIsVisible; + QStringList mOEmbedProviders; - UBOEmbedParser mOEmbedParser; + + void initialiazemOEmbedProviders(); + + void tutorialWebInstance(); + void webBrowserInstance(); + void paraschoolWebInstance(); private slots: void activePageChanged(); void trapFlash(); + void toggleWebTrap(bool checked); - void onOEmbedParsed(QVector contents); + // void showKeyboard(bool checked); signals: @@ -137,6 +139,7 @@ class UBWebController : public QObject * @param pCapturedPixmap QPixmap corresponding to the capture. */ void imageCaptured(const QPixmap& pCapturedPixmap, bool pageMode, const QUrl& source); + void activeWebPageChanged(WBWebView* pWebView); }; diff --git a/src/web/web.pri b/src/web/web.pri index 8d89a572..0e38d0c0 100644 --- a/src/web/web.pri +++ b/src/web/web.pri @@ -26,8 +26,7 @@ HEADERS += src/web/UBWebController.h \ src/web/browser/WBUrlLineEdit.h \ src/web/browser/WBWebView.h \ src/web/browser/WBHistory.h \ - src/web/browser/WBWebTrapWebView.h \ - src/web/UBOEmbedParser.h + src/web/browser/WBWebTrapWebView.h SOURCES += src/web/UBWebController.cpp \ src/web/UBTrapFlashController.cpp \ @@ -47,7 +46,8 @@ SOURCES += src/web/UBWebController.cpp \ src/web/browser/WBUrlLineEdit.cpp \ src/web/browser/WBWebView.cpp \ src/web/browser/WBHistory.cpp \ - src/web/browser/WBWebTrapWebView.cpp \ - src/web/UBOEmbedParser.cpp + src/web/browser/WBWebTrapWebView.cpp + + From b824051438c837864e5a905adb0004d5a8ee0ce2 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 3 Jan 2012 10:49:12 +0100 Subject: [PATCH 02/99] new player class --- src/gui/UBMediaPlayer.cpp | 346 +++++++++++++++++++++++++++++++++ src/gui/UBMediaPlayer.h | 92 +++++++++ src/gui/UBTeacherBarWidget.cpp | 2 +- 3 files changed, 439 insertions(+), 1 deletion(-) create mode 100644 src/gui/UBMediaPlayer.cpp create mode 100644 src/gui/UBMediaPlayer.h diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp new file mode 100644 index 00000000..17770378 --- /dev/null +++ b/src/gui/UBMediaPlayer.cpp @@ -0,0 +1,346 @@ +#include "UBMediaPlayer.h" + + + +#include + +#define SLIDER_RANGE 8 + + +MediaVideoWidget::MediaVideoWidget(UBMediaPlayer *player, QWidget *parent) : + Phonon::VideoWidget(parent), m_player(player)/*, m_action(this)*/ +{ +// m_action.setCheckable(true); +// m_action.setChecked(false); +// m_action.setShortcut(QKeySequence( Qt::AltModifier + Qt::Key_Return)); +// m_action.setShortcutContext(Qt::WindowShortcut); +// connect(&m_action, SIGNAL(toggled(bool)), SLOT(setFullScreen(bool))); +// addAction(&m_action); +// setAcceptDrops(true); +} + +void MediaVideoWidget::timerEvent(QTimerEvent *e) +{ + if (e->timerId() == m_timer.timerId()) { + //let's store the cursor shape +#ifndef QT_NO_CURSOR + setCursor(Qt::BlankCursor); +#endif + } + Phonon::VideoWidget::timerEvent(e); +} + + +UBMediaPlayer::UBMediaPlayer() : + playButton(0), + m_AudioOutput(Phonon::VideoCategory), + m_videoWidget(new MediaVideoWidget(this)) +{ + setContextMenuPolicy(Qt::CustomContextMenu); + m_videoWidget->setContextMenuPolicy(Qt::CustomContextMenu); + + QSize buttonSize(34, 28); + +// QPushButton *openButton = new QPushButton(this); + +//// openButton->setIcon(style()->standardIcon(QStyle::SP_DialogOpenButton)); +//// QPalette bpal; +//// QColor arrowcolor = bpal.buttonText().color(); +//// if (arrowcolor == Qt::black) +//// arrowcolor = QColor(80, 80, 80); +//// bpal.setBrush(QPalette::ButtonText, arrowcolor); +//// openButton->setPalette(bpal); + +// rewindButton = new QPushButton(this); +// rewindButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipBackward)); + +// forwardButton = new QPushButton(this); +// forwardButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipForward)); +// forwardButton->setEnabled(false); + + playButton = new QPushButton(this); + playIcon = style()->standardIcon(QStyle::SP_MediaPlay); + pauseIcon = style()->standardIcon(QStyle::SP_MediaPause); + playButton->setIcon(playIcon); + + slider = new Phonon::SeekSlider(this); + slider->setMediaObject(&m_MediaObject); + + QVBoxLayout *vLayout = new QVBoxLayout(this); + vLayout->setContentsMargins(8, 8, 8, 8); + +// QHBoxLayout *layout = new QHBoxLayout(); + +// info = new QLabel(this); +// info->setMinimumHeight(70); +// info->setAcceptDrops(false); +// info->setMargin(2); +// info->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); +// info->setLineWidth(2); +// info->setAutoFillBackground(true); + +// QPalette palette; +// palette.setBrush(QPalette::WindowText, Qt::white); +#ifndef Q_WS_MAC +// rewindButton->setMinimumSize(buttonSize); +// forwardButton->setMinimumSize(buttonSize); + playButton->setMinimumSize(buttonSize); +#endif +// info->setStyleSheet("border-image:url(:/images/screen.png) ; border-width:3px"); +// info->setPalette(palette); +// info->setText(tr("
No media
")); + + +// layout->addWidget(rewindButton); +// layout->addWidget(playButton); +// layout->addWidget(forwardButton); + +// layout->addStretch(); + +// vLayout->addWidget(info); + initVideoWindow(); + vLayout->addWidget(&m_videoWindow); + QVBoxLayout *buttonPanelLayout = new QVBoxLayout(); + m_videoWindow.hide(); +// buttonPanelLayout->addLayout(layout); + +// timeLabel = new QLabel(this); + progressLabel = new QLabel(this); + QWidget *sliderPanel = new QWidget(this); + QHBoxLayout *sliderLayout = new QHBoxLayout(); + sliderLayout->addWidget(playButton); + sliderLayout->addWidget(slider); +// sliderLayout->addWidget(timeLabel); + sliderLayout->addWidget(progressLabel); + sliderLayout->setContentsMargins(0, 0, 0, 0); + sliderPanel->setLayout(sliderLayout); + + buttonPanelLayout->addWidget(sliderPanel); + buttonPanelLayout->setContentsMargins(0, 0, 0, 0); +#ifdef Q_OS_MAC +// layout->setSpacing(4); + buttonPanelLayout->setSpacing(0); + info->setMinimumHeight(100); + info->setFont(QFont("verdana", 15)); + openButton->setFocusPolicy(Qt::NoFocus); +#endif + QWidget *buttonPanelWidget = new QWidget(this); + buttonPanelWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + buttonPanelWidget->setLayout(buttonPanelLayout); + vLayout->addWidget(buttonPanelWidget); + + QHBoxLayout *labelLayout = new QHBoxLayout(); + + vLayout->addLayout(labelLayout); + setLayout(vLayout); + + + // Setup signal connections: +// connect(rewindButton, SIGNAL(clicked()), this, SLOT(rewind())); + + connect(playButton, SIGNAL(clicked()), this, SLOT(playPause())); +// connect(forwardButton, SIGNAL(clicked()), this, SLOT(forward())); + +// connect(&m_MediaObject, SIGNAL(totalTimeChanged(qint64)), this, SLOT(updateTime())); +// connect(&m_MediaObject, SIGNAL(tick(qint64)), this, SLOT(updateTime())); + connect(&m_MediaObject, SIGNAL(finished()), this, SLOT(finished())); + connect(&m_MediaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(stateChanged(Phonon::State,Phonon::State))); + connect(&m_MediaObject, SIGNAL(bufferStatus(int)), this, SLOT(bufferStatus(int))); + connect(&m_MediaObject, SIGNAL(hasVideoChanged(bool)), this, SLOT(hasVideoChanged(bool))); + +// rewindButton->setEnabled(false); + playButton->setEnabled(false); +// setAcceptDrops(true); + + m_audioOutputPath = Phonon::createPath(&m_MediaObject, &m_AudioOutput); + Phonon::createPath(&m_MediaObject, m_videoWidget); + + resize(minimumSizeHint()); +} + +void UBMediaPlayer::stateChanged(Phonon::State newstate, Phonon::State oldstate) +{ + if (oldstate == Phonon::LoadingState) { + QRect videoHintRect = QRect(QPoint(0, 0), m_videoWindow.sizeHint()); + QApplication::desktop()->screenGeometry().intersected(videoHintRect); + + if (m_MediaObject.hasVideo()) { + qApp->processEvents(); + resize(sizeHint()); + } else + resize(minimumSize()); + + } + + switch (newstate) { + case Phonon::ErrorState: + if (m_MediaObject.errorType() == Phonon::FatalError) { + playButton->setEnabled(false); +// rewindButton->setEnabled(false); + } else { + m_MediaObject.pause(); + } + QMessageBox::warning(this, "Phonon UBMediaPlayer", m_MediaObject.errorString(), QMessageBox::Close); + break; + + case Phonon::StoppedState: +// m_videoWidget-> (false); + // Fall through + case Phonon::PausedState: + playButton->setIcon(playIcon); + if (m_MediaObject.currentSource().type() != Phonon::MediaSource::Invalid){ + playButton->setEnabled(true); +// rewindButton->setEnabled(true); + } else { + playButton->setEnabled(false); +// rewindButton->setEnabled(false); + } + break; + case Phonon::PlayingState: + playButton->setEnabled(true); + playButton->setIcon(pauseIcon); + if (m_MediaObject.hasVideo()) + m_videoWindow.show(); + // Fall through + case Phonon::BufferingState: +// rewindButton->setEnabled(true); + break; + case Phonon::LoadingState: +// rewindButton->setEnabled(false); + break; + } + +} + +void UBMediaPlayer::setVolume(qreal volume) +{ + m_AudioOutput.setVolume(volume); +} + + +void UBMediaPlayer::initVideoWindow() +{ + QVBoxLayout *videoLayout = new QVBoxLayout(); + videoLayout->addWidget(m_videoWidget); + videoLayout->setContentsMargins(0, 0, 0, 0); + m_videoWindow.setLayout(videoLayout); + m_videoWindow.setMinimumSize(70, 70); +} + +void UBMediaPlayer::playPause() +{ + if (m_MediaObject.state() == Phonon::PlayingState) + m_MediaObject.pause(); + else { + if (m_MediaObject.currentTime() == m_MediaObject.totalTime()) + m_MediaObject.seek(0); + m_MediaObject.play(); + } +} + +void UBMediaPlayer::setFile(const QString &fileName) +{ + setWindowTitle(fileName.right(fileName.length() - fileName.lastIndexOf('/') - 1)); + m_MediaObject.setCurrentSource(Phonon::MediaSource(fileName)); + m_MediaObject.play(); +} + +void UBMediaPlayer::setLocation(const QString& location) +{ + setWindowTitle(location.right(location.length() - location.lastIndexOf('/') - 1)); + m_MediaObject.setCurrentSource(Phonon::MediaSource(QUrl::fromEncoded(location.toUtf8()))); + m_MediaObject.play(); +} + + +void UBMediaPlayer::openFile() +{ + QStringList fileNames = QFileDialog::getOpenFileNames(this, QString(), QDesktopServices::storageLocation(QDesktopServices::MusicLocation)); + + + m_MediaObject.clearQueue(); + if (fileNames.size() > 0) { + QString fileName = fileNames[0]; + setFile(fileName); + for (int i=1; isetEnabled(m_MediaObject.queue().size() > 0); +} + +void UBMediaPlayer::bufferStatus(int percent) +{ + if (percent == 100) + progressLabel->setText(QString()); + else { + QString str = QString::fromLatin1("(%1%)").arg(percent); + progressLabel->setText(str); + } +} + +//void UBMediaPlayer::updateTime() +//{ +// long len = m_MediaObject.totalTime(); +// long pos = m_MediaObject.currentTime(); +// QString timeString; +// if (pos || len) +// { +// int sec = pos/1000; +// int min = sec/60; +// int hour = min/60; +// int msec = pos; + +// QTime playTime(hour%60, min%60, sec%60, msec%1000); +// sec = len / 1000; +// min = sec / 60; +// hour = min / 60; +// msec = len; + +// QTime stopTime(hour%60, min%60, sec%60, msec%1000); +// QString timeFormat = "m:ss"; +// if (hour > 0) +// timeFormat = "h:mm:ss"; +// timeString = playTime.toString(timeFormat); +// if (len) +// timeString += " / " + stopTime.toString(timeFormat); +// } +// timeLabel->setText(timeString); +//} + +void UBMediaPlayer::rewind() +{ + m_MediaObject.seek(0); +} + +void UBMediaPlayer::forward() +{ + QList queue = m_MediaObject.queue(); + if (queue.size() > 0) { + m_MediaObject.setCurrentSource(queue[0]); +// forwardButton->setEnabled(queue.size() > 1); + m_MediaObject.play(); + } +} + +void UBMediaPlayer::openUrl() +{ + QSettings settings; + settings.beginGroup(QLatin1String("BrowserMainWindow")); + QString sourceURL = settings.value("location").toString(); + bool ok = false; + sourceURL = QInputDialog::getText(this, tr("Open Location"), tr("Please enter a valid address here:"), QLineEdit::Normal, sourceURL, &ok); + if (ok && !sourceURL.isEmpty()) { + setLocation(sourceURL); + settings.setValue("location", sourceURL); + } +} + +void UBMediaPlayer::finished() +{ +} + +void UBMediaPlayer::hasVideoChanged(bool bHasVideo) +{ +// info->setVisible(!bHasVideo); + m_videoWindow.setVisible(bHasVideo); +} diff --git a/src/gui/UBMediaPlayer.h b/src/gui/UBMediaPlayer.h new file mode 100644 index 00000000..6e563698 --- /dev/null +++ b/src/gui/UBMediaPlayer.h @@ -0,0 +1,92 @@ +#ifndef UBUBMediaPlayer_H +#define UBUBMediaPlayer_H + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE +class QPushButton; +class QLabel; +class QSlider; +class QTextEdit; +QT_END_NAMESPACE + +class UBMediaPlayer; + +class MediaVideoWidget : public Phonon::VideoWidget +{ + Q_OBJECT; + +public: + MediaVideoWidget(UBMediaPlayer *player, QWidget *parent = 0); + +protected: + void timerEvent(QTimerEvent *e); + +private: + UBMediaPlayer* m_player; + QBasicTimer m_timer; +// QAction m_action; +}; + +class UBMediaPlayer : public QWidget +{ + Q_OBJECT +public: + UBMediaPlayer(); + + void setFile(const QString &text); + void setLocation(const QString &location); + void setVolume(qreal volume); + +public slots: + void openFile(); + void rewind(); + void forward(); +// void updateTime(); + void finished(); + void playPause(); + +private slots: + void stateChanged(Phonon::State newstate, Phonon::State oldstate); + void bufferStatus(int percent); + void openUrl(); + + void hasVideoChanged(bool); + +private: + void initVideoWindow(); + + QIcon playIcon; + QIcon pauseIcon; + QPushButton *playButton; +// QPushButton *rewindButton; +// QPushButton *forwardButton; + Phonon::SeekSlider *slider; +// QLabel *timeLabel; + QLabel *progressLabel; +// QLabel *info; + + QWidget m_videoWindow; + Phonon::MediaObject m_MediaObject; + Phonon::AudioOutput m_AudioOutput; + MediaVideoWidget *m_videoWidget; + Phonon::Path m_audioOutputPath; +}; + +#endif // UBUBMediaPlayer_H diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 75033ed9..ec0cbcce 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -488,7 +488,7 @@ UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char mpTitleLabel = new QLabel(tr("Drop media here")); mpLayout->addWidget(mpTitleLabel); mpTabWidget = new QTabWidget(); - mpTabWidget->setMinimumHeight(200); + mpTabWidget->setMinimumHeight(120); mpTabWidget->addTab(mpImageTab,QIcon(":images/toolbar/extraTool.png"),""); mpTabWidget->addTab(mpVideoTab,QIcon(":images/libpalette/movieIcon.svg"),""); mpTabWidget->addTab(mpAudioTab,QIcon(":images/libpalette/soundIcon.svg"),""); From 23f2cef57de33e68e8fb974d0654f0004b5ad75f Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Tue, 3 Jan 2012 14:47:04 +0100 Subject: [PATCH 03/99] Did some modification on the teacher bar --- resources/images/duration1.png | Bin 0 -> 1164 bytes resources/images/duration2.png | Bin 0 -> 1178 bytes resources/images/duration3.png | Bin 0 -> 1338 bytes resources/sankore.qrc | 3 + src/gui/UBTeacherBarWidget.cpp | 193 ++++++++------------------------- src/gui/UBTeacherBarWidget.h | 18 ++- 6 files changed, 56 insertions(+), 158 deletions(-) create mode 100644 resources/images/duration1.png create mode 100644 resources/images/duration2.png create mode 100644 resources/images/duration3.png diff --git a/resources/images/duration1.png b/resources/images/duration1.png new file mode 100644 index 0000000000000000000000000000000000000000..e05ffa8ee03484d3fc8a798b9e7597f7eaa1ac0d GIT binary patch literal 1164 zcmV;71atd|P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iySz z4F?R!(zz7?000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000B$Nkl&*br zt7RoS*Yr6z_2A~p%c=q(jE|NYZ94$yqoR2&7qJ6`Vne8p1A|uXw+i5&t|qe4U@|*a z$*ZAMVEz^`0a$iXDFA?z+xc|o!k>}x!IfuL?)O+U{}h<6#JpYlU8~f^dQVIby}t7F zz#~AUv>Bkwj)%7+0`$7PmYokJvIFI$PEQ%;8-NA7%pZh4G<&<^Vc){TCoK)O0uUqr z0%))H%I-^(r~U0U--}0&Th5rd-e>Z6XPjVO521G3I|JOPI0D3k*M-CMq1oGIW@7Z1 zNOi+bZFJss_=d-#t+y-z5Jk>})4RQePTxdivgN#$2pF%1Ja0#xkPLdq%K{*3`$1fy z_aX1#{pYRScrZV!CE$&#Qh_IK?5a03|}{BTEE+g9zA=DDpRqUV(Lq0IVAUNJ<1CX#`+dA^^)q z02Uzoy+O_a;l< z1;iiSu97+-4cxY3-ZB7Pid2udVvGXneyPs(SHR$vuykmulEwyz6f18J9Y6sH)5qql z^z*=!9mWp?fDVMIgOg>9b_|#;Rnk@!fC3mrkIu6DDK5wEcgYmHUu@RdUAJEb7R~1K eV;$>Qmh=~BJur+Rvz`V30000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iySz z4F@6=1hm=!000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000B^NklmD2IJKmNqq;L8UUw$!R9^~_w{P|? zGzZ|uZf^iE1i%Ntook#cT3PV3S`WBz}SS-f8TKZkVRIU#^TO9rNeD2XB zK-|)n0eIE;@oGeXRP8Zt(-r0X57{~m4=`^95K_zhV`$%D^oHH0(8n)MtEvFRH@^m; zyVNtgUoD32tv=J*r_atBIpa+-KX+LR=A{rS(#B-~FN=-BZy>b>tgN&_i zOsj>?_g>T3RIp=M5dbmCnbmr=7xI{9XXc#^N+Mvo6!v*F@`Sj}IQ<|1Vs0ORPV~cN z47~r^(f^PLnAF?BN6cZElm$S1`)<7fIBYYzNl`$GfKljFi5A0XUI60CKd4s#dmYBX z>>VLH0*0V-C9Q^`d;olU2XNfT_=o_+g2%0Q0EcZxx3o}_MnEqp(PcH$O9IeI3xKma zrjrD~MiBrT2|yDq08$pFi3FgY769k9_gMG559xw&qTI=S^)55ha&P~ZV4*+3Dn9w=^Pbf2yua!3MiIACPmjKLb)qGDR zGhe8Mw&0PNnPtZTY--JXdyLy$c=2<*&^Wngf_?zoS~1_8;I~~-&M#-IEC6DmG@u0t z%?Wq s1bx@$2q5UZIGF=RNnf3P(vv9HUq!8q0QEr*YXATM07*qoM6N<$f`fen1^@s6 literal 0 HcmV?d00001 diff --git a/resources/images/duration3.png b/resources/images/duration3.png new file mode 100644 index 0000000000000000000000000000000000000000..9280a6421ebe27461f8043180d4ed2b2e2fdc4f7 GIT binary patch literal 1338 zcmV-A1;zS_P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iySz z4F@-Q*-$Y6000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000D)Nkl=0T^xQBzs&Zf~;mnqK00IcM&! z-`CIG<@N9xoVEF6Q78(!RHV4Ac7J+sxG(gjlIw5MIhxY^^v$pSpN_59X_nn_~bnYbqKD8A-A~wn=3P7g!J!%86+)R6fQXrH7 zFI1|Sner9{kQw>A)e0c&pu2Ntgxm!5K;>FDQ9XqKbg3P{N+anK1d!SAc+?JHxtaFx zH%j~jxSUsTBY_<&V8)Yl3aJo(D$}XieD!lokiU;Xhzzpd`~-(I3#PnVJB4tkz{>&Nuj z(eBV^Qm&_^K6v5Vwa|wz*Ih3A2QRK3qFN4Wh4?jMymO z|FwZCnUAJ~K*Y?HcfaZhCHvW2u13b~4eKVVXQh#J6`Kl0eK;wk3m5G*Nj-5V48)l* w5KG)hnl@@tzgbO;k1EN5e>(e2&!lnv3z>$(?+sp-)Bpeg07*qoM6N<$f*>kfH~;_u literal 0 HcmV?d00001 diff --git a/resources/sankore.qrc b/resources/sankore.qrc index c0ff2a69..8601be9f 100644 --- a/resources/sankore.qrc +++ b/resources/sankore.qrc @@ -338,5 +338,8 @@ images/download_close.png images/download_open.png images/tab_mask.png + images/duration1.png + images/duration2.png + images/duration3.png diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index ec0cbcce..bf454bf2 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -15,26 +15,20 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDockPaletteWidget(parent) , mpLayout(NULL) , mpTitleLayout(NULL) - , mpPhasisLayout(NULL) , mpDurationLayout(NULL) - , mpEquipmentLayout(NULL) - , mpActivityLayout(NULL) , mpTitleLabel(NULL) - , mpPhasisLabel(NULL) , mpDurationLabel(NULL) - , mpEquipmentLabel(NULL) - , mpActivityLabel(NULL) , mpTitle(NULL) - , mpEquipment(NULL) - , mpPhasis(NULL) - , mpDuration(NULL) - , mpActivity(NULL) , mpAction1(NULL) , mpAction2(NULL) , mpAction3(NULL) , mpDropMediaZone(NULL) , mpContainer(NULL) , mpContainerLayout(NULL) + , mpDuration1(NULL) + , mpDuration2(NULL) + , mpDuration3(NULL) + , mpDurationButtons(NULL) { setObjectName(name); mName = "TeacherBarWidget"; @@ -69,51 +63,26 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpTitleLayout->addWidget(mpTitle, 1); mpLayout->addLayout(mpTitleLayout); - // Phasis - mpPhasisLabel = new QLabel(tr("Phasis"), mpContainer); - mpPhasisLabel->setMinimumWidth(LABEL_MINWIDHT); - mpPhasisLabel->setAlignment(Qt::AlignRight); - mpPhasis = new QComboBox(mpContainer); - mpPhasis->setObjectName("DockPaletteWidgetComboBox"); - mpPhasisLayout = new QHBoxLayout(); - mpPhasisLayout->addWidget(mpPhasisLabel, 0); - mpPhasisLayout->addWidget(mpPhasis, 1); - mpLayout->addLayout(mpPhasisLayout); - // Duration mpDurationLabel = new QLabel(tr("Duration"), mpContainer); mpDurationLabel->setMinimumWidth(LABEL_MINWIDHT); - mpDurationLabel->setAlignment(Qt::AlignRight); - mpDuration = new QComboBox(mpContainer); - mpDuration->setObjectName("DockPaletteWidgetComboBox"); mpDurationLayout = new QHBoxLayout(); - mpDurationLayout->addWidget(mpDurationLabel, 0); - mpDurationLayout->addWidget(mpDuration, 1); + mpDurationLayout->addWidget(mpDurationLabel, 1); + mpDuration1 = new QCheckBox(this); + mpDuration1->setIcon(QIcon(":images/duration1.png")); + mpDurationLayout->addWidget(mpDuration1, 0); + mpDuration2 = new QCheckBox(this); + mpDuration2->setIcon(QIcon(":images/duration2.png")); + mpDurationLayout->addWidget(mpDuration2, 0); + mpDuration3 = new QCheckBox(this); + mpDuration3->setIcon(QIcon(":images/duration3.png")); + mpDurationLayout->addWidget(mpDuration3, 0); + mpDurationButtons = new QButtonGroup(this); + mpDurationButtons->addButton(mpDuration1); + mpDurationButtons->addButton(mpDuration2); + mpDurationButtons->addButton(mpDuration3); mpLayout->addLayout(mpDurationLayout); - // Equipment - mpEquipmentLabel = new QLabel(tr("Equipment"), mpContainer); - mpEquipmentLabel->setMinimumWidth(LABEL_MINWIDHT); - mpEquipmentLabel->setAlignment(Qt::AlignRight); - mpEquipment = new QLineEdit(mpContainer); - mpEquipment->setObjectName("DockPaletteWidgetLineEdit"); - connect(mpEquipment, SIGNAL(textChanged(const QString&)), this, SLOT(onEquipmentTextChanged(const QString&))); - mpEquipmentLayout = new QHBoxLayout(); - mpEquipmentLayout->addWidget(mpEquipmentLabel, 0); - mpEquipmentLayout->addWidget(mpEquipment, 1); - mpLayout->addLayout(mpEquipmentLayout); - - // Activity - mpActivityLabel = new QLabel(tr("Activity"), mpContainer); - mpActivityLabel->setMinimumWidth(LABEL_MINWIDHT); - mpActivityLabel->setAlignment(Qt::AlignRight); - mpActivity = new QComboBox(mpContainer); - mpActivity->setObjectName("DockPaletteWidgetComboBox"); - mpActivityLayout = new QHBoxLayout(); - mpActivityLayout->addWidget(mpActivityLabel, 0); - mpActivityLayout->addWidget(mpActivity, 1); - mpLayout->addLayout(mpActivityLayout); - // Actions mpAction1 = new UBTeacherStudentAction(1, mpContainer); mpAction2 = new UBTeacherStudentAction(2, mpContainer); @@ -133,10 +102,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(loadContent())); connect(UBApplication::mainWindow->actionQuit, SIGNAL(triggered()), this, SLOT(saveContent())); connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); - connect(mpPhasis, SIGNAL(currentIndexChanged(int)), this, SLOT(onValueChanged())); - connect(mpDuration, SIGNAL(currentIndexChanged(int)), this, SLOT(onValueChanged())); - connect(mpEquipment, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); - connect(mpActivity, SIGNAL(currentIndexChanged(int)), this, SLOT(onValueChanged())); connect(mpAction1->teacher(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); connect(mpAction1->student(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); connect(mpAction2->teacher(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); @@ -147,108 +112,67 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock UBTeacherBarWidget::~UBTeacherBarWidget() { - if(NULL != mpDropMediaZone) - { + if(NULL != mpDropMediaZone){ delete mpDropMediaZone; mpDropMediaZone = NULL; } - if(NULL != mpAction3) - { + if(NULL != mpAction3){ delete mpAction3; mpAction3 = NULL; } - if(NULL != mpAction2) - { + if(NULL != mpAction2){ delete mpAction2; mpAction2 = NULL; } - if(NULL != mpAction1) - { + if(NULL != mpAction1){ delete mpAction1; mpAction1 = NULL; } - if(NULL != mpActivityLabel) - { - delete mpActivityLabel; - mpActivityLabel = NULL; - } - if(NULL != mpActivity) - { - delete mpActivity; - mpActivity = NULL; - } - if(NULL != mpActivityLayout) - { - delete mpActivityLayout; - mpActivityLayout = NULL; - } - if(NULL != mpEquipmentLabel) - { - delete mpEquipmentLabel; - mpEquipmentLabel = NULL; + if(NULL != mpDurationLabel){ + delete mpDurationLabel; + mpDurationLabel = NULL; } - if(NULL != mpEquipment) - { - delete mpEquipment; - mpEquipment = NULL; + if(NULL != mpDuration1){ + delete mpDuration1; + mpDuration1 = NULL; } - if(NULL != mpEquipmentLayout) - { - delete mpEquipmentLayout; - mpEquipmentLayout = NULL; + if(NULL != mpDuration2){ + delete mpDuration2; + mpDuration2 = NULL; } - if(NULL != mpDurationLabel) - { - delete mpDurationLabel; - mpDurationLabel = NULL; + if(NULL != mpDuration3){ + delete mpDuration3; + mpDuration3 = NULL; } - if(NULL != mpDuration) - { - delete mpDuration; - mpDuration = NULL; + if(NULL != mpDurationButtons){ + delete mpDurationButtons; + mpDurationButtons = NULL; } - if(NULL != mpDurationLayout) - { + if(NULL != mpDurationLayout){ delete mpDurationLayout; mpDurationLayout = NULL; } - if(NULL != mpPhasisLabel) - { - delete mpPhasisLabel; - mpPhasisLabel = NULL; - } - if(NULL != mpPhasisLayout) - { - delete mpPhasisLayout; - mpPhasisLayout = NULL; - } - if(NULL != mpTitleLabel) - { + if(NULL != mpTitleLabel){ delete mpTitleLabel; mpTitleLabel = NULL; } - if(NULL != mpTitle) - { + if(NULL != mpTitle){ delete mpTitle; mpTitle = NULL; } - if(NULL != mpTitleLayout) - { + if(NULL != mpTitleLayout){ delete mpTitleLayout; mpTitleLayout = NULL; } - if(NULL != mpLayout) - { + if(NULL != mpLayout){ delete mpLayout; mpLayout = NULL; } - if(NULL != mpContainer) - { + if(NULL != mpContainer){ delete mpContainer; mpContainer = NULL; } - if(NULL != mpContainerLayout) - { + if(NULL != mpContainerLayout){ delete mpContainerLayout; mpContainerLayout = NULL; } @@ -256,29 +180,12 @@ UBTeacherBarWidget::~UBTeacherBarWidget() void UBTeacherBarWidget::populateCombos() { - QStringList qslPhasis; - qslPhasis << tr("") << tr("I discover") << tr("I experiment") << tr("I train myself") << tr("I play") << tr("I memorize"); - mpPhasis->insertItems(0, qslPhasis); - mpPhasis->setCurrentIndex(0); - - QStringList qslDuration; - qslDuration << tr("") << tr("Short") << tr("Middle") << tr("Long"); - mpDuration->insertItems(0, qslDuration); - mpDuration->setCurrentIndex(0); - - QStringList qslActivity; - qslActivity << tr("") << tr("Alone") << tr("By Group") << tr("All together"); - mpActivity->insertItems(0, qslActivity); - mpActivity->setCurrentIndex(0); + } void UBTeacherBarWidget::onValueChanged() { if( mpTitle->text() == "" - && mpDuration->currentIndex() == 0 - && mpPhasis->currentIndex() == 0 - && mpEquipment->text() == "" - && mpActivity->currentIndex() == 0 && mpAction1->teacherText() == "" && mpAction1->studentText() == "" && mpAction2->teacherText() == "" @@ -302,10 +209,6 @@ void UBTeacherBarWidget::saveContent() { sTeacherBarInfos infos; infos.title = mpTitle->text(); - infos.phasis = mpPhasis->currentIndex(); - infos.Duration = mpDuration->currentIndex(); - infos.material = mpEquipment->text(); - infos.activity = mpActivity->currentIndex(); infos.action1Master = mpAction1->teacherText(); infos.action1Student = mpAction1->studentText(); infos.action2Master = mpAction2->teacherText(); @@ -319,10 +222,6 @@ void UBTeacherBarWidget::loadContent() { sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); mpTitle->setText(nextInfos.title); - mpPhasis->setCurrentIndex(nextInfos.phasis); - mpDuration->setCurrentIndex(nextInfos.Duration); - mpEquipment->setText(nextInfos.material); - mpActivity->setCurrentIndex(nextInfos.activity); mpAction1->setTeacherText(nextInfos.action1Master); mpAction1->setStudentText(nextInfos.action1Student); mpAction2->setTeacherText(nextInfos.action2Master); @@ -338,7 +237,7 @@ void UBTeacherBarWidget::onTitleTextChanged(const QString& text) void UBTeacherBarWidget::onEquipmentTextChanged(const QString& text) { - mpEquipment->setToolTip(text); + } UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent, const char *name):QWidget(parent) diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 585e7f8a..ec7946fb 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -10,7 +10,9 @@ class UBVideoPlayer; #include #include #include -#include +#include +#include +#include #include "UBDockPaletteWidget.h" @@ -85,26 +87,20 @@ private: QVBoxLayout* mpLayout; QHBoxLayout* mpTitleLayout; - QHBoxLayout* mpPhasisLayout; QHBoxLayout* mpDurationLayout; - QHBoxLayout* mpEquipmentLayout; - QHBoxLayout* mpActivityLayout; QLabel* mpTitleLabel; - QLabel* mpPhasisLabel; QLabel* mpDurationLabel; - QLabel* mpEquipmentLabel; - QLabel* mpActivityLabel; QLineEdit* mpTitle; - QLineEdit* mpEquipment; - QComboBox* mpPhasis; - QComboBox* mpDuration; - QComboBox* mpActivity; UBTeacherStudentAction* mpAction1; UBTeacherStudentAction* mpAction2; UBTeacherStudentAction* mpAction3; UBTeacherBarDropMediaZone* mpDropMediaZone; QWidget* mpContainer; QVBoxLayout* mpContainerLayout; + QCheckBox* mpDuration1; + QCheckBox* mpDuration2; + QCheckBox* mpDuration3; + QButtonGroup* mpDurationButtons; }; #endif // UBTEACHERBARWIDGET_H From df8a8a5ec9dfe61cf5b1efa9b5fe414fc39296da Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Wed, 4 Jan 2012 13:21:12 +0100 Subject: [PATCH 04/99] added class UBWidgetList --- Sankore_3.1.pro | 2 + src/customWidgets/UBWidgetList.cpp | 133 ++++++++++++++++++++++++++++ src/customWidgets/UBWidgetList.h | 44 +++++++++ src/customWidgets/customWidgets.pri | 5 ++ 4 files changed, 184 insertions(+) create mode 100644 src/customWidgets/UBWidgetList.cpp create mode 100644 src/customWidgets/UBWidgetList.h create mode 100644 src/customWidgets/customWidgets.pri diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 3005b8b1..5dfa1b33 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -53,6 +53,7 @@ include(src/desktop/desktop.pri) include(src/web/web.pri) include(src/softwareupdate/softwareupdate.pri) include(src/transition/transition.pri) +include(src/customWidgets/customWidgets.pri) DEPENDPATH += src/pdf-merger INCLUDEPATH += src/pdf-merger @@ -398,3 +399,4 @@ INSTALLS = UB_ETC \ UB_THIRDPARTY_INTERACTIVE OTHER_FILES += + diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp new file mode 100644 index 00000000..2daf1576 --- /dev/null +++ b/src/customWidgets/UBWidgetList.cpp @@ -0,0 +1,133 @@ +#include +#include "UBWidgetList.h" + +UBWidgetList::UBWidgetList(QWidget* parent, eWidgetListOrientation orientation, const char* name):QScrollArea(parent) + , mpLayout(NULL) + , mpContainer(NULL) + , mMargin(5) + , mpEmptyLabel(NULL) +{ + setObjectName(name); + mOrientation = orientation; + mpContainer = new QWidget(this); + mWidgets.clear(); + + if(eWidgetListOrientation_Vertical == orientation){ + setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + mpLayout = new QVBoxLayout(mpContainer); + mpContainer->resize(width(), mpContainer->height()); + }else{ + setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); + setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + mpLayout = new QHBoxLayout(mpContainer); + mpContainer->resize(mpContainer->width(), height()); + } + mpLayout->setContentsMargins(margin(), margin(), margin(), margin()); + mpContainer->setLayout(mpLayout); + setWidget(mpContainer); +} + +UBWidgetList::~UBWidgetList() +{ + if(NULL != mpEmptyLabel){ + delete mpEmptyLabel; + mpEmptyLabel = NULL; + } + if(NULL != mpLayout){ + delete mpLayout; + mpLayout = NULL; + } + if(NULL != mpContainer){ + delete mpContainer; + mpContainer = NULL; + } +} + +void UBWidgetList::addWidget(QWidget *widget) +{ + if(NULL != mpLayout){ + updateSize(true, widget); + mpLayout->addWidget(widget); + mWidgets << widget; + } +} + +void UBWidgetList::removeWidget(QWidget *widget) +{ + if(NULL != mpLayout){ + mpLayout->removeWidget(widget); + mWidgets.remove(mWidgets.indexOf(widget)); + updateSize(false, widget); + widget->setVisible(false); + } +} + +void UBWidgetList::updateSize(bool widgetAdded, QWidget *widget) +{ + float scaleFactor; + int newWidgetWidth; + int newWidgetHeight; + + if(eWidgetListOrientation_Vertical == mOrientation){ + scaleFactor = (float)widget->width() / (float)mpContainer->width(); + }else{ + scaleFactor = (float)widget->height() / (float)mpContainer->height(); + } + + newWidgetWidth = widget->width()*scaleFactor; + newWidgetHeight = widget->height()*scaleFactor; + + widget->resize(newWidgetWidth, newWidgetHeight); + + // Now we have to update the container + if(eWidgetListOrientation_Vertical == mOrientation){ + if(widgetAdded){ + mpContainer->resize(mpContainer->width(), mpContainer->height() + newWidgetHeight); + }else{ + mpContainer->resize(mpContainer->width(), mpContainer->height() - newWidgetHeight); + } + }else{ + if(widgetAdded){ + mpContainer->resize(mpContainer->width() + newWidgetWidth, mpContainer->height()); + }else{ + mpContainer->resize(mpContainer->width() - newWidgetWidth, mpContainer->height()); + } + } +} + +void UBWidgetList::resizeEvent(QResizeEvent *ev) +{ + if(ev->oldSize().width() >= 0 && ev->oldSize().height() >= 0){ + float scale; + if(eWidgetListOrientation_Vertical == mOrientation){ + scale = (float)ev->size().width() / (float)ev->oldSize().width(); + updateAllWidgetsize(scale); + mpContainer->resize(width() - 2, mpContainer->height()*scale); + }else{ + scale = (float)ev->size().height() / (float)ev->oldSize().height(); + updateAllWidgetsize(scale); + mpContainer->resize(mpContainer->width()*scale, height() - 2); + } + } +} + +void UBWidgetList::updateAllWidgetsize(float scale) +{ + for(int i=0; iresize(mWidgets.at(i)->width()*scale, mWidgets.at(i)->height()*scale); + } +} + +void UBWidgetList::setMargin(int margin) +{ + mMargin = margin; +} + +int UBWidgetList::margin() +{ + return mMargin; +} + +// TODO : - add onHover 'delete' button +// - add empty label diff --git a/src/customWidgets/UBWidgetList.h b/src/customWidgets/UBWidgetList.h new file mode 100644 index 00000000..171ece88 --- /dev/null +++ b/src/customWidgets/UBWidgetList.h @@ -0,0 +1,44 @@ +#ifndef UBWIDGETLIST_H +#define UBWIDGETLIST_H + +#include +#include +#include +#include +#include +#include +#include +#include + +typedef enum{ + eWidgetListOrientation_Vertical, + eWidgetListOrientation_Horizontal +}eWidgetListOrientation; + +class UBWidgetList : public QScrollArea +{ + Q_OBJECT + +public: + UBWidgetList(QWidget* parent=0, eWidgetListOrientation orientation = eWidgetListOrientation_Vertical, const char* name = "UBWidgetList"); + ~UBWidgetList(); + void addWidget(QWidget* widget); + void removeWidget(QWidget* widget); + void setMargin(int margin); + int margin(); + +protected: + void resizeEvent(QResizeEvent* ev); + +private: + void updateSize(bool widgetAdded, QWidget* widget); + void updateAllWidgetsize(float scale); + QLayout* mpLayout; + QWidget* mpContainer; + eWidgetListOrientation mOrientation; + int mMargin; + QVector mWidgets; + QLabel* mpEmptyLabel; +}; + +#endif // UBWIDGETLIST_H diff --git a/src/customWidgets/customWidgets.pri b/src/customWidgets/customWidgets.pri new file mode 100644 index 00000000..a5609d31 --- /dev/null +++ b/src/customWidgets/customWidgets.pri @@ -0,0 +1,5 @@ + +HEADERS += src/customWidgets/UBWidgetList.h + +SOURCES += src/customWidgets/UBWidgetList.cpp + From f5931f0f05536d67f064fcfa7ccee6d966d6f7c9 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 4 Jan 2012 13:46:03 +0100 Subject: [PATCH 05/99] src/adaptors --- src/customWidgets/UBWidgetList.cpp | 18 ++++++++++++++- src/customWidgets/UBWidgetList.h | 1 + src/gui/UBTeacherBarWidget.cpp | 37 ++---------------------------- src/gui/UBTeacherBarWidget.h | 2 -- 4 files changed, 20 insertions(+), 38 deletions(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 2daf1576..87a9538d 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -11,6 +11,8 @@ UBWidgetList::UBWidgetList(QWidget* parent, eWidgetListOrientation orientation, mOrientation = orientation; mpContainer = new QWidget(this); mWidgets.clear(); + mpEmptyLabel = new QLabel(this); + mpEmptyLabel->setObjectName("emptyString"); if(eWidgetListOrientation_Vertical == orientation){ setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); @@ -47,6 +49,7 @@ UBWidgetList::~UBWidgetList() void UBWidgetList::addWidget(QWidget *widget) { if(NULL != mpLayout){ + mpEmptyLabel->setVisible(false); updateSize(true, widget); mpLayout->addWidget(widget); mWidgets << widget; @@ -60,6 +63,9 @@ void UBWidgetList::removeWidget(QWidget *widget) mWidgets.remove(mWidgets.indexOf(widget)); updateSize(false, widget); widget->setVisible(false); + if(0 == mpLayout->count()){ + mpEmptyLabel->setVisible(true); + } } } @@ -98,6 +104,10 @@ void UBWidgetList::updateSize(bool widgetAdded, QWidget *widget) void UBWidgetList::resizeEvent(QResizeEvent *ev) { + mpEmptyLabel->setGeometry((width() - mpEmptyLabel->width()) / 2, + (height() - mpEmptyLabel->height()) /2, + mpEmptyLabel->width(), + mpEmptyLabel->height()); if(ev->oldSize().width() >= 0 && ev->oldSize().height() >= 0){ float scale; if(eWidgetListOrientation_Vertical == mOrientation){ @@ -129,5 +139,11 @@ int UBWidgetList::margin() return mMargin; } +void UBWidgetList::setEmptyText(const QString &text) +{ + if(NULL != mpEmptyLabel){ + mpEmptyLabel->setText(text); + } +} + // TODO : - add onHover 'delete' button -// - add empty label diff --git a/src/customWidgets/UBWidgetList.h b/src/customWidgets/UBWidgetList.h index 171ece88..87337458 100644 --- a/src/customWidgets/UBWidgetList.h +++ b/src/customWidgets/UBWidgetList.h @@ -25,6 +25,7 @@ public: void addWidget(QWidget* widget); void removeWidget(QWidget* widget); void setMargin(int margin); + void setEmptyText(const QString& text); int margin(); protected: diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index bf454bf2..2557b50b 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -20,8 +20,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpDurationLabel(NULL) , mpTitle(NULL) , mpAction1(NULL) - , mpAction2(NULL) - , mpAction3(NULL) , mpDropMediaZone(NULL) , mpContainer(NULL) , mpContainerLayout(NULL) @@ -53,11 +51,9 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock // Title mpTitleLabel = new QLabel(tr("Title"), mpContainer); - mpTitleLabel->setMinimumWidth(LABEL_MINWIDHT); - mpTitleLabel->setAlignment(Qt::AlignRight); mpTitle = new QLineEdit(mpContainer); mpTitle->setObjectName("DockPaletteWidgetLineEdit"); - connect(mpTitle, SIGNAL(textChanged(const QString&)), this, SLOT(onTitleTextChanged(const QString&))); + connect(mpTitle, SIGNAL(textChanged(const QString&)), this, SLOT(onTitleTextChanged(const QString&))); mpTitleLayout = new QHBoxLayout(); mpTitleLayout->addWidget(mpTitleLabel, 0); mpTitleLayout->addWidget(mpTitle, 1); @@ -65,7 +61,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock // Duration mpDurationLabel = new QLabel(tr("Duration"), mpContainer); - mpDurationLabel->setMinimumWidth(LABEL_MINWIDHT); mpDurationLayout = new QHBoxLayout(); mpDurationLayout->addWidget(mpDurationLabel, 1); mpDuration1 = new QCheckBox(this); @@ -85,12 +80,8 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock // Actions mpAction1 = new UBTeacherStudentAction(1, mpContainer); - mpAction2 = new UBTeacherStudentAction(2, mpContainer); - mpAction3 = new UBTeacherStudentAction(3, mpContainer); mpLayout->addWidget(mpAction1); - mpLayout->addWidget(mpAction2); - mpLayout->addWidget(mpAction3); // Media mpDropMediaZone = new UBTeacherBarDropMediaZone(); @@ -104,10 +95,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); connect(mpAction1->teacher(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); connect(mpAction1->student(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); - connect(mpAction2->teacher(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); - connect(mpAction2->student(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); - connect(mpAction3->teacher(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); - connect(mpAction3->student(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); } UBTeacherBarWidget::~UBTeacherBarWidget() @@ -116,14 +103,6 @@ UBTeacherBarWidget::~UBTeacherBarWidget() delete mpDropMediaZone; mpDropMediaZone = NULL; } - if(NULL != mpAction3){ - delete mpAction3; - mpAction3 = NULL; - } - if(NULL != mpAction2){ - delete mpAction2; - mpAction2 = NULL; - } if(NULL != mpAction1){ delete mpAction1; mpAction1 = NULL; @@ -187,11 +166,7 @@ void UBTeacherBarWidget::onValueChanged() { if( mpTitle->text() == "" && mpAction1->teacherText() == "" - && mpAction1->studentText() == "" - && mpAction2->teacherText() == "" - && mpAction2->studentText() == "" - && mpAction3->teacherText() == "" - && mpAction3->studentText() == "") + && mpAction1->studentText() == "") { mIconToLeft = QPixmap(":images/teacher_open_disabled.png"); mIconToRight = QPixmap(":images/teacher_close_disabled.png"); @@ -211,10 +186,6 @@ void UBTeacherBarWidget::saveContent() infos.title = mpTitle->text(); infos.action1Master = mpAction1->teacherText(); infos.action1Student = mpAction1->studentText(); - infos.action2Master = mpAction2->teacherText(); - infos.action2Student = mpAction2->studentText(); - infos.action3Master = mpAction3->teacherText(); - infos.action3Student = mpAction3->studentText(); UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos); } @@ -224,10 +195,6 @@ void UBTeacherBarWidget::loadContent() mpTitle->setText(nextInfos.title); mpAction1->setTeacherText(nextInfos.action1Master); mpAction1->setStudentText(nextInfos.action1Student); - mpAction2->setTeacherText(nextInfos.action2Master); - mpAction2->setStudentText(nextInfos.action2Student); - mpAction3->setTeacherText(nextInfos.action3Master); - mpAction3->setStudentText(nextInfos.action3Student); } void UBTeacherBarWidget::onTitleTextChanged(const QString& text) diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index ec7946fb..67a3e97b 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -92,8 +92,6 @@ private: QLabel* mpDurationLabel; QLineEdit* mpTitle; UBTeacherStudentAction* mpAction1; - UBTeacherStudentAction* mpAction2; - UBTeacherStudentAction* mpAction3; UBTeacherBarDropMediaZone* mpDropMediaZone; QWidget* mpContainer; QVBoxLayout* mpContainerLayout; From e4d14dcf8b34f56f25816bca64da9051aba33631 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 4 Jan 2012 14:00:08 +0100 Subject: [PATCH 06/99] updated missing files --- resources/images/duration1.png | Bin 1164 -> 795 bytes resources/images/duration2.png | Bin 1178 -> 909 bytes resources/images/duration3.png | Bin 1338 -> 1140 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/images/duration1.png b/resources/images/duration1.png index e05ffa8ee03484d3fc8a798b9e7597f7eaa1ac0d..5f1f83557afb6952748ea72cc2aad8364c6e5d55 100644 GIT binary patch delta 675 zcmV;U0$lx!37ZCxVFwNY27DVy)RAZ>e*$(%L_t(|+U=S*V zAwe-JT4}&a5XC4cT8Suv;5H&?Cw7Wr;|oMlD@DQ0x{LTIglH$CpahE`SL1iGs!&eICCGT3WRVu-#PccN#+7DE@bxt;^t3L>%GF(lCRg5@A22tOgiODe~XXa zjF|9d#OtCr@p63h_CIj|a+%fwpry9wSUivt|M*|B`x7I#|6C0~uW=&)iqASaAl1t6*KA+{Szd`w!|8ptX0H~>f*J3knj>Al%7 z^I5?u^EkE8+_gS@TDxL<18^J1f7Jj5U%PA_OJjTDShR3&@&hX8qG`Es_q<_+^rcj1%Pz( z@*{F~HC)Ej3{WZ&Dwr_@fR^+n?Nmg2r?zWanQZ_7z+IIvp$h^HNJwaMp zpp|}J05m|zWnLEmk|E?X&u0J_xGPLr3-qLK2mnbC^qMye!0jN67`Ft#jS$S3w*@ZBJA7`Fw0-5_upw-o?R7C6_IEse*@=9L_t(|+U=V^OcPNY$3NHBAjLm)B5~0W z5=~DM5X*#hA{Y{2g0MMgNH8WWCa@Vd8eK?K5`u$U0~0neB9j#tDuD#A(L{+ZBuvFW zEt1&QfoHhXYq?$z=-uNx-?jJsyx+aw@AvLKkX*_^|3OAo&j1}j8xRB&*brt7RoS*Yr6z_2A~p%c=q(jE|NY zZ94$yqoR2&7qJ6`Vne8p1A|uXf42(YpROjd(O@z=R>`ZORABxVFacP0Q7Hg`liT@p z=faQ_R8){lc)Xde>LBWM~_?1 zn7Q6(@^@#PU|tWQcH27x+^9GL#Dv#{!}Ouq+ht~A^q5F>!%l5<-gWqf$D*ybECCQj z&VOpep0c^`+f4XL8&#Qh_IK?5a z03|}{BTEE+g9zA=DDpRqUV(Lq0IVAUNJ<1CX#`+dA^^)q02USvP1^)If%$3sXfb7ic{&j3Kk0 R1^@s607*qo1w^hwV1gS1=$ill diff --git a/resources/images/duration2.png b/resources/images/duration2.png index 29263f1403c45f83da86d00f2492fa74d0c2763d..37dcb1cacca0c1b080717f93e5119839e10852ce 100644 GIT binary patch delta 790 zcmV+x1L^#l35^GkVFwNd2Si=(g^_3{e*)-9L_t(|+U=V^XcJK!$KPEGog&H73>FNM zL4v_liIWXDsHH@k2r2Dk#Zah!mY_77xHTv){s{y{oeTz&ixn|C1g@PLYEvSiLntSh z;aqZWQnpIUj-{?_-MwA>MI3-mrrQB%Cx4aW9fGo97vv5$ysA(3`LmldVgl`fw0MHwu5r7eZzr6^c z0Zd6X0W<(xO*sG!z$z(af9L>qKm)MUm975(FxQ_j5X}3l9IyR+4lV%>LD>Mk53q}J zsx1K8r$MN~Wt$tSKqbIgkrQ3F!nCHqU*-5#eT85W;4aBA-7iD5rC@2FOSbDO1(5(( zxe+z|I!sFnBKdT|i0Fab|Suwjkvw3($Z@;ka1dsqBC~!F+e|X{Et)i&gmzf9Q`jn2dTYPyh6W256 zvDAQJOG6}|4x2G=Isv$nK=hFr93Y54G}S8zYL3mB1wq}xNuw}^;pps0BLUYR6#`p( UYMH7l00000NkvXX1g=70f_sH#DF6Tf delta 1061 zcmV+=1ls$J2bu|xVFwKdA`}F)+L34{e*^VNL_t(|+U=V^NE=Zc$G?}PsPS*6fQzDn zk{F29xTx9E6d^hpvUN}dZNa5Qx6(~%7ok-U9l8abR1j>om@cMPAzn~OMHeAc{GUp5 zcU?|A(wF4CoHTdO@BA*w_jAAZ-tYJFdjREP9{US!?DiS}y#P7^*Z?#Es0Uzie?==R z8D8MaZjr9K5>mD2IJKmNqq;L8UUw$!R9^~_w{P|?GzZ|uZf^iE1i%Ntook#cT3PV3 zS`WBz0OHC&s8;}c9mc`z9U(gchM;pLt%jj|0DO7} zaNNlFhycWb$E|k&hiyi;v`~^pKrblKWi``F0?0OgVbNYi4v?DpQPe-uE9764UOLW%_7 zlokNB=l5Qv0FGz@U`Yu_Bmi+*0MwlcaT0(XiU91807Pg3P<<&x{sCZS*$V(+y_;`6 z;KI_s&$APub-e>kU=IScVcOEbW;9BeE z%hSTOEzV8JIS&9~N0`t$08c10k*}3D?}?C^WtRZVYt?*DBr{*Ag|^_4n3-kA0c>i` ze0z-BTzK(wywEtgXM%nJ+gdT-oZz=zQO+-CtSkUxp){Zce+bP9e!FigGa$ELSoW!~ znPrmzJf%Dx+GE_NJDl;nd%c&G`;4Od0%G@Q(G8Spc8m8!GV^lgyy6HTEQ}+ikSCO< zg=^p1pAjYI6$6lLk@o+YF?L0{pnv&~UFmHR#Z!PVCFr~~l>-EQ*X9Ty=)5?Y14c<- foqf`iDA!*_6RnH@^+67600000NkvXXu0mjf_qFLh diff --git a/resources/images/duration3.png b/resources/images/duration3.png index 9280a6421ebe27461f8043180d4ed2b2e2fdc4f7..9c61f7f8d1f509bc18fa4d3e24cb3b32a9c1702e 100644 GIT binary patch delta 1022 zcmVv(tiGPCOG$hB|VlkwK zEKqR1XlK$3q3wEgcbA#FTn|j1szR5v{dg9HieIxk^4iF-EFQPDJ_62 zcsv4_F?oq;r8hMExXC$}QUc-yPgDT2E7b0gnGX?2GQdwNfKKBkF|P6idrop_AjyK~ zLjavltEHu{!TBnYebHpW^OeCs^!y9@>i>jdQe*gdgaI4X7 zP6EVMeLAyQxSp*Gpy>br0Prf&)|djsT75c`O56~6Mu4gV006)*M@>)*@F|cQRsmvf zf97P!yitO#0{{TvK#G(=Er7%jE$jkRPzwmikX)z*Y-2J7)B?Vy>ocJiz)Tvw!S^F- zp#=I42n#4UwC%wH&14M=f5;{SK3D`WS;GQk0cr~t0Zi7g0F0zOun1tXG6gsw65u!{ zKzcx}!XkjldgS$Z-G+8~HVfB_8NPaluvv;7Wvtf$3LiBi_UcD69uXk-hbF}?Ad>Oe z7b15)X^BZCZV)59$xBSXx#_@TUJ5I{p<%IBpN)<68zC`HhLMwBf6SX9wL4@MTlJ$c zMg2;wX<0iqmWMZp0lsmQ7#}TjG{$v1tnvhV#8UlOERtwHeEhJx-*uJTUb~!MD`fai ztEJ`9J(o3Z0RRB7`fk_RT)r=NUCP%95&rI%siEfv=aX1tIDIL4`?Gd_N`Y4h3Et=< z7T#WWRQ_umr$=Hse|xaL(m%Z}6!=R2^t#R-tmiUT!e!9n-0opZLFUZ4i{JI$3wc?o z4qv+Rr?#uZ^^-RN006KwxBL74mCT8Z^WTa$u{>p}w*8H@AZK{ab3kNT7mEi+3XN^4 zHsKAIZ?wm|UqX+?hs!tGJFS+MR65lq0-taP&@m5bay%+YY+tgj7?ZkWhMC^cqAIr< z?fzdkP${!$icN%9iMF2B^MsULHpg~o_~od{r$A~>+7*IYILVg&0Zqn%6e%GwL`!0b sDj-90w=tQ5`HC8VGy$G^{AoH~srdtru! z>1?2q7)VUxU`^A(aBhNi6m*WgD8(&cDYzFK@m)9A3uS#HbPCeFkWuFB7;9y2H7~YW zWwdFUKqOR1iyg!1UMz7@Q(5kAZ?g27UgCKN9 zxoVEF6Q7UGmPgj_rE_ zGE>?#fDSo+yc`MOt0lr*cLkW=q$Q*14C1een|i_i=0uV@Amxdy3vtwdxMk&441+@FUL9|YN3bs1R%4v?}JKo z$3^#@pLBHYB>_IQ6+R+1f66BcK&JOSY6Gy`OnZbtsU5&dBk2+ZklFBf)DB>|nfCBEO8f-4p%EqZ#4QBCsTBYT z191uguxJQ?MF>EXRsh6}q)7-sy;cBh)IRpg2Vm3+fX!-R6arAGe-!{b<&V8)Yl3aJ zo(D$}XieD!lnt*Db?EfMDWH?IVXKPCqNt^m_}IL6*qiuuDa_O>g)^onUqi)l1B zySDRwOWjOTPdxD#$e~g_0Q|FSTOU~KrqepK{%NAjr5gKJe`Q3Q z7d-|jVPF(9f8Z6B0KS4>{qaM;t?u{VUZP%4myzcVdY*sl$Mo6J?$BpauBW9wc;VZ% z(1$PAT`v0vFRmVAk``KKsM#k+8>n5sarIB(e2&!lnv3z>$(?+sp-)Bpeg07*qoM6N<$f|iy;r~m)} From 002c544cff0d43d1cbb54c4c2865e7eef1a74749 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 4 Jan 2012 14:38:41 +0100 Subject: [PATCH 07/99] Added the action viewer --- resources/style.qss | 3 ++- src/gui/UBTeacherBarWidget.cpp | 18 ++++-------------- src/gui/UBTeacherBarWidget.h | 5 +++-- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/resources/style.qss b/resources/style.qss index cfa6b41c..503822a7 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -4,7 +4,8 @@ QWidget#UBLibPathViewer, QWidget#UBTeacherStudentAction, QWidget#UBLibNavigatorWidget, QWidget#UBLibItemProperties, -QWidget#UBDownloadWidget +QWidget#UBDownloadWidget, +QWidget#UBWidgetList { background: #EEEEEE; border-radius: 10px; diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 2557b50b..7674e111 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -27,6 +27,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpDuration2(NULL) , mpDuration3(NULL) , mpDurationButtons(NULL) + , mpActions(NULL) { setObjectName(name); mName = "TeacherBarWidget"; @@ -79,9 +80,9 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpLayout->addLayout(mpDurationLayout); // Actions - mpAction1 = new UBTeacherStudentAction(1, mpContainer); - - mpLayout->addWidget(mpAction1); + mpActions = new UBWidgetList(this); + mpActions->setEmptyText(tr("Add actions")); + mpLayout->addWidget(mpActions); // Media mpDropMediaZone = new UBTeacherBarDropMediaZone(); @@ -93,8 +94,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(loadContent())); connect(UBApplication::mainWindow->actionQuit, SIGNAL(triggered()), this, SLOT(saveContent())); connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); - connect(mpAction1->teacher(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); - connect(mpAction1->student(), SIGNAL(textChanged()), this, SLOT(onValueChanged())); } UBTeacherBarWidget::~UBTeacherBarWidget() @@ -184,8 +183,6 @@ void UBTeacherBarWidget::saveContent() { sTeacherBarInfos infos; infos.title = mpTitle->text(); - infos.action1Master = mpAction1->teacherText(); - infos.action1Student = mpAction1->studentText(); UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos); } @@ -193,8 +190,6 @@ void UBTeacherBarWidget::loadContent() { sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); mpTitle->setText(nextInfos.title); - mpAction1->setTeacherText(nextInfos.action1Master); - mpAction1->setStudentText(nextInfos.action1Student); } void UBTeacherBarWidget::onTitleTextChanged(const QString& text) @@ -202,11 +197,6 @@ void UBTeacherBarWidget::onTitleTextChanged(const QString& text) mpTitle->setToolTip(text); } -void UBTeacherBarWidget::onEquipmentTextChanged(const QString& text) -{ - -} - UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent, const char *name):QWidget(parent) , mpActionLabel(NULL) , mpTeacherLabel(NULL) diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 67a3e97b..423761bd 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -15,6 +15,7 @@ class UBVideoPlayer; #include #include "UBDockPaletteWidget.h" +#include "customWidgets/UBWidgetList.h" #define LABEL_MINWIDHT 80 @@ -79,8 +80,7 @@ private slots: void saveContent(); void loadContent(); void onValueChanged(); - void onTitleTextChanged(const QString& text); - void onEquipmentTextChanged(const QString& text); + void onTitleTextChanged(const QString& text); private: void populateCombos(); @@ -99,6 +99,7 @@ private: QCheckBox* mpDuration2; QCheckBox* mpDuration3; QButtonGroup* mpDurationButtons; + UBWidgetList* mpActions; }; #endif // UBTEACHERBARWIDGET_H From 0045204c7a623dafd7589d9ed8a02c944d3fb787 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Wed, 4 Jan 2012 14:39:52 +0100 Subject: [PATCH 08/99] first draft --- src/gui/UBTeacherBarWidget.cpp | 103 ++++++++------------------------- src/gui/UBTeacherBarWidget.h | 12 ++-- 2 files changed, 28 insertions(+), 87 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 2557b50b..bd0a20b0 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -1,7 +1,8 @@ - #include "UBTeacherBarWidget.h" +#include "UBTeacherBarWidget.h" #include "core/UBApplication.h" #include "core/UBPersistenceManager.h" + #include "UBMainWindow.h" #include "document/UBDocumentController.h" @@ -10,6 +11,10 @@ #include "board/UBBoardController.h" #include "board/UBBoardPaletteManager.h" +#include "gui/UBMediaPlayer.h" + +#include "frameworks/UBFileSystemUtils.h" + #include "core/memcheck.h" UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDockPaletteWidget(parent) @@ -326,110 +331,50 @@ QTextEdit* UBTeacherStudentAction::student() return mpStudent; } -#include "gui/UBMediaPlayer.h" -#include "gui/UBVideoPlayer.h" -#include "frameworks/UBFileSystemUtils.h" -UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char *name):QWidget(parent) - , mpTitleLabel(NULL) - , mpImageTab(NULL) - , mpTabWidget(NULL) - , mpLayout(NULL) +UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char *name):UBWidgetList(parent) + { setObjectName(name); setAcceptDrops(true); - - setAttribute(Qt::WA_StyledBackground, true); - setStyleSheet(UBApplication::globalStyleSheet()); - - // Create the GUI - mpLayout = new QVBoxLayout(this); - setLayout(mpLayout); - - - mpImageTab = new QLabel(); - mpVideoTab = new UBMediaPlayer(); - mpAudioTab = new UBMediaPlayer(); - - mpTitleLabel = new QLabel(tr("Drop media here")); - mpLayout->addWidget(mpTitleLabel); - mpTabWidget = new QTabWidget(); - mpTabWidget->setMinimumHeight(120); - mpTabWidget->addTab(mpImageTab,QIcon(":images/toolbar/extraTool.png"),""); - mpTabWidget->addTab(mpVideoTab,QIcon(":images/libpalette/movieIcon.svg"),""); - mpTabWidget->addTab(mpAudioTab,QIcon(":images/libpalette/soundIcon.svg"),""); - mpLayout->addWidget(mpTabWidget); + setEmptyText(tr("Drag media here ...")); } UBTeacherBarDropMediaZone::~UBTeacherBarDropMediaZone() { - if(NULL != mpTitleLabel) - { - delete mpTitleLabel; - mpTitleLabel = NULL; - } - if(NULL != mpImageTab) - { - delete mpImageTab; - mpImageTab = NULL; - } - if(NULL != mpVideoTab) - { - delete mpVideoTab; - mpVideoTab = NULL; - } - if(NULL != mpAudioTab) - { - delete mpAudioTab; - mpAudioTab = NULL; - } - if(NULL != mpTabWidget) - { - delete mpTabWidget; - mpTabWidget = NULL; - } - if(NULL != mpLayout) - { - delete mpLayout; - mpLayout = NULL; - } + qDeleteAll(mWidgetList); } void UBTeacherBarDropMediaZone::dragEnterEvent(QDragEnterEvent *pEvent) { - setBackgroundRole(QPalette::Highlight); pEvent->acceptProposedAction(); } void UBTeacherBarDropMediaZone::dragLeaveEvent(QDragLeaveEvent *pEvent) { - setBackgroundRole(QPalette::Dark); pEvent->accept(); } void UBTeacherBarDropMediaZone::dropEvent(QDropEvent *pEvent) { - setBackgroundRole(QPalette::Dark); - if(pEvent->mimeData()->hasHtml()) qDebug() << pEvent->mimeData()->html(); - if(pEvent->mimeData()->hasUrls()) qDebug() << pEvent->mimeData()->urls(); - if(pEvent->mimeData()->hasText()) qDebug() << pEvent->mimeData()->text(); QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(pEvent->mimeData()->urls().at(0).toLocalFile()); if(mimeType.contains("image")){ QPixmap pix = QPixmap(pEvent->mimeData()->urls().at(0).toLocalFile()); - mpImageTab->setPixmap(pix); - mpTabWidget->setCurrentWidget(mpImageTab); - } - else if(mimeType.contains("video")){ - mpVideoTab->setFile(pEvent->mimeData()->urls().at(0).toLocalFile()); - mpVideoTab->playPause(); - - mpTabWidget->setCurrentWidget(mpVideoTab); - } - else if(mimeType.contains("audio")){ - mpVideoTab->setFile(pEvent->mimeData()->urls().at(0).toLocalFile()); - mpVideoTab->playPause(); - mpTabWidget->setCurrentWidget(mpAudioTab); + float ratio = (float)width()/(float)pix.width(); + pix.transformed(QTransform::scale((float)pix.width()/ratio,(float)pix.height()/ratio)); + QLabel* label = new QLabel(); + label->setPixmap(pix); + label->setScaledContents(true); + addWidget(label); + mWidgetList << label; + } + else if(mimeType.contains("video") || mimeType.contains("audio")){ + UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + mediaPlayer->setFile(pEvent->mimeData()->urls().at(0).toLocalFile()); + mediaPlayer->playPause(); + addWidget(mediaPlayer); + mWidgetList << mediaPlayer; } else{ qWarning() << "bad idea to come here"; diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 67a3e97b..a7abe72c 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -2,7 +2,6 @@ #define UBTEACHERBARWIDGET_H class UBMediaPlayer; -class UBVideoPlayer; #include #include @@ -14,6 +13,8 @@ class UBVideoPlayer; #include #include +#include "customWidgets/UBWidgetList.h" + #include "UBDockPaletteWidget.h" #define LABEL_MINWIDHT 80 @@ -45,7 +46,7 @@ private: }; -class UBTeacherBarDropMediaZone : public QWidget +class UBTeacherBarDropMediaZone : public UBWidgetList { Q_OBJECT @@ -54,12 +55,7 @@ public: ~UBTeacherBarDropMediaZone(); private: - QLabel* mpTitleLabel; - QLabel* mpImageTab; - UBMediaPlayer* mpVideoTab; - UBMediaPlayer* mpAudioTab; - QTabWidget* mpTabWidget; - QVBoxLayout* mpLayout; + QListmWidgetList; protected: void dragEnterEvent(QDragEnterEvent* pEvent); From 176977677e755cac0fd8261f498b44f0478a4365 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Wed, 4 Jan 2012 14:41:35 +0100 Subject: [PATCH 09/99] second draft --- src/gui/UBTeacherBarWidget.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 5a62f301..3b403e2c 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -351,8 +351,6 @@ void UBTeacherBarDropMediaZone::dropEvent(QDropEvent *pEvent) QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(pEvent->mimeData()->urls().at(0).toLocalFile()); if(mimeType.contains("image")){ QPixmap pix = QPixmap(pEvent->mimeData()->urls().at(0).toLocalFile()); - float ratio = (float)width()/(float)pix.width(); - pix.transformed(QTransform::scale((float)pix.width()/ratio,(float)pix.height()/ratio)); QLabel* label = new QLabel(); label->setPixmap(pix); label->setScaledContents(true); From 5c0d14b7dede99c63f4b2cac97741bbe9071433e Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 4 Jan 2012 14:45:34 +0100 Subject: [PATCH 10/99] Updated the stylesheet --- resources/style.qss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/style.qss b/resources/style.qss index 503822a7..fabe3668 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -5,7 +5,8 @@ QWidget#UBTeacherStudentAction, QWidget#UBLibNavigatorWidget, QWidget#UBLibItemProperties, QWidget#UBDownloadWidget, -QWidget#UBWidgetList +QWidget#UBWidgetList, +QWidget#UBTeacherBarDropMediaZone { background: #EEEEEE; border-radius: 10px; From 38ee9bf8b6719506e29ec3b69eb041df5b2697dc Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 4 Jan 2012 17:00:33 +0100 Subject: [PATCH 11/99] backup --- src/gui/UBTeacherBarWidget.cpp | 93 ++++++++++++++++++++++++++++------ src/gui/UBTeacherBarWidget.h | 14 +++-- 2 files changed, 89 insertions(+), 18 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 3b403e2c..b5aa5d33 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -25,6 +25,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpDurationLabel(NULL) , mpTitle(NULL) , mpAction1(NULL) + , mpMediaLabel(NULL) , mpDropMediaZone(NULL) , mpContainer(NULL) , mpContainerLayout(NULL) @@ -32,7 +33,13 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpDuration2(NULL) , mpDuration3(NULL) , mpDurationButtons(NULL) + , mpActionLabel(NULL) , mpActions(NULL) + , mpActionButton(NULL) + , mpCommentLabel(NULL) + , mpComments(NULL) + , mpLinkLabel(NULL) + , mpLinks(NULL) { setObjectName(name); mName = "TeacherBarWidget"; @@ -60,15 +67,13 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpTitle = new QLineEdit(mpContainer); mpTitle->setObjectName("DockPaletteWidgetLineEdit"); connect(mpTitle, SIGNAL(textChanged(const QString&)), this, SLOT(onTitleTextChanged(const QString&))); - mpTitleLayout = new QHBoxLayout(); - mpTitleLayout->addWidget(mpTitleLabel, 0); - mpTitleLayout->addWidget(mpTitle, 1); - mpLayout->addLayout(mpTitleLayout); + mpLayout->addWidget(mpTitleLabel, 0); + mpLayout->addWidget(mpTitle, 0); // Duration mpDurationLabel = new QLabel(tr("Duration"), mpContainer); + mpLayout->addWidget(mpDurationLabel, 0); mpDurationLayout = new QHBoxLayout(); - mpDurationLayout->addWidget(mpDurationLabel, 1); mpDuration1 = new QCheckBox(this); mpDuration1->setIcon(QIcon(":images/duration1.png")); mpDurationLayout->addWidget(mpDuration1, 0); @@ -82,35 +87,88 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpDurationButtons->addButton(mpDuration1); mpDurationButtons->addButton(mpDuration2); mpDurationButtons->addButton(mpDuration3); - mpLayout->addLayout(mpDurationLayout); + mpLayout->addLayout(mpDurationLayout, 0); // Actions + mpActionLabel = new QLabel(tr("Actions"), this); + mpLayout->addWidget(mpActionLabel, 0); mpActions = new UBWidgetList(this); mpActions->setEmptyText(tr("Add actions")); - mpLayout->addWidget(mpActions); + mpLayout->addWidget(mpActions, 1); + mpActionButton = new QPushButton(this); + mpActionButton->setObjectName("DockPaletteWidgetButton"); + mpActionButton->setText(tr("Add action")); + mpLayout->addWidget(mpActionButton, 0); // Media + mpMediaLabel = new QLabel(tr("Media"), this); + mpLayout->addWidget(mpMediaLabel, 0); mpDropMediaZone = new UBTeacherBarDropMediaZone(); - mpLayout->addWidget(mpDropMediaZone); - - populateCombos(); + mpLayout->addWidget(mpDropMediaZone, 1); + + // Links + mpLinkLabel = new QLabel(tr("Links"), this); + mpLayout->addWidget(mpLinkLabel, 0); + mpLinks = new UBWidgetList(this); + mpLayout->addWidget(mpLinks, 1); + mpLinkButton = new QPushButton(tr("Add link"), this); + mpLinkButton->setObjectName("DockPaletteWidgetButton"); + mpLayout->addWidget(mpLinkButton); + + // Comments + mpCommentLabel = new QLabel(tr("Comments"), this); + mpLayout->addWidget(mpCommentLabel, 0); + mpComments = new QTextEdit(this); + mpComments->setObjectName("DockPaletteWidgetBox"); + mpComments->setStyleSheet("background:white;"); + mpLayout->addWidget(mpComments, 1); connect(UBApplication::boardController, SIGNAL(activeSceneWillChange()), this, SLOT(saveContent())); connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(loadContent())); connect(UBApplication::mainWindow->actionQuit, SIGNAL(triggered()), this, SLOT(saveContent())); connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); + connect(mpActionButton, SIGNAL(clicked()), this, SLOT(onActionButton())); + connect(mpLinkButton, SIGNAL(clicked()), this, SLOT(onLinkButton())); } UBTeacherBarWidget::~UBTeacherBarWidget() { + if(NULL != mpComments){ + delete mpComments; + mpComments = NULL; + } + if(NULL != mpCommentLabel){ + delete mpCommentLabel; + mpCommentLabel = NULL; + } + if(NULL != mpLinks){ + delete mpLinks; + mpLinks = NULL; + } + if(NULL != mpLinkLabel){ + delete mpLinkLabel; + mpLinkLabel = NULL; + } if(NULL != mpDropMediaZone){ delete mpDropMediaZone; mpDropMediaZone = NULL; } + if(NULL != mpMediaLabel){ + delete mpMediaLabel; + mpMediaLabel = NULL; + } + if(NULL != mpActionButton){ + delete mpActionButton; + mpActionButton = NULL; + } if(NULL != mpAction1){ delete mpAction1; mpAction1 = NULL; } + if(NULL != mpActionLabel){ + delete mpActionLabel; + mpActionLabel = NULL; + } if(NULL != mpDurationLabel){ delete mpDurationLabel; mpDurationLabel = NULL; @@ -161,11 +219,6 @@ UBTeacherBarWidget::~UBTeacherBarWidget() } } -void UBTeacherBarWidget::populateCombos() -{ - -} - void UBTeacherBarWidget::onValueChanged() { if( mpTitle->text() == "" @@ -202,6 +255,16 @@ void UBTeacherBarWidget::onTitleTextChanged(const QString& text) mpTitle->setToolTip(text); } +void UBTeacherBarWidget::onActionButton() +{ + +} + +void UBTeacherBarWidget::onLinkButton() +{ + +} + UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent, const char *name):QWidget(parent) , mpActionLabel(NULL) , mpTeacherLabel(NULL) diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 9ac35434..5176bf25 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -12,7 +12,7 @@ class UBMediaPlayer; #include #include #include - +#include #include "customWidgets/UBWidgetList.h" #include "UBDockPaletteWidget.h" @@ -77,10 +77,10 @@ private slots: void loadContent(); void onValueChanged(); void onTitleTextChanged(const QString& text); + void onActionButton(); + void onLinkButton(); private: - void populateCombos(); - QVBoxLayout* mpLayout; QHBoxLayout* mpTitleLayout; QHBoxLayout* mpDurationLayout; @@ -88,6 +88,7 @@ private: QLabel* mpDurationLabel; QLineEdit* mpTitle; UBTeacherStudentAction* mpAction1; + QLabel* mpMediaLabel; UBTeacherBarDropMediaZone* mpDropMediaZone; QWidget* mpContainer; QVBoxLayout* mpContainerLayout; @@ -95,7 +96,14 @@ private: QCheckBox* mpDuration2; QCheckBox* mpDuration3; QButtonGroup* mpDurationButtons; + QLabel* mpActionLabel; UBWidgetList* mpActions; + QPushButton* mpActionButton; + QLabel* mpLinkLabel; + UBWidgetList* mpLinks; + QPushButton* mpLinkButton; + QLabel* mpCommentLabel; + QTextEdit* mpComments; }; #endif // UBTEACHERBARWIDGET_H From 453debb2a35578675d5a36ff7c5103c48bc622b1 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Wed, 4 Jan 2012 17:04:58 +0100 Subject: [PATCH 12/99] changed to have a correct the wrong resize behaviour --- src/customWidgets/UBWidgetList.cpp | 15 +++++++--- src/gui/UBTeacherBarWidget.cpp | 44 +++++++++++++++++++++++++----- src/gui/UBTeacherBarWidget.h | 5 +++- 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 87a9538d..fa3ce3ed 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -76,16 +76,23 @@ void UBWidgetList::updateSize(bool widgetAdded, QWidget *widget) int newWidgetHeight; if(eWidgetListOrientation_Vertical == mOrientation){ - scaleFactor = (float)widget->width() / (float)mpContainer->width(); + scaleFactor = (float)mpContainer->width() / (float)widget->width(); }else{ - scaleFactor = (float)widget->height() / (float)mpContainer->height(); + scaleFactor = (float)mpContainer->height() / (float)widget->height(); } - newWidgetWidth = widget->width()*scaleFactor; - newWidgetHeight = widget->height()*scaleFactor; + newWidgetWidth = (int)((float)widget->width()*scaleFactor); + newWidgetHeight = (int)((float)widget->height()*scaleFactor); + + qDebug() << "container size " << mpContainer->size(); + qDebug() << "widget size " << widget->size(); + qDebug() << "scale factor " << scaleFactor; + widget->resize(newWidgetWidth, newWidgetHeight); + qDebug() << "widget new value " << newWidgetWidth << "x" << newWidgetHeight; + // Now we have to update the container if(eWidgetListOrientation_Vertical == mOrientation){ if(widgetAdded){ diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 3b403e2c..20229a03 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -322,12 +322,16 @@ QTextEdit* UBTeacherStudentAction::student() } -UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char *name):UBWidgetList(parent) +UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char *name):QWidget(parent) { setObjectName(name); setAcceptDrops(true); - setEmptyText(tr("Drag media here ...")); + + mWidget.setEmptyText(tr("Drag media here ...")); + mLayout.addWidget(&mWidget); + setLayout(&mLayout); + } UBTeacherBarDropMediaZone::~UBTeacherBarDropMediaZone() @@ -348,20 +352,46 @@ void UBTeacherBarDropMediaZone::dragLeaveEvent(QDragLeaveEvent *pEvent) void UBTeacherBarDropMediaZone::dropEvent(QDropEvent *pEvent) { - QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(pEvent->mimeData()->urls().at(0).toLocalFile()); + QPixmap pixFromDropEvent; + QString mimeType; + QString resourcePath; + if(pEvent->mimeData()->hasText()){ + qDebug() << "pEvent->mimeData()->hasText()" << pEvent->mimeData()->text(); + resourcePath = pEvent->mimeData()->text(); + } + else if(pEvent->mimeData()->hasUrls()){ + qDebug() << "pEvent->mimeData()->hasUrls()" << pEvent->mimeData()->urls().at(0); + resourcePath = pEvent->mimeData()->urls().at(0).toLocalFile(); + } + else if(pEvent->mimeData()->hasImage()){ + qDebug() << "pEvent->mimeData()->hasImage()"; + pixFromDropEvent.loadFromData(pEvent->mimeData()->imageData().toByteArray()); + if(!pixFromDropEvent.isNull()) + mimeType = "image"; + } + + if (mimeType.isEmpty() && resourcePath.isEmpty()){ + pEvent->acceptProposedAction(); + return; + } + + mimeType = mimeType.isEmpty() ? UBFileSystemUtils::mimeTypeFromFileName(resourcePath) : mimeType; if(mimeType.contains("image")){ - QPixmap pix = QPixmap(pEvent->mimeData()->urls().at(0).toLocalFile()); + qDebug() << pixFromDropEvent.size(); + QPixmap pix = pixFromDropEvent.height() ? pixFromDropEvent : QPixmap(resourcePath); QLabel* label = new QLabel(); label->setPixmap(pix); + //label->resize(size()); label->setScaledContents(true); - addWidget(label); + mWidget.addWidget(label); mWidgetList << label; } else if(mimeType.contains("video") || mimeType.contains("audio")){ UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); - mediaPlayer->setFile(pEvent->mimeData()->urls().at(0).toLocalFile()); + mediaPlayer->setFile(resourcePath); + //mediaPlayer->resize(size()); mediaPlayer->playPause(); - addWidget(mediaPlayer); + mWidget.addWidget(mediaPlayer); mWidgetList << mediaPlayer; } else{ diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 9ac35434..63f7e262 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -47,7 +47,7 @@ private: }; -class UBTeacherBarDropMediaZone : public UBWidgetList +class UBTeacherBarDropMediaZone : public QWidget { Q_OBJECT @@ -57,6 +57,9 @@ public: private: QListmWidgetList; + UBWidgetList mWidget; + QVBoxLayout mLayout; + protected: void dragEnterEvent(QDragEnterEvent* pEvent); From 89e16fdecdcbce12890a995eff450541f3aa9ecc Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 08:47:07 +0100 Subject: [PATCH 13/99] Added some minor changes on the GUI --- src/gui/UBTeacherBarWidget.cpp | 26 ++++++++++++++++++++++++-- src/gui/UBTeacherBarWidget.h | 2 ++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index c9e33340..dfc0d712 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -36,10 +36,13 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpActionLabel(NULL) , mpActions(NULL) , mpActionButton(NULL) + , mpActionLayout(NULL) , mpCommentLabel(NULL) , mpComments(NULL) , mpLinkLabel(NULL) , mpLinks(NULL) + , mpLinkButton(NULL) + , mpLinkLayout(NULL) { setObjectName(name); mName = "TeacherBarWidget"; @@ -76,6 +79,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpDurationLayout = new QHBoxLayout(); mpDuration1 = new QCheckBox(this); mpDuration1->setIcon(QIcon(":images/duration1.png")); + mpDuration1->setChecked(true); mpDurationLayout->addWidget(mpDuration1, 0); mpDuration2 = new QCheckBox(this); mpDuration2->setIcon(QIcon(":images/duration2.png")); @@ -98,7 +102,10 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpActionButton = new QPushButton(this); mpActionButton->setObjectName("DockPaletteWidgetButton"); mpActionButton->setText(tr("Add action")); - mpLayout->addWidget(mpActionButton, 0); + mpActionLayout = new QHBoxLayout(); + mpActionLayout->addWidget(mpActionButton, 0); + mpActionLayout->addStretch(1); + mpLayout->addLayout(mpActionLayout, 0); // Media mpMediaLabel = new QLabel(tr("Media"), this); @@ -113,7 +120,10 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpLayout->addWidget(mpLinks, 1); mpLinkButton = new QPushButton(tr("Add link"), this); mpLinkButton->setObjectName("DockPaletteWidgetButton"); - mpLayout->addWidget(mpLinkButton); + mpLinkLayout = new QHBoxLayout(); + mpLinkLayout->addWidget(mpLinkButton, 0); + mpLinkLayout->addStretch(1); + mpLayout->addLayout(mpLinkLayout, 0); // Comments mpCommentLabel = new QLabel(tr("Comments"), this); @@ -149,6 +159,14 @@ UBTeacherBarWidget::~UBTeacherBarWidget() delete mpLinkLabel; mpLinkLabel = NULL; } + if(NULL != mpLinkButton){ + delete mpLinkButton; + mpLinkButton = NULL; + } + if(NULL != mpLinkLayout){ + delete mpLinkLayout; + mpLinkLayout = NULL; + } if(NULL != mpDropMediaZone){ delete mpDropMediaZone; mpDropMediaZone = NULL; @@ -161,6 +179,10 @@ UBTeacherBarWidget::~UBTeacherBarWidget() delete mpActionButton; mpActionButton = NULL; } + if(NULL != mpActionLayout){ + delete mpActionLayout; + mpActionLayout = NULL; + } if(NULL != mpAction1){ delete mpAction1; mpAction1 = NULL; diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 7ba1eeb9..a9d939d0 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -102,9 +102,11 @@ private: QLabel* mpActionLabel; UBWidgetList* mpActions; QPushButton* mpActionButton; + QHBoxLayout* mpActionLayout; QLabel* mpLinkLabel; UBWidgetList* mpLinks; QPushButton* mpLinkButton; + QHBoxLayout* mpLinkLayout; QLabel* mpCommentLabel; QTextEdit* mpComments; }; From 9b470227833083506ce15d8bbab6fed440f51761 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 09:48:52 +0100 Subject: [PATCH 14/99] Added the actions --- src/gui/UBTeacherBarWidget.cpp | 136 ++++++++++----------------------- src/gui/UBTeacherBarWidget.h | 27 +++---- 2 files changed, 52 insertions(+), 111 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index dfc0d712..8b80beb1 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -243,9 +243,7 @@ UBTeacherBarWidget::~UBTeacherBarWidget() void UBTeacherBarWidget::onValueChanged() { - if( mpTitle->text() == "" - && mpAction1->teacherText() == "" - && mpAction1->studentText() == "") + if( mpTitle->text() == "") { mIconToLeft = QPixmap(":images/teacher_open_disabled.png"); mIconToRight = QPixmap(":images/teacher_close_disabled.png"); @@ -279,7 +277,9 @@ void UBTeacherBarWidget::onTitleTextChanged(const QString& text) void UBTeacherBarWidget::onActionButton() { - + UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); + mActionList << pAction; + mpActions->addWidget(pAction); } void UBTeacherBarWidget::onLinkButton() @@ -287,126 +287,74 @@ void UBTeacherBarWidget::onLinkButton() } -UBTeacherStudentAction::UBTeacherStudentAction(int actionNumber, QWidget *parent, const char *name):QWidget(parent) - , mpActionLabel(NULL) - , mpTeacherLabel(NULL) - , mpStudentLabel(NULL) - , mpTeacher(NULL) - , mpStudent(NULL) - , mpLayout(NULL) - , mpTeacherLayout(NULL) - , mpStudentLayout(NULL) +UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) + , mpText(NULL) + , mpLayout(NULL) + , mpComboLayout(NULL) + , mpCombo(NULL) { setObjectName(name); - mActionNumber = actionNumber; setAttribute(Qt::WA_StyledBackground, true); setStyleSheet(UBApplication::globalStyleSheet()); // Create the GUI - mpLayout = new QVBoxLayout(this); + mpLayout = new QHBoxLayout(this); setLayout(mpLayout); - mpActionLabel = new QLabel(tr("Action %0").arg(mActionNumber), this); - mpLayout->addWidget(mpActionLabel, 0); + mpComboLayout = new QVBoxLayout(); + + mpCombo = new QComboBox(this); + mpCombo->addItem(tr("Teacher")); + mpCombo->addItem(tr("Student")); + mpComboLayout->addWidget(0); + mpComboLayout->addStretch(1); + + mpLayout->addLayout(mpComboLayout, 0); + + mpText = new QTextEdit(this); + mpLayout->addWidget(mpText, 1); - mpTeacherLayout = new QHBoxLayout(); - - mpTeacherLabel = new QLabel(tr("Teacher"), this); - mpTeacherLabel->setAlignment(Qt::AlignTop); - mpTeacher = new QTextEdit(this); - mpTeacher->setObjectName("TeacherStudentBox"); - mpTeacher->setStyleSheet("background-color:#FF9F6D"); - mpTeacherLayout->addWidget(mpTeacherLabel, 0); - mpTeacherLayout->addWidget(mpTeacher, 1); - mpLayout->addLayout(mpTeacherLayout, 1); - - mpStudentLayout = new QHBoxLayout(); - mpStudentLabel = new QLabel(tr("Student"), this); - mpStudentLabel->setAlignment(Qt::AlignTop); - mpStudent = new QTextEdit(this); - mpStudent->setObjectName("TeacherStudentBox"); - mpStudent->setStyleSheet("background-color:#06E983"); - mpStudentLayout->addWidget(mpStudentLabel, 0); - mpStudentLayout->addWidget(mpStudent, 1); - mpLayout->addLayout(mpStudentLayout, 1); } UBTeacherStudentAction::~UBTeacherStudentAction() { - if(NULL != mpActionLabel) - { - delete mpActionLabel; - mpActionLabel = NULL; - } - if(NULL != mpTeacherLabel) - { - delete mpTeacherLabel; - mpTeacherLabel = NULL; - } - if(NULL != mpTeacher) - { - delete mpTeacher; - mpTeacher = NULL; - } - if(NULL != mpTeacherLayout) - { - delete mpTeacherLayout; - mpTeacherLayout = NULL; - } - if(NULL != mpStudentLabel) - { - delete mpStudentLabel; - mpStudentLabel = NULL; + if(NULL != mpCombo){ + delete mpCombo; + mpCombo = NULL; } - if(NULL != mpStudent) - { - delete mpStudent; - mpStudent = NULL; + if(NULL != mpText){ + delete mpText; + mpText = NULL; } - if(NULL != mpStudentLayout) - { - delete mpStudentLayout; - mpStudentLayout = NULL; + if(NULL != mpComboLayout){ + delete mpComboLayout; + mpComboLayout = NULL; } - if(NULL != mpLayout) - { + if(NULL != mpLayout){ delete mpLayout; mpLayout = NULL; } } -QString UBTeacherStudentAction::teacherText() +QString UBTeacherStudentAction::text() { - return mpTeacher->document()->toPlainText(); -} - -QString UBTeacherStudentAction::studentText() -{ - return mpStudent->document()->toPlainText(); -} - -void UBTeacherStudentAction::setTeacherText(QString text) -{ - mpTeacher->setText(text); + QString str; + if(NULL != mpText){ + str = mpText->document()->toPlainText(); + } + return str; } -void UBTeacherStudentAction::setStudentText(QString text) +QString UBTeacherStudentAction::comboValue() { - mpStudent->setText(text); -} + QString str; -QTextEdit* UBTeacherStudentAction::teacher() -{ - return mpTeacher; -} + // TODO : Implement this method -QTextEdit* UBTeacherStudentAction::student() -{ - return mpStudent; + return str; } - UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char *name):QWidget(parent) { diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index a9d939d0..f0c997b9 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -13,7 +13,7 @@ class UBMediaPlayer; #include #include #include -#include "customWidgets/UBWidgetList.h" +#include #include "UBDockPaletteWidget.h" #include "customWidgets/UBWidgetList.h" @@ -25,25 +25,16 @@ class UBTeacherStudentAction : public QWidget Q_OBJECT public: - UBTeacherStudentAction(int actionNumber, QWidget* parent=0, const char* name="UBTeacherStudentAction"); + UBTeacherStudentAction(QWidget* parent=0, const char* name="UBTeacherStudentAction"); ~UBTeacherStudentAction(); - QString teacherText(); - QString studentText(); - void setTeacherText(QString text); - void setStudentText(QString text); - QTextEdit* teacher(); - QTextEdit* student(); + QString comboValue(); + QString text(); private: - int mActionNumber; - QLabel* mpActionLabel; - QLabel* mpTeacherLabel; - QLabel* mpStudentLabel; - QTextEdit* mpTeacher; - QTextEdit* mpStudent; - QVBoxLayout* mpLayout; - QHBoxLayout* mpTeacherLayout; - QHBoxLayout* mpStudentLayout; + QTextEdit* mpText; + QHBoxLayout* mpLayout; + QVBoxLayout* mpComboLayout; + QComboBox* mpCombo; }; @@ -109,6 +100,8 @@ private: QHBoxLayout* mpLinkLayout; QLabel* mpCommentLabel; QTextEdit* mpComments; + + QVector mActionList; }; #endif // UBTEACHERBARWIDGET_H From 80e9b93ae6529f545e54146f78071cbfef6689a4 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 10:08:45 +0100 Subject: [PATCH 15/99] Added the Links widgets --- src/gui/UBTeacherBarWidget.cpp | 48 +++++++++++++++++++++++++++++++++- src/gui/UBTeacherBarWidget.h | 15 +++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 8b80beb1..e5647a6c 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -47,6 +47,8 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock setObjectName(name); mName = "TeacherBarWidget"; mVisibleState = true; + mActionList.clear(); + mUrlList.clear(); setAttribute(Qt::WA_StyledBackground, true); setStyleSheet(UBApplication::globalStyleSheet()); @@ -284,7 +286,9 @@ void UBTeacherBarWidget::onActionButton() void UBTeacherBarWidget::onLinkButton() { - + UBUrlWidget* pUrl = new UBUrlWidget(this); + mUrlList << pUrl; + mpLinks->addWidget(pUrl); } UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) @@ -437,3 +441,45 @@ void UBTeacherBarDropMediaZone::dragMoveEvent(QDragMoveEvent *pEvent) { pEvent->acceptProposedAction(); } + +// --------------------------------------------------------------------------------------------- +UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) + , mpLayout(NULL) + , mpUrlLabel(NULL) + , mpUrl(NULL) +{ + setObjectName(name); + mpLayout = new QHBoxLayout(this); + setLayout(mpLayout); + mpUrlLabel = new QLabel(tr("Url"), this); + mpLayout->addWidget(mpUrlLabel, 0); + mpUrl = new QLineEdit(this); + mpLayout->addWidget(mpUrl, 1); +} + +UBUrlWidget::~UBUrlWidget() +{ + if(NULL != mpUrlLabel){ + delete mpUrlLabel; + mpUrlLabel = NULL; + } + if(NULL != mpUrl){ + delete mpUrl; + mpUrl = NULL; + } + if(NULL != mpLayout){ + delete mpLayout; + mpLayout = NULL; + } +} + +QString UBUrlWidget::url() +{ + QString str; + + if(NULL != mpUrl){ + str = mpUrl->text(); + } + + return str; +} diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index f0c997b9..29933d9d 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -59,6 +59,20 @@ protected: void dragLeaveEvent(QDragLeaveEvent* pEvent); }; +class UBUrlWidget : public QWidget +{ +public: + UBUrlWidget(QWidget* parent=0, const char* name="UBUrlWidget"); + ~UBUrlWidget(); + + QString url(); + +private: + QHBoxLayout* mpLayout; + QLabel* mpUrlLabel; + QLineEdit* mpUrl; +}; + class UBTeacherBarWidget : public UBDockPaletteWidget { Q_OBJECT @@ -102,6 +116,7 @@ private: QTextEdit* mpComments; QVector mActionList; + QVector mUrlList; }; #endif // UBTEACHERBARWIDGET_H From 883d22be7b927ad39437df4ba897b4aa1855b51b Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 10:36:09 +0100 Subject: [PATCH 16/99] Corrected a problem --- src/gui/UBTeacherBarWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index e5647a6c..d92f5cf2 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -311,7 +311,7 @@ UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name mpCombo = new QComboBox(this); mpCombo->addItem(tr("Teacher")); mpCombo->addItem(tr("Student")); - mpComboLayout->addWidget(0); + mpComboLayout->addWidget(mpCombo, 0); mpComboLayout->addStretch(1); mpLayout->addLayout(mpComboLayout, 0); From 0aab9a99576542427bb510bee6020ce30cd95308 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 10:53:35 +0100 Subject: [PATCH 17/99] Stylized the widgets --- resources/style.qss | 1 - src/gui/UBTeacherBarWidget.cpp | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/style.qss b/resources/style.qss index fabe3668..8681fb80 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -1,7 +1,6 @@ QWidget#DockPaletteWidgetBox, QWidget#documentNavigator, QWidget#UBLibPathViewer, -QWidget#UBTeacherStudentAction, QWidget#UBLibNavigatorWidget, QWidget#UBLibItemProperties, QWidget#UBDownloadWidget, diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index d92f5cf2..3a682e8a 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -309,6 +309,8 @@ UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name mpComboLayout = new QVBoxLayout(); mpCombo = new QComboBox(this); + mpCombo->setObjectName("DockPaletteWidgetComboBox"); + mpCombo->setMinimumWidth(80); mpCombo->addItem(tr("Teacher")); mpCombo->addItem(tr("Student")); mpComboLayout->addWidget(mpCombo, 0); @@ -317,6 +319,9 @@ UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name mpLayout->addLayout(mpComboLayout, 0); mpText = new QTextEdit(this); + mpText->setObjectName("DockPaletteWidgetBox"); + mpText->setStyleSheet("background:white;"); + mpLayout->addWidget(mpText, 1); } @@ -449,11 +454,15 @@ UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) , mpUrl(NULL) { setObjectName(name); + setAttribute(Qt::WA_StyledBackground, true); + setStyleSheet(UBApplication::globalStyleSheet()); + mpLayout = new QHBoxLayout(this); setLayout(mpLayout); mpUrlLabel = new QLabel(tr("Url"), this); mpLayout->addWidget(mpUrlLabel, 0); mpUrl = new QLineEdit(this); + mpUrl->setObjectName("DockPaletteWidgetLineEdit"); mpLayout->addWidget(mpUrl, 1); } From bac4c4caac970f231c7e4a6f6efafdc7a25b4431 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 5 Jan 2012 10:59:23 +0100 Subject: [PATCH 18/99] first draft for fixing resize problem --- src/customWidgets/UBWidgetList.cpp | 41 ++++++++++++++++-------------- src/gui/UBTeacherBarWidget.cpp | 17 ++++++++----- src/gui/UBTeacherBarWidget.h | 2 +- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index fa3ce3ed..667d8908 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -50,9 +50,9 @@ void UBWidgetList::addWidget(QWidget *widget) { if(NULL != mpLayout){ mpEmptyLabel->setVisible(false); + mWidgets << widget; updateSize(true, widget); mpLayout->addWidget(widget); - mWidgets << widget; } } @@ -76,34 +76,31 @@ void UBWidgetList::updateSize(bool widgetAdded, QWidget *widget) int newWidgetHeight; if(eWidgetListOrientation_Vertical == mOrientation){ - scaleFactor = (float)mpContainer->width() / (float)widget->width(); + scaleFactor = (float)widget->width() / (float)mpContainer->width(); }else{ - scaleFactor = (float)mpContainer->height() / (float)widget->height(); + scaleFactor = (float)widget->height() / (float)mpContainer->height(); } - newWidgetWidth = (int)((float)widget->width()*scaleFactor); - newWidgetHeight = (int)((float)widget->height()*scaleFactor); - - qDebug() << "container size " << mpContainer->size(); - qDebug() << "widget size " << widget->size(); - qDebug() << "scale factor " << scaleFactor; - + newWidgetWidth = widget->width()/scaleFactor; + newWidgetHeight = widget->height()/scaleFactor; widget->resize(newWidgetWidth, newWidgetHeight); - qDebug() << "widget new value " << newWidgetWidth << "x" << newWidgetHeight; // Now we have to update the container if(eWidgetListOrientation_Vertical == mOrientation){ if(widgetAdded){ mpContainer->resize(mpContainer->width(), mpContainer->height() + newWidgetHeight); - }else{ + } + else{ mpContainer->resize(mpContainer->width(), mpContainer->height() - newWidgetHeight); } - }else{ + } + else{ if(widgetAdded){ mpContainer->resize(mpContainer->width() + newWidgetWidth, mpContainer->height()); - }else{ + } + else{ mpContainer->resize(mpContainer->width() - newWidgetWidth, mpContainer->height()); } } @@ -119,12 +116,17 @@ void UBWidgetList::resizeEvent(QResizeEvent *ev) float scale; if(eWidgetListOrientation_Vertical == mOrientation){ scale = (float)ev->size().width() / (float)ev->oldSize().width(); - updateAllWidgetsize(scale); - mpContainer->resize(width() - 2, mpContainer->height()*scale); - }else{ + if(scale != 0 && scale < 10){ + updateAllWidgetsize(scale); + mpContainer->resize(width() - 2, mpContainer->height()*scale); + } + } + else{ scale = (float)ev->size().height() / (float)ev->oldSize().height(); - updateAllWidgetsize(scale); - mpContainer->resize(mpContainer->width()*scale, height() - 2); + if(scale != 0 && scale < 10){ + updateAllWidgetsize(scale); + mpContainer->resize(mpContainer->width()*scale, height() - 2); + } } } } @@ -154,3 +156,4 @@ void UBWidgetList::setEmptyText(const QString &text) } // TODO : - add onHover 'delete' button + diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 3a682e8a..d65e41fe 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -112,7 +112,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock // Media mpMediaLabel = new QLabel(tr("Media"), this); mpLayout->addWidget(mpMediaLabel, 0); - mpDropMediaZone = new UBTeacherBarDropMediaZone(); + mpDropMediaZone = new UBTeacherBarDropMediaZone(this); mpLayout->addWidget(mpDropMediaZone, 1); // Links @@ -369,9 +369,9 @@ UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char { setObjectName(name); setAcceptDrops(true); - - mWidget.setEmptyText(tr("Drag media here ...")); - mLayout.addWidget(&mWidget); + mWidget = new UBWidgetList(parent); + mWidget->setEmptyText(tr("Drag media here ...")); + mLayout.addWidget(mWidget); setLayout(&mLayout); } @@ -379,6 +379,10 @@ UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char UBTeacherBarDropMediaZone::~UBTeacherBarDropMediaZone() { qDeleteAll(mWidgetList); + if(mWidget){ + delete mWidget; + mWidget = NULL; + } } @@ -423,9 +427,8 @@ void UBTeacherBarDropMediaZone::dropEvent(QDropEvent *pEvent) QPixmap pix = pixFromDropEvent.height() ? pixFromDropEvent : QPixmap(resourcePath); QLabel* label = new QLabel(); label->setPixmap(pix); - //label->resize(size()); label->setScaledContents(true); - mWidget.addWidget(label); + mWidget->addWidget(label); mWidgetList << label; } else if(mimeType.contains("video") || mimeType.contains("audio")){ @@ -433,7 +436,7 @@ void UBTeacherBarDropMediaZone::dropEvent(QDropEvent *pEvent) mediaPlayer->setFile(resourcePath); //mediaPlayer->resize(size()); mediaPlayer->playPause(); - mWidget.addWidget(mediaPlayer); + mWidget->addWidget(mediaPlayer); mWidgetList << mediaPlayer; } else{ diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 29933d9d..644b496a 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -48,7 +48,7 @@ public: private: QListmWidgetList; - UBWidgetList mWidget; + UBWidgetList* mWidget; QVBoxLayout mLayout; From 0fb7cad9883006f92a64346139d6dd7ce0b404d0 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 11:33:24 +0100 Subject: [PATCH 19/99] Added some logic in the teacher bar --- src/customWidgets/UBWidgetList.cpp | 5 +++++ src/customWidgets/UBWidgetList.h | 1 + src/gui/UBTeacherBarWidget.cpp | 16 ++++++++++++++-- src/gui/UBTeacherBarWidget.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 667d8908..5ec2ea96 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -155,5 +155,10 @@ void UBWidgetList::setEmptyText(const QString &text) } } +bool UBWidgetList::empty() +{ + return mWidgets.empty(); +} + // TODO : - add onHover 'delete' button diff --git a/src/customWidgets/UBWidgetList.h b/src/customWidgets/UBWidgetList.h index 87337458..0aa00572 100644 --- a/src/customWidgets/UBWidgetList.h +++ b/src/customWidgets/UBWidgetList.h @@ -27,6 +27,7 @@ public: void setMargin(int margin); void setEmptyText(const QString& text); int margin(); + bool empty(); protected: void resizeEvent(QResizeEvent* ev); diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index d65e41fe..93e1fc61 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -245,7 +245,11 @@ UBTeacherBarWidget::~UBTeacherBarWidget() void UBTeacherBarWidget::onValueChanged() { - if( mpTitle->text() == "") + if( mpTitle->text() == "" && + mpLinks->empty() && + mpActions->empty() && + mpDropMediaZone->empty() && + mpComments->document()->toPlainText() == "") { mIconToLeft = QPixmap(":images/teacher_open_disabled.png"); mIconToRight = QPixmap(":images/teacher_close_disabled.png"); @@ -291,6 +295,7 @@ void UBTeacherBarWidget::onLinkButton() mpLinks->addWidget(pUrl); } +// --------------------------------------------------------------------------------------------- UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) , mpText(NULL) , mpLayout(NULL) @@ -359,11 +364,14 @@ QString UBTeacherStudentAction::comboValue() { QString str; - // TODO : Implement this method + if(NULL != mpCombo){ + str = mpCombo->currentText(); + } return str; } +// --------------------------------------------------------------------------------------------- UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char *name):QWidget(parent) { @@ -385,6 +393,10 @@ UBTeacherBarDropMediaZone::~UBTeacherBarDropMediaZone() } } +bool UBTeacherBarDropMediaZone::empty() +{ + return mWidget->empty(); +} void UBTeacherBarDropMediaZone::dragEnterEvent(QDragEnterEvent *pEvent) { diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 644b496a..b29b5136 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -45,6 +45,7 @@ class UBTeacherBarDropMediaZone : public QWidget public: UBTeacherBarDropMediaZone(QWidget* parent=0, const char* name="UBTeacherBarDropMediaZone"); ~UBTeacherBarDropMediaZone(); + bool empty(); private: QListmWidgetList; From ca29e0d5e36f96a57d4c76108fc0ca7b191a5316 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 14:34:57 +0100 Subject: [PATCH 20/99] Added the ability to save the values of the teacher bar in the UBZ file --- src/core/UBPersistenceManager.cpp | 53 ++++++++++++------- src/core/UBPersistenceManager.h | 13 ++--- src/gui/UBTeacherBarWidget.cpp | 88 ++++++++++++++++++++++++++++++- src/gui/UBTeacherBarWidget.h | 3 ++ 4 files changed, 128 insertions(+), 29 deletions(-) diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index 9ac5d13a..d3389c19 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -1086,16 +1086,36 @@ void UBPersistenceManager::persistTeacherBar(UBDocumentProxy* pDocumentProxy, in // Set the element values QDomElement teacherBarElem = teacherBarNode.toElement(); teacherBarElem.setAttribute("title", infos.title); - teacherBarElem.setAttribute("phasis", infos.phasis); - teacherBarElem.setAttribute("duration", infos.Duration); - teacherBarElem.setAttribute("equipment", infos.material); - teacherBarElem.setAttribute("activity", infos.activity); - teacherBarElem.setAttribute("action1Teacher", infos.action1Master); - teacherBarElem.setAttribute("action1Student", infos.action1Student); - teacherBarElem.setAttribute("action2Teacher", infos.action2Master); - teacherBarElem.setAttribute("action2Student", infos.action2Student); - teacherBarElem.setAttribute("action3Teacher", infos.action3Master); - teacherBarElem.setAttribute("action3Student", infos.action3Student); + teacherBarElem.setAttribute("duration", QString("%0").arg(infos.Duration)); + + QString qsAct; + for(int i=0; itext(); + // Duration + if(mpDuration1->isChecked()){ + infos.Duration = 0; + }else if(mpDuration2->isChecked()){ + infos.Duration = 1; + }else{ + infos.Duration = 2; + } + // Actions + for(int i=0; icomboValue()).arg(mActionList.at(i)->text()); + } + // Media + // TODO : Get the url of the dropped medias and store them in infos.medias + + // Links + for(int j=0; jurl()){ + infos.urls << mUrlList.at(j)->url(); + } + } + // Comments + infos.comments = mpComments->document()->toPlainText(); + UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos); } void UBTeacherBarWidget::loadContent() { sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); + // Title mpTitle->setText(nextInfos.title); + // Duration + switch(nextInfos.Duration){ + case 0: mpDuration1->setChecked(true); + break; + case 1: mpDuration2->setChecked(true); + break; + case 2: mpDuration3->setChecked(true); + break; + default: mpDuration1->setChecked(true); + break; + } + // Actions + for(int i=0; i= 2){ + UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); + pAction->setComboValue(qslAction.at(0).toInt()); + pAction->setText(qslAction.at(1)); + mActionList << pAction; + mpActions->addWidget(pAction); + } + } + // Media + // TODO : Add the media items here + + // Links + for(int j=0; jsetUrl(qsUrl); + mUrlList << pLink; + mpLinks->addWidget(pLink); + } + } + // Comments + if(NULL != mpComments){ + mpComments->document()->setPlainText(nextInfos.comments); + } } void UBTeacherBarWidget::onTitleTextChanged(const QString& text) @@ -365,12 +430,26 @@ QString UBTeacherStudentAction::comboValue() QString str; if(NULL != mpCombo){ - str = mpCombo->currentText(); + str = QString("%0").arg(mpCombo->currentIndex()); } return str; } +void UBTeacherStudentAction::setComboValue(int value) +{ + if(NULL != mpCombo){ + mpCombo->setCurrentIndex(value); + } +} + +void UBTeacherStudentAction::setText(const QString& text) +{ + if(NULL != mpText){ + mpText->document()->setPlainText(text); + } +} + // --------------------------------------------------------------------------------------------- UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char *name):QWidget(parent) @@ -507,3 +586,10 @@ QString UBUrlWidget::url() return str; } + +void UBUrlWidget::setUrl(const QString &url) +{ + if(NULL != mpUrl){ + mpUrl->setText(url); + } +} diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index b29b5136..f59f64ed 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -29,6 +29,8 @@ public: ~UBTeacherStudentAction(); QString comboValue(); QString text(); + void setComboValue(int value); + void setText(const QString& text); private: QTextEdit* mpText; @@ -67,6 +69,7 @@ public: ~UBUrlWidget(); QString url(); + void setUrl(const QString& url); private: QHBoxLayout* mpLayout; From 84abba1f77b92eac06b9607e7e12b44d1a5ff868 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 15:12:36 +0100 Subject: [PATCH 21/99] Fixed an issue in the teacherbar --- src/gui/UBTeacherBarWidget.cpp | 23 ++++++++++++++++++----- src/gui/UBTeacherBarWidget.h | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 833e1796..2c41ed50 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -24,7 +24,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpTitleLabel(NULL) , mpDurationLabel(NULL) , mpTitle(NULL) - , mpAction1(NULL) , mpMediaLabel(NULL) , mpDropMediaZone(NULL) , mpContainer(NULL) @@ -185,10 +184,6 @@ UBTeacherBarWidget::~UBTeacherBarWidget() delete mpActionLayout; mpActionLayout = NULL; } - if(NULL != mpAction1){ - delete mpAction1; - mpAction1 = NULL; - } if(NULL != mpActionLabel){ delete mpActionLabel; mpActionLabel = NULL; @@ -297,6 +292,7 @@ void UBTeacherBarWidget::saveContent() void UBTeacherBarWidget::loadContent() { + clearWidgetLists(); sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); // Title mpTitle->setText(nextInfos.title); @@ -360,6 +356,23 @@ void UBTeacherBarWidget::onLinkButton() mpLinks->addWidget(pUrl); } +void UBTeacherBarWidget::clearWidgetLists() +{ + if(NULL != mpActions){ + for(int i=0; iremoveWidget(mActionList.at(i)); + } + mActionList.clear(); + } + + if(NULL != mpLinks){ + for(int i=0; iremoveWidget(mUrlList.at(i)); + } + mUrlList.clear(); + } +} + // --------------------------------------------------------------------------------------------- UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) , mpText(NULL) diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index f59f64ed..07ca9674 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -93,13 +93,13 @@ private slots: void onLinkButton(); private: + void clearWidgetLists(); QVBoxLayout* mpLayout; QHBoxLayout* mpTitleLayout; QHBoxLayout* mpDurationLayout; QLabel* mpTitleLabel; QLabel* mpDurationLabel; QLineEdit* mpTitle; - UBTeacherStudentAction* mpAction1; QLabel* mpMediaLabel; UBTeacherBarDropMediaZone* mpDropMediaZone; QWidget* mpContainer; From b731b302de929ace527a50991835f5087039388a Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 5 Jan 2012 15:13:00 +0100 Subject: [PATCH 22/99] fixed UBWidgetList resize issue --- src/core/UBApplicationController.cpp | 1 - src/customWidgets/UBWidgetList.cpp | 112 ++++++++++++--------------- src/customWidgets/UBWidgetList.h | 8 +- 3 files changed, 54 insertions(+), 67 deletions(-) diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index 68c9b81b..2c24539a 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -722,7 +722,6 @@ void UBApplicationController::importFile(const QString& pFilePath) void UBApplicationController::useMultiScreen(bool use) { mDisplayManager->setUseMultiScreen(use); - } diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 5ec2ea96..67c157b2 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -10,7 +10,6 @@ UBWidgetList::UBWidgetList(QWidget* parent, eWidgetListOrientation orientation, setObjectName(name); mOrientation = orientation; mpContainer = new QWidget(this); - mWidgets.clear(); mpEmptyLabel = new QLabel(this); mpEmptyLabel->setObjectName("emptyString"); @@ -18,12 +17,13 @@ UBWidgetList::UBWidgetList(QWidget* parent, eWidgetListOrientation orientation, setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); mpLayout = new QVBoxLayout(mpContainer); - mpContainer->resize(width(), mpContainer->height()); - }else{ + mpContainer->resize(mpContainer->width(), mpContainer->height()); + } + else{ setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); mpLayout = new QHBoxLayout(mpContainer); - mpContainer->resize(mpContainer->width(), height()); + mpContainer->resize(mpContainer->width(), mpContainer->height()); } mpLayout->setContentsMargins(margin(), margin(), margin(), margin()); mpContainer->setLayout(mpLayout); @@ -50,8 +50,8 @@ void UBWidgetList::addWidget(QWidget *widget) { if(NULL != mpLayout){ mpEmptyLabel->setVisible(false); - mWidgets << widget; - updateSize(true, widget); + mWidgetInfo[widget] = widget->size(); + updateView(size()); mpLayout->addWidget(widget); } } @@ -60,82 +60,68 @@ void UBWidgetList::removeWidget(QWidget *widget) { if(NULL != mpLayout){ mpLayout->removeWidget(widget); - mWidgets.remove(mWidgets.indexOf(widget)); - updateSize(false, widget); + mWidgetInfo.remove(widget); widget->setVisible(false); + updateView(size()); if(0 == mpLayout->count()){ mpEmptyLabel->setVisible(true); } } } -void UBWidgetList::updateSize(bool widgetAdded, QWidget *widget) -{ - float scaleFactor; - int newWidgetWidth; - int newWidgetHeight; - - if(eWidgetListOrientation_Vertical == mOrientation){ - scaleFactor = (float)widget->width() / (float)mpContainer->width(); - }else{ - scaleFactor = (float)widget->height() / (float)mpContainer->height(); - } - - newWidgetWidth = widget->width()/scaleFactor; - newWidgetHeight = widget->height()/scaleFactor; - widget->resize(newWidgetWidth, newWidgetHeight); - - - // Now we have to update the container - if(eWidgetListOrientation_Vertical == mOrientation){ - if(widgetAdded){ - mpContainer->resize(mpContainer->width(), mpContainer->height() + newWidgetHeight); - } - else{ - mpContainer->resize(mpContainer->width(), mpContainer->height() - newWidgetHeight); - } - } - else{ - if(widgetAdded){ - mpContainer->resize(mpContainer->width() + newWidgetWidth, mpContainer->height()); +int UBWidgetList::scaleWidgets(QSize pSize) +{ + int result = 0; + foreach(QWidget* eachWidget, mWidgetInfo.keys()){ + qDebug() << __FUNCTION__ << "eachWidget : " << eachWidget; + qreal scaleFactor = 0; + int newWidgetWidth = pSize.width(); + int newWidgetHeight = pSize.height(); + if(eWidgetListOrientation_Vertical == mOrientation){ + scaleFactor = (float)mWidgetInfo[eachWidget].width() / (float)pSize.width(); + qDebug() << __FUNCTION__ << "scale factor: " << scaleFactor; + newWidgetHeight = mWidgetInfo[eachWidget].height()/scaleFactor; + result += newWidgetHeight; } else{ - mpContainer->resize(mpContainer->width() - newWidgetWidth, mpContainer->height()); + scaleFactor = (float)mWidgetInfo[eachWidget].height() / (float)pSize.height(); + newWidgetWidth = mWidgetInfo[eachWidget].width()/scaleFactor; + result += newWidgetWidth; } } + return result; +} + +void UBWidgetList::scaleContainer(QSize pSize, int updateValue) +{ + if(eWidgetListOrientation_Vertical == mOrientation) + mpContainer->resize(pSize.width(), updateValue); + else + mpContainer->resize(updateValue, pSize.height()); } + +void UBWidgetList::updateView(QSize pSize) +{ + // Widgets on list are resized automatically to fit the mpcontainer. + // so if you want to keep the aspect ratio you have to calculate + // the sum of the new widget height and give it to the mpContainer. + // The container resize will trig the widgets resize and the good + // height permits to respect the aspect ratio. + int updatedValue = scaleWidgets(pSize); + scaleContainer(pSize,updatedValue); +} + + + void UBWidgetList::resizeEvent(QResizeEvent *ev) { mpEmptyLabel->setGeometry((width() - mpEmptyLabel->width()) / 2, (height() - mpEmptyLabel->height()) /2, mpEmptyLabel->width(), mpEmptyLabel->height()); - if(ev->oldSize().width() >= 0 && ev->oldSize().height() >= 0){ - float scale; - if(eWidgetListOrientation_Vertical == mOrientation){ - scale = (float)ev->size().width() / (float)ev->oldSize().width(); - if(scale != 0 && scale < 10){ - updateAllWidgetsize(scale); - mpContainer->resize(width() - 2, mpContainer->height()*scale); - } - } - else{ - scale = (float)ev->size().height() / (float)ev->oldSize().height(); - if(scale != 0 && scale < 10){ - updateAllWidgetsize(scale); - mpContainer->resize(mpContainer->width()*scale, height() - 2); - } - } - } -} - -void UBWidgetList::updateAllWidgetsize(float scale) -{ - for(int i=0; iresize(mWidgets.at(i)->width()*scale, mWidgets.at(i)->height()*scale); - } + updateView(size()); } void UBWidgetList::setMargin(int margin) @@ -157,7 +143,7 @@ void UBWidgetList::setEmptyText(const QString &text) bool UBWidgetList::empty() { - return mWidgets.empty(); + return mWidgetInfo.empty(); } // TODO : - add onHover 'delete' button diff --git a/src/customWidgets/UBWidgetList.h b/src/customWidgets/UBWidgetList.h index 0aa00572..2dd0895f 100644 --- a/src/customWidgets/UBWidgetList.h +++ b/src/customWidgets/UBWidgetList.h @@ -15,6 +15,7 @@ typedef enum{ eWidgetListOrientation_Horizontal }eWidgetListOrientation; + class UBWidgetList : public QScrollArea { Q_OBJECT @@ -33,13 +34,14 @@ protected: void resizeEvent(QResizeEvent* ev); private: - void updateSize(bool widgetAdded, QWidget* widget); - void updateAllWidgetsize(float scale); + int scaleWidgets(QSize pSize); + void scaleContainer(QSize pSize, int updateValue); + void updateView(QSize pSize); QLayout* mpLayout; QWidget* mpContainer; eWidgetListOrientation mOrientation; int mMargin; - QVector mWidgets; + QMap mWidgetInfo; QLabel* mpEmptyLabel; }; From 17f0fa9b8e40d22299be7904e64c32cc4ca84b99 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 16:13:22 +0100 Subject: [PATCH 23/99] updated the parents in the teacher bar --- src/gui/UBTeacherBarWidget.cpp | 33 +++++++++++++++++++-------------- src/gui/UBTeacherBarWidget.h | 2 ++ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 2c41ed50..04679ec0 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -42,6 +42,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpLinks(NULL) , mpLinkButton(NULL) , mpLinkLayout(NULL) + , mpStackWidget(NULL) { setObjectName(name); mName = "TeacherBarWidget"; @@ -88,19 +89,19 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpDuration3 = new QCheckBox(this); mpDuration3->setIcon(QIcon(":images/duration3.png")); mpDurationLayout->addWidget(mpDuration3, 0); - mpDurationButtons = new QButtonGroup(this); + mpDurationButtons = new QButtonGroup(mpContainer); mpDurationButtons->addButton(mpDuration1); mpDurationButtons->addButton(mpDuration2); mpDurationButtons->addButton(mpDuration3); mpLayout->addLayout(mpDurationLayout, 0); // Actions - mpActionLabel = new QLabel(tr("Actions"), this); + mpActionLabel = new QLabel(tr("Actions"), mpContainer); mpLayout->addWidget(mpActionLabel, 0); - mpActions = new UBWidgetList(this); + mpActions = new UBWidgetList(mpContainer); mpActions->setEmptyText(tr("Add actions")); mpLayout->addWidget(mpActions, 1); - mpActionButton = new QPushButton(this); + mpActionButton = new QPushButton(mpContainer); mpActionButton->setObjectName("DockPaletteWidgetButton"); mpActionButton->setText(tr("Add action")); mpActionLayout = new QHBoxLayout(); @@ -109,17 +110,17 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpLayout->addLayout(mpActionLayout, 0); // Media - mpMediaLabel = new QLabel(tr("Media"), this); + mpMediaLabel = new QLabel(tr("Media"), mpContainer); mpLayout->addWidget(mpMediaLabel, 0); - mpDropMediaZone = new UBTeacherBarDropMediaZone(this); + mpDropMediaZone = new UBTeacherBarDropMediaZone(mpContainer); mpLayout->addWidget(mpDropMediaZone, 1); // Links - mpLinkLabel = new QLabel(tr("Links"), this); + mpLinkLabel = new QLabel(tr("Links"), mpContainer); mpLayout->addWidget(mpLinkLabel, 0); - mpLinks = new UBWidgetList(this); + mpLinks = new UBWidgetList(mpContainer); mpLayout->addWidget(mpLinks, 1); - mpLinkButton = new QPushButton(tr("Add link"), this); + mpLinkButton = new QPushButton(tr("Add link"), mpContainer); mpLinkButton->setObjectName("DockPaletteWidgetButton"); mpLinkLayout = new QHBoxLayout(); mpLinkLayout->addWidget(mpLinkButton, 0); @@ -127,7 +128,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpLayout->addLayout(mpLinkLayout, 0); // Comments - mpCommentLabel = new QLabel(tr("Comments"), this); + mpCommentLabel = new QLabel(tr("Comments"), mpContainer); mpLayout->addWidget(mpCommentLabel, 0); mpComments = new QTextEdit(this); mpComments->setObjectName("DockPaletteWidgetBox"); @@ -236,6 +237,10 @@ UBTeacherBarWidget::~UBTeacherBarWidget() delete mpContainerLayout; mpContainerLayout = NULL; } + if(NULL != mpStackWidget){ + delete mpStackWidget; + mpStackWidget = NULL; + } } void UBTeacherBarWidget::onValueChanged() @@ -311,7 +316,7 @@ void UBTeacherBarWidget::loadContent() for(int i=0; i= 2){ - UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); + UBTeacherStudentAction* pAction = new UBTeacherStudentAction(mpContainer); pAction->setComboValue(qslAction.at(0).toInt()); pAction->setText(qslAction.at(1)); mActionList << pAction; @@ -325,7 +330,7 @@ void UBTeacherBarWidget::loadContent() for(int j=0; jsetUrl(qsUrl); mUrlList << pLink; mpLinks->addWidget(pLink); @@ -344,14 +349,14 @@ void UBTeacherBarWidget::onTitleTextChanged(const QString& text) void UBTeacherBarWidget::onActionButton() { - UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); + UBTeacherStudentAction* pAction = new UBTeacherStudentAction(mpContainer); mActionList << pAction; mpActions->addWidget(pAction); } void UBTeacherBarWidget::onLinkButton() { - UBUrlWidget* pUrl = new UBUrlWidget(this); + UBUrlWidget* pUrl = new UBUrlWidget(mpContainer); mUrlList << pUrl; mpLinks->addWidget(pUrl); } diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 07ca9674..8082bc6f 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -14,6 +14,7 @@ class UBMediaPlayer; #include #include #include +#include #include "UBDockPaletteWidget.h" #include "customWidgets/UBWidgetList.h" @@ -118,6 +119,7 @@ private: QHBoxLayout* mpLinkLayout; QLabel* mpCommentLabel; QTextEdit* mpComments; + QStackedWidget* mpStackWidget; QVector mActionList; QVector mUrlList; From 15ea3abdb645fa6978005914af506376e9b9e312 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 5 Jan 2012 16:24:40 +0100 Subject: [PATCH 24/99] saved media infos into svg file --- src/gui/UBTeacherBarWidget.cpp | 82 ++++++++++++++++++++++++---------- src/gui/UBTeacherBarWidget.h | 5 +++ 2 files changed, 64 insertions(+), 23 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 04679ec0..1b16d44f 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -282,6 +282,7 @@ void UBTeacherBarWidget::saveContent() } // Media // TODO : Get the url of the dropped medias and store them in infos.medias + infos.medias = mpDropMediaZone->mediaList(); // Links for(int j=0; jreloadMedia(nextInfos.medias); // Links for(int j=0; jcleanMedias(); + if(NULL != mpActions){ for(int i=0; iremoveWidget(mActionList.at(i)); @@ -483,13 +487,25 @@ UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char UBTeacherBarDropMediaZone::~UBTeacherBarDropMediaZone() { - qDeleteAll(mWidgetList); + cleanMedias(); if(mWidget){ delete mWidget; mWidget = NULL; } } +void UBTeacherBarDropMediaZone::cleanMedias() +{ + foreach(QWidget* eachWidget,mWidgetList){ + mWidget->removeWidget(eachWidget); + delete eachWidget; + } + + mWidgetList.clear(); + + mMediaList.clear(); +} + bool UBTeacherBarDropMediaZone::empty() { return mWidget->empty(); @@ -505,6 +521,46 @@ void UBTeacherBarDropMediaZone::dragLeaveEvent(QDragLeaveEvent *pEvent) pEvent->accept(); } + +void UBTeacherBarDropMediaZone::addMedia(QString pMediaPath) +{ + if(!pMediaPath.isEmpty()) + mMediaList.append(pMediaPath); + else + qWarning() << __FUNCTION__ << "empty path"; + + QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(pMediaPath); + if(mimeType.contains("image")){ + QPixmap pix = QPixmap(pMediaPath); + QLabel* label = new QLabel(); + label->setPixmap(pix); + label->setScaledContents(true); + mWidget->addWidget(label); + mWidgetList << label; + } + else if(mimeType.contains("video") || mimeType.contains("audio")){ + UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + mediaPlayer->setFile(pMediaPath); + mediaPlayer->playPause(); + mWidget->addWidget(mediaPlayer); + mWidgetList << mediaPlayer; + } + else{ + qWarning() << "pMediaPath" << pMediaPath; + qWarning() << "bad idea to come here"; + } + +} + +void UBTeacherBarDropMediaZone::reloadMedia(QStringList pList) +{ + cleanMedias(); + foreach(QString eachString, pList){ + addMedia(eachString); + } + +} + void UBTeacherBarDropMediaZone::dropEvent(QDropEvent *pEvent) { QPixmap pixFromDropEvent; @@ -529,28 +585,8 @@ void UBTeacherBarDropMediaZone::dropEvent(QDropEvent *pEvent) pEvent->acceptProposedAction(); return; } - - mimeType = mimeType.isEmpty() ? UBFileSystemUtils::mimeTypeFromFileName(resourcePath) : mimeType; - if(mimeType.contains("image")){ - qDebug() << pixFromDropEvent.size(); - QPixmap pix = pixFromDropEvent.height() ? pixFromDropEvent : QPixmap(resourcePath); - QLabel* label = new QLabel(); - label->setPixmap(pix); - label->setScaledContents(true); - mWidget->addWidget(label); - mWidgetList << label; - } - else if(mimeType.contains("video") || mimeType.contains("audio")){ - UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); - mediaPlayer->setFile(resourcePath); - //mediaPlayer->resize(size()); - mediaPlayer->playPause(); - mWidget->addWidget(mediaPlayer); - mWidgetList << mediaPlayer; - } - else{ - qWarning() << "bad idea to come here"; - } + if(!resourcePath.isEmpty()) + addMedia(resourcePath); pEvent->acceptProposedAction(); } diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 8082bc6f..d72fbf70 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -48,9 +48,14 @@ class UBTeacherBarDropMediaZone : public QWidget public: UBTeacherBarDropMediaZone(QWidget* parent=0, const char* name="UBTeacherBarDropMediaZone"); ~UBTeacherBarDropMediaZone(); + QStringList mediaList() {return mMediaList;} + void reloadMedia(QStringList pList); + void cleanMedias(); bool empty(); private: + void addMedia(QString pMediaPath); + QStringList mMediaList; QListmWidgetList; UBWidgetList* mWidget; QVBoxLayout mLayout; From f60872774b2cae7564a96c2a940bc7b811159c5b Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 16:26:00 +0100 Subject: [PATCH 25/99] backup --- src/gui/UBTeacherBarWidget.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 04679ec0..55e463e8 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -62,7 +62,10 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpContainer = new QWidget(this); mpContainer->setObjectName("DockPaletteWidgetBox"); - mpContainerLayout->addWidget(mpContainer); + + mpStackWidget = new QStackedWidget(this); + mpContainerLayout->addWidget(mpStackWidget); + mpStackWidget->addWidget(mpContainer); mpLayout = new QVBoxLayout(mpContainer); mpContainer->setLayout(mpLayout); From 3e7e2d81703bf8676d1db638fd3c940466f9ee4e Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 5 Jan 2012 16:35:44 +0100 Subject: [PATCH 26/99] fixed start on laod media player issue --- src/gui/UBMediaPlayer.cpp | 1 - src/gui/UBTeacherBarWidget.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index 17770378..421f891b 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -242,7 +242,6 @@ void UBMediaPlayer::setFile(const QString &fileName) { setWindowTitle(fileName.right(fileName.length() - fileName.lastIndexOf('/') - 1)); m_MediaObject.setCurrentSource(Phonon::MediaSource(fileName)); - m_MediaObject.play(); } void UBMediaPlayer::setLocation(const QString& location) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 1b16d44f..688e2147 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -541,7 +541,6 @@ void UBTeacherBarDropMediaZone::addMedia(QString pMediaPath) else if(mimeType.contains("video") || mimeType.contains("audio")){ UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); mediaPlayer->setFile(pMediaPath); - mediaPlayer->playPause(); mWidget->addWidget(mediaPlayer); mWidgetList << mediaPlayer; } From 079f7534c85b39825090f19c7ecfe73c23dc209c Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 Jan 2012 16:57:17 +0100 Subject: [PATCH 27/99] First backup of the teacherbar preview widget --- src/gui/UBTeacherBarWidget.cpp | 75 +++++++++++++++++++++++++++++++--- src/gui/UBTeacherBarWidget.h | 22 ++++++++++ 2 files changed, 92 insertions(+), 5 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index cb84c90d..5b50c6f8 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -43,6 +43,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpLinkButton(NULL) , mpLinkLayout(NULL) , mpStackWidget(NULL) + , mpPreview(NULL) { setObjectName(name); mName = "TeacherBarWidget"; @@ -63,9 +64,12 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpContainer = new QWidget(this); mpContainer->setObjectName("DockPaletteWidgetBox"); + mpPreview = new UBTeacherBarPreviewWidget(this); + mpStackWidget = new QStackedWidget(this); mpContainerLayout->addWidget(mpStackWidget); mpStackWidget->addWidget(mpContainer); + mpStackWidget->addWidget(mpPreview); mpLayout = new QVBoxLayout(mpContainer); mpContainer->setLayout(mpLayout); @@ -144,6 +148,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); connect(mpActionButton, SIGNAL(clicked()), this, SLOT(onActionButton())); connect(mpLinkButton, SIGNAL(clicked()), this, SLOT(onLinkButton())); + connect(mpPreview, SIGNAL(showEditMode()), this, SLOT(onShowEditMode())); } UBTeacherBarWidget::~UBTeacherBarWidget() @@ -240,6 +245,10 @@ UBTeacherBarWidget::~UBTeacherBarWidget() delete mpContainerLayout; mpContainerLayout = NULL; } + if(NULL != mpPreview){ + delete mpPreview; + mpPreview = NULL; + } if(NULL != mpStackWidget){ delete mpStackWidget; mpStackWidget = NULL; @@ -248,11 +257,7 @@ UBTeacherBarWidget::~UBTeacherBarWidget() void UBTeacherBarWidget::onValueChanged() { - if( mpTitle->text() == "" && - mpLinks->empty() && - mpActions->empty() && - mpDropMediaZone->empty() && - mpComments->document()->toPlainText() == "") + if(isEmpty()) { mIconToLeft = QPixmap(":images/teacher_open_disabled.png"); mIconToRight = QPixmap(":images/teacher_close_disabled.png"); @@ -345,6 +350,19 @@ void UBTeacherBarWidget::loadContent() if(NULL != mpComments){ mpComments->document()->setPlainText(nextInfos.comments); } + + if(!isEmpty()){ + mpStackWidget->setCurrentWidget(mpPreview); + } +} + +bool UBTeacherBarWidget::isEmpty() +{ + return mpTitle->text() == "" && + mpLinks->empty() && + mpActions->empty() && + mpDropMediaZone->empty() && + mpComments->document()->toPlainText() == ""; } void UBTeacherBarWidget::onTitleTextChanged(const QString& text) @@ -385,6 +403,11 @@ void UBTeacherBarWidget::clearWidgetLists() } } +void UBTeacherBarWidget::onShowEditMode() +{ + mpStackWidget->setCurrentWidget(mpContainer); +} + // --------------------------------------------------------------------------------------------- UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) , mpText(NULL) @@ -650,3 +673,45 @@ void UBUrlWidget::setUrl(const QString &url) mpUrl->setText(url); } } + +// ------------------------------------------------------------------------------------ +UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char *name):QWidget(parent) + , mpLayout(NULL) + , mpEditButton(NULL) + , mpEditLayout(NULL) +{ + setObjectName(name); + + mpLayout = new QVBoxLayout(this); + setLayout(mpLayout); + + mpEditButton = new QPushButton(tr("Edit infos"), this); + mpEditLayout = new QHBoxLayout(); + mpEditLayout->addStretch(1); + mpEditLayout->addWidget(mpEditButton, 0); + mpEditLayout->addStretch(1); + mpLayout->addLayout(mpEditLayout); + + connect(mpEditButton, SIGNAL(clicked()), this, SLOT(onEdit())); +} + +UBTeacherBarPreviewWidget::~UBTeacherBarPreviewWidget() +{ + if(NULL != mpEditButton){ + delete mpEditButton; + mpEditButton = NULL; + } + if(NULL != mpEditLayout){ + delete mpEditLayout; + mpEditLayout = NULL; + } + if(NULL != mpLayout){ + delete mpLayout; + mpLayout = NULL; + } +} + +void UBTeacherBarPreviewWidget::onEdit() +{ + emit showEditMode(); +} diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index d72fbf70..7e9caa3f 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -83,6 +83,25 @@ private: QLineEdit* mpUrl; }; +class UBTeacherBarPreviewWidget : public QWidget +{ + Q_OBJECT +public: + UBTeacherBarPreviewWidget(QWidget* parent=0, const char* name="UBTeacherBarPreviewWidget"); + ~UBTeacherBarPreviewWidget(); + +signals: + void showEditMode(); + +private slots: + void onEdit(); + +private: + QVBoxLayout* mpLayout; + QPushButton* mpEditButton; + QHBoxLayout* mpEditLayout; +}; + class UBTeacherBarWidget : public UBDockPaletteWidget { Q_OBJECT @@ -97,9 +116,11 @@ private slots: void onTitleTextChanged(const QString& text); void onActionButton(); void onLinkButton(); + void onShowEditMode(); private: void clearWidgetLists(); + bool isEmpty(); QVBoxLayout* mpLayout; QHBoxLayout* mpTitleLayout; QHBoxLayout* mpDurationLayout; @@ -125,6 +146,7 @@ private: QLabel* mpCommentLabel; QTextEdit* mpComments; QStackedWidget* mpStackWidget; + UBTeacherBarPreviewWidget* mpPreview; QVector mActionList; QVector mUrlList; From afab4879e1263cad40567ac9aeb8f25d5703b593 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 5 Jan 2012 18:18:48 +0100 Subject: [PATCH 28/99] dnd try and first media viewer widget --- src/board/UBBoardView.cpp | 4 +- src/gui/UBMediaPlayer.cpp | 8 ++-- src/gui/UBTeacherBarWidget.cpp | 79 +++++++++++++++++++++++++++++++++- src/gui/UBTeacherBarWidget.h | 25 ++++++++++- 4 files changed, 108 insertions(+), 8 deletions(-) diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index d5ff09e6..af99f131 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -33,6 +33,8 @@ #include "gui/UBToolWidget.h" #include "gui/UBResources.h" #include "gui/UBMainWindow.h" +#include "gui/UBTeacherBarWidget.h" + #include "board/UBBoardController.h" @@ -725,7 +727,7 @@ void UBBoardView::dropEvent (QDropEvent *event) { qDebug() << event->source(); - if(!event->source() || dynamic_cast(event->source()) || dynamic_cast(event->source())) + if(!event->source() || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source())) { mController->processMimeData (event->mimeData (), mapToScene (event->pos ())); event->acceptProposedAction (); diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index 421f891b..357d161e 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -39,7 +39,7 @@ UBMediaPlayer::UBMediaPlayer() : setContextMenuPolicy(Qt::CustomContextMenu); m_videoWidget->setContextMenuPolicy(Qt::CustomContextMenu); - QSize buttonSize(34, 28); + QSize buttonSize(26, 20); // QPushButton *openButton = new QPushButton(this); @@ -67,7 +67,7 @@ UBMediaPlayer::UBMediaPlayer() : slider->setMediaObject(&m_MediaObject); QVBoxLayout *vLayout = new QVBoxLayout(this); - vLayout->setContentsMargins(8, 8, 8, 8); + vLayout->setContentsMargins(1, 1, 1, 1); // QHBoxLayout *layout = new QHBoxLayout(); @@ -101,7 +101,7 @@ UBMediaPlayer::UBMediaPlayer() : initVideoWindow(); vLayout->addWidget(&m_videoWindow); QVBoxLayout *buttonPanelLayout = new QVBoxLayout(); - m_videoWindow.hide(); +// m_videoWindow.hide(); // buttonPanelLayout->addLayout(layout); // timeLabel = new QLabel(this); @@ -224,7 +224,7 @@ void UBMediaPlayer::initVideoWindow() videoLayout->addWidget(m_videoWidget); videoLayout->setContentsMargins(0, 0, 0, 0); m_videoWindow.setLayout(videoLayout); - m_videoWindow.setMinimumSize(70, 70); + m_videoWindow.setMinimumSize(100, 100); } void UBMediaPlayer::playPause() diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 17057d94..65c4ad91 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -333,7 +333,6 @@ void UBTeacherBarWidget::loadContent() } } // Media - // TODO : Add the media items here mpDropMediaZone->reloadMedia(nextInfos.medias); // Links @@ -352,6 +351,7 @@ void UBTeacherBarWidget::loadContent() } if(!isEmpty()){ + mpPreview->mediaViewer()->loadMedia(nextInfos.medias); mpStackWidget->setCurrentWidget(mpPreview); } } @@ -685,12 +685,14 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char setLayout(mpLayout); mpEditButton = new QPushButton(tr("Edit infos"), this); - mpEditLayout = new QHBoxLayout(); + mpEditLayout = new QVBoxLayout(); mpEditLayout->addStretch(1); mpEditLayout->addWidget(mpEditButton, 0); mpEditLayout->addStretch(1); + mpEditLayout->addWidget(&mMediaViewer); mpLayout->addLayout(mpEditLayout); + connect(mpEditButton, SIGNAL(clicked()), this, SLOT(onEdit())); } @@ -714,3 +716,76 @@ void UBTeacherBarPreviewWidget::onEdit() { emit showEditMode(); } + + +// ------------------------------------------------------------------------------------ +UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char* name) : QWidget(parent) +{ + setObjectName(name); + setAcceptDrops(true); + mWidget = new UBWidgetList(parent); + mWidget->setEmptyText(tr("No media found")); + mLayout.addWidget(mWidget); + setLayout(&mLayout); + //TO TEST only +// QStringList mediaPathList; +// mediaPathList << "/home/claudio/Desktop/PIPPO.jpg"; +// loadMedia(mediaPathList); +} + +UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() +{ + if(mWidget){ + delete mWidget; + mWidget = NULL; + } + +} + + +// for test only +QString tempString; + +void UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) +{ + foreach(QString eachString, pMedias){ + if(!eachString.isEmpty()){ + tempString = eachString; + QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(eachString); + if(mimeType.contains("image")){ + QPixmap pix = QPixmap(eachString); + QLabel* label = new QLabel(); + label->setPixmap(pix); + label->setScaledContents(true); + mWidget->addWidget(label); + // mWidgetList << label; + } + else if(mimeType.contains("video") || mimeType.contains("audio")){ + UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + mediaPlayer->setFile(eachString); + mWidget->addWidget(mediaPlayer); + // mWidgetList << mediaPlayer; + } + else{ + qWarning() << "pMediaPath" << eachString; + qWarning() << "bad idea to come here"; + } + } + } +} + +void UBTeacherBarPreviewMedia::mousePressEvent(QMouseEvent *event) +{ + Q_UNUSED(event); + QMimeData *mimeData = new QMimeData; + QList urls; + urls << QUrl::fromLocalFile(tempString); + mimeData->setUrls(urls); + mimeData->setText(tempString); + + + QDrag *drag = new QDrag(this); + drag->setMimeData(mimeData); + drag->start(); +} + diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 7e9caa3f..50377d65 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -68,6 +68,27 @@ protected: void dragLeaveEvent(QDragLeaveEvent* pEvent); }; + + +class UBTeacherBarPreviewMedia : public QWidget +{ + Q_OBJECT +public: + UBTeacherBarPreviewMedia(QWidget* parent=0, const char* name="UBTeacherBarPreviewMedia"); + ~UBTeacherBarPreviewMedia(); + void loadMedia(QStringList pMedias); + +private: + UBWidgetList* mWidget; + QVBoxLayout mLayout; + +protected: + void mousePressEvent(QMouseEvent *event); + +public slots: + +}; + class UBUrlWidget : public QWidget { public: @@ -89,6 +110,7 @@ class UBTeacherBarPreviewWidget : public QWidget public: UBTeacherBarPreviewWidget(QWidget* parent=0, const char* name="UBTeacherBarPreviewWidget"); ~UBTeacherBarPreviewWidget(); + UBTeacherBarPreviewMedia* mediaViewer() {return &mMediaViewer;} signals: void showEditMode(); @@ -99,7 +121,8 @@ private slots: private: QVBoxLayout* mpLayout; QPushButton* mpEditButton; - QHBoxLayout* mpEditLayout; + QVBoxLayout* mpEditLayout; + UBTeacherBarPreviewMedia mMediaViewer; }; class UBTeacherBarWidget : public UBDockPaletteWidget From 08f9384b4321c77ae073d3415ce9be605d79ad0f Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 10:51:35 +0100 Subject: [PATCH 29/99] handling drop from preview mode --- src/board/UBBoardView.cpp | 10 +++--- src/core/UBDisplayManager.cpp | 2 +- src/customWidgets/UBDraggableLabel.cpp | 39 +++++++++++++++++++++++ src/customWidgets/UBDraggableLabel.h | 23 ++++++++++++++ src/customWidgets/customWidgets.pri | 8 +++-- src/gui/UBMediaPlayer.cpp | 28 ++++++++++++++++ src/gui/UBMediaPlayer.h | 12 +++++++ src/gui/UBTeacherBarWidget.cpp | 44 +++++++------------------- src/gui/UBTeacherBarWidget.h | 7 +--- 9 files changed, 126 insertions(+), 47 deletions(-) create mode 100644 src/customWidgets/UBDraggableLabel.cpp create mode 100644 src/customWidgets/UBDraggableLabel.h diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index af99f131..4cbfe088 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -19,6 +19,7 @@ #include "UBDrawingController.h" #include "frameworks/UBGeometryUtils.h" +#include "frameworks/UBPlatformUtils.h" #include "core/UBSettings.h" #include "core/UBMimeData.h" @@ -33,8 +34,8 @@ #include "gui/UBToolWidget.h" #include "gui/UBResources.h" #include "gui/UBMainWindow.h" -#include "gui/UBTeacherBarWidget.h" - +#include "gui/UBMediaPlayer.h" +#include "gui/UBThumbnailWidget.h" #include "board/UBBoardController.h" @@ -44,9 +45,8 @@ #include "domain/UBItem.h" #include "document/UBDocumentProxy.h" -#include "../gui/UBThumbnailWidget.h" -#include "frameworks/UBPlatformUtils.h" +#include "customWidgets/UBDraggableLabel.h" #include "core/memcheck.h" @@ -727,7 +727,7 @@ void UBBoardView::dropEvent (QDropEvent *event) { qDebug() << event->source(); - if(!event->source() || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source())) + if(!event->source() || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source())) { mController->processMimeData (event->mimeData (), mapToScene (event->pos ())); event->acceptProposedAction (); diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp index 6ecdc679..c6214d15 100644 --- a/src/core/UBDisplayManager.cpp +++ b/src/core/UBDisplayManager.cpp @@ -48,7 +48,7 @@ UBDisplayManager::UBDisplayManager(QObject *parent) void UBDisplayManager::initScreenIndexes() { - int screenCount = numScreens(); + int screenCount = 1;//numScreens(); mScreenIndexesRoles.clear(); diff --git a/src/customWidgets/UBDraggableLabel.cpp b/src/customWidgets/UBDraggableLabel.cpp new file mode 100644 index 00000000..200205b9 --- /dev/null +++ b/src/customWidgets/UBDraggableLabel.cpp @@ -0,0 +1,39 @@ +#include +#include +#include + +#include "UBDraggableLabel.h" + + +UBDraggableLabel::UBDraggableLabel(QWidget *parent) : + QLabel(parent) +{ +} + +UBDraggableLabel::~UBDraggableLabel() +{ + //NOOP +} + +void UBDraggableLabel::loadImage(QString imagePath) +{ + mSourcePath = imagePath; + QPixmap pix = QPixmap(mSourcePath); + setPixmap(pix); + setScaledContents(true); +} + +void UBDraggableLabel::mousePressEvent(QMouseEvent *event) +{ + Q_UNUSED(event); + QMimeData *mimeData = new QMimeData; + QList urls; + urls << QUrl::fromLocalFile(mSourcePath); + mimeData->setUrls(urls); + mimeData->setText(mSourcePath); + + + QDrag *drag = new QDrag(this); + drag->setMimeData(mimeData); + drag->start(); +} diff --git a/src/customWidgets/UBDraggableLabel.h b/src/customWidgets/UBDraggableLabel.h new file mode 100644 index 00000000..384b313e --- /dev/null +++ b/src/customWidgets/UBDraggableLabel.h @@ -0,0 +1,23 @@ +#ifndef UBDRAGGABLELABEL_H +#define UBDRAGGABLELABEL_H + +#include + +class UBDraggableLabel : public QLabel +{ + Q_OBJECT +public: + UBDraggableLabel(QWidget *parent = 0); + ~UBDraggableLabel(); + void loadImage(QString imagePath); +signals: + +public slots: + +protected: + QString mSourcePath; + void mousePressEvent(QMouseEvent *event); + +}; + +#endif // UBDRAGGABLELABEL_H diff --git a/src/customWidgets/customWidgets.pri b/src/customWidgets/customWidgets.pri index a5609d31..321f3d45 100644 --- a/src/customWidgets/customWidgets.pri +++ b/src/customWidgets/customWidgets.pri @@ -1,5 +1,9 @@ -HEADERS += src/customWidgets/UBWidgetList.h +HEADERS += src/customWidgets/UBWidgetList.h \ + src/customWidgets/UBDraggableLabel.h -SOURCES += src/customWidgets/UBWidgetList.cpp +SOURCES += src/customWidgets/UBWidgetList.cpp \ + src/customWidgets/UBDraggableLabel.cpp + + diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index 357d161e..c68253b3 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -343,3 +343,31 @@ void UBMediaPlayer::hasVideoChanged(bool bHasVideo) // info->setVisible(!bHasVideo); m_videoWindow.setVisible(bHasVideo); } + +//************************************************************************* +UBDraggableMediaPlayer::UBDraggableMediaPlayer():UBMediaPlayer() +{ +// setAcceptDrops(true); +} + +void UBDraggableMediaPlayer::setFile(const QString &text) +{ + mSourcePath = text; + UBMediaPlayer::setFile(text); +} + +void UBDraggableMediaPlayer::mousePressEvent(QMouseEvent *event) +{ + Q_UNUSED(event); + QMimeData *mimeData = new QMimeData; + QList urls; + urls << QUrl::fromLocalFile(mSourcePath); + mimeData->setUrls(urls); + mimeData->setText(mSourcePath); + + + QDrag *drag = new QDrag(this); + drag->setMimeData(mimeData); + drag->start(); +} + diff --git a/src/gui/UBMediaPlayer.h b/src/gui/UBMediaPlayer.h index 6e563698..86534802 100644 --- a/src/gui/UBMediaPlayer.h +++ b/src/gui/UBMediaPlayer.h @@ -89,4 +89,16 @@ private: Phonon::Path m_audioOutputPath; }; +class UBDraggableMediaPlayer : public UBMediaPlayer +{ + Q_OBJECT +public: + UBDraggableMediaPlayer(); + void setFile(const QString &text); +protected: + QString mSourcePath; + void mousePressEvent(QMouseEvent *event); +}; + + #endif // UBUBMediaPlayer_H diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 65c4ad91..e2336b10 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -15,6 +15,8 @@ #include "frameworks/UBFileSystemUtils.h" +#include "customWidgets/UBDraggableLabel.h" + #include "core/memcheck.h" UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDockPaletteWidget(parent) @@ -583,7 +585,6 @@ void UBTeacherBarDropMediaZone::reloadMedia(QStringList pList) foreach(QString eachString, pList){ addMedia(eachString); } - } void UBTeacherBarDropMediaZone::dropEvent(QDropEvent *pEvent) @@ -722,15 +723,11 @@ void UBTeacherBarPreviewWidget::onEdit() UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char* name) : QWidget(parent) { setObjectName(name); - setAcceptDrops(true); mWidget = new UBWidgetList(parent); mWidget->setEmptyText(tr("No media found")); mLayout.addWidget(mWidget); setLayout(&mLayout); - //TO TEST only -// QStringList mediaPathList; -// mediaPathList << "/home/claudio/Desktop/PIPPO.jpg"; -// loadMedia(mediaPathList); + mWidgetList.clear(); } UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() @@ -743,28 +740,25 @@ UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() } -// for test only -QString tempString; - void UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) { + foreach(QWidget* eachWidget, mWidgetList.keys()) + delete eachWidget; + mWidgetList.clear(); foreach(QString eachString, pMedias){ if(!eachString.isEmpty()){ - tempString = eachString; QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(eachString); if(mimeType.contains("image")){ - QPixmap pix = QPixmap(eachString); - QLabel* label = new QLabel(); - label->setPixmap(pix); - label->setScaledContents(true); + UBDraggableLabel* label = new UBDraggableLabel(); + label->loadImage(eachString); mWidget->addWidget(label); - // mWidgetList << label; + mWidgetList[label]=eachString; } else if(mimeType.contains("video") || mimeType.contains("audio")){ - UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + UBDraggableMediaPlayer* mediaPlayer = new UBDraggableMediaPlayer(); mediaPlayer->setFile(eachString); mWidget->addWidget(mediaPlayer); - // mWidgetList << mediaPlayer; + mWidgetList[mediaPlayer] = eachString; } else{ qWarning() << "pMediaPath" << eachString; @@ -773,19 +767,3 @@ void UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) } } } - -void UBTeacherBarPreviewMedia::mousePressEvent(QMouseEvent *event) -{ - Q_UNUSED(event); - QMimeData *mimeData = new QMimeData; - QList urls; - urls << QUrl::fromLocalFile(tempString); - mimeData->setUrls(urls); - mimeData->setText(tempString); - - - QDrag *drag = new QDrag(this); - drag->setMimeData(mimeData); - drag->start(); -} - diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 50377d65..a7097cbe 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -81,12 +81,7 @@ public: private: UBWidgetList* mWidget; QVBoxLayout mLayout; - -protected: - void mousePressEvent(QMouseEvent *event); - -public slots: - + QMapmWidgetList; }; class UBUrlWidget : public QWidget From 91621dbb9b4c9f48ba240ef3c79503c5ac30dd26 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 10:57:32 +0100 Subject: [PATCH 30/99] restored good version --- src/core/UBDisplayManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp index c6214d15..6ecdc679 100644 --- a/src/core/UBDisplayManager.cpp +++ b/src/core/UBDisplayManager.cpp @@ -48,7 +48,7 @@ UBDisplayManager::UBDisplayManager(QObject *parent) void UBDisplayManager::initScreenIndexes() { - int screenCount = 1;//numScreens(); + int screenCount = numScreens(); mScreenIndexesRoles.clear(); From 03fef88c4fac3de08bac78be17b3a37e457789d9 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 6 Jan 2012 11:29:26 +0100 Subject: [PATCH 31/99] Backup --- src/customWidgets/UBWidgetList.cpp | 2 + src/gui/UBTeacherBarWidget.cpp | 135 ++++++++++++++++++++++++----- src/gui/UBTeacherBarWidget.h | 23 ++++- 3 files changed, 133 insertions(+), 27 deletions(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 67c157b2..b46d0770 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -12,6 +12,8 @@ UBWidgetList::UBWidgetList(QWidget* parent, eWidgetListOrientation orientation, mpContainer = new QWidget(this); mpEmptyLabel = new QLabel(this); mpEmptyLabel->setObjectName("emptyString"); + mpEmptyLabel->setWordWrap(true); + mpEmptyLabel->setAlignment(Qt::AlignCenter); if(eWidgetListOrientation_Vertical == orientation){ setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 65c4ad91..479e570f 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -278,11 +278,11 @@ void UBTeacherBarWidget::saveContent() infos.title = mpTitle->text(); // Duration if(mpDuration1->isChecked()){ - infos.Duration = 0; + infos.Duration = eDuration_Quarter; }else if(mpDuration2->isChecked()){ - infos.Duration = 1; + infos.Duration = eDuration_Half; }else{ - infos.Duration = 2; + infos.Duration = eDuration_ThreeQuarter; } // Actions for(int i=0; isetText(nextInfos.title); // Duration switch(nextInfos.Duration){ - case 0: mpDuration1->setChecked(true); + case eDuration_Quarter: mpDuration1->setChecked(true); break; - case 1: mpDuration2->setChecked(true); + case eDuration_Half: mpDuration2->setChecked(true); break; - case 2: mpDuration3->setChecked(true); + case eDuration_ThreeQuarter: mpDuration3->setChecked(true); break; default: mpDuration1->setChecked(true); break; @@ -351,8 +351,18 @@ void UBTeacherBarWidget::loadContent() } if(!isEmpty()){ + // Update the fields of the preview widget + mpPreview->setTitle(mpTitle->text()); mpPreview->mediaViewer()->loadMedia(nextInfos.medias); mpStackWidget->setCurrentWidget(mpPreview); + if(mpDuration1->isChecked()){ + mpPreview->setDuration(eDuration_Quarter); + }else if(mpDuration2->isChecked()){ + mpPreview->setDuration(eDuration_Half); + }else{ + mpPreview->setDuration(eDuration_ThreeQuarter); + } + } } @@ -675,22 +685,60 @@ void UBUrlWidget::setUrl(const QString &url) // ------------------------------------------------------------------------------------ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char *name):QWidget(parent) - , mpLayout(NULL) , mpEditButton(NULL) - , mpEditLayout(NULL) + , mpTitle(NULL) + , mpDuration(NULL) + , mpActionsLabel(NULL) + , mpMediaLabel(NULL) + , mpCommentsLabel(NULL) { setObjectName(name); - mpLayout = new QVBoxLayout(this); - setLayout(mpLayout); + setLayout(&mLayout); + + setAttribute(Qt::WA_StyledBackground, true); + setStyleSheet(UBApplication::globalStyleSheet()); + + // Build the Preview widget + // Title + duration + mpTitle = new QLabel(this); + mpTitle->setObjectName("UBTeacherBarPreviewTitle"); + mpTitle->setWordWrap(true); + mpTitle->setAlignment(Qt::AlignCenter); + mpDuration = new QLabel(this); + mTitleDurationLayout.addWidget(mpTitle, 0); + mTitleDurationLayout.addWidget(mpDuration, 1); + mLayout.addLayout(&mTitleDurationLayout, 0); + // Actions + mpActionsLabel = new QLabel(tr("Actions"), this); + mActionLabelLayout.addWidget(mpActionsLabel, 0); + mActionLabelLayout.addStretch(1); + mLayout.addLayout(&mActionLabelLayout); + + // Media + mpMediaLabel = new QLabel(tr("Medias"), this); + mMediaLabelLayout.addWidget(mpMediaLabel, 0); + mMediaLabelLayout.addStretch(1); + mLayout.addLayout(&mMediaLabelLayout); + mLayout.addWidget(&mMediaViewer, 0); + + // Temporary stretch + mLayout.addStretch(1); + + // Comments + mpCommentsLabel = new QLabel(tr("Comments"), this); + mCommentsLabelLayout.addWidget(mpCommentsLabel, 0); + mCommentsLabelLayout.addStretch(1); + mLayout.addLayout(&mCommentsLabelLayout); + + // Edit button mpEditButton = new QPushButton(tr("Edit infos"), this); - mpEditLayout = new QVBoxLayout(); - mpEditLayout->addStretch(1); - mpEditLayout->addWidget(mpEditButton, 0); - mpEditLayout->addStretch(1); - mpEditLayout->addWidget(&mMediaViewer); - mpLayout->addLayout(mpEditLayout); + mpEditButton->setObjectName("DockPaletteWidgetButton"); + mEditLayout.addStretch(1); + mEditLayout.addWidget(mpEditButton, 0); + mEditLayout.addStretch(1); + mLayout.addLayout(&mEditLayout, 0); connect(mpEditButton, SIGNAL(clicked()), this, SLOT(onEdit())); @@ -698,18 +746,30 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char UBTeacherBarPreviewWidget::~UBTeacherBarPreviewWidget() { + if(NULL != mpTitle){ + delete mpTitle; + mpTitle = NULL; + } + if(NULL != mpDuration){ + delete mpDuration; + mpDuration = NULL; + } + if(NULL != mpActionsLabel){ + delete mpActionsLabel; + mpActionsLabel = NULL; + } + if(NULL != mpMediaLabel){ + delete mpMediaLabel; + mpMediaLabel = NULL; + } + if(NULL != mpCommentsLabel){ + delete mpCommentsLabel; + mpCommentsLabel = NULL; + } if(NULL != mpEditButton){ delete mpEditButton; mpEditButton = NULL; } - if(NULL != mpEditLayout){ - delete mpEditLayout; - mpEditLayout = NULL; - } - if(NULL != mpLayout){ - delete mpLayout; - mpLayout = NULL; - } } void UBTeacherBarPreviewWidget::onEdit() @@ -717,6 +777,33 @@ void UBTeacherBarPreviewWidget::onEdit() emit showEditMode(); } +void UBTeacherBarPreviewWidget::setTitle(const QString &title) +{ + if(NULL != mpTitle){ + mpTitle->setText(title); + } +} + +void UBTeacherBarPreviewWidget::setDuration(eDuration duration) +{ + if(NULL != mpDuration){ + QPixmap p; + switch(duration){ + case eDuration_Quarter: + p = QPixmap(":images/duration1.png"); + break; + case eDuration_Half: + p = QPixmap(":images/duration2.png"); + break; + case eDuration_ThreeQuarter: + p = QPixmap(":images/duration3.png"); + break; + default: + break; + } + mpDuration->setPixmap(p.scaledToHeight(16, Qt::SmoothTransformation)); + } +} // ------------------------------------------------------------------------------------ UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char* name) : QWidget(parent) diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 50377d65..a76de6a7 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -21,6 +21,12 @@ class UBMediaPlayer; #define LABEL_MINWIDHT 80 +typedef enum{ + eDuration_Quarter, + eDuration_Half, + eDuration_ThreeQuarter +}eDuration; + class UBTeacherStudentAction : public QWidget { Q_OBJECT @@ -111,6 +117,8 @@ public: UBTeacherBarPreviewWidget(QWidget* parent=0, const char* name="UBTeacherBarPreviewWidget"); ~UBTeacherBarPreviewWidget(); UBTeacherBarPreviewMedia* mediaViewer() {return &mMediaViewer;} + void setTitle(const QString& title); + void setDuration(eDuration duration); signals: void showEditMode(); @@ -119,10 +127,19 @@ private slots: void onEdit(); private: - QVBoxLayout* mpLayout; - QPushButton* mpEditButton; - QVBoxLayout* mpEditLayout; + QVBoxLayout mLayout; + QHBoxLayout mEditLayout; + QHBoxLayout mTitleDurationLayout; + QHBoxLayout mActionLabelLayout; + QHBoxLayout mMediaLabelLayout; + QHBoxLayout mCommentsLabelLayout; UBTeacherBarPreviewMedia mMediaViewer; + QPushButton* mpEditButton; + QLabel* mpTitle; + QLabel* mpDuration; + QLabel* mpActionsLabel; + QLabel* mpMediaLabel; + QLabel* mpCommentsLabel; }; class UBTeacherBarWidget : public UBDockPaletteWidget From 1eba2bb0f48ad29a5515fa04e5dce40e1ca923b5 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 11:32:50 +0100 Subject: [PATCH 32/99] merged --- src/gui/UBTeacherBarWidget.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 52985f84..b5e788da 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -356,6 +356,7 @@ void UBTeacherBarWidget::loadContent() // Update the fields of the preview widget mpPreview->setTitle(mpTitle->text()); mpPreview->mediaViewer()->loadMedia(nextInfos.medias); + mpStackWidget->setCurrentWidget(mpPreview); if(mpDuration1->isChecked()){ mpPreview->setDuration(eDuration_Quarter); @@ -366,6 +367,9 @@ void UBTeacherBarWidget::loadContent() } } + // this is always done becasue it allows to clean the media on + // changing the page + mpPreview->mediaViewer()->loadMedia(nextInfos.medias); } bool UBTeacherBarWidget::isEmpty() @@ -829,8 +833,6 @@ UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() void UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) { - foreach(QWidget* eachWidget, mWidgetList.keys()) - delete eachWidget; mWidgetList.clear(); foreach(QString eachString, pMedias){ if(!eachString.isEmpty()){ From fb2f09deede96b77d9f54ce04274934cac78de36 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 6 Jan 2012 12:49:58 +0100 Subject: [PATCH 33/99] updated stylesheet --- resources/style.qss | 21 +++++++++++++++++++++ src/gui/UBTeacherBarWidget.cpp | 20 +++++++++++++++++++- src/gui/UBTeacherBarWidget.h | 3 +++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/resources/style.qss b/resources/style.qss index 8681fb80..f631984c 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -12,6 +12,27 @@ QWidget#UBTeacherBarDropMediaZone border: 2px solid #999999; } +QWidget#UBTeacherBarPreviewWidget +{ + background: #FFFFFF; + border-radius: 10px; + border: 2px solid #999999; +} + +QLabel#UBTeacherBarPreviewTitle +{ + color: #555555; + font-size : 18px; + font-weight:bold; +} + +QLabel#UBTeacherBarPreviewSubtitle +{ + color: #555555; + font-size : 14px; + font-weight:bold; +} + QWidget#UBLibWebView { background: #EEEEEE; diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 52985f84..112a256b 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -364,7 +364,7 @@ void UBTeacherBarWidget::loadContent() }else{ mpPreview->setDuration(eDuration_ThreeQuarter); } - + mpPreview->setComments(mpComments->document()->toPlainText()); } } @@ -692,6 +692,7 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char , mpActionsLabel(NULL) , mpMediaLabel(NULL) , mpCommentsLabel(NULL) + , mpComments(NULL) { setObjectName(name); @@ -713,12 +714,14 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char // Actions mpActionsLabel = new QLabel(tr("Actions"), this); + mpActionsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mActionLabelLayout.addWidget(mpActionsLabel, 0); mActionLabelLayout.addStretch(1); mLayout.addLayout(&mActionLabelLayout); // Media mpMediaLabel = new QLabel(tr("Medias"), this); + mpMediaLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mMediaLabelLayout.addWidget(mpMediaLabel, 0); mMediaLabelLayout.addStretch(1); mLayout.addLayout(&mMediaLabelLayout); @@ -729,9 +732,13 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char // Comments mpCommentsLabel = new QLabel(tr("Comments"), this); + mpCommentsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mCommentsLabelLayout.addWidget(mpCommentsLabel, 0); mCommentsLabelLayout.addStretch(1); mLayout.addLayout(&mCommentsLabelLayout); + mpComments = new QLabel(this); + mpComments->setWordWrap(true); + mLayout.addWidget(mpComments); // Edit button mpEditButton = new QPushButton(tr("Edit infos"), this); @@ -747,6 +754,10 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char UBTeacherBarPreviewWidget::~UBTeacherBarPreviewWidget() { + if(NULL != mpComments){ + delete mpComments; + mpComments = NULL; + } if(NULL != mpTitle){ delete mpTitle; mpTitle = NULL; @@ -806,6 +817,13 @@ void UBTeacherBarPreviewWidget::setDuration(eDuration duration) } } +void UBTeacherBarPreviewWidget::setComments(const QString &comments) +{ + if(NULL != mpComments){ + mpComments->setText(comments); + } +} + // ------------------------------------------------------------------------------------ UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char* name) : QWidget(parent) { diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 5ee8f336..8937bf24 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -114,6 +114,7 @@ public: UBTeacherBarPreviewMedia* mediaViewer() {return &mMediaViewer;} void setTitle(const QString& title); void setDuration(eDuration duration); + void setComments(const QString& comments); signals: void showEditMode(); @@ -129,12 +130,14 @@ private: QHBoxLayout mMediaLabelLayout; QHBoxLayout mCommentsLabelLayout; UBTeacherBarPreviewMedia mMediaViewer; + QPushButton* mpEditButton; QLabel* mpTitle; QLabel* mpDuration; QLabel* mpActionsLabel; QLabel* mpMediaLabel; QLabel* mpCommentsLabel; + QLabel* mpComments; }; class UBTeacherBarWidget : public UBDockPaletteWidget From e93410f1370619d20f6794c129e3fa0e77a0a706 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 12:51:27 +0100 Subject: [PATCH 34/99] resolved issue --- src/gui/UBTeacherBarWidget.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 84eed6b0..f4e14883 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -366,10 +366,10 @@ void UBTeacherBarWidget::loadContent() mpPreview->setDuration(eDuration_ThreeQuarter); } mpPreview->setComments(mpComments->document()->toPlainText()); + mpPreview->mediaViewer()->cleanMedia(); + mpPreview->mediaViewer()->loadMedia(nextInfos.medias); } - // this is always done becasue it allows to clean the media on - // changing the page - mpPreview->mediaViewer()->loadMedia(nextInfos.medias); + } bool UBTeacherBarWidget::isEmpty() @@ -848,10 +848,18 @@ UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() } +void UBTeacherBarPreviewMedia::cleanMedia() +{ + foreach(QWidget* eachWidget, mWidgetList.keys()){ + delete eachWidget; + eachWidget = NULL; + } + mWidgetList.clear(); +} + void UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) { - mWidgetList.clear(); foreach(QString eachString, pMedias){ if(!eachString.isEmpty()){ QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(eachString); From b5dc5d1d46dcc601d97838d1d7d5dd1003a81bf5 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 12:51:50 +0100 Subject: [PATCH 35/99] fixed duplicated widgets --- src/customWidgets/UBWidgetList.cpp | 2 -- src/gui/UBTeacherBarWidget.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index b46d0770..d73ded86 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -76,13 +76,11 @@ int UBWidgetList::scaleWidgets(QSize pSize) { int result = 0; foreach(QWidget* eachWidget, mWidgetInfo.keys()){ - qDebug() << __FUNCTION__ << "eachWidget : " << eachWidget; qreal scaleFactor = 0; int newWidgetWidth = pSize.width(); int newWidgetHeight = pSize.height(); if(eWidgetListOrientation_Vertical == mOrientation){ scaleFactor = (float)mWidgetInfo[eachWidget].width() / (float)pSize.width(); - qDebug() << __FUNCTION__ << "scale factor: " << scaleFactor; newWidgetHeight = mWidgetInfo[eachWidget].height()/scaleFactor; result += newWidgetHeight; } diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 8937bf24..4195a21a 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -83,6 +83,7 @@ public: UBTeacherBarPreviewMedia(QWidget* parent=0, const char* name="UBTeacherBarPreviewMedia"); ~UBTeacherBarPreviewMedia(); void loadMedia(QStringList pMedias); + void cleanMedia(); private: UBWidgetList* mWidget; From 12a77f0ab923ee216435ac6f95366be3232142b1 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 13:01:41 +0100 Subject: [PATCH 36/99] added method to load widgets --- src/gui/UBTeacherBarWidget.cpp | 8 ++++++++ src/gui/UBTeacherBarWidget.h | 1 + 2 files changed, 9 insertions(+) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index f4e14883..670dde8d 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -857,6 +857,14 @@ void UBTeacherBarPreviewMedia::cleanMedia() mWidgetList.clear(); } +void UBTeacherBarPreviewMedia::loadWidgets(QList pWidgetsList) +{ + foreach(QWidget*eachWidget, pWidgetsList){ + mWidget->addWidget(eachWidget); + mWidgetList[eachWidget]="DRAG UNAVAILABLE"; + } +} + void UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) { diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 4195a21a..862182a9 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -83,6 +83,7 @@ public: UBTeacherBarPreviewMedia(QWidget* parent=0, const char* name="UBTeacherBarPreviewMedia"); ~UBTeacherBarPreviewMedia(); void loadMedia(QStringList pMedias); + void loadWidgets(QList pWidgetList); void cleanMedia(); private: From e584c2cfd09f1cb91f6f4473c1cea1572617b9a1 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 6 Jan 2012 13:02:58 +0100 Subject: [PATCH 37/99] backup --- src/gui/UBTeacherBarWidget.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index f4e14883..4c19586c 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -721,28 +721,30 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char mpActionsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mActionLabelLayout.addWidget(mpActionsLabel, 0); mActionLabelLayout.addStretch(1); - mLayout.addLayout(&mActionLabelLayout); + mpActionsLabel->setVisible(false); + //mLayout.addLayout(&mActionLabelLayout); // Media mpMediaLabel = new QLabel(tr("Medias"), this); mpMediaLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mMediaLabelLayout.addWidget(mpMediaLabel, 0); mMediaLabelLayout.addStretch(1); - mLayout.addLayout(&mMediaLabelLayout); - mLayout.addWidget(&mMediaViewer, 0); + mpMediaLabel->setVisible(false); + //mLayout.addLayout(&mMediaLabelLayout, 0); + mLayout.addWidget(&mMediaViewer, 1); - // Temporary stretch - mLayout.addStretch(1); // Comments mpCommentsLabel = new QLabel(tr("Comments"), this); mpCommentsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mCommentsLabelLayout.addWidget(mpCommentsLabel, 0); mCommentsLabelLayout.addStretch(1); - mLayout.addLayout(&mCommentsLabelLayout); + //mLayout.addLayout(&mCommentsLabelLayout); mpComments = new QLabel(this); mpComments->setWordWrap(true); - mLayout.addWidget(mpComments); + mpCommentsLabel->setVisible(false); + mpComments->setVisible(false); + //mLayout.addWidget(mpComments); // Edit button mpEditButton = new QPushButton(tr("Edit infos"), this); From ef2e24c0d80dff8efd85146f5b3920032605ffc7 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 13:23:48 +0100 Subject: [PATCH 38/99] fixed widget to load on page change regarding the stored information --- src/gui/UBTeacherBarWidget.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 670dde8d..43df4246 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -352,6 +352,8 @@ void UBTeacherBarWidget::loadContent() mpComments->document()->setPlainText(nextInfos.comments); } + mpPreview->mediaViewer()->cleanMedia(); + if(!isEmpty()){ // Update the fields of the preview widget mpPreview->setTitle(mpTitle->text()); @@ -366,9 +368,12 @@ void UBTeacherBarWidget::loadContent() mpPreview->setDuration(eDuration_ThreeQuarter); } mpPreview->setComments(mpComments->document()->toPlainText()); - mpPreview->mediaViewer()->cleanMedia(); mpPreview->mediaViewer()->loadMedia(nextInfos.medias); } + else{ + mpStackWidget->setCurrentWidget(mpContainer); + } + } From abdea843ff81cb6efa0f127a999b3f68d3434ffa Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 6 Jan 2012 13:56:04 +0100 Subject: [PATCH 39/99] backup of the teacher bar preview --- src/gui/UBTeacherBarWidget.cpp | 99 ++++++++++++++++++++++++++++++++-- src/gui/UBTeacherBarWidget.h | 8 +++ 2 files changed, 102 insertions(+), 5 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index f82770b0..0275b1ac 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -365,9 +365,33 @@ void UBTeacherBarWidget::loadContent() }else{ mpPreview->setDuration(eDuration_ThreeQuarter); } - mpPreview->setComments(mpComments->document()->toPlainText()); - mpPreview->mediaViewer()->cleanMedia(); + + mpPreview->clean(); + + // Add the actions + if(!mActionList.empty()){ + QStringList actions; + foreach(UBTeacherStudentAction* action, mActionList){ + QString desc = QString("%0;%1").arg(action->comboValue()).arg(action->text()); + actions << desc; + } + mpPreview->setActions(actions); + } + + // Add the media mpPreview->mediaViewer()->loadMedia(nextInfos.medias); + + // Add the links + if(!mUrlList.empty()){ + QStringList links; + foreach(UBUrlWidget* url, mUrlList){ + links << url->url(); + } + mpPreview->setLinks(links); + } + + // Add the comments + mpPreview->setComments(mpComments->document()->toPlainText()); } } @@ -697,6 +721,7 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char , mpMediaLabel(NULL) , mpCommentsLabel(NULL) , mpComments(NULL) + , mpLinksLabel(NULL) { setObjectName(name); @@ -733,6 +758,8 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char //mLayout.addLayout(&mMediaLabelLayout, 0); mLayout.addWidget(&mMediaViewer, 1); + mpLinksLabel = new QLabel(tr("Links"), this); + mpLinksLabel->setObjectName("UBTeacherBarPreviewSubtitle"); // Comments mpCommentsLabel = new QLabel(tr("Comments"), this); @@ -760,6 +787,10 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char UBTeacherBarPreviewWidget::~UBTeacherBarPreviewWidget() { + if(NULL != mpLinksLabel){ + delete mpLinksLabel; + mpLinksLabel = NULL; + } if(NULL != mpComments){ delete mpComments; mpComments = NULL; @@ -825,8 +856,64 @@ void UBTeacherBarPreviewWidget::setDuration(eDuration duration) void UBTeacherBarPreviewWidget::setComments(const QString &comments) { - if(NULL != mpComments){ + if("" != comments){ + mWidgets.clear(); mpComments->setText(comments); + mpComments->setVisible(true); + mpCommentsLabel->setVisible(true); + mWidgets << mpCommentsLabel; + mWidgets << mpComments; + mMediaViewer.loadWidgets(mWidgets); + } +} + +void UBTeacherBarPreviewWidget::clean() +{ + mMediaViewer.cleanMedia(); + hideElements(); +} + +void UBTeacherBarPreviewWidget::hideElements() +{ + mpActionsLabel->setVisible(false); + mpMediaLabel->setVisible(false); + mpCommentsLabel->setVisible(false); + mpComments->setVisible(false); + mpLinksLabel->setVisible(false); +} + +void UBTeacherBarPreviewWidget::setActions(QStringList actions) +{ + if(!actions.empty()){ + mWidgets.clear(); + mpActionsLabel->setVisible(true); + mWidgets << mpActionsLabel; + foreach(QString action, actions){ + QStringList desc = action.split(';'); + if(2 <= desc.size()){ + QString owner = desc.at(0); + QString act = desc.at(1); + + // TODO : Create the action widget here and add it to mWidgets + + } + } + mMediaViewer.loadWidgets(mWidgets); + } +} + +void UBTeacherBarPreviewWidget::setLinks(QStringList links) +{ + if(!links.empty()){ + mWidgets.clear(); + mpLinksLabel->setVisible(true); + mWidgets << mpLinksLabel; + foreach(QString link, links){ + mpTmpLink = new QLabel(link, this); + mpTmpLink->setOpenExternalLinks(true); + mWidgets << mpTmpLink; + } + mMediaViewer.loadWidgets(mWidgets); } } @@ -853,8 +940,10 @@ UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() void UBTeacherBarPreviewMedia::cleanMedia() { foreach(QWidget* eachWidget, mWidgetList.keys()){ - delete eachWidget; - eachWidget = NULL; + if(QString(eachWidget->metaObject()->className()).contains("UBDraggable")){ + delete eachWidget; + eachWidget = NULL; + } } mWidgetList.clear(); } diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 862182a9..5ebe6558 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -117,6 +117,9 @@ public: void setTitle(const QString& title); void setDuration(eDuration duration); void setComments(const QString& comments); + void setActions(QStringList actions); + void setLinks(QStringList links); + void clean(); signals: void showEditMode(); @@ -125,6 +128,8 @@ private slots: void onEdit(); private: + void hideElements(); + QVBoxLayout mLayout; QHBoxLayout mEditLayout; QHBoxLayout mTitleDurationLayout; @@ -132,6 +137,7 @@ private: QHBoxLayout mMediaLabelLayout; QHBoxLayout mCommentsLabelLayout; UBTeacherBarPreviewMedia mMediaViewer; + QList mWidgets; QPushButton* mpEditButton; QLabel* mpTitle; @@ -140,6 +146,8 @@ private: QLabel* mpMediaLabel; QLabel* mpCommentsLabel; QLabel* mpComments; + QLabel* mpLinksLabel; + QLabel* mpTmpLink; }; class UBTeacherBarWidget : public UBDockPaletteWidget From c7c931b92aa7c5b7769405f885ce96b03b4a7126 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 6 Jan 2012 14:36:56 +0100 Subject: [PATCH 40/99] added the links in the teacherbar preview --- src/gui/UBTeacherBarWidget.cpp | 47 ++++++++++------------------------ src/gui/UBTeacherBarWidget.h | 3 --- 2 files changed, 14 insertions(+), 36 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index e1022004..cf155423 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -746,37 +746,9 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char mTitleDurationLayout.addWidget(mpDuration, 1); mLayout.addLayout(&mTitleDurationLayout, 0); - // Actions - mpActionsLabel = new QLabel(tr("Actions"), this); - mpActionsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - mActionLabelLayout.addWidget(mpActionsLabel, 0); - mActionLabelLayout.addStretch(1); - mpActionsLabel->setVisible(false); - //mLayout.addLayout(&mActionLabelLayout); - - // Media - mpMediaLabel = new QLabel(tr("Medias"), this); - mpMediaLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - mMediaLabelLayout.addWidget(mpMediaLabel, 0); - mMediaLabelLayout.addStretch(1); - mpMediaLabel->setVisible(false); - //mLayout.addLayout(&mMediaLabelLayout, 0); mLayout.addWidget(&mMediaViewer, 1); - mpLinksLabel = new QLabel(tr("Links"), this); - mpLinksLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - - // Comments - mpCommentsLabel = new QLabel(tr("Comments"), this); - mpCommentsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - mCommentsLabelLayout.addWidget(mpCommentsLabel, 0); - mCommentsLabelLayout.addStretch(1); - //mLayout.addLayout(&mCommentsLabelLayout); - mpComments = new QLabel(this); - mpComments->setWordWrap(true); - mpCommentsLabel->setVisible(false); - mpComments->setVisible(false); - //mLayout.addWidget(mpComments); + hideElements(); // Edit button mpEditButton = new QPushButton(tr("Edit infos"), this); @@ -880,6 +852,17 @@ void UBTeacherBarPreviewWidget::clean() void UBTeacherBarPreviewWidget::hideElements() { + mpActionsLabel = new QLabel(tr("Actions"), this); + mpActionsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpMediaLabel = new QLabel(tr("Media"), this); + mpMediaLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpCommentsLabel = new QLabel(tr("Comments"), this); + mpCommentsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpComments = new QLabel(this); + mpComments->setWordWrap(true); + mpLinksLabel = new QLabel(tr("Links"), this); + mpLinksLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpActionsLabel->setVisible(false); mpMediaLabel->setVisible(false); mpCommentsLabel->setVisible(false); @@ -945,10 +928,8 @@ UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() void UBTeacherBarPreviewMedia::cleanMedia() { foreach(QWidget* eachWidget, mWidgetList.keys()){ - if(QString(eachWidget->metaObject()->className()).contains("UBDraggable")){ - delete eachWidget; - eachWidget = NULL; - } + delete eachWidget; + eachWidget = NULL; } mWidgetList.clear(); } diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 5ebe6558..126af37d 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -133,9 +133,6 @@ private: QVBoxLayout mLayout; QHBoxLayout mEditLayout; QHBoxLayout mTitleDurationLayout; - QHBoxLayout mActionLabelLayout; - QHBoxLayout mMediaLabelLayout; - QHBoxLayout mCommentsLabelLayout; UBTeacherBarPreviewMedia mMediaViewer; QList mWidgets; From e114d8adf0163a4f33db8963136ef45e90600250 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 6 Jan 2012 14:58:04 +0100 Subject: [PATCH 41/99] added the action preview in the teacher bar --- src/gui/UBTeacherBarWidget.cpp | 61 ++++++++++++++++++++++++++++++++-- src/gui/UBTeacherBarWidget.h | 22 ++++++++++++ 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index cf155423..f20095d9 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -881,9 +881,10 @@ void UBTeacherBarPreviewWidget::setActions(QStringList actions) if(2 <= desc.size()){ QString owner = desc.at(0); QString act = desc.at(1); - - // TODO : Create the action widget here and add it to mWidgets - + mpTmpAction = new UBActionPreview(this); + mpTmpAction->setOwner(owner); + mpTmpAction->setContent(act); + mWidgets << mpTmpAction; } } mMediaViewer.loadWidgets(mWidgets); @@ -967,3 +968,57 @@ void UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) } } } + +// ----------------------------------------------------------------------------------------------- +UBActionPreview::UBActionPreview(QWidget *parent, const char *name):QWidget(parent) + , mpOwner(NULL) + , mpContent(NULL) +{ + setObjectName(name); + setLayout(&mLayout); + mpOwner = new QLabel(this); + mpOwner->setObjectName("UBActionPreviewOwner"); + mOwnerLayout.addWidget(mpOwner, 0); + mOwnerLayout.addStretch(1); + mLayout.addLayout(&mOwnerLayout); + mpContent = new QLabel(this); + mpContent->setObjectName("UBActionPreviewContent"); + mpContent->setWordWrap(true); + mLayout.addWidget(mpContent); +} + +UBActionPreview::~UBActionPreview() +{ + if(NULL != mpOwner){ + delete mpOwner; + mpOwner = NULL; + } + if(NULL != mpContent){ + delete mpContent; + mpContent = NULL; + } +} + +void UBActionPreview::setOwner(const QString &owner) +{ + if(NULL != mpOwner && NULL != mpContent){ + switch(owner.toInt()){ + case eActionOwner_Teacher: + mpOwner->setText(tr("Teacher")); + mpContent->setStyleSheet("background:lightblue;"); + break; + + case eActionOwner_Student: + mpOwner->setText(tr("Student")); + mpContent->setStyleSheet("background:lightgreen;"); + break; + } + } +} + +void UBActionPreview::setContent(const QString &content) +{ + if(NULL != mpContent){ + mpContent->setText(content); + } +} diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 126af37d..3e53f97d 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -27,6 +27,11 @@ typedef enum{ eDuration_ThreeQuarter }eDuration; +typedef enum{ + eActionOwner_Teacher, + eActionOwner_Student +}eActionOwner; + class UBTeacherStudentAction : public QWidget { Q_OBJECT @@ -107,6 +112,22 @@ private: QLineEdit* mpUrl; }; +class UBActionPreview : public QWidget +{ +public: + UBActionPreview(QWidget* parent=0, const char* name="UBActionPreview"); + ~UBActionPreview(); + void setOwner(const QString& owner); + void setContent(const QString& content); + +private: + QLabel* mpOwner; + QLabel* mpContent; + + QVBoxLayout mLayout; + QHBoxLayout mOwnerLayout; +}; + class UBTeacherBarPreviewWidget : public QWidget { Q_OBJECT @@ -145,6 +166,7 @@ private: QLabel* mpComments; QLabel* mpLinksLabel; QLabel* mpTmpLink; + UBActionPreview* mpTmpAction; }; class UBTeacherBarWidget : public UBDockPaletteWidget From 92abcddbbe6f7f945d6213cf4411f9f35c051afe Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 15:02:38 +0100 Subject: [PATCH 42/99] resolved conflict --- src/gui/UBTeacherBarWidget.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index f20095d9..646b459d 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -911,8 +911,9 @@ UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char* { setObjectName(name); mWidget = new UBWidgetList(parent); - mWidget->setEmptyText(tr("No media found")); +// mWidget->setEmptyText(tr("No media found")); mLayout.addWidget(mWidget); + mWidget->setStyleSheet(QString("background-color: red;")); setLayout(&mLayout); mWidgetList.clear(); } @@ -929,8 +930,11 @@ UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() void UBTeacherBarPreviewMedia::cleanMedia() { foreach(QWidget* eachWidget, mWidgetList.keys()){ - delete eachWidget; - eachWidget = NULL; + if(QString(eachWidget->metaObject()->className()).contains("UBDraggable")){ + delete eachWidget; + eachWidget = NULL; + } + mWidget->removeWidget(eachWidget); } mWidgetList.clear(); } From 64542002d65390676b7725bdf3fa94d52c17ed7c Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 15:19:43 +0100 Subject: [PATCH 43/99] fixed last scale issues --- src/customWidgets/UBWidgetList.cpp | 8 ++++++++ src/gui/UBMediaPlayer.cpp | 8 +++++--- src/gui/UBTeacherBarWidget.cpp | 7 +++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index d73ded86..cc2ee125 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -53,6 +53,7 @@ void UBWidgetList::addWidget(QWidget *widget) if(NULL != mpLayout){ mpEmptyLabel->setVisible(false); mWidgetInfo[widget] = widget->size(); + qDebug() << __FUNCTION__ << "widget->size () " << widget->size(); updateView(size()); mpLayout->addWidget(widget); } @@ -75,6 +76,7 @@ void UBWidgetList::removeWidget(QWidget *widget) int UBWidgetList::scaleWidgets(QSize pSize) { int result = 0; + int count = 0; foreach(QWidget* eachWidget, mWidgetInfo.keys()){ qreal scaleFactor = 0; int newWidgetWidth = pSize.width(); @@ -89,6 +91,12 @@ int UBWidgetList::scaleWidgets(QSize pSize) newWidgetWidth = mWidgetInfo[eachWidget].width()/scaleFactor; result += newWidgetWidth; } + qDebug() << __PRETTY_FUNCTION__ << "widget " << &eachWidget; + qDebug() << __PRETTY_FUNCTION__ << "count " << count++; + qDebug() << __PRETTY_FUNCTION__ << "widget orignal size " << mWidgetInfo[eachWidget]; + qDebug() << __PRETTY_FUNCTION__ << "containes size " << pSize; + qDebug() << __PRETTY_FUNCTION__ << "scale factor " << scaleFactor; + qDebug() << __PRETTY_FUNCTION__ << "new height " << result; } return result; } diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index c68253b3..b7c13c78 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -100,14 +100,17 @@ UBMediaPlayer::UBMediaPlayer() : // vLayout->addWidget(info); initVideoWindow(); vLayout->addWidget(&m_videoWindow); +// m_videoWidget->setStyleSheet(QString("background:red;")); QVBoxLayout *buttonPanelLayout = new QVBoxLayout(); -// m_videoWindow.hide(); + //m_videoWindow.hide(); // buttonPanelLayout->addLayout(layout); // timeLabel = new QLabel(this); progressLabel = new QLabel(this); QWidget *sliderPanel = new QWidget(this); +// sliderPanel->setStyleSheet(QString("background:green;")); QHBoxLayout *sliderLayout = new QHBoxLayout(); +// playButton->setStyleSheet(QString("background:yellow;")); sliderLayout->addWidget(playButton); sliderLayout->addWidget(slider); // sliderLayout->addWidget(timeLabel); @@ -130,7 +133,6 @@ UBMediaPlayer::UBMediaPlayer() : vLayout->addWidget(buttonPanelWidget); QHBoxLayout *labelLayout = new QHBoxLayout(); - vLayout->addLayout(labelLayout); setLayout(vLayout); @@ -224,7 +226,7 @@ void UBMediaPlayer::initVideoWindow() videoLayout->addWidget(m_videoWidget); videoLayout->setContentsMargins(0, 0, 0, 0); m_videoWindow.setLayout(videoLayout); - m_videoWindow.setMinimumSize(100, 100); + m_videoWindow.setMinimumSize(60, 40); } void UBMediaPlayer::playPause() diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 646b459d..188f1f0f 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -913,7 +913,7 @@ UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char* mWidget = new UBWidgetList(parent); // mWidget->setEmptyText(tr("No media found")); mLayout.addWidget(mWidget); - mWidget->setStyleSheet(QString("background-color: red;")); +// mWidget->setStyleSheet(QString("background-color: red;")); setLayout(&mLayout); mWidgetList.clear(); } @@ -931,10 +931,13 @@ void UBTeacherBarPreviewMedia::cleanMedia() { foreach(QWidget* eachWidget, mWidgetList.keys()){ if(QString(eachWidget->metaObject()->className()).contains("UBDraggable")){ + mWidget->removeWidget(eachWidget); delete eachWidget; eachWidget = NULL; } - mWidget->removeWidget(eachWidget); + else{ + mWidget->removeWidget(eachWidget); + } } mWidgetList.clear(); } From e849733736ef1528cc41974d0bbf22ecbdd6213e Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 6 Jan 2012 15:20:13 +0100 Subject: [PATCH 44/99] backup --- resources/style.qss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/style.qss b/resources/style.qss index f631984c..323f062c 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -40,6 +40,19 @@ QWidget#UBLibWebView border: 2px solid #999999; } +QWidget#UBActionPreviewOwner +{ + color: #555555; + font-size : 10px; + font-weight:bold; +} + +QWidget#UBActionPreviewContent +{ + border-radius : 10px; + border: 2px solid; +} + QWebView#SearchEngineView { background:white; From c39f52134937e55063c0a747c35d16016b0db389 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 16:19:09 +0100 Subject: [PATCH 45/99] fixed url issue --- src/gui/UBTeacherBarWidget.cpp | 47 +++++++++++++++++++++++++++++----- src/gui/UBTeacherBarWidget.h | 7 ++++- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 188f1f0f..03b1644a 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -386,7 +386,12 @@ void UBTeacherBarWidget::loadContent() if(!mUrlList.empty()){ QStringList links; foreach(UBUrlWidget* url, mUrlList){ - links << url->url(); + QStringList list = url->url().split(";"); + QString formedlink = "" + list.at(1) + ""; + links << formedlink; } mpPreview->setLinks(links); } @@ -674,17 +679,37 @@ UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) setAttribute(Qt::WA_StyledBackground, true); setStyleSheet(UBApplication::globalStyleSheet()); - mpLayout = new QHBoxLayout(this); + mpLayout = new QVBoxLayout(this); setLayout(mpLayout); + + mpLabelLayout = new QHBoxLayout(this); mpUrlLabel = new QLabel(tr("Url"), this); - mpLayout->addWidget(mpUrlLabel, 0); + mpLabelLayout->addWidget(mpUrlLabel, 0); mpUrl = new QLineEdit(this); mpUrl->setObjectName("DockPaletteWidgetLineEdit"); - mpLayout->addWidget(mpUrl, 1); + mpLabelLayout->addWidget(mpUrl, 1); + + mpTitleLayout = new QHBoxLayout(this); + mpTitleLabel = new QLabel(tr("Title"),this); + mpTitleLayout->addWidget(mpTitleLabel,0); + mpTitle = new QLineEdit(this); + mpTitle->setObjectName("DockPaletteWidgetLineEdit"); + mpTitleLayout->addWidget(mpTitle,1); + + mpLayout->addLayout(mpTitleLayout); + mpLayout->addLayout(mpLabelLayout); } UBUrlWidget::~UBUrlWidget() { + if(NULL != mpTitle){ + delete mpTitle; + mpTitle = NULL; + } + if(NULL != mpTitleLabel){ + delete mpTitleLabel; + mpTitleLabel = NULL; + } if(NULL != mpUrlLabel){ delete mpUrlLabel; mpUrlLabel = NULL; @@ -693,6 +718,14 @@ UBUrlWidget::~UBUrlWidget() delete mpUrl; mpUrl = NULL; } + if(NULL != mpTitleLayout){ + delete mpTitleLayout; + mpTitleLayout = NULL; + } + if(NULL != mpLabelLayout){ + delete mpLabelLayout; + mpLabelLayout = NULL; + } if(NULL != mpLayout){ delete mpLayout; mpLayout = NULL; @@ -704,7 +737,7 @@ QString UBUrlWidget::url() QString str; if(NULL != mpUrl){ - str = mpUrl->text(); + str = mpUrl->text() + ";" + mpTitle->text(); } return str; @@ -712,8 +745,10 @@ QString UBUrlWidget::url() void UBUrlWidget::setUrl(const QString &url) { + QStringList list = url.split(";"); if(NULL != mpUrl){ - mpUrl->setText(url); + mpUrl->setText(list.at(0)); + mpTitle->setText(list.at(1)); } } diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 3e53f97d..3916d528 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -107,9 +107,14 @@ public: void setUrl(const QString& url); private: - QHBoxLayout* mpLayout; + QVBoxLayout* mpLayout; + QHBoxLayout* mpLabelLayout; + QHBoxLayout* mpTitleLayout; QLabel* mpUrlLabel; QLineEdit* mpUrl; + + QLabel* mpTitleLabel; + QLineEdit* mpTitle; }; class UBActionPreview : public QWidget From 3b8a522873ba08b4e7c34afc2e2eb0cd5afbf187 Mon Sep 17 00:00:00 2001 From: Claudio Valerio <=claudio@open-sankore.org> Date: Fri, 6 Jan 2012 16:44:24 +0100 Subject: [PATCH 46/99] fixed build issue on windows --- src/customWidgets/UBWidgetList.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index cc2ee125..c0d98f9d 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -91,12 +91,14 @@ int UBWidgetList::scaleWidgets(QSize pSize) newWidgetWidth = mWidgetInfo[eachWidget].width()/scaleFactor; result += newWidgetWidth; } - qDebug() << __PRETTY_FUNCTION__ << "widget " << &eachWidget; +#ifndef Q_WS_WIN + qDebug() << __PRETTY_FUNCTION__ << "widget " << &eachWidget; qDebug() << __PRETTY_FUNCTION__ << "count " << count++; qDebug() << __PRETTY_FUNCTION__ << "widget orignal size " << mWidgetInfo[eachWidget]; qDebug() << __PRETTY_FUNCTION__ << "containes size " << pSize; qDebug() << __PRETTY_FUNCTION__ << "scale factor " << scaleFactor; qDebug() << __PRETTY_FUNCTION__ << "new height " << result; +#endif } return result; } From c0fefa26a0234397da8f8320e608f5172f529a7f Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 6 Jan 2012 16:48:10 +0100 Subject: [PATCH 47/99] fixed build issue on mac --- src/gui/UBMediaPlayer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index b7c13c78..d158fb53 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -123,9 +123,9 @@ UBMediaPlayer::UBMediaPlayer() : #ifdef Q_OS_MAC // layout->setSpacing(4); buttonPanelLayout->setSpacing(0); - info->setMinimumHeight(100); - info->setFont(QFont("verdana", 15)); - openButton->setFocusPolicy(Qt::NoFocus); +// info->setMinimumHeight(100); +// info->setFont(QFont("verdana", 15)); +// openButton->setFocusPolicy(Qt::NoFocus); #endif QWidget *buttonPanelWidget = new QWidget(this); buttonPanelWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); From 8b333c21b91429a060db8ab881e1fa045908b1af Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Mon, 9 Jan 2012 09:46:24 +0100 Subject: [PATCH 48/99] Updated the styles --- resources/style.qss | 3 ++- src/gui/UBTeacherBarWidget.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/resources/style.qss b/resources/style.qss index 323f062c..384ece67 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -29,8 +29,9 @@ QLabel#UBTeacherBarPreviewTitle QLabel#UBTeacherBarPreviewSubtitle { color: #555555; - font-size : 14px; + font-size : 15px; font-weight:bold; + padding-top: 10px; } QWidget#UBLibWebView diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 03b1644a..43c9859f 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -558,7 +558,8 @@ UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char mWidget->setEmptyText(tr("Drag media here ...")); mLayout.addWidget(mWidget); setLayout(&mLayout); - + // The next line is disgusting. This is a quickfix that must be reworked later + setContentsMargins(-9, -9, -9, -9); } UBTeacherBarDropMediaZone::~UBTeacherBarDropMediaZone() @@ -687,6 +688,7 @@ UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) mpLabelLayout->addWidget(mpUrlLabel, 0); mpUrl = new QLineEdit(this); mpUrl->setObjectName("DockPaletteWidgetLineEdit"); + mpUrl->setMinimumHeight(20); mpLabelLayout->addWidget(mpUrl, 1); mpTitleLayout = new QHBoxLayout(this); @@ -694,6 +696,7 @@ UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) mpTitleLayout->addWidget(mpTitleLabel,0); mpTitle = new QLineEdit(this); mpTitle->setObjectName("DockPaletteWidgetLineEdit"); + mpTitle->setMinimumHeight(20); mpTitleLayout->addWidget(mpTitle,1); mpLayout->addLayout(mpTitleLayout); @@ -782,6 +785,8 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char mLayout.addLayout(&mTitleDurationLayout, 0); mLayout.addWidget(&mMediaViewer, 1); + // The next line is disgusting. This is a quickfix that must be reworked later + mMediaViewer.setContentsMargins(-9, -9, -9, -9); hideElements(); From 5e8a46147472fda0cc667fd66d39255a1b668d06 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 9 Jan 2012 09:52:38 +0100 Subject: [PATCH 49/99] fixed ratio and added space between list elements --- src/customWidgets/UBWidgetList.cpp | 7 ++++++- src/customWidgets/UBWidgetList.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index c0d98f9d..7115b14f 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -5,6 +5,7 @@ UBWidgetList::UBWidgetList(QWidget* parent, eWidgetListOrientation orientation, , mpLayout(NULL) , mpContainer(NULL) , mMargin(5) + , mListElementsSpacing(10) , mpEmptyLabel(NULL) { setObjectName(name); @@ -75,7 +76,8 @@ void UBWidgetList::removeWidget(QWidget *widget) int UBWidgetList::scaleWidgets(QSize pSize) { - int result = 0; + // to remove the first spacing that shouldn't be there. + int result = -mListElementsSpacing; int count = 0; foreach(QWidget* eachWidget, mWidgetInfo.keys()){ qreal scaleFactor = 0; @@ -85,6 +87,7 @@ int UBWidgetList::scaleWidgets(QSize pSize) scaleFactor = (float)mWidgetInfo[eachWidget].width() / (float)pSize.width(); newWidgetHeight = mWidgetInfo[eachWidget].height()/scaleFactor; result += newWidgetHeight; + eachWidget->setMinimumHeight(newWidgetHeight); } else{ scaleFactor = (float)mWidgetInfo[eachWidget].height() / (float)pSize.height(); @@ -99,6 +102,8 @@ int UBWidgetList::scaleWidgets(QSize pSize) qDebug() << __PRETTY_FUNCTION__ << "scale factor " << scaleFactor; qDebug() << __PRETTY_FUNCTION__ << "new height " << result; #endif + //Adding a vertical/horizontal space between each element of the list + result += mListElementsSpacing; } return result; } diff --git a/src/customWidgets/UBWidgetList.h b/src/customWidgets/UBWidgetList.h index 2dd0895f..6cdfef66 100644 --- a/src/customWidgets/UBWidgetList.h +++ b/src/customWidgets/UBWidgetList.h @@ -29,6 +29,8 @@ public: void setEmptyText(const QString& text); int margin(); bool empty(); + void setListElementSpacing(int margin) { mListElementsSpacing = margin; } + int listElementsSpacing() {return mListElementsSpacing; } protected: void resizeEvent(QResizeEvent* ev); @@ -41,6 +43,7 @@ private: QWidget* mpContainer; eWidgetListOrientation mOrientation; int mMargin; + int mListElementsSpacing; QMap mWidgetInfo; QLabel* mpEmptyLabel; }; From 8cbd8a8a73f2b883ac5d477886664b7f84ab4db3 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 9 Jan 2012 09:52:50 +0100 Subject: [PATCH 50/99] mimimal change --- src/gui/UBMediaPlayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index d158fb53..8bb60905 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -102,7 +102,7 @@ UBMediaPlayer::UBMediaPlayer() : vLayout->addWidget(&m_videoWindow); // m_videoWidget->setStyleSheet(QString("background:red;")); QVBoxLayout *buttonPanelLayout = new QVBoxLayout(); - //m_videoWindow.hide(); + m_videoWindow.hide(); // buttonPanelLayout->addLayout(layout); // timeLabel = new QLabel(this); From 81ed0c74c2fce88e0498acdacc8494468afa8360 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Mon, 9 Jan 2012 10:49:17 +0100 Subject: [PATCH 51/99] Stylized the teacher bar preview --- resources/style.qss | 13 +++++++++++-- src/gui/UBTeacherBarWidget.cpp | 6 ++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/resources/style.qss b/resources/style.qss index 384ece67..e279c597 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -44,14 +44,23 @@ QWidget#UBLibWebView QWidget#UBActionPreviewOwner { color: #555555; - font-size : 10px; - font-weight:bold; + font-size : 12px; + font-weight: bold; +} + +QWidget#UBTeacherBarPreviewComments +{ + border-radius: 10px; + border: white 2px solid; + padding: 5px 5px 5px 5px; + background-color: white; } QWidget#UBActionPreviewContent { border-radius : 10px; border: 2px solid; + padding: 5px 5px 5px 5px; } QWebView#SearchEngineView diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 43c9859f..3b311908 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -900,6 +900,7 @@ void UBTeacherBarPreviewWidget::hideElements() mpCommentsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mpComments = new QLabel(this); mpComments->setWordWrap(true); + mpComments->setObjectName("UBTeacherBarPreviewComments"); mpLinksLabel = new QLabel(tr("Links"), this); mpLinksLabel->setObjectName("UBTeacherBarPreviewSubtitle"); @@ -1032,6 +1033,7 @@ UBActionPreview::UBActionPreview(QWidget *parent, const char *name):QWidget(pare mpContent->setObjectName("UBActionPreviewContent"); mpContent->setWordWrap(true); mLayout.addWidget(mpContent); + setContentsMargins(-9, -9, -9, -9); } UBActionPreview::~UBActionPreview() @@ -1052,12 +1054,12 @@ void UBActionPreview::setOwner(const QString &owner) switch(owner.toInt()){ case eActionOwner_Teacher: mpOwner->setText(tr("Teacher")); - mpContent->setStyleSheet("background:lightblue;"); + mpContent->setStyleSheet("background:lightblue; border:lightblue;"); break; case eActionOwner_Student: mpOwner->setText(tr("Student")); - mpContent->setStyleSheet("background:lightgreen;"); + mpContent->setStyleSheet("background:lightgreen; border:lightgreen;"); break; } } From a94f7f63de05df51ae321594aca8661edb1d0d81 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 9 Jan 2012 15:11:31 +0100 Subject: [PATCH 52/99] I don't know --- src/customWidgets/UBWidgetList.cpp | 61 +++++++++++++++++++----------- src/customWidgets/UBWidgetList.h | 10 ++++- src/gui/UBTeacherBarWidget.cpp | 36 +++++++++++++----- src/gui/UBTeacherBarWidget.h | 5 ++- 4 files changed, 77 insertions(+), 35 deletions(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 7115b14f..482a0780 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -49,12 +49,12 @@ UBWidgetList::~UBWidgetList() } } -void UBWidgetList::addWidget(QWidget *widget) +void UBWidgetList::addWidget(QWidget *widget, bool isResizable) { if(NULL != mpLayout){ mpEmptyLabel->setVisible(false); - mWidgetInfo[widget] = widget->size(); - qDebug() << __FUNCTION__ << "widget->size () " << widget->size(); + mWidgetInfo[widget] = {widget->size(), isResizable}; + qDebug() << __FUNCTION__ << "widget : " << widget << " widget->size () " << widget->size() << " isResizable " << isResizable; updateView(size()); mpLayout->addWidget(widget); } @@ -80,28 +80,45 @@ int UBWidgetList::scaleWidgets(QSize pSize) int result = -mListElementsSpacing; int count = 0; foreach(QWidget* eachWidget, mWidgetInfo.keys()){ - qreal scaleFactor = 0; - int newWidgetWidth = pSize.width(); - int newWidgetHeight = pSize.height(); - if(eWidgetListOrientation_Vertical == mOrientation){ - scaleFactor = (float)mWidgetInfo[eachWidget].width() / (float)pSize.width(); - newWidgetHeight = mWidgetInfo[eachWidget].height()/scaleFactor; - result += newWidgetHeight; - eachWidget->setMinimumHeight(newWidgetHeight); + if(mWidgetInfo[eachWidget].isResizable){ + qreal scaleFactor = 0; + int newWidgetWidth = pSize.width(); + int newWidgetHeight = pSize.height(); + if(eWidgetListOrientation_Vertical == mOrientation){ + scaleFactor = (float)mWidgetInfo[eachWidget].size.width() / (float)pSize.width(); + newWidgetHeight = mWidgetInfo[eachWidget].size.height()/scaleFactor; + result += newWidgetHeight; + eachWidget->setMinimumHeight(newWidgetHeight); + eachWidget->setMaximumHeight(newWidgetHeight + 1); + } + else{ + scaleFactor = (float)mWidgetInfo[eachWidget].size.height() / (float)pSize.height(); + newWidgetWidth = mWidgetInfo[eachWidget].size.width()/scaleFactor; + result += newWidgetWidth; + eachWidget->setMinimumWidth(newWidgetWidth); + eachWidget->setMinimumWidth(newWidgetWidth+1); + } +#ifndef Q_WS_WIN + qDebug() << __PRETTY_FUNCTION__ << "widget " << &eachWidget; + qDebug() << __PRETTY_FUNCTION__ << "count " << count++; + qDebug() << __PRETTY_FUNCTION__ << "widget orignal size " << mWidgetInfo[eachWidget].size; + qDebug() << __PRETTY_FUNCTION__ << "containes size " << pSize; + qDebug() << __PRETTY_FUNCTION__ << "scale factor " << scaleFactor; + qDebug() << __PRETTY_FUNCTION__ << "new height " << result; +#endif } else{ - scaleFactor = (float)mWidgetInfo[eachWidget].height() / (float)pSize.height(); - newWidgetWidth = mWidgetInfo[eachWidget].width()/scaleFactor; - result += newWidgetWidth; + if(eWidgetListOrientation_Vertical == mOrientation){ + result += mWidgetInfo[eachWidget].size.height(); + eachWidget->setMinimumHeight(mWidgetInfo[eachWidget].size.height()); + eachWidget->setMaximumHeight(mWidgetInfo[eachWidget].size.height() + 1); + } + else{ + result += mWidgetInfo[eachWidget].size.width(); + eachWidget->setMinimumWidth(mWidgetInfo[eachWidget].size.width()); + eachWidget->setMaximumWidth(mWidgetInfo[eachWidget].size.width() + 1); + } } -#ifndef Q_WS_WIN - qDebug() << __PRETTY_FUNCTION__ << "widget " << &eachWidget; - qDebug() << __PRETTY_FUNCTION__ << "count " << count++; - qDebug() << __PRETTY_FUNCTION__ << "widget orignal size " << mWidgetInfo[eachWidget]; - qDebug() << __PRETTY_FUNCTION__ << "containes size " << pSize; - qDebug() << __PRETTY_FUNCTION__ << "scale factor " << scaleFactor; - qDebug() << __PRETTY_FUNCTION__ << "new height " << result; -#endif //Adding a vertical/horizontal space between each element of the list result += mListElementsSpacing; } diff --git a/src/customWidgets/UBWidgetList.h b/src/customWidgets/UBWidgetList.h index 6cdfef66..fe0c8f29 100644 --- a/src/customWidgets/UBWidgetList.h +++ b/src/customWidgets/UBWidgetList.h @@ -20,10 +20,16 @@ class UBWidgetList : public QScrollArea { Q_OBJECT + typedef struct + { + QSize size; + bool isResizable; + } sWidgetProperties; + public: UBWidgetList(QWidget* parent=0, eWidgetListOrientation orientation = eWidgetListOrientation_Vertical, const char* name = "UBWidgetList"); ~UBWidgetList(); - void addWidget(QWidget* widget); + void addWidget(QWidget* widget, bool isResizable = true); void removeWidget(QWidget* widget); void setMargin(int margin); void setEmptyText(const QString& text); @@ -44,7 +50,7 @@ private: eWidgetListOrientation mOrientation; int mMargin; int mListElementsSpacing; - QMap mWidgetInfo; + QMap mWidgetInfo; QLabel* mpEmptyLabel; }; diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 3b311908..cfdf18ce 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -119,7 +119,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpLayout->addLayout(mpActionLayout, 0); // Media - mpMediaLabel = new QLabel(tr("Media"), mpContainer); + mpMediaLabel = new QLabel(tr("Medias"), mpContainer); mpLayout->addWidget(mpMediaLabel, 0); mpDropMediaZone = new UBTeacherBarDropMediaZone(mpContainer); mpLayout->addWidget(mpDropMediaZone, 1); @@ -380,7 +380,15 @@ void UBTeacherBarWidget::loadContent() } // Add the media - mpPreview->mediaViewer()->loadMedia(nextInfos.medias); + if(nextInfos.medias.count() > 0){ + QList widgetList; + widgetList.append(mpPreview->mediaLabel()); + mpPreview->mediaViewer()->loadWidgets(widgetList,false); + int loadedMedia = mpPreview->mediaViewer()->loadMedia(nextInfos.medias); + if(loadedMedia) + mpPreview->mediaLabel()->setVisible(true); + } + // Add the links if(!mUrlList.empty()){ @@ -879,8 +887,10 @@ void UBTeacherBarPreviewWidget::setComments(const QString &comments) mpComments->setVisible(true); mpCommentsLabel->setVisible(true); mWidgets << mpCommentsLabel; + mMediaViewer.loadWidgets(mWidgets, false); + mWidgets.clear(); mWidgets << mpComments; - mMediaViewer.loadWidgets(mWidgets); + mMediaViewer.loadWidgets(mWidgets, true); } } @@ -894,7 +904,7 @@ void UBTeacherBarPreviewWidget::hideElements() { mpActionsLabel = new QLabel(tr("Actions"), this); mpActionsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - mpMediaLabel = new QLabel(tr("Media"), this); + mpMediaLabel = new QLabel(tr("Medias"), this); mpMediaLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mpCommentsLabel = new QLabel(tr("Comments"), this); mpCommentsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); @@ -917,6 +927,8 @@ void UBTeacherBarPreviewWidget::setActions(QStringList actions) mWidgets.clear(); mpActionsLabel->setVisible(true); mWidgets << mpActionsLabel; + mediaViewer()->loadWidgets(mWidgets,false); + mWidgets.clear(); foreach(QString action, actions){ QStringList desc = action.split(';'); if(2 <= desc.size()){ @@ -928,7 +940,7 @@ void UBTeacherBarPreviewWidget::setActions(QStringList actions) mWidgets << mpTmpAction; } } - mMediaViewer.loadWidgets(mWidgets); + mMediaViewer.loadWidgets(mWidgets, true); } } @@ -938,12 +950,14 @@ void UBTeacherBarPreviewWidget::setLinks(QStringList links) mWidgets.clear(); mpLinksLabel->setVisible(true); mWidgets << mpLinksLabel; + mMediaViewer.loadWidgets(mWidgets, false); + mWidgets.clear(); foreach(QString link, links){ mpTmpLink = new QLabel(link, this); mpTmpLink->setOpenExternalLinks(true); mWidgets << mpTmpLink; } - mMediaViewer.loadWidgets(mWidgets); + mMediaViewer.loadWidgets(mWidgets, true); } } @@ -983,17 +997,18 @@ void UBTeacherBarPreviewMedia::cleanMedia() mWidgetList.clear(); } -void UBTeacherBarPreviewMedia::loadWidgets(QList pWidgetsList) +void UBTeacherBarPreviewMedia::loadWidgets(QList pWidgetsList, bool isResizable) { foreach(QWidget*eachWidget, pWidgetsList){ - mWidget->addWidget(eachWidget); + mWidget->addWidget(eachWidget,isResizable); mWidgetList[eachWidget]="DRAG UNAVAILABLE"; } } -void UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) +int UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) { + int addedMedia = 0; foreach(QString eachString, pMedias){ if(!eachString.isEmpty()){ QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(eachString); @@ -1002,12 +1017,14 @@ void UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) label->loadImage(eachString); mWidget->addWidget(label); mWidgetList[label]=eachString; + addedMedia += 1; } else if(mimeType.contains("video") || mimeType.contains("audio")){ UBDraggableMediaPlayer* mediaPlayer = new UBDraggableMediaPlayer(); mediaPlayer->setFile(eachString); mWidget->addWidget(mediaPlayer); mWidgetList[mediaPlayer] = eachString; + addedMedia += 1; } else{ qWarning() << "pMediaPath" << eachString; @@ -1015,6 +1032,7 @@ void UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) } } } + return addedMedia; } // ----------------------------------------------------------------------------------------------- diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 3916d528..b2910594 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -87,8 +87,8 @@ class UBTeacherBarPreviewMedia : public QWidget public: UBTeacherBarPreviewMedia(QWidget* parent=0, const char* name="UBTeacherBarPreviewMedia"); ~UBTeacherBarPreviewMedia(); - void loadMedia(QStringList pMedias); - void loadWidgets(QList pWidgetList); + int loadMedia(QStringList pMedias); + void loadWidgets(QList pWidgetList, bool isResizable = true); void cleanMedia(); private: @@ -146,6 +146,7 @@ public: void setActions(QStringList actions); void setLinks(QStringList links); void clean(); + QLabel* mediaLabel() { return mpMediaLabel;} signals: void showEditMode(); From 3c905ba23371de47e905f31f9474f6b63946fe25 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 9 Jan 2012 15:23:42 +0100 Subject: [PATCH 53/99] fixed syntax error --- src/customWidgets/UBWidgetList.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 482a0780..2832ca61 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -53,7 +53,8 @@ void UBWidgetList::addWidget(QWidget *widget, bool isResizable) { if(NULL != mpLayout){ mpEmptyLabel->setVisible(false); - mWidgetInfo[widget] = {widget->size(), isResizable}; + sWidgetProperties properties = {widget->size(), isResizable}; + mWidgetInfo[widget] = properties; qDebug() << __FUNCTION__ << "widget : " << widget << " widget->size () " << widget->size() << " isResizable " << isResizable; updateView(size()); mpLayout->addWidget(widget); From 04dacaa607b8aecd81307e11ff897d00b0952991 Mon Sep 17 00:00:00 2001 From: Claudio Valerio <=claudio@open-sankore.org> Date: Mon, 9 Jan 2012 15:57:51 +0100 Subject: [PATCH 54/99] fixed player windows on windows --- src/gui/UBMediaPlayer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index 8bb60905..641ac162 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -102,7 +102,9 @@ UBMediaPlayer::UBMediaPlayer() : vLayout->addWidget(&m_videoWindow); // m_videoWidget->setStyleSheet(QString("background:red;")); QVBoxLayout *buttonPanelLayout = new QVBoxLayout(); - m_videoWindow.hide(); +#ifdef Q_WS_MAC + m_videoWindow.hide(); +#endif // buttonPanelLayout->addLayout(layout); // timeLabel = new QLabel(this); From afa89214a85578473b8415b5a69cba87f0c434f0 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 9 Jan 2012 16:04:49 +0100 Subject: [PATCH 55/99] last commit --- Sankore_3.1.pro | 4 ++-- src/gui/UBMediaPlayer.cpp | 4 ++-- src/gui/UBTeacherBarWidget.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 5dfa1b33..787b195b 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -12,8 +12,8 @@ linux-g++-64 { VERSION_MAJ = 1 VERSION_MIN = 40 -VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error -VERSION_PATCH = 01 +VERSION_TYPE = a # a = alpha, b = beta, r = release, other => error +VERSION_PATCH = 00 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index 641ac162..62ea98c8 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -102,8 +102,8 @@ UBMediaPlayer::UBMediaPlayer() : vLayout->addWidget(&m_videoWindow); // m_videoWidget->setStyleSheet(QString("background:red;")); QVBoxLayout *buttonPanelLayout = new QVBoxLayout(); -#ifdef Q_WS_MAC - m_videoWindow.hide(); +#ifndef Q_WS_WIN + m_videoWindow.hide(); #endif // buttonPanelLayout->addLayout(layout); diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index cfdf18ce..3a9a8a75 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -386,7 +386,7 @@ void UBTeacherBarWidget::loadContent() mpPreview->mediaViewer()->loadWidgets(widgetList,false); int loadedMedia = mpPreview->mediaViewer()->loadMedia(nextInfos.medias); if(loadedMedia) - mpPreview->mediaLabel()->setVisible(true); + mpPreview->mediaLabel()->setVisible(true); } From 955e928930d47c27f0cf03e12d9cd71711acb9f4 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 12 Jan 2012 14:36:08 +0100 Subject: [PATCH 56/99] partial backup of the ubmediawidget --- Sankore_3.1.pro | 1 + resources/style.qss | 17 ++- src/customWidgets/UBGlobals.h | 9 ++ src/customWidgets/UBMediaWidget.cpp | 209 ++++++++++++++++++++++++++++ src/customWidgets/UBMediaWidget.h | 85 +++++++++++ src/customWidgets/UBWidgetList.cpp | 68 +++++---- src/customWidgets/UBWidgetList.h | 7 +- src/customWidgets/customWidgets.pri | 10 +- src/gui/UBMediaPlayer.cpp | 12 ++ src/gui/UBMediaPlayer.h | 3 + src/gui/UBTeacherBarWidget.cpp | 182 ++++++++++++++++++++++-- src/gui/UBTeacherBarWidget.h | 33 ++++- src/interfaces/IDropable.h | 21 +++ src/interfaces/IResizeable.h | 15 ++ src/interfaces/interfaces.pri | 3 + 15 files changed, 628 insertions(+), 47 deletions(-) create mode 100644 src/customWidgets/UBGlobals.h create mode 100644 src/customWidgets/UBMediaWidget.cpp create mode 100644 src/customWidgets/UBMediaWidget.h create mode 100644 src/interfaces/IDropable.h create mode 100644 src/interfaces/IResizeable.h create mode 100644 src/interfaces/interfaces.pri diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 5dfa1b33..78afe48f 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -54,6 +54,7 @@ include(src/web/web.pri) include(src/softwareupdate/softwareupdate.pri) include(src/transition/transition.pri) include(src/customWidgets/customWidgets.pri) +include(src/interfaces/interfaces.pri) DEPENDPATH += src/pdf-merger INCLUDEPATH += src/pdf-merger diff --git a/resources/style.qss b/resources/style.qss index e279c597..a3fec87d 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -5,13 +5,23 @@ QWidget#UBLibNavigatorWidget, QWidget#UBLibItemProperties, QWidget#UBDownloadWidget, QWidget#UBWidgetList, -QWidget#UBTeacherBarDropMediaZone +QWidget#UBTeacherBarDropMediaZone, +QWidget#UBTBMediaContainer { background: #EEEEEE; border-radius: 10px; border: 2px solid #999999; } +QWidget#UBMediaVideoContainer +{ + background: #000000; + border-radius: 10px; + border: 2px solid #999999; + margin: 0px 0px 0px 0px; + padding: 0px 0px 0px 0px; +} + QWidget#UBTeacherBarPreviewWidget { background: #FFFFFF; @@ -26,6 +36,11 @@ QLabel#UBTeacherBarPreviewTitle font-weight:bold; } +QLabel#UBMediaPlayerButton +{ + padding: 0px 0px 0px 0px; +} + QLabel#UBTeacherBarPreviewSubtitle { color: #555555; diff --git a/src/customWidgets/UBGlobals.h b/src/customWidgets/UBGlobals.h new file mode 100644 index 00000000..1707ceac --- /dev/null +++ b/src/customWidgets/UBGlobals.h @@ -0,0 +1,9 @@ +#ifndef UBGLOBALS_H +#define UBGLOBALS_H + +#define DELETEPTR(ptr) if(NULL != ptr){ \ + delete ptr; \ + ptr = NULL; \ + } + +#endif // UBGLOBALS_H diff --git a/src/customWidgets/UBMediaWidget.cpp b/src/customWidgets/UBMediaWidget.cpp new file mode 100644 index 00000000..eabe51bd --- /dev/null +++ b/src/customWidgets/UBMediaWidget.cpp @@ -0,0 +1,209 @@ +#include "core/UBApplication.h" +#include "UBGlobals.h" +#include "UBMediaWidget.h" + +UBMediaWidget::UBMediaWidget(eMediaType type, QWidget *parent, const char *name):QWidget(parent) + , mpMediaObject(NULL) + , mpVideoWidget(NULL) + , mpAudioOutput(NULL) + , mpPlayStopButton(NULL) + , mpPauseButton(NULL) + , mpSlider(NULL) + , mAutoUpdate(false) + , mGeneratingThumbnail(false) + , mBorder(5) + , mpVideoContainer(NULL) +{ + setObjectName(name); + + setAttribute(Qt::WA_StyledBackground, true); + setStyleSheet(UBApplication::globalStyleSheet()); + + mType = type; + setLayout(&mLayout); + + mpPlayStopButton = new UBMediaButton(this); + mpPlayStopButton->setPixmap(QPixmap(":images/play.svg")); + mpPauseButton = new UBMediaButton(this); + mpPauseButton->setPixmap(QPixmap(":images/pause.svg")); + mpPauseButton->setEnabled(false); + mpSlider = new QSlider(this); + mpSlider->setOrientation(Qt::Horizontal); + mpSlider->setMinimum(0); + mpSlider->setMaximum(0); + + mSeekerLayout.addWidget(mpPlayStopButton, 0); + mSeekerLayout.addWidget(mpPauseButton, 0); + mSeekerLayout.addWidget(mpSlider, 1); + + connect(mpPlayStopButton, SIGNAL(clicked()), this, SLOT(onPlayStopClicked())); + connect(mpPauseButton, SIGNAL(clicked()), this, SLOT(onPauseClicked())); + connect(mpSlider, SIGNAL(valueChanged(int)), this, SLOT(onSliderChanged(int))); +} + +UBMediaWidget::~UBMediaWidget() +{ + DELETEPTR(mpSlider); + DELETEPTR(mpPauseButton); + DELETEPTR(mpPlayStopButton); + DELETEPTR(mpAudioOutput); + DELETEPTR(mpVideoWidget); + DELETEPTR(mpVideoContainer); + DELETEPTR(mpMediaObject); +} + +void UBMediaWidget::setFile(const QString &filePath) +{ + Q_ASSERT("" != filePath); + mFilePath = filePath; + mpMediaObject = new Phonon::MediaObject(this); + mpMediaObject->setTickInterval(TICK_INTERVAL); + connect(mpMediaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(onStateChanged(Phonon::State,Phonon::State))); + connect(mpMediaObject, SIGNAL(totalTimeChanged(qint64)), this, SLOT(onTotalTimeChanged(qint64))); + connect(mpMediaObject, SIGNAL(tick(qint64)), this, SLOT(onTick(qint64))); + mpMediaObject->setCurrentSource(Phonon::MediaSource(filePath)); + createMediaPlayer(); +} + +eMediaType UBMediaWidget::mediaType() +{ + return mType; +} + +void UBMediaWidget::createMediaPlayer() +{ + if(eMediaType_Video == mType){ + mpVideoWidget = new Phonon::VideoWidget(this); + mpVideoWidget->setStyleSheet(QString("margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;")); + mpVideoContainer = new QWidget(this); + mpVideoContainer->setObjectName("UBMediaVideoContainer"); + mpVideoContainer->setLayout(&mVideoLayout); + mVideoLayout.addWidget(mpVideoWidget, 1); + Phonon::createPath(mpMediaObject, mpVideoWidget); + adaptSizeToVideo(); + mLayout.addWidget(mpVideoContainer, 1); + mpAudioOutput = new Phonon::AudioOutput(Phonon::VideoCategory, this); + Phonon::createPath(mpMediaObject, mpAudioOutput); + }else if(eMediaType_Audio == mType){ + mpAudioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this); + Phonon::createPath(mpMediaObject, mpAudioOutput); + } + mLayout.addLayout(&mSeekerLayout, 0); +} + +void UBMediaWidget::adaptSizeToVideo() +{ + if(NULL != mpVideoWidget){ + int origW = mpVideoWidget->width(); + int origH = mpVideoWidget->height(); + int newW = width(); + float scaleFactor = (float)origW/(float)newW; + int newH = origH/scaleFactor; + resize(width(), height() + newH); + } +} + +void UBMediaWidget::onStateChanged(Phonon::State newState, Phonon::State oldState) +{ + if(!mGeneratingThumbnail){ + if(Phonon::LoadingState == oldState && Phonon::StoppedState == newState){ + if(eMediaType_Video == mType){ + // We do that here to generate the thumbnail of the video + mGeneratingThumbnail = true; + mpMediaObject->play(); + mpMediaObject->pause(); + mGeneratingThumbnail = false; + } + }else if(Phonon::PlayingState == oldState && Phonon::PausedState == newState){ + mpPlayStopButton->setPixmap(QPixmap(":images/play.svg")); + mpPauseButton->setEnabled(false); + }else if((Phonon::PausedState == oldState && Phonon::PlayingState == newState) || + (Phonon::StoppedState == oldState && Phonon::PlayingState == newState)){ + mpPlayStopButton->setPixmap(QPixmap(":images/stop.svg")); + mpPauseButton->setEnabled(true); + }else if(Phonon::PlayingState == oldState && Phonon::StoppedState == newState){ + mpPlayStopButton->setPixmap(QPixmap(":images/play.svg")); + mpPauseButton->setEnabled(false); + mpSlider->setValue(0); + } + } +} + +void UBMediaWidget::onTotalTimeChanged(qint64 total) +{ + mpSlider->setMaximum(total); +} + +void UBMediaWidget::onTick(qint64 currentTime) +{ + mAutoUpdate = true; + mpSlider->setValue((int)currentTime); + mAutoUpdate = false; +} + +void UBMediaWidget::onSliderChanged(int value) +{ + if(!mAutoUpdate){ + mpMediaObject->seek(value); + } +} + +void UBMediaWidget::onPlayStopClicked() +{ + switch(mpMediaObject->state()){ + case Phonon::PlayingState: + mpMediaObject->stop(); + break; + + case Phonon::StoppedState: + case Phonon::PausedState: + mpMediaObject->play(); + break; + default: + break; + } +} + +void UBMediaWidget::onPauseClicked() +{ + mpMediaObject->pause(); +} + +int UBMediaWidget::border() +{ + return mBorder; +} + +void UBMediaWidget::resizeEvent(QResizeEvent* ev) +{ + Q_UNUSED(ev); +} + +// ----------------------------------------------------------------------------------------------------------- +UBMediaButton::UBMediaButton(QWidget *parent, const char *name):QLabel(parent) + , mPressed(false) +{ + setObjectName(name); + resize(UBMEDIABUTTON_SIZE, UBMEDIABUTTON_SIZE); + setStyleSheet(QString("padding:0px 0px 0px 0px;")); +} + +UBMediaButton::~UBMediaButton() +{ + +} + +void UBMediaButton::mousePressEvent(QMouseEvent* ev) +{ + Q_UNUSED(ev); + mPressed = true; +} + +void UBMediaButton::mouseReleaseEvent(QMouseEvent* ev) +{ + Q_UNUSED(ev); + if(mPressed){ + mPressed = false; + emit clicked(); + } +} diff --git a/src/customWidgets/UBMediaWidget.h b/src/customWidgets/UBMediaWidget.h new file mode 100644 index 00000000..c835ab91 --- /dev/null +++ b/src/customWidgets/UBMediaWidget.h @@ -0,0 +1,85 @@ +#ifndef UBMEDIAWIDGET_H +#define UBMEDIAWIDGET_H + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "interfaces/IResizeable.h" + +#define UBMEDIABUTTON_SIZE 32 +#define TICK_INTERVAL 1000 + +typedef enum{ + eMediaType_Video, + eMediaType_Audio +}eMediaType; + +class UBMediaButton : public QLabel +{ + Q_OBJECT +public: + UBMediaButton(QWidget* parent=0, const char* name="UBMediaButton"); + ~UBMediaButton(); + +signals: + void clicked(); + +protected: + void mousePressEvent(QMouseEvent* ev); + void mouseReleaseEvent(QMouseEvent* ev); + +private: + bool mPressed; +}; + +class UBMediaWidget : public QWidget +{ + Q_OBJECT +public: + UBMediaWidget(eMediaType type = eMediaType_Video, QWidget* parent=0, const char* name="UBMediaWidget"); + ~UBMediaWidget(); + void setFile(const QString& filePath); + eMediaType mediaType(); + int border(); + +protected: + void resizeEvent(QResizeEvent* ev); + +private slots: + void onPlayStopClicked(); + void onPauseClicked(); + void onStateChanged(Phonon::State newState, Phonon::State oldState); + void onTotalTimeChanged(qint64 total); + void onTick(qint64 currentTime); + void onSliderChanged(int value); + +private: + void createMediaPlayer(); + void adaptSizeToVideo(); + + QString mFilePath; + eMediaType mType; + Phonon::MediaObject* mpMediaObject; + Phonon::VideoWidget* mpVideoWidget; + Phonon::AudioOutput* mpAudioOutput; + QVBoxLayout mLayout; + QHBoxLayout mSeekerLayout; + UBMediaButton* mpPlayStopButton; + UBMediaButton* mpPauseButton; + QSlider* mpSlider; + bool mAutoUpdate; + bool mGeneratingThumbnail; + int mBorder; + QWidget* mpVideoContainer; + QVBoxLayout mVideoLayout; +}; + +#endif // UBMEDIAWIDGET_H diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 7115b14f..b025bfdb 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -1,4 +1,7 @@ #include +#include + +#include "UBGlobals.h" #include "UBWidgetList.h" UBWidgetList::UBWidgetList(QWidget* parent, eWidgetListOrientation orientation, const char* name):QScrollArea(parent) @@ -20,13 +23,11 @@ UBWidgetList::UBWidgetList(QWidget* parent, eWidgetListOrientation orientation, setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); mpLayout = new QVBoxLayout(mpContainer); - mpContainer->resize(mpContainer->width(), mpContainer->height()); } else{ setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); mpLayout = new QHBoxLayout(mpContainer); - mpContainer->resize(mpContainer->width(), mpContainer->height()); } mpLayout->setContentsMargins(margin(), margin(), margin(), margin()); mpContainer->setLayout(mpLayout); @@ -35,28 +36,22 @@ UBWidgetList::UBWidgetList(QWidget* parent, eWidgetListOrientation orientation, UBWidgetList::~UBWidgetList() { - if(NULL != mpEmptyLabel){ - delete mpEmptyLabel; - mpEmptyLabel = NULL; - } - if(NULL != mpLayout){ - delete mpLayout; - mpLayout = NULL; - } - if(NULL != mpContainer){ - delete mpContainer; - mpContainer = NULL; - } + DELETEPTR(mpEmptyLabel); + DELETEPTR(mpLayout); + DELETEPTR(mpContainer); } void UBWidgetList::addWidget(QWidget *widget) { - if(NULL != mpLayout){ + if(NULL != mpLayout && NULL != widget){ + widget->setParent(mpContainer); mpEmptyLabel->setVisible(false); mWidgetInfo[widget] = widget->size(); - qDebug() << __FUNCTION__ << "widget->size () " << widget->size(); updateView(size()); mpLayout->addWidget(widget); + + // This call is used only to refresh the size of the widgets + updateSizes(); } } @@ -78,7 +73,6 @@ int UBWidgetList::scaleWidgets(QSize pSize) { // to remove the first spacing that shouldn't be there. int result = -mListElementsSpacing; - int count = 0; foreach(QWidget* eachWidget, mWidgetInfo.keys()){ qreal scaleFactor = 0; int newWidgetWidth = pSize.width(); @@ -87,21 +81,12 @@ int UBWidgetList::scaleWidgets(QSize pSize) scaleFactor = (float)mWidgetInfo[eachWidget].width() / (float)pSize.width(); newWidgetHeight = mWidgetInfo[eachWidget].height()/scaleFactor; result += newWidgetHeight; - eachWidget->setMinimumHeight(newWidgetHeight); } else{ scaleFactor = (float)mWidgetInfo[eachWidget].height() / (float)pSize.height(); newWidgetWidth = mWidgetInfo[eachWidget].width()/scaleFactor; result += newWidgetWidth; } -#ifndef Q_WS_WIN - qDebug() << __PRETTY_FUNCTION__ << "widget " << &eachWidget; - qDebug() << __PRETTY_FUNCTION__ << "count " << count++; - qDebug() << __PRETTY_FUNCTION__ << "widget orignal size " << mWidgetInfo[eachWidget]; - qDebug() << __PRETTY_FUNCTION__ << "containes size " << pSize; - qDebug() << __PRETTY_FUNCTION__ << "scale factor " << scaleFactor; - qDebug() << __PRETTY_FUNCTION__ << "new height " << result; -#endif //Adding a vertical/horizontal space between each element of the list result += mListElementsSpacing; } @@ -132,11 +117,42 @@ void UBWidgetList::updateView(QSize pSize) void UBWidgetList::resizeEvent(QResizeEvent *ev) { + Q_UNUSED(ev); mpEmptyLabel->setGeometry((width() - mpEmptyLabel->width()) / 2, (height() - mpEmptyLabel->height()) /2, mpEmptyLabel->width(), mpEmptyLabel->height()); updateView(size()); + updateSizes(); +} + +void UBWidgetList::updateSizes() +{ + // Resize all the widgets + foreach(QWidget* eachWidget, mWidgetInfo.keys()){ + if(NULL != eachWidget){ + QSize originalSize = mWidgetInfo[eachWidget]; + int currentWidth = mpContainer->width(); + int currentHeight = mpContainer->height(); + if(eWidgetListOrientation_Vertical == mOrientation){ + if(verticalScrollBar()->isVisible()){ + currentWidth -= verticalScrollBar()->width(); + eachWidget->setStyleSheet(QString("margin-right:%0;").arg(verticalScrollBar()->width())); + } + float scaleFactor = (float)currentWidth/(float)originalSize.width(); + currentHeight = originalSize.height()*scaleFactor; + }else{ + if(horizontalScrollBar()->isVisible()){ + currentHeight -= horizontalScrollBar()->height(); + eachWidget->setStyleSheet(QString("padding-bottom:%0;").arg(horizontalScrollBar()->height())); + } + float scaleFactor = (float)currentHeight/(float)originalSize.height(); + currentWidth = originalSize.width()*scaleFactor; + } + + eachWidget->resize(currentWidth, currentHeight); + } + } } void UBWidgetList::setMargin(int margin) diff --git a/src/customWidgets/UBWidgetList.h b/src/customWidgets/UBWidgetList.h index 6cdfef66..fc7d9627 100644 --- a/src/customWidgets/UBWidgetList.h +++ b/src/customWidgets/UBWidgetList.h @@ -3,13 +3,15 @@ #include #include -#include +#include #include #include #include #include #include +#include "interfaces/IResizeable.h" + typedef enum{ eWidgetListOrientation_Vertical, eWidgetListOrientation_Horizontal @@ -39,7 +41,8 @@ private: int scaleWidgets(QSize pSize); void scaleContainer(QSize pSize, int updateValue); void updateView(QSize pSize); - QLayout* mpLayout; + void updateSizes(); + QBoxLayout* mpLayout; QWidget* mpContainer; eWidgetListOrientation mOrientation; int mMargin; diff --git a/src/customWidgets/customWidgets.pri b/src/customWidgets/customWidgets.pri index 321f3d45..e46249f5 100644 --- a/src/customWidgets/customWidgets.pri +++ b/src/customWidgets/customWidgets.pri @@ -1,9 +1,9 @@ HEADERS += src/customWidgets/UBWidgetList.h \ - src/customWidgets/UBDraggableLabel.h + src/customWidgets/UBDraggableLabel.h \ + src/customWidgets/UBMediaWidget.h \ + src/customWidgets/UBGlobals.h SOURCES += src/customWidgets/UBWidgetList.cpp \ - src/customWidgets/UBDraggableLabel.cpp - - - + src/customWidgets/UBDraggableLabel.cpp \ + src/customWidgets/UBMediaWidget.cpp diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index 8bb60905..cae48d13 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -346,6 +346,18 @@ void UBMediaPlayer::hasVideoChanged(bool bHasVideo) m_videoWindow.setVisible(bHasVideo); } +void UBMediaPlayer::resizeEvent(QResizeEvent* pEvent) +{ +// int origWidth = m_videoWindow.width(); +// int origHeight = m_videoWindow.height(); + +// float scaleFactor = (float)origWidth / (float)width(); +// int newWidth = width(); +// int newHeigth = origHeight/scaleFactor; + +// m_videoWindow.resize(newWidth, newHeigth); +} + //************************************************************************* UBDraggableMediaPlayer::UBDraggableMediaPlayer():UBMediaPlayer() { diff --git a/src/gui/UBMediaPlayer.h b/src/gui/UBMediaPlayer.h index 86534802..9e5e0e1a 100644 --- a/src/gui/UBMediaPlayer.h +++ b/src/gui/UBMediaPlayer.h @@ -62,6 +62,9 @@ public slots: void finished(); void playPause(); +protected: + void resizeEvent(QResizeEvent* pEvent); + private slots: void stateChanged(Phonon::State newstate, Phonon::State oldstate); void bufferStatus(int percent); diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 3b311908..87c4b4b5 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -16,6 +16,7 @@ #include "frameworks/UBFileSystemUtils.h" #include "customWidgets/UBDraggableLabel.h" +#include "customWidgets/UBMediaWidget.h" #include "core/memcheck.h" @@ -27,7 +28,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpDurationLabel(NULL) , mpTitle(NULL) , mpMediaLabel(NULL) - , mpDropMediaZone(NULL) , mpContainer(NULL) , mpContainerLayout(NULL) , mpDuration1(NULL) @@ -46,6 +46,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpLinkLayout(NULL) , mpStackWidget(NULL) , mpPreview(NULL) + , mpMediaContainer(NULL) { setObjectName(name); mName = "TeacherBarWidget"; @@ -121,8 +122,8 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock // Media mpMediaLabel = new QLabel(tr("Media"), mpContainer); mpLayout->addWidget(mpMediaLabel, 0); - mpDropMediaZone = new UBTeacherBarDropMediaZone(mpContainer); - mpLayout->addWidget(mpDropMediaZone, 1); + mpMediaContainer = new UBTBMediaContainer(this); + mpLayout->addWidget(mpMediaContainer, 1); // Links mpLinkLabel = new QLabel(tr("Links"), mpContainer); @@ -151,10 +152,15 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock connect(mpActionButton, SIGNAL(clicked()), this, SLOT(onActionButton())); connect(mpLinkButton, SIGNAL(clicked()), this, SLOT(onLinkButton())); connect(mpPreview, SIGNAL(showEditMode()), this, SLOT(onShowEditMode())); + connect(mpMediaContainer, SIGNAL(mediaDropped(QString)), this, SLOT(onMediaDropped(QString))); } UBTeacherBarWidget::~UBTeacherBarWidget() { + if(NULL != mpMediaContainer){ + delete mpMediaContainer; + mpMediaContainer = NULL; + } if(NULL != mpComments){ delete mpComments; mpComments = NULL; @@ -179,10 +185,6 @@ UBTeacherBarWidget::~UBTeacherBarWidget() delete mpLinkLayout; mpLinkLayout = NULL; } - if(NULL != mpDropMediaZone){ - delete mpDropMediaZone; - mpDropMediaZone = NULL; - } if(NULL != mpMediaLabel){ delete mpMediaLabel; mpMediaLabel = NULL; @@ -291,8 +293,9 @@ void UBTeacherBarWidget::saveContent() infos.actions << QString("%0;%1").arg(mActionList.at(i)->comboValue()).arg(mActionList.at(i)->text()); } // Media - // TODO : Get the url of the dropped medias and store them in infos.medias - infos.medias = mpDropMediaZone->mediaList(); + foreach(QString media, mpMediaContainer->mediaUrls()){ + infos.medias << media; + } // Links for(int j=0; jreloadMedia(nextInfos.medias); + foreach(QString url, nextInfos.medias){ + if("" != url){ + QWidget* pMedia = mpMediaContainer->generateMediaWidget(url); + if(NULL != pMedia){ + mMediaList << pMedia; + mpMediaContainer->addWidget(pMedia); + } + } + } // Links for(int j=0; jtext() == "" && mpLinks->empty() && mpActions->empty() && - mpDropMediaZone->empty() && + mpMediaContainer->empty() && mpComments->document()->toPlainText() == ""; } @@ -436,11 +447,19 @@ void UBTeacherBarWidget::onLinkButton() void UBTeacherBarWidget::clearWidgetLists() { - mpDropMediaZone->cleanMedias(); + if(NULL != mpMediaContainer){ + for(int i=0; iremoveWidget(mMediaList.at(i)); + delete mMediaList.at(i); + } + mMediaList.clear(); + mpMediaContainer->cleanMedias(); + } if(NULL != mpActions){ for(int i=0; iremoveWidget(mActionList.at(i)); + delete mActionList.at(i); } mActionList.clear(); } @@ -448,6 +467,7 @@ void UBTeacherBarWidget::clearWidgetLists() if(NULL != mpLinks){ for(int i=0; iremoveWidget(mUrlList.at(i)); + delete mUrlList.at(i); } mUrlList.clear(); } @@ -458,6 +478,17 @@ void UBTeacherBarWidget::onShowEditMode() mpStackWidget->setCurrentWidget(mpContainer); } +void UBTeacherBarWidget::onMediaDropped(const QString &url) +{ + if("" != url){ + QWidget* pMedia = mpMediaContainer->generateMediaWidget(url); + if(NULL != pMedia){ + mMediaList << pMedia; + mpMediaContainer->addWidget(pMedia); + } + } +} + // --------------------------------------------------------------------------------------------- UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) , mpText(NULL) @@ -1071,3 +1102,130 @@ void UBActionPreview::setContent(const QString &content) mpContent->setText(content); } } + +// ------------------------------------------------------------------------------------------------------------------------------------ +UBTBMediaContainer::UBTBMediaContainer(QWidget *parent, const char *name) : UBWidgetList(parent) +{ + setObjectName(name); + setAcceptDrops(true); +} + +UBTBMediaContainer::~UBTBMediaContainer() +{ + +} + +void UBTBMediaContainer::dropEvent(QDropEvent* pEvent) +{ + QPixmap pixFromDropEvent; + QString mimeType; + QString resourcePath; + if(pEvent->mimeData()->hasText()){ + qDebug() << "text dropped"; + resourcePath = pEvent->mimeData()->text(); + } + else if(pEvent->mimeData()->hasUrls()){ + qDebug() << "url dropped"; + resourcePath = pEvent->mimeData()->urls().at(0).toLocalFile(); + } + else if(pEvent->mimeData()->hasImage()){ + qDebug() << "image dropped"; + pixFromDropEvent.loadFromData(pEvent->mimeData()->imageData().toByteArray()); + if(!pixFromDropEvent.isNull()) + mimeType = "image"; + } + + if (mimeType.isEmpty() && resourcePath.isEmpty()){ + pEvent->acceptProposedAction(); + return; + } + if(!resourcePath.isEmpty()){ + qDebug() << "emitting 'mediaDropped'"; + emit mediaDropped(resourcePath); + pEvent->acceptProposedAction(); + } +} + +void UBTBMediaContainer::dragEnterEvent(QDragEnterEvent* pEvent) +{ + pEvent->acceptProposedAction(); +} + +void UBTBMediaContainer::dragMoveEvent(QDragMoveEvent* pEvent) +{ + pEvent->acceptProposedAction(); +} + +void UBTBMediaContainer::dragLeaveEvent(QDragLeaveEvent* pEvent) +{ + pEvent->accept(); +} + +void UBTBMediaContainer::addMedia(const QString& mediaPath) +{ + if(!mediaPath.isEmpty()) + mMediaList.append(mediaPath); + else + qWarning() << __FUNCTION__ << "empty path"; + + QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(mediaPath); + if(mimeType.contains("image")){ + QPixmap pix = QPixmap(mediaPath); + QLabel* label = new QLabel(); + label->setPixmap(pix); + label->setScaledContents(true); + addWidget(label); + } + else if(mimeType.contains("video") || mimeType.contains("audio")){ + UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + mediaPlayer->setFile(mediaPath); + addWidget(mediaPlayer); + } + else{ + qWarning() << "pMediaPath" << mediaPath; + qWarning() << "bad idea to come here"; + } +} + +QStringList UBTBMediaContainer::mediaUrls() +{ + return mMediaList; +} + +void UBTBMediaContainer::cleanMedias() +{ + mMediaList.clear(); +} + +QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url) +{ + QWidget* pW = NULL; + + if(!url.isEmpty()) + mMediaList.append(url); + else + qWarning() << __FUNCTION__ << "empty path"; + + QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(url); + if(mimeType.contains("image")){ + QPixmap pix = QPixmap(url); + QLabel* label = new QLabel(); + pix.scaledToWidth(label->width()); + label->resize(pix.width(), pix.height()); + label->setPixmap(pix); + label->setScaledContents(true); + pW = label; + } + else if(mimeType.contains("video") || mimeType.contains("audio")){ + UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + //UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); + mediaPlayer->setFile(url); + pW = mediaPlayer; + } + else{ + qWarning() << "pMediaPath" << url; + qWarning() << "bad idea to come here"; + } + + return pW; +} diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 3916d528..e23ec228 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -18,6 +18,7 @@ class UBMediaPlayer; #include "UBDockPaletteWidget.h" #include "customWidgets/UBWidgetList.h" +#include "interfaces/IDropable.h" #define LABEL_MINWIDHT 80 @@ -174,6 +175,33 @@ private: UBActionPreview* mpTmpAction; }; + +class UBTBMediaContainer : public UBWidgetList + , public IDropable +{ + Q_OBJECT +public: + UBTBMediaContainer(QWidget* parent=0, const char* name="UBTBMediaContainer"); + ~UBTBMediaContainer(); + QStringList mediaUrls(); + QWidget* generateMediaWidget(const QString& url); + void cleanMedias(); + +signals: + void mediaDropped(const QString& url); + +protected: + void dropEvent(QDropEvent* pEvent); + void dragEnterEvent(QDragEnterEvent* pEvent); + void dragMoveEvent(QDragMoveEvent* pEvent); + void dragLeaveEvent(QDragLeaveEvent* pEvent); + +private: + void addMedia(const QString& mediaPath); + + QStringList mMediaList; +}; + class UBTeacherBarWidget : public UBDockPaletteWidget { Q_OBJECT @@ -189,6 +217,7 @@ private slots: void onActionButton(); void onLinkButton(); void onShowEditMode(); + void onMediaDropped(const QString& url); private: void clearWidgetLists(); @@ -200,7 +229,6 @@ private: QLabel* mpDurationLabel; QLineEdit* mpTitle; QLabel* mpMediaLabel; - UBTeacherBarDropMediaZone* mpDropMediaZone; QWidget* mpContainer; QVBoxLayout* mpContainerLayout; QCheckBox* mpDuration1; @@ -222,6 +250,9 @@ private: QVector mActionList; QVector mUrlList; + QVector mMediaList; + + UBTBMediaContainer* mpMediaContainer; }; #endif // UBTEACHERBARWIDGET_H diff --git a/src/interfaces/IDropable.h b/src/interfaces/IDropable.h new file mode 100644 index 00000000..a75f4f16 --- /dev/null +++ b/src/interfaces/IDropable.h @@ -0,0 +1,21 @@ +#ifndef IDROPABLE_H +#define IDROPABLE_H + +#include +#include +#include +#include + +class IDropable +{ +public: + virtual ~IDropable(){} + +protected: + virtual void dropEvent(QDropEvent* pEvent) = 0; + virtual void dragEnterEvent(QDragEnterEvent* pEvent) = 0; + virtual void dragMoveEvent(QDragMoveEvent* pEvent) = 0; + virtual void dragLeaveEvent(QDragLeaveEvent* pEvent) = 0; +}; + +#endif // IDROPABLE_H diff --git a/src/interfaces/IResizeable.h b/src/interfaces/IResizeable.h new file mode 100644 index 00000000..b84ac8e5 --- /dev/null +++ b/src/interfaces/IResizeable.h @@ -0,0 +1,15 @@ +#ifndef IRESIZEABLE_H +#define IRESIZEABLE_H + +#include + +class IResizeable +{ +public: + ~IResizeable(); + +protected: + virtual void resizeEvent(QResizeEvent* pEvent) = 0; +}; + +#endif // IRESIZEABLE_H diff --git a/src/interfaces/interfaces.pri b/src/interfaces/interfaces.pri new file mode 100644 index 00000000..55098bf3 --- /dev/null +++ b/src/interfaces/interfaces.pri @@ -0,0 +1,3 @@ +HEADERS += src/interfaces/IDropable.h \ + src/interfaces/IDropable.h \ + src/interfaces/IResizeable.h From 432af59ca3fa2e317aa0fcc99a93a33bbe4dbe22 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 12 Jan 2012 15:08:29 +0100 Subject: [PATCH 57/99] resolved a conflict --- src/customWidgets/UBWidgetList.h | 4 ++-- src/gui/UBTeacherBarWidget.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/customWidgets/UBWidgetList.h b/src/customWidgets/UBWidgetList.h index 50823b08..865386ad 100644 --- a/src/customWidgets/UBWidgetList.h +++ b/src/customWidgets/UBWidgetList.h @@ -31,7 +31,7 @@ class UBWidgetList : public QScrollArea public: UBWidgetList(QWidget* parent=0, eWidgetListOrientation orientation = eWidgetListOrientation_Vertical, const char* name = "UBWidgetList"); ~UBWidgetList(); - void addWidget(QWidget* widget, bool isResizable = true); + void addWidget(QWidget* widget); void removeWidget(QWidget* widget); void setMargin(int margin); void setEmptyText(const QString& text); @@ -53,7 +53,7 @@ private: eWidgetListOrientation mOrientation; int mMargin; int mListElementsSpacing; - QMap mWidgetInfo; + QMap mWidgetInfo; QLabel* mpEmptyLabel; }; diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 6d75471a..a718a40a 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -1031,7 +1031,7 @@ void UBTeacherBarPreviewMedia::cleanMedia() void UBTeacherBarPreviewMedia::loadWidgets(QList pWidgetsList, bool isResizable) { foreach(QWidget*eachWidget, pWidgetsList){ - mWidget->addWidget(eachWidget,isResizable); + mWidget->addWidget(eachWidget); mWidgetList[eachWidget]="DRAG UNAVAILABLE"; } } From f8cbf42134a6ccd58f3d967359f9557cb3b4f9ed Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 12 Jan 2012 16:20:09 +0100 Subject: [PATCH 58/99] fixed horizontal widgetlist --- src/customWidgets/UBWidgetList.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 13dca3a9..0ba01bb0 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -81,18 +81,15 @@ int UBWidgetList::scaleWidgets(QSize pSize) scaleFactor = (float)mWidgetInfo[eachWidget].width() / (float)pSize.width(); newWidgetHeight = mWidgetInfo[eachWidget].height()/scaleFactor; result += newWidgetHeight; + eachWidget->setMinimumHeight(newWidgetHeight- 1); + eachWidget->setMaximumHeight(newWidgetHeight); } else{ - if(eWidgetListOrientation_Vertical == mOrientation){ - result += mWidgetInfo[eachWidget].height(); - eachWidget->setMinimumHeight(mWidgetInfo[eachWidget].height()); - eachWidget->setMaximumHeight(mWidgetInfo[eachWidget].height() + 1); - } - else{ - result += mWidgetInfo[eachWidget].width(); - eachWidget->setMinimumWidth(mWidgetInfo[eachWidget].width()); - eachWidget->setMaximumWidth(mWidgetInfo[eachWidget].width() + 1); - } + scaleFactor = (float)mWidgetInfo[eachWidget].height() / (float)pSize.height(); + newWidgetWidth = mWidgetInfo[eachWidget].width()/scaleFactor; + result += newWidgetWidth; + eachWidget->setMinimumWidth(newWidgetWidth - 1); + eachWidget->setMaximumWidth(newWidgetWidth); } //Adding a vertical/horizontal space between each element of the list result += mListElementsSpacing; From ff7fe04fe19e31f43e8ae4b24b88bd0092f23c62 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 13 Jan 2012 09:50:48 +0100 Subject: [PATCH 59/99] Updated the video widget rendering --- resources/style.qss | 2 -- src/customWidgets/UBMediaWidget.cpp | 13 +++++++------ src/gui/UBTeacherBarWidget.cpp | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/resources/style.qss b/resources/style.qss index a3fec87d..d80964a1 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -18,8 +18,6 @@ QWidget#UBMediaVideoContainer background: #000000; border-radius: 10px; border: 2px solid #999999; - margin: 0px 0px 0px 0px; - padding: 0px 0px 0px 0px; } QWidget#UBTeacherBarPreviewWidget diff --git a/src/customWidgets/UBMediaWidget.cpp b/src/customWidgets/UBMediaWidget.cpp index eabe51bd..24be6760 100644 --- a/src/customWidgets/UBMediaWidget.cpp +++ b/src/customWidgets/UBMediaWidget.cpp @@ -35,6 +35,7 @@ UBMediaWidget::UBMediaWidget(eMediaType type, QWidget *parent, const char *name) mSeekerLayout.addWidget(mpPlayStopButton, 0); mSeekerLayout.addWidget(mpPauseButton, 0); mSeekerLayout.addWidget(mpSlider, 1); + mSeekerLayout.setContentsMargins(0, 0, 0, 0); connect(mpPlayStopButton, SIGNAL(clicked()), this, SLOT(onPlayStopClicked())); connect(mpPauseButton, SIGNAL(clicked()), this, SLOT(onPauseClicked())); @@ -74,9 +75,9 @@ void UBMediaWidget::createMediaPlayer() { if(eMediaType_Video == mType){ mpVideoWidget = new Phonon::VideoWidget(this); - mpVideoWidget->setStyleSheet(QString("margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;")); mpVideoContainer = new QWidget(this); mpVideoContainer->setObjectName("UBMediaVideoContainer"); + mVideoLayout.setContentsMargins(10, 10, 25, 10); mpVideoContainer->setLayout(&mVideoLayout); mVideoLayout.addWidget(mpVideoWidget, 1); Phonon::createPath(mpMediaObject, mpVideoWidget); @@ -93,13 +94,13 @@ void UBMediaWidget::createMediaPlayer() void UBMediaWidget::adaptSizeToVideo() { - if(NULL != mpVideoWidget){ - int origW = mpVideoWidget->width(); - int origH = mpVideoWidget->height(); + if(NULL != mpVideoContainer){ + int origW = mpVideoContainer->width(); + int origH = mpVideoContainer->height(); int newW = width(); float scaleFactor = (float)origW/(float)newW; int newH = origH/scaleFactor; - resize(width(), height() + newH); + resize(newW, height() + newH); } } @@ -185,7 +186,7 @@ UBMediaButton::UBMediaButton(QWidget *parent, const char *name):QLabel(parent) { setObjectName(name); resize(UBMEDIABUTTON_SIZE, UBMEDIABUTTON_SIZE); - setStyleSheet(QString("padding:0px 0px 0px 0px;")); + setStyleSheet(QString("padding:0px 0px 0px 0px; margin:0px 0px 0px 0px;")); } UBMediaButton::~UBMediaButton() diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index a718a40a..0f439cf7 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -1235,8 +1235,8 @@ QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url) pW = label; } else if(mimeType.contains("video") || mimeType.contains("audio")){ - UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); - //UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); + //UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); mediaPlayer->setFile(url); pW = mediaPlayer; } From 78562cd4215ecaf1addba557c7f6a3854aaa7b78 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 13 Jan 2012 09:57:39 +0100 Subject: [PATCH 60/99] hiding not finished implementation for backup reasons --- src/gui/UBTeacherBarWidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 0f439cf7..a718a40a 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -1235,8 +1235,8 @@ QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url) pW = label; } else if(mimeType.contains("video") || mimeType.contains("audio")){ - //UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); - UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); + UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + //UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); mediaPlayer->setFile(url); pW = mediaPlayer; } From 4c4d569b35d0a8c0671c4858bd0d3fe1eb5e4d14 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 13 Jan 2012 11:09:14 +0100 Subject: [PATCH 61/99] Enabled UBMediaMidget --- src/customWidgets/UBMediaWidget.cpp | 1 - src/gui/UBTeacherBarWidget.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/customWidgets/UBMediaWidget.cpp b/src/customWidgets/UBMediaWidget.cpp index 24be6760..9dc0a8d0 100644 --- a/src/customWidgets/UBMediaWidget.cpp +++ b/src/customWidgets/UBMediaWidget.cpp @@ -49,7 +49,6 @@ UBMediaWidget::~UBMediaWidget() DELETEPTR(mpPlayStopButton); DELETEPTR(mpAudioOutput); DELETEPTR(mpVideoWidget); - DELETEPTR(mpVideoContainer); DELETEPTR(mpMediaObject); } diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index a718a40a..0f439cf7 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -1235,8 +1235,8 @@ QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url) pW = label; } else if(mimeType.contains("video") || mimeType.contains("audio")){ - UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); - //UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); + //UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); mediaPlayer->setFile(url); pW = mediaPlayer; } From af1e875a7109b40cb2eda05eb28ed2a62a81530e Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 13 Jan 2012 12:01:54 +0100 Subject: [PATCH 62/99] Modified the audio midget --- src/customWidgets/UBMediaWidget.cpp | 40 ++++++--- src/customWidgets/UBMediaWidget.h | 6 +- src/gui/UBTeacherBarWidget.cpp | 126 +--------------------------- src/gui/UBTeacherBarWidget.h | 31 ------- 4 files changed, 35 insertions(+), 168 deletions(-) diff --git a/src/customWidgets/UBMediaWidget.cpp b/src/customWidgets/UBMediaWidget.cpp index 9dc0a8d0..31523a90 100644 --- a/src/customWidgets/UBMediaWidget.cpp +++ b/src/customWidgets/UBMediaWidget.cpp @@ -12,7 +12,8 @@ UBMediaWidget::UBMediaWidget(eMediaType type, QWidget *parent, const char *name) , mAutoUpdate(false) , mGeneratingThumbnail(false) , mBorder(5) - , mpVideoContainer(NULL) + , mpMediaContainer(NULL) + , mpCover(NULL) { setObjectName(name); @@ -50,6 +51,7 @@ UBMediaWidget::~UBMediaWidget() DELETEPTR(mpAudioOutput); DELETEPTR(mpVideoWidget); DELETEPTR(mpMediaObject); + DELETEPTR(mpCover); } void UBMediaWidget::setFile(const QString &filePath) @@ -72,30 +74,41 @@ eMediaType UBMediaWidget::mediaType() void UBMediaWidget::createMediaPlayer() { + mpMediaContainer = new QWidget(this); + mpMediaContainer->setObjectName("UBMediaVideoContainer"); + mpMediaContainer->setLayout(&mMediaLayout); + if(eMediaType_Video == mType){ + mMediaLayout.setContentsMargins(10, 10, 25, 10); mpVideoWidget = new Phonon::VideoWidget(this); - mpVideoContainer = new QWidget(this); - mpVideoContainer->setObjectName("UBMediaVideoContainer"); - mVideoLayout.setContentsMargins(10, 10, 25, 10); - mpVideoContainer->setLayout(&mVideoLayout); - mVideoLayout.addWidget(mpVideoWidget, 1); + mMediaLayout.addStretch(1); + mMediaLayout.addWidget(mpVideoWidget, 0); + mMediaLayout.addStretch(1); Phonon::createPath(mpMediaObject, mpVideoWidget); adaptSizeToVideo(); - mLayout.addWidget(mpVideoContainer, 1); mpAudioOutput = new Phonon::AudioOutput(Phonon::VideoCategory, this); Phonon::createPath(mpMediaObject, mpAudioOutput); }else if(eMediaType_Audio == mType){ + mMediaLayout.setContentsMargins(10, 10, 10, 10); + mpCover = new QLabel(mpMediaContainer); + mpMediaContainer->setStyleSheet(QString("background: none;")); + setAudioCover(":images/libpalette/soundIcon.svg"); + mpCover->setScaledContents(true); + mMediaLayout.addStretch(1); + mMediaLayout.addWidget(mpCover, 0); + mMediaLayout.addStretch(1); mpAudioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this); Phonon::createPath(mpMediaObject, mpAudioOutput); } + mLayout.addWidget(mpMediaContainer, 1); mLayout.addLayout(&mSeekerLayout, 0); } void UBMediaWidget::adaptSizeToVideo() { - if(NULL != mpVideoContainer){ - int origW = mpVideoContainer->width(); - int origH = mpVideoContainer->height(); + if(NULL != mpMediaContainer){ + int origW = mpMediaContainer->width(); + int origH = mpMediaContainer->height(); int newW = width(); float scaleFactor = (float)origW/(float)newW; int newH = origH/scaleFactor; @@ -179,6 +192,13 @@ void UBMediaWidget::resizeEvent(QResizeEvent* ev) Q_UNUSED(ev); } +void UBMediaWidget::setAudioCover(const QString &coverPath) +{ + if(NULL != mpCover){ + mpCover->setPixmap(QPixmap(coverPath)); + } +} + // ----------------------------------------------------------------------------------------------------------- UBMediaButton::UBMediaButton(QWidget *parent, const char *name):QLabel(parent) , mPressed(false) diff --git a/src/customWidgets/UBMediaWidget.h b/src/customWidgets/UBMediaWidget.h index c835ab91..3f4be679 100644 --- a/src/customWidgets/UBMediaWidget.h +++ b/src/customWidgets/UBMediaWidget.h @@ -49,6 +49,7 @@ public: void setFile(const QString& filePath); eMediaType mediaType(); int border(); + void setAudioCover(const QString& coverPath); protected: void resizeEvent(QResizeEvent* ev); @@ -78,8 +79,9 @@ private: bool mAutoUpdate; bool mGeneratingThumbnail; int mBorder; - QWidget* mpVideoContainer; - QVBoxLayout mVideoLayout; + QWidget* mpMediaContainer; + QHBoxLayout mMediaLayout; + QLabel* mpCover; }; #endif // UBMEDIAWIDGET_H diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 0f439cf7..c3e31d21 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -123,6 +123,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpMediaLabel = new QLabel(tr("Medias"), mpContainer); mpLayout->addWidget(mpMediaLabel, 0); mpMediaContainer = new UBTBMediaContainer(this); + mpMediaContainer->setEmptyText(tr("Drop media here")); mpLayout->addWidget(mpMediaContainer, 1); // Links @@ -587,128 +588,6 @@ void UBTeacherStudentAction::setText(const QString& text) } } -// --------------------------------------------------------------------------------------------- -UBTeacherBarDropMediaZone::UBTeacherBarDropMediaZone(QWidget *parent, const char *name):QWidget(parent) - -{ - setObjectName(name); - setAcceptDrops(true); - mWidget = new UBWidgetList(parent); - mWidget->setEmptyText(tr("Drag media here ...")); - mLayout.addWidget(mWidget); - setLayout(&mLayout); - // The next line is disgusting. This is a quickfix that must be reworked later - setContentsMargins(-9, -9, -9, -9); -} - -UBTeacherBarDropMediaZone::~UBTeacherBarDropMediaZone() -{ - cleanMedias(); - if(mWidget){ - delete mWidget; - mWidget = NULL; - } -} - -void UBTeacherBarDropMediaZone::cleanMedias() -{ - foreach(QWidget* eachWidget,mWidgetList){ - mWidget->removeWidget(eachWidget); - delete eachWidget; - } - - mWidgetList.clear(); - - mMediaList.clear(); -} - -bool UBTeacherBarDropMediaZone::empty() -{ - return mWidget->empty(); -} - -void UBTeacherBarDropMediaZone::dragEnterEvent(QDragEnterEvent *pEvent) -{ - pEvent->acceptProposedAction(); -} - -void UBTeacherBarDropMediaZone::dragLeaveEvent(QDragLeaveEvent *pEvent) -{ - pEvent->accept(); -} - - -void UBTeacherBarDropMediaZone::addMedia(QString pMediaPath) -{ - if(!pMediaPath.isEmpty()) - mMediaList.append(pMediaPath); - else - qWarning() << __FUNCTION__ << "empty path"; - - QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(pMediaPath); - if(mimeType.contains("image")){ - QPixmap pix = QPixmap(pMediaPath); - QLabel* label = new QLabel(); - label->setPixmap(pix); - label->setScaledContents(true); - mWidget->addWidget(label); - mWidgetList << label; - } - else if(mimeType.contains("video") || mimeType.contains("audio")){ - UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); - mediaPlayer->setFile(pMediaPath); - mWidget->addWidget(mediaPlayer); - mWidgetList << mediaPlayer; - } - else{ - qWarning() << "pMediaPath" << pMediaPath; - qWarning() << "bad idea to come here"; - } - -} - -void UBTeacherBarDropMediaZone::reloadMedia(QStringList pList) -{ - cleanMedias(); - foreach(QString eachString, pList){ - addMedia(eachString); - } -} - -void UBTeacherBarDropMediaZone::dropEvent(QDropEvent *pEvent) -{ - QPixmap pixFromDropEvent; - QString mimeType; - QString resourcePath; - if(pEvent->mimeData()->hasText()){ - qDebug() << "pEvent->mimeData()->hasText()" << pEvent->mimeData()->text(); - resourcePath = pEvent->mimeData()->text(); - } - else if(pEvent->mimeData()->hasUrls()){ - qDebug() << "pEvent->mimeData()->hasUrls()" << pEvent->mimeData()->urls().at(0); - resourcePath = pEvent->mimeData()->urls().at(0).toLocalFile(); - } - else if(pEvent->mimeData()->hasImage()){ - qDebug() << "pEvent->mimeData()->hasImage()"; - pixFromDropEvent.loadFromData(pEvent->mimeData()->imageData().toByteArray()); - if(!pixFromDropEvent.isNull()) - mimeType = "image"; - } - - if (mimeType.isEmpty() && resourcePath.isEmpty()){ - pEvent->acceptProposedAction(); - return; - } - if(!resourcePath.isEmpty()) - addMedia(resourcePath); - pEvent->acceptProposedAction(); -} - -void UBTeacherBarDropMediaZone::dragMoveEvent(QDragMoveEvent *pEvent) -{ - pEvent->acceptProposedAction(); -} - // --------------------------------------------------------------------------------------------- UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) , mpLayout(NULL) @@ -997,9 +876,7 @@ UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char* { setObjectName(name); mWidget = new UBWidgetList(parent); -// mWidget->setEmptyText(tr("No media found")); mLayout.addWidget(mWidget); -// mWidget->setStyleSheet(QString("background-color: red;")); setLayout(&mLayout); mWidgetList.clear(); } @@ -1235,7 +1112,6 @@ QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url) pW = label; } else if(mimeType.contains("video") || mimeType.contains("audio")){ - //UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); mediaPlayer->setFile(url); pW = mediaPlayer; diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index f4341a14..7bb80512 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -52,36 +52,6 @@ private: QComboBox* mpCombo; }; - -class UBTeacherBarDropMediaZone : public QWidget -{ - Q_OBJECT - -public: - UBTeacherBarDropMediaZone(QWidget* parent=0, const char* name="UBTeacherBarDropMediaZone"); - ~UBTeacherBarDropMediaZone(); - QStringList mediaList() {return mMediaList;} - void reloadMedia(QStringList pList); - void cleanMedias(); - bool empty(); - -private: - void addMedia(QString pMediaPath); - QStringList mMediaList; - QListmWidgetList; - UBWidgetList* mWidget; - QVBoxLayout mLayout; - - -protected: - void dragEnterEvent(QDragEnterEvent* pEvent); - void dropEvent(QDropEvent *pEvent); - void dragMoveEvent(QDragMoveEvent* pEvent); - void dragLeaveEvent(QDragLeaveEvent* pEvent); -}; - - - class UBTeacherBarPreviewMedia : public QWidget { Q_OBJECT @@ -176,7 +146,6 @@ private: UBActionPreview* mpTmpAction; }; - class UBTBMediaContainer : public UBWidgetList , public IDropable { From f5f1f835fdaa0f01846fdbe0dba99798e6139117 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 13 Jan 2012 12:38:30 +0100 Subject: [PATCH 63/99] Added some comments in the code --- src/customWidgets/UBMediaWidget.cpp | 88 +++++++++++++++++++++++++++++ src/customWidgets/UBMediaWidget.h | 34 +++++++++++ src/gui/UBTeacherBarWidget.cpp | 4 -- 3 files changed, 122 insertions(+), 4 deletions(-) diff --git a/src/customWidgets/UBMediaWidget.cpp b/src/customWidgets/UBMediaWidget.cpp index 31523a90..572db702 100644 --- a/src/customWidgets/UBMediaWidget.cpp +++ b/src/customWidgets/UBMediaWidget.cpp @@ -1,7 +1,27 @@ +/* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include "core/UBApplication.h" #include "UBGlobals.h" #include "UBMediaWidget.h" +/** + * \brief Constructor + * @param type as the media type + * @param parent as the parent widget + * @param name as the object name + */ UBMediaWidget::UBMediaWidget(eMediaType type, QWidget *parent, const char *name):QWidget(parent) , mpMediaObject(NULL) , mpVideoWidget(NULL) @@ -43,6 +63,9 @@ UBMediaWidget::UBMediaWidget(eMediaType type, QWidget *parent, const char *name) connect(mpSlider, SIGNAL(valueChanged(int)), this, SLOT(onSliderChanged(int))); } +/** + * \brief Destructor + */ UBMediaWidget::~UBMediaWidget() { DELETEPTR(mpSlider); @@ -54,6 +77,10 @@ UBMediaWidget::~UBMediaWidget() DELETEPTR(mpCover); } +/** + * \brief Set the media file + * @param filePath as the media file path + */ void UBMediaWidget::setFile(const QString &filePath) { Q_ASSERT("" != filePath); @@ -67,11 +94,18 @@ void UBMediaWidget::setFile(const QString &filePath) createMediaPlayer(); } +/** + * \brief Get the media type + * @returns the media type + */ eMediaType UBMediaWidget::mediaType() { return mType; } +/** + * \brief Create the media player + */ void UBMediaWidget::createMediaPlayer() { mpMediaContainer = new QWidget(this); @@ -104,6 +138,9 @@ void UBMediaWidget::createMediaPlayer() mLayout.addLayout(&mSeekerLayout, 0); } +/** + * \brief Adapt the widget size to the video in order to keep the good aspect ratio + */ void UBMediaWidget::adaptSizeToVideo() { if(NULL != mpMediaContainer){ @@ -116,6 +153,11 @@ void UBMediaWidget::adaptSizeToVideo() } } +/** + * \brief Handle the media state change notification + * @param newState as the new state + * @param oldState as the old state + */ void UBMediaWidget::onStateChanged(Phonon::State newState, Phonon::State oldState) { if(!mGeneratingThumbnail){ @@ -142,11 +184,19 @@ void UBMediaWidget::onStateChanged(Phonon::State newState, Phonon::State oldStat } } +/** + * \brief Handles the total time change notification + * @param total as the new total time + */ void UBMediaWidget::onTotalTimeChanged(qint64 total) { mpSlider->setMaximum(total); } +/** + * \brief Handles the tick notification + * @param currentTime as the current time + */ void UBMediaWidget::onTick(qint64 currentTime) { mAutoUpdate = true; @@ -154,6 +204,10 @@ void UBMediaWidget::onTick(qint64 currentTime) mAutoUpdate = false; } +/** + * \brief Handles the seeker value change notification + * @param value as the new seeker value + */ void UBMediaWidget::onSliderChanged(int value) { if(!mAutoUpdate){ @@ -161,6 +215,9 @@ void UBMediaWidget::onSliderChanged(int value) } } +/** + * \brief Toggle Play-Stop + */ void UBMediaWidget::onPlayStopClicked() { switch(mpMediaObject->state()){ @@ -177,21 +234,36 @@ void UBMediaWidget::onPlayStopClicked() } } +/** + * \brief Pause the media + */ void UBMediaWidget::onPauseClicked() { mpMediaObject->pause(); } +/** + * Get the border + * @returns the actual border + */ int UBMediaWidget::border() { return mBorder; } +/** + * \brief Handles the resize event + * @param ev as the resize event + */ void UBMediaWidget::resizeEvent(QResizeEvent* ev) { Q_UNUSED(ev); } +/** + * \brief Set the audio cover + * @param coverPath as the cover image file path + */ void UBMediaWidget::setAudioCover(const QString &coverPath) { if(NULL != mpCover){ @@ -200,6 +272,11 @@ void UBMediaWidget::setAudioCover(const QString &coverPath) } // ----------------------------------------------------------------------------------------------------------- +/** + * \brief Constructor + * @param parent as the parent widget + * @param name as the object name + */ UBMediaButton::UBMediaButton(QWidget *parent, const char *name):QLabel(parent) , mPressed(false) { @@ -208,17 +285,28 @@ UBMediaButton::UBMediaButton(QWidget *parent, const char *name):QLabel(parent) setStyleSheet(QString("padding:0px 0px 0px 0px; margin:0px 0px 0px 0px;")); } +/** + * \brief Destructor + */ UBMediaButton::~UBMediaButton() { } +/** + * \brief Handles the mouse press notification + * @param ev as the mouse press event + */ void UBMediaButton::mousePressEvent(QMouseEvent* ev) { Q_UNUSED(ev); mPressed = true; } +/** + * \brief Handles the mouse release notification + * @param ev as the mouse release event + */ void UBMediaButton::mouseReleaseEvent(QMouseEvent* ev) { Q_UNUSED(ev); diff --git a/src/customWidgets/UBMediaWidget.h b/src/customWidgets/UBMediaWidget.h index 3f4be679..ba7d774b 100644 --- a/src/customWidgets/UBMediaWidget.h +++ b/src/customWidgets/UBMediaWidget.h @@ -1,3 +1,17 @@ +/* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #ifndef UBMEDIAWIDGET_H #define UBMEDIAWIDGET_H @@ -17,6 +31,9 @@ #define UBMEDIABUTTON_SIZE 32 #define TICK_INTERVAL 1000 +/** + * \brief The media type + */ typedef enum{ eMediaType_Video, eMediaType_Audio @@ -37,6 +54,7 @@ protected: void mouseReleaseEvent(QMouseEvent* ev); private: + /** And indicator of the press event in progress */ bool mPressed; }; @@ -66,21 +84,37 @@ private: void createMediaPlayer(); void adaptSizeToVideo(); + /** The current media file path */ QString mFilePath; + /** The current media type */ eMediaType mType; + /** The media object */ Phonon::MediaObject* mpMediaObject; + /** The video renderer */ Phonon::VideoWidget* mpVideoWidget; + /** The audio renderer */ Phonon::AudioOutput* mpAudioOutput; + /** The principal layout of this widget */ QVBoxLayout mLayout; + /** The seeker layout */ QHBoxLayout mSeekerLayout; + /** The play-stop button */ UBMediaButton* mpPlayStopButton; + /** The pause button */ UBMediaButton* mpPauseButton; + /** The seeker slider */ QSlider* mpSlider; + /** An indicator of the seeker auto update in progress */ bool mAutoUpdate; + /** An indicator of the thumbnail generation in progress */ bool mGeneratingThumbnail; + /** The border */ int mBorder; + /** A widget that will contain the media */ QWidget* mpMediaContainer; + /** The media layout */ QHBoxLayout mMediaLayout; + /** The audio cover */ QLabel* mpCover; }; diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index c3e31d21..06058bbd 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -1016,15 +1016,12 @@ void UBTBMediaContainer::dropEvent(QDropEvent* pEvent) QString mimeType; QString resourcePath; if(pEvent->mimeData()->hasText()){ - qDebug() << "text dropped"; resourcePath = pEvent->mimeData()->text(); } else if(pEvent->mimeData()->hasUrls()){ - qDebug() << "url dropped"; resourcePath = pEvent->mimeData()->urls().at(0).toLocalFile(); } else if(pEvent->mimeData()->hasImage()){ - qDebug() << "image dropped"; pixFromDropEvent.loadFromData(pEvent->mimeData()->imageData().toByteArray()); if(!pixFromDropEvent.isNull()) mimeType = "image"; @@ -1035,7 +1032,6 @@ void UBTBMediaContainer::dropEvent(QDropEvent* pEvent) return; } if(!resourcePath.isEmpty()){ - qDebug() << "emitting 'mediaDropped'"; emit mediaDropped(resourcePath); pEvent->acceptProposedAction(); } From 15f89fc7a2fc2a81bef965096b8bff617439a7e2 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 18 Jan 2012 09:29:14 +0100 Subject: [PATCH 64/99] Partial commit --- src/gui/UBTeacherBarWidget.cpp | 412 ++++++++++++++------------------- src/gui/UBTeacherBarWidget.h | 72 +++++- 2 files changed, 244 insertions(+), 240 deletions(-) diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 06058bbd..6201f0d1 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -17,23 +17,18 @@ #include "customWidgets/UBDraggableLabel.h" #include "customWidgets/UBMediaWidget.h" +#include "customWidgets/UBGlobals.h" #include "core/memcheck.h" UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDockPaletteWidget(parent) , mpLayout(NULL) , mpTitleLayout(NULL) - , mpDurationLayout(NULL) , mpTitleLabel(NULL) - , mpDurationLabel(NULL) , mpTitle(NULL) , mpMediaLabel(NULL) , mpContainer(NULL) , mpContainerLayout(NULL) - , mpDuration1(NULL) - , mpDuration2(NULL) - , mpDuration3(NULL) - , mpDurationButtons(NULL) , mpActionLabel(NULL) , mpActions(NULL) , mpActionButton(NULL) @@ -47,6 +42,8 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock , mpStackWidget(NULL) , mpPreview(NULL) , mpMediaContainer(NULL) + , mpDocPreviewWidget(NULL) + , mpDocEditWidget(NULL) { setObjectName(name); mName = "TeacherBarWidget"; @@ -68,11 +65,15 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpContainer->setObjectName("DockPaletteWidgetBox"); mpPreview = new UBTeacherBarPreviewWidget(this); + mpDocPreviewWidget = new UBTBDocumentPreviewWidget(this); + mpDocEditWidget = new UBTBDocumentEditWidget(this); mpStackWidget = new QStackedWidget(this); mpContainerLayout->addWidget(mpStackWidget); mpStackWidget->addWidget(mpContainer); mpStackWidget->addWidget(mpPreview); + mpStackWidget->addWidget(mpDocPreviewWidget); + mpStackWidget->addWidget(mpDocEditWidget); mpLayout = new QVBoxLayout(mpContainer); mpContainer->setLayout(mpLayout); @@ -85,26 +86,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpLayout->addWidget(mpTitleLabel, 0); mpLayout->addWidget(mpTitle, 0); - // Duration - mpDurationLabel = new QLabel(tr("Duration"), mpContainer); - mpLayout->addWidget(mpDurationLabel, 0); - mpDurationLayout = new QHBoxLayout(); - mpDuration1 = new QCheckBox(this); - mpDuration1->setIcon(QIcon(":images/duration1.png")); - mpDuration1->setChecked(true); - mpDurationLayout->addWidget(mpDuration1, 0); - mpDuration2 = new QCheckBox(this); - mpDuration2->setIcon(QIcon(":images/duration2.png")); - mpDurationLayout->addWidget(mpDuration2, 0); - mpDuration3 = new QCheckBox(this); - mpDuration3->setIcon(QIcon(":images/duration3.png")); - mpDurationLayout->addWidget(mpDuration3, 0); - mpDurationButtons = new QButtonGroup(mpContainer); - mpDurationButtons->addButton(mpDuration1); - mpDurationButtons->addButton(mpDuration2); - mpDurationButtons->addButton(mpDuration3); - mpLayout->addLayout(mpDurationLayout, 0); - // Actions mpActionLabel = new QLabel(tr("Actions"), mpContainer); mpLayout->addWidget(mpActionLabel, 0); @@ -154,110 +135,35 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock connect(mpLinkButton, SIGNAL(clicked()), this, SLOT(onLinkButton())); connect(mpPreview, SIGNAL(showEditMode()), this, SLOT(onShowEditMode())); connect(mpMediaContainer, SIGNAL(mediaDropped(QString)), this, SLOT(onMediaDropped(QString))); + connect(mpDocPreviewWidget, SIGNAL(onEditClicked()), this, SLOT(onTBStateChanged(eTeacherBarState))); + connect(mpDocPreviewWidget, SIGNAL(onPageViewClicked()), this, SLOT(onTBStateChanged(eTeacherBarState))); + connect(mpDocEditWidget, SIGNAL(onPageViewClicked()), this, SLOT(onTBStateChanged(eTeacherBarState))); + connect(mpDocEditWidget, SIGNAL(onPreviewClicked()), this, SLOT(onTBStateChanged(eTeacherBarState))); } UBTeacherBarWidget::~UBTeacherBarWidget() { - if(NULL != mpMediaContainer){ - delete mpMediaContainer; - mpMediaContainer = NULL; - } - if(NULL != mpComments){ - delete mpComments; - mpComments = NULL; - } - if(NULL != mpCommentLabel){ - delete mpCommentLabel; - mpCommentLabel = NULL; - } - if(NULL != mpLinks){ - delete mpLinks; - mpLinks = NULL; - } - if(NULL != mpLinkLabel){ - delete mpLinkLabel; - mpLinkLabel = NULL; - } - if(NULL != mpLinkButton){ - delete mpLinkButton; - mpLinkButton = NULL; - } - if(NULL != mpLinkLayout){ - delete mpLinkLayout; - mpLinkLayout = NULL; - } - if(NULL != mpMediaLabel){ - delete mpMediaLabel; - mpMediaLabel = NULL; - } - if(NULL != mpActionButton){ - delete mpActionButton; - mpActionButton = NULL; - } - if(NULL != mpActionLayout){ - delete mpActionLayout; - mpActionLayout = NULL; - } - if(NULL != mpActionLabel){ - delete mpActionLabel; - mpActionLabel = NULL; - } - if(NULL != mpDurationLabel){ - delete mpDurationLabel; - mpDurationLabel = NULL; - } - if(NULL != mpDuration1){ - delete mpDuration1; - mpDuration1 = NULL; - } - if(NULL != mpDuration2){ - delete mpDuration2; - mpDuration2 = NULL; - } - if(NULL != mpDuration3){ - delete mpDuration3; - mpDuration3 = NULL; - } - if(NULL != mpDurationButtons){ - delete mpDurationButtons; - mpDurationButtons = NULL; - } - if(NULL != mpDurationLayout){ - delete mpDurationLayout; - mpDurationLayout = NULL; - } - if(NULL != mpTitleLabel){ - delete mpTitleLabel; - mpTitleLabel = NULL; - } - if(NULL != mpTitle){ - delete mpTitle; - mpTitle = NULL; - } - if(NULL != mpTitleLayout){ - delete mpTitleLayout; - mpTitleLayout = NULL; - } - if(NULL != mpLayout){ - delete mpLayout; - mpLayout = NULL; - } - if(NULL != mpContainer){ - delete mpContainer; - mpContainer = NULL; - } - if(NULL != mpContainerLayout){ - delete mpContainerLayout; - mpContainerLayout = NULL; - } - if(NULL != mpPreview){ - delete mpPreview; - mpPreview = NULL; - } - if(NULL != mpStackWidget){ - delete mpStackWidget; - mpStackWidget = NULL; - } + DELETEPTR(mpDocPreviewWidget); + DELETEPTR(mpDocEditWidget); + DELETEPTR(mpMediaContainer); + DELETEPTR(mpComments); + DELETEPTR(mpCommentLabel); + DELETEPTR(mpLinks); + DELETEPTR(mpLinkLabel); + DELETEPTR(mpLinkButton); + DELETEPTR(mpLinkLayout); + DELETEPTR(mpMediaLabel); + DELETEPTR(mpActionButton); + DELETEPTR(mpActionLayout); + DELETEPTR(mpActionLabel); + DELETEPTR(mpTitleLabel); + DELETEPTR(mpTitle); + DELETEPTR(mpTitleLayout); + DELETEPTR(mpLayout); + DELETEPTR(mpContainer); + DELETEPTR(mpContainerLayout); + DELETEPTR(mpPreview); + DELETEPTR(mpStackWidget); } void UBTeacherBarWidget::onValueChanged() @@ -281,14 +187,7 @@ void UBTeacherBarWidget::saveContent() sTeacherBarInfos infos; // Title infos.title = mpTitle->text(); - // Duration - if(mpDuration1->isChecked()){ - infos.Duration = eDuration_Quarter; - }else if(mpDuration2->isChecked()){ - infos.Duration = eDuration_Half; - }else{ - infos.Duration = eDuration_ThreeQuarter; - } + // Actions for(int i=0; icomboValue()).arg(mActionList.at(i)->text()); @@ -316,17 +215,7 @@ void UBTeacherBarWidget::loadContent() sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); // Title mpTitle->setText(nextInfos.title); - // Duration - switch(nextInfos.Duration){ - case eDuration_Quarter: mpDuration1->setChecked(true); - break; - case eDuration_Half: mpDuration2->setChecked(true); - break; - case eDuration_ThreeQuarter: mpDuration3->setChecked(true); - break; - default: mpDuration1->setChecked(true); - break; - } + // Actions for(int i=0; imediaViewer()->loadMedia(nextInfos.medias); mpStackWidget->setCurrentWidget(mpPreview); - if(mpDuration1->isChecked()){ - mpPreview->setDuration(eDuration_Quarter); - }else if(mpDuration2->isChecked()){ - mpPreview->setDuration(eDuration_Half); - }else{ - mpPreview->setDuration(eDuration_ThreeQuarter); - } mpPreview->clean(); // Add the actions @@ -498,6 +380,24 @@ void UBTeacherBarWidget::onMediaDropped(const QString &url) } } +void UBTeacherBarWidget::onTBStateChanged(eTeacherBarState state) +{ + switch(state){ + case eTeacherBarState_DocumentEdit: + mpStackWidget->setCurrentWidget(mpDocEditWidget); + break; + case eTeacherBarState_DocumentPreview: + mpStackWidget->setCurrentWidget(mpDocPreviewWidget); + break; + case eTeacherBarState_PageEdit: + mpStackWidget->setCurrentWidget(mpContainer); + break; + case eTeacherBarState_PagePreview: + mpStackWidget->setCurrentWidget(mpPreview); + break; + } +} + // --------------------------------------------------------------------------------------------- UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) , mpText(NULL) @@ -536,22 +436,10 @@ UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name UBTeacherStudentAction::~UBTeacherStudentAction() { - if(NULL != mpCombo){ - delete mpCombo; - mpCombo = NULL; - } - if(NULL != mpText){ - delete mpText; - mpText = NULL; - } - if(NULL != mpComboLayout){ - delete mpComboLayout; - mpComboLayout = NULL; - } - if(NULL != mpLayout){ - delete mpLayout; - mpLayout = NULL; - } + DELETEPTR(mpCombo); + DELETEPTR(mpText); + DELETEPTR(mpComboLayout); + DELETEPTR(mpLayout); } QString UBTeacherStudentAction::text() @@ -623,34 +511,13 @@ UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) UBUrlWidget::~UBUrlWidget() { - if(NULL != mpTitle){ - delete mpTitle; - mpTitle = NULL; - } - if(NULL != mpTitleLabel){ - delete mpTitleLabel; - mpTitleLabel = NULL; - } - if(NULL != mpUrlLabel){ - delete mpUrlLabel; - mpUrlLabel = NULL; - } - if(NULL != mpUrl){ - delete mpUrl; - mpUrl = NULL; - } - if(NULL != mpTitleLayout){ - delete mpTitleLayout; - mpTitleLayout = NULL; - } - if(NULL != mpLabelLayout){ - delete mpLabelLayout; - mpLabelLayout = NULL; - } - if(NULL != mpLayout){ - delete mpLayout; - mpLayout = NULL; - } + DELETEPTR(mpTitle); + DELETEPTR(mpTitleLabel); + DELETEPTR(mpUrlLabel); + DELETEPTR(mpUrl); + DELETEPTR(mpTitleLayout); + DELETEPTR(mpLabelLayout); + DELETEPTR(mpLayout); } QString UBUrlWidget::url() @@ -683,6 +550,7 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char , mpCommentsLabel(NULL) , mpComments(NULL) , mpLinksLabel(NULL) + , mpContentContainer(NULL) { setObjectName(name); @@ -702,7 +570,9 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char mTitleDurationLayout.addWidget(mpDuration, 1); mLayout.addLayout(&mTitleDurationLayout, 0); - mLayout.addWidget(&mMediaViewer, 1); + mpContentContainer = new UBTBPreviewContainer(this); + mLayout.addWidget(mpContentContainer, 1); + //mLayout.addWidget(&mMediaViewer, 1); // The next line is disgusting. This is a quickfix that must be reworked later mMediaViewer.setContentsMargins(-9, -9, -9, -9); @@ -722,38 +592,15 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char UBTeacherBarPreviewWidget::~UBTeacherBarPreviewWidget() { - if(NULL != mpLinksLabel){ - delete mpLinksLabel; - mpLinksLabel = NULL; - } - if(NULL != mpComments){ - delete mpComments; - mpComments = NULL; - } - if(NULL != mpTitle){ - delete mpTitle; - mpTitle = NULL; - } - if(NULL != mpDuration){ - delete mpDuration; - mpDuration = NULL; - } - if(NULL != mpActionsLabel){ - delete mpActionsLabel; - mpActionsLabel = NULL; - } - if(NULL != mpMediaLabel){ - delete mpMediaLabel; - mpMediaLabel = NULL; - } - if(NULL != mpCommentsLabel){ - delete mpCommentsLabel; - mpCommentsLabel = NULL; - } - if(NULL != mpEditButton){ - delete mpEditButton; - mpEditButton = NULL; - } + DELETEPTR(mpLinksLabel); + DELETEPTR(mpComments); + DELETEPTR(mpTitle); + DELETEPTR(mpDuration); + DELETEPTR(mpActionsLabel); + DELETEPTR(mpMediaLabel); + DELETEPTR(mpCommentsLabel); + DELETEPTR(mpContentContainer); + DELETEPTR(mpEditButton); } void UBTeacherBarPreviewWidget::onEdit() @@ -807,6 +654,13 @@ void UBTeacherBarPreviewWidget::setComments(const QString &comments) void UBTeacherBarPreviewWidget::clean() { mMediaViewer.cleanMedia(); + + foreach(QWidget* eachWidget, mStoredWidgets){ + delete eachWidget; + eachWidget = NULL; + } + mStoredWidgets.clear(); + hideElements(); } @@ -883,11 +737,7 @@ UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char* UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() { - if(mWidget){ - delete mWidget; - mWidget = NULL; - } - + DELETEPTR(mWidget); } void UBTeacherBarPreviewMedia::cleanMedia() @@ -1119,3 +969,97 @@ QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url) return pW; } + +// ------------------------------------------------------------------------------------------------------------------- +UBTBPreviewContainer::UBTBPreviewContainer(QWidget *parent, const char *name):UBWidgetList(parent) +{ + setObjectName(name); +} + +UBTBPreviewContainer::~UBTBPreviewContainer() +{ + +} + +// ------------------------------------------------------------------------------------------------------------------- +UBTBDocumentEditWidget::UBTBDocumentEditWidget(QWidget *parent, const char *name):QWidget(parent) + , mpPageViewButton(NULL) + , mpPreviewButton(NULL) + , mpTitleLabel(NULL) + , mpTitle(NULL) + , mpTargetLabel(NULL) + , mpTarget(NULL) + , mpMetadataLabel(NULL) + , mpLicenseLabel(NULL) +{ + setObjectName(name); + setLayout(&mLayout); + + mpPageViewButton = new QPushButton(tr("Page View"), this); + mPageLayout.addStretch(1); + mPageLayout.addWidget(mpPageViewButton, 0); + mPageLayout.addStretch(1); + mLayout.addLayout(&mPageLayout); + + mpTitleLabel = new QLabel(tr("Session Title:"), this); + mpTitleLabel->setAlignment(Qt::AlignLeft); + mLayout.addWidget(mpTitleLabel); + mpTitle = new QLineEdit(this); + mLayout.addWidget(mpTitle); + + + mpPreviewButton = new QPushButton(tr("Preview"), this); + mPreviewLayout.addStretch(1); + mPreviewLayout.addWidget(mpPreviewButton, 0); + mPreviewLayout.addStretch(1); + mLayout.addLayout(&mPreviewLayout); + + connect(mpPageViewButton, SIGNAL(clicked()), this, SIGNAL(onPageViewClicked())); + connect(mpPreviewButton, SIGNAL(clicked()), this, SIGNAL(onPreviewClicked())); +} + +UBTBDocumentEditWidget::~UBTBDocumentEditWidget() +{ + DELETEPTR(mpTitleLabel); + DELETEPTR(mpTitle); + DELETEPTR(mpTargetLabel); + DELETEPTR(mpTarget); + DELETEPTR(mpMetadataLabel); + DELETEPTR(mpLicenseLabel); + DELETEPTR(mpPageViewButton); + DELETEPTR(mpPreviewButton); +} + +// ------------------------------------------------------------------------------------------------------------------- +UBTBDocumentPreviewWidget::UBTBDocumentPreviewWidget(QWidget *parent, const char *name):QWidget(parent) + , mpPageViewButton(NULL) + , mpEditButton(NULL) +{ + setObjectName(name); + setLayout(&mLayout); + + mpPageViewButton = new QPushButton(tr("Page View"), this); + mPageLayout.addStretch(1); + mPageLayout.addWidget(mpPageViewButton, 0); + mPageLayout.addStretch(1); + mLayout.addLayout(&mPageLayout); + + // TODO : Add the elements here + + mpEditButton = new QPushButton(tr("Edit"), this); + mPreviewLayout.addStretch(1); + mPreviewLayout.addWidget(mpEditButton, 0); + mPreviewLayout.addStretch(1); + mLayout.addLayout(&mPreviewLayout); + + connect(mpPageViewButton, SIGNAL(clicked()), this, SIGNAL(onPageViewClicked())); + connect(mpEditButton, SIGNAL(clicked()), this, SIGNAL(onEditClicked())); +} + +UBTBDocumentPreviewWidget::~UBTBDocumentPreviewWidget() +{ + DELETEPTR(mpPageViewButton); + DELETEPTR(mpEditButton); +} + + diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 7bb80512..ee74c7bc 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -22,6 +22,13 @@ class UBMediaPlayer; #define LABEL_MINWIDHT 80 +typedef enum{ + eTeacherBarState_DocumentEdit, + eTeacherBarState_DocumentPreview, + eTeacherBarState_PageEdit, + eTeacherBarState_PagePreview +}eTeacherBarState; + typedef enum{ eDuration_Quarter, eDuration_Half, @@ -104,6 +111,13 @@ private: QHBoxLayout mOwnerLayout; }; +class UBTBPreviewContainer : public UBWidgetList +{ +public: + UBTBPreviewContainer(QWidget* parent=0, const char* name="UBTBPreviewContainer"); + ~UBTBPreviewContainer(); +}; + class UBTeacherBarPreviewWidget : public QWidget { Q_OBJECT @@ -133,6 +147,7 @@ private: QHBoxLayout mTitleDurationLayout; UBTeacherBarPreviewMedia mMediaViewer; QList mWidgets; + QList mStoredWidgets; QPushButton* mpEditButton; QLabel* mpTitle; @@ -144,6 +159,7 @@ private: QLabel* mpLinksLabel; QLabel* mpTmpLink; UBActionPreview* mpTmpAction; + UBTBPreviewContainer* mpContentContainer; }; class UBTBMediaContainer : public UBWidgetList @@ -172,6 +188,51 @@ private: QStringList mMediaList; }; +class UBTBDocumentEditWidget : public QWidget +{ + Q_OBJECT +public: + UBTBDocumentEditWidget(QWidget* parent=0, const char* name="UBTBDocumentEditWidget"); + ~UBTBDocumentEditWidget(); + +signals: + void onPreviewClicked(); + void onPageViewClicked(); + +private: + QVBoxLayout mLayout; + QHBoxLayout mPageLayout; + QHBoxLayout mPreviewLayout; + QPushButton* mpPageViewButton; + QPushButton* mpPreviewButton; + + QLabel* mpTitleLabel; + QLineEdit* mpTitle; + QLabel* mpTargetLabel; + QTextEdit* mpTarget; + QLabel* mpMetadataLabel; + QLabel* mpLicenseLabel; +}; + +class UBTBDocumentPreviewWidget : public QWidget +{ + Q_OBJECT +public: + UBTBDocumentPreviewWidget(QWidget* parent=0, const char* name="UBTBDocumentPreviewWidget"); + ~UBTBDocumentPreviewWidget(); + +signals: + void onEditClicked(); + void onPageViewClicked(); + +private: + QVBoxLayout mLayout; + QHBoxLayout mPageLayout; + QHBoxLayout mPreviewLayout; + QPushButton* mpPageViewButton; + QPushButton* mpEditButton; +}; + class UBTeacherBarWidget : public UBDockPaletteWidget { Q_OBJECT @@ -188,23 +249,18 @@ private slots: void onLinkButton(); void onShowEditMode(); void onMediaDropped(const QString& url); + void onTBStateChanged(eTeacherBarState state); private: void clearWidgetLists(); bool isEmpty(); QVBoxLayout* mpLayout; QHBoxLayout* mpTitleLayout; - QHBoxLayout* mpDurationLayout; QLabel* mpTitleLabel; - QLabel* mpDurationLabel; QLineEdit* mpTitle; QLabel* mpMediaLabel; QWidget* mpContainer; QVBoxLayout* mpContainerLayout; - QCheckBox* mpDuration1; - QCheckBox* mpDuration2; - QCheckBox* mpDuration3; - QButtonGroup* mpDurationButtons; QLabel* mpActionLabel; UBWidgetList* mpActions; QPushButton* mpActionButton; @@ -223,6 +279,10 @@ private: QVector mMediaList; UBTBMediaContainer* mpMediaContainer; + eTeacherBarState mState; + + UBTBDocumentPreviewWidget* mpDocPreviewWidget; + UBTBDocumentEditWidget* mpDocEditWidget; }; #endif // UBTEACHERBARWIDGET_H From 3dd07bb46d95e2ba8f428b8e114e83530ca6af30 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 20 Jan 2012 08:40:35 +0100 Subject: [PATCH 65/99] backup while reworking the teacher bar --- src/gui/UBTBDocumentEditWidget.cpp | 88 +++ src/gui/UBTBDocumentEditWidget.h | 45 ++ src/gui/UBTBDocumentPreviewWidget.cpp | 48 ++ src/gui/UBTBDocumentPreviewWidget.h | 33 + src/gui/UBTBPageEditWidget.cpp | 417 ++++++++++ src/gui/UBTBPageEditWidget.h | 92 +++ src/gui/UBTeacherBarDataMgr.cpp | 97 +++ src/gui/UBTeacherBarDataMgr.h | 109 +++ src/gui/UBTeacherBarPreviewWidget.cpp | 314 ++++++++ src/gui/UBTeacherBarPreviewWidget.h | 96 +++ src/gui/UBTeacherBarWidget.cpp | 1050 +++---------------------- src/gui/UBTeacherBarWidget.h | 251 +----- src/gui/gui.pri | 16 +- 13 files changed, 1464 insertions(+), 1192 deletions(-) create mode 100644 src/gui/UBTBDocumentEditWidget.cpp create mode 100644 src/gui/UBTBDocumentEditWidget.h create mode 100644 src/gui/UBTBDocumentPreviewWidget.cpp create mode 100644 src/gui/UBTBDocumentPreviewWidget.h create mode 100644 src/gui/UBTBPageEditWidget.cpp create mode 100644 src/gui/UBTBPageEditWidget.h create mode 100644 src/gui/UBTeacherBarDataMgr.cpp create mode 100644 src/gui/UBTeacherBarDataMgr.h create mode 100644 src/gui/UBTeacherBarPreviewWidget.cpp create mode 100644 src/gui/UBTeacherBarPreviewWidget.h diff --git a/src/gui/UBTBDocumentEditWidget.cpp b/src/gui/UBTBDocumentEditWidget.cpp new file mode 100644 index 00000000..17fa19a8 --- /dev/null +++ b/src/gui/UBTBDocumentEditWidget.cpp @@ -0,0 +1,88 @@ +#include "UBTBDocumentEditWidget.h" +#include "customWidgets/UBGlobals.h" + +UBTBDocumentEditWidget::UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QWidget *parent, const char *name):QWidget(parent) + , mpPageViewButton(NULL) + , mpPreviewButton(NULL) + , mpTitleLabel(NULL) + , mpTitle(NULL) + , mpTargetLabel(NULL) + , mpTarget(NULL) + , mpMetadataLabel(NULL) + , mpLicenseLabel(NULL) +{ + setObjectName(name); + + mpDataMgr = pDataMgr; + + setLayout(&mLayout); + mLayout.setContentsMargins(0, 0, 0, 0); + + mpContainer = new QWidget(this); + mpContainer->setObjectName("DockPaletteWidgetBox"); + mLayout.addWidget(mpContainer, 1); + mpContainer->setLayout(&mContainerLayout); + + // Title + mpTitleLabel = new QLabel(tr("Session Title"), mpContainer); + mpTitleLabel->setAlignment(Qt::AlignLeft); + //mpTitleLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mContainerLayout.addWidget(mpTitleLabel, 0); + mpTitle = new QLineEdit(mpContainer); + mpTitle->setObjectName("DockPaletteWidgetLineEdit"); + mContainerLayout.addWidget(mpTitle, 0); + + // Target + mpTargetLabel = new QLabel(tr("Session Target"), mpContainer); + //mpTargetLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mContainerLayout.addWidget(mpTargetLabel, 0); + mpTarget = new QTextEdit(mpContainer); + mpTarget->setObjectName("UBTeacherBarTargetBox"); + mContainerLayout.addWidget(mpTarget, 1); + + // Metadata + mpMetadataLabel = new QLabel(tr("Metadata"), mpContainer); + mpMetadataLabel->setAlignment(Qt::AlignLeft); + //mpMetadataLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mContainerLayout.addWidget(mpMetadataLabel, 0); + + // License + mpLicenseLabel = new QLabel(tr("License"), mpContainer); + mpLicenseLabel->setAlignment(Qt::AlignLeft); + //mpLicenseLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mContainerLayout.addWidget(mpLicenseLabel, 0); + + mpPageViewButton = new QPushButton(tr("Page View"), this); + mpPageViewButton->setObjectName("DockPaletteWidgetButton"); + mPreviewLayout.addWidget(mpPageViewButton, 0); + mpPreviewButton = new QPushButton(tr("Preview"), this); + mpPreviewButton->setObjectName("DockPaletteWidgetButton"); + mPreviewLayout.addWidget(mpPreviewButton, 0); + mPreviewLayout.addStretch(1); + mLayout.addLayout(&mPreviewLayout, 0); + + connect(mpPageViewButton, SIGNAL(clicked()), this, SLOT(onPageView())); + connect(mpPreviewButton, SIGNAL(clicked()), this, SLOT(onPreview())); +} + +UBTBDocumentEditWidget::~UBTBDocumentEditWidget() +{ + DELETEPTR(mpTitleLabel); + DELETEPTR(mpTitle); + DELETEPTR(mpTargetLabel); + DELETEPTR(mpTarget); + DELETEPTR(mpMetadataLabel); + DELETEPTR(mpLicenseLabel); + DELETEPTR(mpPageViewButton); + DELETEPTR(mpPreviewButton); +} + +void UBTBDocumentEditWidget::onPageView() +{ + emit changeTBState(eTeacherBarState_PageEdit); +} + +void UBTBDocumentEditWidget::onPreview() +{ + emit changeTBState(eTeacherBarState_DocumentPreview); +} diff --git a/src/gui/UBTBDocumentEditWidget.h b/src/gui/UBTBDocumentEditWidget.h new file mode 100644 index 00000000..f26559eb --- /dev/null +++ b/src/gui/UBTBDocumentEditWidget.h @@ -0,0 +1,45 @@ +#ifndef UBTBDOCUMENTEDITWIDGET_H +#define UBTBDOCUMENTEDITWIDGET_H + +#include +#include +#include +#include +#include + +#include "UBTeacherBarDataMgr.h" + +class UBTBDocumentEditWidget : public QWidget +{ + Q_OBJECT +public: + UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTBDocumentEditWidget"); + ~UBTBDocumentEditWidget(); + +signals: + void changeTBState(eTeacherBarState state); + +private slots: + void onPageView(); + void onPreview(); + +private: + QVBoxLayout mLayout; + QHBoxLayout mPageLayout; + QHBoxLayout mPreviewLayout; + QVBoxLayout mContainerLayout; + QPushButton* mpPageViewButton; + QPushButton* mpPreviewButton; + + QWidget* mpContainer; + QLabel* mpTitleLabel; + QLineEdit* mpTitle; + QLabel* mpTargetLabel; + QTextEdit* mpTarget; + QLabel* mpMetadataLabel; + QLabel* mpLicenseLabel; + + UBTeacherBarDataMgr* mpDataMgr; +}; + +#endif // UBTBDOCUMENTEDITWIDGET_H diff --git a/src/gui/UBTBDocumentPreviewWidget.cpp b/src/gui/UBTBDocumentPreviewWidget.cpp new file mode 100644 index 00000000..818dfce5 --- /dev/null +++ b/src/gui/UBTBDocumentPreviewWidget.cpp @@ -0,0 +1,48 @@ +#include "customWidgets/UBGlobals.h" +#include "UBTBDocumentPreviewWidget.h" + +UBTBDocumentPreviewWidget::UBTBDocumentPreviewWidget(UBTeacherBarDataMgr *pDataMgr, QWidget *parent, const char *name):QWidget(parent) + , mpPageViewButton(NULL) + , mpEditButton(NULL) +{ + setObjectName(name); + mpDataMgr = pDataMgr; + + setLayout(&mLayout); + + mpPageViewButton = new QPushButton(tr("Page View"), this); + mpPageViewButton->setObjectName("DockPaletteWidgetButton"); + mPageLayout.addStretch(1); + mPageLayout.addWidget(mpPageViewButton, 0); + mPageLayout.addStretch(1); + mLayout.addLayout(&mPageLayout); + + // TODO : Add the elements here + + mpEditButton = new QPushButton(tr("Edit"), this); + mpEditButton->setObjectName("DockPaletteWidgetButton"); + mPreviewLayout.addStretch(1); + mPreviewLayout.addWidget(mpEditButton, 0); + mPreviewLayout.addStretch(1); + mLayout.addLayout(&mPreviewLayout); + + connect(mpPageViewButton, SIGNAL(clicked()), this, SLOT(onPageView())); + connect(mpEditButton, SIGNAL(clicked()), this, SLOT(onEdit())); +} + +UBTBDocumentPreviewWidget::~UBTBDocumentPreviewWidget() +{ + DELETEPTR(mpPageViewButton); + DELETEPTR(mpEditButton); +} + +void UBTBDocumentPreviewWidget::onEdit() +{ + emit changeTBState(eTeacherBarState_DocumentEdit); +} + +void UBTBDocumentPreviewWidget::onPageView() +{ + emit changeTBState(eTeacherBarState_PagePreview); +} + diff --git a/src/gui/UBTBDocumentPreviewWidget.h b/src/gui/UBTBDocumentPreviewWidget.h new file mode 100644 index 00000000..0b426e3c --- /dev/null +++ b/src/gui/UBTBDocumentPreviewWidget.h @@ -0,0 +1,33 @@ +#ifndef UBTBDOCUMENTPREVIEWWIDGET_H +#define UBTBDOCUMENTPREVIEWWIDGET_H + +#include +#include + +#include "UBTeacherBarDataMgr.h" + +class UBTBDocumentPreviewWidget : public QWidget +{ + Q_OBJECT +public: + UBTBDocumentPreviewWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTBDocumentPreviewWidget"); + ~UBTBDocumentPreviewWidget(); + +signals: + void changeTBState(eTeacherBarState state); + +private slots: + void onPageView(); + void onEdit(); + +private: + QVBoxLayout mLayout; + QHBoxLayout mPageLayout; + QHBoxLayout mPreviewLayout; + QPushButton* mpPageViewButton; + QPushButton* mpEditButton; + + UBTeacherBarDataMgr* mpDataMgr; +}; + +#endif // UBTBDOCUMENTPREVIEWWIDGET_H diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp new file mode 100644 index 00000000..121ab0b3 --- /dev/null +++ b/src/gui/UBTBPageEditWidget.cpp @@ -0,0 +1,417 @@ +#include "customWidgets/UBGlobals.h" +#include "core/UBApplication.h" +#include "frameworks/UBFileSystemUtils.h" +#include "gui/UBMediaPlayer.h" +#include "customWidgets/UBMediaWidget.h" + +#include "UBTBPageEditWidget.h" + +UBTBPageEditWidget::UBTBPageEditWidget(UBTeacherBarDataMgr *pDataMgr, QWidget *parent, const char *name):QWidget(parent) + , mpDataMgr(NULL) + , mpTitleLabel(NULL) + , mpTitle(NULL) + , mpMediaLabel(NULL) + , mpActionLabel(NULL) + , mpActions(NULL) + , mpActionButton(NULL) + , mpLinkLabel(NULL) + , mpLinks(NULL) + , mpLinkButton(NULL) + , mpCommentLabel(NULL) + , mpComments(NULL) + , mpDocumentEditbutton(NULL) + , mpPagePreviewButton(NULL) + , mpContainer(NULL) +{ + Q_UNUSED(name); + mpDataMgr = pDataMgr; + setAttribute(Qt::WA_StyledBackground, true); + setStyleSheet(UBApplication::globalStyleSheet()); + + mLayout.setContentsMargins(0, 0, 0, 0); + setLayout(&mLayout); + + mpContainer = new QWidget(this); + mpContainer->setObjectName("DockPaletteWidgetBox"); + mpContainer->setLayout(&mContainerLayout); + mLayout.addWidget(mpContainer, 1); + + // Title + mpTitleLabel = new QLabel(tr("Title"), mpContainer); + mpTitle = new QLineEdit(mpContainer); + mpTitle->setObjectName("DockPaletteWidgetLineEdit"); + connect(mpTitle, SIGNAL(textChanged(const QString&)), this, SLOT(onTitleTextChanged(const QString&))); + mContainerLayout.addWidget(mpTitleLabel, 0); + mContainerLayout.addWidget(mpTitle, 0); + + // Actions + mpActionLabel = new QLabel(tr("Actions"), mpContainer); + mContainerLayout.addWidget(mpActionLabel, 0); + mpActions = new UBWidgetList(mpContainer); + mpActions->setEmptyText(tr("Add actions")); + mContainerLayout.addWidget(mpActions, 1); + mpActionButton = new QPushButton(mpContainer); + mpActionButton->setObjectName("DockPaletteWidgetButton"); + mpActionButton->setText(tr("Add action")); + mActionLayout.addWidget(mpActionButton, 0); + mActionLayout.addStretch(1); + mContainerLayout.addLayout(&mActionLayout, 0); + + // Media + mpMediaLabel = new QLabel(tr("Medias"), mpContainer); + mContainerLayout.addWidget(mpMediaLabel, 0); + mpMediaContainer = new UBTBMediaContainer(mpContainer); + mpMediaContainer->setEmptyText(tr("Drop media here")); + mContainerLayout.addWidget(mpMediaContainer, 1); + + // Links + mpLinkLabel = new QLabel(tr("Links"), mpContainer); + mContainerLayout.addWidget(mpLinkLabel, 0); + mpLinks = new UBWidgetList(mpContainer); + mContainerLayout.addWidget(mpLinks, 1); + mpLinkButton = new QPushButton(tr("Add link"), mpContainer); + mpLinkButton->setObjectName("DockPaletteWidgetButton"); + mLinkLayout.addWidget(mpLinkButton, 0); + mLinkLayout.addStretch(1); + mContainerLayout.addLayout(&mLinkLayout, 0); + + // Comments + mpCommentLabel = new QLabel(tr("Comments"), mpContainer); + mContainerLayout.addWidget(mpCommentLabel, 0); + mpComments = new QTextEdit(mpContainer); + mpComments->setObjectName("DockPaletteWidgetBox"); + mpComments->setStyleSheet("background:white;"); + mContainerLayout.addWidget(mpComments, 1); + + mpPagePreviewButton = new QPushButton(tr("Preview"), this); + mpPagePreviewButton->setObjectName("DockPaletteWidgetButton"); + mpDocumentEditbutton = new QPushButton(tr("Document View"), this); + mpDocumentEditbutton->setObjectName("DockPaletteWidgetButton"); + mPagePreviewLayout.addWidget(mpDocumentEditbutton, 0); + mPagePreviewLayout.addWidget(mpPagePreviewButton, 0); + mPagePreviewLayout.addStretch(1); + mLayout.addLayout(&mPagePreviewLayout, 0); + + connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); + connect(mpActionButton, SIGNAL(clicked()), this, SLOT(onActionButton())); + connect(mpLinkButton, SIGNAL(clicked()), this, SLOT(onLinkButton())); + connect(mpDocumentEditbutton, SIGNAL(clicked()), this, SLOT(onDocumentEditClicked())); + connect(mpPagePreviewButton, SIGNAL(clicked()), this, SLOT(onPagePreviewClicked())); + connect(mpMediaContainer, SIGNAL(mediaDropped(QString)), this, SLOT(onMediaDropped(QString))); +} + +UBTBPageEditWidget::~UBTBPageEditWidget() +{ + DELETEPTR(mpDocumentEditbutton); + DELETEPTR(mpPagePreviewButton); + DELETEPTR(mpComments); + DELETEPTR(mpCommentLabel); + DELETEPTR(mpLinks); + DELETEPTR(mpLinkLabel); + DELETEPTR(mpLinkButton); + DELETEPTR(mpMediaLabel); + DELETEPTR(mpActionButton); + DELETEPTR(mpActionLabel); + DELETEPTR(mpTitleLabel); + DELETEPTR(mpTitle); +} + +void UBTBPageEditWidget::onValueChanged() +{ + mpDataMgr->setPageTitle(mpTitle->text()); + mpDataMgr->setComments(mpComments->document()->toPlainText()); + emit valueChanged(); +} + +void UBTBPageEditWidget::onActionButton() +{ + UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); + mpDataMgr->actions() << pAction; + mpActions->addWidget(pAction); +} + +void UBTBPageEditWidget::onLinkButton() +{ + UBUrlWidget* pUrl = new UBUrlWidget(this); + mpDataMgr->urls() << pUrl; + mpLinks->addWidget(pUrl); +} + +void UBTBPageEditWidget::onMediaDropped(const QString &url) +{ + if("" != url){ + QWidget* pMedia = mpMediaContainer->generateMediaWidget(url); + if(NULL != pMedia){ + mpDataMgr->medias() << pMedia; + mpMediaContainer->addWidget(pMedia); + } + } +} + + +void UBTBPageEditWidget::saveInfos(sTeacherBarInfos *infos) +{ + if(NULL != infos){ + infos->title = mpTitle->text(); + + // Actions + for(int i=0; iactions().size(); i++){ + infos->actions << QString("%0;%1").arg(mpDataMgr->actions().at(i)->comboValue()).arg(mpDataMgr->actions().at(i)->text()); + } + // Media + foreach(QString media, mpMediaContainer->mediaUrls()){ + infos->medias << media; + } + + // Links + for(int j=0; jurls().size(); j++){ + if("" != mpDataMgr->urls().at(j)->url()){ + infos->urls << mpDataMgr->urls().at(j)->url(); + } + } + // Comments + infos->comments = mpComments->document()->toPlainText(); + } +} + +void UBTBPageEditWidget::loadInfos(sTeacherBarInfos* infos) +{ + if(NULL != infos){ + // Title + mpTitle->setText(infos->title); + mpDataMgr->setPageTitle(infos->title); + + // Actions + for(int i=0; iactions.size(); i++){ + QStringList qslAction = infos->actions.at(i).split(";"); + if(qslAction.size() >= 2){ + UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); + pAction->setComboValue(qslAction.at(0).toInt()); + pAction->setText(qslAction.at(1)); + mpDataMgr->actions() << pAction; + mpActions->addWidget(pAction); + } + } + // Media + foreach(QString url, infos->medias){ + if("" != url){ + QWidget* pMedia = mpMediaContainer->generateMediaWidget(url); + if(NULL != pMedia){ + mpDataMgr->medias() << pMedia; + mpMediaContainer->addWidget(pMedia); + } + } + } + + // Links + for(int j=0; jurls.size(); j++){ + QString qsUrl = infos->urls.at(j); + if("" != qsUrl){ + UBUrlWidget* pLink = new UBUrlWidget(this); + pLink->setUrl(qsUrl); + mpDataMgr->urls() << pLink; + mpLinks->addWidget(pLink); + } + } + // Comments + if(NULL != mpComments){ + mpComments->document()->setPlainText(infos->comments); + } + } +} + +void UBTBPageEditWidget::onDocumentEditClicked() +{ + emit changeTBState(eTeacherBarState_DocumentEdit); +} + +void UBTBPageEditWidget::onPagePreviewClicked() +{ + emit changeTBState(eTeacherBarState_PagePreview); +} + +// --------------------------------------------------------------------------------------------- +UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) + , mpLayout(NULL) + , mpUrlLabel(NULL) + , mpUrl(NULL) +{ + setObjectName(name); + setAttribute(Qt::WA_StyledBackground, true); + setStyleSheet(UBApplication::globalStyleSheet()); + + mpLayout = new QVBoxLayout(this); + setLayout(mpLayout); + + mpLabelLayout = new QHBoxLayout(this); + mpUrlLabel = new QLabel(tr("Url"), this); + mpLabelLayout->addWidget(mpUrlLabel, 0); + mpUrl = new QLineEdit(this); + mpUrl->setObjectName("DockPaletteWidgetLineEdit"); + mpUrl->setMinimumHeight(20); + mpLabelLayout->addWidget(mpUrl, 1); + + mpTitleLayout = new QHBoxLayout(this); + mpTitleLabel = new QLabel(tr("Title"),this); + mpTitleLayout->addWidget(mpTitleLabel,0); + mpTitle = new QLineEdit(this); + mpTitle->setObjectName("DockPaletteWidgetLineEdit"); + mpTitle->setMinimumHeight(20); + mpTitleLayout->addWidget(mpTitle,1); + + mpLayout->addLayout(mpTitleLayout); + mpLayout->addLayout(mpLabelLayout); +} + +UBUrlWidget::~UBUrlWidget() +{ + DELETEPTR(mpTitle); + DELETEPTR(mpTitleLabel); + DELETEPTR(mpUrlLabel); + DELETEPTR(mpUrl); + DELETEPTR(mpTitleLayout); + DELETEPTR(mpLabelLayout); + DELETEPTR(mpLayout); +} + +QString UBUrlWidget::url() +{ + QString str; + + if(NULL != mpUrl){ + str = mpUrl->text() + ";" + mpTitle->text(); + } + + return str; +} + +void UBUrlWidget::setUrl(const QString &url) +{ + QStringList list = url.split(";"); + if(NULL != mpUrl){ + mpUrl->setText(list.at(0)); + mpTitle->setText(list.at(1)); + } +} + +// ------------------------------------------------------------------------------------------------------------------------------------ +UBTBMediaContainer::UBTBMediaContainer(QWidget *parent, const char *name) : UBWidgetList(parent) +{ + setObjectName(name); + setAcceptDrops(true); +} + +UBTBMediaContainer::~UBTBMediaContainer() +{ + +} + +void UBTBMediaContainer::dropEvent(QDropEvent* pEvent) +{ + QPixmap pixFromDropEvent; + QString mimeType; + QString resourcePath; + if(pEvent->mimeData()->hasText()){ + resourcePath = pEvent->mimeData()->text(); + } + else if(pEvent->mimeData()->hasUrls()){ + resourcePath = pEvent->mimeData()->urls().at(0).toLocalFile(); + } + else if(pEvent->mimeData()->hasImage()){ + pixFromDropEvent.loadFromData(pEvent->mimeData()->imageData().toByteArray()); + if(!pixFromDropEvent.isNull()) + mimeType = "image"; + } + + if (mimeType.isEmpty() && resourcePath.isEmpty()){ + pEvent->acceptProposedAction(); + return; + } + if(!resourcePath.isEmpty()){ + emit mediaDropped(resourcePath); + pEvent->acceptProposedAction(); + } +} + +void UBTBMediaContainer::dragEnterEvent(QDragEnterEvent* pEvent) +{ + pEvent->acceptProposedAction(); +} + +void UBTBMediaContainer::dragMoveEvent(QDragMoveEvent* pEvent) +{ + pEvent->acceptProposedAction(); +} + +void UBTBMediaContainer::dragLeaveEvent(QDragLeaveEvent* pEvent) +{ + pEvent->accept(); +} + +void UBTBMediaContainer::addMedia(const QString& mediaPath) +{ + if(!mediaPath.isEmpty()) + mMediaList.append(mediaPath); + else + qWarning() << __FUNCTION__ << "empty path"; + + QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(mediaPath); + if(mimeType.contains("image")){ + QPixmap pix = QPixmap(mediaPath); + QLabel* label = new QLabel(); + label->setPixmap(pix); + label->setScaledContents(true); + addWidget(label); + } + else if(mimeType.contains("video") || mimeType.contains("audio")){ + UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); + mediaPlayer->setFile(mediaPath); + addWidget(mediaPlayer); + } + else{ + qWarning() << "pMediaPath" << mediaPath; + qWarning() << "bad idea to come here"; + } +} + +QStringList UBTBMediaContainer::mediaUrls() +{ + return mMediaList; +} + +void UBTBMediaContainer::cleanMedias() +{ + mMediaList.clear(); +} + +QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url) +{ + QWidget* pW = NULL; + + if(!url.isEmpty()) + mMediaList.append(url); + else + qWarning() << __FUNCTION__ << "empty path"; + + QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(url); + if(mimeType.contains("image")){ + QPixmap pix = QPixmap(url); + QLabel* label = new QLabel(); + pix.scaledToWidth(label->width()); + label->resize(pix.width(), pix.height()); + label->setPixmap(pix); + label->setScaledContents(true); + pW = label; + } + else if(mimeType.contains("video") || mimeType.contains("audio")){ + UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); + mediaPlayer->setFile(url); + pW = mediaPlayer; + } + else{ + qWarning() << "pMediaPath" << url; + qWarning() << "bad idea to come here"; + } + + return pW; +} diff --git a/src/gui/UBTBPageEditWidget.h b/src/gui/UBTBPageEditWidget.h new file mode 100644 index 00000000..ed766eaa --- /dev/null +++ b/src/gui/UBTBPageEditWidget.h @@ -0,0 +1,92 @@ +#ifndef UBTBPAGEEDITWIDGET_H +#define UBTBPAGEEDITWIDGET_H + +#include +#include +#include +#include +#include +#include +#include + +#include "core/UBPersistenceManager.h" +#include "customWidgets/UBWidgetList.h" +#include "interfaces/IDropable.h" +#include "UBTeacherBarDataMgr.h" + +class UBTBMediaContainer : public UBWidgetList + , public IDropable +{ + Q_OBJECT +public: + UBTBMediaContainer(QWidget* parent=0, const char* name="UBTBMediaContainer"); + ~UBTBMediaContainer(); + QStringList mediaUrls(); + QWidget* generateMediaWidget(const QString& url); + void cleanMedias(); + +signals: + void mediaDropped(const QString& url); + +protected: + void dropEvent(QDropEvent* pEvent); + void dragEnterEvent(QDragEnterEvent* pEvent); + void dragMoveEvent(QDragMoveEvent* pEvent); + void dragLeaveEvent(QDragLeaveEvent* pEvent); + +private: + void addMedia(const QString& mediaPath); + + QStringList mMediaList; +}; + +class UBTBPageEditWidget : public QWidget +{ + Q_OBJECT +public: + UBTBPageEditWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTBPageEditWidget"); + ~UBTBPageEditWidget(); + + void saveInfos(sTeacherBarInfos* infos); + void loadInfos(sTeacherBarInfos* infos); + +signals: + void valueChanged(); + void changeTBState(eTeacherBarState state); + +private slots: + void onValueChanged(); + void onActionButton(); + void onLinkButton(); + void onMediaDropped(const QString& url); + void onDocumentEditClicked(); + void onPagePreviewClicked(); + +private: + QVBoxLayout mLayout; + QHBoxLayout mTitleLayout; + QVBoxLayout mContainerLayout; + QHBoxLayout mActionLayout; + QHBoxLayout mLinkLayout; + QHBoxLayout mDocumentViewLayout; + QHBoxLayout mPagePreviewLayout; + + UBTeacherBarDataMgr* mpDataMgr; + QLabel* mpTitleLabel; + QLineEdit* mpTitle; + QLabel* mpMediaLabel; + UBTBMediaContainer* mpMediaContainer; + QLabel* mpActionLabel; + UBWidgetList* mpActions; + QPushButton* mpActionButton; + QLabel* mpLinkLabel; + UBWidgetList* mpLinks; + QPushButton* mpLinkButton; + QLabel* mpCommentLabel; + QTextEdit* mpComments; + QPushButton* mpDocumentEditbutton; + QPushButton* mpPagePreviewButton; + QWidget* mpContainer; +}; + +#endif // UBTBPAGEEDITWIDGET_H diff --git a/src/gui/UBTeacherBarDataMgr.cpp b/src/gui/UBTeacherBarDataMgr.cpp new file mode 100644 index 00000000..96faf37b --- /dev/null +++ b/src/gui/UBTeacherBarDataMgr.cpp @@ -0,0 +1,97 @@ +#include "core/UBApplication.h" +#include "customWidgets/UBGlobals.h" +#include "UBTeacherBarDataMgr.h" + +UBTeacherBarDataMgr::UBTeacherBarDataMgr() +{ + +} + +UBTeacherBarDataMgr::~UBTeacherBarDataMgr() +{ + +} + +void UBTeacherBarDataMgr::clearLists() +{ + mActionList.clear(); + mUrlList.clear(); + mMediaList.clear(); +} + +UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) + , mpText(NULL) + , mpLayout(NULL) + , mpComboLayout(NULL) + , mpCombo(NULL) +{ + setObjectName(name); + + setAttribute(Qt::WA_StyledBackground, true); + setStyleSheet(UBApplication::globalStyleSheet()); + + // Create the GUI + mpLayout = new QHBoxLayout(this); + setLayout(mpLayout); + + mpComboLayout = new QVBoxLayout(); + + mpCombo = new QComboBox(this); + mpCombo->setObjectName("DockPaletteWidgetComboBox"); + mpCombo->setMinimumWidth(80); + mpCombo->addItem(tr("Teacher")); + mpCombo->addItem(tr("Student")); + mpComboLayout->addWidget(mpCombo, 0); + mpComboLayout->addStretch(1); + + mpLayout->addLayout(mpComboLayout, 0); + + mpText = new QTextEdit(this); + mpText->setObjectName("DockPaletteWidgetBox"); + mpText->setStyleSheet("background:white;"); + + mpLayout->addWidget(mpText, 1); + +} + +UBTeacherStudentAction::~UBTeacherStudentAction() +{ + DELETEPTR(mpCombo); + DELETEPTR(mpText); + DELETEPTR(mpComboLayout); + DELETEPTR(mpLayout); +} + +QString UBTeacherStudentAction::text() +{ + QString str; + if(NULL != mpText){ + str = mpText->document()->toPlainText(); + } + return str; +} + +QString UBTeacherStudentAction::comboValue() +{ + QString str; + + if(NULL != mpCombo){ + str = QString("%0").arg(mpCombo->currentIndex()); + } + + return str; +} + +void UBTeacherStudentAction::setComboValue(int value) +{ + if(NULL != mpCombo){ + mpCombo->setCurrentIndex(value); + } +} + +void UBTeacherStudentAction::setText(const QString& text) +{ + if(NULL != mpText){ + mpText->document()->setPlainText(text); + } +} diff --git a/src/gui/UBTeacherBarDataMgr.h b/src/gui/UBTeacherBarDataMgr.h new file mode 100644 index 00000000..43c809b9 --- /dev/null +++ b/src/gui/UBTeacherBarDataMgr.h @@ -0,0 +1,109 @@ +#ifndef UBTEACHERBARDATAMGR_H +#define UBTEACHERBARDATAMGR_H + +#include +#include +#include +#include +#include +#include +#include +#include + +typedef enum{ + eTeacherBarState_DocumentEdit, + eTeacherBarState_DocumentPreview, + eTeacherBarState_PageEdit, + eTeacherBarState_PagePreview +}eTeacherBarState; + +typedef enum{ + eActionOwner_Teacher, + eActionOwner_Student +}eActionOwner; + +class UBTeacherStudentAction : public QWidget +{ + Q_OBJECT + +public: + UBTeacherStudentAction(QWidget* parent=0, const char* name="UBTeacherStudentAction"); + ~UBTeacherStudentAction(); + QString text(); + QString comboValue(); + void setComboValue(int value); + void setText(const QString& text); + +private: + QTextEdit* mpText; + QHBoxLayout* mpLayout; + QVBoxLayout* mpComboLayout; + QComboBox* mpCombo; +}; + +class UBUrlWidget : public QWidget +{ +public: + UBUrlWidget(QWidget* parent=0, const char* name="UBUrlWidget"); + ~UBUrlWidget(); + + QString url(); + void setUrl(const QString& url); + +private: + QVBoxLayout* mpLayout; + QHBoxLayout* mpLabelLayout; + QHBoxLayout* mpTitleLayout; + QLabel* mpUrlLabel; + QLineEdit* mpUrl; + + QLabel* mpTitleLabel; + QLineEdit* mpTitle; +}; + +class UBTeacherBarDataMgr +{ +public: + UBTeacherBarDataMgr(); + ~UBTeacherBarDataMgr(); + + // Session Title + void setSessionTitle(const QString& title){mSessionTitle = title;} + QString sessionTitle(){return mSessionTitle;} + + // Session Target + void setSessionTarget(const QString& target){mSessionTarget = target;} + QString sessionTarget(){return mSessionTarget;} + + // Page Title + void setPageTitle(const QString& title){mPageTitle = title;} + QString pageTitle(){return mPageTitle;} + + // Actions + QVector actions(){return mActionList;} + + // Medias + QVector medias(){return mMediaList;} + + // Urls + QVector urls(){return mUrlList;} + + // Comments + void setComments(const QString& c){mComments = c;} + QString comments(){return mComments;} + + // Others + void clearLists(); + +private: + QString mSessionTitle; + QString mSessionTarget; + QString mPageTitle; + QString mComments; + + QVector mActionList; + QVector mUrlList; + QVector mMediaList; +}; + +#endif // UBTEACHERBARDATAMGR_H diff --git a/src/gui/UBTeacherBarPreviewWidget.cpp b/src/gui/UBTeacherBarPreviewWidget.cpp new file mode 100644 index 00000000..7dbf450e --- /dev/null +++ b/src/gui/UBTeacherBarPreviewWidget.cpp @@ -0,0 +1,314 @@ +#include "core/UBApplication.h" +#include "customWidgets/UBGlobals.h" +#include "frameworks/UBFileSystemUtils.h" + +#include "UBTeacherBarPreviewWidget.h" + + +UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char* name) : QWidget(parent) +{ + setObjectName(name); + mWidget = new UBWidgetList(parent); + mLayout.addWidget(mWidget); + setLayout(&mLayout); + mWidgetList.clear(); +} + +UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() +{ + DELETEPTR(mWidget); +} + +void UBTeacherBarPreviewMedia::cleanMedia() +{ + foreach(QWidget* eachWidget, mWidgetList.keys()){ + if(QString(eachWidget->metaObject()->className()).contains("UBDraggable")){ + mWidget->removeWidget(eachWidget); + delete eachWidget; + eachWidget = NULL; + } + else{ + mWidget->removeWidget(eachWidget); + } + } + mWidgetList.clear(); +} + +void UBTeacherBarPreviewMedia::loadWidgets(QList pWidgetsList, bool isResizable) +{ + foreach(QWidget*eachWidget, pWidgetsList){ + mWidget->addWidget(eachWidget); + mWidgetList[eachWidget]="DRAG UNAVAILABLE"; + } +} + + +int UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) +{ + int addedMedia = 0; +// foreach(QString eachString, pMedias){ +// if(!eachString.isEmpty()){ +// QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(eachString); +// if(mimeType.contains("image")){ +// UBDraggableLabel* label = new UBDraggableLabel(); +// label->loadImage(eachString); +// mWidget->addWidget(label); +// mWidgetList[label]=eachString; +// addedMedia += 1; +// } +// else if(mimeType.contains("video") || mimeType.contains("audio")){ +// UBDraggableMediaPlayer* mediaPlayer = new UBDraggableMediaPlayer(); +// mediaPlayer->setFile(eachString); +// mWidget->addWidget(mediaPlayer); +// mWidgetList[mediaPlayer] = eachString; +// addedMedia += 1; +// } +// else{ +// qWarning() << "pMediaPath" << eachString; +// qWarning() << "bad idea to come here"; +// } +// } +// } + return addedMedia; +} + +// ----------------------------------------------------------------------------------------------- +UBActionPreview::UBActionPreview(QWidget *parent, const char *name):QWidget(parent) + , mpOwner(NULL) + , mpContent(NULL) +{ + setObjectName(name); + setLayout(&mLayout); + mpOwner = new QLabel(this); + mpOwner->setObjectName("UBActionPreviewOwner"); + mOwnerLayout.addWidget(mpOwner, 0); + mOwnerLayout.addStretch(1); + mLayout.addLayout(&mOwnerLayout); + mpContent = new QLabel(this); + mpContent->setObjectName("UBActionPreviewContent"); + mpContent->setWordWrap(true); + mLayout.addWidget(mpContent); + setContentsMargins(-9, -9, -9, -9); +} + +UBActionPreview::~UBActionPreview() +{ + if(NULL != mpOwner){ + delete mpOwner; + mpOwner = NULL; + } + if(NULL != mpContent){ + delete mpContent; + mpContent = NULL; + } +} + +void UBActionPreview::setOwner(const QString &owner) +{ + if(NULL != mpOwner && NULL != mpContent){ + switch(owner.toInt()){ + case eActionOwner_Teacher: + mpOwner->setText(tr("Teacher")); + mpContent->setStyleSheet("background:lightblue; border:lightblue;"); + break; + + case eActionOwner_Student: + mpOwner->setText(tr("Student")); + mpContent->setStyleSheet("background:lightgreen; border:lightgreen;"); + break; + } + } +} + +void UBActionPreview::setContent(const QString &content) +{ + if(NULL != mpContent){ + mpContent->setText(content); + } +} + +// ------------------------------------------------------------------------------------------------------------------- +UBTBPreviewContainer::UBTBPreviewContainer(QWidget *parent, const char *name):UBWidgetList(parent) +{ + setObjectName(name); +} + +UBTBPreviewContainer::~UBTBPreviewContainer() +{ + +} + +// ------------------------------------------------------------------------------------ +UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataMgr, QWidget *parent, const char *name):QWidget(parent) + , mpEditButton(NULL) + , mpTitle(NULL) + , mpDuration(NULL) + , mpActionsLabel(NULL) + , mpMediaLabel(NULL) + , mpCommentsLabel(NULL) + , mpComments(NULL) + , mpLinksLabel(NULL) + , mpContentContainer(NULL) +{ + setObjectName(name); + mpDataMgr = pDataMgr; + setLayout(&mLayout); + + setAttribute(Qt::WA_StyledBackground, true); + setStyleSheet(UBApplication::globalStyleSheet()); + + // Build the Preview widget + // Title + duration + mpTitle = new QLabel(this); + mpTitle->setObjectName("UBTeacherBarPreviewTitle"); + mpTitle->setWordWrap(true); + mpTitle->setAlignment(Qt::AlignCenter); + mpDuration = new QLabel(this); + mTitleDurationLayout.addWidget(mpTitle, 0); + mTitleDurationLayout.addWidget(mpDuration, 1); + mLayout.addLayout(&mTitleDurationLayout, 0); + + mpContentContainer = new UBTBPreviewContainer(this); + mLayout.addWidget(mpContentContainer, 1); + //mLayout.addWidget(&mMediaViewer, 1); + // The next line is disgusting. This is a quickfix that must be reworked later + mMediaViewer.setContentsMargins(-9, -9, -9, -9); + + hideElements(); + + // Edit button + mpEditButton = new QPushButton(tr("Edit infos"), this); + mpEditButton->setObjectName("DockPaletteWidgetButton"); + mEditLayout.addStretch(1); + mEditLayout.addWidget(mpEditButton, 0); + mEditLayout.addStretch(1); + mLayout.addLayout(&mEditLayout, 0); + + + connect(mpEditButton, SIGNAL(clicked()), this, SLOT(onEdit())); +} + +UBTeacherBarPreviewWidget::~UBTeacherBarPreviewWidget() +{ + DELETEPTR(mpLinksLabel); + DELETEPTR(mpComments); + DELETEPTR(mpTitle); + DELETEPTR(mpDuration); + DELETEPTR(mpActionsLabel); + DELETEPTR(mpMediaLabel); + DELETEPTR(mpCommentsLabel); + DELETEPTR(mpContentContainer); + DELETEPTR(mpEditButton); +} + +void UBTeacherBarPreviewWidget::onEdit() +{ + emit showEditMode(); +} + +void UBTeacherBarPreviewWidget::setTitle(const QString &title) +{ + if(NULL != mpTitle){ + mpTitle->setText(title); + } +} + +void UBTeacherBarPreviewWidget::setComments(const QString &comments) +{ + if("" != comments){ + mWidgets.clear(); + mpComments->setText(comments); + mpComments->setVisible(true); + mpCommentsLabel->setVisible(true); + mWidgets << mpCommentsLabel; + mMediaViewer.loadWidgets(mWidgets, false); + mWidgets.clear(); + mWidgets << mpComments; + mMediaViewer.loadWidgets(mWidgets, true); + } +} + +void UBTeacherBarPreviewWidget::clean() +{ + mMediaViewer.cleanMedia(); + + foreach(QWidget* eachWidget, mStoredWidgets){ + delete eachWidget; + eachWidget = NULL; + } + mStoredWidgets.clear(); + + hideElements(); +} + +void UBTeacherBarPreviewWidget::hideElements() +{ + mpActionsLabel = new QLabel(tr("Actions"), this); + mpActionsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpMediaLabel = new QLabel(tr("Medias"), this); + mpMediaLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpCommentsLabel = new QLabel(tr("Comments"), this); + mpCommentsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpComments = new QLabel(this); + mpComments->setWordWrap(true); + mpComments->setObjectName("UBTeacherBarPreviewComments"); + mpLinksLabel = new QLabel(tr("Links"), this); + mpLinksLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + + mpActionsLabel->setVisible(false); + mpMediaLabel->setVisible(false); + mpCommentsLabel->setVisible(false); + mpComments->setVisible(false); + mpLinksLabel->setVisible(false); +} + +void UBTeacherBarPreviewWidget::setActions(QStringList actions) +{ + if(!actions.empty()){ + mWidgets.clear(); + mpActionsLabel->setVisible(true); + mWidgets << mpActionsLabel; + mediaViewer()->loadWidgets(mWidgets,false); + mWidgets.clear(); + foreach(QString action, actions){ + QStringList desc = action.split(';'); + if(2 <= desc.size()){ + QString owner = desc.at(0); + QString act = desc.at(1); + mpTmpAction = new UBActionPreview(this); + mpTmpAction->setOwner(owner); + mpTmpAction->setContent(act); + mWidgets << mpTmpAction; + } + } + mMediaViewer.loadWidgets(mWidgets, true); + } +} + +void UBTeacherBarPreviewWidget::setLinks(QStringList links) +{ + if(!links.empty()){ + mWidgets.clear(); + mpLinksLabel->setVisible(true); + mWidgets << mpLinksLabel; + mMediaViewer.loadWidgets(mWidgets, false); + mWidgets.clear(); + foreach(QString link, links){ + mpTmpLink = new QLabel(link, this); + mpTmpLink->setOpenExternalLinks(true); + mWidgets << mpTmpLink; + } + mMediaViewer.loadWidgets(mWidgets, true); + } +} + +void UBTeacherBarPreviewWidget::loadInfos(sTeacherBarInfos *infos) +{ + if(NULL != infos){ + setTitle(infos->title); + mediaViewer()->loadMedia(infos->medias); + + // Add the comments + //setComments(); + } +} diff --git a/src/gui/UBTeacherBarPreviewWidget.h b/src/gui/UBTeacherBarPreviewWidget.h new file mode 100644 index 00000000..69f853dc --- /dev/null +++ b/src/gui/UBTeacherBarPreviewWidget.h @@ -0,0 +1,96 @@ +#ifndef UBTEACHERBARPREVIEWWIDGET_H +#define UBTEACHERBARPREVIEWWIDGET_H + +#include +#include +#include + +#include "core/UBPersistenceManager.h" +#include "customWidgets/UBWidgetList.h" +#include "UBTeacherBarDataMgr.h" + +class UBTeacherBarPreviewMedia : public QWidget +{ + Q_OBJECT +public: + UBTeacherBarPreviewMedia(QWidget* parent=0, const char* name="UBTeacherBarPreviewMedia"); + ~UBTeacherBarPreviewMedia(); + int loadMedia(QStringList pMedias); + void loadWidgets(QList pWidgetList, bool isResizable = true); + void cleanMedia(); + +private: + UBWidgetList* mWidget; + QVBoxLayout mLayout; + QMapmWidgetList; +}; + +class UBActionPreview : public QWidget +{ +public: + UBActionPreview(QWidget* parent=0, const char* name="UBActionPreview"); + ~UBActionPreview(); + void setOwner(const QString& owner); + void setContent(const QString& content); + +private: + QLabel* mpOwner; + QLabel* mpContent; + + QVBoxLayout mLayout; + QHBoxLayout mOwnerLayout; +}; + +class UBTBPreviewContainer : public UBWidgetList +{ +public: + UBTBPreviewContainer(QWidget* parent=0, const char* name="UBTBPreviewContainer"); + ~UBTBPreviewContainer(); +}; + +class UBTeacherBarPreviewWidget : public QWidget +{ + Q_OBJECT +public: + UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTeacherBarPreviewWidget"); + ~UBTeacherBarPreviewWidget(); + UBTeacherBarPreviewMedia* mediaViewer() {return &mMediaViewer;} + void setTitle(const QString& title); + void setComments(const QString& comments); + void setActions(QStringList actions); + void setLinks(QStringList links); + void clean(); + QLabel* mediaLabel() { return mpMediaLabel;} + void loadInfos(sTeacherBarInfos* infos); + +signals: + void showEditMode(); + +private slots: + void onEdit(); + +private: + void hideElements(); + + QVBoxLayout mLayout; + QHBoxLayout mEditLayout; + QHBoxLayout mTitleDurationLayout; + UBTeacherBarPreviewMedia mMediaViewer; + QList mWidgets; + QList mStoredWidgets; + + QPushButton* mpEditButton; + QLabel* mpTitle; + QLabel* mpDuration; + QLabel* mpActionsLabel; + QLabel* mpMediaLabel; + QLabel* mpCommentsLabel; + QLabel* mpComments; + QLabel* mpLinksLabel; + QLabel* mpTmpLink; + UBActionPreview* mpTmpAction; + UBTBPreviewContainer* mpContentContainer; + UBTeacherBarDataMgr* mpDataMgr; +}; + +#endif // UBTEACHERBARPREVIEWWIDGET_H diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 6201f0d1..0ac3107d 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -13,8 +13,6 @@ #include "gui/UBMediaPlayer.h" -#include "frameworks/UBFileSystemUtils.h" - #include "customWidgets/UBDraggableLabel.h" #include "customWidgets/UBMediaWidget.h" #include "customWidgets/UBGlobals.h" @@ -22,34 +20,15 @@ #include "core/memcheck.h" UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDockPaletteWidget(parent) - , mpLayout(NULL) - , mpTitleLayout(NULL) - , mpTitleLabel(NULL) - , mpTitle(NULL) - , mpMediaLabel(NULL) - , mpContainer(NULL) - , mpContainerLayout(NULL) - , mpActionLabel(NULL) - , mpActions(NULL) - , mpActionButton(NULL) - , mpActionLayout(NULL) - , mpCommentLabel(NULL) - , mpComments(NULL) - , mpLinkLabel(NULL) - , mpLinks(NULL) - , mpLinkButton(NULL) - , mpLinkLayout(NULL) , mpStackWidget(NULL) , mpPreview(NULL) - , mpMediaContainer(NULL) , mpDocPreviewWidget(NULL) , mpDocEditWidget(NULL) -{ + { setObjectName(name); mName = "TeacherBarWidget"; mVisibleState = true; - mActionList.clear(); - mUrlList.clear(); + mData.clearLists(); setAttribute(Qt::WA_StyledBackground, true); setStyleSheet(UBApplication::globalStyleSheet()); @@ -58,110 +37,35 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mIconToRight = QPixmap(":images/teacher_close.png"); // Create the GUI - mpContainerLayout = new QVBoxLayout(this); - setLayout(mpContainerLayout); - - mpContainer = new QWidget(this); - mpContainer->setObjectName("DockPaletteWidgetBox"); + setLayout(&mLayout); - mpPreview = new UBTeacherBarPreviewWidget(this); - mpDocPreviewWidget = new UBTBDocumentPreviewWidget(this); - mpDocEditWidget = new UBTBDocumentEditWidget(this); + mpPageEditWidget = new UBTBPageEditWidget(&mData, this); + mpPreview = new UBTeacherBarPreviewWidget(&mData, this); + mpDocPreviewWidget = new UBTBDocumentPreviewWidget(&mData, this); + mpDocEditWidget = new UBTBDocumentEditWidget(&mData, this); mpStackWidget = new QStackedWidget(this); - mpContainerLayout->addWidget(mpStackWidget); - mpStackWidget->addWidget(mpContainer); + mLayout.addWidget(mpStackWidget); + mpStackWidget->addWidget(mpPageEditWidget); mpStackWidget->addWidget(mpPreview); mpStackWidget->addWidget(mpDocPreviewWidget); mpStackWidget->addWidget(mpDocEditWidget); - mpLayout = new QVBoxLayout(mpContainer); - mpContainer->setLayout(mpLayout); - - // Title - mpTitleLabel = new QLabel(tr("Title"), mpContainer); - mpTitle = new QLineEdit(mpContainer); - mpTitle->setObjectName("DockPaletteWidgetLineEdit"); - connect(mpTitle, SIGNAL(textChanged(const QString&)), this, SLOT(onTitleTextChanged(const QString&))); - mpLayout->addWidget(mpTitleLabel, 0); - mpLayout->addWidget(mpTitle, 0); - - // Actions - mpActionLabel = new QLabel(tr("Actions"), mpContainer); - mpLayout->addWidget(mpActionLabel, 0); - mpActions = new UBWidgetList(mpContainer); - mpActions->setEmptyText(tr("Add actions")); - mpLayout->addWidget(mpActions, 1); - mpActionButton = new QPushButton(mpContainer); - mpActionButton->setObjectName("DockPaletteWidgetButton"); - mpActionButton->setText(tr("Add action")); - mpActionLayout = new QHBoxLayout(); - mpActionLayout->addWidget(mpActionButton, 0); - mpActionLayout->addStretch(1); - mpLayout->addLayout(mpActionLayout, 0); - - // Media - mpMediaLabel = new QLabel(tr("Medias"), mpContainer); - mpLayout->addWidget(mpMediaLabel, 0); - mpMediaContainer = new UBTBMediaContainer(this); - mpMediaContainer->setEmptyText(tr("Drop media here")); - mpLayout->addWidget(mpMediaContainer, 1); - - // Links - mpLinkLabel = new QLabel(tr("Links"), mpContainer); - mpLayout->addWidget(mpLinkLabel, 0); - mpLinks = new UBWidgetList(mpContainer); - mpLayout->addWidget(mpLinks, 1); - mpLinkButton = new QPushButton(tr("Add link"), mpContainer); - mpLinkButton->setObjectName("DockPaletteWidgetButton"); - mpLinkLayout = new QHBoxLayout(); - mpLinkLayout->addWidget(mpLinkButton, 0); - mpLinkLayout->addStretch(1); - mpLayout->addLayout(mpLinkLayout, 0); - - // Comments - mpCommentLabel = new QLabel(tr("Comments"), mpContainer); - mpLayout->addWidget(mpCommentLabel, 0); - mpComments = new QTextEdit(this); - mpComments->setObjectName("DockPaletteWidgetBox"); - mpComments->setStyleSheet("background:white;"); - mpLayout->addWidget(mpComments, 1); - connect(UBApplication::boardController, SIGNAL(activeSceneWillChange()), this, SLOT(saveContent())); connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(loadContent())); connect(UBApplication::mainWindow->actionQuit, SIGNAL(triggered()), this, SLOT(saveContent())); - connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); - connect(mpActionButton, SIGNAL(clicked()), this, SLOT(onActionButton())); - connect(mpLinkButton, SIGNAL(clicked()), this, SLOT(onLinkButton())); + connect(mpPreview, SIGNAL(showEditMode()), this, SLOT(onShowEditMode())); - connect(mpMediaContainer, SIGNAL(mediaDropped(QString)), this, SLOT(onMediaDropped(QString))); - connect(mpDocPreviewWidget, SIGNAL(onEditClicked()), this, SLOT(onTBStateChanged(eTeacherBarState))); - connect(mpDocPreviewWidget, SIGNAL(onPageViewClicked()), this, SLOT(onTBStateChanged(eTeacherBarState))); - connect(mpDocEditWidget, SIGNAL(onPageViewClicked()), this, SLOT(onTBStateChanged(eTeacherBarState))); - connect(mpDocEditWidget, SIGNAL(onPreviewClicked()), this, SLOT(onTBStateChanged(eTeacherBarState))); + connect(mpDocPreviewWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState))); + connect(mpDocEditWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState))); + connect(mpPageEditWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState))); } UBTeacherBarWidget::~UBTeacherBarWidget() { DELETEPTR(mpDocPreviewWidget); DELETEPTR(mpDocEditWidget); - DELETEPTR(mpMediaContainer); - DELETEPTR(mpComments); - DELETEPTR(mpCommentLabel); - DELETEPTR(mpLinks); - DELETEPTR(mpLinkLabel); - DELETEPTR(mpLinkButton); - DELETEPTR(mpLinkLayout); - DELETEPTR(mpMediaLabel); - DELETEPTR(mpActionButton); - DELETEPTR(mpActionLayout); - DELETEPTR(mpActionLabel); - DELETEPTR(mpTitleLabel); - DELETEPTR(mpTitle); - DELETEPTR(mpTitleLayout); - DELETEPTR(mpLayout); - DELETEPTR(mpContainer); - DELETEPTR(mpContainerLayout); + DELETEPTR(mpPageEditWidget); DELETEPTR(mpPreview); DELETEPTR(mpStackWidget); } @@ -185,199 +89,114 @@ void UBTeacherBarWidget::onValueChanged() void UBTeacherBarWidget::saveContent() { sTeacherBarInfos infos; - // Title - infos.title = mpTitle->text(); - - // Actions - for(int i=0; icomboValue()).arg(mActionList.at(i)->text()); - } - // Media - foreach(QString media, mpMediaContainer->mediaUrls()){ - infos.medias << media; - } - - // Links - for(int j=0; jurl()){ - infos.urls << mUrlList.at(j)->url(); - } - } - // Comments - infos.comments = mpComments->document()->toPlainText(); - + mpPageEditWidget->saveInfos(&infos); UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos); } void UBTeacherBarWidget::loadContent() { - clearWidgetLists(); - sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); - // Title - mpTitle->setText(nextInfos.title); - - // Actions - for(int i=0; i= 2){ - UBTeacherStudentAction* pAction = new UBTeacherStudentAction(mpContainer); - pAction->setComboValue(qslAction.at(0).toInt()); - pAction->setText(qslAction.at(1)); - mActionList << pAction; - mpActions->addWidget(pAction); - } - } - // Media - foreach(QString url, nextInfos.medias){ - if("" != url){ - QWidget* pMedia = mpMediaContainer->generateMediaWidget(url); - if(NULL != pMedia){ - mMediaList << pMedia; - mpMediaContainer->addWidget(pMedia); - } - } - } - - // Links - for(int j=0; jsetUrl(qsUrl); - mUrlList << pLink; - mpLinks->addWidget(pLink); - } - } - // Comments - if(NULL != mpComments){ - mpComments->document()->setPlainText(nextInfos.comments); - } - - mpPreview->mediaViewer()->cleanMedia(); - - if(!isEmpty()){ - // Update the fields of the preview widget - mpPreview->setTitle(mpTitle->text()); - mpPreview->mediaViewer()->loadMedia(nextInfos.medias); - - mpStackWidget->setCurrentWidget(mpPreview); - mpPreview->clean(); - - // Add the actions - if(!mActionList.empty()){ - QStringList actions; - foreach(UBTeacherStudentAction* action, mActionList){ - QString desc = QString("%0;%1").arg(action->comboValue()).arg(action->text()); - actions << desc; - } - mpPreview->setActions(actions); - } - - // Add the media - if(nextInfos.medias.count() > 0){ - QList widgetList; - widgetList.append(mpPreview->mediaLabel()); - mpPreview->mediaViewer()->loadWidgets(widgetList,false); - int loadedMedia = mpPreview->mediaViewer()->loadMedia(nextInfos.medias); - if(loadedMedia) - mpPreview->mediaLabel()->setVisible(true); - } - - - // Add the links - if(!mUrlList.empty()){ - QStringList links; - foreach(UBUrlWidget* url, mUrlList){ - QStringList list = url->url().split(";"); - QString formedlink = "" + list.at(1) + ""; - links << formedlink; - } - mpPreview->setLinks(links); - } - - // Add the comments - mpPreview->setComments(mpComments->document()->toPlainText()); - } - else{ - mpStackWidget->setCurrentWidget(mpContainer); - } - - +// clearWidgetLists(); +// sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); + +// mpPageEditWidget->loadInfos(&nextInfos); +// mpPreview->mediaViewer()->cleanMedia(); + +// if(!isEmpty()){ +// // Update the fields of the preview widget +// onTBStateChanged(eTeacherBarState_PagePreview); +// mpPreview->clean(); +// mpPreview->loadInfos(&nextInfos); + +// // Add the actions +// if(!mActionList.empty()){ +// QStringList actions; +// foreach(UBTeacherStudentAction* action, mActionList){ +// QString desc = QString("%0;%1").arg(action->comboValue()).arg(action->text()); +// actions << desc; +// } +// mpPreview->setActions(actions); +// } + +// // Add the media +// if(nextInfos.medias.count() > 0){ +// QList widgetList; +// widgetList.append(mpPreview->mediaLabel()); +// mpPreview->mediaViewer()->loadWidgets(widgetList,false); +// int loadedMedia = mpPreview->mediaViewer()->loadMedia(nextInfos.medias); +// if(loadedMedia) +// mpPreview->mediaLabel()->setVisible(true); +// } + + +// // Add the links +// if(!mUrlList.empty()){ +// QStringList links; +// foreach(UBUrlWidget* url, mUrlList){ +// QStringList list = url->url().split(";"); +// QString formedlink = "" + list.at(1) + ""; +// links << formedlink; +// } +// mpPreview->setLinks(links); +// } +// } +// else{ +// // If the document has only one page, show the document edit page +// if(1 == UBApplication::boardController->activeDocument()->pageCount()){ +// onTBStateChanged(eTeacherBarState_DocumentEdit); +// }else{ +// onTBStateChanged(eTeacherBarState_PageEdit); +// } +// } } bool UBTeacherBarWidget::isEmpty() { - return mpTitle->text() == "" && - mpLinks->empty() && - mpActions->empty() && - mpMediaContainer->empty() && - mpComments->document()->toPlainText() == ""; + return mData.pageTitle() == "" && + mData.urls().empty() && + mData.actions().empty() && + mData.medias().empty() && + mData.comments() == ""; } void UBTeacherBarWidget::onTitleTextChanged(const QString& text) { - mpTitle->setToolTip(text); -} - -void UBTeacherBarWidget::onActionButton() -{ - UBTeacherStudentAction* pAction = new UBTeacherStudentAction(mpContainer); - mActionList << pAction; - mpActions->addWidget(pAction); -} - -void UBTeacherBarWidget::onLinkButton() -{ - UBUrlWidget* pUrl = new UBUrlWidget(mpContainer); - mUrlList << pUrl; - mpLinks->addWidget(pUrl); + //mpTitle->setToolTip(text); } void UBTeacherBarWidget::clearWidgetLists() { - if(NULL != mpMediaContainer){ - for(int i=0; iremoveWidget(mMediaList.at(i)); - delete mMediaList.at(i); - } - mMediaList.clear(); - mpMediaContainer->cleanMedias(); - } - - if(NULL != mpActions){ - for(int i=0; iremoveWidget(mActionList.at(i)); - delete mActionList.at(i); - } - mActionList.clear(); - } - - if(NULL != mpLinks){ - for(int i=0; iremoveWidget(mUrlList.at(i)); - delete mUrlList.at(i); - } - mUrlList.clear(); - } +// if(NULL != mpMediaContainer){ +// for(int i=0; iremoveWidget(mMediaList.at(i)); +// delete mMediaList.at(i); +// } +// mMediaList.clear(); +// mpMediaContainer->cleanMedias(); +// } + +// if(NULL != mpActions){ +// for(int i=0; iremoveWidget(mActionList.at(i)); +// delete mActionList.at(i); +// } +// mActionList.clear(); +// } + +// if(NULL != mpLinks){ +// for(int i=0; iremoveWidget(mUrlList.at(i)); +// delete mUrlList.at(i); +// } +// mUrlList.clear(); +// } } void UBTeacherBarWidget::onShowEditMode() { - mpStackWidget->setCurrentWidget(mpContainer); -} - -void UBTeacherBarWidget::onMediaDropped(const QString &url) -{ - if("" != url){ - QWidget* pMedia = mpMediaContainer->generateMediaWidget(url); - if(NULL != pMedia){ - mMediaList << pMedia; - mpMediaContainer->addWidget(pMedia); - } - } + mpStackWidget->setCurrentWidget(mpPageEditWidget); } void UBTeacherBarWidget::onTBStateChanged(eTeacherBarState state) @@ -390,7 +209,7 @@ void UBTeacherBarWidget::onTBStateChanged(eTeacherBarState state) mpStackWidget->setCurrentWidget(mpDocPreviewWidget); break; case eTeacherBarState_PageEdit: - mpStackWidget->setCurrentWidget(mpContainer); + mpStackWidget->setCurrentWidget(mpPageEditWidget); break; case eTeacherBarState_PagePreview: mpStackWidget->setCurrentWidget(mpPreview); @@ -398,668 +217,3 @@ void UBTeacherBarWidget::onTBStateChanged(eTeacherBarState state) } } -// --------------------------------------------------------------------------------------------- -UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) - , mpText(NULL) - , mpLayout(NULL) - , mpComboLayout(NULL) - , mpCombo(NULL) -{ - setObjectName(name); - - setAttribute(Qt::WA_StyledBackground, true); - setStyleSheet(UBApplication::globalStyleSheet()); - - // Create the GUI - mpLayout = new QHBoxLayout(this); - setLayout(mpLayout); - - mpComboLayout = new QVBoxLayout(); - - mpCombo = new QComboBox(this); - mpCombo->setObjectName("DockPaletteWidgetComboBox"); - mpCombo->setMinimumWidth(80); - mpCombo->addItem(tr("Teacher")); - mpCombo->addItem(tr("Student")); - mpComboLayout->addWidget(mpCombo, 0); - mpComboLayout->addStretch(1); - - mpLayout->addLayout(mpComboLayout, 0); - - mpText = new QTextEdit(this); - mpText->setObjectName("DockPaletteWidgetBox"); - mpText->setStyleSheet("background:white;"); - - mpLayout->addWidget(mpText, 1); - -} - -UBTeacherStudentAction::~UBTeacherStudentAction() -{ - DELETEPTR(mpCombo); - DELETEPTR(mpText); - DELETEPTR(mpComboLayout); - DELETEPTR(mpLayout); -} - -QString UBTeacherStudentAction::text() -{ - QString str; - if(NULL != mpText){ - str = mpText->document()->toPlainText(); - } - return str; -} - -QString UBTeacherStudentAction::comboValue() -{ - QString str; - - if(NULL != mpCombo){ - str = QString("%0").arg(mpCombo->currentIndex()); - } - - return str; -} - -void UBTeacherStudentAction::setComboValue(int value) -{ - if(NULL != mpCombo){ - mpCombo->setCurrentIndex(value); - } -} - -void UBTeacherStudentAction::setText(const QString& text) -{ - if(NULL != mpText){ - mpText->document()->setPlainText(text); - } -} - -// --------------------------------------------------------------------------------------------- -UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) - , mpLayout(NULL) - , mpUrlLabel(NULL) - , mpUrl(NULL) -{ - setObjectName(name); - setAttribute(Qt::WA_StyledBackground, true); - setStyleSheet(UBApplication::globalStyleSheet()); - - mpLayout = new QVBoxLayout(this); - setLayout(mpLayout); - - mpLabelLayout = new QHBoxLayout(this); - mpUrlLabel = new QLabel(tr("Url"), this); - mpLabelLayout->addWidget(mpUrlLabel, 0); - mpUrl = new QLineEdit(this); - mpUrl->setObjectName("DockPaletteWidgetLineEdit"); - mpUrl->setMinimumHeight(20); - mpLabelLayout->addWidget(mpUrl, 1); - - mpTitleLayout = new QHBoxLayout(this); - mpTitleLabel = new QLabel(tr("Title"),this); - mpTitleLayout->addWidget(mpTitleLabel,0); - mpTitle = new QLineEdit(this); - mpTitle->setObjectName("DockPaletteWidgetLineEdit"); - mpTitle->setMinimumHeight(20); - mpTitleLayout->addWidget(mpTitle,1); - - mpLayout->addLayout(mpTitleLayout); - mpLayout->addLayout(mpLabelLayout); -} - -UBUrlWidget::~UBUrlWidget() -{ - DELETEPTR(mpTitle); - DELETEPTR(mpTitleLabel); - DELETEPTR(mpUrlLabel); - DELETEPTR(mpUrl); - DELETEPTR(mpTitleLayout); - DELETEPTR(mpLabelLayout); - DELETEPTR(mpLayout); -} - -QString UBUrlWidget::url() -{ - QString str; - - if(NULL != mpUrl){ - str = mpUrl->text() + ";" + mpTitle->text(); - } - - return str; -} - -void UBUrlWidget::setUrl(const QString &url) -{ - QStringList list = url.split(";"); - if(NULL != mpUrl){ - mpUrl->setText(list.at(0)); - mpTitle->setText(list.at(1)); - } -} - -// ------------------------------------------------------------------------------------ -UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(QWidget *parent, const char *name):QWidget(parent) - , mpEditButton(NULL) - , mpTitle(NULL) - , mpDuration(NULL) - , mpActionsLabel(NULL) - , mpMediaLabel(NULL) - , mpCommentsLabel(NULL) - , mpComments(NULL) - , mpLinksLabel(NULL) - , mpContentContainer(NULL) -{ - setObjectName(name); - - setLayout(&mLayout); - - setAttribute(Qt::WA_StyledBackground, true); - setStyleSheet(UBApplication::globalStyleSheet()); - - // Build the Preview widget - // Title + duration - mpTitle = new QLabel(this); - mpTitle->setObjectName("UBTeacherBarPreviewTitle"); - mpTitle->setWordWrap(true); - mpTitle->setAlignment(Qt::AlignCenter); - mpDuration = new QLabel(this); - mTitleDurationLayout.addWidget(mpTitle, 0); - mTitleDurationLayout.addWidget(mpDuration, 1); - mLayout.addLayout(&mTitleDurationLayout, 0); - - mpContentContainer = new UBTBPreviewContainer(this); - mLayout.addWidget(mpContentContainer, 1); - //mLayout.addWidget(&mMediaViewer, 1); - // The next line is disgusting. This is a quickfix that must be reworked later - mMediaViewer.setContentsMargins(-9, -9, -9, -9); - - hideElements(); - - // Edit button - mpEditButton = new QPushButton(tr("Edit infos"), this); - mpEditButton->setObjectName("DockPaletteWidgetButton"); - mEditLayout.addStretch(1); - mEditLayout.addWidget(mpEditButton, 0); - mEditLayout.addStretch(1); - mLayout.addLayout(&mEditLayout, 0); - - - connect(mpEditButton, SIGNAL(clicked()), this, SLOT(onEdit())); -} - -UBTeacherBarPreviewWidget::~UBTeacherBarPreviewWidget() -{ - DELETEPTR(mpLinksLabel); - DELETEPTR(mpComments); - DELETEPTR(mpTitle); - DELETEPTR(mpDuration); - DELETEPTR(mpActionsLabel); - DELETEPTR(mpMediaLabel); - DELETEPTR(mpCommentsLabel); - DELETEPTR(mpContentContainer); - DELETEPTR(mpEditButton); -} - -void UBTeacherBarPreviewWidget::onEdit() -{ - emit showEditMode(); -} - -void UBTeacherBarPreviewWidget::setTitle(const QString &title) -{ - if(NULL != mpTitle){ - mpTitle->setText(title); - } -} - -void UBTeacherBarPreviewWidget::setDuration(eDuration duration) -{ - if(NULL != mpDuration){ - QPixmap p; - switch(duration){ - case eDuration_Quarter: - p = QPixmap(":images/duration1.png"); - break; - case eDuration_Half: - p = QPixmap(":images/duration2.png"); - break; - case eDuration_ThreeQuarter: - p = QPixmap(":images/duration3.png"); - break; - default: - break; - } - mpDuration->setPixmap(p.scaledToHeight(16, Qt::SmoothTransformation)); - } -} - -void UBTeacherBarPreviewWidget::setComments(const QString &comments) -{ - if("" != comments){ - mWidgets.clear(); - mpComments->setText(comments); - mpComments->setVisible(true); - mpCommentsLabel->setVisible(true); - mWidgets << mpCommentsLabel; - mMediaViewer.loadWidgets(mWidgets, false); - mWidgets.clear(); - mWidgets << mpComments; - mMediaViewer.loadWidgets(mWidgets, true); - } -} - -void UBTeacherBarPreviewWidget::clean() -{ - mMediaViewer.cleanMedia(); - - foreach(QWidget* eachWidget, mStoredWidgets){ - delete eachWidget; - eachWidget = NULL; - } - mStoredWidgets.clear(); - - hideElements(); -} - -void UBTeacherBarPreviewWidget::hideElements() -{ - mpActionsLabel = new QLabel(tr("Actions"), this); - mpActionsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - mpMediaLabel = new QLabel(tr("Medias"), this); - mpMediaLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - mpCommentsLabel = new QLabel(tr("Comments"), this); - mpCommentsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - mpComments = new QLabel(this); - mpComments->setWordWrap(true); - mpComments->setObjectName("UBTeacherBarPreviewComments"); - mpLinksLabel = new QLabel(tr("Links"), this); - mpLinksLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - - mpActionsLabel->setVisible(false); - mpMediaLabel->setVisible(false); - mpCommentsLabel->setVisible(false); - mpComments->setVisible(false); - mpLinksLabel->setVisible(false); -} - -void UBTeacherBarPreviewWidget::setActions(QStringList actions) -{ - if(!actions.empty()){ - mWidgets.clear(); - mpActionsLabel->setVisible(true); - mWidgets << mpActionsLabel; - mediaViewer()->loadWidgets(mWidgets,false); - mWidgets.clear(); - foreach(QString action, actions){ - QStringList desc = action.split(';'); - if(2 <= desc.size()){ - QString owner = desc.at(0); - QString act = desc.at(1); - mpTmpAction = new UBActionPreview(this); - mpTmpAction->setOwner(owner); - mpTmpAction->setContent(act); - mWidgets << mpTmpAction; - } - } - mMediaViewer.loadWidgets(mWidgets, true); - } -} - -void UBTeacherBarPreviewWidget::setLinks(QStringList links) -{ - if(!links.empty()){ - mWidgets.clear(); - mpLinksLabel->setVisible(true); - mWidgets << mpLinksLabel; - mMediaViewer.loadWidgets(mWidgets, false); - mWidgets.clear(); - foreach(QString link, links){ - mpTmpLink = new QLabel(link, this); - mpTmpLink->setOpenExternalLinks(true); - mWidgets << mpTmpLink; - } - mMediaViewer.loadWidgets(mWidgets, true); - } -} - -// ------------------------------------------------------------------------------------ -UBTeacherBarPreviewMedia::UBTeacherBarPreviewMedia(QWidget* parent, const char* name) : QWidget(parent) -{ - setObjectName(name); - mWidget = new UBWidgetList(parent); - mLayout.addWidget(mWidget); - setLayout(&mLayout); - mWidgetList.clear(); -} - -UBTeacherBarPreviewMedia::~UBTeacherBarPreviewMedia() -{ - DELETEPTR(mWidget); -} - -void UBTeacherBarPreviewMedia::cleanMedia() -{ - foreach(QWidget* eachWidget, mWidgetList.keys()){ - if(QString(eachWidget->metaObject()->className()).contains("UBDraggable")){ - mWidget->removeWidget(eachWidget); - delete eachWidget; - eachWidget = NULL; - } - else{ - mWidget->removeWidget(eachWidget); - } - } - mWidgetList.clear(); -} - -void UBTeacherBarPreviewMedia::loadWidgets(QList pWidgetsList, bool isResizable) -{ - foreach(QWidget*eachWidget, pWidgetsList){ - mWidget->addWidget(eachWidget); - mWidgetList[eachWidget]="DRAG UNAVAILABLE"; - } -} - - -int UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) -{ - int addedMedia = 0; - foreach(QString eachString, pMedias){ - if(!eachString.isEmpty()){ - QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(eachString); - if(mimeType.contains("image")){ - UBDraggableLabel* label = new UBDraggableLabel(); - label->loadImage(eachString); - mWidget->addWidget(label); - mWidgetList[label]=eachString; - addedMedia += 1; - } - else if(mimeType.contains("video") || mimeType.contains("audio")){ - UBDraggableMediaPlayer* mediaPlayer = new UBDraggableMediaPlayer(); - mediaPlayer->setFile(eachString); - mWidget->addWidget(mediaPlayer); - mWidgetList[mediaPlayer] = eachString; - addedMedia += 1; - } - else{ - qWarning() << "pMediaPath" << eachString; - qWarning() << "bad idea to come here"; - } - } - } - return addedMedia; -} - -// ----------------------------------------------------------------------------------------------- -UBActionPreview::UBActionPreview(QWidget *parent, const char *name):QWidget(parent) - , mpOwner(NULL) - , mpContent(NULL) -{ - setObjectName(name); - setLayout(&mLayout); - mpOwner = new QLabel(this); - mpOwner->setObjectName("UBActionPreviewOwner"); - mOwnerLayout.addWidget(mpOwner, 0); - mOwnerLayout.addStretch(1); - mLayout.addLayout(&mOwnerLayout); - mpContent = new QLabel(this); - mpContent->setObjectName("UBActionPreviewContent"); - mpContent->setWordWrap(true); - mLayout.addWidget(mpContent); - setContentsMargins(-9, -9, -9, -9); -} - -UBActionPreview::~UBActionPreview() -{ - if(NULL != mpOwner){ - delete mpOwner; - mpOwner = NULL; - } - if(NULL != mpContent){ - delete mpContent; - mpContent = NULL; - } -} - -void UBActionPreview::setOwner(const QString &owner) -{ - if(NULL != mpOwner && NULL != mpContent){ - switch(owner.toInt()){ - case eActionOwner_Teacher: - mpOwner->setText(tr("Teacher")); - mpContent->setStyleSheet("background:lightblue; border:lightblue;"); - break; - - case eActionOwner_Student: - mpOwner->setText(tr("Student")); - mpContent->setStyleSheet("background:lightgreen; border:lightgreen;"); - break; - } - } -} - -void UBActionPreview::setContent(const QString &content) -{ - if(NULL != mpContent){ - mpContent->setText(content); - } -} - -// ------------------------------------------------------------------------------------------------------------------------------------ -UBTBMediaContainer::UBTBMediaContainer(QWidget *parent, const char *name) : UBWidgetList(parent) -{ - setObjectName(name); - setAcceptDrops(true); -} - -UBTBMediaContainer::~UBTBMediaContainer() -{ - -} - -void UBTBMediaContainer::dropEvent(QDropEvent* pEvent) -{ - QPixmap pixFromDropEvent; - QString mimeType; - QString resourcePath; - if(pEvent->mimeData()->hasText()){ - resourcePath = pEvent->mimeData()->text(); - } - else if(pEvent->mimeData()->hasUrls()){ - resourcePath = pEvent->mimeData()->urls().at(0).toLocalFile(); - } - else if(pEvent->mimeData()->hasImage()){ - pixFromDropEvent.loadFromData(pEvent->mimeData()->imageData().toByteArray()); - if(!pixFromDropEvent.isNull()) - mimeType = "image"; - } - - if (mimeType.isEmpty() && resourcePath.isEmpty()){ - pEvent->acceptProposedAction(); - return; - } - if(!resourcePath.isEmpty()){ - emit mediaDropped(resourcePath); - pEvent->acceptProposedAction(); - } -} - -void UBTBMediaContainer::dragEnterEvent(QDragEnterEvent* pEvent) -{ - pEvent->acceptProposedAction(); -} - -void UBTBMediaContainer::dragMoveEvent(QDragMoveEvent* pEvent) -{ - pEvent->acceptProposedAction(); -} - -void UBTBMediaContainer::dragLeaveEvent(QDragLeaveEvent* pEvent) -{ - pEvent->accept(); -} - -void UBTBMediaContainer::addMedia(const QString& mediaPath) -{ - if(!mediaPath.isEmpty()) - mMediaList.append(mediaPath); - else - qWarning() << __FUNCTION__ << "empty path"; - - QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(mediaPath); - if(mimeType.contains("image")){ - QPixmap pix = QPixmap(mediaPath); - QLabel* label = new QLabel(); - label->setPixmap(pix); - label->setScaledContents(true); - addWidget(label); - } - else if(mimeType.contains("video") || mimeType.contains("audio")){ - UBMediaPlayer* mediaPlayer = new UBMediaPlayer(); - mediaPlayer->setFile(mediaPath); - addWidget(mediaPlayer); - } - else{ - qWarning() << "pMediaPath" << mediaPath; - qWarning() << "bad idea to come here"; - } -} - -QStringList UBTBMediaContainer::mediaUrls() -{ - return mMediaList; -} - -void UBTBMediaContainer::cleanMedias() -{ - mMediaList.clear(); -} - -QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url) -{ - QWidget* pW = NULL; - - if(!url.isEmpty()) - mMediaList.append(url); - else - qWarning() << __FUNCTION__ << "empty path"; - - QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(url); - if(mimeType.contains("image")){ - QPixmap pix = QPixmap(url); - QLabel* label = new QLabel(); - pix.scaledToWidth(label->width()); - label->resize(pix.width(), pix.height()); - label->setPixmap(pix); - label->setScaledContents(true); - pW = label; - } - else if(mimeType.contains("video") || mimeType.contains("audio")){ - UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); - mediaPlayer->setFile(url); - pW = mediaPlayer; - } - else{ - qWarning() << "pMediaPath" << url; - qWarning() << "bad idea to come here"; - } - - return pW; -} - -// ------------------------------------------------------------------------------------------------------------------- -UBTBPreviewContainer::UBTBPreviewContainer(QWidget *parent, const char *name):UBWidgetList(parent) -{ - setObjectName(name); -} - -UBTBPreviewContainer::~UBTBPreviewContainer() -{ - -} - -// ------------------------------------------------------------------------------------------------------------------- -UBTBDocumentEditWidget::UBTBDocumentEditWidget(QWidget *parent, const char *name):QWidget(parent) - , mpPageViewButton(NULL) - , mpPreviewButton(NULL) - , mpTitleLabel(NULL) - , mpTitle(NULL) - , mpTargetLabel(NULL) - , mpTarget(NULL) - , mpMetadataLabel(NULL) - , mpLicenseLabel(NULL) -{ - setObjectName(name); - setLayout(&mLayout); - - mpPageViewButton = new QPushButton(tr("Page View"), this); - mPageLayout.addStretch(1); - mPageLayout.addWidget(mpPageViewButton, 0); - mPageLayout.addStretch(1); - mLayout.addLayout(&mPageLayout); - - mpTitleLabel = new QLabel(tr("Session Title:"), this); - mpTitleLabel->setAlignment(Qt::AlignLeft); - mLayout.addWidget(mpTitleLabel); - mpTitle = new QLineEdit(this); - mLayout.addWidget(mpTitle); - - - mpPreviewButton = new QPushButton(tr("Preview"), this); - mPreviewLayout.addStretch(1); - mPreviewLayout.addWidget(mpPreviewButton, 0); - mPreviewLayout.addStretch(1); - mLayout.addLayout(&mPreviewLayout); - - connect(mpPageViewButton, SIGNAL(clicked()), this, SIGNAL(onPageViewClicked())); - connect(mpPreviewButton, SIGNAL(clicked()), this, SIGNAL(onPreviewClicked())); -} - -UBTBDocumentEditWidget::~UBTBDocumentEditWidget() -{ - DELETEPTR(mpTitleLabel); - DELETEPTR(mpTitle); - DELETEPTR(mpTargetLabel); - DELETEPTR(mpTarget); - DELETEPTR(mpMetadataLabel); - DELETEPTR(mpLicenseLabel); - DELETEPTR(mpPageViewButton); - DELETEPTR(mpPreviewButton); -} - -// ------------------------------------------------------------------------------------------------------------------- -UBTBDocumentPreviewWidget::UBTBDocumentPreviewWidget(QWidget *parent, const char *name):QWidget(parent) - , mpPageViewButton(NULL) - , mpEditButton(NULL) -{ - setObjectName(name); - setLayout(&mLayout); - - mpPageViewButton = new QPushButton(tr("Page View"), this); - mPageLayout.addStretch(1); - mPageLayout.addWidget(mpPageViewButton, 0); - mPageLayout.addStretch(1); - mLayout.addLayout(&mPageLayout); - - // TODO : Add the elements here - - mpEditButton = new QPushButton(tr("Edit"), this); - mPreviewLayout.addStretch(1); - mPreviewLayout.addWidget(mpEditButton, 0); - mPreviewLayout.addStretch(1); - mLayout.addLayout(&mPreviewLayout); - - connect(mpPageViewButton, SIGNAL(clicked()), this, SIGNAL(onPageViewClicked())); - connect(mpEditButton, SIGNAL(clicked()), this, SIGNAL(onEditClicked())); -} - -UBTBDocumentPreviewWidget::~UBTBDocumentPreviewWidget() -{ - DELETEPTR(mpPageViewButton); - DELETEPTR(mpEditButton); -} - - diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index ee74c7bc..ec486074 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -1,8 +1,6 @@ #ifndef UBTEACHERBARWIDGET_H #define UBTEACHERBARWIDGET_H -class UBMediaPlayer; - #include #include #include @@ -19,220 +17,14 @@ class UBMediaPlayer; #include "UBDockPaletteWidget.h" #include "customWidgets/UBWidgetList.h" #include "interfaces/IDropable.h" +#include "UBTeacherBarDataMgr.h" +#include "UBTBDocumentPreviewWidget.h" +#include "UBTBPageEditWidget.h" +#include "UBTeacherBarPreviewWidget.h" +#include "UBTBDocumentEditWidget.h" #define LABEL_MINWIDHT 80 -typedef enum{ - eTeacherBarState_DocumentEdit, - eTeacherBarState_DocumentPreview, - eTeacherBarState_PageEdit, - eTeacherBarState_PagePreview -}eTeacherBarState; - -typedef enum{ - eDuration_Quarter, - eDuration_Half, - eDuration_ThreeQuarter -}eDuration; - -typedef enum{ - eActionOwner_Teacher, - eActionOwner_Student -}eActionOwner; - -class UBTeacherStudentAction : public QWidget -{ - Q_OBJECT - -public: - UBTeacherStudentAction(QWidget* parent=0, const char* name="UBTeacherStudentAction"); - ~UBTeacherStudentAction(); - QString comboValue(); - QString text(); - void setComboValue(int value); - void setText(const QString& text); - -private: - QTextEdit* mpText; - QHBoxLayout* mpLayout; - QVBoxLayout* mpComboLayout; - QComboBox* mpCombo; -}; - -class UBTeacherBarPreviewMedia : public QWidget -{ - Q_OBJECT -public: - UBTeacherBarPreviewMedia(QWidget* parent=0, const char* name="UBTeacherBarPreviewMedia"); - ~UBTeacherBarPreviewMedia(); - int loadMedia(QStringList pMedias); - void loadWidgets(QList pWidgetList, bool isResizable = true); - void cleanMedia(); - -private: - UBWidgetList* mWidget; - QVBoxLayout mLayout; - QMapmWidgetList; -}; - -class UBUrlWidget : public QWidget -{ -public: - UBUrlWidget(QWidget* parent=0, const char* name="UBUrlWidget"); - ~UBUrlWidget(); - - QString url(); - void setUrl(const QString& url); - -private: - QVBoxLayout* mpLayout; - QHBoxLayout* mpLabelLayout; - QHBoxLayout* mpTitleLayout; - QLabel* mpUrlLabel; - QLineEdit* mpUrl; - - QLabel* mpTitleLabel; - QLineEdit* mpTitle; -}; - -class UBActionPreview : public QWidget -{ -public: - UBActionPreview(QWidget* parent=0, const char* name="UBActionPreview"); - ~UBActionPreview(); - void setOwner(const QString& owner); - void setContent(const QString& content); - -private: - QLabel* mpOwner; - QLabel* mpContent; - - QVBoxLayout mLayout; - QHBoxLayout mOwnerLayout; -}; - -class UBTBPreviewContainer : public UBWidgetList -{ -public: - UBTBPreviewContainer(QWidget* parent=0, const char* name="UBTBPreviewContainer"); - ~UBTBPreviewContainer(); -}; - -class UBTeacherBarPreviewWidget : public QWidget -{ - Q_OBJECT -public: - UBTeacherBarPreviewWidget(QWidget* parent=0, const char* name="UBTeacherBarPreviewWidget"); - ~UBTeacherBarPreviewWidget(); - UBTeacherBarPreviewMedia* mediaViewer() {return &mMediaViewer;} - void setTitle(const QString& title); - void setDuration(eDuration duration); - void setComments(const QString& comments); - void setActions(QStringList actions); - void setLinks(QStringList links); - void clean(); - QLabel* mediaLabel() { return mpMediaLabel;} - -signals: - void showEditMode(); - -private slots: - void onEdit(); - -private: - void hideElements(); - - QVBoxLayout mLayout; - QHBoxLayout mEditLayout; - QHBoxLayout mTitleDurationLayout; - UBTeacherBarPreviewMedia mMediaViewer; - QList mWidgets; - QList mStoredWidgets; - - QPushButton* mpEditButton; - QLabel* mpTitle; - QLabel* mpDuration; - QLabel* mpActionsLabel; - QLabel* mpMediaLabel; - QLabel* mpCommentsLabel; - QLabel* mpComments; - QLabel* mpLinksLabel; - QLabel* mpTmpLink; - UBActionPreview* mpTmpAction; - UBTBPreviewContainer* mpContentContainer; -}; - -class UBTBMediaContainer : public UBWidgetList - , public IDropable -{ - Q_OBJECT -public: - UBTBMediaContainer(QWidget* parent=0, const char* name="UBTBMediaContainer"); - ~UBTBMediaContainer(); - QStringList mediaUrls(); - QWidget* generateMediaWidget(const QString& url); - void cleanMedias(); - -signals: - void mediaDropped(const QString& url); - -protected: - void dropEvent(QDropEvent* pEvent); - void dragEnterEvent(QDragEnterEvent* pEvent); - void dragMoveEvent(QDragMoveEvent* pEvent); - void dragLeaveEvent(QDragLeaveEvent* pEvent); - -private: - void addMedia(const QString& mediaPath); - - QStringList mMediaList; -}; - -class UBTBDocumentEditWidget : public QWidget -{ - Q_OBJECT -public: - UBTBDocumentEditWidget(QWidget* parent=0, const char* name="UBTBDocumentEditWidget"); - ~UBTBDocumentEditWidget(); - -signals: - void onPreviewClicked(); - void onPageViewClicked(); - -private: - QVBoxLayout mLayout; - QHBoxLayout mPageLayout; - QHBoxLayout mPreviewLayout; - QPushButton* mpPageViewButton; - QPushButton* mpPreviewButton; - - QLabel* mpTitleLabel; - QLineEdit* mpTitle; - QLabel* mpTargetLabel; - QTextEdit* mpTarget; - QLabel* mpMetadataLabel; - QLabel* mpLicenseLabel; -}; - -class UBTBDocumentPreviewWidget : public QWidget -{ - Q_OBJECT -public: - UBTBDocumentPreviewWidget(QWidget* parent=0, const char* name="UBTBDocumentPreviewWidget"); - ~UBTBDocumentPreviewWidget(); - -signals: - void onEditClicked(); - void onPageViewClicked(); - -private: - QVBoxLayout mLayout; - QHBoxLayout mPageLayout; - QHBoxLayout mPreviewLayout; - QPushButton* mpPageViewButton; - QPushButton* mpEditButton; -}; - class UBTeacherBarWidget : public UBDockPaletteWidget { Q_OBJECT @@ -245,44 +37,23 @@ private slots: void loadContent(); void onValueChanged(); void onTitleTextChanged(const QString& text); - void onActionButton(); - void onLinkButton(); void onShowEditMode(); - void onMediaDropped(const QString& url); void onTBStateChanged(eTeacherBarState state); private: void clearWidgetLists(); bool isEmpty(); - QVBoxLayout* mpLayout; - QHBoxLayout* mpTitleLayout; - QLabel* mpTitleLabel; - QLineEdit* mpTitle; - QLabel* mpMediaLabel; - QWidget* mpContainer; - QVBoxLayout* mpContainerLayout; - QLabel* mpActionLabel; - UBWidgetList* mpActions; - QPushButton* mpActionButton; - QHBoxLayout* mpActionLayout; - QLabel* mpLinkLabel; - UBWidgetList* mpLinks; - QPushButton* mpLinkButton; - QHBoxLayout* mpLinkLayout; - QLabel* mpCommentLabel; - QTextEdit* mpComments; - QStackedWidget* mpStackWidget; - UBTeacherBarPreviewWidget* mpPreview; - QVector mActionList; - QVector mUrlList; - QVector mMediaList; - - UBTBMediaContainer* mpMediaContainer; + QVBoxLayout mLayout; + QStackedWidget* mpStackWidget; eTeacherBarState mState; + UBTBPageEditWidget* mpPageEditWidget; + UBTeacherBarPreviewWidget* mpPreview; UBTBDocumentPreviewWidget* mpDocPreviewWidget; UBTBDocumentEditWidget* mpDocEditWidget; + + UBTeacherBarDataMgr mData; }; #endif // UBTEACHERBARWIDGET_H diff --git a/src/gui/gui.pri b/src/gui/gui.pri index d1a187cd..5fa7ab62 100644 --- a/src/gui/gui.pri +++ b/src/gui/gui.pri @@ -47,7 +47,12 @@ HEADERS += src/gui/UBThumbnailView.h \ src/gui/UBLibWebView.h \ src/gui/UBDownloadWidget.h \ src/gui/UBDockDownloadWidget.h \ - src/gui/UBMediaPlayer.h + src/gui/UBMediaPlayer.h \ + src/gui/UBTeacherBarDataMgr.h \ + src/gui/UBTBDocumentEditWidget.h \ + src/gui/UBTBDocumentPreviewWidget.h \ + src/gui/UBTeacherBarPreviewWidget.h \ + src/gui/UBTBPageEditWidget.h SOURCES += src/gui/UBThumbnailView.cpp \ src/gui/UBFloatingPalette.cpp \ @@ -97,7 +102,12 @@ SOURCES += src/gui/UBThumbnailView.cpp \ src/gui/UBLibWebView.cpp \ src/gui/UBDownloadWidget.cpp \ src/gui/UBDockDownloadWidget.cpp \ - src/gui/UBMediaPlayer.cpp + src/gui/UBMediaPlayer.cpp \ + src/gui/UBTeacherBarDataMgr.cpp \ + src/gui/UBTBDocumentEditWidget.cpp \ + src/gui/UBTBDocumentPreviewWidget.cpp \ + src/gui/UBTeacherBarPreviewWidget.cpp \ + src/gui/UBTBPageEditWidget.cpp win32 { @@ -125,5 +135,3 @@ linux-g++-64 { SOURCES += src/gui/UBKeyboardPalette_linux.cpp } - - From 9ec91284124cf0c2826a24ddd7f469745ee5c791 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 20 Jan 2012 16:02:42 +0100 Subject: [PATCH 66/99] backup of the teacherbar rework --- src/gui/UBTBDocumentEditWidget.cpp | 10 ++ src/gui/UBTBDocumentEditWidget.h | 2 + src/gui/UBTBDocumentPreviewWidget.cpp | 9 ++ src/gui/UBTBDocumentPreviewWidget.h | 2 + src/gui/UBTBPageEditWidget.cpp | 219 +++++++++++++++++--------- src/gui/UBTBPageEditWidget.h | 51 +++++- src/gui/UBTeacherBarDataMgr.cpp | 115 +++++++------- src/gui/UBTeacherBarDataMgr.h | 58 ++----- src/gui/UBTeacherBarPreviewWidget.cpp | 13 +- src/gui/UBTeacherBarPreviewWidget.h | 3 +- src/gui/UBTeacherBarWidget.cpp | 128 ++++----------- src/gui/UBTeacherBarWidget.h | 2 - 12 files changed, 334 insertions(+), 278 deletions(-) diff --git a/src/gui/UBTBDocumentEditWidget.cpp b/src/gui/UBTBDocumentEditWidget.cpp index 17fa19a8..bf2b7190 100644 --- a/src/gui/UBTBDocumentEditWidget.cpp +++ b/src/gui/UBTBDocumentEditWidget.cpp @@ -86,3 +86,13 @@ void UBTBDocumentEditWidget::onPreview() { emit changeTBState(eTeacherBarState_DocumentPreview); } + +void UBTBDocumentEditWidget::updateFields() +{ + +} + +void UBTBDocumentEditWidget::clearFields() +{ + +} diff --git a/src/gui/UBTBDocumentEditWidget.h b/src/gui/UBTBDocumentEditWidget.h index f26559eb..705adcfe 100644 --- a/src/gui/UBTBDocumentEditWidget.h +++ b/src/gui/UBTBDocumentEditWidget.h @@ -15,6 +15,8 @@ class UBTBDocumentEditWidget : public QWidget public: UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTBDocumentEditWidget"); ~UBTBDocumentEditWidget(); + void updateFields(); + void clearFields(); signals: void changeTBState(eTeacherBarState state); diff --git a/src/gui/UBTBDocumentPreviewWidget.cpp b/src/gui/UBTBDocumentPreviewWidget.cpp index 818dfce5..39d75199 100644 --- a/src/gui/UBTBDocumentPreviewWidget.cpp +++ b/src/gui/UBTBDocumentPreviewWidget.cpp @@ -46,3 +46,12 @@ void UBTBDocumentPreviewWidget::onPageView() emit changeTBState(eTeacherBarState_PagePreview); } +void UBTBDocumentPreviewWidget::updateFields() +{ + +} + +void UBTBDocumentPreviewWidget::clearFields() +{ + +} diff --git a/src/gui/UBTBDocumentPreviewWidget.h b/src/gui/UBTBDocumentPreviewWidget.h index 0b426e3c..99959afa 100644 --- a/src/gui/UBTBDocumentPreviewWidget.h +++ b/src/gui/UBTBDocumentPreviewWidget.h @@ -12,6 +12,8 @@ class UBTBDocumentPreviewWidget : public QWidget public: UBTBDocumentPreviewWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTBDocumentPreviewWidget"); ~UBTBDocumentPreviewWidget(); + void updateFields(); + void clearFields(); signals: void changeTBState(eTeacherBarState state); diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp index 121ab0b3..d596e806 100644 --- a/src/gui/UBTBPageEditWidget.cpp +++ b/src/gui/UBTBPageEditWidget.cpp @@ -25,6 +25,8 @@ UBTBPageEditWidget::UBTBPageEditWidget(UBTeacherBarDataMgr *pDataMgr, QWidget *p { Q_UNUSED(name); mpDataMgr = pDataMgr; + mActions.clear(); + mUrls.clear(); setAttribute(Qt::WA_StyledBackground, true); setStyleSheet(UBApplication::globalStyleSheet()); @@ -93,6 +95,7 @@ UBTBPageEditWidget::UBTBPageEditWidget(UBTeacherBarDataMgr *pDataMgr, QWidget *p mLayout.addLayout(&mPagePreviewLayout, 0); connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); + connect(mpComments, SIGNAL(textChanged()), this, SLOT(onValueChanged())); connect(mpActionButton, SIGNAL(clicked()), this, SLOT(onActionButton())); connect(mpLinkButton, SIGNAL(clicked()), this, SLOT(onLinkButton())); connect(mpDocumentEditbutton, SIGNAL(clicked()), this, SLOT(onDocumentEditClicked())); @@ -126,14 +129,14 @@ void UBTBPageEditWidget::onValueChanged() void UBTBPageEditWidget::onActionButton() { UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); - mpDataMgr->actions() << pAction; + mActions << pAction; mpActions->addWidget(pAction); } void UBTBPageEditWidget::onLinkButton() { UBUrlWidget* pUrl = new UBUrlWidget(this); - mpDataMgr->urls() << pUrl; + mUrls << pUrl; mpLinks->addWidget(pUrl); } @@ -143,91 +146,87 @@ void UBTBPageEditWidget::onMediaDropped(const QString &url) QWidget* pMedia = mpMediaContainer->generateMediaWidget(url); if(NULL != pMedia){ mpDataMgr->medias() << pMedia; + mpDataMgr->addMediaUrl(url); mpMediaContainer->addWidget(pMedia); } } } - -void UBTBPageEditWidget::saveInfos(sTeacherBarInfos *infos) +void UBTBPageEditWidget::onDocumentEditClicked() { - if(NULL != infos){ - infos->title = mpTitle->text(); + emit changeTBState(eTeacherBarState_DocumentEdit); +} - // Actions - for(int i=0; iactions().size(); i++){ - infos->actions << QString("%0;%1").arg(mpDataMgr->actions().at(i)->comboValue()).arg(mpDataMgr->actions().at(i)->text()); - } - // Media - foreach(QString media, mpMediaContainer->mediaUrls()){ - infos->medias << media; - } +void UBTBPageEditWidget::onPagePreviewClicked() +{ + emit changeTBState(eTeacherBarState_PagePreview); +} - // Links - for(int j=0; jurls().size(); j++){ - if("" != mpDataMgr->urls().at(j)->url()){ - infos->urls << mpDataMgr->urls().at(j)->url(); - } - } - // Comments - infos->comments = mpComments->document()->toPlainText(); +void UBTBPageEditWidget::saveFields() +{ + mpDataMgr->actions()->clear(); + mpDataMgr->urls()->clear(); + foreach(UBTeacherStudentAction* pAct, mActions){ + sAction action; + action.type = pAct->comboValue().toInt(); + action.content = pAct->text(); + mpDataMgr->actions()->append(action); + } + foreach(UBUrlWidget* pUrl, mUrls){ + sLink link; + link.title = pUrl->title(); + link.link = pUrl->url(); + mpDataMgr->urls()->append(link); } + + // TODO : Medias } -void UBTBPageEditWidget::loadInfos(sTeacherBarInfos* infos) +void UBTBPageEditWidget::updateFields() { - if(NULL != infos){ - // Title - mpTitle->setText(infos->title); - mpDataMgr->setPageTitle(infos->title); - - // Actions - for(int i=0; iactions.size(); i++){ - QStringList qslAction = infos->actions.at(i).split(";"); - if(qslAction.size() >= 2){ - UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); - pAction->setComboValue(qslAction.at(0).toInt()); - pAction->setText(qslAction.at(1)); - mpDataMgr->actions() << pAction; - mpActions->addWidget(pAction); - } - } - // Media - foreach(QString url, infos->medias){ - if("" != url){ - QWidget* pMedia = mpMediaContainer->generateMediaWidget(url); - if(NULL != pMedia){ - mpDataMgr->medias() << pMedia; - mpMediaContainer->addWidget(pMedia); - } - } - } + mpTitle->setText(mpDataMgr->pageTitle()); + qDebug() << "mpComments will become: " << mpDataMgr->comments(); + + foreach(sAction action, *mpDataMgr->actions()){ + UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); + pAction->setComboValue(action.type); + pAction->setText(action.content); + mActions << pAction; + mpActions->addWidget(pAction); + } - // Links - for(int j=0; jurls.size(); j++){ - QString qsUrl = infos->urls.at(j); - if("" != qsUrl){ - UBUrlWidget* pLink = new UBUrlWidget(this); - pLink->setUrl(qsUrl); - mpDataMgr->urls() << pLink; - mpLinks->addWidget(pLink); - } - } - // Comments - if(NULL != mpComments){ - mpComments->document()->setPlainText(infos->comments); - } + foreach(sLink link, *mpDataMgr->urls()){ + UBUrlWidget* urlWidget = new UBUrlWidget(this); + urlWidget->setTitle(link.title); + urlWidget->setUrl(link.link); + mUrls << urlWidget; + mpLinks->addWidget(urlWidget); } -} -void UBTBPageEditWidget::onDocumentEditClicked() -{ - emit changeTBState(eTeacherBarState_DocumentEdit); + // TODO: add the medias + + qDebug() << "mpComments will become: " << mpDataMgr->comments(); + mpComments->setPlainText(mpDataMgr->comments()); } -void UBTBPageEditWidget::onPagePreviewClicked() +void UBTBPageEditWidget::clearFields() { - emit changeTBState(eTeacherBarState_PagePreview); + mpTitle->setText(""); + mpComments->setText(""); + foreach(UBTeacherStudentAction* pAction, mActions){ + mpActions->removeWidget(pAction); + DELETEPTR(pAction); + } + mActions.clear(); + + foreach(UBUrlWidget* pLink, mUrls){ + mpLinks->removeWidget(pLink); + DELETEPTR(pLink); + } + mUrls.clear(); + + // TODO: clean the media? + } // --------------------------------------------------------------------------------------------- @@ -287,10 +286,8 @@ QString UBUrlWidget::url() void UBUrlWidget::setUrl(const QString &url) { - QStringList list = url.split(";"); if(NULL != mpUrl){ - mpUrl->setText(list.at(0)); - mpTitle->setText(list.at(1)); + mpUrl->setText(url); } } @@ -415,3 +412,81 @@ QWidget* UBTBMediaContainer::generateMediaWidget(const QString& url) return pW; } + +UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) + , mpText(NULL) + , mpLayout(NULL) + , mpComboLayout(NULL) + , mpCombo(NULL) +{ + setObjectName(name); + + setAttribute(Qt::WA_StyledBackground, true); + setStyleSheet(UBApplication::globalStyleSheet()); + + // Create the GUI + mpLayout = new QHBoxLayout(this); + setLayout(mpLayout); + + mpComboLayout = new QVBoxLayout(); + + mpCombo = new QComboBox(this); + mpCombo->setObjectName("DockPaletteWidgetComboBox"); + mpCombo->setMinimumWidth(80); + mpCombo->addItem(tr("Teacher")); + mpCombo->addItem(tr("Student")); + mpComboLayout->addWidget(mpCombo, 0); + mpComboLayout->addStretch(1); + + mpLayout->addLayout(mpComboLayout, 0); + + mpText = new QTextEdit(this); + mpText->setObjectName("DockPaletteWidgetBox"); + mpText->setStyleSheet("background:white;"); + + mpLayout->addWidget(mpText, 1); + +} + +UBTeacherStudentAction::~UBTeacherStudentAction() +{ + DELETEPTR(mpCombo); + DELETEPTR(mpText); + DELETEPTR(mpComboLayout); + DELETEPTR(mpLayout); +} + +QString UBTeacherStudentAction::text() +{ + QString str; + if(NULL != mpText){ + str = mpText->document()->toPlainText(); + } + return str; +} + +QString UBTeacherStudentAction::comboValue() +{ + QString str; + + if(NULL != mpCombo){ + str = QString("%0").arg(mpCombo->currentIndex()); + } + + return str; +} + +void UBTeacherStudentAction::setComboValue(int value) +{ + if(NULL != mpCombo){ + mpCombo->setCurrentIndex(value); + } +} + +void UBTeacherStudentAction::setText(const QString& text) +{ + if(NULL != mpText){ + mpText->document()->setPlainText(text); + } +} + diff --git a/src/gui/UBTBPageEditWidget.h b/src/gui/UBTBPageEditWidget.h index ed766eaa..bbcd5576 100644 --- a/src/gui/UBTBPageEditWidget.h +++ b/src/gui/UBTBPageEditWidget.h @@ -14,6 +14,48 @@ #include "interfaces/IDropable.h" #include "UBTeacherBarDataMgr.h" +class UBTeacherStudentAction : public QWidget +{ + Q_OBJECT + +public: + UBTeacherStudentAction(QWidget* parent=0, const char* name="UBTeacherStudentAction"); + ~UBTeacherStudentAction(); + QString text(); + QString comboValue(); + void setComboValue(int value); + void setText(const QString& text); + +private: + QTextEdit* mpText; + QHBoxLayout* mpLayout; + QVBoxLayout* mpComboLayout; + QComboBox* mpCombo; +}; + +class UBUrlWidget : public QWidget +{ +public: + UBUrlWidget(QWidget* parent=0, const char* name="UBUrlWidget"); + ~UBUrlWidget(); + + QString url(); + void setUrl(const QString& url); + + QString title(){return mpTitle->text();} + void setTitle(const QString& title){mpTitle->setText(title);} + +private: + QVBoxLayout* mpLayout; + QHBoxLayout* mpLabelLayout; + QHBoxLayout* mpTitleLayout; + QLabel* mpUrlLabel; + QLineEdit* mpUrl; + + QLabel* mpTitleLabel; + QLineEdit* mpTitle; +}; + class UBTBMediaContainer : public UBWidgetList , public IDropable { @@ -46,9 +88,9 @@ class UBTBPageEditWidget : public QWidget public: UBTBPageEditWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTBPageEditWidget"); ~UBTBPageEditWidget(); - - void saveInfos(sTeacherBarInfos* infos); - void loadInfos(sTeacherBarInfos* infos); + void saveFields(); + void updateFields(); + void clearFields(); signals: void valueChanged(); @@ -87,6 +129,9 @@ private: QPushButton* mpDocumentEditbutton; QPushButton* mpPagePreviewButton; QWidget* mpContainer; + + QVector mActions; + QVector mUrls; }; #endif // UBTBPAGEEDITWIDGET_H diff --git a/src/gui/UBTeacherBarDataMgr.cpp b/src/gui/UBTeacherBarDataMgr.cpp index 96faf37b..8ee86c8c 100644 --- a/src/gui/UBTeacherBarDataMgr.cpp +++ b/src/gui/UBTeacherBarDataMgr.cpp @@ -1,5 +1,8 @@ #include "core/UBApplication.h" +#include "core/UBPersistenceManager.h" +#include "board/UBBoardController.h" #include "customWidgets/UBGlobals.h" + #include "UBTeacherBarDataMgr.h" UBTeacherBarDataMgr::UBTeacherBarDataMgr() @@ -19,79 +22,75 @@ void UBTeacherBarDataMgr::clearLists() mMediaList.clear(); } -UBTeacherStudentAction::UBTeacherStudentAction(QWidget *parent, const char *name):QWidget(parent) - , mpText(NULL) - , mpLayout(NULL) - , mpComboLayout(NULL) - , mpCombo(NULL) +void UBTeacherBarDataMgr::saveContent() { - setObjectName(name); + // Store the page information in the UBZ + sTeacherBarInfos infos; - setAttribute(Qt::WA_StyledBackground, true); - setStyleSheet(UBApplication::globalStyleSheet()); + infos.title = mPageTitle; - // Create the GUI - mpLayout = new QHBoxLayout(this); - setLayout(mpLayout); + // Actions + foreach(sAction action, mActionList){ + infos.actions << QString("%0;%1").arg(action.type).arg(action.content); + } - mpComboLayout = new QVBoxLayout(); + // Media + foreach(QString media, mMediaUrls){ + infos.medias << media; + } - mpCombo = new QComboBox(this); - mpCombo->setObjectName("DockPaletteWidgetComboBox"); - mpCombo->setMinimumWidth(80); - mpCombo->addItem(tr("Teacher")); - mpCombo->addItem(tr("Student")); - mpComboLayout->addWidget(mpCombo, 0); - mpComboLayout->addStretch(1); + // Links + foreach(sLink link, mUrlList){ + if("" != link.title && "" != link.link){ + infos.urls << QString("%0;%1").arg(link.title).arg(link.link); + } + } - mpLayout->addLayout(mpComboLayout, 0); + // Comments + infos.comments = mComments; - mpText = new QTextEdit(this); - mpText->setObjectName("DockPaletteWidgetBox"); - mpText->setStyleSheet("background:white;"); + UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos); - mpLayout->addWidget(mpText, 1); + // TODO: Store the document metadata somewhere } -UBTeacherStudentAction::~UBTeacherStudentAction() +void UBTeacherBarDataMgr::loadContent() { - DELETEPTR(mpCombo); - DELETEPTR(mpText); - DELETEPTR(mpComboLayout); - DELETEPTR(mpLayout); -} - -QString UBTeacherStudentAction::text() -{ - QString str; - if(NULL != mpText){ - str = mpText->document()->toPlainText(); + clearLists(); + + sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); + + // Page Title + mPageTitle = nextInfos.title; + // Actions + foreach(QString eachAction, nextInfos.actions){ + QStringList qslAction = eachAction.split(";"); + if(2 <= qslAction.size()){ + sAction action; + action.type = qslAction.at(0).toInt(); + action.content = qslAction.at(1); + mActionList << action; + } } - return str; -} - -QString UBTeacherStudentAction::comboValue() -{ - QString str; - - if(NULL != mpCombo){ - str = QString("%0").arg(mpCombo->currentIndex()); + // Media URL + mMediaUrls = nextInfos.medias; + + // Links + foreach(QString eachUrl, nextInfos.urls){ + QStringList qslUrl = eachUrl.split(';'); + if(2 <= qslUrl.size()){ + sLink link; + link.title = qslUrl.at(0); + link.link = qslUrl.at(1); + mUrlList << link; + } } - return str; -} + // Comments + mComments = nextInfos.comments; -void UBTeacherStudentAction::setComboValue(int value) -{ - if(NULL != mpCombo){ - mpCombo->setCurrentIndex(value); - } -} + // TODO : Read the document metadata file and populate the metadata infos here -void UBTeacherStudentAction::setText(const QString& text) -{ - if(NULL != mpText){ - mpText->document()->setPlainText(text); - } } + diff --git a/src/gui/UBTeacherBarDataMgr.h b/src/gui/UBTeacherBarDataMgr.h index 43c809b9..96323fa6 100644 --- a/src/gui/UBTeacherBarDataMgr.h +++ b/src/gui/UBTeacherBarDataMgr.h @@ -22,44 +22,15 @@ typedef enum{ eActionOwner_Student }eActionOwner; -class UBTeacherStudentAction : public QWidget -{ - Q_OBJECT - -public: - UBTeacherStudentAction(QWidget* parent=0, const char* name="UBTeacherStudentAction"); - ~UBTeacherStudentAction(); - QString text(); - QString comboValue(); - void setComboValue(int value); - void setText(const QString& text); - -private: - QTextEdit* mpText; - QHBoxLayout* mpLayout; - QVBoxLayout* mpComboLayout; - QComboBox* mpCombo; -}; +typedef struct{ + int type; + QString content; +}sAction; -class UBUrlWidget : public QWidget -{ -public: - UBUrlWidget(QWidget* parent=0, const char* name="UBUrlWidget"); - ~UBUrlWidget(); - - QString url(); - void setUrl(const QString& url); - -private: - QVBoxLayout* mpLayout; - QHBoxLayout* mpLabelLayout; - QHBoxLayout* mpTitleLayout; - QLabel* mpUrlLabel; - QLineEdit* mpUrl; - - QLabel* mpTitleLabel; - QLineEdit* mpTitle; -}; +typedef struct{ + QString title; + QString link; +}sLink; class UBTeacherBarDataMgr { @@ -80,13 +51,15 @@ public: QString pageTitle(){return mPageTitle;} // Actions - QVector actions(){return mActionList;} + QVector* actions(){return &mActionList;} // Medias QVector medias(){return mMediaList;} + void addMediaUrl(const QString& url){mMediaUrls << url;} + QStringList mediaUrls(){return mMediaUrls;} // Urls - QVector urls(){return mUrlList;} + QVector* urls(){return &mUrlList;} // Comments void setComments(const QString& c){mComments = c;} @@ -94,6 +67,8 @@ public: // Others void clearLists(); + void saveContent(); + void loadContent(); private: QString mSessionTitle; @@ -101,9 +76,10 @@ private: QString mPageTitle; QString mComments; - QVector mActionList; - QVector mUrlList; + QVector mActionList; + QVector mUrlList; QVector mMediaList; + QStringList mMediaUrls; }; #endif // UBTEACHERBARDATAMGR_H diff --git a/src/gui/UBTeacherBarPreviewWidget.cpp b/src/gui/UBTeacherBarPreviewWidget.cpp index 7dbf450e..662996df 100644 --- a/src/gui/UBTeacherBarPreviewWidget.cpp +++ b/src/gui/UBTeacherBarPreviewWidget.cpp @@ -302,13 +302,12 @@ void UBTeacherBarPreviewWidget::setLinks(QStringList links) } } -void UBTeacherBarPreviewWidget::loadInfos(sTeacherBarInfos *infos) +void UBTeacherBarPreviewWidget::updateFields() +{ + +} + +void UBTeacherBarPreviewWidget::clearFields() { - if(NULL != infos){ - setTitle(infos->title); - mediaViewer()->loadMedia(infos->medias); - // Add the comments - //setComments(); - } } diff --git a/src/gui/UBTeacherBarPreviewWidget.h b/src/gui/UBTeacherBarPreviewWidget.h index 69f853dc..db70b142 100644 --- a/src/gui/UBTeacherBarPreviewWidget.h +++ b/src/gui/UBTeacherBarPreviewWidget.h @@ -61,7 +61,8 @@ public: void setLinks(QStringList links); void clean(); QLabel* mediaLabel() { return mpMediaLabel;} - void loadInfos(sTeacherBarInfos* infos); + void updateFields(); + void clearFields(); signals: void showEditMode(); diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 0ac3107d..569a4d3e 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -59,6 +59,7 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock connect(mpDocPreviewWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState))); connect(mpDocEditWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState))); connect(mpPageEditWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState))); + connect(mpPageEditWidget, SIGNAL(valueChanged()), this, SLOT(onValueChanged())); } UBTeacherBarWidget::~UBTeacherBarWidget() @@ -88,110 +89,49 @@ void UBTeacherBarWidget::onValueChanged() void UBTeacherBarWidget::saveContent() { - sTeacherBarInfos infos; - mpPageEditWidget->saveInfos(&infos); - UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos); + mpPageEditWidget->saveFields(); + mData.saveContent(); } void UBTeacherBarWidget::loadContent() { -// clearWidgetLists(); -// sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); - -// mpPageEditWidget->loadInfos(&nextInfos); -// mpPreview->mediaViewer()->cleanMedia(); - -// if(!isEmpty()){ -// // Update the fields of the preview widget -// onTBStateChanged(eTeacherBarState_PagePreview); -// mpPreview->clean(); -// mpPreview->loadInfos(&nextInfos); - -// // Add the actions -// if(!mActionList.empty()){ -// QStringList actions; -// foreach(UBTeacherStudentAction* action, mActionList){ -// QString desc = QString("%0;%1").arg(action->comboValue()).arg(action->text()); -// actions << desc; -// } -// mpPreview->setActions(actions); -// } - -// // Add the media -// if(nextInfos.medias.count() > 0){ -// QList widgetList; -// widgetList.append(mpPreview->mediaLabel()); -// mpPreview->mediaViewer()->loadWidgets(widgetList,false); -// int loadedMedia = mpPreview->mediaViewer()->loadMedia(nextInfos.medias); -// if(loadedMedia) -// mpPreview->mediaLabel()->setVisible(true); -// } - - -// // Add the links -// if(!mUrlList.empty()){ -// QStringList links; -// foreach(UBUrlWidget* url, mUrlList){ -// QStringList list = url->url().split(";"); -// QString formedlink = "" + list.at(1) + ""; -// links << formedlink; -// } -// mpPreview->setLinks(links); -// } -// } -// else{ -// // If the document has only one page, show the document edit page -// if(1 == UBApplication::boardController->activeDocument()->pageCount()){ -// onTBStateChanged(eTeacherBarState_DocumentEdit); -// }else{ -// onTBStateChanged(eTeacherBarState_PageEdit); -// } -// } + // Clear the old datas + mpPageEditWidget->clearFields(); + mpPreview->clearFields(); + mpDocEditWidget->clearFields(); + mpDocPreviewWidget->clearFields(); + + // Update the datas + mData.loadContent(); + + qDebug() << mData.comments(); + + // Update the fields + mpPageEditWidget->updateFields(); + mpPreview->updateFields(); + mpDocEditWidget->updateFields(); + mpDocPreviewWidget->updateFields(); + + if(!isEmpty()){ + onTBStateChanged(eTeacherBarState_PagePreview); + }else{ + if(1 == UBApplication::boardController->activeDocument()->pageCount()){ + onTBStateChanged(eTeacherBarState_DocumentEdit); + }else{ + onTBStateChanged(eTeacherBarState_PageEdit); + } + } } bool UBTeacherBarWidget::isEmpty() { return mData.pageTitle() == "" && - mData.urls().empty() && - mData.actions().empty() && + mData.urls()->empty() && + mData.actions()->empty() && mData.medias().empty() && - mData.comments() == ""; -} - -void UBTeacherBarWidget::onTitleTextChanged(const QString& text) -{ - //mpTitle->setToolTip(text); -} - -void UBTeacherBarWidget::clearWidgetLists() -{ -// if(NULL != mpMediaContainer){ -// for(int i=0; iremoveWidget(mMediaList.at(i)); -// delete mMediaList.at(i); -// } -// mMediaList.clear(); -// mpMediaContainer->cleanMedias(); -// } - -// if(NULL != mpActions){ -// for(int i=0; iremoveWidget(mActionList.at(i)); -// delete mActionList.at(i); -// } -// mActionList.clear(); -// } - -// if(NULL != mpLinks){ -// for(int i=0; iremoveWidget(mUrlList.at(i)); -// delete mUrlList.at(i); -// } -// mUrlList.clear(); -// } + mData.comments() == "" && + mData.sessionTarget() == "" && + mData.sessionTitle() == ""; } void UBTeacherBarWidget::onShowEditMode() diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index ec486074..6b38645b 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -36,12 +36,10 @@ private slots: void saveContent(); void loadContent(); void onValueChanged(); - void onTitleTextChanged(const QString& text); void onShowEditMode(); void onTBStateChanged(eTeacherBarState state); private: - void clearWidgetLists(); bool isEmpty(); QVBoxLayout mLayout; From b9949772275e1d71cddace2611764e4dc14c4bf6 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Mon, 23 Jan 2012 09:38:51 +0100 Subject: [PATCH 67/99] Partial backup of the teacherbar rework --- src/gui/UBTBPageEditWidget.cpp | 15 +++++++++------ src/gui/UBTBPageEditWidget.h | 3 ++- src/gui/UBTeacherBarWidget.cpp | 2 -- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp index d596e806..693c3674 100644 --- a/src/gui/UBTBPageEditWidget.cpp +++ b/src/gui/UBTBPageEditWidget.cpp @@ -94,8 +94,8 @@ UBTBPageEditWidget::UBTBPageEditWidget(UBTeacherBarDataMgr *pDataMgr, QWidget *p mPagePreviewLayout.addStretch(1); mLayout.addLayout(&mPagePreviewLayout, 0); - connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged())); - connect(mpComments, SIGNAL(textChanged()), this, SLOT(onValueChanged())); + connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onTitleChanged())); + connect(mpComments, SIGNAL(textChanged()), this, SLOT(onCommentsChanged())); connect(mpActionButton, SIGNAL(clicked()), this, SLOT(onActionButton())); connect(mpLinkButton, SIGNAL(clicked()), this, SLOT(onLinkButton())); connect(mpDocumentEditbutton, SIGNAL(clicked()), this, SLOT(onDocumentEditClicked())); @@ -119,9 +119,14 @@ UBTBPageEditWidget::~UBTBPageEditWidget() DELETEPTR(mpTitle); } -void UBTBPageEditWidget::onValueChanged() +void UBTBPageEditWidget::onTitleChanged() { mpDataMgr->setPageTitle(mpTitle->text()); + emit valueChanged(); +} + +void UBTBPageEditWidget::onCommentsChanged() +{ mpDataMgr->setComments(mpComments->document()->toPlainText()); emit valueChanged(); } @@ -185,7 +190,6 @@ void UBTBPageEditWidget::saveFields() void UBTBPageEditWidget::updateFields() { mpTitle->setText(mpDataMgr->pageTitle()); - qDebug() << "mpComments will become: " << mpDataMgr->comments(); foreach(sAction action, *mpDataMgr->actions()){ UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); @@ -205,8 +209,7 @@ void UBTBPageEditWidget::updateFields() // TODO: add the medias - qDebug() << "mpComments will become: " << mpDataMgr->comments(); - mpComments->setPlainText(mpDataMgr->comments()); + mpComments->document()->setPlainText(mpDataMgr->comments()); } void UBTBPageEditWidget::clearFields() diff --git a/src/gui/UBTBPageEditWidget.h b/src/gui/UBTBPageEditWidget.h index bbcd5576..fa56047d 100644 --- a/src/gui/UBTBPageEditWidget.h +++ b/src/gui/UBTBPageEditWidget.h @@ -97,7 +97,8 @@ signals: void changeTBState(eTeacherBarState state); private slots: - void onValueChanged(); + void onTitleChanged(); + void onCommentsChanged(); void onActionButton(); void onLinkButton(); void onMediaDropped(const QString& url); diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 569a4d3e..75c8a978 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -104,8 +104,6 @@ void UBTeacherBarWidget::loadContent() // Update the datas mData.loadContent(); - qDebug() << mData.comments(); - // Update the fields mpPageEditWidget->updateFields(); mpPreview->updateFields(); From 247964f20b0904a4bf81643e81da469dcbee72af Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 23 Jan 2012 10:25:00 +0100 Subject: [PATCH 68/99] removed double layer warning --- src/gui/UBTBPageEditWidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp index 693c3674..ab1dc7a8 100644 --- a/src/gui/UBTBPageEditWidget.cpp +++ b/src/gui/UBTBPageEditWidget.cpp @@ -245,7 +245,7 @@ UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) mpLayout = new QVBoxLayout(this); setLayout(mpLayout); - mpLabelLayout = new QHBoxLayout(this); + mpLabelLayout = new QHBoxLayout(0); mpUrlLabel = new QLabel(tr("Url"), this); mpLabelLayout->addWidget(mpUrlLabel, 0); mpUrl = new QLineEdit(this); @@ -253,7 +253,7 @@ UBUrlWidget::UBUrlWidget(QWidget *parent, const char *name):QWidget(parent) mpUrl->setMinimumHeight(20); mpLabelLayout->addWidget(mpUrl, 1); - mpTitleLayout = new QHBoxLayout(this); + mpTitleLayout = new QHBoxLayout(0); mpTitleLabel = new QLabel(tr("Title"),this); mpTitleLayout->addWidget(mpTitleLabel,0); mpTitle = new QLineEdit(this); From 17be2c005025382a8515149ff25cf653658e767e Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Mon, 23 Jan 2012 10:27:14 +0100 Subject: [PATCH 69/99] backup --- src/gui/UBTBPageEditWidget.cpp | 4 ++-- src/gui/UBTeacherBarDataMgr.h | 2 +- src/gui/UBTeacherBarWidget.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp index 693c3674..22c017a9 100644 --- a/src/gui/UBTBPageEditWidget.cpp +++ b/src/gui/UBTBPageEditWidget.cpp @@ -150,7 +150,7 @@ void UBTBPageEditWidget::onMediaDropped(const QString &url) if("" != url){ QWidget* pMedia = mpMediaContainer->generateMediaWidget(url); if(NULL != pMedia){ - mpDataMgr->medias() << pMedia; + mpDataMgr->medias()->append(pMedia); mpDataMgr->addMediaUrl(url); mpMediaContainer->addWidget(pMedia); } @@ -228,7 +228,7 @@ void UBTBPageEditWidget::clearFields() } mUrls.clear(); - // TODO: clean the media? + mpMediaContainer->cleanMedias(); } diff --git a/src/gui/UBTeacherBarDataMgr.h b/src/gui/UBTeacherBarDataMgr.h index 96323fa6..2c299474 100644 --- a/src/gui/UBTeacherBarDataMgr.h +++ b/src/gui/UBTeacherBarDataMgr.h @@ -54,7 +54,7 @@ public: QVector* actions(){return &mActionList;} // Medias - QVector medias(){return mMediaList;} + QVector* medias(){return &mMediaList;} void addMediaUrl(const QString& url){mMediaUrls << url;} QStringList mediaUrls(){return mMediaUrls;} diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 75c8a978..d0bbc85b 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -126,7 +126,7 @@ bool UBTeacherBarWidget::isEmpty() return mData.pageTitle() == "" && mData.urls()->empty() && mData.actions()->empty() && - mData.medias().empty() && + mData.medias()->empty() && mData.comments() == "" && mData.sessionTarget() == "" && mData.sessionTitle() == ""; From 4e6a17b6b9fc0ffcde3e1469d51f1f0e9149bf46 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Mon, 23 Jan 2012 10:54:49 +0100 Subject: [PATCH 70/99] Added the save / load media in the teacherbar --- src/gui/UBTBPageEditWidget.cpp | 36 ++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp index d1ba3c31..5e512d52 100644 --- a/src/gui/UBTBPageEditWidget.cpp +++ b/src/gui/UBTBPageEditWidget.cpp @@ -171,6 +171,7 @@ void UBTBPageEditWidget::saveFields() { mpDataMgr->actions()->clear(); mpDataMgr->urls()->clear(); + foreach(UBTeacherStudentAction* pAct, mActions){ sAction action; action.type = pAct->comboValue().toInt(); @@ -183,14 +184,13 @@ void UBTBPageEditWidget::saveFields() link.link = pUrl->url(); mpDataMgr->urls()->append(link); } - - // TODO : Medias } void UBTBPageEditWidget::updateFields() { + // Title mpTitle->setText(mpDataMgr->pageTitle()); - + // Actions foreach(sAction action, *mpDataMgr->actions()){ UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); pAction->setComboValue(action.type); @@ -198,7 +198,13 @@ void UBTBPageEditWidget::updateFields() mActions << pAction; mpActions->addWidget(pAction); } - + // Medias + foreach(QString url, mpDataMgr->mediaUrls()){ + QWidget* pWidget = mpMediaContainer->generateMediaWidget(url); + mpDataMgr->medias()->append(pWidget); + mpMediaContainer->addWidget(pWidget); + } + // Links foreach(sLink link, *mpDataMgr->urls()){ UBUrlWidget* urlWidget = new UBUrlWidget(this); urlWidget->setTitle(link.title); @@ -206,30 +212,36 @@ void UBTBPageEditWidget::updateFields() mUrls << urlWidget; mpLinks->addWidget(urlWidget); } - - // TODO: add the medias - + // Comments mpComments->document()->setPlainText(mpDataMgr->comments()); } void UBTBPageEditWidget::clearFields() { + // Title mpTitle->setText(""); - mpComments->setText(""); + // Actions foreach(UBTeacherStudentAction* pAction, mActions){ mpActions->removeWidget(pAction); DELETEPTR(pAction); } mActions.clear(); - + // Medias + foreach(QWidget* pMedia, *mpDataMgr->medias()){ + if(NULL != pMedia){ + mpMediaContainer->removeWidget(pMedia); + DELETEPTR(pMedia); + } + } + mpDataMgr->mediaUrls().clear(); + // Links foreach(UBUrlWidget* pLink, mUrls){ mpLinks->removeWidget(pLink); DELETEPTR(pLink); } mUrls.clear(); - - mpMediaContainer->cleanMedias(); - + // Comments + mpComments->setText(""); } // --------------------------------------------------------------------------------------------- From 2fcf84315b2ecc7a48f56e6b8223bdaf9a27b60b Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 23 Jan 2012 15:30:18 +0100 Subject: [PATCH 71/99] fixed video issue on linux --- src/core/UBDisplayManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp index 6ecdc679..96c25059 100644 --- a/src/core/UBDisplayManager.cpp +++ b/src/core/UBDisplayManager.cpp @@ -48,7 +48,7 @@ UBDisplayManager::UBDisplayManager(QObject *parent) void UBDisplayManager::initScreenIndexes() { - int screenCount = numScreens(); + int screenCount = 1;//= numScreens(); mScreenIndexesRoles.clear(); From 95380fc88125a04f23b6446f2939406f5ec60e1f Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 23 Jan 2012 15:30:30 +0100 Subject: [PATCH 72/99] fixed video issue on linux --- src/adaptors/UBImportDocument.cpp | 3 +- src/adaptors/UBImportImage.cpp | 1 - src/adaptors/UBImportPDF.cpp | 1 - src/customWidgets/UBMediaWidget.cpp | 29 +++++++++++--- src/customWidgets/UBMediaWidget.h | 1 + src/document/UBDocumentController.cpp | 2 - src/gui/UBTBPageEditWidget.cpp | 8 +++- src/gui/UBTeacherBarPreviewWidget.cpp | 56 +++++++++++++-------------- src/gui/UBTeacherBarPreviewWidget.h | 2 +- 9 files changed, 60 insertions(+), 43 deletions(-) diff --git a/src/adaptors/UBImportDocument.cpp b/src/adaptors/UBImportDocument.cpp index 17251ae5..f441b980 100644 --- a/src/adaptors/UBImportDocument.cpp +++ b/src/adaptors/UBImportDocument.cpp @@ -14,7 +14,6 @@ */ #include "UBImportDocument.h" -#include "UBMetadataDcSubsetAdaptor.h" #include "document/UBDocumentProxy.h" #include "frameworks/UBFileSystemUtils.h" @@ -49,7 +48,7 @@ QStringList UBImportDocument::supportedExtentions() QString UBImportDocument::importFileFilter() { - return tr("Sankore 3.1 (*.ubz)"); + return tr("Open-Sankore (*.ubz)"); } diff --git a/src/adaptors/UBImportImage.cpp b/src/adaptors/UBImportImage.cpp index 5418b1da..f2829dd6 100644 --- a/src/adaptors/UBImportImage.cpp +++ b/src/adaptors/UBImportImage.cpp @@ -14,7 +14,6 @@ */ #include "UBImportImage.h" -#include "UBMetadataDcSubsetAdaptor.h" #include "UBSvgSubsetAdaptor.h" #include "document/UBDocumentProxy.h" diff --git a/src/adaptors/UBImportPDF.cpp b/src/adaptors/UBImportPDF.cpp index b178b154..c8769996 100644 --- a/src/adaptors/UBImportPDF.cpp +++ b/src/adaptors/UBImportPDF.cpp @@ -14,7 +14,6 @@ */ #include "UBImportPDF.h" -#include "UBMetadataDcSubsetAdaptor.h" #include "UBSvgSubsetAdaptor.h" #include "document/UBDocumentProxy.h" diff --git a/src/customWidgets/UBMediaWidget.cpp b/src/customWidgets/UBMediaWidget.cpp index 572db702..c1809d93 100644 --- a/src/customWidgets/UBMediaWidget.cpp +++ b/src/customWidgets/UBMediaWidget.cpp @@ -103,6 +103,21 @@ eMediaType UBMediaWidget::mediaType() return mType; } +void UBMediaWidget::showEvent(QShowEvent* event) +{ + if(!mpVideoWidget){ + mpVideoWidget = new Phonon::VideoWidget(this); + mMediaLayout.addStretch(1); + mMediaLayout.addWidget(mpVideoWidget, 0); + mMediaLayout.addStretch(1); + Phonon::createPath(mpMediaObject, mpVideoWidget); + adaptSizeToVideo(); + mpMediaObject->play(); + mpMediaObject->stop(); + } + QWidget::showEvent(event); +} + /** * \brief Create the media player */ @@ -114,12 +129,14 @@ void UBMediaWidget::createMediaPlayer() if(eMediaType_Video == mType){ mMediaLayout.setContentsMargins(10, 10, 25, 10); - mpVideoWidget = new Phonon::VideoWidget(this); - mMediaLayout.addStretch(1); - mMediaLayout.addWidget(mpVideoWidget, 0); - mMediaLayout.addStretch(1); - Phonon::createPath(mpMediaObject, mpVideoWidget); - adaptSizeToVideo(); + if(isVisible()){ + mpVideoWidget = new Phonon::VideoWidget(this); + mMediaLayout.addStretch(1); + mMediaLayout.addWidget(mpVideoWidget, 0); + mMediaLayout.addStretch(1); + Phonon::createPath(mpMediaObject, mpVideoWidget); + adaptSizeToVideo(); + } mpAudioOutput = new Phonon::AudioOutput(Phonon::VideoCategory, this); Phonon::createPath(mpMediaObject, mpAudioOutput); }else if(eMediaType_Audio == mType){ diff --git a/src/customWidgets/UBMediaWidget.h b/src/customWidgets/UBMediaWidget.h index ba7d774b..ef8a65a2 100644 --- a/src/customWidgets/UBMediaWidget.h +++ b/src/customWidgets/UBMediaWidget.h @@ -71,6 +71,7 @@ public: protected: void resizeEvent(QResizeEvent* ev); + void showEvent(QShowEvent* event); private slots: void onPlayStopClicked(); diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index 7ee43999..9cae24db 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -37,7 +37,6 @@ #include "board/UBBoardPaletteManager.h" #include "board/UBDrawingController.h" -//#include "gui/UBKeyboardPalette.h" #include "gui/UBThumbnailView.h" #include "gui/UBDocumentTreeWidget.h" @@ -69,7 +68,6 @@ UBDocumentController::UBDocumentController(UBMainWindow* mainWindow) , mToolsPalette(0) , mToolsPalettePositionned(false) , mTrashTi(0) -// , mKeyboardPalette(0) { setupViews(); setupToolbar(); diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp index 5e512d52..f80c894f 100644 --- a/src/gui/UBTBPageEditWidget.cpp +++ b/src/gui/UBTBPageEditWidget.cpp @@ -200,9 +200,13 @@ void UBTBPageEditWidget::updateFields() } // Medias foreach(QString url, mpDataMgr->mediaUrls()){ + if(url.isEmpty()) + continue; QWidget* pWidget = mpMediaContainer->generateMediaWidget(url); - mpDataMgr->medias()->append(pWidget); - mpMediaContainer->addWidget(pWidget); + if(pWidget != NULL){ + mpDataMgr->medias()->append(pWidget); + mpMediaContainer->addWidget(pWidget); + } } // Links foreach(sLink link, *mpDataMgr->urls()){ diff --git a/src/gui/UBTeacherBarPreviewWidget.cpp b/src/gui/UBTeacherBarPreviewWidget.cpp index 662996df..2181a549 100644 --- a/src/gui/UBTeacherBarPreviewWidget.cpp +++ b/src/gui/UBTeacherBarPreviewWidget.cpp @@ -43,34 +43,34 @@ void UBTeacherBarPreviewMedia::loadWidgets(QList pWidgetsList, bool is } -int UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) -{ - int addedMedia = 0; -// foreach(QString eachString, pMedias){ -// if(!eachString.isEmpty()){ -// QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(eachString); -// if(mimeType.contains("image")){ -// UBDraggableLabel* label = new UBDraggableLabel(); -// label->loadImage(eachString); -// mWidget->addWidget(label); -// mWidgetList[label]=eachString; -// addedMedia += 1; -// } -// else if(mimeType.contains("video") || mimeType.contains("audio")){ -// UBDraggableMediaPlayer* mediaPlayer = new UBDraggableMediaPlayer(); -// mediaPlayer->setFile(eachString); -// mWidget->addWidget(mediaPlayer); -// mWidgetList[mediaPlayer] = eachString; -// addedMedia += 1; -// } -// else{ -// qWarning() << "pMediaPath" << eachString; -// qWarning() << "bad idea to come here"; -// } -// } -// } - return addedMedia; -} +//int UBTeacherBarPreviewMedia::loadMedia(QStringList pMedias) +//{ +// int addedMedia = 0; +//// foreach(QString eachString, pMedias){ +//// if(!eachString.isEmpty()){ +//// QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(eachString); +//// if(mimeType.contains("image")){ +//// UBDraggableLabel* label = new UBDraggableLabel(); +//// label->loadImage(eachString); +//// mWidget->addWidget(label); +//// mWidgetList[label]=eachString; +//// addedMedia += 1; +//// } +//// else if(mimeType.contains("video") || mimeType.contains("audio")){ +//// UBDraggableMediaPlayer* mediaPlayer = new UBDraggableMediaPlayer(); +//// mediaPlayer->setFile(eachString); +//// mWidget->addWidget(mediaPlayer); +//// mWidgetList[mediaPlayer] = eachString; +//// addedMedia += 1; +//// } +//// else{ +//// qWarning() << "pMediaPath" << eachString; +//// qWarning() << "bad idea to come here"; +//// } +//// } +//// } +// return addedMedia; +//} // ----------------------------------------------------------------------------------------------- UBActionPreview::UBActionPreview(QWidget *parent, const char *name):QWidget(parent) diff --git a/src/gui/UBTeacherBarPreviewWidget.h b/src/gui/UBTeacherBarPreviewWidget.h index db70b142..a7ff6e9b 100644 --- a/src/gui/UBTeacherBarPreviewWidget.h +++ b/src/gui/UBTeacherBarPreviewWidget.h @@ -15,7 +15,7 @@ class UBTeacherBarPreviewMedia : public QWidget public: UBTeacherBarPreviewMedia(QWidget* parent=0, const char* name="UBTeacherBarPreviewMedia"); ~UBTeacherBarPreviewMedia(); - int loadMedia(QStringList pMedias); +// int loadMedia(QStringList pMedias); void loadWidgets(QList pWidgetList, bool isResizable = true); void cleanMedia(); From 6e81d74d41f3cda36a47797e3877a9d07b19dfb4 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Mon, 23 Jan 2012 15:50:12 +0100 Subject: [PATCH 73/99] Added some logic for the Document description datas in the teacherbar --- src/core/UBPersistenceManager.cpp | 2 -- src/core/UBPersistenceManager.h | 3 +-- src/gui/UBTBDocumentEditWidget.cpp | 22 +++++++++++++++++-- src/gui/UBTBDocumentEditWidget.h | 3 +++ src/gui/UBTBPageEditWidget.cpp | 1 - src/gui/UBTeacherBarDataMgr.cpp | 27 ++++++++++++++++++------ src/gui/UBTeacherBarDataMgr.h | 2 +- src/gui/UBTeacherBarWidget.cpp | 34 +++++++++++++++++++++--------- src/gui/UBTeacherBarWidget.h | 4 +++- 9 files changed, 73 insertions(+), 25 deletions(-) diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index d3389c19..f0502955 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -1086,7 +1086,6 @@ void UBPersistenceManager::persistTeacherBar(UBDocumentProxy* pDocumentProxy, in // Set the element values QDomElement teacherBarElem = teacherBarNode.toElement(); teacherBarElem.setAttribute("title", infos.title); - teacherBarElem.setAttribute("duration", QString("%0").arg(infos.Duration)); QString qsAct; for(int i=0; isetSessionTitle(mpTitle->text()); + emit valueChanged(); +} +void UBTBDocumentEditWidget::onSessionTargetChanged() +{ + mpDataMgr->setSessionTarget(mpTarget->document()->toPlainText()); + emit valueChanged(); } -void UBTBDocumentEditWidget::clearFields() +void UBTBDocumentEditWidget::updateFields() { + mpTitle->setText(mpDataMgr->sessionTitle()); + mpTarget->setPlainText(mpDataMgr->sessionTarget()); +} +void UBTBDocumentEditWidget::clearFields() +{ + mpTitle->setText(""); + mpTarget->setPlainText(""); } + + diff --git a/src/gui/UBTBDocumentEditWidget.h b/src/gui/UBTBDocumentEditWidget.h index 705adcfe..147e5404 100644 --- a/src/gui/UBTBDocumentEditWidget.h +++ b/src/gui/UBTBDocumentEditWidget.h @@ -20,10 +20,13 @@ public: signals: void changeTBState(eTeacherBarState state); + void valueChanged(); private slots: void onPageView(); void onPreview(); + void onSessionTitleChanged(); + void onSessionTargetChanged(); private: QVBoxLayout mLayout; diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp index 5e512d52..c93a5332 100644 --- a/src/gui/UBTBPageEditWidget.cpp +++ b/src/gui/UBTBPageEditWidget.cpp @@ -42,7 +42,6 @@ UBTBPageEditWidget::UBTBPageEditWidget(UBTeacherBarDataMgr *pDataMgr, QWidget *p mpTitleLabel = new QLabel(tr("Title"), mpContainer); mpTitle = new QLineEdit(mpContainer); mpTitle->setObjectName("DockPaletteWidgetLineEdit"); - connect(mpTitle, SIGNAL(textChanged(const QString&)), this, SLOT(onTitleTextChanged(const QString&))); mContainerLayout.addWidget(mpTitleLabel, 0); mContainerLayout.addWidget(mpTitle, 0); diff --git a/src/gui/UBTeacherBarDataMgr.cpp b/src/gui/UBTeacherBarDataMgr.cpp index 8ee86c8c..857898d0 100644 --- a/src/gui/UBTeacherBarDataMgr.cpp +++ b/src/gui/UBTeacherBarDataMgr.cpp @@ -20,6 +20,7 @@ void UBTeacherBarDataMgr::clearLists() mActionList.clear(); mUrlList.clear(); mMediaList.clear(); + mMediaUrls.clear(); } void UBTeacherBarDataMgr::saveContent() @@ -27,40 +28,49 @@ void UBTeacherBarDataMgr::saveContent() // Store the page information in the UBZ sTeacherBarInfos infos; + // Page Title infos.title = mPageTitle; - // Actions foreach(sAction action, mActionList){ infos.actions << QString("%0;%1").arg(action.type).arg(action.content); } - // Media foreach(QString media, mMediaUrls){ infos.medias << media; } - // Links foreach(sLink link, mUrlList){ if("" != link.title && "" != link.link){ infos.urls << QString("%0;%1").arg(link.title).arg(link.link); } } - // Comments infos.comments = mComments; UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos); // TODO: Store the document metadata somewhere + // Session Title + //... = mSessionTitle; + // Session Target + //... = mSessionTarget; } -void UBTeacherBarDataMgr::loadContent() +void UBTeacherBarDataMgr::loadContent(bool docChanged) { clearLists(); sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); + if(docChanged){ + // TODO: Read these information from the metadata file + + // Session Title + //mSessionTitle = ...; + // Session Target + //mSessionTarget = ...; + } // Page Title mPageTitle = nextInfos.title; // Actions @@ -74,7 +84,12 @@ void UBTeacherBarDataMgr::loadContent() } } // Media URL - mMediaUrls = nextInfos.medias; + if((nextInfos.medias.size() == 1) && (nextInfos.medias.at(0) == "")){ + // Do not retrieve it + } + else{ + mMediaUrls = nextInfos.medias; + } // Links foreach(QString eachUrl, nextInfos.urls){ diff --git a/src/gui/UBTeacherBarDataMgr.h b/src/gui/UBTeacherBarDataMgr.h index 2c299474..3ac888be 100644 --- a/src/gui/UBTeacherBarDataMgr.h +++ b/src/gui/UBTeacherBarDataMgr.h @@ -68,7 +68,7 @@ public: // Others void clearLists(); void saveContent(); - void loadContent(); + void loadContent(bool docChanged = false); private: QString mSessionTitle; diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index d0bbc85b..7d8ab771 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -52,14 +52,16 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock mpStackWidget->addWidget(mpDocEditWidget); connect(UBApplication::boardController, SIGNAL(activeSceneWillChange()), this, SLOT(saveContent())); - connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(loadContent())); connect(UBApplication::mainWindow->actionQuit, SIGNAL(triggered()), this, SLOT(saveContent())); + connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(loadContentInfos())); + connect(UBApplication::boardController, SIGNAL(activeDocumentChanged()), this, SLOT(onActiveDocumentChanged())); connect(mpPreview, SIGNAL(showEditMode()), this, SLOT(onShowEditMode())); connect(mpDocPreviewWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState))); connect(mpDocEditWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState))); connect(mpPageEditWidget, SIGNAL(changeTBState(eTeacherBarState)), this, SLOT(onTBStateChanged(eTeacherBarState))); connect(mpPageEditWidget, SIGNAL(valueChanged()), this, SLOT(onValueChanged())); + connect(mpDocEditWidget, SIGNAL(valueChanged()), this, SLOT(onValueChanged())); } UBTeacherBarWidget::~UBTeacherBarWidget() @@ -71,6 +73,11 @@ UBTeacherBarWidget::~UBTeacherBarWidget() DELETEPTR(mpStackWidget); } +void UBTeacherBarWidget::onActiveDocumentChanged() +{ + loadContent(true); +} + void UBTeacherBarWidget::onValueChanged() { if(isEmpty()) @@ -93,22 +100,31 @@ void UBTeacherBarWidget::saveContent() mData.saveContent(); } -void UBTeacherBarWidget::loadContent() +void UBTeacherBarWidget::loadContentInfos() +{ + loadContent(false); +} + +void UBTeacherBarWidget::loadContent(bool docChanged) { // Clear the old datas mpPageEditWidget->clearFields(); mpPreview->clearFields(); - mpDocEditWidget->clearFields(); - mpDocPreviewWidget->clearFields(); + if(docChanged){ + mpDocEditWidget->clearFields(); + mpDocPreviewWidget->clearFields(); + } // Update the datas - mData.loadContent(); + mData.loadContent(docChanged); // Update the fields mpPageEditWidget->updateFields(); mpPreview->updateFields(); - mpDocEditWidget->updateFields(); - mpDocPreviewWidget->updateFields(); + if(docChanged){ + mpDocEditWidget->updateFields(); + mpDocPreviewWidget->updateFields(); + } if(!isEmpty()){ onTBStateChanged(eTeacherBarState_PagePreview); @@ -127,9 +143,7 @@ bool UBTeacherBarWidget::isEmpty() mData.urls()->empty() && mData.actions()->empty() && mData.medias()->empty() && - mData.comments() == "" && - mData.sessionTarget() == "" && - mData.sessionTitle() == ""; + mData.comments() == ""; } void UBTeacherBarWidget::onShowEditMode() diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index 6b38645b..2bea6677 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -34,12 +34,14 @@ public: private slots: void saveContent(); - void loadContent(); + void loadContentInfos(); void onValueChanged(); void onShowEditMode(); void onTBStateChanged(eTeacherBarState state); + void onActiveDocumentChanged(); private: + void loadContent(bool docChanged = false); bool isEmpty(); QVBoxLayout mLayout; From e3b51cc19e5bba3f6430501b3bfa3ab6445b63d8 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 24 Jan 2012 16:49:21 +0100 Subject: [PATCH 74/99] persisted session parameters --- src/adaptors/UBMetadataDcSubsetAdaptor.cpp | 23 ++++++++++- src/core/UBSettings.cpp | 3 ++ src/core/UBSettings.h | 3 ++ src/document/UBDocumentProxy.cpp | 44 ++++++++++++++++++++++ src/document/UBDocumentProxy.h | 6 +++ src/gui/UBTeacherBarDataMgr.cpp | 39 +++++++++++-------- src/gui/UBTeacherBarDataMgr.h | 5 +++ 7 files changed, 105 insertions(+), 18 deletions(-) diff --git a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp index a5dded62..7f6574c6 100644 --- a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp +++ b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp @@ -97,7 +97,7 @@ void UBMetadataDcSubsetAdaptor::persist(UBDocumentProxy* proxy) // introduced in UB 4.2 xmlWriter.writeTextElement(nsDc, "identifier", proxy->metaData(UBSettings::documentIdentifer).toString()); - xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri, "version", UBSettings::currentFileVersion); + xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri, "version", UBSettings::currentFileVersion); QString width = QString::number(proxy->defaultDocumentSize().width()); QString height = QString::number(proxy->defaultDocumentSize().height()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri, "size", QString("%1x%2").arg(width).arg(height)); @@ -105,6 +105,11 @@ void UBMetadataDcSubsetAdaptor::persist(UBDocumentProxy* proxy) // introduced in UB 4.4 xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri, "updated-at", proxy->metaData(UBSettings::documentUpdatedAt).toString()); + // introduced in OpenSankore 1.40.00 + xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionTitle,proxy->metaData(UBSettings::sessionTitle).toString()); + xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionTarget,proxy->metaData(UBSettings::sessionTarget).toString()); + xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionLicence,proxy->metaData(UBSettings::sessionLicence).toString()); + xmlWriter.writeEndElement(); //dc:Description xmlWriter.writeEndElement(); //RDF @@ -204,7 +209,21 @@ QMap UBMetadataDcSubsetAdaptor::load(QString pPath) metadata.insert(UBSettings::documentUpdatedAt, xml.readElementText()); updatedAtFound = true; } - + else if (xml.name() == UBSettings::sessionTitle // introduced in OpenSankore 1.40.00 + && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) + { + metadata.insert(UBSettings::sessionTitle, xml.readElementText()); + } + else if (xml.name() == UBSettings::sessionTarget // introduced in OpenSankore 1.40.00 + && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) + { + metadata.insert(UBSettings::sessionTarget, xml.readElementText()); + } + else if (xml.name() == UBSettings::sessionLicence // introduced in OpenSankore 1.40.00 + && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) + { + metadata.insert(UBSettings::sessionLicence, xml.readElementText()); + } metadata.insert(UBSettings::documentVersion, docVersion); } diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 0db96ae9..1ae24e61 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -36,6 +36,9 @@ QString UBSettings::documentSize = QString("Size"); QString UBSettings::documentIdentifer = QString("ID"); QString UBSettings::documentVersion = QString("Version"); QString UBSettings::documentUpdatedAt = QString("UpdatedAt"); +QString UBSettings::sessionTitle = QString("sessionTitle"); +QString UBSettings::sessionTarget = QString("sessionTarget"); +QString UBSettings::sessionLicence = QString("sessionLicence"); QString UBSettings::trashedDocumentGroupNamePrefix = QString("_Trash:"); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index dde60f13..e05c2599 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -153,6 +153,9 @@ class UBSettings : public QObject static QString documentIdentifer; static QString documentVersion; static QString documentUpdatedAt; + static QString sessionTitle; + static QString sessionTarget; + static QString sessionLicence; static QString trashedDocumentGroupNamePrefix; diff --git a/src/document/UBDocumentProxy.cpp b/src/document/UBDocumentProxy.cpp index 98c1c137..aa70a8a1 100644 --- a/src/document/UBDocumentProxy.cpp +++ b/src/document/UBDocumentProxy.cpp @@ -49,6 +49,10 @@ void UBDocumentProxy::init() setUuid(QUuid::createUuid()); setDefaultDocumentSize(UBSettings::settings()->defaultDocumentSize); + + setSessionTitle(""); + setSessionTarget(""); + setSessionLicence(""); } @@ -196,6 +200,46 @@ void UBDocumentProxy::setUuid(const QUuid& uuid) UBSettings::uniboardDocumentNamespaceUri + "/" + UBStringUtils::toCanonicalUuid(uuid)); } +QString UBDocumentProxy::sessionTitle() const +{ + if(mMetaDatas.contains(UBSettings::sessionTitle)) + return metaData(UBSettings::sessionTitle).toString(); + else + return QString(); +} + +void UBDocumentProxy::setSessionTitle(const QString & sessionTitle) +{ + setMetaData(UBSettings::sessionTitle,QVariant(sessionTitle)); +} + +QString UBDocumentProxy::sessionTarget() const +{ + if(mMetaDatas.contains(UBSettings::sessionTarget)) + return metaData(UBSettings::sessionTarget).toString(); + else + return QString(); +} + +void UBDocumentProxy::setSessionTarget(const QString & sessionTarget) +{ + setMetaData(UBSettings::sessionTarget,QVariant(sessionTarget)); +} + +QString UBDocumentProxy::sessionLicence() const +{ + if(mMetaDatas.contains(UBSettings::sessionLicence)) + return metaData(UBSettings::sessionLicence).toString(); + else + return QString(); +} + +void UBDocumentProxy::setSessionLicence(const QString & sessionLicence) +{ + setMetaData(UBSettings::sessionLicence,QVariant(sessionLicence)); +} + + bool UBDocumentProxy::isModified() const { return mIsModified; diff --git a/src/document/UBDocumentProxy.h b/src/document/UBDocumentProxy.h index 20edb47a..70d708bd 100644 --- a/src/document/UBDocumentProxy.h +++ b/src/document/UBDocumentProxy.h @@ -45,6 +45,12 @@ class UBDocumentProxy : public QObject QString name() const; QString groupName() const; + QString sessionTitle() const; + void setSessionTitle(const QString& sessionTitle); + QString sessionTarget() const; + void setSessionTarget(const QString& sessionTarget); + QString sessionLicence() const; + void setSessionLicence(const QString& sessionLicence); QSize defaultDocumentSize() const; void setDefaultDocumentSize(QSize pSize); diff --git a/src/gui/UBTeacherBarDataMgr.cpp b/src/gui/UBTeacherBarDataMgr.cpp index 857898d0..28cbcb24 100644 --- a/src/gui/UBTeacherBarDataMgr.cpp +++ b/src/gui/UBTeacherBarDataMgr.cpp @@ -1,9 +1,14 @@ +#include "UBTeacherBarDataMgr.h" + #include "core/UBApplication.h" #include "core/UBPersistenceManager.h" + #include "board/UBBoardController.h" + #include "customWidgets/UBGlobals.h" -#include "UBTeacherBarDataMgr.h" +#include "adaptors/UBMetadataDcSubsetAdaptor.h" + UBTeacherBarDataMgr::UBTeacherBarDataMgr() { @@ -47,30 +52,32 @@ void UBTeacherBarDataMgr::saveContent() // Comments infos.comments = mComments; - UBPersistenceManager::persistenceManager()->persistTeacherBar(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex(), infos); + UBDocumentProxy* documentProxy = UBApplication::boardController->activeDocument(); + if(documentProxy){ + UBPersistenceManager::persistenceManager()->persistTeacherBar(documentProxy, UBApplication::boardController->activeSceneIndex(), infos); - // TODO: Store the document metadata somewhere - // Session Title - //... = mSessionTitle; - // Session Target - //... = mSessionTarget; + documentProxy->setSessionTitle(mSessionTitle); + documentProxy->setSessionTarget(mSessionTarget); + documentProxy->setSessionLicence(mSessionLicence); + UBMetadataDcSubsetAdaptor::persist(documentProxy); + } } + + void UBTeacherBarDataMgr::loadContent(bool docChanged) { clearLists(); + UBDocumentProxy* documentProxy = UBApplication::boardController->activeDocument(); - sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); - - if(docChanged){ - // TODO: Read these information from the metadata file - - // Session Title - //mSessionTitle = ...; - // Session Target - //mSessionTarget = ...; + sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(documentProxy, UBApplication::boardController->activeSceneIndex()); + if(true/*docChanged*/){ + mSessionTitle = documentProxy->sessionTitle(); + mSessionTarget = documentProxy->sessionTarget(); + mSessionLicence = documentProxy->sessionLicence(); } + // Page Title mPageTitle = nextInfos.title; // Actions diff --git a/src/gui/UBTeacherBarDataMgr.h b/src/gui/UBTeacherBarDataMgr.h index 3ac888be..73c28cc1 100644 --- a/src/gui/UBTeacherBarDataMgr.h +++ b/src/gui/UBTeacherBarDataMgr.h @@ -46,6 +46,10 @@ public: void setSessionTarget(const QString& target){mSessionTarget = target;} QString sessionTarget(){return mSessionTarget;} + // Licence + void setSessionLicence(const QString& licence){mSessionLicence = licence;} + QString sessionLicence(){return mSessionLicence;} + // Page Title void setPageTitle(const QString& title){mPageTitle = title;} QString pageTitle(){return mPageTitle;} @@ -73,6 +77,7 @@ public: private: QString mSessionTitle; QString mSessionTarget; + QString mSessionLicence; QString mPageTitle; QString mComments; From a375322955dce53a30b19345f1b1d5bd50595093 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 25 Jan 2012 08:47:02 +0100 Subject: [PATCH 75/99] Backup --- resources/images/licenses/ccby.png | Bin 0 -> 4739 bytes resources/images/licenses/ccbync.png | Bin 0 -> 5145 bytes resources/images/licenses/ccbyncnd.png | Bin 0 -> 5281 bytes resources/images/licenses/ccbyncsa.png | Bin 0 -> 5460 bytes resources/images/licenses/ccbynd.png | Bin 0 -> 4880 bytes resources/images/licenses/ccbysa.png | Bin 0 -> 5083 bytes resources/style.qss | 20 +- src/customWidgets/UBWidgetList.cpp | 2 +- src/gui/UBTeacherBarPreviewWidget.cpp | 245 ++++++++++++++----------- src/gui/UBTeacherBarPreviewWidget.h | 65 ++++--- src/gui/UBTeacherBarWidget.cpp | 16 +- 11 files changed, 207 insertions(+), 141 deletions(-) create mode 100644 resources/images/licenses/ccby.png create mode 100644 resources/images/licenses/ccbync.png create mode 100644 resources/images/licenses/ccbyncnd.png create mode 100644 resources/images/licenses/ccbyncsa.png create mode 100644 resources/images/licenses/ccbynd.png create mode 100644 resources/images/licenses/ccbysa.png diff --git a/resources/images/licenses/ccby.png b/resources/images/licenses/ccby.png new file mode 100644 index 0000000000000000000000000000000000000000..822491edb993b072fc183a2ce23adfa8c94cee7c GIT binary patch literal 4739 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 RjS2t&002ovPDHLkV1k=~?l=Gd literal 0 HcmV?d00001 diff --git a/resources/images/licenses/ccbync.png b/resources/images/licenses/ccbync.png new file mode 100644 index 0000000000000000000000000000000000000000..5f982147075ad08691e3b3c53e92633ca0ddcb2f GIT binary patch literal 5145 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 z znK5|=0|Nsz$KZ525eNjR_6`gT(6+`p0H~|0Lnf2Kvp;zjec@jGcYYqZ+&pq}4!N8R zMbAs93RFd|066>lS?q55 zDduzYn9t=P=W@u&3kWWf@cFVQ+*ts0OULPIgw19H00e`TF>#0Lo?xCMHj=XuiI-A!g@W=aw}Gc!ZFySoX`^R(ag9oxy| z2MKaJF+n;5onJ+A3A4~C?Fw{auUmk{VnJW14{!bHt%|pdf@iuR%QD8tV|cm!<;tg+ z!E6|JGmO#a!t0gdm%`GYT`4w-vECKv%xm(!IC(SjM`E+t${sPB%|-@(J3tcm;^cN> zg1qs&H&(3$gpeiAjrS_WUkKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}000TRNkl>p7_TNF?Gz|-X9|>*$|8wrT04?Len3qstKp}8C{oKXFeOZszd{`vt>YBS zl47kBu>4TQVz7tyrIO{eGqqNG`mow-tu0%!149}(GuOM;-TUp`Z_hpVyXP)PL?({o zrtyV+;zmRq2Y>+JbpI*vJP)4dVK5lL^9C4r9=xG+oZk{TC1Mqo%wn-r%Fl~>k`+Z^#Fi6%Es<;lpeNU0gi&`?%gN)X5RFC=kH;~S zpV0xWHm$~{O`FjAomRBpe;@~EjSzi`pen3VKf>UsYatwEe0b7#B=aJ>&Mj8R81YSSS;w? z-Hn!(+aVW=C>CYNa;X$$$a0Z+c)2HkJoPb-^gWO9^f&;(Znwi`vjG4kNrEVf0DvZI z6Sljy9Sw=yYAjNq4JC#sDJ5w1J&6Q|K&8P;X0w^RUN2>{Sz5|Mp%9tPX4bCB+C=Av1}P~eDV7|f z!J%^$9Xv~C#D04FuW!-m{!?_~t>a|1S_uF-olYH|hBN;j8ulB<|D-ET)~1R$!9ak1 z@V)O}G0tMoyciAu;sL-=ior&M0Y-z~b8R*oQmGU?9uLfB^OE7g>2zXZVuB5&@$@(j z`48)2InNY{szwsA1k&j=1VKReu3c3_kkjdeAP5*wk7Fc}(#6X0^f)%GUyoaxZ(+ax zrmqjr`u#Y0`ZS*2xeJq%lQrR7X@7L{&0uVhV#yedj9#GNks$LNo6T0$Yb#kcn>XTwOX0CXrrL%>))Uo zZ)l*FZ{0?Z|M*b?Kwhtx4jwp20O;r&Z`6cyrTwYk!KxSgpY^kN8w!Q0dTk{$o6U$u zqpYp}pueQ0OCHRXG&Rp7J(h;uZeI}NIy*a=mv?q{>gpOA8eq5Ebu)W9t>Uz|x8s3r z+b}sfi8KBExbcPt{AcDe9(wp8jJ^Lpwrt&66Ha-5zShuKu`Gq78L!DSo>!%qrWU%o zy4X-(iJ8r21Ofp7z|_RKF+gk=e?Oi(^eZ^WI?;Y_8vtN97Q=8XhWh$?aI1_}amvF%x&1vev1EVB zJXn2TZH0EzO*gR%+-^6EGtp=inM?+qot=2(kw@V3`PlF{cI+4=NrKz$W*Qj)T3T8V z4u>(5pHc4vuIvb`Tel9PC?b=|=;B@|6k-HxFRNUGilPXs)v8-r&Byu4qmN-Y7Q>Og zAOPTl4>RcAu@jq`H{+r-ia&(I_;6~nD$X5u-MOTfR_c#VMI@yJT^hT{X8mY1xGi1zvR(wa4EX!Vy?Q!o&q>FMcZ<5aUsI64*aS=ueP-2&@6DomGnoaB0%~qR(U+p zX2)l0Au$IO^)^aNDil#!P+& zPN$Q_y+|aoU?S5do{o-=MeDToZnqnKeSKJMT8;DX4q|q87PEy}6yyR51zAl76=h`q zmBRtw0j4EwHXCd<8_Z@iL{Vffy;_pya{e-&JK$$Yn$Hr4C3}W145O~D4!%7;M2+d(MPVMnTHaVGDo6|`aO~){ zk*;I}$C5)>wW<#1&z*$f;^Al z3JLiC_k=qSfNkm6TU%hUSO5S%pRZ!Sc~DMb(e@L^p>EtN_wE3;IdNfR6bNtaTT7>U!~{d?K(pQAGOPuEi}N~RJdtsvo^ z&1T8#_39Gt8#isF(f1@uN(t)m^n4!4C2qbb?e+Aa!y&+EG~%%TFkboND=XeI@;&2) zEXx=kj^l~Po~Y$Jf;s(I%Cr%cZH`v>e=(fJ+GzKvhOrb*rG8co5#^=V)1!Lwr4+p! z{ykYNmYUy~#bTl0kswKzQk0Yu^y2Scthw#{NY3 zD8T@*;pX+|_3T0YT1(k(M0vUqI^C*$crrCPiC-TI;M~Bu<$h{(MWLZuNLUUrpA^oL z1Z#GC%k5}uZ^O;sycu6MnM$8d%>@`D!gM~53&{&Oee(3OiT$)Z_-cs3H4*%Ut=u>w nx}M{>e}6&6r?9{v;{G=P#je}ohm3se00000NkvXXu0mjfV@n6v literal 0 HcmV?d00001 diff --git a/resources/images/licenses/ccbyncsa.png b/resources/images/licenses/ccbyncsa.png new file mode 100644 index 0000000000000000000000000000000000000000..0f2a0f10722d3fabffe8af5d5eed09866e25909a GIT binary patch literal 5460 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 literal 0 HcmV?d00001 diff --git a/resources/style.qss b/resources/style.qss index d80964a1..bdb0966a 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -13,6 +13,13 @@ QWidget#UBTBMediaContainer border: 2px solid #999999; } +QFrame#UBTBSeparator +{ + background: #DDDDDD; + border-radius: 2px; + border: 1px solid #DDDDDD; +} + QWidget#UBMediaVideoContainer { background: #000000; @@ -27,11 +34,17 @@ QWidget#UBTeacherBarPreviewWidget border: 2px solid #999999; } +QLabel#UBTBPreviewSessionTitle +{ + font-size: 12px; +} + QLabel#UBTeacherBarPreviewTitle { color: #555555; - font-size : 18px; + font-size : 20px; font-weight:bold; + padding-left:5px; } QLabel#UBMediaPlayerButton @@ -44,7 +57,7 @@ QLabel#UBTeacherBarPreviewSubtitle color: #555555; font-size : 15px; font-weight:bold; - padding-top: 10px; + padding-left:5px; } QWidget#UBLibWebView @@ -61,7 +74,8 @@ QWidget#UBActionPreviewOwner font-weight: bold; } -QWidget#UBTeacherBarPreviewComments +QWidget#UBTeacherBarPreviewComments, +QWidget#UBTeacherBarTargetBox { border-radius: 10px; border: white 2px solid; diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 0ba01bb0..6481acb4 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -57,7 +57,7 @@ void UBWidgetList::addWidget(QWidget *widget) void UBWidgetList::removeWidget(QWidget *widget) { - if(NULL != mpLayout){ + if(NULL != mpLayout && NULL != widget){ mpLayout->removeWidget(widget); mWidgetInfo.remove(widget); widget->setVisible(false); diff --git a/src/gui/UBTeacherBarPreviewWidget.cpp b/src/gui/UBTeacherBarPreviewWidget.cpp index 2181a549..7d2ad585 100644 --- a/src/gui/UBTeacherBarPreviewWidget.cpp +++ b/src/gui/UBTeacherBarPreviewWidget.cpp @@ -1,5 +1,6 @@ #include "core/UBApplication.h" #include "customWidgets/UBGlobals.h" +#include "board/UBBoardController.h" #include "frameworks/UBFileSystemUtils.h" #include "UBTeacherBarPreviewWidget.h" @@ -84,9 +85,10 @@ UBActionPreview::UBActionPreview(QWidget *parent, const char *name):QWidget(pare mOwnerLayout.addWidget(mpOwner, 0); mOwnerLayout.addStretch(1); mLayout.addLayout(&mOwnerLayout); - mpContent = new QLabel(this); + mpContent = new QTextEdit(this); + mpContent->setReadOnly(true); mpContent->setObjectName("UBActionPreviewContent"); - mpContent->setWordWrap(true); + //mpContent->setWordWrap(true); mLayout.addWidget(mpContent); setContentsMargins(-9, -9, -9, -9); } @@ -103,10 +105,10 @@ UBActionPreview::~UBActionPreview() } } -void UBActionPreview::setOwner(const QString &owner) +void UBActionPreview::setOwner(int owner) { if(NULL != mpOwner && NULL != mpContent){ - switch(owner.toInt()){ + switch(owner){ case eActionOwner_Teacher: mpOwner->setText(tr("Teacher")); mpContent->setStyleSheet("background:lightblue; border:lightblue;"); @@ -124,6 +126,7 @@ void UBActionPreview::setContent(const QString &content) { if(NULL != mpContent){ mpContent->setText(content); + setMinimumHeight(mpOwner->height() + mpContent->height()); } } @@ -136,19 +139,30 @@ UBTBPreviewContainer::UBTBPreviewContainer(QWidget *parent, const char *name):UB UBTBPreviewContainer::~UBTBPreviewContainer() { +} +// ------------------------------------------------------------------------------------ +UBTBPreviewSeparator::UBTBPreviewSeparator(QWidget *parent, const char *name):QFrame(parent) +{ + setObjectName("UBTBSeparator"); + setMinimumHeight(5); + setMaximumHeight(5); +} + +UBTBPreviewSeparator::~UBTBPreviewSeparator() +{ + } // ------------------------------------------------------------------------------------ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataMgr, QWidget *parent, const char *name):QWidget(parent) , mpEditButton(NULL) + , mpSessionTitle(NULL) , mpTitle(NULL) - , mpDuration(NULL) - , mpActionsLabel(NULL) - , mpMediaLabel(NULL) - , mpCommentsLabel(NULL) - , mpComments(NULL) - , mpLinksLabel(NULL) + , mpTitleLabel(NULL) + , mpPageNbrLabel(NULL) , mpContentContainer(NULL) + , mpScheduleLabel(NULL) + , mpLicenseLabel(NULL) { setObjectName(name); mpDataMgr = pDataMgr; @@ -158,23 +172,45 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataM setStyleSheet(UBApplication::globalStyleSheet()); // Build the Preview widget - // Title + duration - mpTitle = new QLabel(this); + // Session Title + mTitleContainer.setLayout(&mTitleLayout); + mpSessionTitle = new QLabel(this); + mpSessionTitle->setText(tr("Session: ")); + mpSessionTitle->setWordWrap(true); + mpSessionTitle->setAlignment(Qt::AlignRight); + mpSessionTitle->setObjectName("UBTBPreviewSessionTitle"); + mLayout.addWidget(mpSessionTitle); + + // Title + mTitleContainer.setLayout(&mTitleLayout); + mTitleLayout.setContentsMargins(0, 0, 0, 0); + mpTitleLabel = new QLabel(&mTitleContainer); + mpTitleLabel->setText(tr("Activity")); + mpTitleLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mTitleLayout.addWidget(mpTitleLabel, 0); + mpTitle = new QLabel(&mTitleContainer); mpTitle->setObjectName("UBTeacherBarPreviewTitle"); mpTitle->setWordWrap(true); - mpTitle->setAlignment(Qt::AlignCenter); - mpDuration = new QLabel(this); - mTitleDurationLayout.addWidget(mpTitle, 0); - mTitleDurationLayout.addWidget(mpDuration, 1); - mLayout.addLayout(&mTitleDurationLayout, 0); - + mpTitle->setAlignment(Qt::AlignLeft); + mTitleLayout.addWidget(mpTitle, 1); + mpPageNbrLabel = new QLabel(tr("Page n° "), &mTitleContainer); + mpPageNbrLabel->setAlignment(Qt::AlignRight); + mpPageNbrLabel->setObjectName("UBTBPreviewSessionTitle"); + mTitleLayout.addWidget(mpPageNbrLabel); + mTitleLayout.addWidget(&mTitleSeparator); + mLayout.addWidget(&mTitleContainer); + + // Content mpContentContainer = new UBTBPreviewContainer(this); mLayout.addWidget(mpContentContainer, 1); - //mLayout.addWidget(&mMediaViewer, 1); - // The next line is disgusting. This is a quickfix that must be reworked later - mMediaViewer.setContentsMargins(-9, -9, -9, -9); - hideElements(); + // License + mLayout.addWidget(&mLicenseSeparator); + mpLicenseLabel = new QLabel(tr("License"), this); + mpLicenseLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mLayout.addWidget(mpLicenseLabel); + // TODO : Add the license field here + // Edit button mpEditButton = new QPushButton(tr("Edit infos"), this); @@ -186,128 +222,121 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataM connect(mpEditButton, SIGNAL(clicked()), this, SLOT(onEdit())); + connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(onActiveSceneChanged())); } UBTeacherBarPreviewWidget::~UBTeacherBarPreviewWidget() { - DELETEPTR(mpLinksLabel); - DELETEPTR(mpComments); - DELETEPTR(mpTitle); - DELETEPTR(mpDuration); - DELETEPTR(mpActionsLabel); - DELETEPTR(mpMediaLabel); - DELETEPTR(mpCommentsLabel); - DELETEPTR(mpContentContainer); DELETEPTR(mpEditButton); + DELETEPTR(mpLicenseLabel); + DELETEPTR(mpScheduleLabel); + DELETEPTR(mpPageNbrLabel); + DELETEPTR(mpTitle); + DELETEPTR(mpTitleLabel); + DELETEPTR(mpSessionTitle); } -void UBTeacherBarPreviewWidget::onEdit() +void UBTeacherBarPreviewWidget::onActiveSceneChanged() { - emit showEditMode(); + mpPageNbrLabel->setText(tr("Page n° %0").arg(UBApplication::boardController->activeSceneIndex())); } -void UBTeacherBarPreviewWidget::setTitle(const QString &title) +void UBTeacherBarPreviewWidget::onEdit() { - if(NULL != mpTitle){ - mpTitle->setText(title); - } + emit showEditMode(); } -void UBTeacherBarPreviewWidget::setComments(const QString &comments) +void UBTeacherBarPreviewWidget::updateFields() { - if("" != comments){ - mWidgets.clear(); - mpComments->setText(comments); - mpComments->setVisible(true); - mpCommentsLabel->setVisible(true); - mWidgets << mpCommentsLabel; - mMediaViewer.loadWidgets(mWidgets, false); - mWidgets.clear(); - mWidgets << mpComments; - mMediaViewer.loadWidgets(mWidgets, true); + // First, remove the previous elements + if(!mStoredWidgets.empty()){ + foreach(QWidget* pW, mStoredWidgets){ + mpContentContainer->removeWidget(pW); + if( pW->objectName() == "UBActionPreview" || + pW->objectName() == "UBLinkPreview" || + pW->objectName() == "UBCommentsPreview"){ + // Here we delete all preview widget excepting the media because they are handled by the data manager + delete pW; + pW = NULL; + } + } + mStoredWidgets.clear(); } -} -void UBTeacherBarPreviewWidget::clean() -{ - mMediaViewer.cleanMedia(); + // Session Title + mpSessionTitle->setText(mpDataMgr->sessionTitle()); - foreach(QWidget* eachWidget, mStoredWidgets){ - delete eachWidget; - eachWidget = NULL; + // Page Title + if("" != mpDataMgr->pageTitle()){ + mpTitle->setText(mpDataMgr->pageTitle()); + mpPageNbrLabel->setText(tr("Page n° %0").arg(UBApplication::boardController->activeSceneIndex())); + mTitleContainer.setVisible(true); + }else{ + mTitleContainer.setVisible(false); } - mStoredWidgets.clear(); - hideElements(); + // Actions + generateActions(); + + // Media + generateMedias(); + + // Links + generateLinks(); + + // Comments + generateComments(); + } -void UBTeacherBarPreviewWidget::hideElements() +void UBTeacherBarPreviewWidget::clearFields() { - mpActionsLabel = new QLabel(tr("Actions"), this); - mpActionsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - mpMediaLabel = new QLabel(tr("Medias"), this); - mpMediaLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - mpCommentsLabel = new QLabel(tr("Comments"), this); - mpCommentsLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - mpComments = new QLabel(this); - mpComments->setWordWrap(true); - mpComments->setObjectName("UBTeacherBarPreviewComments"); - mpLinksLabel = new QLabel(tr("Links"), this); - mpLinksLabel->setObjectName("UBTeacherBarPreviewSubtitle"); - - mpActionsLabel->setVisible(false); - mpMediaLabel->setVisible(false); - mpCommentsLabel->setVisible(false); - mpComments->setVisible(false); - mpLinksLabel->setVisible(false); + } -void UBTeacherBarPreviewWidget::setActions(QStringList actions) +void UBTeacherBarPreviewWidget::generateActions() { - if(!actions.empty()){ - mWidgets.clear(); - mpActionsLabel->setVisible(true); - mWidgets << mpActionsLabel; - mediaViewer()->loadWidgets(mWidgets,false); - mWidgets.clear(); - foreach(QString action, actions){ - QStringList desc = action.split(';'); - if(2 <= desc.size()){ - QString owner = desc.at(0); - QString act = desc.at(1); - mpTmpAction = new UBActionPreview(this); - mpTmpAction->setOwner(owner); - mpTmpAction->setContent(act); - mWidgets << mpTmpAction; - } + if(!mpDataMgr->actions()->empty()){ + foreach(sAction act, *mpDataMgr->actions()){ + mpTmpAction = new UBActionPreview(this); + mpTmpAction->setOwner(act.type); + mpTmpAction->setContent(act.content); + mpContentContainer->addWidget(mpTmpAction); + mStoredWidgets << mpTmpAction; } - mMediaViewer.loadWidgets(mWidgets, true); } } -void UBTeacherBarPreviewWidget::setLinks(QStringList links) +void UBTeacherBarPreviewWidget::generateMedias() { - if(!links.empty()){ - mWidgets.clear(); - mpLinksLabel->setVisible(true); - mWidgets << mpLinksLabel; - mMediaViewer.loadWidgets(mWidgets, false); - mWidgets.clear(); - foreach(QString link, links){ - mpTmpLink = new QLabel(link, this); - mpTmpLink->setOpenExternalLinks(true); - mWidgets << mpTmpLink; + foreach(QWidget* pMedia, *mpDataMgr->medias()){ + if(NULL != pMedia){ + mpContentContainer->addWidget(pMedia); + mStoredWidgets << pMedia; } - mMediaViewer.loadWidgets(mWidgets, true); } } -void UBTeacherBarPreviewWidget::updateFields() +void UBTeacherBarPreviewWidget::generateLinks() { - + if(!mpDataMgr->urls()->empty()){ + foreach(sLink link, *mpDataMgr->urls()){ + mpTmpLink = new QLabel(QString("%1").arg(link.link).arg(link.title), this); + mpTmpLink->setObjectName("UBLinkPreview"); + mpContentContainer->addWidget(mpTmpLink); + mStoredWidgets << mpTmpLink; + } + } } -void UBTeacherBarPreviewWidget::clearFields() +void UBTeacherBarPreviewWidget::generateComments() { - + if("" != mpDataMgr->comments()){ + mpTmpComment = new QTextEdit(this); + mpTmpComment->setObjectName("UBCommentPreview"); + mpTmpComment->setPlainText(mpDataMgr->comments()); + mpTmpComment->setReadOnly(true); + mpContentContainer->addWidget(mpTmpComment); + mStoredWidgets << mpTmpComment; + } } diff --git a/src/gui/UBTeacherBarPreviewWidget.h b/src/gui/UBTeacherBarPreviewWidget.h index a7ff6e9b..882bfc01 100644 --- a/src/gui/UBTeacherBarPreviewWidget.h +++ b/src/gui/UBTeacherBarPreviewWidget.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "core/UBPersistenceManager.h" #include "customWidgets/UBWidgetList.h" @@ -30,12 +31,12 @@ class UBActionPreview : public QWidget public: UBActionPreview(QWidget* parent=0, const char* name="UBActionPreview"); ~UBActionPreview(); - void setOwner(const QString& owner); + void setOwner(int owner); void setContent(const QString& content); private: QLabel* mpOwner; - QLabel* mpContent; + QTextEdit* mpContent; QVBoxLayout mLayout; QHBoxLayout mOwnerLayout; @@ -48,19 +49,19 @@ public: ~UBTBPreviewContainer(); }; +class UBTBPreviewSeparator : public QFrame +{ +public: + UBTBPreviewSeparator(QWidget* parent=0, const char* name="UBTBPreviewSeparator"); + ~UBTBPreviewSeparator(); +}; + class UBTeacherBarPreviewWidget : public QWidget { Q_OBJECT public: UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataMgr, QWidget* parent=0, const char* name="UBTeacherBarPreviewWidget"); ~UBTeacherBarPreviewWidget(); - UBTeacherBarPreviewMedia* mediaViewer() {return &mMediaViewer;} - void setTitle(const QString& title); - void setComments(const QString& comments); - void setActions(QStringList actions); - void setLinks(QStringList links); - void clean(); - QLabel* mediaLabel() { return mpMediaLabel;} void updateFields(); void clearFields(); @@ -69,29 +70,47 @@ signals: private slots: void onEdit(); + void onActiveSceneChanged(); private: - void hideElements(); + void generateActions(); + void generateMedias(); + void generateLinks(); + void generateComments(); QVBoxLayout mLayout; QHBoxLayout mEditLayout; - QHBoxLayout mTitleDurationLayout; - UBTeacherBarPreviewMedia mMediaViewer; - QList mWidgets; - QList mStoredWidgets; - QPushButton* mpEditButton; + + // Titles + QVBoxLayout mTitleLayout; + UBTBPreviewSeparator mTitleSeparator; + QWidget mTitleContainer; + QLabel* mpSessionTitle; QLabel* mpTitle; - QLabel* mpDuration; - QLabel* mpActionsLabel; - QLabel* mpMediaLabel; - QLabel* mpCommentsLabel; - QLabel* mpComments; - QLabel* mpLinksLabel; - QLabel* mpTmpLink; - UBActionPreview* mpTmpAction; + QLabel* mpTitleLabel; + QLabel* mpPageNbrLabel; UBTBPreviewContainer* mpContentContainer; + + // Schedule + QLabel* mpScheduleLabel; + + // License + UBTBPreviewSeparator mLicenseSeparator; + QLabel* mpLicenseLabel; + + /** Pointer to the datas */ UBTeacherBarDataMgr* mpDataMgr; + /** The list of stored widgets */ + QList mStoredWidgets; + /** A temporary action widget */ + UBActionPreview* mpTmpAction; + /** A temporary media widget */ + UBTeacherBarPreviewMedia* mpTmpMedia; + /** A temporary link */ + QLabel* mpTmpLink; + /** A temporary comments field */ + QTextEdit* mpTmpComment; }; #endif // UBTEACHERBARPREVIEWWIDGET_H diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 7d8ab771..322b3f91 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -39,13 +39,13 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock // Create the GUI setLayout(&mLayout); - mpPageEditWidget = new UBTBPageEditWidget(&mData, this); - mpPreview = new UBTeacherBarPreviewWidget(&mData, this); - mpDocPreviewWidget = new UBTBDocumentPreviewWidget(&mData, this); - mpDocEditWidget = new UBTBDocumentEditWidget(&mData, this); - mpStackWidget = new QStackedWidget(this); mLayout.addWidget(mpStackWidget); + mpPageEditWidget = new UBTBPageEditWidget(&mData, mpStackWidget); + mpPreview = new UBTeacherBarPreviewWidget(&mData, mpStackWidget); + mpDocPreviewWidget = new UBTBDocumentPreviewWidget(&mData, mpStackWidget); + mpDocEditWidget = new UBTBDocumentEditWidget(&mData, mpStackWidget); + mpStackWidget->addWidget(mpPageEditWidget); mpStackWidget->addWidget(mpPreview); mpStackWidget->addWidget(mpDocPreviewWidget); @@ -120,7 +120,7 @@ void UBTeacherBarWidget::loadContent(bool docChanged) // Update the fields mpPageEditWidget->updateFields(); - mpPreview->updateFields(); + //mpPreview->updateFields(); if(docChanged){ mpDocEditWidget->updateFields(); mpDocPreviewWidget->updateFields(); @@ -155,15 +155,19 @@ void UBTeacherBarWidget::onTBStateChanged(eTeacherBarState state) { switch(state){ case eTeacherBarState_DocumentEdit: + //mpDocEditWidget->updateFields(); mpStackWidget->setCurrentWidget(mpDocEditWidget); break; case eTeacherBarState_DocumentPreview: + //mpDocPreviewWidget->updateFields(); mpStackWidget->setCurrentWidget(mpDocPreviewWidget); break; case eTeacherBarState_PageEdit: + mpPageEditWidget->updateFields(); mpStackWidget->setCurrentWidget(mpPageEditWidget); break; case eTeacherBarState_PagePreview: + mpPreview->updateFields(); mpStackWidget->setCurrentWidget(mpPreview); break; } From b8e15166984256f7f6af131e9df89fc31a21628d Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 25 Jan 2012 14:18:20 +0100 Subject: [PATCH 76/99] Backuping some rework on the teacherbar --- src/gui/UBTBPageEditWidget.cpp | 41 ++++++++++---- src/gui/UBTBPageEditWidget.h | 3 ++ src/gui/UBTeacherBarPreviewWidget.cpp | 77 +++++++++++++++++++-------- src/gui/UBTeacherBarPreviewWidget.h | 14 +++++ src/gui/UBTeacherBarWidget.cpp | 5 +- 5 files changed, 108 insertions(+), 32 deletions(-) diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp index 4abda81d..4173aba1 100644 --- a/src/gui/UBTBPageEditWidget.cpp +++ b/src/gui/UBTBPageEditWidget.cpp @@ -29,7 +29,7 @@ UBTBPageEditWidget::UBTBPageEditWidget(UBTeacherBarDataMgr *pDataMgr, QWidget *p mUrls.clear(); setAttribute(Qt::WA_StyledBackground, true); setStyleSheet(UBApplication::globalStyleSheet()); - + mClearingFields = false; mLayout.setContentsMargins(0, 0, 0, 0); setLayout(&mLayout); @@ -120,14 +120,18 @@ UBTBPageEditWidget::~UBTBPageEditWidget() void UBTBPageEditWidget::onTitleChanged() { - mpDataMgr->setPageTitle(mpTitle->text()); - emit valueChanged(); + if(!mClearingFields){ + mpDataMgr->setPageTitle(mpTitle->text()); + emit valueChanged(); + } } void UBTBPageEditWidget::onCommentsChanged() { - mpDataMgr->setComments(mpComments->document()->toPlainText()); - emit valueChanged(); + if(!mClearingFields){ + mpDataMgr->setComments(mpComments->document()->toPlainText()); + emit valueChanged(); + } } void UBTBPageEditWidget::onActionButton() @@ -135,6 +139,7 @@ void UBTBPageEditWidget::onActionButton() UBTeacherStudentAction* pAction = new UBTeacherStudentAction(this); mActions << pAction; mpActions->addWidget(pAction); + emit valueChanged(); } void UBTBPageEditWidget::onLinkButton() @@ -142,6 +147,7 @@ void UBTBPageEditWidget::onLinkButton() UBUrlWidget* pUrl = new UBUrlWidget(this); mUrls << pUrl; mpLinks->addWidget(pUrl); + emit valueChanged(); } void UBTBPageEditWidget::onMediaDropped(const QString &url) @@ -149,9 +155,12 @@ void UBTBPageEditWidget::onMediaDropped(const QString &url) if("" != url){ QWidget* pMedia = mpMediaContainer->generateMediaWidget(url); if(NULL != pMedia){ - mpDataMgr->medias()->append(pMedia); - mpDataMgr->addMediaUrl(url); + mMedias << pMedia; + mMediaUrls << url; + //mpDataMgr->medias()->append(pMedia); + //mpDataMgr->addMediaUrl(url); mpMediaContainer->addWidget(pMedia); + emit valueChanged(); } } } @@ -170,6 +179,8 @@ void UBTBPageEditWidget::saveFields() { mpDataMgr->actions()->clear(); mpDataMgr->urls()->clear(); + mpDataMgr->mediaUrls().clear(); + mpDataMgr->medias()->clear(); foreach(UBTeacherStudentAction* pAct, mActions){ sAction action; @@ -183,6 +194,12 @@ void UBTBPageEditWidget::saveFields() link.link = pUrl->url(); mpDataMgr->urls()->append(link); } + foreach(QString url, mMediaUrls){ + mpDataMgr->mediaUrls().append(url); + } + foreach(QWidget* pMedia, mMedias){ + mpDataMgr->medias()->append(pMedia); + } } void UBTBPageEditWidget::updateFields() @@ -203,7 +220,7 @@ void UBTBPageEditWidget::updateFields() continue; QWidget* pWidget = mpMediaContainer->generateMediaWidget(url); if(pWidget != NULL){ - mpDataMgr->medias()->append(pWidget); + mMedias << pWidget; mpMediaContainer->addWidget(pWidget); } } @@ -221,6 +238,7 @@ void UBTBPageEditWidget::updateFields() void UBTBPageEditWidget::clearFields() { + mClearingFields = true; // Title mpTitle->setText(""); // Actions @@ -230,13 +248,14 @@ void UBTBPageEditWidget::clearFields() } mActions.clear(); // Medias - foreach(QWidget* pMedia, *mpDataMgr->medias()){ + foreach(QWidget* pMedia, mMedias){ if(NULL != pMedia){ mpMediaContainer->removeWidget(pMedia); DELETEPTR(pMedia); } } - mpDataMgr->mediaUrls().clear(); + mMedias.clear(); + mMediaUrls.clear(); // Links foreach(UBUrlWidget* pLink, mUrls){ mpLinks->removeWidget(pLink); @@ -245,6 +264,8 @@ void UBTBPageEditWidget::clearFields() mUrls.clear(); // Comments mpComments->setText(""); + + mClearingFields = false; } // --------------------------------------------------------------------------------------------- diff --git a/src/gui/UBTBPageEditWidget.h b/src/gui/UBTBPageEditWidget.h index fa56047d..0f3c61b9 100644 --- a/src/gui/UBTBPageEditWidget.h +++ b/src/gui/UBTBPageEditWidget.h @@ -133,6 +133,9 @@ private: QVector mActions; QVector mUrls; + QVector mMedias; + QStringList mMediaUrls; + bool mClearingFields; }; #endif // UBTBPAGEEDITWIDGET_H diff --git a/src/gui/UBTeacherBarPreviewWidget.cpp b/src/gui/UBTeacherBarPreviewWidget.cpp index 7d2ad585..9b7b136f 100644 --- a/src/gui/UBTeacherBarPreviewWidget.cpp +++ b/src/gui/UBTeacherBarPreviewWidget.cpp @@ -248,23 +248,13 @@ void UBTeacherBarPreviewWidget::onEdit() void UBTeacherBarPreviewWidget::updateFields() { - // First, remove the previous elements - if(!mStoredWidgets.empty()){ - foreach(QWidget* pW, mStoredWidgets){ - mpContentContainer->removeWidget(pW); - if( pW->objectName() == "UBActionPreview" || - pW->objectName() == "UBLinkPreview" || - pW->objectName() == "UBCommentsPreview"){ - // Here we delete all preview widget excepting the media because they are handled by the data manager - delete pW; - pW = NULL; - } - } - mStoredWidgets.clear(); - } - // Session Title - mpSessionTitle->setText(mpDataMgr->sessionTitle()); + if("" != mpDataMgr->sessionTitle()){ + mpSessionTitle->setText(mpDataMgr->sessionTitle()); + mpSessionTitle->setVisible(true); + }else{ + mpSessionTitle->setVisible(false); + } // Page Title if("" != mpDataMgr->pageTitle()){ @@ -279,7 +269,7 @@ void UBTeacherBarPreviewWidget::updateFields() generateActions(); // Media - generateMedias(); + //generateMedias(); // Links generateLinks(); @@ -291,7 +281,20 @@ void UBTeacherBarPreviewWidget::updateFields() void UBTeacherBarPreviewWidget::clearFields() { + // Session Title + mpSessionTitle->setText(""); + + // Page Title + mpTitle->setText(""); + // Medias + if(!mStoredWidgets.empty()){ + foreach(QWidget* pW, mStoredWidgets){ + mpContentContainer->removeWidget(pW); + DELETEPTR(pW); + } + mStoredWidgets.clear(); + } } void UBTeacherBarPreviewWidget::generateActions() @@ -309,10 +312,25 @@ void UBTeacherBarPreviewWidget::generateActions() void UBTeacherBarPreviewWidget::generateMedias() { - foreach(QWidget* pMedia, *mpDataMgr->medias()){ - if(NULL != pMedia){ - mpContentContainer->addWidget(pMedia); - mStoredWidgets << pMedia; + if(isVisible()){ + foreach(QString mediaUrl, mpDataMgr->mediaUrls()){ + QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(mediaUrl); + if(mimeType.contains("image")){ + QPixmap pix = QPixmap(mediaUrl); + QLabel* label = new QLabel(); + pix.scaledToWidth(label->width()); + label->resize(pix.width(), pix.height()); + label->setPixmap(pix); + label->setScaledContents(true); + mStoredWidgets << label; + mpContentContainer->addWidget(label); + } + else if(mimeType.contains("video") || mimeType.contains("audio")){ + UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); + mediaPlayer->setFile(mediaUrl); + mStoredWidgets << mediaPlayer; + mpContentContainer->addWidget(mediaPlayer); + } } } } @@ -323,6 +341,7 @@ void UBTeacherBarPreviewWidget::generateLinks() foreach(sLink link, *mpDataMgr->urls()){ mpTmpLink = new QLabel(QString("%1").arg(link.link).arg(link.title), this); mpTmpLink->setObjectName("UBLinkPreview"); + mpTmpLink->setOpenExternalLinks(true); mpContentContainer->addWidget(mpTmpLink); mStoredWidgets << mpTmpLink; } @@ -340,3 +359,19 @@ void UBTeacherBarPreviewWidget::generateComments() mStoredWidgets << mpTmpComment; } } + +void UBTeacherBarPreviewWidget::showEvent(QShowEvent* ev) +{ + //updateFields(); +} + +// ----------------------------------------------------------------------------------------------------- +UBDraggableMedia::UBDraggableMedia(eMediaType type, QWidget *parent, const char *name):UBMediaWidget(type, parent, name) +{ + +} + +UBDraggableMedia::~UBDraggableMedia() +{ + +} diff --git a/src/gui/UBTeacherBarPreviewWidget.h b/src/gui/UBTeacherBarPreviewWidget.h index 882bfc01..36b75f38 100644 --- a/src/gui/UBTeacherBarPreviewWidget.h +++ b/src/gui/UBTeacherBarPreviewWidget.h @@ -8,6 +8,7 @@ #include "core/UBPersistenceManager.h" #include "customWidgets/UBWidgetList.h" +#include "customWidgets/UBMediaWidget.h" #include "UBTeacherBarDataMgr.h" class UBTeacherBarPreviewMedia : public QWidget @@ -56,6 +57,14 @@ public: ~UBTBPreviewSeparator(); }; +class UBDraggableMedia : public UBMediaWidget +{ +public: + UBDraggableMedia(eMediaType type = eMediaType_Video, QWidget* parent=0, const char* name="UBDraggableMedia"); + ~UBDraggableMedia(); + +}; + class UBTeacherBarPreviewWidget : public QWidget { Q_OBJECT @@ -68,6 +77,9 @@ public: signals: void showEditMode(); +protected: + void showEvent(QShowEvent* ev); + private slots: void onEdit(); void onActiveSceneChanged(); @@ -111,6 +123,8 @@ private: QLabel* mpTmpLink; /** A temporary comments field */ QTextEdit* mpTmpComment; + /** A temporary media object */ + UBDraggableMedia* mTmpMedia; }; #endif // UBTEACHERBARPREVIEWWIDGET_H diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 322b3f91..1198fdd9 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -148,7 +148,7 @@ bool UBTeacherBarWidget::isEmpty() void UBTeacherBarWidget::onShowEditMode() { - mpStackWidget->setCurrentWidget(mpPageEditWidget); + onTBStateChanged(eTeacherBarState_PageEdit); } void UBTeacherBarWidget::onTBStateChanged(eTeacherBarState state) @@ -163,10 +163,13 @@ void UBTeacherBarWidget::onTBStateChanged(eTeacherBarState state) mpStackWidget->setCurrentWidget(mpDocPreviewWidget); break; case eTeacherBarState_PageEdit: + mpPageEditWidget->clearFields(); mpPageEditWidget->updateFields(); mpStackWidget->setCurrentWidget(mpPageEditWidget); break; case eTeacherBarState_PagePreview: + saveContent(); + mpPreview->clearFields(); mpPreview->updateFields(); mpStackWidget->setCurrentWidget(mpPreview); break; From 628f213f1b0a4d9cb5d8d5c3a49b6c386e6b1726 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 25 Jan 2012 16:02:10 +0100 Subject: [PATCH 77/99] Progressing with the medias into the new teacherbar --- src/gui/UBTBPageEditWidget.cpp | 21 ++++++++++++--------- src/gui/UBTeacherBarDataMgr.cpp | 3 --- src/gui/UBTeacherBarDataMgr.h | 2 +- src/gui/UBTeacherBarPreviewWidget.cpp | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp index 4173aba1..39f6716c 100644 --- a/src/gui/UBTBPageEditWidget.cpp +++ b/src/gui/UBTBPageEditWidget.cpp @@ -179,7 +179,7 @@ void UBTBPageEditWidget::saveFields() { mpDataMgr->actions()->clear(); mpDataMgr->urls()->clear(); - mpDataMgr->mediaUrls().clear(); + mpDataMgr->mediaUrls()->clear(); mpDataMgr->medias()->clear(); foreach(UBTeacherStudentAction* pAct, mActions){ @@ -195,7 +195,8 @@ void UBTBPageEditWidget::saveFields() mpDataMgr->urls()->append(link); } foreach(QString url, mMediaUrls){ - mpDataMgr->mediaUrls().append(url); + qDebug() << "saving media :" << url; + mpDataMgr->mediaUrls()->append(url); } foreach(QWidget* pMedia, mMedias){ mpDataMgr->medias()->append(pMedia); @@ -215,15 +216,17 @@ void UBTBPageEditWidget::updateFields() mpActions->addWidget(pAction); } // Medias - foreach(QString url, mpDataMgr->mediaUrls()){ - if(url.isEmpty()) - continue; - QWidget* pWidget = mpMediaContainer->generateMediaWidget(url); - if(pWidget != NULL){ - mMedias << pWidget; - mpMediaContainer->addWidget(pWidget); + foreach(QString url, *mpDataMgr->mediaUrls()){ + if(!url.isEmpty()){ + mMediaUrls << url; + QWidget* pWidget = mpMediaContainer->generateMediaWidget(url); + if(pWidget != NULL){ + mMedias << pWidget; + mpMediaContainer->addWidget(pWidget); + } } } + // Links foreach(sLink link, *mpDataMgr->urls()){ UBUrlWidget* urlWidget = new UBUrlWidget(this); diff --git a/src/gui/UBTeacherBarDataMgr.cpp b/src/gui/UBTeacherBarDataMgr.cpp index 28cbcb24..b612aa57 100644 --- a/src/gui/UBTeacherBarDataMgr.cpp +++ b/src/gui/UBTeacherBarDataMgr.cpp @@ -111,8 +111,5 @@ void UBTeacherBarDataMgr::loadContent(bool docChanged) // Comments mComments = nextInfos.comments; - - // TODO : Read the document metadata file and populate the metadata infos here - } diff --git a/src/gui/UBTeacherBarDataMgr.h b/src/gui/UBTeacherBarDataMgr.h index 73c28cc1..3158dab6 100644 --- a/src/gui/UBTeacherBarDataMgr.h +++ b/src/gui/UBTeacherBarDataMgr.h @@ -60,7 +60,7 @@ public: // Medias QVector* medias(){return &mMediaList;} void addMediaUrl(const QString& url){mMediaUrls << url;} - QStringList mediaUrls(){return mMediaUrls;} + QStringList* mediaUrls(){return &mMediaUrls;} // Urls QVector* urls(){return &mUrlList;} diff --git a/src/gui/UBTeacherBarPreviewWidget.cpp b/src/gui/UBTeacherBarPreviewWidget.cpp index 9b7b136f..1779ddcf 100644 --- a/src/gui/UBTeacherBarPreviewWidget.cpp +++ b/src/gui/UBTeacherBarPreviewWidget.cpp @@ -313,7 +313,7 @@ void UBTeacherBarPreviewWidget::generateActions() void UBTeacherBarPreviewWidget::generateMedias() { if(isVisible()){ - foreach(QString mediaUrl, mpDataMgr->mediaUrls()){ + foreach(QString mediaUrl, *mpDataMgr->mediaUrls()){ QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(mediaUrl); if(mimeType.contains("image")){ QPixmap pix = QPixmap(mediaUrl); From d461e3a7867a4362abe88f64c89f054c98c96245 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 25 Jan 2012 16:20:04 +0100 Subject: [PATCH 78/99] Enabled the display of the media in the teacher bar page preview --- src/gui/UBTeacherBarPreviewWidget.cpp | 4 ++-- src/gui/UBTeacherBarWidget.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/UBTeacherBarPreviewWidget.cpp b/src/gui/UBTeacherBarPreviewWidget.cpp index 1779ddcf..fb225ef8 100644 --- a/src/gui/UBTeacherBarPreviewWidget.cpp +++ b/src/gui/UBTeacherBarPreviewWidget.cpp @@ -269,7 +269,7 @@ void UBTeacherBarPreviewWidget::updateFields() generateActions(); // Media - //generateMedias(); + generateMedias(); // Links generateLinks(); @@ -362,7 +362,7 @@ void UBTeacherBarPreviewWidget::generateComments() void UBTeacherBarPreviewWidget::showEvent(QShowEvent* ev) { - //updateFields(); + updateFields(); } // ----------------------------------------------------------------------------------------------------- diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 1198fdd9..3a66e246 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -170,7 +170,7 @@ void UBTeacherBarWidget::onTBStateChanged(eTeacherBarState state) case eTeacherBarState_PagePreview: saveContent(); mpPreview->clearFields(); - mpPreview->updateFields(); + //mpPreview->updateFields(); mpStackWidget->setCurrentWidget(mpPreview); break; } From 5ce549f174ca646ff739fe4f09f424e749027304 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 26 Jan 2012 15:45:22 +0100 Subject: [PATCH 79/99] Implemented the drag and drop from the teacherbar to the board --- src/board/UBBoardView.cpp | 3 +- src/customWidgets/UBDraggableMedia.cpp | 42 ++++++++++++++++++++++++++ src/customWidgets/UBDraggableMedia.h | 19 ++++++++++++ src/customWidgets/UBMediaWidget.h | 4 +-- src/customWidgets/customWidgets.pri | 6 ++-- src/gui/UBTeacherBarPreviewWidget.cpp | 24 +++------------ src/gui/UBTeacherBarPreviewWidget.h | 12 +++----- src/gui/UBTeacherBarWidget.cpp | 4 ++- 8 files changed, 81 insertions(+), 33 deletions(-) create mode 100644 src/customWidgets/UBDraggableMedia.cpp create mode 100644 src/customWidgets/UBDraggableMedia.h diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 4cbfe088..5bd63181 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -47,6 +47,7 @@ #include "document/UBDocumentProxy.h" #include "customWidgets/UBDraggableLabel.h" +#include "customWidgets/UBDraggableMedia.h" #include "core/memcheck.h" @@ -727,7 +728,7 @@ void UBBoardView::dropEvent (QDropEvent *event) { qDebug() << event->source(); - if(!event->source() || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source())) + if(!event->source() || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source()) || dynamic_cast(event->source())) { mController->processMimeData (event->mimeData (), mapToScene (event->pos ())); event->acceptProposedAction (); diff --git a/src/customWidgets/UBDraggableMedia.cpp b/src/customWidgets/UBDraggableMedia.cpp new file mode 100644 index 00000000..6d2551f2 --- /dev/null +++ b/src/customWidgets/UBDraggableMedia.cpp @@ -0,0 +1,42 @@ +#include +#include + +#include "UBDraggableMedia.h" + +UBDraggableMedia::UBDraggableMedia(eMediaType type, QWidget *parent, const char *name):UBMediaWidget(type, parent, name) +{ + +} + +UBDraggableMedia::~UBDraggableMedia() +{ + +} + +void UBDraggableMedia::mousePressEvent(QMouseEvent* ev) +{ + if(Qt::LeftButton == ev->button()){ + mDragStartPos = ev->pos(); + } +} + +void UBDraggableMedia::mouseMoveEvent(QMouseEvent* ev) +{ + if(!(ev->buttons() & Qt::LeftButton)){ + return; + } + if((ev->pos() - mDragStartPos).manhattanLength() < QApplication::startDragDistance()){ + return; + } + QDrag *drag = new QDrag(this); + QMimeData *mimeData = new QMimeData; + + QList urls; + urls << QUrl(mFilePath); + mimeData->setText(mFilePath); + mimeData->setUrls(urls); + + drag->setMimeData(mimeData); + + Qt::DropAction dropAction = drag->exec(Qt::CopyAction | Qt::MoveAction); +} diff --git a/src/customWidgets/UBDraggableMedia.h b/src/customWidgets/UBDraggableMedia.h new file mode 100644 index 00000000..b45c9391 --- /dev/null +++ b/src/customWidgets/UBDraggableMedia.h @@ -0,0 +1,19 @@ +#ifndef UBDRAGGABLEMEDIA_H +#define UBDRAGGABLEMEDIA_H + +#include "UBMediaWidget.h" + +class UBDraggableMedia : public UBMediaWidget +{ +public: + UBDraggableMedia(eMediaType type = eMediaType_Video, QWidget* parent=0, const char* name="UBDraggableMedia"); + ~UBDraggableMedia(); +protected: + void mousePressEvent(QMouseEvent* ev); + void mouseMoveEvent(QMouseEvent* ev); + +private: + QPoint mDragStartPos; +}; + +#endif // UBDRAGGABLEMEDIA_H diff --git a/src/customWidgets/UBMediaWidget.h b/src/customWidgets/UBMediaWidget.h index ef8a65a2..5192c3c7 100644 --- a/src/customWidgets/UBMediaWidget.h +++ b/src/customWidgets/UBMediaWidget.h @@ -72,6 +72,8 @@ public: protected: void resizeEvent(QResizeEvent* ev); void showEvent(QShowEvent* event); + /** The current media file path */ + QString mFilePath; private slots: void onPlayStopClicked(); @@ -85,8 +87,6 @@ private: void createMediaPlayer(); void adaptSizeToVideo(); - /** The current media file path */ - QString mFilePath; /** The current media type */ eMediaType mType; /** The media object */ diff --git a/src/customWidgets/customWidgets.pri b/src/customWidgets/customWidgets.pri index e46249f5..aa7b0255 100644 --- a/src/customWidgets/customWidgets.pri +++ b/src/customWidgets/customWidgets.pri @@ -2,8 +2,10 @@ HEADERS += src/customWidgets/UBWidgetList.h \ src/customWidgets/UBDraggableLabel.h \ src/customWidgets/UBMediaWidget.h \ - src/customWidgets/UBGlobals.h + src/customWidgets/UBGlobals.h \ + src/customWidgets/UBDraggableMedia.h SOURCES += src/customWidgets/UBWidgetList.cpp \ src/customWidgets/UBDraggableLabel.cpp \ - src/customWidgets/UBMediaWidget.cpp + src/customWidgets/UBMediaWidget.cpp \ + src/customWidgets/UBDraggableMedia.cpp diff --git a/src/gui/UBTeacherBarPreviewWidget.cpp b/src/gui/UBTeacherBarPreviewWidget.cpp index fb225ef8..43331956 100644 --- a/src/gui/UBTeacherBarPreviewWidget.cpp +++ b/src/gui/UBTeacherBarPreviewWidget.cpp @@ -316,17 +316,13 @@ void UBTeacherBarPreviewWidget::generateMedias() foreach(QString mediaUrl, *mpDataMgr->mediaUrls()){ QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(mediaUrl); if(mimeType.contains("image")){ - QPixmap pix = QPixmap(mediaUrl); - QLabel* label = new QLabel(); - pix.scaledToWidth(label->width()); - label->resize(pix.width(), pix.height()); - label->setPixmap(pix); - label->setScaledContents(true); - mStoredWidgets << label; - mpContentContainer->addWidget(label); + mpTmpLabel = new UBDraggableLabel(); + mpTmpLabel->loadImage(mediaUrl); + mStoredWidgets << mpTmpLabel; + mpContentContainer->addWidget(mpTmpLabel); } else if(mimeType.contains("video") || mimeType.contains("audio")){ - UBMediaWidget* mediaPlayer = new UBMediaWidget(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); + UBDraggableMedia* mediaPlayer = new UBDraggableMedia(mimeType.contains("audio")?eMediaType_Audio:eMediaType_Video); mediaPlayer->setFile(mediaUrl); mStoredWidgets << mediaPlayer; mpContentContainer->addWidget(mediaPlayer); @@ -365,13 +361,3 @@ void UBTeacherBarPreviewWidget::showEvent(QShowEvent* ev) updateFields(); } -// ----------------------------------------------------------------------------------------------------- -UBDraggableMedia::UBDraggableMedia(eMediaType type, QWidget *parent, const char *name):UBMediaWidget(type, parent, name) -{ - -} - -UBDraggableMedia::~UBDraggableMedia() -{ - -} diff --git a/src/gui/UBTeacherBarPreviewWidget.h b/src/gui/UBTeacherBarPreviewWidget.h index 36b75f38..c1820777 100644 --- a/src/gui/UBTeacherBarPreviewWidget.h +++ b/src/gui/UBTeacherBarPreviewWidget.h @@ -9,6 +9,8 @@ #include "core/UBPersistenceManager.h" #include "customWidgets/UBWidgetList.h" #include "customWidgets/UBMediaWidget.h" +#include "customWidgets/UBDraggableMedia.h" +#include "customWidgets/UBDraggableLabel.h" #include "UBTeacherBarDataMgr.h" class UBTeacherBarPreviewMedia : public QWidget @@ -57,14 +59,6 @@ public: ~UBTBPreviewSeparator(); }; -class UBDraggableMedia : public UBMediaWidget -{ -public: - UBDraggableMedia(eMediaType type = eMediaType_Video, QWidget* parent=0, const char* name="UBDraggableMedia"); - ~UBDraggableMedia(); - -}; - class UBTeacherBarPreviewWidget : public QWidget { Q_OBJECT @@ -125,6 +119,8 @@ private: QTextEdit* mpTmpComment; /** A temporary media object */ UBDraggableMedia* mTmpMedia; + /** A temporary label object */ + UBDraggableLabel* mpTmpLabel; }; #endif // UBTEACHERBARPREVIEWWIDGET_H diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 3a66e246..8b988526 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -170,7 +170,9 @@ void UBTeacherBarWidget::onTBStateChanged(eTeacherBarState state) case eTeacherBarState_PagePreview: saveContent(); mpPreview->clearFields(); - //mpPreview->updateFields(); + if(mpPreview->isVisible()){ + mpPreview->updateFields(); + } mpStackWidget->setCurrentWidget(mpPreview); break; } From d6af845cf01635d892e37c9a960028cd4a001fd0 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 27 Jan 2012 14:41:13 +0100 Subject: [PATCH 80/99] src/adaptors --- resources/sankore.qrc | 6 +++ resources/style.qss | 5 ++- src/gui/UBTBDocumentEditWidget.cpp | 23 ++++++++++ src/gui/UBTBDocumentEditWidget.h | 6 +++ src/gui/UBTeacherBarDataMgr.cpp | 65 ++++++++++++++++++++++++++- src/gui/UBTeacherBarDataMgr.h | 36 +++++++++++++-- src/gui/UBTeacherBarPreviewWidget.cpp | 29 +++++------- src/gui/UBTeacherBarPreviewWidget.h | 16 +++---- 8 files changed, 149 insertions(+), 37 deletions(-) diff --git a/resources/sankore.qrc b/resources/sankore.qrc index 8601be9f..d81ac808 100644 --- a/resources/sankore.qrc +++ b/resources/sankore.qrc @@ -341,5 +341,11 @@ images/duration1.png images/duration2.png images/duration3.png + images/licenses/ccby.png + images/licenses/ccbync.png + images/licenses/ccbyncnd.png + images/licenses/ccbyncsa.png + images/licenses/ccbynd.png + images/licenses/ccbysa.png diff --git a/resources/style.qss b/resources/style.qss index bdb0966a..8ce2d992 100644 --- a/resources/style.qss +++ b/resources/style.qss @@ -83,10 +83,11 @@ QWidget#UBTeacherBarTargetBox background-color: white; } -QWidget#UBActionPreviewContent +QWidget#UBActionPreviewContent, +QTextEdit#UBCommentPreview { border-radius : 10px; - border: 2px solid; + border: 2px solid #999999; padding: 5px 5px 5px 5px; } diff --git a/src/gui/UBTBDocumentEditWidget.cpp b/src/gui/UBTBDocumentEditWidget.cpp index 618dc0ca..1d93900c 100644 --- a/src/gui/UBTBDocumentEditWidget.cpp +++ b/src/gui/UBTBDocumentEditWidget.cpp @@ -10,6 +10,7 @@ UBTBDocumentEditWidget::UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QW , mpTarget(NULL) , mpMetadataLabel(NULL) , mpLicenseLabel(NULL) + , mpLicenseCombox(NULL) { setObjectName(name); @@ -31,6 +32,7 @@ UBTBDocumentEditWidget::UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QW mpTitle = new QLineEdit(mpContainer); mpTitle->setObjectName("DockPaletteWidgetLineEdit"); mContainerLayout.addWidget(mpTitle, 0); + mContainerLayout.addWidget(&mTitleSeparator); // Target mpTargetLabel = new QLabel(tr("Session Target"), mpContainer); @@ -39,18 +41,31 @@ UBTBDocumentEditWidget::UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QW mpTarget = new QTextEdit(mpContainer); mpTarget->setObjectName("UBTeacherBarTargetBox"); mContainerLayout.addWidget(mpTarget, 1); + mContainerLayout.addWidget(&mTargetSeparator); // Metadata mpMetadataLabel = new QLabel(tr("Metadata"), mpContainer); mpMetadataLabel->setAlignment(Qt::AlignLeft); //mpMetadataLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mContainerLayout.addWidget(mpMetadataLabel, 0); + mContainerLayout.addWidget(&mLicenseSeparator); // License mpLicenseLabel = new QLabel(tr("License"), mpContainer); mpLicenseLabel->setAlignment(Qt::AlignLeft); //mpLicenseLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mContainerLayout.addWidget(mpLicenseLabel, 0); + mpLicenseCombox = new QComboBox(this); + mpLicenseCombox->setObjectName("DockPaletteWidgetComboBox"); + QStringList qslLicenses; + qslLicenses << "CC BY"; + qslLicenses << "CC BY-ND"; + qslLicenses << "CC BY-NC-SA"; + qslLicenses << "CC BY-SA"; + qslLicenses << "CC BY-NC"; + qslLicenses << "CC BY-NC-ND"; + mpLicenseCombox->addItems(qslLicenses); + mContainerLayout.addWidget(mpLicenseCombox); mpPageViewButton = new QPushButton(tr("Page View"), this); mpPageViewButton->setObjectName("DockPaletteWidgetButton"); @@ -65,6 +80,7 @@ UBTBDocumentEditWidget::UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QW connect(mpPreviewButton, SIGNAL(clicked()), this, SLOT(onPreview())); connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onSessionTitleChanged())); connect(mpTarget, SIGNAL(textChanged()), this, SLOT(onSessionTargetChanged())); + connect(mpLicenseCombox, SIGNAL(currentIndexChanged(int)), this, SLOT(onLicenseCurrentIndexChanged(int))); } UBTBDocumentEditWidget::~UBTBDocumentEditWidget() @@ -75,6 +91,7 @@ UBTBDocumentEditWidget::~UBTBDocumentEditWidget() DELETEPTR(mpTarget); DELETEPTR(mpMetadataLabel); DELETEPTR(mpLicenseLabel); + DELETEPTR(mpLicenseCombox); DELETEPTR(mpPageViewButton); DELETEPTR(mpPreviewButton); } @@ -101,6 +118,12 @@ void UBTBDocumentEditWidget::onSessionTargetChanged() emit valueChanged(); } +void UBTBDocumentEditWidget::onLicenseCurrentIndexChanged(int selection) +{ + mpDataMgr->setSessionLicence((eLicense)selection); + emit valueChanged(); +} + void UBTBDocumentEditWidget::updateFields() { mpTitle->setText(mpDataMgr->sessionTitle()); diff --git a/src/gui/UBTBDocumentEditWidget.h b/src/gui/UBTBDocumentEditWidget.h index 147e5404..8cfb7ff9 100644 --- a/src/gui/UBTBDocumentEditWidget.h +++ b/src/gui/UBTBDocumentEditWidget.h @@ -6,6 +6,7 @@ #include #include #include +#include #include "UBTeacherBarDataMgr.h" @@ -27,6 +28,7 @@ private slots: void onPreview(); void onSessionTitleChanged(); void onSessionTargetChanged(); + void onLicenseCurrentIndexChanged(int selection); private: QVBoxLayout mLayout; @@ -35,6 +37,9 @@ private: QVBoxLayout mContainerLayout; QPushButton* mpPageViewButton; QPushButton* mpPreviewButton; + UBTBSeparator mTitleSeparator; + UBTBSeparator mTargetSeparator; + UBTBSeparator mLicenseSeparator; QWidget* mpContainer; QLabel* mpTitleLabel; @@ -43,6 +48,7 @@ private: QTextEdit* mpTarget; QLabel* mpMetadataLabel; QLabel* mpLicenseLabel; + QComboBox* mpLicenseCombox; UBTeacherBarDataMgr* mpDataMgr; }; diff --git a/src/gui/UBTeacherBarDataMgr.cpp b/src/gui/UBTeacherBarDataMgr.cpp index b612aa57..4233e58a 100644 --- a/src/gui/UBTeacherBarDataMgr.cpp +++ b/src/gui/UBTeacherBarDataMgr.cpp @@ -58,7 +58,7 @@ void UBTeacherBarDataMgr::saveContent() documentProxy->setSessionTitle(mSessionTitle); documentProxy->setSessionTarget(mSessionTarget); - documentProxy->setSessionLicence(mSessionLicence); + documentProxy->setSessionLicence(QString("%0").arg(mSessionLicence)); UBMetadataDcSubsetAdaptor::persist(documentProxy); } @@ -75,7 +75,7 @@ void UBTeacherBarDataMgr::loadContent(bool docChanged) if(true/*docChanged*/){ mSessionTitle = documentProxy->sessionTitle(); mSessionTarget = documentProxy->sessionTarget(); - mSessionLicence = documentProxy->sessionLicence(); + mSessionLicence = (eLicense)documentProxy->sessionLicence().toInt(); } // Page Title @@ -113,3 +113,64 @@ void UBTeacherBarDataMgr::loadContent(bool docChanged) mComments = nextInfos.comments; } +// ------------------------------------------------------------------------------------ +UBTBSeparator::UBTBSeparator(QWidget *parent, const char *name):QFrame(parent) +{ + setObjectName("UBTBSeparator"); + setMinimumHeight(5); + setMaximumHeight(5); +} + +UBTBSeparator::~UBTBSeparator() +{ + +} + +// ------------------------------------------------------------------------------------ +UBTBLicenseWidget::UBTBLicenseWidget(QWidget *parent, const char *name):QWidget(parent) +{ + setObjectName(name); + setLayout(&mLayout); + + mpIcon = new QLabel(this); + mpText = new QLabel(this); + mpText->setWordWrap(true); + mLayout.addWidget(mpIcon); + mLayout.addWidget(mpText); +} + +UBTBLicenseWidget::~UBTBLicenseWidget() +{ + DELETEPTR(mpIcon); + DELETEPTR(mpText); +} + +void UBTBLicenseWidget::setLicense(eLicense lic) +{ + switch(lic){ + case eLicense_CCBY: + mpIcon->setPixmap(QPixmap(":images/licenses/ccby.png")); + mpText->setText(tr("Creative Common License %0").arg("CC BY")); + break; + case eLicense_CCBYND: + mpIcon->setPixmap(QPixmap(":images/licenses/ccbynd.png")); + mpText->setText(tr("Creative Common License %0").arg("CC BY-ND")); + break; + case eLicense_CCBYNCSA: + mpIcon->setPixmap(QPixmap(":images/licenses/ccbyncsa.png")); + mpText->setText(tr("Creative Common License %0").arg("CC BY-NC-SA")); + break; + case eLicense_CCBYSA: + mpIcon->setPixmap(QPixmap(":images/licenses/ccbysa.png")); + mpText->setText(tr("Creative Common License %0").arg("CC BY-SA")); + break; + case eLicense_CCBYNC: + mpIcon->setPixmap(QPixmap(":images/licenses/ccbync.png")); + mpText->setText(tr("Creative Common License %0").arg("CC BY-NC")); + break; + case eLicense_CCBYNCND: + mpIcon->setPixmap(QPixmap(":images/licenses/ccbyncnd.png")); + mpText->setText(tr("Creative Common License %0").arg("CC BY-NC-ND")); + break; + } +} diff --git a/src/gui/UBTeacherBarDataMgr.h b/src/gui/UBTeacherBarDataMgr.h index 3158dab6..7ddca7e9 100644 --- a/src/gui/UBTeacherBarDataMgr.h +++ b/src/gui/UBTeacherBarDataMgr.h @@ -9,6 +9,7 @@ #include #include #include +#include typedef enum{ eTeacherBarState_DocumentEdit, @@ -32,6 +33,35 @@ typedef struct{ QString link; }sLink; +typedef enum{ + eLicense_CCBY, + eLicense_CCBYND, + eLicense_CCBYNCSA, + eLicense_CCBYSA, + eLicense_CCBYNC, + eLicense_CCBYNCND +}eLicense; + +class UBTBSeparator : public QFrame +{ +public: + UBTBSeparator(QWidget* parent=0, const char* name="UBTBSeparator"); + ~UBTBSeparator(); +}; + +class UBTBLicenseWidget : public QWidget +{ +public: + UBTBLicenseWidget(QWidget* parent=0, const char* name="UBTBLicenseWidget"); + ~UBTBLicenseWidget(); + void setLicense(eLicense lic); + +private: + QHBoxLayout mLayout; + QLabel* mpIcon; + QLabel* mpText; +}; + class UBTeacherBarDataMgr { public: @@ -47,8 +77,8 @@ public: QString sessionTarget(){return mSessionTarget;} // Licence - void setSessionLicence(const QString& licence){mSessionLicence = licence;} - QString sessionLicence(){return mSessionLicence;} + void setSessionLicence(eLicense licence){mSessionLicence = licence;} + eLicense sessionLicence(){return mSessionLicence;} // Page Title void setPageTitle(const QString& title){mPageTitle = title;} @@ -77,7 +107,7 @@ public: private: QString mSessionTitle; QString mSessionTarget; - QString mSessionLicence; + eLicense mSessionLicence; QString mPageTitle; QString mComments; diff --git a/src/gui/UBTeacherBarPreviewWidget.cpp b/src/gui/UBTeacherBarPreviewWidget.cpp index 43331956..9b93008b 100644 --- a/src/gui/UBTeacherBarPreviewWidget.cpp +++ b/src/gui/UBTeacherBarPreviewWidget.cpp @@ -126,7 +126,7 @@ void UBActionPreview::setContent(const QString &content) { if(NULL != mpContent){ mpContent->setText(content); - setMinimumHeight(mpOwner->height() + mpContent->height()); + setMinimumHeight(mpOwner->height() + mpContent->document()->documentLayout()->documentSize().toSize().height()); } } @@ -139,18 +139,6 @@ UBTBPreviewContainer::UBTBPreviewContainer(QWidget *parent, const char *name):UB UBTBPreviewContainer::~UBTBPreviewContainer() { -} -// ------------------------------------------------------------------------------------ -UBTBPreviewSeparator::UBTBPreviewSeparator(QWidget *parent, const char *name):QFrame(parent) -{ - setObjectName("UBTBSeparator"); - setMinimumHeight(5); - setMaximumHeight(5); -} - -UBTBPreviewSeparator::~UBTBPreviewSeparator() -{ - } // ------------------------------------------------------------------------------------ @@ -206,11 +194,8 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataM // License mLayout.addWidget(&mLicenseSeparator); - mpLicenseLabel = new QLabel(tr("License"), this); - mpLicenseLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpLicenseLabel = new UBTBLicenseWidget(this); mLayout.addWidget(mpLicenseLabel); - // TODO : Add the license field here - // Edit button mpEditButton = new QPushButton(tr("Edit infos"), this); @@ -271,11 +256,14 @@ void UBTeacherBarPreviewWidget::updateFields() // Media generateMedias(); + // Comments + generateComments(); + // Links generateLinks(); - // Comments - generateComments(); + // License + mpLicenseLabel->setLicense(mpDataMgr->sessionLicence()); } @@ -295,6 +283,9 @@ void UBTeacherBarPreviewWidget::clearFields() } mStoredWidgets.clear(); } + + // License + mpLicenseLabel->setLicense(eLicense_CCBY); } void UBTeacherBarPreviewWidget::generateActions() diff --git a/src/gui/UBTeacherBarPreviewWidget.h b/src/gui/UBTeacherBarPreviewWidget.h index c1820777..ada45f6e 100644 --- a/src/gui/UBTeacherBarPreviewWidget.h +++ b/src/gui/UBTeacherBarPreviewWidget.h @@ -4,7 +4,6 @@ #include #include #include -#include #include "core/UBPersistenceManager.h" #include "customWidgets/UBWidgetList.h" @@ -52,13 +51,6 @@ public: ~UBTBPreviewContainer(); }; -class UBTBPreviewSeparator : public QFrame -{ -public: - UBTBPreviewSeparator(QWidget* parent=0, const char* name="UBTBPreviewSeparator"); - ~UBTBPreviewSeparator(); -}; - class UBTeacherBarPreviewWidget : public QWidget { Q_OBJECT @@ -90,7 +82,7 @@ private: // Titles QVBoxLayout mTitleLayout; - UBTBPreviewSeparator mTitleSeparator; + UBTBSeparator mTitleSeparator; QWidget mTitleContainer; QLabel* mpSessionTitle; QLabel* mpTitle; @@ -102,8 +94,10 @@ private: QLabel* mpScheduleLabel; // License - UBTBPreviewSeparator mLicenseSeparator; - QLabel* mpLicenseLabel; + UBTBSeparator mLicenseSeparator; + // TODO : replace the QLabel of the license by a widget done for that! + UBTBLicenseWidget* mpLicenseLabel; + /** Pointer to the datas */ UBTeacherBarDataMgr* mpDataMgr; From 07414cf6070c81d840a901a87423848f4bbea9a0 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 27 Jan 2012 16:26:06 +0100 Subject: [PATCH 81/99] Added some metadata fields --- src/adaptors/UBMetadataDcSubsetAdaptor.cpp | 24 +++++++ src/core/UBSettings.cpp | 4 ++ src/core/UBSettings.h | 4 ++ src/document/UBDocumentProxy.cpp | 55 +++++++++++++++ src/document/UBDocumentProxy.h | 9 +++ src/gui/UBTBDocumentEditWidget.cpp | 81 ++++++++++++++++++++-- src/gui/UBTBDocumentEditWidget.h | 17 +++++ src/gui/UBTeacherBarDataMgr.cpp | 8 +++ src/gui/UBTeacherBarDataMgr.h | 21 ++++++ src/gui/UBTeacherBarWidget.cpp | 6 +- 10 files changed, 224 insertions(+), 5 deletions(-) diff --git a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp index 7f6574c6..cb676f7b 100644 --- a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp +++ b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp @@ -109,6 +109,10 @@ void UBMetadataDcSubsetAdaptor::persist(UBDocumentProxy* proxy) xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionTitle,proxy->metaData(UBSettings::sessionTitle).toString()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionTarget,proxy->metaData(UBSettings::sessionTarget).toString()); xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionLicence,proxy->metaData(UBSettings::sessionLicence).toString()); + xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionKeywords,proxy->metaData(UBSettings::sessionKeywords).toString()); + xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionLevel,proxy->metaData(UBSettings::sessionLevel).toString()); + xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionTopic,proxy->metaData(UBSettings::sessionTopic).toString()); + xmlWriter.writeTextElement(UBSettings::uniboardDocumentNamespaceUri,UBSettings::sessionAuthors,proxy->metaData(UBSettings::sessionAuthors).toString()); xmlWriter.writeEndElement(); //dc:Description xmlWriter.writeEndElement(); //RDF @@ -224,6 +228,26 @@ QMap UBMetadataDcSubsetAdaptor::load(QString pPath) { metadata.insert(UBSettings::sessionLicence, xml.readElementText()); } + else if (xml.name() == UBSettings::sessionKeywords // introduced in OpenSankore 1.40.00 + && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) + { + metadata.insert(UBSettings::sessionKeywords, xml.readElementText()); + } + else if (xml.name() == UBSettings::sessionLevel // introduced in OpenSankore 1.40.00 + && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) + { + metadata.insert(UBSettings::sessionLevel, xml.readElementText()); + } + else if (xml.name() == UBSettings::sessionTopic // introduced in OpenSankore 1.40.00 + && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) + { + metadata.insert(UBSettings::sessionTopic, xml.readElementText()); + } + else if (xml.name() == UBSettings::sessionAuthors // introduced in OpenSankore 1.40.00 + && xml.namespaceUri() == UBSettings::uniboardDocumentNamespaceUri) + { + metadata.insert(UBSettings::sessionAuthors, xml.readElementText()); + } metadata.insert(UBSettings::documentVersion, docVersion); } diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 1ae24e61..c17cf9c7 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -39,6 +39,10 @@ QString UBSettings::documentUpdatedAt = QString("UpdatedAt"); QString UBSettings::sessionTitle = QString("sessionTitle"); QString UBSettings::sessionTarget = QString("sessionTarget"); QString UBSettings::sessionLicence = QString("sessionLicence"); +QString UBSettings::sessionKeywords = QString("sessionAuthors"); +QString UBSettings::sessionLevel = QString("sessionLevel"); +QString UBSettings::sessionTopic = QString("sessionTopic"); +QString UBSettings::sessionAuthors = QString("sessionAuthors"); QString UBSettings::trashedDocumentGroupNamePrefix = QString("_Trash:"); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index e05c2599..6445f7b8 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -156,6 +156,10 @@ class UBSettings : public QObject static QString sessionTitle; static QString sessionTarget; static QString sessionLicence; + static QString sessionKeywords; + static QString sessionLevel; + static QString sessionTopic; + static QString sessionAuthors; static QString trashedDocumentGroupNamePrefix; diff --git a/src/document/UBDocumentProxy.cpp b/src/document/UBDocumentProxy.cpp index aa70a8a1..b6047815 100644 --- a/src/document/UBDocumentProxy.cpp +++ b/src/document/UBDocumentProxy.cpp @@ -53,6 +53,10 @@ void UBDocumentProxy::init() setSessionTitle(""); setSessionTarget(""); setSessionLicence(""); + setSessionKeywords(""); + setSessionLevel(""); + setSessionTopic(""); + setSessionAuthor(""); } @@ -239,6 +243,57 @@ void UBDocumentProxy::setSessionLicence(const QString & sessionLicence) setMetaData(UBSettings::sessionLicence,QVariant(sessionLicence)); } +void UBDocumentProxy::setSessionKeywords(const QString &kw) +{ + setMetaData(UBSettings::sessionKeywords,QVariant(kw)); +} + +QString UBDocumentProxy::sessionKeywords() +{ + if(mMetaDatas.contains(UBSettings::sessionKeywords)) + return metaData(UBSettings::sessionKeywords).toString(); + else + return QString(); +} + +void UBDocumentProxy::setSessionLevel(const QString &level) +{ + setMetaData(UBSettings::sessionLevel,QVariant(level)); +} + +QString UBDocumentProxy::sessionLevel() +{ + if(mMetaDatas.contains(UBSettings::sessionLevel)) + return metaData(UBSettings::sessionLevel).toString(); + else + return QString(); +} + +void UBDocumentProxy::setSessionTopic(const QString &topic) +{ + setMetaData(UBSettings::sessionTopic,QVariant(topic)); +} + +QString UBDocumentProxy::sessionTopic() +{ + if(mMetaDatas.contains(UBSettings::sessionTopic)) + return metaData(UBSettings::sessionTopic).toString(); + else + return QString(); +} + +void UBDocumentProxy::setSessionAuthor(const QString &authors) +{ + setMetaData(UBSettings::sessionAuthors,QVariant(authors)); +} + +QString UBDocumentProxy::sessionAuthors() +{ + if(mMetaDatas.contains(UBSettings::sessionAuthors)) + return metaData(UBSettings::sessionAuthors).toString(); + else + return QString(); +} bool UBDocumentProxy::isModified() const { diff --git a/src/document/UBDocumentProxy.h b/src/document/UBDocumentProxy.h index 70d708bd..a8ec9b3b 100644 --- a/src/document/UBDocumentProxy.h +++ b/src/document/UBDocumentProxy.h @@ -51,6 +51,15 @@ class UBDocumentProxy : public QObject void setSessionTarget(const QString& sessionTarget); QString sessionLicence() const; void setSessionLicence(const QString& sessionLicence); + void setSessionKeywords(const QString& kw); + QString sessionKeywords(); + void setSessionLevel(const QString& level); + QString sessionLevel(); + void setSessionTopic(const QString& topic); + QString sessionTopic(); + void setSessionAuthor(const QString& authors); + QString sessionAuthors(); + QSize defaultDocumentSize() const; void setDefaultDocumentSize(QSize pSize); diff --git a/src/gui/UBTBDocumentEditWidget.cpp b/src/gui/UBTBDocumentEditWidget.cpp index 1d93900c..8d0b94f5 100644 --- a/src/gui/UBTBDocumentEditWidget.cpp +++ b/src/gui/UBTBDocumentEditWidget.cpp @@ -11,6 +11,14 @@ UBTBDocumentEditWidget::UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QW , mpMetadataLabel(NULL) , mpLicenseLabel(NULL) , mpLicenseCombox(NULL) + , mpKeywords(NULL) + , mpLevel(NULL) + , mpTopic(NULL) + , mpAuthor(NULL) + , mpKeywordLabel(NULL) + , mpLevelLabel(NULL) + , mpTopicLabel(NULL) + , mpAuthorLabel(NULL) { setObjectName(name); @@ -27,7 +35,7 @@ UBTBDocumentEditWidget::UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QW // Title mpTitleLabel = new QLabel(tr("Session Title"), mpContainer); mpTitleLabel->setAlignment(Qt::AlignLeft); - //mpTitleLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpTitleLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mContainerLayout.addWidget(mpTitleLabel, 0); mpTitle = new QLineEdit(mpContainer); mpTitle->setObjectName("DockPaletteWidgetLineEdit"); @@ -36,7 +44,7 @@ UBTBDocumentEditWidget::UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QW // Target mpTargetLabel = new QLabel(tr("Session Target"), mpContainer); - //mpTargetLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpTargetLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mContainerLayout.addWidget(mpTargetLabel, 0); mpTarget = new QTextEdit(mpContainer); mpTarget->setObjectName("UBTeacherBarTargetBox"); @@ -45,15 +53,42 @@ UBTBDocumentEditWidget::UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QW // Metadata mpMetadataLabel = new QLabel(tr("Metadata"), mpContainer); + mpMetadataLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mpMetadataLabel->setAlignment(Qt::AlignLeft); - //mpMetadataLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mContainerLayout.addWidget(mpMetadataLabel, 0); + mpKeywords = new QLineEdit(this); + mpKeywords->setObjectName("DockPaletteWidgetLineEdit"); + mpLevel = new QComboBox(this); + mpLevel->setObjectName("DockPaletteWidgetComboBox"); + mpTopic = new QComboBox(this); + mpTopic->setObjectName("DockPaletteWidgetComboBox"); + mpAuthor = new QLineEdit(this); + mpAuthor->setObjectName("DockPaletteWidgetLineEdit"); + mpKeywordLabel = new QLabel(tr("Keywords:"), this); + mpLevelLabel = new QLabel(tr("Level:"), this); + mpTopicLabel = new QLabel(tr("Topic:"), this); + mpAuthorLabel = new QLabel(tr("Author"), this); + + mKeywordLayout.addWidget(mpKeywordLabel, 0); + mKeywordLayout.addWidget(mpKeywords, 1); + mLevelLayout.addWidget(mpLevelLabel, 0); + mLevelLayout.addWidget(mpLevel, 1); + mTopicLayout.addWidget(mpTopicLabel, 0); + mTopicLayout.addWidget(mpTopic, 1); + mAuthorLayout.addWidget(mpAuthorLabel, 0); + mAuthorLayout.addWidget(mpAuthor, 1); + + mContainerLayout.addLayout(&mKeywordLayout, 0); + mContainerLayout.addLayout(&mLevelLayout, 0); + mContainerLayout.addLayout(&mTopicLayout, 0); + mContainerLayout.addLayout(&mAuthorLayout, 0); + mContainerLayout.addWidget(&mLicenseSeparator); // License mpLicenseLabel = new QLabel(tr("License"), mpContainer); mpLicenseLabel->setAlignment(Qt::AlignLeft); - //mpLicenseLabel->setObjectName("UBTeacherBarPreviewSubtitle"); + mpLicenseLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mContainerLayout.addWidget(mpLicenseLabel, 0); mpLicenseCombox = new QComboBox(this); mpLicenseCombox->setObjectName("DockPaletteWidgetComboBox"); @@ -81,6 +116,10 @@ UBTBDocumentEditWidget::UBTBDocumentEditWidget(UBTeacherBarDataMgr* pDataMgr, QW connect(mpTitle, SIGNAL(textChanged(QString)), this, SLOT(onSessionTitleChanged())); connect(mpTarget, SIGNAL(textChanged()), this, SLOT(onSessionTargetChanged())); connect(mpLicenseCombox, SIGNAL(currentIndexChanged(int)), this, SLOT(onLicenseCurrentIndexChanged(int))); + connect(mpKeywords, SIGNAL(textChanged(QString)), this, SLOT(onKeywordChanged(QString))); + connect(mpLevel, SIGNAL(currentIndexChanged(QString)), this, SLOT(onLevelChanged(QString))); + connect(mpTopic, SIGNAL(currentIndexChanged(QString)), this, SLOT(onTopicChanged(QString))); + connect(mpAuthor, SIGNAL(textChanged(QString)), this, SLOT(onAuthorChanged(QString))); } UBTBDocumentEditWidget::~UBTBDocumentEditWidget() @@ -90,6 +129,14 @@ UBTBDocumentEditWidget::~UBTBDocumentEditWidget() DELETEPTR(mpTargetLabel); DELETEPTR(mpTarget); DELETEPTR(mpMetadataLabel); + DELETEPTR(mpKeywordLabel); + DELETEPTR(mpLevelLabel); + DELETEPTR(mpTopicLabel); + DELETEPTR(mpAuthorLabel); + DELETEPTR(mpKeywords); + DELETEPTR(mpLevel); + DELETEPTR(mpTopic); + DELETEPTR(mpAuthor); DELETEPTR(mpLicenseLabel); DELETEPTR(mpLicenseCombox); DELETEPTR(mpPageViewButton); @@ -128,6 +175,10 @@ void UBTBDocumentEditWidget::updateFields() { mpTitle->setText(mpDataMgr->sessionTitle()); mpTarget->setPlainText(mpDataMgr->sessionTarget()); + mpKeywords->setText(mpDataMgr->keywords()); + // TODO: retrieve the level + // TODO retrieve the topic + mpAuthor->setText(mpDataMgr->authors()); } void UBTBDocumentEditWidget::clearFields() @@ -136,4 +187,26 @@ void UBTBDocumentEditWidget::clearFields() mpTarget->setPlainText(""); } +void UBTBDocumentEditWidget::onKeywordChanged(const QString &kw) +{ + mpDataMgr->setKeywords(kw); + emit valueChanged(); +} + +void UBTBDocumentEditWidget::onLevelChanged(const QString &level) +{ + mpDataMgr->setLevel(level); + emit valueChanged(); +} +void UBTBDocumentEditWidget::onTopicChanged(const QString &topic) +{ + mpDataMgr->setTopic(topic); + emit valueChanged(); +} + +void UBTBDocumentEditWidget::onAuthorChanged(const QString &authors) +{ + mpDataMgr->setAuthors(authors); + emit valueChanged(); +} diff --git a/src/gui/UBTBDocumentEditWidget.h b/src/gui/UBTBDocumentEditWidget.h index 8cfb7ff9..7d782247 100644 --- a/src/gui/UBTBDocumentEditWidget.h +++ b/src/gui/UBTBDocumentEditWidget.h @@ -29,6 +29,10 @@ private slots: void onSessionTitleChanged(); void onSessionTargetChanged(); void onLicenseCurrentIndexChanged(int selection); + void onKeywordChanged(const QString& kw); + void onLevelChanged(const QString& level); + void onTopicChanged(const QString& topic); + void onAuthorChanged(const QString& authors); private: QVBoxLayout mLayout; @@ -41,6 +45,11 @@ private: UBTBSeparator mTargetSeparator; UBTBSeparator mLicenseSeparator; + QHBoxLayout mKeywordLayout; + QHBoxLayout mLevelLayout; + QHBoxLayout mTopicLayout; + QHBoxLayout mAuthorLayout; + QWidget* mpContainer; QLabel* mpTitleLabel; QLineEdit* mpTitle; @@ -49,6 +58,14 @@ private: QLabel* mpMetadataLabel; QLabel* mpLicenseLabel; QComboBox* mpLicenseCombox; + QLineEdit* mpKeywords; + QComboBox* mpLevel; + QComboBox* mpTopic; + QLineEdit* mpAuthor; + QLabel* mpKeywordLabel; + QLabel* mpLevelLabel; + QLabel* mpTopicLabel; + QLabel* mpAuthorLabel; UBTeacherBarDataMgr* mpDataMgr; }; diff --git a/src/gui/UBTeacherBarDataMgr.cpp b/src/gui/UBTeacherBarDataMgr.cpp index 4233e58a..2a772441 100644 --- a/src/gui/UBTeacherBarDataMgr.cpp +++ b/src/gui/UBTeacherBarDataMgr.cpp @@ -59,6 +59,10 @@ void UBTeacherBarDataMgr::saveContent() documentProxy->setSessionTitle(mSessionTitle); documentProxy->setSessionTarget(mSessionTarget); documentProxy->setSessionLicence(QString("%0").arg(mSessionLicence)); + documentProxy->setSessionKeywords(mAuthors); + documentProxy->setSessionLevel(mLevel); + documentProxy->setSessionTopic(mTopic); + documentProxy->setSessionAuthor(mAuthors); UBMetadataDcSubsetAdaptor::persist(documentProxy); } @@ -76,6 +80,10 @@ void UBTeacherBarDataMgr::loadContent(bool docChanged) mSessionTitle = documentProxy->sessionTitle(); mSessionTarget = documentProxy->sessionTarget(); mSessionLicence = (eLicense)documentProxy->sessionLicence().toInt(); + mKeywords = documentProxy->sessionKeywords(); + mLevel = documentProxy->sessionLevel(); + mTopic = documentProxy->sessionTopic(); + mAuthors = documentProxy->sessionAuthors(); } // Page Title diff --git a/src/gui/UBTeacherBarDataMgr.h b/src/gui/UBTeacherBarDataMgr.h index 7ddca7e9..b182e892 100644 --- a/src/gui/UBTeacherBarDataMgr.h +++ b/src/gui/UBTeacherBarDataMgr.h @@ -99,6 +99,23 @@ public: void setComments(const QString& c){mComments = c;} QString comments(){return mComments;} + // Keywords + void setKeywords(const QString& kw){mKeywords = kw;} + QString keywords(){return mKeywords;} + + // Level + void setLevel(const QString& level){mLevel = level;} + QString level(){return mLevel;} + + // Topic + void setTopic(const QString& topic){mTopic = topic;} + QString topic(){return mTopic;} + + // Authors + void setAuthors(const QString& authors){mAuthors = authors;} + QString authors(){return mAuthors;} + + // Others void clearLists(); void saveContent(); @@ -110,6 +127,10 @@ private: eLicense mSessionLicence; QString mPageTitle; QString mComments; + QString mKeywords; + QString mLevel; + QString mTopic; + QString mAuthors; QVector mActionList; QVector mUrlList; diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 8b988526..d6d5e9dc 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -143,7 +143,11 @@ bool UBTeacherBarWidget::isEmpty() mData.urls()->empty() && mData.actions()->empty() && mData.medias()->empty() && - mData.comments() == ""; + mData.comments() == "" && + mData.authors() == "" && + mData.keywords() == "" && + mData.level() == "" && + mData.topic() == ""; } void UBTeacherBarWidget::onShowEditMode() From 927c77ac25639055065d91f31c05f956f571ce0c Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Fri, 27 Jan 2012 18:31:02 +0300 Subject: [PATCH 82/99] Code refactoring: pointers instead of names in Palettes --- src/board/UBBoardPaletteManager.cpp | 13 +++++--- src/gui/UBCachePropertiesWidget.cpp | 8 ++--- src/gui/UBDockPalette.cpp | 50 +++++++++++------------------ src/gui/UBDockPalette.h | 7 ++-- src/gui/UBDockPaletteWidget.h | 4 +-- 5 files changed, 37 insertions(+), 45 deletions(-) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 4c79f726..8c20d89a 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -202,8 +202,11 @@ void UBBoardPaletteManager::setupDockPaletteWidgets() // The cache widget will be visible only if a cache is put on the page mRightPalette->registerWidget(mpCachePropWidget); // The teacher bar widget will always be there - mRightPalette->registerWidget(mpTeacherBarWidget); - mRightPalette->addTab(mpTeacherBarWidget); + + // TeacherBarWidget moved to left side just for testing!!!! + mLeftPalette->registerWidget(mpTeacherBarWidget); + mLeftPalette->addTab(mpTeacherBarWidget); + // The download widget will be part of the right palette but // will become visible only when the first download starts mRightPalette->registerWidget(mpDownloadWidget); @@ -211,8 +214,8 @@ void UBBoardPaletteManager::setupDockPaletteWidgets() changeMode(eUBDockPaletteWidget_BOARD, true); // Hide the tabs that must be hidden - mRightPalette->removeTab(mpDownloadWidget->name()); - mRightPalette->removeTab(mpCachePropWidget->name()); + mRightPalette->removeTab(mpDownloadWidget); + mRightPalette->removeTab(mpCachePropWidget); // mLeftPalette->showTabWidget(0); // mRightPalette->showTabWidget(0); @@ -998,7 +1001,7 @@ void UBBoardPaletteManager::stopDownloads() { mDownloadInProgress = false; mpDownloadWidget->setVisibleState(false); - mRightPalette->removeTab(mpDownloadWidget->name()); + mRightPalette->removeTab(mpDownloadWidget); } } diff --git a/src/gui/UBCachePropertiesWidget.cpp b/src/gui/UBCachePropertiesWidget.cpp index 751c5d15..e0c74986 100644 --- a/src/gui/UBCachePropertiesWidget.cpp +++ b/src/gui/UBCachePropertiesWidget.cpp @@ -222,7 +222,7 @@ void UBCachePropertiesWidget::onCloseClicked() emit cacheListEmpty(); } - emit hideTab(name()); + emit hideTab(this); } } @@ -300,7 +300,7 @@ void UBCachePropertiesWidget::updateCurrentCache() if("Cache" == it->data(Qt::UserRole).toString()) { setEnabled(true); - emit showTab(name()); + emit showTab(this); mpCurrentCache = dynamic_cast(it); if((NULL != mpCurrentCache) && (!mCaches.contains(mpCurrentCache))) { @@ -331,7 +331,7 @@ void UBCachePropertiesWidget::updateCurrentCache() // 1 - that this page has no cache // 2 - we are not in Board mode // 3 - we are in Board mode, but show desktop (as really - Desktop mode) - emit hideTab(name()); + emit hideTab(this); mpCurrentCache = NULL; setDisabled(true); } @@ -346,6 +346,6 @@ void UBCachePropertiesWidget::onSizeChanged(int newSize) void UBCachePropertiesWidget::onCacheEnabled() { - emit showTab(name()); + emit showTab(this); } diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp index 7c3cb27e..82f28d76 100644 --- a/src/gui/UBDockPalette.cpp +++ b/src/gui/UBDockPalette.cpp @@ -567,19 +567,15 @@ void UBDockPalette::addTab(UBDockPaletteWidget *widget) * \brief Remove the given tab * @param widgetName as the tab widget name */ -void UBDockPalette::removeTab(const QString &widgetName) +void UBDockPalette::removeTab(UBDockPaletteWidget* widget) { - for(int i = 0; i < mTabWidgets.size(); i++) + int nWidget = mTabWidgets.indexOf(widget); + if( nWidget >= 0 ) { - UBDockPaletteWidget* pCrntWidget = mTabWidgets.at(i); - if(NULL != pCrntWidget && (pCrntWidget->name() == widgetName)) - { - mpStackWidget->removeWidget(pCrntWidget); - mTabWidgets.remove(i); - pCrntWidget->hide(); - update(); - break; - } + mpStackWidget->removeWidget(widget); + mTabWidgets.remove(nWidget); + widget->hide(); + update(); } resizeTabs(); mCurrentTab = qMax(mCurrentTab - 1, 0); @@ -607,17 +603,12 @@ int UBDockPalette::tabSpacing() * \brief Show the given widget * @param widgetName as the given widget name */ -void UBDockPalette::onShowTabWidget(const QString &widgetName) +void UBDockPalette::onShowTabWidget(UBDockPaletteWidget* widget) { - for(int i = 0; i < mRegisteredWidgets.size(); i++) + if (mRegisteredWidgets.contains(widget)) { - UBDockPaletteWidget* pCrntWidget = mRegisteredWidgets.at(i); - if(NULL != pCrntWidget && (pCrntWidget->name() == widgetName)) - { - pCrntWidget->setVisibleState(true); - addTab(pCrntWidget); - break; - } + widget->setVisibleState(true); + addTab(widget); } } @@ -625,16 +616,13 @@ void UBDockPalette::onShowTabWidget(const QString &widgetName) * \brief Hide the given widget * @param widgetName as the given widget name */ -void UBDockPalette::onHideTabWidget(const QString &widgetName) +void UBDockPalette::onHideTabWidget(UBDockPaletteWidget* widget) { - for(int i = 0; i < mRegisteredWidgets.size(); i++){ - UBDockPaletteWidget* pCrntWidget = mRegisteredWidgets.at(i); - if(NULL != pCrntWidget && (pCrntWidget->name() == widgetName)){ - pCrntWidget->setVisibleState(false); - break; - } + if (mRegisteredWidgets.contains(widget)) + { + widget->setVisibleState(false); + removeTab(widget); } - removeTab(widgetName); } /** @@ -644,8 +632,8 @@ void UBDockPalette::connectSignals() { for(int i=0; i < mRegisteredWidgets.size(); i++) { - connect(mRegisteredWidgets.at(i), SIGNAL(showTab(QString)), this, SLOT(onShowTabWidget(QString))); - connect(mRegisteredWidgets.at(i), SIGNAL(hideTab(QString)), this, SLOT(onHideTabWidget(QString))); + connect(mRegisteredWidgets.at(i), SIGNAL(showTab(UBDockPaletteWidget*)), this, SLOT(onShowTabWidget(UBDockPaletteWidget*))); + connect(mRegisteredWidgets.at(i), SIGNAL(hideTab(UBDockPaletteWidget*)), this, SLOT(onHideTabWidget(UBDockPaletteWidget*))); } } @@ -747,7 +735,7 @@ bool UBDockPalette::switchMode(eUBDockPaletteWidgetMode mode) } else { - removeTab(pNextWidget->name()); + removeTab(pNextWidget); } } } diff --git a/src/gui/UBDockPalette.h b/src/gui/UBDockPalette.h index 569c9854..ff3b546d 100644 --- a/src/gui/UBDockPalette.h +++ b/src/gui/UBDockPalette.h @@ -111,8 +111,9 @@ public: void setBackgroundBrush(const QBrush& brush); void registerWidget(UBDockPaletteWidget* widget); + void addTab(UBDockPaletteWidget* widget); - void removeTab(const QString& widgetName); + void removeTab(UBDockPaletteWidget* widget); void connectSignals(); @@ -129,8 +130,8 @@ public: eUBDockPaletteType paletteType(){return mPaletteType;} public slots: - void onShowTabWidget(const QString& widgetName); - void onHideTabWidget(const QString& widgetName); + void onShowTabWidget(UBDockPaletteWidget* widget); + void onHideTabWidget(UBDockPaletteWidget* widget); void onAllDownloadsFinished(); protected: diff --git a/src/gui/UBDockPaletteWidget.h b/src/gui/UBDockPaletteWidget.h index 163ca0cd..0b69a9e6 100644 --- a/src/gui/UBDockPaletteWidget.h +++ b/src/gui/UBDockPaletteWidget.h @@ -31,8 +31,8 @@ public: void setVisibleState(bool state){mVisibleState = state;} signals: - void hideTab(const QString& widgetName); - void showTab(const QString& widgetName); + void hideTab(UBDockPaletteWidget* widget); + void showTab(UBDockPaletteWidget* widget); public slots: void slot_changeMode(eUBDockPaletteWidgetMode newMode); From 7b595aec986aaccd20cae2ce22ff3ee64af35665 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 30 Jan 2012 15:02:11 +0100 Subject: [PATCH 83/99] fixed some issue due to merge --- src/core/UBDisplayManager.cpp | 2 +- src/core/UBSettings.h | 2 -- src/document/UBDocumentProxy.cpp | 2 +- src/domain/UBGraphicsScene.cpp | 1 - src/gui/UBActionPalette.cpp | 6 ++---- src/gui/UBMediaPlayer.cpp | 1 + 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp index 96c25059..6ecdc679 100644 --- a/src/core/UBDisplayManager.cpp +++ b/src/core/UBDisplayManager.cpp @@ -48,7 +48,7 @@ UBDisplayManager::UBDisplayManager(QObject *parent) void UBDisplayManager::initScreenIndexes() { - int screenCount = 1;//= numScreens(); + int screenCount = numScreens(); mScreenIndexesRoles.clear(); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index 29c95d0b..21b4d4e1 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -273,8 +273,6 @@ class UBSettings : public QObject QMap documentSizes; - QSize defaultDocumentSize; - UBSetting* svgViewBoxMargin; UBSetting* pdfMargin; UBSetting* pdfPageFormat; diff --git a/src/document/UBDocumentProxy.cpp b/src/document/UBDocumentProxy.cpp index 50ef04db..aafcfeda 100644 --- a/src/document/UBDocumentProxy.cpp +++ b/src/document/UBDocumentProxy.cpp @@ -48,7 +48,7 @@ void UBDocumentProxy::init() setUuid(QUuid::createUuid()); - setDefaultDocumentSize(UBSettings::settings()->defaultDocumentSize); + setDefaultDocumentSize(UBSettings::settings()->pageSize->get().toSize()); setSessionTitle(""); setSessionTarget(""); diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 995c70f0..0f2d0c52 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -1770,7 +1770,6 @@ void UBGraphicsScene::addMask(const QPointF ¢er) QRectF rect = UBApplication::boardController->activeScene()->normalizedSceneRect(); rect.setRect(center.x() - rect.width()/4, center.y() - rect.height()/4, rect.width()/2 , rect.height()/2); - QPointF origin = center.isNull() ? rect.bottomRight() : center; curtain->setRect(rect); UBGraphicsItem::assignZValue(curtain, toolLayerStart + toolOffsetCurtain); diff --git a/src/gui/UBActionPalette.cpp b/src/gui/UBActionPalette.cpp index 9647590e..304f8ec2 100644 --- a/src/gui/UBActionPalette.cpp +++ b/src/gui/UBActionPalette.cpp @@ -57,12 +57,10 @@ void UBActionPalette::init(Qt::Orientation orientation) mToolButtonStyle = Qt::ToolButtonIconOnly; mButtons.clear(); - QBoxLayout *layout = 0; - if (orientation == Qt::Horizontal) - layout = new QHBoxLayout(this); + new QHBoxLayout(this); else - layout = new QVBoxLayout(this); + new QVBoxLayout(this); updateLayout(); } diff --git a/src/gui/UBMediaPlayer.cpp b/src/gui/UBMediaPlayer.cpp index 4ac7a0a4..c0e9dc93 100644 --- a/src/gui/UBMediaPlayer.cpp +++ b/src/gui/UBMediaPlayer.cpp @@ -350,6 +350,7 @@ void UBMediaPlayer::hasVideoChanged(bool bHasVideo) void UBMediaPlayer::resizeEvent(QResizeEvent* pEvent) { + Q_UNUSED(pEvent); // int origWidth = m_videoWindow.width(); // int origHeight = m_videoWindow.height(); From 9e5198fb4be945202532bbe944b35bd8a528a467 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Mon, 30 Jan 2012 17:05:05 +0300 Subject: [PATCH 84/99] Enhancements to raster PDF export --- src/adaptors/UBExportPDF.cpp | 38 ++++++++++++++++-------------------- src/adaptors/UBExportPDF.h | 2 +- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/adaptors/UBExportPDF.cpp b/src/adaptors/UBExportPDF.cpp index b91b7e14..927a2b56 100644 --- a/src/adaptors/UBExportPDF.cpp +++ b/src/adaptors/UBExportPDF.cpp @@ -63,9 +63,8 @@ void UBExportPDF::persist(UBDocumentProxy* pDocumentProxy) } -void UBExportPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, QString filename) +void UBExportPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QString& filename) { - //PDF QPrinter pdfPrinter; qDebug() << "exporting document to PDF" << filename; @@ -73,19 +72,15 @@ void UBExportPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, QString file pdfPrinter.setOutputFormat(QPrinter::PdfFormat); pdfPrinter.setResolution(UBSettings::settings()->pdfResolution->get().toInt()); pdfPrinter.setOutputFileName(filename); + pdfPrinter.setFullPage(true); - if (UBSettings::settings()->pdfPageFormat->get().toString() == "Letter") - pdfPrinter.setPageSize(QPrinter::Letter); - else - pdfPrinter.setPageSize(QPrinter::A4); - - // pdfMargin is in mm, but margin should be in px - qreal margin = UBSettings::settings()->pdfMargin->get().toDouble() * pdfPrinter.resolution() / 25.4; - - pdfPrinter.setOrientation(QPrinter::Landscape); - pdfPrinter.setFullPage(true); - - QPainter pdfPainter(&pdfPrinter); + //need to calculate screen resolution + QDesktopWidget* desktop = UBApplication::desktop(); + int dpiCommon = (desktop->physicalDpiX() + desktop->physicalDpiY()) / 2; + float scaleFactor = 72.0f / dpiCommon; + + QPainter pdfPainter; + bool painterNeedsBegin = true; int existingPageCount = pDocumentProxy->pageCount(); @@ -98,20 +93,20 @@ void UBExportPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, QString file bool isCrossed = scene->isCrossedBackground(); scene->setBackground(false, false); - QRectF paperRect = pdfPrinter.paperRect(); - paperRect = paperRect.adjusted(margin, margin, -margin, -margin); - - QRectF normalized = scene->normalizedSceneRect(paperRect.width() / paperRect.height()); + QSize pageSize = scene->nominalSize(); // set high res rendering scene->setRenderingQuality(UBItem::RenderingQualityHigh); scene->setRenderingContext(UBGraphicsScene::NonScreen); + //setting page size to appropriate value + pdfPrinter.setPaperSize(QSizeF(pageSize.width()*scaleFactor, pageSize.height()*scaleFactor), QPrinter::Point); + pdfPrinter.setOrientation((pageSize.width() > pageSize.height())? QPrinter::Landscape : QPrinter::Portrait); + if(painterNeedsBegin) painterNeedsBegin = !pdfPainter.begin(&pdfPrinter); //render to PDF - scene->render(&pdfPainter, paperRect, normalized); + scene->render(&pdfPainter); - if (pageIndex < existingPageCount - 1) - pdfPrinter.newPage(); + if (pageIndex < existingPageCount - 1) pdfPrinter.newPage(); //restore screen rendering quality scene->setRenderingContext(UBGraphicsScene::Screen); @@ -120,6 +115,7 @@ void UBExportPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, QString file //restore background state scene->setBackground(isDark, isCrossed); } + if(!painterNeedsBegin) pdfPainter.end(); } QString UBExportPDF::exportExtention() diff --git a/src/adaptors/UBExportPDF.h b/src/adaptors/UBExportPDF.h index 5b9b114e..2511dab1 100644 --- a/src/adaptors/UBExportPDF.h +++ b/src/adaptors/UBExportPDF.h @@ -33,7 +33,7 @@ class UBExportPDF : public UBExportAdaptor virtual QString exportExtention(); virtual void persist(UBDocumentProxy* pDocument); - static void persistsDocument(UBDocumentProxy* pDocument, QString filename); + static void persistsDocument(UBDocumentProxy* pDocument, const QString& filename); }; #endif /* UBEXPORTPDF_H_ */ From 3f8f90ddc48e377882fb097c5525e0f112cbfa09 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 30 Jan 2012 15:09:17 +0100 Subject: [PATCH 85/99] The teacher bar should not be visible on the desktop mode --- src/gui/UBTeacherBarWidget.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/UBTeacherBarWidget.h b/src/gui/UBTeacherBarWidget.h index bac2a132..26831bfe 100644 --- a/src/gui/UBTeacherBarWidget.h +++ b/src/gui/UBTeacherBarWidget.h @@ -34,7 +34,7 @@ public: bool visibleInMode(eUBDockPaletteWidgetMode mode) { - return (mode == eUBDockPaletteWidget_BOARD) || (mode == eUBDockPaletteWidget_DESKTOP); + return (mode == eUBDockPaletteWidget_BOARD); } void loadContent(bool docChanged = false); From 65ffaf9f7dc21f7df786692614d06373c758cbb6 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 30 Jan 2012 16:30:44 +0100 Subject: [PATCH 86/99] fixed issue of empty document. In this case the metadata.rdf and the *.ubz are not created --- src/adaptors/UBMetadataDcSubsetAdaptor.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp index 145196e9..0dbdd5c5 100644 --- a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp +++ b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp @@ -68,12 +68,17 @@ UBMetadataDcSubsetAdaptor::~UBMetadataDcSubsetAdaptor() void UBMetadataDcSubsetAdaptor::persist(UBDocumentProxy* proxy) { + if(!QDir(proxy->persistencePath()).exists()){ + //In this case the a document is an empty document so we do not persist it + return; + } QString fileName = proxy->persistencePath() + "/" + metadataFilename; qWarning() << fileName; QFile file(fileName); if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) { qCritical() << "cannot open " << fileName << " for writing ..."; + qCritical() << "error : " << file.errorString(); return; } From d6f500e09d469cfd2bc9f6a79ce1f03275b2fb06 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Mon, 30 Jan 2012 20:34:19 +0200 Subject: [PATCH 87/99] Fixed crashes on application exiting. The trouble has been in the deleting already deleted objects. I remove all code from destructors and modify one member to pointer for assign hem parent. --- src/board/UBBoardPaletteManager.cpp | 5 ----- src/gui/UBTeacherBarPreviewWidget.cpp | 24 +++++++++--------------- src/gui/UBTeacherBarPreviewWidget.h | 2 +- src/gui/UBTeacherBarWidget.cpp | 5 ----- 4 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 91b16b8e..554dca30 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -112,11 +112,6 @@ UBBoardPaletteManager::~UBBoardPaletteManager() delete mpLibWidget; mpLibWidget = NULL; } - if(NULL != mpTeacherBarWidget) - { - delete mpTeacherBarWidget; - mpTeacherBarWidget = NULL; - } if(NULL != mpCachePropWidget) { delete mpCachePropWidget; diff --git a/src/gui/UBTeacherBarPreviewWidget.cpp b/src/gui/UBTeacherBarPreviewWidget.cpp index 9b93008b..1a7feefc 100644 --- a/src/gui/UBTeacherBarPreviewWidget.cpp +++ b/src/gui/UBTeacherBarPreviewWidget.cpp @@ -161,7 +161,8 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataM // Build the Preview widget // Session Title - mTitleContainer.setLayout(&mTitleLayout); + mpTitleContainer = new QWidget(this); + mpTitleContainer->setLayout(&mTitleLayout); mpSessionTitle = new QLabel(this); mpSessionTitle->setText(tr("Session: ")); mpSessionTitle->setWordWrap(true); @@ -170,23 +171,23 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataM mLayout.addWidget(mpSessionTitle); // Title - mTitleContainer.setLayout(&mTitleLayout); + mpTitleContainer->setLayout(&mTitleLayout); mTitleLayout.setContentsMargins(0, 0, 0, 0); - mpTitleLabel = new QLabel(&mTitleContainer); + mpTitleLabel = new QLabel(mpTitleContainer); mpTitleLabel->setText(tr("Activity")); mpTitleLabel->setObjectName("UBTeacherBarPreviewSubtitle"); mTitleLayout.addWidget(mpTitleLabel, 0); - mpTitle = new QLabel(&mTitleContainer); + mpTitle = new QLabel(mpTitleContainer); mpTitle->setObjectName("UBTeacherBarPreviewTitle"); mpTitle->setWordWrap(true); mpTitle->setAlignment(Qt::AlignLeft); mTitleLayout.addWidget(mpTitle, 1); - mpPageNbrLabel = new QLabel(tr("Page n° "), &mTitleContainer); + mpPageNbrLabel = new QLabel(tr("Page n° "), mpTitleContainer); mpPageNbrLabel->setAlignment(Qt::AlignRight); mpPageNbrLabel->setObjectName("UBTBPreviewSessionTitle"); mTitleLayout.addWidget(mpPageNbrLabel); mTitleLayout.addWidget(&mTitleSeparator); - mLayout.addWidget(&mTitleContainer); + mLayout.addWidget(mpTitleContainer); // Content mpContentContainer = new UBTBPreviewContainer(this); @@ -212,13 +213,6 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataM UBTeacherBarPreviewWidget::~UBTeacherBarPreviewWidget() { - DELETEPTR(mpEditButton); - DELETEPTR(mpLicenseLabel); - DELETEPTR(mpScheduleLabel); - DELETEPTR(mpPageNbrLabel); - DELETEPTR(mpTitle); - DELETEPTR(mpTitleLabel); - DELETEPTR(mpSessionTitle); } void UBTeacherBarPreviewWidget::onActiveSceneChanged() @@ -245,9 +239,9 @@ void UBTeacherBarPreviewWidget::updateFields() if("" != mpDataMgr->pageTitle()){ mpTitle->setText(mpDataMgr->pageTitle()); mpPageNbrLabel->setText(tr("Page n° %0").arg(UBApplication::boardController->activeSceneIndex())); - mTitleContainer.setVisible(true); + mpTitleContainer->setVisible(true); }else{ - mTitleContainer.setVisible(false); + mpTitleContainer->setVisible(false); } // Actions diff --git a/src/gui/UBTeacherBarPreviewWidget.h b/src/gui/UBTeacherBarPreviewWidget.h index ada45f6e..7fb2f92b 100644 --- a/src/gui/UBTeacherBarPreviewWidget.h +++ b/src/gui/UBTeacherBarPreviewWidget.h @@ -83,7 +83,7 @@ private: // Titles QVBoxLayout mTitleLayout; UBTBSeparator mTitleSeparator; - QWidget mTitleContainer; + QWidget* mpTitleContainer; QLabel* mpSessionTitle; QLabel* mpTitle; QLabel* mpTitleLabel; diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index d6d5e9dc..5aeb80a4 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -66,11 +66,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock UBTeacherBarWidget::~UBTeacherBarWidget() { - DELETEPTR(mpDocPreviewWidget); - DELETEPTR(mpDocEditWidget); - DELETEPTR(mpPageEditWidget); - DELETEPTR(mpPreview); - DELETEPTR(mpStackWidget); } void UBTeacherBarWidget::onActiveDocumentChanged() From 63d6e6d295cee2d89715f08139198e7848d9aeba Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Mon, 30 Jan 2012 20:40:37 +0200 Subject: [PATCH 88/99] Fix for SANKORE-3. --- src/adaptors/UBSvgSubsetAdaptor.cpp | 2 +- src/domain/UBGraphicsMediaItem.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index aab62431..57e01565 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1836,7 +1836,7 @@ UBGraphicsAudioItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::audioItemFromSvg() href = mDocumentPath + "/" + href.right(href.length() - indexOfAudioDirectory); } - UBGraphicsAudioItem* audioItem = new UBGraphicsAudioItem(href); + UBGraphicsAudioItem* audioItem = new UBGraphicsAudioItem(QUrl::fromLocalFile(href)); graphicsItemFromSvg(audioItem); QStringRef ubPos = mXmlReader.attributes().value(mNamespaceUri, "position"); diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp index d07ab08c..9342cb66 100644 --- a/src/domain/UBGraphicsMediaItem.cpp +++ b/src/domain/UBGraphicsMediaItem.cpp @@ -86,12 +86,13 @@ QVariant UBGraphicsMediaItem::itemChange(GraphicsItemChange change, const QVaria void UBGraphicsMediaItem::clearSource() { - QString path = mediaFileUrl().path(); + QString path = mediaFileUrl().toLocalFile(); //if path is absolute clean duplicated path string if (!path.contains(UBApplication::boardController->activeDocument()->persistencePath())) path = UBApplication::boardController->activeDocument()->persistencePath() + "/" + path; - UBFileSystemUtils::deleteFile(path); + if (!UBFileSystemUtils::deleteFile(path)) + qDebug() << "cannot delete file: " << path; } void UBGraphicsMediaItem::toggleMute() From 58cf72f526ae0b29da1ebe73ee8cd28415f70282 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 31 Jan 2012 09:38:08 +0100 Subject: [PATCH 89/99] handlig system where the ',' is used to separate decimals --- src/adaptors/UBCFFSubsetAdaptor.cpp | 18 ++++++++++++++++++ src/adaptors/UBSvgSubsetAdaptor.cpp | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp index 981d4ff2..cb08d742 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.cpp +++ b/src/adaptors/UBCFFSubsetAdaptor.cpp @@ -280,6 +280,15 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e point.setY(sCoord.at(1).toFloat()); polygon << point; } + else if (sCoord.size() == 4){ + //This is the case on system were the "," is used to seperate decimal + QPointF point; + QString x = sCoord.at(0) + "." + sCoord.at(1); + QString y = sCoord.at(2) + "." + sCoord.at(3); + point.setX(x.toFloat()); + point.setY(y.toFloat()); + polygon << point; + } else { qWarning() << "cannot make sense of a 'point' value" << sCoord; } @@ -354,6 +363,15 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolyline(const QDomElement & point.setY(sCoord.at(1).toFloat()); polygon << point; } + else if (sCoord.size() == 4){ + //This is the case on system were the "," is used to seperate decimal + QPointF point; + QString x = sCoord.at(0) + "." + sCoord.at(1); + QString y = sCoord.at(2) + "." + sCoord.at(3); + point.setX(x.toFloat()); + point.setY(y.toFloat()); + polygon << point; + } else { qWarning() << "cannot make sense of a 'point' value" << sCoord; } diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index aab62431..1cda7a95 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1301,6 +1301,15 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromPol point.setY(sCoord.at(1).toFloat()); polygon << point; } + else if (sCoord.size() == 4){ + //This is the case on system were the "," is used to seperate decimal + QPointF point; + QString x = sCoord.at(0) + "." + sCoord.at(1); + QString y = sCoord.at(2) + "." + sCoord.at(3); + point.setX(x.toFloat()); + point.setY(y.toFloat()); + polygon << point; + } else { qWarning() << "cannot make sense of a 'point' value" << sCoord; @@ -1583,6 +1592,15 @@ QList UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItem point.setY(sCoord.at(1).toFloat()); points << point; } + else if (sCoord.size() == 4){ + //This is the case on system were the "," is used to seperate decimal + QPointF point; + QString x = sCoord.at(0) + "." + sCoord.at(1); + QString y = sCoord.at(2) + "." + sCoord.at(3); + point.setX(x.toFloat()); + point.setY(y.toFloat()); + points << point; + } else { qWarning() << "cannot make sense of a 'point' value" << sCoord; From 736b2589f7b4c2e74b83935984ac2040666fcf10 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 31 Jan 2012 11:57:05 +0200 Subject: [PATCH 90/99] new paraschool widget --- .../ordonner_des_images.wgt/config.xml | 16 + .../ordonner_des_images.wgt/css/basic.css | 208 +++++ .../ordonner_des_images.wgt/img/1.jpg | Bin 0 -> 32581 bytes .../ordonner_des_images.wgt/img/1.png | Bin 0 -> 55180 bytes .../ordonner_des_images.wgt/img/2.png | Bin 0 -> 37531 bytes .../ordonner_des_images.wgt/img/add_block.png | Bin 0 -> 1626 bytes .../ordonner_des_images.wgt/img/add_img.png | Bin 0 -> 5352 bytes .../ordonner_des_images.wgt/img/circle.png | Bin 0 -> 1026 bytes .../ordonner_des_images.wgt/img/clear_img.png | Bin 0 -> 1310 bytes .../img/close_cont.png | Bin 0 -> 772 bytes .../ordonner_des_images.wgt/img/close_img.png | Bin 0 -> 1924 bytes .../ordonner_des_images.wgt/img/fill_hor.png | Bin 0 -> 1384 bytes .../ordonner_des_images.wgt/img/fill_vert.png | Bin 0 -> 1901 bytes .../img/green_point.png | Bin 0 -> 721 bytes .../ordonner_des_images.wgt/img/red_point.png | Bin 0 -> 740 bytes .../ordonner_des_images.wgt/index.html | 46 ++ .../js/jquery-1.6.2.min.js | 18 + .../js/jquery-ui-1.8.9.custom.min.js | 781 ++++++++++++++++++ .../ordonner_des_images.wgt/js/languages.js | 20 + .../ordonner_des_images.wgt/js/script.js | 405 +++++++++ .../nbproject/private/private.properties | 5 + .../nbproject/private/private.xml | 4 + .../nbproject/project.properties | 7 + .../nbproject/project.xml | 9 + .../ordonner_des_images.wgt/objects/0.gif | Bin 0 -> 2628 bytes .../ordonner_des_images.wgt/objects/1.gif | Bin 0 -> 1483 bytes .../ordonner_des_images.wgt/objects/2.gif | Bin 0 -> 2008 bytes .../ordonner_des_images.wgt/objects/3.gif | Bin 0 -> 2179 bytes .../ordonner_des_images.wgt/objects/4.gif | Bin 0 -> 1772 bytes 29 files changed, 1519 insertions(+) create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/config.xml create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/css/basic.css create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/1.jpg create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/1.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/2.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/add_block.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/add_img.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/circle.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/clear_img.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/close_cont.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/close_img.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/fill_hor.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/fill_vert.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/green_point.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/red_point.png create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/index.html create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-1.6.2.min.js create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-ui-1.8.9.custom.min.js create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/languages.js create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/script.js create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/private/private.properties create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/private/private.xml create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/project.properties create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/project.xml create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/0.gif create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/1.gif create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/2.gif create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/3.gif create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/4.gif diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/config.xml b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/config.xml new file mode 100644 index 00000000..dc9eb189 --- /dev/null +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/config.xml @@ -0,0 +1,16 @@ + + + + Notes + Mnemis SA + Ordonner des images + + + diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/css/basic.css b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/css/basic.css new file mode 100644 index 00000000..476eeb71 --- /dev/null +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/css/basic.css @@ -0,0 +1,208 @@ +html, body{ + width: 100%; + height: 100%; + margin: 0; + padding: 0; +} + +.toggle_mode{ + width: 100%; + height: 25px; + border-bottom: 1px solid black; + background-color: #ccc; + position: fixed; + top: 0; + left: 0; + z-index: 2; +} + +#display_img, #edit_img{ + width: 15px; + height: 15px; + margin: 5px 10px; +} + +.green_point{ + background-image: url(../img/green_point.png); +} + +.red_point{ + background-image: url(../img/red_point.png); +} + +#display_text, #edit_text{ + height: 19px; + padding: 3px 0 0 0; +} + +.selected{ + background-color: #666; +} + +#display:hover, #edit:hover{ + background-color: #999; +} + +.cont{ + width: 100%; + border-bottom: 1px solid black; + margin: 0; + padding: 0; + position: relative; +} + +.sub_cont{ + width: 100%; + padding: 0; + margin: 20px 0 0 0; + min-height: 60px; +} + +.imgs_cont{ + width: 100%; + margin: 0; +} + +.number_cont{ + width: 40px; + height: 33px; + margin-left: 40px; + margin-right: 10px; + background-image: url(../img/circle.png); + background-repeat: no-repeat; + text-align: center; + float: left; + font-size: 130%; + padding-top: 7px; + font-weight: bold; +} + +.text_cont{ + width: 80%; + min-height: 40px; + float: right; + background-color: #ccc; + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; + padding-left: 10px; +} + +.close_cont{ + width: 20px; + height: 20px; + background-image: url(../img/close_cont.png); + cursor: pointer; + position: absolute; + top: -15px; + left: 5px; +} + +.add_img{ + width: 120px; + height: 120px; + margin: 10px 20px; + background-image: url(../img/add_img.png); + background-position: center; + background-repeat: no-repeat; + cursor: pointer; + display: inline-block; +} + +.img_block{ + width: 120px; + height: 120px; + margin: 10px 20px; + cursor: pointer; + display: inline-block; + position: relative; + border: 1px solid #ccc; + -moz-box-shadow: #ccc -1px 0 4px; + -webkit-box-shadow: #ccc -1px 0 4px; + box-shadow: #ccc -1px 0 4px; + background-color: white; +} + +.close_img{ + width: 30px; + height: 30px; + background-image: url(../img/close_img.png); + background-repeat: no-repeat; + position: absolute; + top: -15px; + right: -15px; + cursor: pointer; +} + +.clear_img{ + width: 30px; + height: 30px; + background-image: url(../img/clear_img.png); + background-repeat: no-repeat; + position: absolute; + top: 15px; + right: -15px; + cursor: pointer; +} + +.fill_img{ + width: 30px; + height: 30px; + background-image: url(../img/fill_hor.png); + background-repeat: no-repeat; + position: absolute; + top: -15px; + right: 17px; + cursor: pointer; +} + +.add_block{ + margin: 20px 0 0 20px; + width: 110px; + height: 25px; + background-image: url(../img/add_block.png); + background-repeat: no-repeat; + padding-left: 40px; + padding-top: 5px; + cursor: pointer; + background-color: #ccc; + -webkit-border-radius: 15px; + border-radius: 15px; +} + + + + + + + + + + + + +.black_overlay{ + display: none; + position: absolute; + top: 0%; + left: 0%; + width: 100%; + height: 100%; + background-color: black; + z-index:1001; + -moz-opacity: 0.8; + opacity:.80; + filter: alpha(opacity=80); +} + +.white_content { + display: none; + position:fixed; + top: 50%; + left: 50%; + width: 340px; + height: 480px; + padding: 16px; + background-color: white; + z-index:1002; + overflow: auto; +} \ No newline at end of file diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/1.jpg b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d3807e82d3fc5ef9f11e380880063b3e434f5294 GIT binary patch literal 32581 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òXC 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 literal 0 HcmV?d00001 diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/1.png b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/1.png new file mode 100644 index 0000000000000000000000000000000000000000..c50733dcd78194d56b64f743b0da3c0e4c290863 GIT binary patch literal 55180 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 F{{dznS_c3C literal 0 HcmV?d00001 diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/2.png b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/2.png new file mode 100644 index 0000000000000000000000000000000000000000..7ad83b8765a786ac2644a5e3a6a289a4f1b558db GIT binary patch literal 37531 zcmdSBWmr^g+ct~{f`Ej8Ad&(iEhP;~hjh1+GIYlPBcgP-Fn}~jj11jMch}IJL&MPU zF0cD~uKW4!Z~LC_-QIui`oT7{W?Sc4>p1tL_k$2sW!XnK6gX&TXpiLOq}0*SFmlk) z?xA6$182}r1gFr@Vol|x-fDVIBh#=x5o=xkT8K9viL*l(zj>moDTOKZMl+`X`!h8( zG}ODrOHQMVPIoU#cPMT-ZH?$kWI+y1q0&s~3?{cBr)OoS3* ze}m#hTz8)jk3;N!(%HHwx|MaAB(uC9TBD*ck*^GT&GS<+#9jUGM{5)&6jyE6{Wc4fL% zb~C8cNfRvLHvD@%EWnGQRRoppk<)^S`ik|+(><3%%Dr(p2t)?2EMQetPX>SQAeteN zpV?cEeU`_+{O|8jMbZZmXlZIb0DIKoP%(j%O#Chg#IFfsny@TL|ExDHuj7Fi-H6@6 z2|hnqCY~Ee5jAevIIf+uX9H^&@i8*44G8b|4GiGBzoC+|we548j3DO&olNdbI$XLD zk0rWN0IRNa7-^|5hl?x(!2j$A+HQW4u#A?L){x8B&CSiJsj2rgA=u_9B*My|JP4iT zOoTdW&YqK#bFilej#$|GVB8*X2nCBpr zwKKd?Fj#hF=XA&Y_7I$JSGr>EFkNB2wkG?$?@Z!H@t7}m1}V_56bFL=_oZ{4rn>FMd^Tv89D`%+R2_ipm#)QL1j zq*ei7ZMU;XJ;{*r!;8{w)+_+g)#CDHH`?@kg@L$v4CY|Jr@{d>4^YF|}<8&Eg`CB;5H+XHJjM>0!y{3qw;^KG8$^%_p0Jx{ldU|^H zYE~k%WuqPl*Br~7;c^VIbhk?iHujcrbT)d*+Bu%dCWg~+|kd4><9s$Xdh$Boy-(m4z1{%6CbZw6gs|DbDx#-jwT(K7qWPnGT3QM5@$u>D9N3?c;I*~2sk7(V zekvu}9y>8^3AKAMV)MJTZg*mBR27a2xsPQ-%?Nrpy5SxlEFCFyXnNQ~g>VC+1K05R0>Fw+%8`R2XM`i_LUx z_i3*&?bK&Q;U|*aq>7E$95(um$4dEq|GXaGO4}$LsmJ!j>z8QtOo{4CUWy3qA`5cM zo_OXU0vdex;0=7GQ2}tIlALqhY;URb)20m3zBK}7|HNNQ1i9i7Q; zVRvJ56+-M-hM#5C<8vI+YM*~qLuusU)qXdZRmP7v5x9tdW8s^H%9^_jD>l0lxtv5M z!->;LpqV`bZHen$diG&e<4y$0MDrfm7Jiy5O~JwPHyo%&>}n;wEQfzeVW}=a*`HHf-$TU9(rskLPScM zJCb?{#z&2fpG0L>QI`2?WU^SQUl~uE6!Bj+P=kGarKQ_d#BavB$6u(Hd-%n$p1AMN zr)6Yt4hs65J9hOLdnRZB8-RxG`vx_@1`eOG&WcHV!5pdc@}&mv8f|c_I_xoB)F&V4 zd*W#7%pyGV=Aw7a>oxpqLS9?;qN4Jim`mGg*>6#wTO(W8(xr>l2ZTncoDEUukB}p2_&rcAm5R8=k~a*$ph|> zsH1iRcb;)Fd9#SZmZjP#&Q$B_^ym~*j3Gqi_ z-e&_JZw!i8pP6RQlv|zc!0xVwWogR`FVLVO!@hDhu)l>?x`w=?WI2qm0%Sgs^_oH zw&G)#bQANo*bSW5kb{7ax8mfyff&AJQ<2 zk(wlAyzV2iJfU*_pl#?Q;RAlXktC}AyZL5FiHI4zskwj~ij+40+qPnv@Atts+=LS3 zkp4XK(kT%=Vsk6*yPPZ@^qBsEXJL)jjuN1(?TyB97{o|-dAYXZkUW;8?U!e6Yqt#+ z9^|1pC;5AX!O!=EKKX4V4mhM$-rgYD;oHs)ve)!p=BO*|A4 zvg)WT?GGJ}G7;W`2{0z?P_AOG%6bhjW%xJ`uuBg{tgf!oNd_(=5v=}a_x7pfV;=<2 zad2?3u;Ap60lv+8t0t$TP?II_!^f14hh+_Sk3PH{Z%QcV>zojZw%m>E$(}Agp)+%+ zzY>!gq3pzYEP%Pt47r=Gv>~7oYq01|RL1@J4avUXDOcRn`ZmHw*`G@0Vys;{E{04J9oqyCie1@mbQ!lL{bN0pnZV5@M#p=^ zkTChkLY+{UQ#9L&ZHO`aj~a_!?R~?L2tmVoR_izjK?>Tv~}s`Xr-& zz?vl34K7$|xW6NF=dv|IO$$yNXeAK$vF8IL5QvPM<0e)&cNGB(*!eB%oY#2}spQPL#osHF!Q#Qr}ZGuVg zrke_f-ZVSl2g|)yV`Qi4!N#!ahK7dX;$k=){^Q4wtSs&_TO0Aqw*1YOxRjLFhSRsH zc&Q*o5{jcZy})If+0Wa@R0&v`jiZ5)X}n%IZ`E)4x}NgCjcs{288Qv z!9?u*hqqVzgXyC6qt8vrEtlIu@Pk@6jvEgCLWQn62~HMNrc_x+lDTm2y)RKq z*c&ab(=nT{n>V|tR97Q`w6}F@jDS%ea@80qCIe|OV;Ra`zt3dn;J955<2q9O^>yjl`moj=cmjlFsNpJGkR6gr{f!ful>iJ|Ixc>hr|z zXAtq4wWLRHlNygJkA8ts=0ZyUDa@OlL2+OAl((z}A9GY`6(nVH+oZl}#j835Yn6-j zY(yMSvs3Fldd_Sk@9XvrmeXbCLY&}co0jB3=db#`IFtT%-$e0)>gj;h-fV5Zxx@Gm zErV+NcEPM}bC7EN`T3VG7}p~hVVcyo0vCW8G)G!<-di9zu6CXnFW8q(49}jwJ zu?Jan!uf3`iU;s;gsq&No&Ef7S;I`WJgmi|Is=rIQl9Czh0IOhI>R!JqdGgC&WWsA z*`D`KG!SkK$Umn_g%^2fh^jv@68A=We$F`*&JiPOzjMmT`J!Fa&Q)quU-kVv8rYc$ zW9l8MsY`HPwL})X_!j~?AXFX4RFjvNnm=|L5=DR_pSw+IM9`EZDn;d7Bz4S@K8N#z z#tK%=`!fuW!TTk+S;$Nd)&K4v?2N0|PZ1CeVq+XSeScH4f@FqAO3xYFpZ2ksfhuaP zObndf_8&^rx7!q%v$8h6erDx{O?v9X-U}{64!121XHy$g_H-V^0r0De)6MRdJr21o@C}0jDmLh>i zNAv&$gE@=-#F~VcpO9(FsHSsdxtGTNv6msQgb;e}_QS?>UTbTY;>Y=c(=T6~E;GQg zn=Z}moML9|*MOwx7qM8z&+5ccjV{J{`Ol?Kc`jo%l28v2JFY*GOAQluyqug4x7Qb2 zTU!G66SDGxhjgg$tgvN3C7PjNU!9Q~v%kG|&3F#_M=}c6RoSTfEnP z)%*3ZF=w_T~^cT8N1i1Q2v#g1AEp41+O7cEQu_4 z>qB0A3{FE$%?h(g`+!Aqx6yMoGbTb)NqHv*UO}5g4J*jkhkjQY$Ln^8I#LG`SVQ)G zKycy-PY{L!apO;@o$RcQ%R8~S?QJ3b^Vu1&c%`T;#N9Jr$jhE|&5UbGi9w8$CyF9x zP!T$e`0kF-jSY;YZ>rJ%A;jDBm8i1?ug;z0rPiD`7%2X@*kGO^{j`>ygKbxH*DRUE zscDddk?4M0hmZ3W22GT+5j5txz?Zx8bTT8K-rYFj$B(D~PDA%=JD}tNaf(oj{DS1eB8g1E!*kpSzFQ*UJ z6r2_!4+=95tE$l9lW%$BM4_$&sr;~t3fGYwc>(5}m-@Lag?X{|IeB@Or`zN9)!_AT ztZXw=`P$I84P0{9`#=h(tfbVq-*kn}e>e}`?@#8+j$5G+bT)T(=AIaPNNk^(vmES^ z{(-{ux05`0&XqF`FYMOrNZEtskeh`1n2OBIxscKTT%hyXz)MUc&W4!9-g>ozRAbrFwBCUyZ9_uq2GT zh)-YED6MlRoIlm+v&GmBdsQ7Sw|Yrsr8Fa{e8@v46-s^zJdD97+7rt44xuK@Z~v;K z++A;o-`}7V^YJ`d?QRVsfGqA4sQUNwGU_I>bHZvCKkxY?@~=1D>j|hu&W9uk8jlBr z{pTtguJ-EFIKe_`r8=a5xCO0qnmFA9$efx{*VE~F zsYkrbN()J^GH>|6gV!f{w%(pXW9BN^^6o;4*T*-#?_-2l`UqnhyEy(a=X~A9de-t< zmAUiA2KxHx6D9TC-#J-f!BJsCP>ol9$Yj9OJ~Dy0dENE8M3J>ir9OTf=ct`Ui^0jX z$k@wTl$Dj$)7w*bR`YAub;~UUq^M+TNV(jA6-DU+t|>MaMY_4k*^bK_fT(mHQMbJc zZ!n5(#7FO)zq?tu!yG7^*{z=UW>p%!yV-}N>Rb1)ccX*I4`M4TE3eM>2a^Q+u06fH z1hwB5jb9#i(wI24lire=p6&P`T7?lsI-Iac@X8~8Cx!lJcx~aH+i@?!+~%V&n6-VYf>pEC)G-u_S=D#|i~7Ioa53*9kU~06%lY1`uW3A4kJHdlZ+BuiFKWQ8Q z(d)AanLC^^r0Dr#KpKs{zJAK@_rJhLmq%+ry$;h=V`(rm_gN}MKBFUcZEdYg0G%LT zLXu34eOJsg8-;86irKQvI~fgV@k)c&0925Xkx^P&`bk*siiFJzup%5{tuor*ks|6e z5I-fai|RWx)e*YIdq?QGRdz2;`56fAF;Mh~2q8)I-x6*kEOvjNy6u&FI>r_y zh3>Vpx@Zx31$G8iZA^@vOl<}>#V<+}p4p*lD65V}mf@yGhM}GIK=Kh9D{`Cy=vHtd zJm>;w5g7Yjti26*@Q7NZ<_&s&Ab7(bufqnB~$1|V|8h!a1@7?#@oMhT(VD^*zAy0+xatd$y zi)0+nZ^NJ35WM~Z)Wn~VP;zp@es$6b3tzQ`5FfoE>5Qb>=}T$M4f3;B8C9xPR)I<$ zcy!JNT5t|f22DC1nSUrUkXKMx^`d(p>@a+D;%yY%lYTAe3kqo4NGIM9JAU_T_S0Jm z30c(hnt%M(q%i{gVYubIO%qePMii(7<_>>kPI)e;pFNt-)V4QM9Yp_aY|ORfb9m$k zspfi^@~Un7_y@90wsYo`hN4Ugvj2)FalM`LvRt(~z&8 zkhoc$%sbM;%2di2L$U}SGiaFE)?BrNiM_qOg@r}Tm(i{GAhA}gxAty^0NS**Co(hn z;u_avA+~^Y$`WBqjJE>?!atGi9qm~Ypks85ea&&n&%fVeOCyNE*X>O2u;WE-y+^um z*@2>LI(=|-Y$Nu+El{Nn%2Asxs%$;xm)Fw8G#2o>%Yd#sFoP*OeNV@A6cgEgGn)Z7 z2J*Bkx%X$_lVRCI4H26B5TJ2$FjZzY<18Zn$9@Dn2YYrpqVFDGT%PSW+akD&i=A)e zdi`*6(~-=WN-JoG8qiCA9_k300D`fOh-YPob#wMm)}2#twpLGc8deeF{9%E&)ib;2 zjcMWqmpg*u75Q6vhWSjKJP3iOy~gis@r)(a)SQY8LZbMwLesCKy3PN%WaVwQ7) zS0vI)-_EyYYh9}CW&-)dczB3sXa{HqYeL?4Q|AFmnZRhfaIO2UKIK=Rr~<>&VSxgS z2&?6Ivi#9Zc#x&%|<$Sm7aDX0L1<6=jHPKgp?EtV&Z_wPoow^`N|5*Zy%#{awe2Wy5E)9!`ln}+ zuC=swcNhiv@;*GTfZWA)EHX`4Ii0PzsHhxaD?r!r?PMbZGQS_INXe1^3s<1K)MIP` zh%{?XC?aHv?*XY!&C_GO_RWcyN<9+9RN$yXK=syM2b_$Q>g%J@ii(QyvyP6Ab1Ik< zy0o-gATmuWJf!=f$Ed~>JQ)dN*HJe#6mdsRVNrW70woBCjS$bP-D+VaR7$%Xp_Jr92JAnv zJ3%j8EQ3HC^we@Vi%jh1gg95daQGwnLqi2z9Gn*_>ESLn+dn|p9m!Ku`5Af#YjvDh z_>||n)eFnd=LG$sVjZ1#7tpBh2^B4J^wl#ugLM?*xfIGpvxaJt%(sGfh##y4dFyHL zeWDhV%Cq+f9_eq&yPn7K-VNH|t?9G=y+{ifB|PJ!&!%qu5I{N|_=MrR08L zetJukz#5KWh{KIHhp+*kgYn`!V{{nZR1gE(@9woU9!q_8Wz4Tlv))JICgwYQ3TY`s zSE%R$k8&Xyr;|8q^BMTYsrLeSzY*vNH{S4@yTg%{OdT}FO~$#JO_$rv0D^X1g=}nW z)}BEhKYr}U%$M4q;fwkwo`EH=PAjA~P({aA2aV(g~wVmuS zv8#W+2P^5Q*=nwS$$Xh>^+d}={sAccnqS_9Gf^}^Kq64p*m!t5Fe^(c;3z8axr%EF zvT{R&`ud!j4Xz?`I7S~e3$}lTQ;L-K`Io-@L^Fq(?IXZI(e7|Xk+YFRV6^fhky|%o zXr^RH2hoiA=!!t8=vl};cHs4mc&zk)KuP?=@#=4M=M*!LZeT&ik~bJpy|trj<1Ag* zgI3F!)3KrqZVS%Z2}Nma;N6hJ4M>Cq$;n7=@9oY0q!CBb-R|MxA<)Sc6coI>TDS|u zd#dgL%Mh>zS~vY&T|hOT({VA4xc#Xalnc@{S;YHMlS{wCeWi?P;kte8Luz~S%^@$Q zG@I_LyUS;LwzaW8eze#G8kO>sr_9BY2`rH{{u<^4kcvLIlF7|`*PLq5QFENut&pN$ zbKnJJ#DauUh_Lg2RZ0OZGVbh|r;if(Ok)BV^IzX0rNe%%Tjv}i&NYBm({C|`4-b_& z_R|H+^Lm)^TcvS@e%~x59-TD{W=$5ZKHqcn4rg(-?YFJ9{F91Z#u>!_hM)bqPw+)K z{DI8*<=1E9c*mDJcYbRL?fwp(kHKpRI_V-_&K==TqeM|tpD}T@OAQ5qv;~N;DodWt z2+@>XEL>lR!PJYiKX3+H47t$QnV_1*Q_?ymGelmFdy8IlwGwnY#Mir=Ebxc@hBJxU zZO33%zV7g*1sV+g8(che+Y$T6i8l_i<;Ul{iu{G~J!`!tkd=tL>u>#-ivJ|4x@hpp zvOje(Hs~Ik9vmYxZ#c^bfv9xZka3uz_2Aurv_U(GsOm_ZovkZt4(K9Hry9QwSZO2I z+reLQk{-5fIX=^DE8{C~F+wTRWT(G1X?Bz>ddQpSu+YRH4_Gj<>w{L8^}en7#(JQC zpY&z}2@y7HgLlHiwcFdQhx3r|tGoT8(RA6ez}Jg7Mi~X-(?Dk z421I1Dn>*`;-lyuDmpp~T1>pNsZ?zJX)%tRt-f{i_92m93g|DR6ss|&u~Cna)gFvZ zbqXv*rg6#8OZrr9K8W~niXlWtm#G6Y2I32aT=iV_B@7Ct8|D0R7gTc^*MR=3j8m?M zT<`oo%$cNLpS;^RY!`1Hej_A{8u(ERtn`m=eJ|=wpWHdU@Bvr}f-dWevbC0jQOA%w z;`Y)~Wl=W}&q7?M9oE1TsNp=1jb&PYVa_?`zU6*T$xsm~^pl8v)UQj;@T|HCQU}d7 zKQ5+X8`L!M3P0!El(yZ&)>i>o1XT!IwqDfc@XAo8B%n`e<;S~GPN>fpa_`A8>-G__ zI|2P^Q25o|89@r|lfDc{E4#<-Ma1iDV)Omt9#C@6KYbS5x;kX#bjps1GvKT;(GYR` zI>KgwA1;nAlZ@5zo=QBTSUnTHPL7W!K}tSOTwFbB(&I65zdGa|49{)09>Wt$5hw?m z0wsQ1RpD&~z5ACQ4e}b7b1NU%!FKI6*O@l4rWM5L`cY=H6}A!v08W7F1B3hzO_tBJ zemAF+1Bm1DP^axyfbt-(=Xq+M)I&QN^^aT_LzBn1r;<`z!}dc&=xDL z(dDvG@b>opNg%KLIj;B0s^5GU1@q8qI%xJCeo#5N!wUP^fEs$l!-U_4TfC46-e^z( zz2?B)v4oa%2;A-Y6T=i*aczaQc{~t#3k#Pv21+ZhYCgFEt?#_8T_8qYOdi`{>>%8* z?frj97s#lzQTEL@?$_tjHn58g&77Qq+at2fQf053(-Tr1M``K3@uKb=2Dl21^Z5a_ zs5iz{^cP0ci0F7jzuI!=;hs4z86~d-x6A&U+tZ;4V+Q=r5{9AbnWIvgS$Y5$`W@%h zJLP#%yWOL_kul4)yRvMO9Fda+n!QQQ^C0vR?IPK5a;L>#{y;+EK49K#3jbN z6-t(8G6~Xqr176d5lA)EvXK|~RL(Fx$<5R4=9@=bt`hYAlAMN~OJD!CjQRa3TU9gV zxM^qX^X4Pm7&{lI5#6Gr#A(nsIKd1L8ACk3wCDp5S7SdMAw#0kwMYB^CAZfRKpt1Lluejr~v8?Pb)WTMdI=BuJ zZk~p6QdV#IumD2b6_u-s( z4hty}vU?OR2Li;epR^+|4VqWQYgKt^AftZIC`=@>Qhd)^|L$W(*} z-9M5_(D{!RTEJML|6K9s%D;~1gwdk^_4yMvhB?81eW69ahq(V=UxMGfLH*ZfwEw(h zzk%CRes6+n0k0cc&OQZx9P{o<+jHlEHK=tV-|?b{+%Le^K6+(7KEXAASpG zXCu_8PY+w`vpa}oB+7YWKt6JX1HVn zHy_=GoH~lAnoGSZe|vSC20Y!e)^QS(z|TE?Sx241jp_S|Ccu#@a3m9Z<3_xHS_t|4 zFP_>fx@C*~_&l+lj;rR2`%U|Y&yNYLszxR@hM~<6o^|%aIj=_%er?}A-mhBQp=pWw)38ZSxtIwHWR*p`Q@xiK@%?)n0nim&Yq>N1)gL8mkxCn~er`CIzcS7%-S*H`?8`^1OAule zF|RUUE)>ObF3wg_-G+4nF3O9bL2y^5BlUeox&xl?{kYBTeZkBl9~$pUaEvw#0a_{0 z3VI+_hm<$D?7EwAF;n*-8hA3{%d@T~a)Zd3fIJanr281(W=ZOyBq(!?sX7W9doHk{ zJC!f3j4s$INVnjz0(^EeUS>Sa{pwjJCar)wo|3iOqVnJ4fu-2~r#XSn=NSB-?-Paf8 z;tme1;hNN zRf~hk5_XX!QR&q}WU|o8zu=^rr`Sb}(`C>e!qv6#$;EGQwhyXpz>8Ty3+iD`VdU`N zjZ9%5IMUs>`PLuFNB^D0Qc^?v2f z+@Y??dv_zb-^%Z&xIK6>mJ6_n@KY=fpV^hr?rslQmhXrHj}nG*zS zqGMqO;lFN4aS`*~eVWHT)+1A}`!8$y0k4aiFq0QQmg-dwH^a~eoWF1Ts}>E8CB@=j z>AT{+KeDsSZE>*Z zVPDX9Yee4x7b zN>(Uc5l_XI&-DwaurK|N{A<}yi@?*kGE0 zh~m%jzwdGX51jP><(D*e$r66CbYTHlZ@9Rk)GD&J94}tv0ptd}R^C(IxU#H0vR?XDjW}bdj)>1Z>wl`L@f2$||ZG7Vx6RhIzBAcn&=X;(>CkZR`z!9SA zcQGE=Si*$O*%y^mCM0Oa$7|_>*xc(|?O`qghOZ6SC&Yb54(WU0o{!*ntuO!(u42&; zSuuzV>VThE*+MSX_HO;T77A$DadUIS%gal&ZGN6%ntma#_YTjze`{`V{5zZYg<=2k z^&vfEYzF8_=E_L_7{e=3)xe>T8WWh|6!;(x)k(-ONy#vY_dS>Ld;4{C7a!Gh|B)&Q zA81T2CF|$Ugv3OkvDnk|;}<4*px5DrRc}$OiLw41D-WZPHWjfVW8SN7c?y^K7F!t^ z(Ph1;&Yky-19kdEpFG*T05&)uAD@NAnsO5Ev-eI;!@mQ90;pKg(2ODv2Acg*2Ug~= z($ayI!|2BVFEmRofJ>q9yUKB5aJ*f+BG4xL8P~ndL)YV5iVpOK~&g(#v&hkSg>b1usawI>U~S zLkTGR2H9U0l}+nC0r`FYbpxqCgT=ileaF+EG;Z#XJsu%fbN8x zMw)D$Ppz8tWqG4`wNoDqdrR5GsDp1X)-&t9U@8Yr(AXnxmU|F0IGZ9d^?=U4+t~A# zd<_j@52Vkj2`nKg2}{@zFpy6^Kq2>cR|mV&N4JV$Ffz|{TIQ%p$v7!jTgq(B^mXL1^9&c5%4q<-_*E*7uJt&1(?2JHSuS zS1n?$l<6-R$I+KpJzt5F!H|}N1k*nJEQPHy%HaM$qWf~HPJc26x@_`#|7P-NT)CQm z>Vq5Iy6EjxyDyd~{5vfl-wQ@T7M2IO4C>6?p%~>tJ#Sd8C$>y0LAjNQupjFs_&@TV zJjB@jkU*O7<5I}Yl)n{OfA}yLY9A`e8%9nOC1O0^d5PWTr8}~7XgrZ7T;Z^@q9WD^ zP%YmF;iA2nd~SH`@cjm=hWb&&Vr0+R`igC5&CAvuT}cCd@IqI)L|eW(?O1nQAd)X7 z>yh`|Rwa9jxk{#LPEO88yy0wFL-6L}@3eaN30=0|^UQw`ki`}FqDZH&(QTP80v;re zbRF=vU)V$cDio?#=gN|#wvi`CCe1AO_==jDnMR&g9olghr@(Nq%v4E>I(VxZ*seIi z?zyz`K4|=_=UOgV{C2o(Mls5BnJ7~_o`QK?E*sz<3q5k#LNi@{B-iT5ApNSM_xlnr zMQolNgQFPdzO#lK{tqkuuQHNXy0PEKSbTZ?h9PH?X}Ag6PV&=7NKu3Is-NkN(*ja`Um=Xkr#6(gN|i- zs@)9p1XZdt3jy`D(E>jE>fTPcFGn5rvqkG3C5G;F^}=@wJ7T=uSGtKi zqh_mh60Vz`@;^Or{+PCp;dH%Ltkk!PE{N8b7~Gk!_%k%Ewj#J#DigI|=@M^K;b%;S z2(X&=jwvun3d*%%C8z7wR)ZbJwahlKgo`=aenc&p)J`0?K7grEv394+oQNuLY9E$O zuj1WoPmVWoN6!Sb?Q3q?p+G&LppL-O4iO?F)OJx(kZn#-~TOEhPDE~b64GzwD zT}<{osUr2|#RiSBubUpw>i*e^iT2%w$nS#Rv8v)Yy)kxKLbkEIMLm160JMu=B17-i z9^#qa8JRy?P{gL~zY%04`mRJh&C(@?0X)Z9^QMS_j9~4AqqC0kY?-R^_dNX{%-3-R zve|V}-;Rw=Y6?ZIUgEuQvGs`^CMhu=bB5^1T_*Gc+#(VCd8;*13yNF~X+5I-whTo5 znI4Qnm=oA?(u1VAAev%N>q56d{K#>s5Z}`G3-o-;7*%4*vL7p0jfbMBL${4ap5?4p zllZUJ3Hxx9@(LLT;^Cy`zxEjP|GekR6k_N0(1|NWf)C$+dE0cz-_6ALY(3RsVr&dU z*z}KyTS|i5w^9UKz&3Nn_u$$(Wzt;D?*Q<7Ul#6py%u=6wv5FNZ&S9X^LktohX{y|C|K6SP`g85LWr- zDd2BLaeP3)^o~U4K@_OXWwOsU}ag}LmZeddC&@XL!aa3PHaSNq$5`m(>E=>Ew^)Bu+#_Wn^(La7{~cF~Q0tU{fCZ z=L~dhxT+*Ss*Wv7#(&Z19{$d!@jW3jj0K!9_lHEt{f#%m7OK}xfV!B){N z%bl;n?}#5mOu-`Q)6>(-%gg<#{QE$I_iS$ts3ZT5#1PShjaQ)RNr1QN4IL*(U| znY&5k(-ZQ)CLxy^Tejc|xh(*}lmnnjKJ+oy^wxk3{!Xt;xpf*#q_1*d(QJPQT2Q>Q zIhDznG=srl1qJ6@`57(C{Q7`Q@RG<|<43#FD^nKA>kWT@><=kC46z24sL{%$mL!q| z7i^N--WSV&l}_Y+FRZDV(iUgXO9a>j3!m=Y|4e1k<~%s(G3Pp3a_3XK48NUgx~>}2 zR|-u4$7?pr{*Ycc{>Tk?h4oK%reM>szFuKq<^snSo&Q80V)U>&oc2bAimd@f?O~>LV6xQUFLm!F3I){N&pIDTN;$Yfm;gR`rNj#5&@r?v z?%ZjI;ANX@Quv=1j)zy4rmMXqQLtS6bZggb@Uk~Oi>O39taWnB73e8t9(eG~OTKM* z;rUrvy-a1ZT85F?16g^k`4XvPq13Q5-}}HMTdfEL0%^mHjnviQ04Eh7^S|%J;F1Vm zqA+Va*s3Q`fsQ32oxo@DMZ7OQo2v78OSQMHL}|okd8NaubafN?gDZWSMn+;!D&iAq zQn`U43g0W#BlmcsUJVtIiL=;DKu{+=zvoaE1|D|RbZI$W6^70El2CoB639|na`B!* zwTiRI*5ml1^N%>SK3%3I^{#DG6KbPsK>$=jT^sN#t8nDkr^#c?hI=2XOV6$6rUvE4<6eH8>x# z?q`=WCx8qt&m|t4Req62S5bZJdCwSKKBV%0cSh<7&6j^>qqFiSiUIB;i}Y4ZKQuJ-QQpU*@pb1hfU`-Qv5>ffh1gL|D z`UI#_Ku1RX4(nWCaSTVir;?GpAr5FnKYhAoS+18qx|Hvkr=CsJ6IquSKAI9-f|#&N zaFyTw3C>gAN1QpsI@zN*_g#f_O7z{3Q)RH`+dAMNUj9r@*Wnmm7Ix4Lz$-<7l8D`$ zK#fmpK(yYDB27M*PiWRQ1DBI4+4LG7#0(rP9APSQu49uO9a1aDJCJUIF5{r1CGh@} zgpvK?;(f4MLlk}WjhbD#qg<|R&SRqRP4E{Ar_j_+rtoJ^*HFQ&^I<8n%d%?c2erke z^k%N(lP9cK7RTvISHO!Ucve$0&sT38jXaf~XI^1J?IMn^v)W%}38A5-0e4z;kwLf! zQQ24LZ>~BelJ&6K$T1v<^tu#x_8y`?CldGE9BTXW#eG_z(1KG?(5ow&P5_KjSTrZI z>JxC`CdYGfauP6xs;~SS9T{CVUD2HS_%txjy1~rZyTAAD|8I(_^8?WHe?rp@fX=l; z@5>*#g_Z3%>LXl`vwGP)QZ}c<)EUvq(7?Nw`dj>USy{{M2Gv%lwXddgtjHO~OwN(~ zR}~ll*d~0cw(}!S7j9bI_wCzEyrgsIuV=k;hMwz3V1IoHJ|E1lS^iOD;1F!)>I9XY7 z|BW{H*DGu+B1^6UtVQf3(q4^XWra9OD|ni@6DQq0BU=@_vxYy-3HDL{<0KWlc`F{u zf<;X&$g|FztLjbO$VDflcC};NJHaAtJ+e5n|IPci^o?#*=iP(YED`&&o&;7GXJ@gy zYnPi}!tO zo!)An^z(Pne{RXwvi~I?dJ1M}YWwlyOKOl7gH)3Je9GC94jHXH>Hrr#QIwy{o}mt0 zeAAk+1B{jLPV1AS5u<$?cwo+XWDP^6u@zL-7boH*swTUF4y_bJTM+pGIkJtD|8v}Q zB6GX~lygKNpXhuuc`ES%85^S2pkXCa7?`(;S6Ca#RdjN7R%XlZJ-SgIv8RQUC0X^r zUXLZdg_!5rTZW+5o>&VNKDY<)!H^Xl3rI*REw^3L~ae*tnghuWPvJVZh@ z9{w@=kIj;ndEr)tuGdYCBf%Df^9ra#ycC-mWBSVjl zUdA<{zk3PlJw*9~q+2b=pEU;AYY2I-h_f6K~x zH<3aiQ}R}1GF!)i#oRpVLvjc)6EG{>P~^~XNYjun;D&P0Oedr`wCa;UqbyYY{~VX{ z6}!NH>1E-mbZ#@h>kc_z3Tkg}H}N@?-U#=_`!A`v!gbW{X0#RG*@n-POAhI$&b1%5 ze198o?dHLR8>U@y>piu2kIZCN2c)%BQdss;)78}UGlU&ryLU#@NmBc6W?s?sNPZ5@ zJFKSeghM-nW~mjB-!bphSfrTCkk%2?nUarr^)WevE8Q`M9d)RghR#J*-c{BknI?P< zYPVS%Tfeq(s%$N50CW3;ZTPi)jVIzoVxIe=n+y*DsA2tqT0U}(QWUv@QPdykm?t+p zwJbtSAk7-DAl-mKo|f?{F}`3dBws&C#a$K!)60a*0skLha1df~$a=%E%XAk=k<80q z5lmcPLYA?tIkR(kE`Tq-Y?~}?jz}R}o)whOG1G8Awf`a8^LZu8hrq~nY+QRQ9ghQ;z=&2p7Gz|1XD(wTgz>r3ju)x39BF96~W*9B_E zo`PoyC0tIVPDG)^jWu4g*NVm2Q z4&<@yu#_n>l_>2#dbmo-Ne09>4-O=_uic;gGcG^zm&1#l9!myZ_HrDQ6N% zr8wonIMmXYVtMV4p~vfe9!mh@Pul24{1{%4(iug>4*-r*L}+sT$!nui28IC(ccV?7 zI<UW~PpP3ChlE>>B&9IEPE+=R z8tsaS;@BYZGVdETqdJ+l*ZM^Esv9~(rb9xove%_UD9`@rOFA9Ptw`v(%jqUd&TeZ_qKEy~Y-b$E_9e$riC6l)~i6b3BnkkB*xYiEIjmx^Y!m z4-DNjd3)ayVM;iA+dwL(EQSX;OxdZmN>A$)npfV7i2QG!=oCd-JIYto4S5pUS+wrv z)o$<|O>~zShc-pI4uLCPRicoi)R@YG_3ZXaf7Z!aBu=m?Wd$B(uJzJfsmiPmQOm}ALbn)SF+$&6wo1*WlO`6`Sg=#5WwntDw;k%32F|(fCbl-cQ^E{W> zA_x)6fFQM30<8<*ocn@L-G|nPO%$n~?!Tx0$yB~n?38b}U@x3aNKCyDw$G#ad2y`r zZVa!MTYdkqz!k9Yo{q)fhR z{`et)XHupjB`4h_C8Gd|7}#|biQ%PZLnBVs@1VmGIeMstpxP#N(c*Q#_~wqFIInnU z?*m&j?noB)mS%{jYEwLwKSH=~Z_Jim`@jvO;5tCuMqj`GjjXnI!xTxK&voQNojoT3 z=1i@vGY?5C7XCkTE#Rc{W~scAq;>|LmT2ny$y7WdyRYn+YjT_cOOCB_n~biW^_r3z}I`C8Ol97c@68#w`Z9FM7GiT+Y@XU(=KC z06_=r`OE)}aK$|Tjl#Tlc(eWprvY=TdbEo|=sjq|0F@k1Kq>)fu8~t@P;LavgzJ5h zm^#M6WmeymZVoZU_B&J87=;~;ug`8TKchtK4w=8oV;ia77kx1>7{KJ^d3kC4ea@#V zvlzv|M`s~j>&uWVhS82S!?5x)U@{OM?yE=8fIPcOGD=7brV{f!JLiO|!}^p6&-fJ` zW}5{GSwppQy>SNOkCH*ZqojBt@mRgNu-VmhTmdP6R9=4m3S*B^g=VR`cfDoJ^v%sp zqCOPu%Jc!!tIr>I#fA3bV6n83{Bt&@o?m+QhIXn2UgL2DEhHr;za+Qs{6ed*@Yc|J zY$1Tr3xGfYlcIY-Sjctz77gtS&q(}{S+tq7^N31-D%~bgG2TY&(9jToi?#)00%+IH z!8u3&4AK9Yv;_tP;QNB$@`TNeQ~lPx-!?Xw@^=KCcG2Jp_1el|zP+0GTrp!L>7Tw4 zS}Ul5kk!E&rAqG*8hZPnci=85>(9G%xRG+NQeo$}_RXP3WduWB9~=9@#qYBEU_S(t zl+WeQhje2+j@CD!?W-3&&LxminkStrDhcW_L9~j{U^vNMZx`=h!jE^BCv3i6-^PJA%V};tZzTqb34I38o$UW{)1km?}bI4vX-_s zpJ{j8_V!=bb@|Qu^FM+4S^4g*>oDh&dbCh0c0vDGtF!He+w7}z-7rYb3Sk|upyBjS zen4fZ$<8uEc(iskt~cj~L*zCSJVmUGg0wBoIk5UP=G*#{X|QK=c`G_NB_*%#f8k{ zV1QRpT+^wnrlzHqmK;q{UecjXY|Fl6+PnUBb8Hc4 ziJk6Dyk#)!jWEuZrHRCEx6!hCIH5hwL}50z{8Ei!Y_w3t5nW$Xlg_VIEc|b?(G|zk ze))~knUu0c!PLsvi;yCQojSz(R8gT`nTaTJ9;s5BudvvlAV!VS`f__= zF>fd=s(M=Qwjre^j+WGfRqBI+jGUZawZ*eL6qkBkySkJOPwzDCQm&M~(2B8Xix`NU zjEtQ0moE`#9^O{*LmT~)^?LH`_*#p7tRL9C#F?RN4nAR&5y&=hgddYgyG$stbU!biTb;*pz4 zpGtPr^eXZ+{4r}!VLU`fFHN+|V~(X%e#61Dh_R=v$;kl}Q+?`Wx>Ierd3j4r-4-0p z&EEAONINh5LXQnb$H{ioe(2Y_vA#}(8N52Gs!z1kKp|;YLVrj*>OSu2zt*SdOZbsw@)QkmAN`-D2!XV;K~(_GU&+h{?RZ0Cg6DlK3X)#4O;WK z1=`K%#xZZ2e2L#b(?!z@tKazcva;cGc5qtlQgzTnZlda`ykG#dNW{Upji={j6n~|b z`c3O-pJPd)@iRWn&4Oyx?NRLq6@*=8HXp~Kb=o2?HxNE6Td0AgV6gk_$-k|HSbVxa z{Obn}FJe`A$dNKeC`{bl%s@TN%c=P`~GwhJ7 z!z}*w#r1p!+e*RC&W=L5fR>^I=-_1o4T23rTKUwk&H+HN##P=H?LTqDKWZV_b;cn0 z!&IBOgoVW~`mx=1h zy#~!=pcmI?))uLurA3eJaJ07$s}WKKhugaB_@^LxveS^GdZS+Pcze4zzjcw3(MqWs zZO*Ii<0=CKq&}VpNIdudM3E+QR^g3;5IlzB;=LL!mAEhM_SqJxA3IZ4`mLNr5(R6t z0lCgTtb^U}PGzNYZr71iVtk(zd(I(g0z zoFIF}GDsqCZ1Wq<)b--ZK;@OLi*!p*1WHcNn%StVk1gjPeZ@CPvY>J(1kP{Warj9h zC%TL%q|Luf(Yw#6uPri!{E)=kap{=HcDnlB9wCpEQt({pqk=|$$cHP(6$U4ie_nFLl-S?&tR!z+=J=XBKtqM1r^FP+U?vfJ|^ZC-T zkw+H+G5yS@8lOme3UPoUYoBP~uQi`cjw-SO0I1j#ucfjSud~S2{qu`&#zB&V!D~F? zy541Rt5hnptTND1Pn@$qsL@y)1IK`6Y|!9RII$Cd7F8{*V0a*V7M_Z!EBW=tvTi0% zoPvv@@21J~xcUChYq+3s&Td$PW^LGlV>NPMBUT$ae8bJb@%22t=c!swINeH+a;MZm zf3aWF@k9>YkjRkg;wY1x=fK)?F8eZfG@8=+UxhiCG`-o#yg{P|J2q=|{iSHf2jCqQ+KH!^nJVEVK*=FaJW4&&&RWxe#Zo}S*{;WudZ z0HvD@bh3Pr^w+m5K$lTL=<<_Gri!w%)FXxO?;3hcv^XD6+0+h328a* z^L0&<;thz;E8|6wG8Qd(X_gIduBJ+qMtuq0>R{j?@(B-6+0_07i$|30O|a4y+tI%>q0*{qT%3y4kwT z=!M{hO(dLPoU`8s?q|Et;ONK585UeRH$wi=&f&7S-a_JEH_t~(nhe~y;Plf9ejU}8 zlw7v#@o`VG|ER=8W&bI4F?e+@u4DmSB`P~-ig*0o_u|_8d}}={2eX1E#}Gci9~vgJ zy|YuQ&bWmWn|=Z(_Y*KV_z==VeBd%j(okYq7k*aiAp(eC)LfOFs>(g-`N~s2Rh*_8lB7wV4nzF)>jU zmhIFvRc`AH4=}JWQy8G7pT{CX#LPY`yrEZv7~Aw#7j(;alcs6TSr?A-5Eq`&tUN%Abgenu+jff72OXivkQyLN`Z+o}QjwlGr*=2Yi zb?x_tyZBa-v93@?-FU7WtZVJbw`2^z_4lE4s@I*C2864w(sz)K<5l%G$Kws*>sC|* zH+i_oSA8cXr6Jh){Pn1cLXvgwYD9&^O01us(cH8v$T%;6u8#DMZ~r)c_h)wfP1A4= zs$IEcp48{W553NAn%7@Ay?n`w{W4iINV)LKF!8clvZh{jbTlJgs%V)N-r3a#2FV)- z2bXI9^COHNJ|Zh;N-uAH`$Y@bqsy@(x(JEFP&NttL=>#F_@07q-@bL<+$s$G zWE|~zg!CKdxBdmc=_J3ts;YTS%r`hY(^jrxc82L1ReZF25hqc+Hf7HHWE$SD8$9Br zpr0vmx|KF0z;s*zC!?$z5IC0YiCP3|hwh6XkL>-dFEfQdyV!a)h3B?5+jsWzg{kx_ z?$qMmd-Xj?)6P}O1p4s{Kc6}=JA`U(k8w_Fr6++Kz5DNb60p^>w?bZTD`W)1(aQ&2UB2sP)ob6ylhf&H#&52- zYl>PXq4}u0hb6K2@-M3p$WjdS^Z@eZxkLn!seQRZgRwHWPodB&a9#DsW(+Gy#2t## z8|P{rb|dzGx)Q9_NgGBzN4BIgUvf0`^Or6hE^iV-;Itk5%So+U}-2)JB4saGIUse$Bu zhH!Pjtz5Oma5c2miGQY}Q@+r}viI3*Yat~6pPuLm(@*}6O*)ClN$Ngw8lG?fNBoWU zF#fYgl(M>ZiBac897M_O0zi)QT8)9TD+D+Sr9Eh?zOTe-)`J7 zniZoOtoGP#hcK2$tyvSR;NhKH|KM#q|Cakkj3$1bsd=yA%YCtDJ|`Ytc#`1;ek zfer*M>9aI_^P1`F(;cyfl;Jo1TO;|gGvL@&Uk+|RcodF`C6#{_XO!*&hH2m7pz*p( zUu8C)q-P~x@aAb$(_QRH+glDXvroPJmy5sbq~*`LZixAbLu0>w{hF4hr=%o;o~Ozn zjS2+{nezE>N3F5{M&l-SiOiPXhC_sN2!#KneKC4q)z=Ws=O>3=VdU_pF>i!O4tIXiYZwn!ssBs6RdyDkdzzoTvg;hDFP zzc)D+>7*q6sG4aWt{f^*BUX=E!!2oBa*2LiK*1cxnWG|VOTLryT zGsl^kzMqi{F^;l*Uu|yqMin6x8G~%4ik$!1w!+;0lAj!d2x_^I>Q5xMvL;PB-rZc< zHV?`*rVasmg!G2>sfPeTmuK)_Um`;Dno24Jx+a(aM{IcR0ZZQeBviQClldiL%R){u2m~T6r(&6n3yF{*->IB9?b{q<-<|Wl-s@{T%`M*meQ!JWf~P*MJJEX; zPorAS9ILe*saOq)l^AhLWF;6~D{k49dwOKDF_kJDyL>YYa0>N=5mNhj{Kr3t|Cgx@ zaL;n9E~S0Y#Se(kauw*;ID)gJH7RegwZg3Tqw{GLuyj#t*U|+yiqvGCDsL)#nsn;8 zdXvOxY2WhlQXO4_I$t3vCLv*b#gq#33}N1fOGGq|DDgdm!Pubj6FnO0T4WglM#JA! zj{-_1t;w~n+Ri2ryGC?aNfo`lvdX_ek1#D{B3I(yEB)Dy`?+rO33(!y#@CRjORQDm zx9rfA=Oeg91==ZkG*O{)e_o9hD(%Gn*0;3W0*ds!9tVqex7V>J^MiwmDk@_7gFuW$ z`5ZDrVTkzAxE~WaLdiC;bDG>|76pH?y&N1!HbvHWFxf+H_MH|KEZV=VUfec+%5`ah zv+ZvWz3zz97$f1+&QvYLfYxkUT&(zTt4yjrMH0jWS;lR4xjWH*^R=DRH4p~i5>}2+ zEx9=@>$rk;U~-oy>TfeLyZT*Fq zlJ5?L-51_)$zM6&8zQpr*YomnBkPTN7Y!+854)NM479b^mpYoYEcx_444Q$g83--D z1%mQQITF+~G%=6=IO_J0kA4OsRSP%k+{1)gCF<6$uAE=IvskRZZT{;;mDG@;;fF8u@_z-ry>f2LVX7kf-NX9& z{V1WBEtjH&+sI+74jN`w*qaZ(KK>K`{}OcVEO-=`y+15r4-v`Jc#QXxljr5mWrx3{ zPfn=tf3&pqgLoHon8AoBBO|0W^FKv+!YrfPPD5h^oBy+KRJ(nC)OD>L+#Ecpm}K6d zTE-;zm9B1mmrc}DiP83Tf`s2~xA}ViE$ZpkNJwroIO!gMkeV9`07W3=f8PR3b)kb_ zkAQe=NlC9!#fQA}%=Bq8{|uB?JH4L3 zlVpXy*O+3j^^*Rv!TlTS?=|y<9}2g^>g?xZxNR)DXO4el5=b1NHm~{nv4 za~Z&EH%bpP0*y!^l&IBTK)^k^$mw9Q)wna9B7OsO9G^aYN{S^}@D$&!|Ln{Ik$QP( zsU;yOL!_&4uv@4EQ${)K|IFR_)5Bo@ZjQL+%Ivz6Rp#g{2r7;AZc=nI@GYmI=;C9e zr}!+@1F2h#tP=vq7yzEw;{&xl+l>Hie)xtz$E05>=ZKA~)oS(#rBK!KhHJ`G8vP;j zZp_=N7*}?-!P1!N-H~h8Gw+WeC2S zO#i-BVGIWXi#ta>tlUHq%9F)~g%pNmZLLX=Ja$1r7-%+XjPVnLx8d0wW~^d`spsNp z8wcuz)Lxhi)l4lpXm6Krr9|Y`tUJCm(TgJDv;w2EM<^KI*i9kQ(rBI{1si4Rcl1!*ebHI^uf?_xa%|N^X>WTn@q6 zv*>kftGm=Q#MWU93hjbt7oX=$#xc~ySDPg-_U*{fY_&o9hI9QxzN=}M2BDd)^{Og!zajL!eVbHNnMd*i^wx7{r)^VSkL7hfz~nA=d%5W>Z!^-|u#pz4L8$lt z@HDo?ur0zz{_Orcv%a^3yb4j)v@6PVOJ2^GYWs&Xg3moN5u)su>-@CWS>`#C(>H9b z*I}&5Z}S^rsp-in(P6>{LQ4`5?I&RTG~3{6y|Svqyb+nO;i<=BX|&hOmF6BeU3wLm z&vN9c)T{C%S-tq@41y0vh;}*raip5ZK)|%rt6cBa;fzdVb_XrL(UfBS!7on?LslD? zafs^>w8pP!j56PYFH_vT=5Sxw`6y9EC4iM8iepZ2Cr=;+Ve>ZWCbj8i>czBNsI1@e zbgkYGJ3os*J!4%a*n;y@qrf!lw+(3n1D>kA{j`%?4EtMCJW&ZKsp+)ts4vY zE%zE1T%Xw1Pg~whKd#a*=A6IO$P2vQaAxCA8IadFWYx{uxKAYP*LDA|&!&AvO+5O$ zSw|Z?!nUUC=54;`SFxEfvOhDPGFQD=&9xo-u$MC?$8CBTr}>Njq-0l$RJsv666ok zo^N`m9qz}+t69!5}pFHPMkk$rki z!u5*=^0WR7BRBSph>q+A7<@h8mObZq@{zpOPHh=^|2*Yj(7ui0a22VVX+%n|cAe_?~c^CcZ?FPOWo~Q_Eb*TFg1s=_iol zo+Z|eP|#_h^5zuM?X^5&9%y$$(Tg3#ud1@UIsyjYDjj@klGkRr?FB^&u_BJ zC8x`ReCnz_KfP~!DY=O(RJK-@ZoZNUi~u z8s2E+1P$`pshleR1KN@xFI~hhvp17&xUV7@AyN_y2|HjBG|a4 z^Zar+)|`k*dtKW~I9cw$ z9qYcmV5dX!!O=;bpG0^B%3ITLpqrBOqHsKs(1xUc+Rih5W6kQVoiz0OEs?#(P3=Mg zOQ`o9Ue#eK=zVja6&d zyf&_ruYpW1rQ(}vPuqpI?H5~(xmGu4shVQHH{mak`k(xd5DOEFgFzqCeKLeY4!;`H z?yKFJEB;Yx){_iKovj3SWzd58M%yYo>e_K=z7aOs8e5_gwktlOqnp z=7Uj+`^-w|iW!Ov03(Qqhy)Y!6f301swVmZek@Rr_t;<7f7Y@Y8Hpzm{GtYGfHM#j zyalUlz@#uM9Y5|FQYQQjhVz{3ie@l{e`!&hYDSZ% zJm^MEkw1P0AJV}J%o)Hg3Ad1ygRI%2qHVbyv~Af47~y#xHdzDowIfJqnJ@Dm9~3s^wD)gm0Wo@`y#2;i<@ zM&8y*{@bZcgX*s##QajuH-CvF-fn%#j*FXIr3$1-fb4fr(RRI%We7}HD-RfknP{Ka$&#-1rP#nPh$22dQ zJ=C)x_s0f(WC{Y*BZ}dn$^~>a5I~L}n;n!fiM7ieO^q@$A=w!&_OasZW9Oj0@+eza zGutMWUBIZo;pzn;VN zY`;`#@Tugr3k!T&;QTjft>VD5zuzU6!|F72&7MV5xy~y@L6P|3hAxF?lsfAE*U^oU z?$KoKj4?go?M108I3yJ8J7ZxF}3iFNew`O_}u9>p50 z=)*C%^7Vx8Q3uc@R@c!X-hTe*or%cgqs?!SyzW2S!kw!3`6P(in=1_`A5>{hx1NH(lxz^~Lj4_7RXzHR}Zz;lA3i)-|Vu_;?`1mD}7bH0m76{tziO zy27~ZVq{kG4iVJ7IeAgmQmKf}oHzJ5#IY#QP(iM~S|f6V>7q)zQ&C8m8kv`VH+oSL zwN2kH+TFrQZayoc$a+loWQ<*cCI?M|MmYh+;NGN4yB1NuaSsD}ZT}n}tlwnsIg(^0 zjG~kaN4H!+duNs03I5>?o$FAWAnLW1bqJg-1zShBSUG)B83mK{$B_7;zCz%fzM9%8 zXgKTQvUJ`r4&<`RMVi@Fh3*oXhpdfCeUU zdd2?n5#L+V$$I$XbHq^5yZPgSk!x!MZ(Z~7ghSB}1hjpRp$fw+LeI}`*o!hpJ;gJM z(uD6#EI*%ju|~7WzS$kh&Zw9Ql5u9>y>Au1UrPer&wp+u$H95A$I;wF793Q27B$-R zmpB-fDbgd%D79!U;c}|zenYlwR19vr72YbZ_f^g^PEr=Ih&}VP^GZrfZx7nAd%C*; zrsX;yAV4vZ{&|mwNHJftMvtfT@G)8d;PJvuwv2}RZ*4$$l_I^1Zq|>X9_t z6;!NqPKh5zF(zZ&TNqImif52G-_5DGeT!!&^zAS}t*|;Q%9IXYL2G-vY})|l*>i?& zoiH+y*e*g-ZXC6aJl^I7H&9=<<2g!fxpfBnGygd}B-Q6Q=~DbM52NCoRYitGREGZlT^JrlbnT^i>3`i|H3!yc@)5pchiVSuCN*4^BRTAW2KJ1pMVTodL_(moc%Pb`ktHbBeEJsUytW!p$ zd)W3p!&w2ttwD}G0ZmA{QLsdR1-3JNG(6mp{YBU|&Yc5{ORonFVHdkXx*KLcK@Awp3k88VN=xnRqT}2p%R2toRN+Y|Bn|t-dgMeAKOxbBT8Ke`tAg! zbRCe^5}~M40;OCpAm06>Ej`hE8uSE ztHF)E8TP|v@LjVx9U8-ez@U<+&*bi_mADr;FCT>d)%eGFtz-p=#>EL6@5y_bM#a8vHlB?EGb|NfdZ1i|%twKK9bDsmCLLi3|#2EsW*QZd+H-l3tPtzvZv zP~k>v#JEt2r!QU;-7`{?2>{#rZ1xExfVIPNr2t+d$H>kflAYe`bIT>_R6xiZ|nSr z#GXeXy2JistIx!P4YexQ#f8P8X?MT2UlOYKH}1-Z$dr!6lzj?NiTP2mfOrvDtW0wy zo)q5naVeW8Qhf5!tKmoZQ#vQ3&UtHU;qsK{9>~gQt0dRhay#B6eCWt`dd=n9gS%9jQ&nvywMo8=6na_k!t+`owLpGA)_t-h_id3< zG06`UnFvnnU*hm65*M$a@ZRdxW_(F;Yj6rbgR#-A=l<-%0CVPh>Yi?odD9*j z@1aTp6>qBy-)dPVf$En2=~sz8T0u?Yx;y8dm=&EDKQ%*o+Pq+6c^yiy81bkOHOo19 zc&3cRXdIbyy=Sng01GPMXlf>$AFe}Wpl&Up!>{v{sWsl*hD0h`$AS3N4s%~{9r-k~ z-;6*Kr#H3Y@_1;h>>Aq2xJe%f-*t?Wl~!WPSq;VrAKT)|D9C)2I22pd{i~TjKE}@s z%Ro6(wXMQqD->JELwK|U`J>dQGqT_Ca>F*3 z`qdagud`kci_Tnr8s4=2b(qfZ(?6s!k-KjEUj$ha!IB0)`c zYKFV<@9!`$7FS^m@!B{ZN8P^$`+j}v`vpg4*@QoJLY7Q7A_(?YinFqHn9Dvw%{1%( z=DS5rxwCz$&RD}eadq6^5c5#y;6j7Kp#wQMXB9nE4dpd?PhQ@(^yCZrtsBO0mu|U` zuzvY-LGCCa7oG)Wz4(Ne&c6FsNUx;gdR^ZdJdSH>R&SV$Bff$2iJ zOd8e_bbw~U51@`8LI(YuOIl%xP!|&m1Y1Oou(uR|R;_5(R~8{Mp5}D4$64TZk8b)2 zHe|v3^`JwJb8;`r8ZWtGpaqL~d$}i+;+gBD2CI8fw|n*}bv6{_5SmE#-}LoNlDgx@ zWa&p&CIK1j?dNaX^D;VJ{#c!(2_>6uxmEO;6*JNc$#+@QC7KgznZ{Ey^G0V+?Kb=5 z7P~0&h&+8aSjs);G{>pYnO9W9R~o?nCOmjFO`N(PhMMXrNfe3815xmxkIKjQr5-ANH6Vn z-wVO3uZp|9{O}!>s2BE9ph*g#E~5uz4q2G>CFf1-?71~g+0Yz@;6EN_@4-W7`R1p| zHL3bmxfyMiL9LtI_o8*@)cf|7+g05+f*Lt)LJk92^`^e?MCBG$=-ifY-vHR6p;9*sp>iEsWqMR!G z7&V&;)v&nU6*S${wzZ@8k~^>fVL|GocHb>daL(RCoSdLm+C~uXjFR~;-`n-SP-Ous ze`?H-Z*(ocsT-<}(iXqVXd~@}PxT+`y09i3fd?!vc*vqw2pVI34}|7Y7p&_LJnw6N zCMPF%cZ0-6S!G1_`%l{$H=Bi8aq_%{2G?SM)OB@y@alOMETo*>ZuVzxE>-@B=ZtNO z(YJTHAQ!A|q@qOrt+0q|$sEGSWn>YIe*y58h?zS3`@35aeknOB1cw`DVS6#{6$rQ2)U-711TGva6Pu$Dc~;|5l6*Ih z$s?|$dZb-%fgB-#OKRvk zc5qJUicMQ8op4iUbk6DSZMj}i%Oo~|@Bk1%pl3x#=~BwO8+}L4`nl-cq|E8{C$Jrf z67}5EqkG9|<77u}h-3xdY7f&XiGcKlhKfqxQ{Oa+oUku)5NQg%VHMx61{mo@l5szp z@qd~=q{X)JerbrEY3)=$`{9i)8%VsBD7#)Vn46N&BI0q$&Dj~$7?Q$|4?>Tu8diDY z6ZY9Uc#e-ktE#HH64p+kfb$|fzv7wxzPa9c!w5+L=@ZVh*AqrSj^b}LaCIH)O?q1f zJJXJWk8quF+)a6Z(q2?ARksJiEnw>gK+X{hd0${oEM$)C>t0@39W{QSrLE2 zMHdGYpE!DzUNf-nFl3;W_2)ls@I!FBg47zrO9+COBKBMVgFl2;6>~mXU39U$=>sV< zOcUBzEzxi)P0QLfZ{$rkwk=AEG)NJ-;)H@h!0BY7uKu!Kf#F@tB4te>q@$yq05cdA zn$Pg^l&pEu)Z3nxbSN7rLyacO4NZEA3JVPhI_>IWx0>#*cEHV#=4y%bD*La)iz>^x zxz$eWkov7$0Qen$TK~K7tQ2fr>*=7eWm&4#1XHb)zB3?s7$7};-2x1KnKY3*inAZ*JogYMgvxKYC=p5pwisv z!=UxLEMUvf`L(oyzV2aJh?NyM=_PEPD@$q+yh4k@7#OzKzzP96T-C6V2oCeC#Rpa{J^o?2{sRL8 zQNug2%E~vbjPcxNY2O9)`wXS{M5w#uhvCukNL|8UeFT6*Gcq&RXfgpm%xW`C-SFiC zc@m!sK={h1@x`N)T|l;Fxjx@?9XE|^Q5}}m*4Acc2aJa1K97uuu(hywH3PJxhOKH= z;{#rOojwA<6dspNMZo$gka>jku^iP9Zov`5WKuPy54L}Rt;UPI3_2)TAAUv;$(d)^ zM2fDa{}~LIs+sHPc+3JF|K=@~V^=o=FhXIWk!tGdprj$?aag=KTv5(g1VUUJW`7%+ zY`U&I;m5NBDB!Srfm7C#z#JPaij%9Z$`DV2&r=%BFE!mGscZoB01ExPGC;)xoHkiL zAAqJ-4gsq+=CG)^*fEt1DU}waYCn|(lc;IywpsMUQ*d5G?40 zv{4G^Bw*FzyDUYi9O6HuHQLN$z96L@ta*dxA07xr zy#3Hy>YjVnqePXfQh|m%!|ls)-uy3F2-K~!U-g;LLMYR6vc2wN1>+CgY3qCQib%mzXFlFI@RZUF(yyr$5 zSUc{@RU`A`ZjAH=?Wn2-OX_{@rhSuL-`7SmNb_o_VIXQ=J271{eGPBj?M2&N4P#NQ zAMw8&9xrS|I!ekws+Yr3Kvq9_g=edKbeM%HVKseGiC|S^*eUj`v7rHqn1_K*<@ti2 zFrI*Xpn$lOyo<{TSgI}>pa_AWTP}9tO6`Js+4@Q4luZ_C9|4*vhRly?N`2zrWWO%0 zd%v+cZ}j(dcgLXA#X{molX6)A>@v5X>b$3?Cr?GcFPXDAGc&Vl>xA65uYr@?gc`n1 z&YHq?e3)(Q)hX*qXV?DIkmk1FWb=8Wxog&5K9RdL(BnHczuCAyoS68RSpz(V=bOWE z``wgJ!{xGtSV@<~!w!FIM`fUALY4gXwbMpLnacp0U$07{)auI?ekv+q!l z%@JNuz;xi-(tUX96&Hp5AFwUz(qgpaoxm~cafw_0g2GnPFCi9i9qsM@J;UlakJC50 zN`qI{2mHW{wU-#N};YD{o=wA{PpOf9ARE<7%cDLuNt zCZjJZtOVZm(#sW(81LBAvBGr1{r49E$U*Rb0lFOC5$#@^^_EoetYOsH$sD#!kPH^$ zY2!&kM~9#8+KKdZwLtGs@qUht2{pyYH-26?N^7az^Q7F&<)ERE z@VL_e?>bkaA?$et!GptYju^vUGVj_bYw@UCc zwB++}Ooq@SkI_4VE^E|vpiaqsx_7g}_r50w16legNI2^_XRk=UqFi%>4N+F9;o+gn zpKK*}@S9rTd#Ci8ywt~lGyqma{n@g=cYRB1p2(zi)y>G-sQY8R4i1N(BNl{NS;3_~ zPt0i*2Wu7Dij)R(GO#%i1j55hfR_Bvs~M*DGAsLBdZn_FxVg=Q}p zkPy<@*!PiX}gBN%A z)(G$Oncy=7ZwqV}P#m>4OFBC<%E!?FW@sLjxyjjlh3(2RvI0Kol(^EeWgkD%ySi7q zB0K=Dwwm+3;t}mGz2n_&pWfZCLz~uoQ}+C}(v^bKf%(ZP#Z<8Ja)`s0g9ua_OJI|c ziJ2K6NhF94K@BF+YMoLJwIPn<^LS-myD9?>*xTX^hhOk-sJ*x{&ALqQ5+(RBdMz(h{RWm2wiFaP@!m zbuI2p?_qq7ltQQ^mQjdwA;QsUMMLM2OR43SCii5in6{JAnTT@V9Gvn4ojg8i71cV^ELROw_!=f`)@0qcBV$lI3A+1aS%k`MPY^})m^xcaR7K^E_DQWJm4p(NX zwbipwwPH2#AtzLx56J}Z!@4qN$BugQxKyiQ9Wm8AyDWrr>Ccx%*g7?@(7yshkP?ur3w^_<>qtr z;4r@G@R(4IA!u$ivBMBY4=w38tr%+)b6TwW-;f$%#y%AS+W%8M1TWrm6$UVL3$n&9NBYo`&iO0MD8m1T z>fia&=vV&D^cRFWRd?e+#vYbF+(SvdZV*Cq`g}bZxrXys#U`xR8haE|TTQM>@}_dj z2Cit#k}jDZtl>p)VPIvBQuCB_x4`Fyzon($>_dCq9pMQk$(Z1#<_uaKl#BZ3r^npOIYpWx#Pz(T#X!}Ct-&NQ zwfo<(;RlTTQ+AlS?jb9puvD-Lg@PxnfsqMb-ri-0$-w*V@~5E*pzZh?OvDk0qVXJ# zj>EO^IhP_o-V%I1!7Lzq>J*6@kF6W*%qw&5*g(6XbUjl1(s5J|z4V*+fN^L5K3F#I znY5v>xkKxm^*$id}!w_BWq(er(xH(Fb^v4XJdZD`L=J(*bMA72_om}??2EJPk9 zuL;l2AZNUhy{T-?>`0XiPi2b#n!AGkk*?*hj@GNbs*`1}z2@lyTgt`85g;)!BDz_X z8*h*Y%hk|)i{p~qz_8%sm(AVmLD8;Xpv?L=vm5<3Xp4r39W&xmxaj_y`gP?YLcX@< z{BExb>+Xt2IU7?jH{$^%B_&{$ycXq?y`r{xJ5cLz^*SepJ+K`vPGnv#9%eclHd!(n zFSL4vp)W5OIEi~k5RS%F8m?BwI|yd|)?Pr*4oCqti)7Bzd_+dh^Tv4Ut@^1g9Ncsh zdiw&OcK+_+KKQ0^>!{K#e>$8NU zW?unFj{B_uz>d~f&D(07a|o+--vuYR+Hw+debb2?YeyaWa+hw69GGpbt-hl6013<- zPD)O)InWDNlxg8)JfY|E6tXQPGIzC#MqR0F^aYU|YjD#)4rd7Gpawl;=ht7!nc}5`$r5FlZts6c;YgkQf$f+>p3&hoCVjh;d^KTQ_QqrL2ev zl}B4k8v>QG=(IC)-}n0cXYRe789Jp#PkY;Q&pqdVe*gC$#WW0R9)1vzW7|Xu|0)#t z0V$f=rz*;j@B4f3?4*GD0t$+}AA1(@=f0|`H!vRyf?yQy_k0iMl!i=^NRXzgqzMu0 zQJ$c9v*&rouzc7L{6Pq99Ev1H1M5M<2vSvbTv3%Pm|w!ut$(c;ir(@){|x?b3#G1Y z1fgI>ofbkptElP)A=aiiW0~e>j^mu7|2Wu&WI~)vCR3+1O{+F57HxZTFysr;=> z^nVP)v`%_{P|D?UClR!TU|De^hQ99+JpI@(jN`}=hk8X9*q~%Gxx9vab80-C?=&Fy z4S;hYzi!>hrcj#_EVgYOtt?h9D-BewICvj&M-z8$)8Zn)3-6o#5mGfx8sfM%9eVXO zdilTsvMjT6zHwft+Dx&l^a}EQTV?Oedi`yLV>^FDopyXUtaEb@$g(YjI{_~R`JRWh zISBSwJkbh$aS9cS{#)p3@F`#v-<^5JcJyJ_T2KjuItN+AvBG5 zRRYnL-bRXf=qa5dW{dbHGOC3qd|$!(kYI1w(&oD5IWx_#KmS5Avv(;e8s(EpC24y4 zE@_$y#TGLq_9}E6D8Do^LYzD4mFrNsyPNjzeTkAd(;5ln8ajpRI(-qSB6BmD3{6c; z($`;|mtG_^A-#}ufGU+r!5b%z%*RIBi+OO;9`&VNf9DaeQj>a8FOxVEK&RMLq( zY2MS0hxT{IfDgl$5#1bY)HD_=On32N?BUwXX0uFn2$Mk~BzLaW6hOqF3qqDsLa-Sj z14cmPe5bP+YDr^gG%!>LnW*<|$9_Ro)F=)J^Ac^`w24j(zekf(Qxa5cG%KB)xI;Jp z9G9SJAlIS(fqr^!$1ZZc5L}i`PxbWBuEFP}L0tFC-Oq<3i3jM>iE$+VkfJSn?E0?U zaNyuU`9y%(P%hJVK<~A&Q7V;6a=ltxqAi=Z(7Pvw5uI8~xY6a{xzieE;0X~N7wL5R zYNfK^0t79!%%G^%YH@y8v7SzoVOc<>6Qi1m#4;_aR+n1Py9(zApxdiZoVk`rq{a=S zJ_zz&mAPd8kvmrEh6Lhb?!ZX-xecW4gF}v%I*D@p4Jp><(rNvN2;ChYzwzI&3^ez; ztW)kxCf?ao2HTUknn9e;=YNFqS-}U2h2luHT747rxxJIue30|i|MUR)jz^E?=Vd?U zF!usT?dWYEoVrvpHB%@SzF`7VkY8eD3kwTJXJ=3M(Ik9Y+&%vygH>`i(Gz|oza!NLSRcQzh?@i4ijD)wWMVA5wBYxI*tv^>T zmrrxaHzQrNhXso2$kzvjLg5cE*co`YjRkOiV@hmT5i?zEM66J@(CI?Ha27zi!0Bl( zFY$OzLbA~Hi<;1W$NU%w|1j=ZgS^g4qyb9P4KiqW$FvKh$3aS0(A6%Xh2Cm!LLC*i zbSdAT5()7MjJS}e{7|)4-2X#69< Y0H|PDf!Y4H@c;k-07*qoM6N<$g7eP`cK`qY literal 0 HcmV?d00001 diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/add_img.png b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/add_img.png new file mode 100644 index 0000000000000000000000000000000000000000..e678875d38e8ee09b84603f99c4c98d45c768961 GIT binary patch literal 5352 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 literal 0 HcmV?d00001 diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/circle.png b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/circle.png new file mode 100644 index 0000000000000000000000000000000000000000..4de395a37694609f06c158b5bfc3cabb319adc61 GIT binary patch literal 1026 zcmV+d1pWJoP)fWJK{)l$Jv9B9@k(#IK$TQbh^kpJ0eu5ld5p1gZzk$&Z^T z9!iqF&vdqoVU4>carc2InO)s|f0>!g&ilqi50{7ilI>?dWxLrv`L`H5#s0;PvLo!I z(M>X$3>8up?2rtavFND0wjvuamt7X%KC=7S)i@|GFQ=B47V`OgR99C=nx;{GeZBa{ z!^1;Lr_*$FbVRXOjCOZ->GJYYzt1UqF%pT4Z0c6 zW=mbax3@>@>+2MaM)gxa*dMr;!ubF$um{obdc8C{I!X-<4SCIxgM$N_o}Q*eBB7u9 z!jM6$fEtE@{R%@jGBQGeK%k(LIUEkt%*>3K3NqFJgQm>_egj--X(>%iOo+Kw3}J4D zLLs`jxxwKQ1HLu`D25eqv$L~QTU$%T)ba5#4G#~~_4T#kaBBu%h(Qc1dal@T5Mm$} zVj{N7XM6_!l^#@XM`&dx-}Ww*cp7BKPlKdvt`n|N7XUbY=jVc1l+Tc42e zBdLzZ(8$ za`vF|o2p*+dzt-FXJ;q%^z>NH0I|lcuCCI?#)f_hgp&-nlIuDvCE(BWuLLYIex!zN zZEd3b3%lKJ@eZN%n@Xj`JG`~Er9Zy(H5Vn|H#oSj1Z-8v_))9gChJA?ZFz0Adc#5% w(X-`~IrTHj{WHW*`CK*J&)xSk#9sjh0O|y((21~E;{X5v07*qoM6N<$g5_4*djJ3c literal 0 HcmV?d00001 diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/clear_img.png b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/clear_img.png new file mode 100644 index 0000000000000000000000000000000000000000..fbaefffbee58a8a6285525535ae9f515c6f59122 GIT binary patch literal 1310 zcmV+(1>yRMP)TUv+&6IUXL&q!vADO6GfOk)HqK}SV} zF-Cm5I-1|_Fjv0J?(A+XVv_@xd%y3Vdw%DAzt47ecPEcQc6lUvG~fv9gUx0Whr=OF zO-+)JkRVA(Nis4rB5t=^GBY!s*mol|)poo68D?i75Riz72tSUlV(r1ccWZ0Q@AZ16 zrKLrVkB{Z_^i)PiM}@rButt1Lv*_q(8-S{@?84zf%qh3Gw+`-6(ACw|Qz%PCzQDW+ z-d8x|;r4@FeSUuKtgEa0J~cIU4gjBDUtgzTINrW}tNT?|RRSP6J3DjS+}xyrr!pla zWsYZf_LE&5LRqlvH3XMIs9MKRa5kf&qC%Wbr;Lw}i{I~;n3x#yII!1(^PgcfV)*`z z#i;-thil7Vq0mBtUtV5n+&K8mxD^x>NLyPQb3o%sUY@~z8D&t`Cs|Bk(E23~KQ|VV z2ox6=r-_!IpD*$8@#^eg@KA<_hh=GLNg^X7@7-@D%7iR8mOs507@IG^^u$t5nz`B8*=h-ahK7bz z8OD2UZB0Q}R#r6TUjFIm|OHbh%vG%~&oI6BB9?Jwc`V`}<{Q zXGdaVV>OelC1*{{pvR0anJrM$dc z-N!q-p`k%bs-&budFJNk^bB2WJc4-z9`ydBqgms`dIePjaNa1zeb(*3z<{6rLV6~<85L~c7XGs$As-2V3Vmxq#xj_udEjbL6|)C_4RrwSohdSrlzLU za#~4HOIiMi_Szhp+3x^zpxN_U{22nCo6<4YBHdkCS*bB+JbgZ&w#$u;4Rt+ZYiYT^ zVO@(vJ1}?n$ADQnSy;cuD6__fV5Y>(88#K;a!bDaiqVMAARjY46gcb`2n71zwlBf_ z9js`=>@XdP!`ehl!wJ3%z|v8?`WDLgAM)u#^255X0X%{64Fo@f;1u@WkiHzi{3qsB zfWE@;ASdn~`ptFkHH=>%co|l?p#X0%m*tbj9|ZK^TJ&1)+z*lM|6iE@ivAX00LjEi UmYo?l;{X5v07*qoM6N<$g1ZQA`~Uy| literal 0 HcmV?d00001 diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/close_cont.png b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/close_cont.png new file mode 100644 index 0000000000000000000000000000000000000000..210b4d6dc089ad9277ab8a8c684438c2c4f6db69 GIT binary patch literal 772 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 Lybz?E8=LwM$^HJZ literal 0 HcmV?d00001 diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/green_point.png b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/img/green_point.png new file mode 100644 index 0000000000000000000000000000000000000000..a2a4468089bac7dc1e200c8f60836c9b45f16e2d GIT binary patch literal 721 zcmV;?0xtcDP)t|)b8>35cdc>t?ftpS zuS$LgQr8A$HQVt)xCXQbrS8`6A1kME>z$;6DIMRmF?fA)e&fNF>T+LiK_^PUIASN9 zR69^+pDosEx2NaVcbd*`C#P$K1e95AjMbkn&f;=M?J~`B?H(8-KxyuVIQr0z2hfan zVXjtR^(nYvtwUl93o{qQ>lBVyByyTIz#_*~%N-!e=$c@V8aNpq1_AmnJ@RhJz=MY< z1~*#~6ItXea(8(WWeVGgauBBgQ3Me4zzVa(b^Mf)+(kqiD8&o2&NR(5r7~I;&+6u= z^ZFU!Oal>TBoq2P;m83hp47Z3i|M~24SCXROoTCi?H+L%JHvzyGE&0Ul98CEnVTX} zF6Mo34ncTwmn42CezDz+#3!vh7MWZyDlEu+fS71lT=GL8&uut#UkK5qog`W9C*d!& zC5W;Fi7RS8D?#!0Tj!t}jDuIEO#^0=E%d24tM<4#>^#w~x?iR#ehgTEIT0*DD6248 zo(5UQ&oK^Ou!g?{7H2z4;K1%2C#|K5sIG+J#M98D+3W!Et{O{vFT(Eo6rwc*(*OM! zMFMx!Go3dP4mTzFcadTjyfMHyD+>_8YCl$KHO|ROy1&ReE50aRaw+q;*#Kl5Y_|(& zG)U+l=sk!ifm*wLK514jHiidJ3Mpz@>CMistuxuT?@Qjfw@mU~qz{uCa@HI=did_d z^u+bpby}GJ2DBD@8pF`B!I_<@_Kl7AU+$?+_FxYVAn;`D#F2%`srsB>djkd8^5n$R z1nU4i0`S_v_{h}3`#)D9DvEp|NOB~&+1_{cz$jdE>z}|D3cQG@VsMP|U=bLUkp0;L zz4n>xRqqHHpAMW9X?&{HfXnRf4`G88=inWMMsm&tWg0E1GYLA^pw-3*i=#QNqjgD3 zx+HaXI`0yIjFv!l1L%8p4Z((BWf2O)ps)%AxEUFVSt&RkBBmZx!-N1?8V!+#URZiy z$bqJEt}o#I0A+q$dIuTVGDbjYH8jywp^2iyFAT(F+mR~vY?4H%5ST$MEr*1Yq-qIXq?^}a zyW}cU4-21u@Noqcc~-PQYkfbgVBJyL07ru>La621-8s~I=9KW+S{Jte*k!8wzg+kCB2o_nrCH|O?vbRXS~Bb zuCOdyhMnz42<%@81h^cCM2eDX6^mk?rO6eUq!&=gL1y$is(cBpdsfb6J*9B`7hnKZ WDw06KPZvZ00000 + + + D'n'd + + + + + + + + + + +
+
+
+
+
Display
+
+
+
+
+
+
Edit
+
+
+
+
+ + + diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-1.6.2.min.js b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-1.6.2.min.js new file mode 100644 index 00000000..48590ecb --- /dev/null +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-1.6.2.min.js @@ -0,0 +1,18 @@ +/*! + * jQuery JavaScript Library v1.6.2 + * http://jquery.com/ + * + * Copyright 2011, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Thu Jun 30 14:16:56 2011 -0400 + */ +(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"":"")+""),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c
a",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
t
",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i. +shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j +)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); \ No newline at end of file diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-ui-1.8.9.custom.min.js b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-ui-1.8.9.custom.min.js new file mode 100644 index 00000000..45cc2744 --- /dev/null +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/jquery-ui-1.8.9.custom.min.js @@ -0,0 +1,781 @@ +/*! + * jQuery UI 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI + */ +(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.9",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106, +NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this, +"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position"); +if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f, +"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h, +d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}}); +c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a); +return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;a.target==this._mouseDownEvent.target&&c.data(a.target,this.widgetName+".preventClickEvent", +true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery); +;/* + * jQuery UI Position 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Position + */ +(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY, +left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+= +k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-= +m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left= +d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+= +a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b), +g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery); +;/* + * jQuery UI Draggable 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Draggables + * + * Depends: + * jquery.ui.core.js + * jquery.ui.mouse.js + * jquery.ui.widget.js + */ +(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper== +"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b= +this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;return true},_mouseStart:function(a){var b=this.options;this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top- +this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions(); +d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);return true},_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis|| +this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&& +this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this== +a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone():this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]|| +0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0], +this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top- +(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment== +"parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[(a.containment=="document"?0:d(window).scrollLeft())-this.offset.relative.left-this.offset.parent.left,(a.containment=="document"?0:d(window).scrollTop())-this.offset.relative.top-this.offset.parent.top,(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"? +0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){var b=d(a.containment)[0];if(b){a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"), +10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}}else if(a.containment.constructor== +Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop(): +f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,g=a.pageY; +if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.leftthis.containment[2])e=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/ +b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.topthis.containment[3])?g:!(g-this.offset.click.topthis.containment[2])?e:!(e-this.offset.click.left').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")})}, +stop:function(){d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!= +document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!="x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY=0;h--){var i=c.snapElements[h].left,k=i+c.snapElements[h].width,j=c.snapElements[h].top,l=j+c.snapElements[h].height;if(i-e=j&&f<=l||h>=j&&h<=l||fl)&&(e>= +i&&e<=k||g>=i&&g<=k||ek);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(), +top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle= +this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne", +nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor== +String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),k=0;k=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,k);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection(); +this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){e(this).removeClass("ui-resizable-autohide");b._handles.show()},function(){if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()}; +if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(), +d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset= +this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio: +this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize", +b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height; +f={width:c.size.width-(f?0:c.sizeDiff.width),height:c.size.height-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop", +b);this._helper&&this.helper.remove();return false},_updateCache:function(b){this.offset=this.helper.offset();if(l(b.left))this.position.left=b.left;if(l(b.top))this.position.top=b.top;if(l(b.height))this.size.height=b.height;if(l(b.width))this.size.width=b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(b.height)b.width=c.height*this.aspectRatio;else if(b.width)b.height=c.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top= +a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this.options,c=this.axis,d=l(b.width)&&a.maxWidth&&a.maxWidthb.width,h=l(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height, +k=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&k)b.left=i-a.minWidth;if(d&&k)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+ +a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this, +arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable, +{version:"1.8.9"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize, +function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var k=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:k.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n= +(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(k.css("position"))){c._revertToRelativePosition=true;k.css({position:"absolute",top:"auto",left:"auto"})}k.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition= +false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left- +a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize", +b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top", +"Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset, +f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left= +a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+ +a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&& +e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative", +height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width= +d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},l=function(b){return!isNaN(parseInt(b,10))}})(jQuery); +;/* + * jQuery UI Selectable 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Selectables + * + * Depends: + * jquery.ui.core.js + * jquery.ui.mouse.js + * jquery.ui.widget.js + */ +(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"), +selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("
")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX, +c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting", +c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d= +this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.righti||a.bottomb&&a.rightg&&a.bottom *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){this.containerCache={};this.element.addClass("ui-sortable"); +this.refresh();this.floating=this.items.length?/left|right/.test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a==="disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this, +arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem= +c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset, +{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment(); +if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start", +a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute"); +if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a, +c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]== +document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var b=this.containers.length- +1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null}); +this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},toArray:function(a){var b=this._getItemsAsjQuery(a&& +a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+jg&&b+la[this.floating?"width":"height"]?j:g0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h= +d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)}); +return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b=0;f--)for(var g= +d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h=0;b--){var c=this.items[b],e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top= +e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0]; +if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder); +c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length=== +1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-f)this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top< +this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.topthis.containment[2])?f:!(f-this.offset.click.left=0;e--)if(d.ui.contains(this.containers[e].element[0], +this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out", +g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",a,this._uiHash());for(e=0;e li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix"); +a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom"); +if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var h=d.closest(".ui-accordion-header");a.active=h.length?h:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion", +function(f){return a._keydown(f)}).next().attr("role","tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(f){a._clickHandler.call(a,f,this);f.preventDefault()})},_createIcons:function(){var a=this.options;if(a.icons){c("").addClass("ui-icon "+ +a.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("tabIndex"); +this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons(); +b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,h=this.headers.index(a.target),f=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:f=this.headers[(h+1)%d];break;case b.LEFT:case b.UP:f=this.headers[(h-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target); +a.preventDefault()}if(f){c(a.target).attr("tabIndex",-1);c(f).attr("tabIndex",0);f.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+ +c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options; +if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){var h=this.active;j=a.next();g=this.active.next();e={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):j,oldContent:g};var f=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(j,g,e,b,f);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header); +if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);a.next().addClass("ui-accordion-content-active")}}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var g=this.active.next(), +e={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:g},j=this.active=c([]);this._toggle(j,g,e)}},_toggle:function(a,b,d,h,f){var g=this,e=g.options;g.toShow=a;g.toHide=b;g.data=d;var j=function(){if(g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data);g.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&h?{toShow:c([]),toHide:b,complete:j,down:f,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:f,autoHeight:e.autoHeight|| +e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;h=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!h[k]&&!c.easing[k])k="slide";h[k]||(h[k]=function(l){this.slide(l,{easing:k,duration:i||700})});h[k](d)}else{if(e.collapsible&&h)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false", +tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.9",animations:{slide:function(a,b){a= +c.extend({easing:"swing",duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),h=0,f={},g={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){g[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/);f[i]={value:j[1], +unit:j[2]||"px"}});a.toShow.css({height:0,overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(g,{step:function(j,i){if(i.prop=="height")h=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=h*f[i.prop].value+f[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide",paddingTop:"hide", +paddingBottom:"hide"},a);else a.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery); +;/* + * jQuery UI Autocomplete 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Autocomplete + * + * Depends: + * jquery.ui.core.js + * jquery.ui.widget.js + * jquery.ui.position.js + */ +(function(d){d.widget("ui.autocomplete",{options:{appendTo:"body",delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,f;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.attr("readonly"))){f=false;var e=d.ui.keyCode; +switch(c.keyCode){case e.PAGE_UP:a._move("previousPage",c);break;case e.PAGE_DOWN:a._move("nextPage",c);break;case e.UP:a._move("previous",c);c.preventDefault();break;case e.DOWN:a._move("next",c);c.preventDefault();break;case e.ENTER:case e.NUMPAD_ENTER:if(a.menu.active){f=true;c.preventDefault()}case e.TAB:if(!a.menu.active)return;a.menu.select(c);break;case e.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=a.element.val()){a.selectedItem= +null;a.search(null,c)}},a.options.delay);break}}}).bind("keypress.autocomplete",function(c){if(f){f=false;c.preventDefault()}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)};this.menu=d("
    ").addClass("ui-autocomplete").appendTo(d(this.options.appendTo|| +"body",b)[0]).mousedown(function(c){var e=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(g){g.target!==a.element[0]&&g.target!==e&&!d.ui.contains(e,g.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,e){e=e.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:e})&&/^key/.test(c.originalEvent.type)&&a.element.val(e.value)},selected:function(c,e){var g=e.item.data("item.autocomplete"), +h=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();a.previous=h;setTimeout(function(){a.previous=h;a.selectedItem=g},1)}false!==a._trigger("select",c,{item:g})&&a.element.val(g.value);a.term=a.element.val();a.close(c);a.selectedItem=g},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");d.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup"); +this.menu.element.remove();d.Widget.prototype.destroy.call(this)},_setOption:function(a,b){d.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(d(b||"body",this.element[0].ownerDocument)[0]);a==="disabled"&&b&&this.xhr&&this.xhr.abort()},_initSource:function(){var a=this,b,f;if(d.isArray(this.options.source)){b=this.options.source;this.source=function(c,e){e(d.ui.autocomplete.filter(b,c.term))}}else if(typeof this.options.source=== +"string"){f=this.options.source;this.source=function(c,e){a.xhr&&a.xhr.abort();a.xhr=d.ajax({url:f,data:c,dataType:"json",success:function(g,h,i){i===a.xhr&&e(g);a.xhr=null},error:function(g){g===a.xhr&&e([]);a.xhr=null}})}}else this.source=this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length").data("item.autocomplete",b).append(d("").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b); +else this.search(null,b)},widget:function(){return this.menu.element}});d.extend(d.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},filter:function(a,b){var f=new RegExp(d.ui.autocomplete.escapeRegex(b),"i");return d.grep(a,function(c){return f.test(c.label||c.value||c)})}})})(jQuery); +(function(d){d.widget("ui.menu",{_create:function(){var a=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(b){if(d(b.target).closest(".ui-menu-item a").length){b.preventDefault();a.select(b)}});this.refresh()},refresh:function(){var a=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex", +-1).mouseenter(function(b){a.activate(b,d(this).parent())}).mouseleave(function(){a.deactivate()})},activate:function(a,b){this.deactivate();if(this.hasScroll()){var f=b.offset().top-this.element.offset().top,c=this.element.attr("scrollTop"),e=this.element.height();if(f<0)this.element.attr("scrollTop",c+f);else f>=e&&this.element.attr("scrollTop",c+f-e+b.height())}this.active=b.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",a,{item:b})}, +deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");this._trigger("blur");this.active=null}},next:function(a){this.move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev",".ui-menu-item:last",a)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(a,b,f){if(this.active){a=this.active[a+"All"](".ui-menu-item").eq(0); +a.length?this.activate(f,a):this.activate(f,this.element.children(b))}else this.activate(f,this.element.children(b))},nextPage:function(a){if(this.hasScroll())if(!this.active||this.last())this.activate(a,this.element.children(".ui-menu-item:first"));else{var b=this.active.offset().top,f=this.element.height(),c=this.element.children(".ui-menu-item").filter(function(){var e=d(this).offset().top-b-f+d(this).height();return e<10&&e>-10});c.length||(c=this.element.children(".ui-menu-item:last"));this.activate(a, +c)}else this.activate(a,this.element.children(".ui-menu-item").filter(!this.active||this.last()?":first":":last"))},previousPage:function(a){if(this.hasScroll())if(!this.active||this.first())this.activate(a,this.element.children(".ui-menu-item:last"));else{var b=this.active.offset().top,f=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var c=d(this).offset().top-b+f-d(this).height();return c<10&&c>-10});result.length||(result=this.element.children(".ui-menu-item:first")); +this.activate(a,result)}else this.activate(a,this.element.children(".ui-menu-item").filter(!this.active||this.first()?":last":":first"))},hasScroll:function(){return this.element.height()").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),d=this.options.icons,e=d.primary&&d.secondary;if(d.primary||d.secondary){b.addClass("ui-button-text-icon"+(e?"s":d.primary?"-primary":"-secondary"));d.primary&&b.prepend("");d.secondary&&b.append("");if(!this.options.text){b.addClass(e?"ui-button-icons-only":"ui-button-icon-only").removeClass("ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary"); +this.hasTitle||b.attr("title",c)}}else b.addClass("ui-button-text-only")}}});a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,c){b==="disabled"&&this.buttons.button("option",b,c);a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass("ui-corner-left").end().filter(":last").addClass("ui-corner-right").end().end()}, +destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");a.Widget.prototype.destroy.call(this)}})})(jQuery); +;/* + * jQuery UI Dialog 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Dialog + * + * Depends: + * jquery.ui.core.js + * jquery.ui.widget.js + * jquery.ui.button.js + * jquery.ui.draggable.js + * jquery.ui.mouse.js + * jquery.ui.position.js + * jquery.ui.resizable.js + */ +(function(c,j){var k={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},l={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&& +c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||" ",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("
    ")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex", +-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("
    ")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),h=c('').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role", +"button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("").addClass("ui-dialog-title").attr("id",e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose= +b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");a.uiDialog.remove();a.originalTitle&& +a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==b.uiDialog[0]){e=c(this).css("z-index"); +isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+=1;d.uiDialog.css("z-index",c.ui.dialog.maxZ); +d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target===f[0]&&e.shiftKey){g.focus(1);return false}}}); +c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("
    ").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("
    ").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,function(){return!(d=true)});if(d){c.each(a,function(f, +h){h=c.isFunction(h)?{click:h,text:f}:h;f=c('').attr(h,true).unbind("click").click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.fn.button&&f.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g= +d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition,originalSize:f.originalSize, +position:f.position,size:f.size}}a=a===j?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize",f,b(h))},stop:function(f, +h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):[a[0],a[1]];if(b.length=== +1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f);if(g in k)e=true;if(g in +l)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"):e.removeClass("ui-dialog-disabled"); +break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||" "));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a=this.options,b,d,e= +this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height-b,0));this.uiDialog.is(":data(resizable)")&& +this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.9",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),create:function(a){if(this.instances.length=== +0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(), +height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight); +b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a");if(!a.values)a.values=[this._valueMin(),this._valueMin()];if(a.values.length&&a.values.length!==2)a.values=[a.values[0],a.values[0]]}else this.range=d("
    ");this.range.appendTo(this.element).addClass("ui-slider-range");if(a.range==="min"||a.range==="max")this.range.addClass("ui-slider-range-"+a.range);this.range.addClass("ui-widget-header")}d(".ui-slider-handle",this.element).length===0&&d("").appendTo(this.element).addClass("ui-slider-handle"); +if(a.values&&a.values.length)for(;d(".ui-slider-handle",this.element).length").appendTo(this.element).addClass("ui-slider-handle");this.handles=d(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(c){c.preventDefault()}).hover(function(){a.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(a.disabled)d(this).blur(); +else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(c){d(this).data("index.ui-slider-handle",c)});this.handles.keydown(function(c){var e=true,f=d(this).data("index.ui-slider-handle"),h,g,i;if(!b.options.disabled){switch(c.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:e= +false;if(!b._keySliding){b._keySliding=true;d(this).addClass("ui-state-active");h=b._start(c,f);if(h===false)return}break}i=b.options.step;h=b.options.values&&b.options.values.length?(g=b.values(f)):(g=b.value());switch(c.keyCode){case d.ui.keyCode.HOME:g=b._valueMin();break;case d.ui.keyCode.END:g=b._valueMax();break;case d.ui.keyCode.PAGE_UP:g=b._trimAlignValue(h+(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:g=b._trimAlignValue(h-(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(h=== +b._valueMax())return;g=b._trimAlignValue(h+i);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(h===b._valueMin())return;g=b._trimAlignValue(h-i);break}b._slide(c,f,g);return e}}).keyup(function(c){var e=d(this).data("index.ui-slider-handle");if(b._keySliding){b._keySliding=false;b._stop(c,e);b._change(c,e);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider"); +this._mouseDestroy();return this},_mouseCapture:function(b){var a=this.options,c,e,f,h,g;if(a.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:b.pageX,y:b.pageY});e=this._valueMax()-this._valueMin()+1;h=this;this.handles.each(function(i){var j=Math.abs(c-h.values(i));if(e>j){e=j;f=d(this);g=i}});if(a.range===true&&this.values(1)===a.min){g+=1;f=d(this.handles[g])}if(this._start(b, +g)===false)return false;this._mouseSliding=true;h._handleIndex=g;f.addClass("ui-state-active").focus();a=f.offset();this._clickOffset=!d(b.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:b.pageX-a.left-f.width()/2,top:b.pageY-a.top-f.height()/2-(parseInt(f.css("borderTopWidth"),10)||0)-(parseInt(f.css("borderBottomWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(b,g,c);return this._animateOff=true},_mouseStart:function(){return true}, +_mouseDrag:function(b){var a=this._normValueFromMouse({x:b.pageX,y:b.pageY});this._slide(b,this._handleIndex,a);return false},_mouseStop:function(b){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(b,this._handleIndex);this._change(b,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(b){var a; +if(this.orientation==="horizontal"){a=this.elementSize.width;b=b.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{a=this.elementSize.height;b=b.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}a=b/a;if(a>1)a=1;if(a<0)a=0;if(this.orientation==="vertical")a=1-a;b=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+a*b)},_start:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value= +this.values(a);c.values=this.values()}return this._trigger("start",b,c)},_slide:function(b,a,c){var e;if(this.options.values&&this.options.values.length){e=this.values(a?0:1);if(this.options.values.length===2&&this.options.range===true&&(a===0&&c>e||a===1&&c1){this.options.values[b]=this._trimAlignValue(a);this._refreshValue();this._change(null,b)}if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;e=arguments[0];for(f=0;f=this._valueMax())return this._valueMax();var a=this.options.step>0?this.options.step:1,c=(b-this._valueMin())%a;alignValue=b-c;if(Math.abs(c)*2>=a)alignValue+=c>0?a:-a;return parseFloat(alignValue.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max}, +_refreshValue:function(){var b=this.options.range,a=this.options,c=this,e=!this._animateOff?a.animate:false,f,h={},g,i,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(k){f=(c.values(k)-c._valueMin())/(c._valueMax()-c._valueMin())*100;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";d(this).stop(1,1)[e?"animate":"css"](h,a.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(k===0)c.range.stop(1,1)[e?"animate":"css"]({left:f+"%"},a.animate); +if(k===1)c.range[e?"animate":"css"]({width:f-g+"%"},{queue:false,duration:a.animate})}else{if(k===0)c.range.stop(1,1)[e?"animate":"css"]({bottom:f+"%"},a.animate);if(k===1)c.range[e?"animate":"css"]({height:f-g+"%"},{queue:false,duration:a.animate})}g=f});else{i=this.value();j=this._valueMin();l=this._valueMax();f=l!==j?(i-j)/(l-j)*100:0;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";this.handle.stop(1,1)[e?"animate":"css"](h,a.animate);if(b==="min"&&this.orientation==="horizontal")this.range.stop(1, +1)[e?"animate":"css"]({width:f+"%"},a.animate);if(b==="max"&&this.orientation==="horizontal")this.range[e?"animate":"css"]({width:100-f+"%"},{queue:false,duration:a.animate});if(b==="min"&&this.orientation==="vertical")this.range.stop(1,1)[e?"animate":"css"]({height:f+"%"},a.animate);if(b==="max"&&this.orientation==="vertical")this.range[e?"animate":"css"]({height:100-f+"%"},{queue:false,duration:a.animate})}}});d.extend(d.ui.slider,{version:"1.8.9"})})(jQuery); +;/* + * jQuery UI Tabs 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Tabs + * + * Depends: + * jquery.ui.core.js + * jquery.ui.widget.js + */ +(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"
    ",remove:null,select:null,show:null,spinner:"Loading…",tabTemplate:"
  • #{label}
    • "},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&& +e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b= +d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]|| +(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all"); +this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected= +this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active"); +if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected")); +this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+ +g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal", +function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")}; +this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected= +-1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier."; +d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e= +d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b, +e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]); +j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove(); +if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null, +this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this}, +load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c, +"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this}, +url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.9"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k')}function E(a,b){d.extend(a,b);for(var c in b)if(b[c]== +null||b[c]==G)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.9"}});var y=(new Date).getTime();d.extend(K.prototype,{markerClassName:"hasDatepicker",log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){E(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase(); +f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:d('
    ')}}, +_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&& +b.append.remove();if(c){b.append=d(''+c+"");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('').addClass(this._triggerClass).html(f== +""?c:d("").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;gh){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a, +c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b), +true);this._updateDatepicker(b);this._updateAlternate(b);b.dpDiv.show()}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}E(a.settings,e||{}); +b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass); +this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup", +this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().removeClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs, +function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().addClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null: +f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true}, +_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);d.datepicker._curInst&&d.datepicker._curInst!=b&&d.datepicker._curInst.dpDiv.stop(true,true);var c=d.datepicker._get(b,"beforeShow");E(b.settings,c?c.apply(a,[a,b]):{});b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos= +d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b, +c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){d.datepicker._datepickerShowing=true;var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.effects&& +d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}},_updateDatepicker:function(a){var b=this,c=d.datepicker._getBorders(a.dpDiv);a.dpDiv.empty().append(this._generateHTML(a));var e=a.dpDiv.find("iframe.ui-datepicker-cover");e.length&&e.css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});a.dpDiv.find("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a").bind("mouseout", +function(){d(this).removeClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).removeClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).removeClass("ui-datepicker-next-hover")}).bind("mouseover",function(){if(!b._isDisabledDatepicker(a.inline?a.dpDiv.parent()[0]:a.input[0])){d(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");d(this).addClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!= +-1&&d(this).addClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).addClass("ui-datepicker-next-hover")}}).end().find("."+this._dayOverClass+" a").trigger("mouseover").end();c=this._getNumberOfMonths(a);e=c[1];e>1?a.dpDiv.addClass("ui-datepicker-multi-"+e).css("width",17*e+"em"):a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");a.dpDiv[(c[0]!=1||c[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a, +"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input.focus();if(a.yearshtml){var f=a.yearshtml;setTimeout(function(){f===a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);f=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]}, +_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e- +g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1);)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);this._curInst=null};d.effects&&d.effects[a]? +b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();if(a=this._get(b,"onClose"))a.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")}, +_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"): +0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear= +false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){var b=this._getInst(d(a)[0]);b.input&&b._selectingMonthYear&&setTimeout(function(){b.input.focus()},0);b._selectingMonthYear=!b._selectingMonthYear},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay= +d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a); +else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b= +a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort, +g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=z+1-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}w=this._daylightSavingAdjust(new Date(c,j-1,l));if(w.getFullYear()!=c||w.getMonth()+1!=j||w.getDate()!=l)throw"Invalid date";return w},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y", +RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=k+112?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay= +a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(), +b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n= +this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&nn;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));n=this._canAdjustMonth(a,-1,m,g)?''+n+"":f?"":''+n+"";var r=this._get(a,"nextText");r=!h?r:this.formatDate(r,this._daylightSavingAdjust(new Date(m,g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?''+r+"":f?"":''+r+"";j=this._get(a,"currentText");r=this._get(a,"gotoCurrent")&&a.currentDay?u:b;j=!h?j:this.formatDate(j,r,this._getFormatConfig(a));h=!a.inline?'":"";e=e?'
    '+(c?h:"")+(this._isInRange(a,r)?'":"")+(c?"":h)+"
    ":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");r=this._get(a,"dayNames");this._get(a,"dayNamesShort");var s=this._get(a,"dayNamesMin"),z= +this._get(a,"monthNames"),w=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),v=this._get(a,"showOtherMonths"),H=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var L=this._getDefaultDate(a),I="",C=0;C1)switch(D){case 0:x+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]- +1:x+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:x+=" ui-datepicker-group-middle";t="";break}x+='">'}x+='
    '+(/all|left/.test(t)&&C==0?c?f:n:"")+(/all|right/.test(t)&&C==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,C>0||D>0,z,w)+'
    ';var A=j?'":"";for(t=0;t<7;t++){var q= +(t+h)%7;A+="=5?' class="ui-datepicker-week-end"':"")+'>'+s[q]+""}x+=A+"";A=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,A);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;A=l?6:Math.ceil((t+A)/7);q=this._daylightSavingAdjust(new Date(m,g,1-t));for(var O=0;O";var P=!j?"":'";for(t=0;t<7;t++){var F= +p?p.apply(a.input?a.input[0]:null,[q]):[true,""],B=q.getMonth()!=g,J=B&&!H||!F[0]||k&&qo;P+='";q.setDate(q.getDate()+1);q=this._daylightSavingAdjust(q)}x+= +P+""}g++;if(g>11){g=0;m++}x+="
    '+this._get(a,"weekHeader")+"
    '+this._get(a,"calculateWeek")(q)+""+(B&&!v?" ":J?''+q.getDate()+"":''+q.getDate()+"")+"
    "+(l?""+(i[0]>0&&D==i[1]-1?'
    ':""):"");M+=x}I+=M}I+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'':"");a._keyEvent=false;return I},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='
    ', +o="";if(h||!j)o+=''+i[b]+"";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='"}u||(k+=o+(h||!(j&& +l)?" ":""));a.yearshtml="";if(h||!l)k+=''+c+"";else{g=this._get(a,"yearRange").split(":");var r=(new Date).getFullYear();i=function(s){s=s.match(/c[+-].*/)?c+parseInt(s.substring(1),10):s.match(/[+-].*/)?r+parseInt(s,10):parseInt(s,10);return isNaN(s)?r:s};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='";if(d.browser.mozilla)k+='";else{k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?" ":"")+o;k+="
    ";return k},_adjustInstDate:function(a,b,c){var e= +a.drawYear+(c=="Y"?b:0),f=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&ba?a:b},_notifyChange:function(a){var b=this._get(a, +"onChangeMonthYear");if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a); +c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a, +"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker= +function(a){if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b)); +return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new K;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.9";window["DP_jQuery_"+y]=d})(jQuery); +;/* + * jQuery UI Progressbar 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Progressbar + * + * Depends: + * jquery.ui.core.js + * jquery.ui.widget.js + */ +(function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("
    ").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"); +this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100* +this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.9"})})(jQuery); +;/* + * jQuery UI Effects 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Effects/ + */ +jQuery.effects||function(f,j){function n(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1], +16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return o.transparent;return o[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return n(b)}function p(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle, +a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function q(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d= +a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function m(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor", +"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=n(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var o={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0, +0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211, +211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},r=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b, +d){if(f.isFunction(b)){d=b;b=null}return this.queue("fx",function(){var e=f(this),g=e.attr("style")||" ",h=q(p.call(this)),l,v=e.attr("className");f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});l=q(p.call(this));e.attr("className",v);e.animate(u(h,l),a,b,function(){f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments)});h=f.queue(this);l=h.splice(h.length-1,1)[0]; +h.splice(1,0,l);f.dequeue(this)})};f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c, +a):f.effects.animateClass.apply(this,[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.9",save:function(c,a){for(var b=0;b").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent", +border:"none",margin:0,padding:0});c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c); +return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(m(c))return this._show.apply(this,arguments); +else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(m(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(m(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c), +b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c, +a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c, +a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a== +e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+ +e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery); +;/* + * jQuery UI Effects Fade 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Effects/Fade + * + * Depends: + * jquery.effects.core.js + */ +(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery); +;/* + * jQuery UI Effects Fold 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Effects/Fold + * + * Depends: + * jquery.effects.core.js + */ +(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1], +10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery); +;/* + * jQuery UI Effects Highlight 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Effects/Highlight + * + * Depends: + * jquery.effects.core.js + */ +(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&& +this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery); +;/* + * jQuery UI Effects Pulsate 1.8.9 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Effects/Pulsate + * + * Depends: + * jquery.effects.core.js + */ +(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments); +b.dequeue()})})}})(jQuery); +; \ No newline at end of file diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/languages.js b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/languages.js new file mode 100644 index 00000000..f3719885 --- /dev/null +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/languages.js @@ -0,0 +1,20 @@ +var sankoreLang = { + "en":{ + "short_desc": "Place the pictures in ascending order.", + "display":"Display", + "edit":"Edit", + "add":"Add new block" + }, + "ru":{ + "short_desc": "Расположите картинки в порядке возрастания цифр.", + "display":"Показать", + "edit":"Изменить", + "add":"Добавить новый блок" + }, + "fr":{ + "short_desc": "Placez les photos dans l'ordre croissant.", + "display":"D'affichage", + "edit":"Modifier", + "add":"Ajouter nouveau bloc" + } +}; \ No newline at end of file diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/script.js b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/script.js new file mode 100644 index 00000000..151b2be2 --- /dev/null +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/script.js @@ -0,0 +1,405 @@ +var lang = ""; //locale language + +//main function +function start(){ + + if(window.sankore){ + try{ + lang = sankore.locale().substr(0,2); + sankoreLang[lang].edit; + } catch(e){ + lang = "en"; + } + } else + lang = "en"; + $("#display_text").text(sankoreLang[lang].display); + $("#edit_text").text(sankoreLang[lang].edit); + + if(window.sankore){ + if(sankore.preference("odr_des_imgs","")){ + var data = jQuery.parseJSON(sankore.preference("odr_des_imgs","")); + importData(data); + } else { + showExample(); + } + } + else + showExample(); + + //events + $("body").live("mouseout",function(){ + if(event.target.tagName == "BODY") + if(window.sankore) + exportData(); + }) + + $("#display, #edit").click(function(event){ + if(this.id == "display"){ + if(!$(this).hasClass("selected")){ + $(this).addClass("selected"); + $("#display_img").removeClass("red_point").addClass("green_point"); + $("#edit_img").removeClass("green_point").addClass("red_point"); + $("#edit").removeClass("selected"); + $(".add_block").remove(); + $(".cont").each(function(){ + var container = $(this); + var tmp_i = 0; + var tmp_right = ""; + var tmp_array = []; + + container.find(".text_cont").removeAttr("contenteditable"); + container.find(".add_img").remove(); + container.find(".close_cont").remove(); + container.find(".img_block").each(function(){ + if($(this).html().match(/input").val(tmp_right); + + container.find(".img_block").each(function(){ + $(this).css("float",""); + tmp_array.push($(this)); + }); + tmp_array = shuffle(tmp_array); + for(var i = 0; i").appendTo(container); + container.find(".text_cont").attr("contenteditable","true"); + container.find(".imgs_cont").sortable("destroy"); + container.find(".imgs_cont").css("background-color", "white"); + + var add_img = $("
    "); + container.find(".img_block").each(function(){ + $(this).attr("ondragenter", "return false;") + .attr("ondragleave", "$(this).css(\"background-color\",\"white\"); return false;") + .attr("ondragover", "$(this).css(\"background-color\",\"#ccc\"); return false;") + .attr("ondrop", "$(this).css(\"background-color\",\"white\"); return onDropTarget(this,event);") + .css("float","left"); + $("
    ").appendTo($(this)); + $("
    ").appendTo($(this)); + }); + container.find(".imgs_cont").append(add_img) + }); + + // $(".img_block").css("overflow", "auto"); + // setTimeout(function(){ + // $(".img_block").css("overflow", "").width(121); + // setTimeout(function(){ + // $(".img_block").width(120); + // }, 1); + // }, 1); + + + $("
    " + sankoreLang[lang].add + "
    ").appendTo("body"); + } + } + }); + + //add new block + $(".add_block").live("click", function(){ + addContainer(); + }); + + //adding new img + $(".add_img").live("click", function(){ + addImgBlock($(this)); + }); + + //deleting a block + $(".close_cont").live("click",function(){ + $(this).parent().remove(); + refreshBlockNumbers(); + }); + + //deleting the img block + $(".close_img").live("click", function(){ + var i = 0; + var tmp_obj = $(this).parent().parent(); + $(this).parent().remove(); + if(tmp_obj.find(".img_block").size() > 0){ + tmp_obj.find(".img_block").each(function(){ + $(this).find("input").val(++i); + }); + } + + }); + + // //turning an image + // $(".fill_img").live("click",function(){ + // var tmp_back = $(this).css("background-image"); + // var lclImg = $(this).parent().find("img"); + // if(tmp_back.match(/fill_hor/)){ + // lclImg.removeAttr("height").attr("width", "120"); + // $(this).css("background-image","url(img/fill_vert.png)"); + // } + // else{ + // lclImg.removeAttr("width").attr("height", "120"); + // $(this).css("background-image","url(img/fill_hor.png)"); + // } + // }); + + //cleaning an image + $(".clear_img").live("click",function(){ + //$(this).parent().find(".fill_img").remove(); + $(this).parent().find("img").remove(); + }); +} + +//export +function exportData(){ + var array_to_export = []; + if($("#edit").hasClass("selected")){ + $(".cont").each(function(){ + var container = $(this); + var tmp_right = ""; + var tmp_i = 0; + container.find(".img_block").each(function(){ + if($(this).html().match(/input").val(tmp_right); + }); + } + $(".cont").each(function(){ + var cont_obj = new Object(); + cont_obj.text = $(this).find(".text_cont").text(); + cont_obj.right = $(this).find(".imgs_cont>input").val(); + cont_obj.imgs = []; + $(this).find(".img_block").each(function(){ + var img_obj = new Object(); + img_obj.value = $(this).find("input").val(); + img_obj.link = $(this).find("img").attr("src"); + img_obj.ht = $(this).find("img").height(); + img_obj.wd = $(this).find("img").width(); + cont_obj.imgs.push(img_obj); + }); + array_to_export.push(cont_obj); + }); + //console.log(JSON.stringify(array_to_import)); + //alert(JSON.stringify(array_to_export)) + sankore.setPreference("odr_des_imgs", JSON.stringify(array_to_export)); +} + +//import +function importData(data){ + + var tmp = 0; + for(var i in data){ + var tmp_array = []; + var container = $("
    "); + var sub_container = $("
    ").appendTo(container); + var imgs_container = $("
    ").appendTo(container); + + var number = $("
    "+ (++tmp) +"
    ").appendTo(sub_container); + var text = $("
    " + data[i].text + "
    ").appendTo(sub_container); + + $("").appendTo(imgs_container); + + for(var j in data[i].imgs){ + var img_block = $("
    "); + var img = $(""); + img.height(data[i].imgs[j].ht).width(data[i].imgs[j].wd); + if((120 - data[i].imgs[j].ht) > 0) + img.css("margin",(120 - data[i].imgs[j].ht)/2 + "px 0"); + var hidden_input = $("").val(data[i].imgs[j].value); + img_block.append(hidden_input).append(img); + tmp_array.push(img_block); + } + tmp_array = shuffle(tmp_array); + for(j = 0; j"); + var sub_container = $("
    ").appendTo(container); + var imgs_container = $("
    ").appendTo(container); + + var number = $("
    1
    ").appendTo(sub_container); + var text = $("
    " + sankoreLang[lang].short_desc + "
    ").appendTo(sub_container); + + $("").appendTo(imgs_container); + + var img1 = $("
    "); + $("").appendTo(img1); + $("").appendTo(img1); + var img2 = $("
    "); + $("").appendTo(img2); + $("").appendTo(img2); + var img3 = $("
    "); + $("").appendTo(img3); + $("").appendTo(img3); + var img4 = $("
    "); + $("").appendTo(img4); + $("").appendTo(img4); + var img5 = $("
    "); + $("").appendTo(img5); + $("").appendTo(img5); + + tmp_array.push(img1, img2, img3, img4, img5); + tmp_array = shuffle(tmp_array); + for(var i = 0; i"); + var sub_container = $("
    ").appendTo(container); + var imgs_container = $("
    ").appendTo(container); + + var close = $("
    ").appendTo(container); + var number = $("
    "+ ($(".cont").size() + 1) +"
    ").appendTo(sub_container); + var text = $("
    Enter your text here ...
    ").appendTo(sub_container); + + $("").appendTo(imgs_container); + var add_img = $("
    ").appendTo(imgs_container); + container.insertBefore($(".add_block")); +} + +//add new img block +function addImgBlock(dest){ + var img_block = $("
    ").insertBefore(dest); + var tmp_counter = dest.parent().find(".img_block").size(); + $("
    ").appendTo(img_block); + $("
    ").appendTo(img_block); + $("").appendTo(img_block); +} + +function refreshBlockNumbers(){ + var i = 0; + $(".cont").each(function(){ + $(this).find(".number_cont").text(++i); + }) +} + +//shuffles an array +function shuffle( arr ) +{ + var pos, tmp; + + for( var i = 0; i < arr.length; i++ ) + { + pos = Math.round( Math.random() * ( arr.length - 1 ) ); + tmp = arr[pos]; + arr[pos] = arr[i]; + arr[i] = tmp; + } + return arr; +} + + +function stringToXML(text){ + if (window.ActiveXObject){ + var doc=new ActiveXObject('Microsoft.XMLDOM'); + doc.async='false'; + doc.loadXML(text); + } else { + var parser=new DOMParser(); + doc=parser.parseFromString(text,'text/xml'); + } + return doc; +} + +function onDropTarget(obj, event) { + $(obj).find("img").remove(); + //alert(tmp_img.width() + " | " + tmp_img.height() + " | " + tmp_img.attr("src")); + if (event.dataTransfer) { + var format = "text/plain"; + var textData = event.dataTransfer.getData(format); + if (!textData) { + alert(":("); + } + textData = stringToXML(textData); + var tmp = textData.getElementsByTagName("path")[0].firstChild.textContent; + tmp = tmp.substr(1, tmp.length); + //alert(textData.getElementsByTagName("type")[0].firstChild.textContent + " | " + textData.getElementsByTagName("path")[0].firstChild.textContent); + var tmp_img = $("").attr("src", tmp); + //alert(1) + //alert(tmp_img.width() + " | " + tmp_img.height() + " | " + tmp_img.attr("src")); + //$("#dnd_1").html(textData); + //tmp_img.css("display", "none"); + $(obj).append(tmp_img); + //alert(tmp_img.width() + " | " + tmp_img.height()) + setTimeout(function(){ + if(tmp_img.height() >= tmp_img.width()) + tmp_img.attr("height", "120"); + else{ + tmp_img.attr("width","120"); + tmp_img.css("margin",(120 - tmp_img.height())/2 + "px 0"); + } + }, 6) + //alert(tmp_img.width() + " | " + tmp_img.height()) + // $(".img_block").css("overflow", "auto"); + // setTimeout(function(){ + // $(".img_block").css("overflow", "").width(121); + // setTimeout(function(){ + // $(".img_block").width(120); + // }, 1); + // }, 1); + } + else { + alert ("Your browser does not support the dataTransfer object."); + } + + if (event.stopPropagation) { + event.stopPropagation (); + } + else { + event.cancelBubble = true; + } + return false; +} + diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/private/private.properties b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/private/private.properties new file mode 100644 index 00000000..85ba65e5 --- /dev/null +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/private/private.properties @@ -0,0 +1,5 @@ +copy.src.files=false +copy.src.target= +index.file=index.html +run.as=LOCAL +url=http://localhost/Ordonner_des_images/ diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/private/private.xml b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/private/private.xml new file mode 100644 index 00000000..c1f155a7 --- /dev/null +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/private/private.xml @@ -0,0 +1,4 @@ + + + + diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/project.properties b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/project.properties new file mode 100644 index 00000000..6ffde2f5 --- /dev/null +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/project.properties @@ -0,0 +1,7 @@ +include.path=${php.global.include.path} +php.version=PHP_5 +source.encoding=UTF-8 +src.dir=. +tags.asp=false +tags.short=true +web.root=. diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/project.xml b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/project.xml new file mode 100644 index 00000000..b1d09609 --- /dev/null +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/nbproject/project.xml @@ -0,0 +1,9 @@ + + + org.netbeans.modules.php.project + + + Ordonner_des_images.wgt + + + diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/0.gif b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/0.gif new file mode 100644 index 0000000000000000000000000000000000000000..0860a5fc1194e6c81ac1cf70527331243348f7d6 GIT binary patch literal 2628 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 literal 0 HcmV?d00001 diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/1.gif b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/1.gif new file mode 100644 index 0000000000000000000000000000000000000000..c6d04fac0639c879c068e84c6e2ada542f1d939b GIT binary patch literal 1483 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 literal 0 HcmV?d00001 diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/4.gif b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/objects/4.gif new file mode 100644 index 0000000000000000000000000000000000000000..20f341c36bb0fdf6923be0cd3d6af312462d121f GIT binary patch literal 1772 zcma*m{WsGK0Dy6oq8Cc3>$Tm{@-|A|hGNNPTk|quWF{u2r7$lmqP!j5NlnB>Vwzm# zC0BPhNfX&ZX5nfq+znGm5?W&S^gYKpopaAU=YD>8{)5K_jfB|-`6^seSW@_3*8PX| z|FYo+ia*%+gH3Cc)+n#pyk-kv>zZu<6@V&WJ75Pu4X_ii3!o0z4cN11&rbjifTpIV z7C>8DTL+-4tGgEf0)c)8fWcrrJw1KEzJ2>35XgRjfq{Xcp`nqHkuku;!~_b3nwpxL znVB5`96Wf?+}!-op+goH7M7NlR#sNl*48#QHZXv#t*xD%oxQ#N;lqcI9693P;Na-! z2#3Ru9zE*h*b9~l`L6%|FLQe$FbVq;_DQy?Oo|ToAot=IC`gI0_k&}~?o12@LmzSTPUr@~E32xi?%%&(U0q#UTU%FGS6^S>(9rPc z(IYmS{rK_Y#>U2`rl#iRW)6qb($dn}+WO+f3oe(-7E7ZaboCm1gp3+qqvnKM;!rf>c@$8A^9 ziZknIj7xw1YKnS55KrPL?>+oQH1uGl;>OqZKg~&|LRJ5b-tC}v3kF5Zl3mMa$|``^ zytPsMwY{fs<&$CzS^vyqSB9xjYG*Nh_tV)#$(M^0q4}pgVy9K+*_abSPCJvsb;e;@ zv$;cy)mjzLKpbbYcwzC~Qn)^QNp5-(%X><1Hgi8fyfogVGX+6*mJwt4R>fw+_t%vt zy)UgLUlHg=eU4|)jAOYtJDY~o67>-cvRaCfQ6<9>6%xj z% z^bn;8?v-WS9W!(PD5t6!hKICOm7%jSI6JFKD$W|#N1_zvh_~Fstda#Ch;LswSxELE zK4*W(skT9+U^RcIwXHG*XO4Ve`+(lZ>bt(ZlhBu~B8kkMq3bV{DI-s3z7{+gzvYZo zt3Rnu-wpn|lZgH(^5{lLd+OXcZ7FAB{9lzm5^>R2}*NiZl8t7myN@Eu0X#;Dc zGOS>u8=_mQ2x7sb9>vv=t)O-?!`f9H~PNFqA2IHIKMuq3$|=rApvFIk Date: Tue, 31 Jan 2012 11:38:25 +0100 Subject: [PATCH 91/99] improved debian package --- buildDebianPackage | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/buildDebianPackage b/buildDebianPackage index ca709d01..9eb6010e 100755 --- a/buildDebianPackage +++ b/buildDebianPackage @@ -49,8 +49,8 @@ else LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`" if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then echo creating a tag with the version $VERSION -# git tag -a "v$VERSION" -m "Generating setup for v$VERSION" -# git push origin --tags + git tag -a "v$VERSION" -m "Generating setup for v$VERSION" + git push origin --tags fi fi @@ -192,6 +192,9 @@ CONTROL_FILE="$BASE_WORKING_DIR/DEBIAN/control" CHANGE_LOG_TEXT="changelog.txt" ARCHITECTURE=`uname -i` +if [ "$ARCHITECTURE" == "x86_64" ]; then + ARCHITECTURE="amd64" +fi echo "Open-Sankore ($VERSION) $ARCHITECTURE; urgency=low" > "$CHANGE_LOG_FILE" echo >> "$CHANGE_LOG_FILE" @@ -206,8 +209,8 @@ echo "Priority: optional" >> "$CONTROL_FILE" echo "Architecture: $ARCHITECTURE" >> "$CONTROL_FILE" echo "Essential: no" >> "$CONTROL_FILE" echo "Installed-Size: `du -s $SANKORE_PACKAGE_DIRECTORY | awk '{ print $1 }'`" >> "$CONTROL_FILE" -echo "Maintainer: Claudio VALERIO " >> "$CONTROL_FILE" -echo "Homepage: http://www.open-sankore.org" >> "$CONTROL_FILE" +echo "Maintainer: Open-Sankoré Developers team " >> "$CONTROL_FILE" +echo "Homepage: http://dev.open-sankore.org" >> "$CONTROL_FILE" echo -n "Depends: " >> "$CONTROL_FILE" unset tab declare -a tab @@ -223,6 +226,10 @@ for l in `objdump -p $SANKORE_PACKAGE_DIRECTORY/Open-Sankore | grep NEEDED | awk done; done; +#additional dependencies +tab[$count]="gtk2-engines-pixbuf" +((count++)) + for ((i=0;i<${#tab[@]};i++)); do if [ $i -ne "0" ]; then echo -n ", " >> "$CONTROL_FILE" @@ -254,10 +261,10 @@ chmod 755 "$BASE_WORKING_DIR/DEBIAN/postint" mkdir -p "install/linux" -sudo chown -R root:root $BASE_WORKING_DIR +fakeroot chown -R root:root $BASE_WORKING_DIR dpkg -b "$BASE_WORKING_DIR" install/linux/Open-Sankore_${VERSION}_$ARCHITECTURE.deb notify-send "Open-Sankore" "Package built" #clean up mess -#sudo rm -rf $BASE_WORKING_DIR +#fakeroot rm -rf $BASE_WORKING_DIR From cbbf77f092e6321da6207193488a0e0b801772b6 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Tue, 31 Jan 2012 11:38:28 +0100 Subject: [PATCH 92/99] Fixed an issue in the teacherbar V3 --- src/core/UBSettings.cpp | 2 +- src/gui/UBTBDocumentEditWidget.cpp | 3 +++ src/gui/UBTeacherBarDataMgr.cpp | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index a07ff438..b9819d52 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -39,7 +39,7 @@ QString UBSettings::documentUpdatedAt = QString("UpdatedAt"); QString UBSettings::sessionTitle = QString("sessionTitle"); QString UBSettings::sessionTarget = QString("sessionTarget"); QString UBSettings::sessionLicence = QString("sessionLicence"); -QString UBSettings::sessionKeywords = QString("sessionAuthors"); +QString UBSettings::sessionKeywords = QString("sessionKeywords"); QString UBSettings::sessionLevel = QString("sessionLevel"); QString UBSettings::sessionTopic = QString("sessionTopic"); QString UBSettings::sessionAuthors = QString("sessionAuthors"); diff --git a/src/gui/UBTBDocumentEditWidget.cpp b/src/gui/UBTBDocumentEditWidget.cpp index 8d0b94f5..30f3438e 100644 --- a/src/gui/UBTBDocumentEditWidget.cpp +++ b/src/gui/UBTBDocumentEditWidget.cpp @@ -1,3 +1,5 @@ +#include + #include "UBTBDocumentEditWidget.h" #include "customWidgets/UBGlobals.h" @@ -190,6 +192,7 @@ void UBTBDocumentEditWidget::clearFields() void UBTBDocumentEditWidget::onKeywordChanged(const QString &kw) { mpDataMgr->setKeywords(kw); + qDebug() << ">>> KEYWORD CHANGED: " << kw; emit valueChanged(); } diff --git a/src/gui/UBTeacherBarDataMgr.cpp b/src/gui/UBTeacherBarDataMgr.cpp index 2a772441..5d951d77 100644 --- a/src/gui/UBTeacherBarDataMgr.cpp +++ b/src/gui/UBTeacherBarDataMgr.cpp @@ -59,7 +59,8 @@ void UBTeacherBarDataMgr::saveContent() documentProxy->setSessionTitle(mSessionTitle); documentProxy->setSessionTarget(mSessionTarget); documentProxy->setSessionLicence(QString("%0").arg(mSessionLicence)); - documentProxy->setSessionKeywords(mAuthors); + qDebug() << "Saving keywords: " << mKeywords; + documentProxy->setSessionKeywords(mKeywords); documentProxy->setSessionLevel(mLevel); documentProxy->setSessionTopic(mTopic); documentProxy->setSessionAuthor(mAuthors); @@ -81,6 +82,7 @@ void UBTeacherBarDataMgr::loadContent(bool docChanged) mSessionTarget = documentProxy->sessionTarget(); mSessionLicence = (eLicense)documentProxy->sessionLicence().toInt(); mKeywords = documentProxy->sessionKeywords(); + qDebug() << "Keywords loaded: " << mKeywords << " (" << documentProxy->sessionKeywords() << ")"; mLevel = documentProxy->sessionLevel(); mTopic = documentProxy->sessionTopic(); mAuthors = documentProxy->sessionAuthors(); From 32fcd0be014cda20344cf6448dad7484cb843e60 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Tue, 31 Jan 2012 13:19:38 +0200 Subject: [PATCH 93/99] Fix for SANKORE-493. --- src/board/UBBoardPaletteManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 554dca30..15931d04 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -823,6 +823,7 @@ void UBBoardPaletteManager::addItem(const QPixmap& pPixmap, const QPointF& pos, void UBBoardPaletteManager::addItemToCurrentPage() { UBApplication::applicationController->showBoard(); + UBApplication::applicationController->hideDesktop(); mAddItemPalette->hide(); if(mPixmap.isNull()) UBApplication::boardController->downloadURL(mItemUrl); From d2923eb6d07ea92388b243e1fa7fbc31f3c92f64 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 31 Jan 2012 11:38:50 +0100 Subject: [PATCH 94/99] added execute flag --- release.linux.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 release.linux.sh diff --git a/release.linux.sh b/release.linux.sh old mode 100644 new mode 100755 From 79588b6a1d326044ba23400a3d475d8d944213c4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 31 Jan 2012 14:05:52 +0200 Subject: [PATCH 95/99] changed paraschool widget --- .../ordonner_des_images.wgt/index.html | 10 +++++++++- .../ordonner_des_images.wgt/js/languages.js | 20 ------------------- .../ordonner_des_images.wgt/js/script.js | 19 ++++-------------- .../js/translation/en.js | 8 ++++++++ .../js/translation/fr.js | 8 ++++++++ .../js/translation/ru.js | 8 ++++++++ 6 files changed, 37 insertions(+), 36 deletions(-) delete mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/languages.js create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/translation/en.js create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/translation/fr.js create mode 100644 resources/library/sankoreInteractivities/ordonner_des_images.wgt/js/translation/ru.js diff --git a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/index.html b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/index.html index 536bd4e0..5525abd4 100644 --- a/resources/library/sankoreInteractivities/ordonner_des_images.wgt/index.html +++ b/resources/library/sankoreInteractivities/ordonner_des_images.wgt/index.html @@ -10,6 +10,14 @@