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

resources/library/interactive/WebBrowser.wgt/css/main.css

@@ -180,3 +180,19 @@ body{
 	background-image:url(../imgs/right.png);
 	background-repeat:no-repeat;
 }
+
+.popupWordInfo{
+    position: absolute;
+    display: none;
+    width: 100px;
+    height: 17px;
+    top: 0;
+    left: 0;
+    text-align: center;
+    border: 1px solid #B9B9B9;
+    background-color: #eaebeb;
+    color: black;
+    font-family: Verdana,Arial,Helvetica,sans-serif;
+    font-size: small;
+    z-index: 100;
+}

resources/library/interactive/WebBrowser.wgt/index.html

@@ -22,6 +22,7 @@
             $(document).ready(function(){
                 //var resizer; // Timer
                 //var resizerIndex;
+                var popupFlag = false;
                 var currentHistory = 0;
                 var references = new Array();
                 var globalWidth = 850;
@@ -37,6 +38,7 @@
                 var resizer; // Timer
                 var resizerIndex;
                 
+                var popupText = $("<div id='popupWordInfo' class='popupWordInfo'></div>").appendTo("body");
                 
                 resizerIndex = 0;
 									
@@ -67,6 +69,52 @@
                     }
                 });
 		
+                $("#search-button").mouseover(function(evt){
+                    popupFlag = true;
+                    popupText.css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13)
+                    .css({width:"100px"})
+                    .text("Go to the site")
+                    .show("fast", function(){
+                        if(!popupFlag)
+                            popupText.hide();
+                    });
+                });
+                
+                $("#back-button").mouseover(function(evt){
+                    popupFlag = true;
+                    popupText.css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13)
+                    .css({width:"90px"})
+                    .text("Previous site")
+                    .show("fast", function(){
+                        if(!popupFlag)
+                            popupText.hide();
+                    });
+                });
+                
+                $("#forward-button").mouseover(function(evt){
+                    popupFlag = true;
+                    popupText.css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13)
+                    .css({width:"70px"})
+                    .text("Next site")
+                    .show("fast", function(){
+                        if(!popupFlag)
+                            popupText.hide();
+                    });
+                });
+                
+                $("#search-button, #back-button, #forward-button").mousemove(function(evt){
+                    popupText.css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13);
+                });
+                
+                $("#search-button, #back-button, #forward-button").mouseout(function(evt){
+                    popupText.hide();
+                    popupFlag = false;
+                });
+                
                 $("#textbox").keypress(function(e) {
                     if(e.keyCode == 13) {
                         $("#search-button").trigger("click");

resources/library/interactive/Wikipedia.wgt/config.xml

@@ -3,8 +3,8 @@
 		xmlns:ub="http://uniboard.mnemis.com/widgets"
         identifier="http://uniboard.mnemis.com/widgets/wikipedia" 
         version="1.2"
-        width="350"
+        width="370"
-        height="450"
+        height="400"
         ub:resizable = "true">
        
   		<name>Wikipedia</name>

resources/library/interactive/Wikipedia.wgt/css/master.css

@@ -101,13 +101,23 @@ body{
 #toolbar-button-languages{ background-image:url(../images/toolbarButtonLanguages.png) }
 
 #toolbar-button-search{
+    float: left;
     width:22px;
     height:22px;
     position:relative;
-  margin-left:-22px;
+    margin-left:-32px;
     background-image:url(../images/toolbarButtonSearch.png);
     background-repeat:no-repeat;
     background-position:center center;
+    border: 1px solid #B9B9B9;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    -webkit-box-shadow: #dadada -1px 0 4px;
+    box-shadow: #dadada -1px 0 4px;
+}
+
+#toolbar-button-search:hover{
+    border: 1px solid #666666;
 }
 
 #toolbar-button-languages{
@@ -117,3 +127,23 @@ body{
 #toolbar-button-back{
     margin-right:0px;
 }
+
+.popupWordInfo{
+    position: absolute;
+    display: none;
+    width: 100px;
+    height: 17px;
+    top: 0;
+    left: 0;
+    text-align: center;
+    border: 1px solid #B9B9B9;
+    background-color: #eaebeb;
+    color: black;
+    font-family: Verdana,Arial,Helvetica,sans-serif;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    -webkit-box-shadow: #dadada -1px 0 4px;
+    box-shadow: #dadada -1px 0 4px;
+    z-index: 100;
+    font-family: Arial,Helvetica,sans-serif;
+}

resources/library/interactive/Wikipedia.wgt/index.html

@@ -14,6 +14,7 @@
 
         <script type="text/javascript"> 
             
+            var popupFlag = false
             var browsing = false;
             var lang = 'en';
             var internalChange = false;
@@ -43,6 +44,8 @@
                 var ubHistoryList = "";
                 var ubHistoryIndex = "";
 
+                var popupText = $("<div id='popupWordInfo' class='popupWordInfo'></div>").appendTo("body");
+
                 lang = navigator.userAgent.split(";");
 
                 lang = (navigator.language || navigator.systemLanguage || 
@@ -91,6 +94,32 @@
                     };
                 });
                 
+                $("#toolbar-button-search").click(function(){
+                    $("#url").trigger("change");
+                });
+                
+                $("#toolbar-button-search").mouseover(function(evt){
+                    popupFlag = true;
+                    popupText.text("Search")
+                    .css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13)
+                    .css({width:"70px"})
+                    .show("fast", function(){
+                        if(!popupFlag)
+                            popupText.hide();
+                    });
+                });
+                
+                $("#toolbar-button-search, #toolbar-button-back, #toolbar-button-forward").mousemove(function(evt){
+                    popupText.css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13);
+                });
+                
+                $("#toolbar-button-search, #toolbar-button-back, #toolbar-button-forward").mouseout(function(evt){
+                    popupFlag = false;
+                    popupText.hide();
+                });
+
                 $("#url").val(appHistory.list[appHistory.index]);
 
                 if($("#url").val().length > 0)
@@ -101,11 +130,35 @@
                     appHistory.back();
                 });
                 
+                $("#toolbar-button-back").mouseover(function(evt){
+                    popupFlag = true;
+                    popupText.text("Previous word")
+                    .css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13)
+                    .css({width:"100px"})
+                    .show("fast", function(){
+                        if(!popupFlag)
+                            popupText.hide();
+                    });
+                });
+                
                 $("#toolbar-button-forward").click(function(){
                     browsing = true;
                     appHistory.forward();
                 });
 
+                $("#toolbar-button-forward").mouseover(function(evt){
+                    popupFlag = true;
+                    popupText.text("Next word")
+                    .css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13)
+                    .css({width:"70px"})
+                    .show("fast", function(){
+                        if(!popupFlag)
+                            popupText.hide();
+                    });
+                });
+                
                 $("#toolbar-button-home").click(function(){
                 });
             });

resources/library/interactive/Wikipedia.wgt/nbproject/private/private.properties

@@ -1,5 +0,0 @@
-copy.src.files=false
-copy.src.target=
-index.file=index.html
-run.as=LOCAL
-url=http://localhost/Wikipedia.wgt/

resources/library/interactive/Wikipedia.wgt/nbproject/private/private.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>

resources/library/interactive/Wikipedia.wgt/nbproject/project.properties

@@ -1,7 +0,0 @@
-include.path=${php.global.include.path}
-php.version=PHP_5
-source.encoding=UTF-8
-src.dir=.
-tags.asp=false
-tags.short=true
-web.root=.

resources/library/interactive/Wikipedia.wgt/nbproject/project.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.php.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>Wikipedia.wgt</name>
-        </data>
-    </configuration>
-</project>

resources/library/interactive/Wiktionary.wgt/css/master.css

@@ -101,13 +101,23 @@ body{
 #toolbar-button-languages{ background-image:url(../images/toolbarButtonLanguages.png) }
 
 #toolbar-button-search{
+    float: left;
     width:22px;
     height:22px;
     position:relative;
-  margin-left:-22px;
+    margin-left:-32px;
     background-image:url(../images/toolbarButtonSearch.png);
     background-repeat:no-repeat;
     background-position:center center;
+    border: 1px solid #B9B9B9;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    -webkit-box-shadow: #dadada -1px 0 4px;
+    box-shadow: #dadada -1px 0 4px;
+}
+
+#toolbar-button-search:hover{
+    border: 1px solid #666666;
 }
 
 #toolbar-button-languages{
@@ -117,3 +127,23 @@ body{
 #toolbar-button-back{
   margin-right:0px;
 }
+
+.popupWordInfo{
+    position: absolute;
+    display: none;
+    width: 100px;
+    height: 17px;
+    top: 0;
+    left: 0;
+    text-align: center;
+    border: 1px solid #B9B9B9;
+    background-color: #eaebeb;
+    color: black;
+    font-family: Verdana,Arial,Helvetica,sans-serif;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    -webkit-box-shadow: #dadada -1px 0 4px;
+    box-shadow: #dadada -1px 0 4px;
+    z-index: 100;
+    font-family: Arial,Helvetica,sans-serif;
+}

resources/library/interactive/Wiktionary.wgt/index.html

@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"> 
     <head> 
@@ -14,6 +13,7 @@
 
         <script type="text/javascript"> 
             
+            var popupFlag = false;
             var browsing = false;
             var mode = 'wiki';
             var lang = 'en';
@@ -44,6 +44,8 @@
                 var ubHistoryList = "";
                 var ubHistoryIndex = "";
 
+                var popupText = $("<div id='popupWordInfo' class='popupWordInfo'></div>").appendTo("body");
+
                 lang = navigator.userAgent.split(";");
 
                 lang = (navigator.language || navigator.systemLanguage || 
@@ -98,16 +100,66 @@
                 if($("#url").val().length > 0)
                     $("#url").change();
                 
+                $("#toolbar-button-search").click(function(){
+                    $("#url").trigger("change");
+                });
+                
+                $("#toolbar-button-search").mouseover(function(evt){
+                    popupFlag = true;
+                    popupText.text("Search")
+                    .css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13)
+                    .css({width:"70px"})
+                    .show("fast", function(){
+                        if(!popupFlag)
+                            popupText.hide();
+                    });
+                });
+                
+                $("#toolbar-button-search, #toolbar-button-back, #toolbar-button-forward").mousemove(function(evt){
+                    popupText.css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13);
+                });
+                
+                $("#toolbar-button-search, #toolbar-button-back, #toolbar-button-forward").mouseout(function(evt){
+                    popupFlag = false;
+                    popupText.hide();
+                });
+                
                 $("#toolbar-button-back").click(function(){
                     browsing = true;
                     appHistory.back();
                 });
                 
+                $("#toolbar-button-back").mouseover(function(evt){
+                    popupFlag = true;
+                    popupText.text("Previous word")
+                    .css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13)
+                    .css({width:"100px"})
+                    .show("fast", function(){
+                        if(!popupFlag)
+                            popupText.hide();
+                    });
+                });
+
                 $("#toolbar-button-forward").click(function(){
                     browsing = true;
                     appHistory.forward();
                 });
                 
+                $("#toolbar-button-forward").mouseover(function(evt){
+                    popupFlag = true;
+                    popupText.text("Next word")
+                    .css("top", evt.pageY + 5)
+                    .css("left", evt.pageX + 13)
+                    .css({width:"70px"})
+                    .show("fast", function(){
+                        if(!popupFlag)
+                            popupText.hide();
+                    });
+                });
+
                 $("#toolbar-button-home").click(function(){
                 });
             });

resources/library/interactive/Wiktionary.wgt/nbproject/private/private.properties

@@ -1,5 +0,0 @@
-copy.src.files=false
-copy.src.target=
-index.file=index.html
-run.as=LOCAL
-url=http://localhost/Wiktionary.wgt/

resources/library/interactive/Wiktionary.wgt/nbproject/project.properties

@@ -1,7 +0,0 @@
-include.path=${php.global.include.path}
-php.version=PHP_53
-source.encoding=UTF-8
-src.dir=.
-tags.asp=false
-tags.short=true
-web.root=.

resources/library/interactive/Wiktionary.wgt/nbproject/project.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.php.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>Wiktionary.wgt</name>
-        </data>
-    </configuration>
-</project>

src/core/UBApplicationController.cpp

@@ -520,7 +520,7 @@ void UBApplicationController::ftpCommandFinished(int id, bool error)
    }
    else{
        QString responseString =  QString(mFtp->readAll());
-       if (!responseString.isEmpty() && responseString.contains("version:") && responseString.contains("url:")){
+       if (!responseString.isEmpty() && responseString.contains("version") && responseString.contains("url")){
            mFtp->close();
            downloadJsonFinished(responseString);
        }
@@ -539,23 +539,9 @@ void UBApplicationController::downloadJsonFinished(QString currentJson)
     UBVersion jsonVersion (scriptValue.property("version").toString().left(4));
 
     if (installedVersion.isValid() &&  jsonVersion.isValid() && jsonVersion > installedVersion) {
-            QMessageBox msgBox;
+            if (UBApplication::mainWindow->yesNoQuestion(tr("Update available"), tr ("New update available, would you go to the web page ?"))){
-            msgBox.setText (tr ("New update available, would you go to the web page ?"));
-            msgBox.setStandardButtons (QMessageBox::Ok | QMessageBox::Cancel);
-            msgBox.setDefaultButton (QMessageBox::Ok);
-            int ret = msgBox.exec();
-            switch (ret) {
-                case QMessageBox::Ok: {
                     QUrl url(scriptValue.property ("url").toString());
                     QDesktopServices::openUrl (url);
-                    break;
-                }
-                case QMessageBox::Cancel:
-                    // do nothing
-                    break;
-                 default:
-                    // should never be reached
-                    break;
             }
     }
     else {

src/desktop/UBDesktopAnnotationController.cpp

@@ -433,7 +433,10 @@ void UBDesktopAnnotationController::customCapture()
     UBCustomCaptureWindow customCaptureWindow(mDesktopPalette);
 
     // need to show the window before execute it to avoid some glitch on windows.
+
+#ifndef Q_WS_WIN // Working only without this call on win32 desktop mode
     customCaptureWindow.show();
+#endif
 
     if (customCaptureWindow.execute(getScreenPixmap()) == QDialog::Accepted)
     {

src/document/UBDocumentController.cpp

@@ -476,7 +476,6 @@ void UBDocumentController::showKeyboard(bool show)
         mKeyboardPalette->setVisible(show);
     }
 
-//    mPaletteManager->showVirtualKeyboard(show);
 }
 
 void UBDocumentController::setupPalettes()
@@ -640,10 +639,7 @@ void UBDocumentController::deleteSelectedItem()
                 }
             }
 
-            if (QMessageBox::question( 0, tr("Remove Page"),
+            if(UBApplication::mainWindow->yesNoQuestion(tr("Remove Page"), tr("Are you sure you want to remove %n page(s) from the selected document '%1'?", "", sceneIndexes.count()).arg(proxy->metaData(UBSettings::documentName).toString())))
-                    tr("Are you sure you want to remove %n page(s) from the selected document '%1'?", "", sceneIndexes.count())
-                        .arg(proxy->metaData(UBSettings::documentName).toString()),
-                    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
             {
                 UBPersistenceManager::persistenceManager()->deleteDocumentScenes(proxy, sceneIndexes);
                 proxy->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime()));
@@ -668,9 +664,7 @@ void UBDocumentController::deleteSelectedItem()
 
         if (proxyTi && proxyTi->proxy() && proxyTi->parent())
         {
-            if (QMessageBox::question( 0, tr("Remove Document"),
+            if(UBApplication::mainWindow->yesNoQuestion(tr("Remove Document"), tr("Are you sure you want to remove the document '%1'?").arg(proxyTi->proxy()->metaData(UBSettings::documentName).toString())))
-                    tr("Are you sure you want to remove the document '%1'?").arg(proxyTi->proxy()->metaData(UBSettings::documentName).toString()),
-                    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
             {
                 if (proxyTi->parent() == mTrashTi)
                 {
@@ -737,9 +731,7 @@ void UBDocumentController::deleteSelectedItem()
         {
             if (groupTi == mTrashTi)
             {
-                if (QMessageBox::question( 0, tr("Empty Trash"),
+                if(UBApplication::mainWindow->yesNoQuestion(tr("Empty Trash"), tr("Are you sure you want to empty trash?")))
-                        tr("Are you sure you want to empty trash?"),
-                        QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
                 {
                     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
                     QList<UBDocumentProxyTreeItem*> toBeDeleted;
@@ -769,9 +761,7 @@ void UBDocumentController::deleteSelectedItem()
             }
             else
             {
-                if (QMessageBox::question( 0, tr("Remove Folder"),
+                if(UBApplication::mainWindow->yesNoQuestion(tr("Remove Folder"), tr("Are you sure you want to remove the folder '%1' and all its content?").arg(groupTi->groupName())))
-                        tr("Are you sure you want to remove the folder '%1' and all its content?").arg(groupTi->groupName()),
-                        QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
                 {
                     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
@@ -1483,11 +1473,10 @@ bool UBDocumentController::isOKToOpenDocument(UBDocumentProxy* proxy)
     }
     else
     {
-        if (QMessageBox::question( 0, tr("Open Document"),
+        if (UBApplication::mainWindow->yesNoQuestion(tr("Open Document"),
                 tr("The document '%1' has been generated with a newer version of Sankore (%2). By opening it, you may lose some information. Do you want to proceed?")
                     .arg(proxy->metaData(UBSettings::documentName).toString())
-                    .arg(docVersion),
+                    .arg(docVersion)))
-                QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
         {
             return true;
         }

src/gui/UBDocumentNavigator.cpp

@@ -54,6 +54,7 @@ UBDocumentNavigator::UBDocumentNavigator(QWidget *parent, const char *name):QGra
     setFrameShadow(QFrame::Plain);
 
     connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(addNewPage()));
+    connect(UBApplication::boardController, SIGNAL(setDocOnPageNavigator(UBDocumentProxy*)), this, SLOT(generateThumbnails()));
     connect(mScene, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
 }
 
@@ -118,7 +119,6 @@ void UBDocumentNavigator::generateThumbnails()
 
         items << pixmapItem;
         labels << tr("Page %0").arg(i + 1);
-        //itemsPath.append(QUrl::fromLocalFile(mCrntDoc->persistencePath() + QString("/pages/%0").arg(i + 1)));
     }
 
     // Draw the items
@@ -347,12 +347,12 @@ void UBDocumentNavigator::resizeEvent(QResizeEvent *event)
     mThumbnailWidth = (width() > mThumbnailMinWidth) ? width() - 2*border() : mThumbnailMinWidth;
 
     // Update the scene rect
-//    QRect sceneRect;
+    //    QRect sceneRect;
-//    sceneRect.setWidth(width() - 2*border());
+    //    sceneRect.setWidth(width() - 2*border());
-//    sceneRect.setHeight(height() - 2*border());
+    //    sceneRect.setHeight(height() - 2*border());
-//    sceneRect.moveLeft(border());
+    //    sceneRect.moveLeft(border());
-//    sceneRect.moveTop(border());
+    //    sceneRect.moveTop(border());
-//    scene()->setSceneRect(sceneRect);
+    //    scene()->setSceneRect(sceneRect);
 
     // Refresh the scene
     refreshScene();
@@ -432,6 +432,6 @@ UBDocumentProxy* UBDocumentNavigator::currentDoc()
  */
 void UBDocumentNavigator::onSelectionChanged()
 {
-//    QList<QGraphicsItem*> qlItems = mScene->selectedItems();
+    //    QList<QGraphicsItem*> qlItems = mScene->selectedItems();
-//    qDebug() << "The number of selected items is " << qlItems.count();
+    //    qDebug() << "The number of selected items is " << qlItems.count();
 }

src/gui/UBDocumentNavigator.h

@@ -51,13 +51,14 @@ protected:
 private slots:
     void addNewPage();
     void onSelectionChanged();
+    void generateThumbnails();
 
 private:
     void setGraphicsItems(QList<QGraphicsItem*> items, QStringList labels);
     void refreshScene();
     void updateSpecificThumbnail(int iPage);
     int border();
-    void generateThumbnails();
+
 
     /** The scene */
     QGraphicsScene* mScene;

src/gui/UBMainWindow.cpp

@@ -138,3 +138,18 @@ void UBMainWindow::onExportDone()
     actionOpen->setEnabled(true);
     actionDocumentAdd->setEnabled(true);
 }
+
+bool UBMainWindow::yesNoQuestion(QString windowTitle, QString text)
+{
+    QMessageBox messageBox;
+    messageBox.setParent(this);
+    messageBox.setWindowFlags(Qt::Dialog);
+    messageBox.setWindowTitle(windowTitle);
+    messageBox.setText(text);
+    QPushButton* yesButton = messageBox.addButton(tr("Yes"),QMessageBox::YesRole);
+    messageBox.addButton(tr("No"),QMessageBox::NoRole);
+    messageBox.setIcon(QMessageBox::Question);
+    messageBox.exec();
+
+    return messageBox.clickedButton() == yesButton;
+}

src/gui/UBMainWindow.h

@@ -41,6 +41,7 @@ class UBMainWindow : public QMainWindow, public Ui::MainWindow
 
         void addDocumentsWidget(QWidget *pWidget);
         void switchToDocumentsWidget();
+        bool yesNoQuestion(QString windowTitle, QString text);
 
     signals:
         void closeEvent_Signal( QCloseEvent *event );