diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 2efb06ef..b10b733f 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -7,8 +7,8 @@ CONFIG += debug_and_release \ no_include_pwd VERSION_MAJ = 1 -VERSION_MIN = 15 -VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error +VERSION_MIN = 20 +VERSION_TYPE = r # a = alpha, b = beta, r = release, other => error VERSION_PATCH = 00 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" diff --git a/resources/i18n/sankore_ar.qm b/resources/i18n/sankore_ar.qm new file mode 100644 index 00000000..be651eed --- /dev/null +++ b/resources/i18n/sankore_ar.qm @@ -0,0 +1 @@ +<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/resources/i18n/sankore_da.qm b/resources/i18n/sankore_da.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_da.qm and b/resources/i18n/sankore_da.qm differ diff --git a/resources/i18n/sankore_de.qm b/resources/i18n/sankore_de.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_de.qm and b/resources/i18n/sankore_de.qm differ diff --git a/resources/i18n/sankore_en.qm b/resources/i18n/sankore_en.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_en.qm and b/resources/i18n/sankore_en.qm differ diff --git a/resources/i18n/sankore_en_UK.qm b/resources/i18n/sankore_en_UK.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_en_UK.qm and b/resources/i18n/sankore_en_UK.qm differ diff --git a/resources/i18n/sankore_es.qm b/resources/i18n/sankore_es.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_es.qm and b/resources/i18n/sankore_es.qm differ diff --git a/resources/i18n/sankore_fr.qm b/resources/i18n/sankore_fr.qm index 755966c1..62b771ae 100644 Binary files a/resources/i18n/sankore_fr.qm and b/resources/i18n/sankore_fr.qm differ diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/sankore_fr.ts index b0288bae..52640124 100644 --- a/resources/i18n/sankore_fr.ts +++ b/resources/i18n/sankore_fr.ts @@ -7,6 +7,10 @@ Click to Return to Application Cliquer pour activer Sankoré + + background: url(:/images/bigUniboard.png); border: none; + + DownloadDialog @@ -45,12 +49,16 @@ Open Ouvrir + + Ico + + IntranetPodcastPublishingDialog Publish Podcast to YouTube - Publier le Podcast sur YouTube + Publier le Podcast sur YouTube Title @@ -129,7 +137,7 @@ Start Screen Recording - Démarrer l'enregistrement de l'écran + Démarrer l'enregistrement de l'écran Marker @@ -189,7 +197,7 @@ Trap Flash Content - Capturer Flash + Capturer Flash Web Trap @@ -249,11 +257,11 @@ Web Browsing - Parcourir le Web + Parcourir le Web Small Line - Ligne fine + Ligne fine Medium Line @@ -261,11 +269,11 @@ Large Line - Ligne large + Ligne large Smalle Eraser - Gomme fine + Gomme fine Medium Eraser @@ -389,7 +397,7 @@ Sankore 3.1 - Sankoré 3.1 + Sankoré 3.1 Show Desktop @@ -397,7 +405,7 @@ Ctrl+Shift+H - Ctrl+Shift+H + Ctrl+Shift+H Rename Content @@ -457,7 +465,7 @@ Clear All Elements - Effacer tous les éléments + Effacer tous les éléments Annotate Document @@ -465,7 +473,7 @@ Ctrl+I - Ctrl+I + Ctrl+I Erase Annotation @@ -473,11 +481,11 @@ Ctrl+E - Ctrl+E + Ctrl+E Highlight - Mettre en surbrillance + Mettre en surbrillance Ctrl+M @@ -561,7 +569,7 @@ Pause Podcast Recording - Mettre en pause l'enregistrement + Mettre en pause l'enregistrement Podcast Config @@ -581,7 +589,7 @@ Show Sankore Widgets Editor - Afficher l'éditeur d'Apps Sankoré + Afficher l'éditeur d'Apps Sankoré Hide Sankoré @@ -818,6 +826,14 @@ Password: Mot de passe: + + DUMMY ICON + + + + INTRO TEXT DUMMY + + ProxyDialog @@ -841,6 +857,10 @@ Save username and password for future use Sauver nom utilisateur & mot de passe + + ICON + + QObject @@ -855,13 +875,6 @@ Accueil - - QuaZipFile - - ZIP/UNZIP API error %1 - - - UBAbstractPublisher @@ -1097,16 +1110,9 @@ Page %1 Page %1 - - Are you sure you want to remove %n page(s) from the selected document '%1'? - - - - - 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? - + Ce document '%1' a été créé avec une version plus récente de Sankoré (%2). En l'ouvrant, vous risquez de perdre certains éléments. Désirez-vous continuer? @@ -1167,19 +1173,19 @@ Credentials has to not been filled out yet. - + Les informations n'ont pas encore été remplies. Uploading Sankore File on Web. - + Fichier Sankoré en cours d'import sur le Web. Document uploaded correctly on the web. - + Document correctment importé sur le Web. Failed to upload document on the web. - + L'import Web du document a échoué. @@ -1192,19 +1198,12 @@ Copying page %1/%2 Copie de la page %1/%2 en cours - - %1 pages copied - - - - - UBDropMeWidget Drop here - Déposer ici + Déposer ici @@ -1231,7 +1230,7 @@ Export to Sankore Format - + Export au format Sankoré @@ -1351,19 +1350,19 @@ Importing file %1... - Importation du fichier %1... + Importation du fichier %1... Import of file %1 failed. - + L'import du fichier %1 a échoué. Import successful. - Importation terminée. + Importation terminée. Import failed. - + L'import a échoué. @@ -1378,11 +1377,11 @@ Sankore 3.1 (*.ubz) - Sankore 3.1 (*.ubz) + Sankore 3.1 (*.ubz) Import of file %1 failed. - + L'import du fichier %1 a échoué. @@ -1457,7 +1456,7 @@ Back to folder - Retour au répertoire + Retour au répertoire Remove from favorites @@ -1495,7 +1494,7 @@ UBLibraryController Added 1 Image to Library - 1 images ajoutées à la bibiliothèque + 1 image ajoutées à la bibiliothèque Audios @@ -1505,7 +1504,7 @@ Movies Movies category element - Vidéos + Vidéos Pictures @@ -1529,11 +1528,11 @@ Creating image thumbnail for %1. - Création de la vignette pour %1. + Création de la vignette pour %1. Adding to page failed for item %1. - Impossible d'ajouter %1 à la page courrante. + Impossible d'ajouter %1 à la page courrante. Interactivities @@ -1547,7 +1546,7 @@ Animations Animations category element - + Animations @@ -1600,7 +1599,7 @@ Voulez-vous ignorer les erreurs pour ce serveur? Sankore has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well. - + Sankoré a perdu l'accès au dossier de document '%1'. Malheurheusement l'application doit être fermée pour éviter tout risque de corruption de vos fichiers. Les dernières modifications effectuées risquent d'être perdues. @@ -1663,7 +1662,7 @@ Voulez-vous ignorer les erreurs pour ce serveur? Sankore Cast - + @@ -1681,34 +1680,34 @@ Voulez-vous ignorer les erreurs pour ce serveur? UBProxyLoginDlg Proxy Login - + Username: - Nom d'utilisateur: + Nom d'utilisateur: Password: - Mot de passe: + Mot de passe: UBPublicationDlg Publish document on the web - + Publier le document sur le web Title: - + Titre: Description: - + Description: Publish - Publier + Publier @@ -1719,7 +1718,7 @@ Voulez-vous ignorer les erreurs pour ce serveur? Trash - Corbeille + Corbeille Images @@ -1761,7 +1760,7 @@ Voulez-vous ignorer les erreurs pour ce serveur? Triangle - + Equerre @@ -1817,7 +1816,11 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Updating file - + Mise à jour du fichier + + + Please wait the import process will start soon... + Merci de patienter, le processus d'import va commencer... @@ -1838,7 +1841,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. UBWebPublisher Publish Document on Sankore Web - + Publier le document sur Planète Sankoré @@ -2095,7 +2098,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Clear Recent Searches - Supprimer l'historique de recherches + Supprimer l'historique de recherches @@ -2106,7 +2109,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Add to Current Document - Ajouter au document courant + Ajouter au document courant PDF @@ -2118,7 +2121,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Download PDF Document: would you prefer to download the PDF file or add it to the current Sankore document? - + Téléchargement du PDF: préférez-vous téléchargemer le fichier PDF ou l'ajouter à votre document Sankoré actuellement ouvert ? @@ -2148,7 +2151,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Uniboard - Sankoré + Sankoré Category @@ -2253,11 +2256,11 @@ p, li { white-space: pre-wrap; } Attach Downloadable PDF Version - Attacher la version PDF + Attacher la version PDF Attach Downloadable Uniboard File (UBZ) - Attacher le fichier Sankoré (UBZ) + Attacher le fichier Sankoré (UBZ) Warning: This documents contains video, which will not be displayed properly on the Web @@ -2270,6 +2273,10 @@ p, li { white-space: pre-wrap; } Uniboard Documents Documents Uniboard + + 1 + + preferencesDialog @@ -2291,7 +2298,7 @@ p, li { white-space: pre-wrap; } Show Page with External Browser - Ouvrir la page dans un navigateur Web externe + Ouvrir la page dans un navigateur Web externe Virtual Keyboard @@ -2299,15 +2306,15 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Taille des touches du clavier virtuel: + Taille des touches du clavier virtuel: Positioned at the Top (recommended for tablets) - Positionné en haut (recommandé pour les tablettes) + Positionné en haut (recommandé pour les tablettes) Positioned at the Bottom (recommended for white boards) - Positionné en bas (recommandé pour les tableaux blancs) + Positionné en bas (recommandé pour les tableaux blancs) Display Text Under Button @@ -2351,7 +2358,7 @@ p, li { white-space: pre-wrap; } Stylus Palette - Barre d'outil du stylet + Barre d'outil du stylet Horizontal @@ -2375,7 +2382,7 @@ p, li { white-space: pre-wrap; } Licences - Licences + Licences OpenSSl @@ -2632,15 +2639,15 @@ p, li { white-space: pre-wrap; } Network - + Réseau Community - + Communauté User/Pass: - + Nom d'utilisateur/Mot de passe: diff --git a/resources/i18n/sankore_fr_CH.qm b/resources/i18n/sankore_fr_CH.qm index 755966c1..62b771ae 100644 Binary files a/resources/i18n/sankore_fr_CH.qm and b/resources/i18n/sankore_fr_CH.qm differ diff --git a/resources/i18n/sankore_fr_CH.ts b/resources/i18n/sankore_fr_CH.ts index b0288bae..52640124 100644 --- a/resources/i18n/sankore_fr_CH.ts +++ b/resources/i18n/sankore_fr_CH.ts @@ -7,6 +7,10 @@ Click to Return to Application Cliquer pour activer Sankoré + + background: url(:/images/bigUniboard.png); border: none; + + DownloadDialog @@ -45,12 +49,16 @@ Open Ouvrir + + Ico + + IntranetPodcastPublishingDialog Publish Podcast to YouTube - Publier le Podcast sur YouTube + Publier le Podcast sur YouTube Title @@ -129,7 +137,7 @@ Start Screen Recording - Démarrer l'enregistrement de l'écran + Démarrer l'enregistrement de l'écran Marker @@ -189,7 +197,7 @@ Trap Flash Content - Capturer Flash + Capturer Flash Web Trap @@ -249,11 +257,11 @@ Web Browsing - Parcourir le Web + Parcourir le Web Small Line - Ligne fine + Ligne fine Medium Line @@ -261,11 +269,11 @@ Large Line - Ligne large + Ligne large Smalle Eraser - Gomme fine + Gomme fine Medium Eraser @@ -389,7 +397,7 @@ Sankore 3.1 - Sankoré 3.1 + Sankoré 3.1 Show Desktop @@ -397,7 +405,7 @@ Ctrl+Shift+H - Ctrl+Shift+H + Ctrl+Shift+H Rename Content @@ -457,7 +465,7 @@ Clear All Elements - Effacer tous les éléments + Effacer tous les éléments Annotate Document @@ -465,7 +473,7 @@ Ctrl+I - Ctrl+I + Ctrl+I Erase Annotation @@ -473,11 +481,11 @@ Ctrl+E - Ctrl+E + Ctrl+E Highlight - Mettre en surbrillance + Mettre en surbrillance Ctrl+M @@ -561,7 +569,7 @@ Pause Podcast Recording - Mettre en pause l'enregistrement + Mettre en pause l'enregistrement Podcast Config @@ -581,7 +589,7 @@ Show Sankore Widgets Editor - Afficher l'éditeur d'Apps Sankoré + Afficher l'éditeur d'Apps Sankoré Hide Sankoré @@ -818,6 +826,14 @@ Password: Mot de passe: + + DUMMY ICON + + + + INTRO TEXT DUMMY + + ProxyDialog @@ -841,6 +857,10 @@ Save username and password for future use Sauver nom utilisateur & mot de passe + + ICON + + QObject @@ -855,13 +875,6 @@ Accueil - - QuaZipFile - - ZIP/UNZIP API error %1 - - - UBAbstractPublisher @@ -1097,16 +1110,9 @@ Page %1 Page %1 - - Are you sure you want to remove %n page(s) from the selected document '%1'? - - - - - 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? - + Ce document '%1' a été créé avec une version plus récente de Sankoré (%2). En l'ouvrant, vous risquez de perdre certains éléments. Désirez-vous continuer? @@ -1167,19 +1173,19 @@ Credentials has to not been filled out yet. - + Les informations n'ont pas encore été remplies. Uploading Sankore File on Web. - + Fichier Sankoré en cours d'import sur le Web. Document uploaded correctly on the web. - + Document correctment importé sur le Web. Failed to upload document on the web. - + L'import Web du document a échoué. @@ -1192,19 +1198,12 @@ Copying page %1/%2 Copie de la page %1/%2 en cours - - %1 pages copied - - - - - UBDropMeWidget Drop here - Déposer ici + Déposer ici @@ -1231,7 +1230,7 @@ Export to Sankore Format - + Export au format Sankoré @@ -1351,19 +1350,19 @@ Importing file %1... - Importation du fichier %1... + Importation du fichier %1... Import of file %1 failed. - + L'import du fichier %1 a échoué. Import successful. - Importation terminée. + Importation terminée. Import failed. - + L'import a échoué. @@ -1378,11 +1377,11 @@ Sankore 3.1 (*.ubz) - Sankore 3.1 (*.ubz) + Sankore 3.1 (*.ubz) Import of file %1 failed. - + L'import du fichier %1 a échoué. @@ -1457,7 +1456,7 @@ Back to folder - Retour au répertoire + Retour au répertoire Remove from favorites @@ -1495,7 +1494,7 @@ UBLibraryController Added 1 Image to Library - 1 images ajoutées à la bibiliothèque + 1 image ajoutées à la bibiliothèque Audios @@ -1505,7 +1504,7 @@ Movies Movies category element - Vidéos + Vidéos Pictures @@ -1529,11 +1528,11 @@ Creating image thumbnail for %1. - Création de la vignette pour %1. + Création de la vignette pour %1. Adding to page failed for item %1. - Impossible d'ajouter %1 à la page courrante. + Impossible d'ajouter %1 à la page courrante. Interactivities @@ -1547,7 +1546,7 @@ Animations Animations category element - + Animations @@ -1600,7 +1599,7 @@ Voulez-vous ignorer les erreurs pour ce serveur? Sankore has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well. - + Sankoré a perdu l'accès au dossier de document '%1'. Malheurheusement l'application doit être fermée pour éviter tout risque de corruption de vos fichiers. Les dernières modifications effectuées risquent d'être perdues. @@ -1663,7 +1662,7 @@ Voulez-vous ignorer les erreurs pour ce serveur? Sankore Cast - + @@ -1681,34 +1680,34 @@ Voulez-vous ignorer les erreurs pour ce serveur? UBProxyLoginDlg Proxy Login - + Username: - Nom d'utilisateur: + Nom d'utilisateur: Password: - Mot de passe: + Mot de passe: UBPublicationDlg Publish document on the web - + Publier le document sur le web Title: - + Titre: Description: - + Description: Publish - Publier + Publier @@ -1719,7 +1718,7 @@ Voulez-vous ignorer les erreurs pour ce serveur? Trash - Corbeille + Corbeille Images @@ -1761,7 +1760,7 @@ Voulez-vous ignorer les erreurs pour ce serveur? Triangle - + Equerre @@ -1817,7 +1816,11 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Updating file - + Mise à jour du fichier + + + Please wait the import process will start soon... + Merci de patienter, le processus d'import va commencer... @@ -1838,7 +1841,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. UBWebPublisher Publish Document on Sankore Web - + Publier le document sur Planète Sankoré @@ -2095,7 +2098,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Clear Recent Searches - Supprimer l'historique de recherches + Supprimer l'historique de recherches @@ -2106,7 +2109,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Add to Current Document - Ajouter au document courant + Ajouter au document courant PDF @@ -2118,7 +2121,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Download PDF Document: would you prefer to download the PDF file or add it to the current Sankore document? - + Téléchargement du PDF: préférez-vous téléchargemer le fichier PDF ou l'ajouter à votre document Sankoré actuellement ouvert ? @@ -2148,7 +2151,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Uniboard - Sankoré + Sankoré Category @@ -2253,11 +2256,11 @@ p, li { white-space: pre-wrap; } Attach Downloadable PDF Version - Attacher la version PDF + Attacher la version PDF Attach Downloadable Uniboard File (UBZ) - Attacher le fichier Sankoré (UBZ) + Attacher le fichier Sankoré (UBZ) Warning: This documents contains video, which will not be displayed properly on the Web @@ -2270,6 +2273,10 @@ p, li { white-space: pre-wrap; } Uniboard Documents Documents Uniboard + + 1 + + preferencesDialog @@ -2291,7 +2298,7 @@ p, li { white-space: pre-wrap; } Show Page with External Browser - Ouvrir la page dans un navigateur Web externe + Ouvrir la page dans un navigateur Web externe Virtual Keyboard @@ -2299,15 +2306,15 @@ p, li { white-space: pre-wrap; } Keyboard button size: - Taille des touches du clavier virtuel: + Taille des touches du clavier virtuel: Positioned at the Top (recommended for tablets) - Positionné en haut (recommandé pour les tablettes) + Positionné en haut (recommandé pour les tablettes) Positioned at the Bottom (recommended for white boards) - Positionné en bas (recommandé pour les tableaux blancs) + Positionné en bas (recommandé pour les tableaux blancs) Display Text Under Button @@ -2351,7 +2358,7 @@ p, li { white-space: pre-wrap; } Stylus Palette - Barre d'outil du stylet + Barre d'outil du stylet Horizontal @@ -2375,7 +2382,7 @@ p, li { white-space: pre-wrap; } Licences - Licences + Licences OpenSSl @@ -2632,15 +2639,15 @@ p, li { white-space: pre-wrap; } Network - + Réseau Community - + Communauté User/Pass: - + Nom d'utilisateur/Mot de passe: diff --git a/resources/i18n/sankore_it.qm b/resources/i18n/sankore_it.qm index 6ed517a9..414a1c81 100644 Binary files a/resources/i18n/sankore_it.qm and b/resources/i18n/sankore_it.qm differ diff --git a/resources/i18n/sankore_iw.qm b/resources/i18n/sankore_iw.qm new file mode 100644 index 00000000..be651eed --- /dev/null +++ b/resources/i18n/sankore_iw.qm @@ -0,0 +1 @@ +<¸dÊÍ!¿`¡½Ý \ No newline at end of file diff --git a/resources/i18n/sankore_ja.qm b/resources/i18n/sankore_ja.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_ja.qm and b/resources/i18n/sankore_ja.qm differ diff --git a/resources/i18n/sankore_ko.qm b/resources/i18n/sankore_ko.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_ko.qm and b/resources/i18n/sankore_ko.qm differ diff --git a/resources/i18n/sankore_nb.qm b/resources/i18n/sankore_nb.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_nb.qm and b/resources/i18n/sankore_nb.qm differ diff --git a/resources/i18n/sankore_nl.qm b/resources/i18n/sankore_nl.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_nl.qm and b/resources/i18n/sankore_nl.qm differ diff --git a/resources/i18n/sankore_pl.qm b/resources/i18n/sankore_pl.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_pl.qm and b/resources/i18n/sankore_pl.qm differ diff --git a/resources/i18n/sankore_rm.qm b/resources/i18n/sankore_rm.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_rm.qm and b/resources/i18n/sankore_rm.qm differ diff --git a/resources/i18n/sankore_ro.qm b/resources/i18n/sankore_ro.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_ro.qm and b/resources/i18n/sankore_ro.qm differ diff --git a/resources/i18n/sankore_ru.qm b/resources/i18n/sankore_ru.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_ru.qm and b/resources/i18n/sankore_ru.qm differ diff --git a/resources/i18n/sankore_sv.qm b/resources/i18n/sankore_sv.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_sv.qm and b/resources/i18n/sankore_sv.qm differ diff --git a/resources/i18n/sankore_zh.qm b/resources/i18n/sankore_zh.qm index 6bd22c41..be651eed 100644 Binary files a/resources/i18n/sankore_zh.qm and b/resources/i18n/sankore_zh.qm differ diff --git a/resources/images/libpalette/FlashCategory.svg b/resources/images/libpalette/FlashCategory.svg new file mode 100644 index 00000000..502fc7b2 --- /dev/null +++ b/resources/images/libpalette/FlashCategory.svg @@ -0,0 +1,106 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/libpalette/FlashIcon.svg b/resources/images/libpalette/FlashIcon.svg new file mode 100644 index 00000000..4a075206 --- /dev/null +++ b/resources/images/libpalette/FlashIcon.svg @@ -0,0 +1,89 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/library_close.png b/resources/images/library_close.png new file mode 100644 index 00000000..0e744056 Binary files /dev/null and b/resources/images/library_close.png differ diff --git a/resources/images/library_open.png b/resources/images/library_open.png new file mode 100644 index 00000000..7529ab02 Binary files /dev/null and b/resources/images/library_open.png differ diff --git a/resources/images/pages_close.png b/resources/images/pages_close.png new file mode 100644 index 00000000..482fe036 Binary files /dev/null and b/resources/images/pages_close.png differ diff --git a/resources/images/pages_open.png b/resources/images/pages_open.png new file mode 100644 index 00000000..9fef5b4a Binary files /dev/null and b/resources/images/pages_open.png differ diff --git a/resources/images/toolbar/stylusTab.png b/resources/images/toolbar/stylusTab.png index a0a78e38..5e2764fe 100644 Binary files a/resources/images/toolbar/stylusTab.png and b/resources/images/toolbar/stylusTab.png differ diff --git a/resources/library/interactive/Graphme.wgt/Grapheur.xhtml b/resources/library/interactive/Graphme.wgt/Grapheur.xhtml index 44f3b420..cfd5dd33 100644 --- a/resources/library/interactive/Graphme.wgt/Grapheur.xhtml +++ b/resources/library/interactive/Graphme.wgt/Grapheur.xhtml @@ -23,18 +23,7 @@ - @@ -43,6 +42,9 @@ if(window.sankore){ url = window.sankore.preference("url", ""); + if(sankore.preference("browserHistory", "")) + references = sankore.preference("browserHistory", "").split(","); + currentHistory = parseInt(sankore.preference("browserIndex", "0")); }else{ url = ""; }; @@ -141,6 +143,8 @@ if(window.sankore){ window.sankore.setPreference("url", $("#textbox").val()); + window.sankore.setPreference("browserHistory", references.toString()); + window.sankore.setPreference("browserIndex", currentHistory); }; $("#embeded-content").hide(); @@ -152,6 +156,9 @@ clearTimeout(resizer); resizerIndex = 0; + $("#web-content") + .attr("width", globalWidth - 25) + .attr("height", globalHeight - 90); $("#web-content").show(); return false; }; diff --git a/resources/library/interactive/Geogebra.wgt/bin/geogebra.jar b/resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra.jar similarity index 100% rename from resources/library/interactive/Geogebra.wgt/bin/geogebra.jar rename to resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra.jar diff --git a/resources/library/interactive/Geogebra.wgt/bin/geogebra_cas.jar b/resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra_cas.jar similarity index 100% rename from resources/library/interactive/Geogebra.wgt/bin/geogebra_cas.jar rename to resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra_cas.jar diff --git a/resources/library/interactive/Geogebra.wgt/bin/geogebra_export.jar b/resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra_export.jar similarity index 100% rename from resources/library/interactive/Geogebra.wgt/bin/geogebra_export.jar rename to resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra_export.jar diff --git a/resources/library/interactive/Geogebra.wgt/bin/geogebra_gui.jar b/resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra_gui.jar similarity index 100% rename from resources/library/interactive/Geogebra.wgt/bin/geogebra_gui.jar rename to resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra_gui.jar diff --git a/resources/library/interactive/Geogebra.wgt/bin/geogebra_main.jar b/resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra_main.jar similarity index 100% rename from resources/library/interactive/Geogebra.wgt/bin/geogebra_main.jar rename to resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra_main.jar diff --git a/resources/library/interactive/Geogebra.wgt/bin/geogebra_properties.jar b/resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra_properties.jar similarity index 100% rename from resources/library/interactive/Geogebra.wgt/bin/geogebra_properties.jar rename to resources/library/nonDistributedInteractivities/Geogebra.wgt/bin/geogebra_properties.jar diff --git a/resources/library/interactive/Geogebra.wgt/config.xml b/resources/library/nonDistributedInteractivities/Geogebra.wgt/config.xml similarity index 100% rename from resources/library/interactive/Geogebra.wgt/config.xml rename to resources/library/nonDistributedInteractivities/Geogebra.wgt/config.xml diff --git a/resources/library/interactive/Geogebra.wgt/icon.png b/resources/library/nonDistributedInteractivities/Geogebra.wgt/icon.png similarity index 100% rename from resources/library/interactive/Geogebra.wgt/icon.png rename to resources/library/nonDistributedInteractivities/Geogebra.wgt/icon.png diff --git a/resources/library/interactive/Geogebra.wgt/images/loading.gif b/resources/library/nonDistributedInteractivities/Geogebra.wgt/images/loading.gif similarity index 100% rename from resources/library/interactive/Geogebra.wgt/images/loading.gif rename to resources/library/nonDistributedInteractivities/Geogebra.wgt/images/loading.gif diff --git a/resources/library/interactive/Geogebra.wgt/index.html b/resources/library/nonDistributedInteractivities/Geogebra.wgt/index.html similarity index 100% rename from resources/library/interactive/Geogebra.wgt/index.html rename to resources/library/nonDistributedInteractivities/Geogebra.wgt/index.html diff --git a/resources/sankore.qrc b/resources/sankore.qrc index 6c721712..af062959 100644 --- a/resources/sankore.qrc +++ b/resources/sankore.qrc @@ -176,7 +176,7 @@ images/cursors/rotate.png images/cursors/resize.png images/cursors/drawCompass.png - images/cursors/drawRulerLine.png + images/cursors/drawRulerLine.png images/print/onepage.png images/print/thumbnails.png images/print/twopages.png @@ -203,7 +203,6 @@ images/toolbar/tutorial.png images/edit-mode.svg images/save.svg - images/toolbar/stylusTab.png images/libpalette/social.png images/navig_arrow.png images/flags/ar.png @@ -289,8 +288,6 @@ images/toolbar/hide.png images/toolbar/record.png images/libpalette/MoviesCategory.svg - - images/virtual.keyboard/41/centre-passive.png images/virtual.keyboard/41/left-passive.png images/virtual.keyboard/41/right-passive.png @@ -300,7 +297,6 @@ images/virtual.keyboard/41/backspace.png images/virtual.keyboard/41/capslock.png images/virtual.keyboard/41/tab.png - images/virtual.keyboard/29/centre-passive.png images/virtual.keyboard/29/left-passive.png images/virtual.keyboard/29/right-passive.png @@ -310,6 +306,12 @@ images/virtual.keyboard/29/backspace.png images/virtual.keyboard/29/capslock.png images/virtual.keyboard/29/tab.png - + images/libpalette/FlashCategory.svg + images/libpalette/FlashIcon.svg + images/toolbar/stylusTab.png + images/library_close.png + images/library_open.png + images/pages_close.png + images/pages_open.png diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 2e9c417f..692cba14 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -654,7 +654,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() scene->registerTool(protractor); } } - else if (mXmlReader.name() == "protractor") + else if (mXmlReader.name() == "triangle") { UBGraphicsTriangle *triangle = triangleFromSvg(); @@ -892,6 +892,7 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene() { QGraphicsItem *item = items.takeFirst(); + UBGraphicsPolygonItem *polygonItem = qgraphicsitem_cast (item); if (polygonItem && polygonItem->isVisible()) @@ -1060,6 +1061,14 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene() protractorToSvg(protractor); continue; } + + UBGraphicsTriangle *triangle = qgraphicsitem_cast (item); + + if (triangle && triangle->isVisible()) + { + triangleToSvg(triangle); + continue; + } } if (openStroke) @@ -1887,7 +1896,9 @@ void UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsItemFromSvg(QGraphicsItem* g { if (!svgX.isNull() && !svgY.isNull()) { - gItem->setPos(svgX.toString().toFloat(), svgY.toString().toFloat()); + #ifndef Q_WS_X11 + gItem->setPos(svgX.toString().toFloat(), svgY.toString().toFloat()); + #endif } } @@ -2522,7 +2533,6 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::protractorToSvg(UBGraphicsProtractor */ - mXmlWriter.writeStartElement(UBSettings::uniboardDocumentNamespaceUri, "protractor"); mXmlWriter.writeAttribute("x", QString("%1").arg(item->rect().x())); @@ -2589,6 +2599,39 @@ UBGraphicsProtractor* UBSvgSubsetAdaptor::UBSvgSubsetReader::protractorFromSvg() return protractor; } +void UBSvgSubsetAdaptor::UBSvgSubsetWriter::triangleToSvg(UBGraphicsTriangle *item) +{ + + /** + * + * sample + * + + + */ + + mXmlWriter.writeStartElement(UBSettings::uniboardDocumentNamespaceUri, "triangle"); + mXmlWriter.writeAttribute("x", QString("%1").arg(item->boundingRect().x())); + mXmlWriter.writeAttribute("y", QString("%1").arg(item->boundingRect().y())); + mXmlWriter.writeAttribute("width", QString("%1").arg(item->boundingRect().width())); + mXmlWriter.writeAttribute("height", QString("%1").arg(item->boundingRect().height())); + mXmlWriter.writeAttribute("transform", toSvgTransform(item->sceneMatrix())); + mXmlWriter.writeAttribute("orientation", UBGraphicsTriangle::orientationToStr(item->getOrientation())); + + QString zs; + zs.setNum(item->zValue(), 'f'); // 'f' keeps precision + mXmlWriter.writeAttribute(UBSettings::uniboardDocumentNamespaceUri, "z-value", zs); + + UBItem* ubItem = dynamic_cast(item); + + if (ubItem) + { + mXmlWriter.writeAttribute(UBSettings::uniboardDocumentNamespaceUri, "uuid", UBStringUtils::toCanonicalUuid(ubItem->uuid())); + } + + mXmlWriter.writeEndElement(); +} + UBGraphicsTriangle* UBSvgSubsetAdaptor::UBSvgSubsetReader::triangleFromSvg() { UBGraphicsTriangle* triangle = new UBGraphicsTriangle(); @@ -2602,16 +2645,18 @@ UBGraphicsTriangle* UBSvgSubsetAdaptor::UBSvgSubsetReader::triangleFromSvg() QStringRef svgY = mXmlReader.attributes().value("y"); QStringRef svgWidth = mXmlReader.attributes().value("width"); QStringRef svgHeight = mXmlReader.attributes().value("height"); + QStringRef orientationStringRef = mXmlReader.attributes().value("orientation"); UBGraphicsTriangle::UBGraphicsTriangleOrientation orientation = UBGraphicsTriangle::orientationFromStr(orientationStringRef); + triangle->setOrientation(orientation); - if (!svgX.isNull() && !svgY.isNull() && !svgWidth.isNull() && !svgHeight.isNull()) + if (!svgX.isNull() && !svgY.isNull() && !svgWidth.isNull() && !svgHeight.isNull()) { triangle->setRect(svgX.toString().toFloat(), svgY.toString().toFloat(), svgWidth.toString().toFloat(), svgHeight.toString().toFloat(), orientation); } - triangle->setVisible(true); + triangle->setVisible(true); return triangle; } diff --git a/src/adaptors/UBSvgSubsetAdaptor.h b/src/adaptors/UBSvgSubsetAdaptor.h index aa60eae1..8a3412be 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.h +++ b/src/adaptors/UBSvgSubsetAdaptor.h @@ -210,6 +210,7 @@ class UBSvgSubsetAdaptor void rulerToSvg(UBGraphicsRuler *item); void compassToSvg(UBGraphicsCompass *item); void protractorToSvg(UBGraphicsProtractor *item); + void triangleToSvg(UBGraphicsTriangle *item); void writeSvgElement(); private: diff --git a/src/adaptors/publishing/UBDocumentPublisher.h b/src/adaptors/publishing/UBDocumentPublisher.h index bacac586..7c2ebacf 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.h +++ b/src/adaptors/publishing/UBDocumentPublisher.h @@ -21,7 +21,7 @@ #include "ui_webPublishing.h" #include "UBAbstractPublisher.h" -#define DOCPUBLICATION_URL "http://planetsankore-staging.devxwiki.com/xwiki/bin/view/CreateResources/UniboardUpload?xpage=plain&outputSyntax=plain" +#define DOCPUBLICATION_URL "http://planete.sankore.org/xwiki/bin/view/CreateResources/UniboardUpload?xpage=plain&outputSyntax=plain" #define XWIKI_ORIGIN_HEADER "http://sankore.devxwiki.com" typedef struct diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp old mode 100644 new mode 100755 index 1e00c4e1..5392cc28 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -60,11 +60,11 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardController* pBoardController) : QObject(container) + , mKeyboardPalette(0) , mContainer(container) , mBoardControler(pBoardController) , mStylusPalette(0) , mZoomPalette(0) - , mKeyboardPalette(0) , mNavigPalette(NULL) , mLibPalette(NULL) , mBackgroundsPalette(0) @@ -132,7 +132,9 @@ void UBBoardPaletteManager::setupPalettes() if (UBPlatformUtils::hasVirtualKeyboard()) { mKeyboardPalette = UBKeyboardPalette::create(0); +#ifndef Q_WS_MAC mKeyboardPalette->setParent(mContainer); +#endif } mZoomPalette = new UBZoomPalette(mContainer); diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index df0fba1e..4aed8c49 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -245,7 +245,7 @@ QList UBLibraryController::rootCategoriesList() element->setMoveable(false); categories << element; - categoryImage = new QImage(":images/libpalette/InteractivesCategory.svg"); + categoryImage = new QImage(":images/libpalette/FlashCategory.svg"); element = new UBLibElement(eUBLibElementType_Folder, mAnimationUserDirectoryPath, tr("Animations", "Animations category element")); element->setThumbnail(categoryImage); element->setMoveable(false); diff --git a/src/core/UBApplication.h b/src/core/UBApplication.h index bd1d994a..29371970 100644 --- a/src/core/UBApplication.h +++ b/src/core/UBApplication.h @@ -34,7 +34,6 @@ class UBControlView; class UBPreferencesController; class UBResources; class UBSettings; -class UBLicense; class UBPersistenceManager; class UBApplicationController; class UBDocumentController; diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index c08ec695..2e978523 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -519,15 +519,10 @@ void UBApplicationController::ftpCommandFinished(int id, bool error) mFtp->close(); } else{ - // 3 stand for the third command we have sent - // in our case - // 1->connect - // 2->login - // 3->get - if (id == 3){ - QString updateString = QString(mFtp->readAll()); + QString responseString = QString(mFtp->readAll()); + if (!responseString.isEmpty() && responseString.contains("version:") && responseString.contains("url:")){ mFtp->close(); - downloadJsonFinished(updateString); + downloadJsonFinished(responseString); } } } diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index 1bd1b45c..5d6b3b34 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -51,6 +51,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) , mTransparentDrawingView(0) , mTransparentDrawingScene(0) , mDesktopPalette(NULL) + , mKeyboardPalette(0) , mDesktopToolsPalette(NULL) , mDesktopPenPalette(NULL) , mDesktopMarkerPalette(NULL) @@ -65,7 +66,6 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) , mbArrowClicked(false) , mBoardStylusTool(UBStylusTool::Pen) , mDesktopStylusTool(UBStylusTool::Selector) - , mKeyboardPalette(0) { mTransparentDrawingView = new UBBoardView(UBApplication::boardController, 0); // deleted in UBDesktopAnnotationController::destructor @@ -73,7 +73,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) mTransparentDrawingView->setAttribute(Qt::WA_TranslucentBackground, true); // !!!! Should be included into Windows after QT recompilation #ifdef Q_WS_MAC - //mTransparentDrawingView->setAttribute(Qt::WA_MacNoShadow, true); + mTransparentDrawingView->setAttribute(Qt::WA_MacNoShadow, true); #endif mTransparentDrawingView->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::Window); mTransparentDrawingView->setCacheMode(QGraphicsView::CacheNone); @@ -104,7 +104,9 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) mKeyboardPalette->setParent(mTransparentDrawingView); #endif connect(mKeyboardPalette, SIGNAL(keyboardActivated(bool)), mTransparentDrawingView, SLOT(virtualKeyboardActivated(bool))); +#ifdef Q_WS_X11 connect(mKeyboardPalette, SIGNAL(moved(QPoint)), this, SLOT(refreshMask())); +#endif } connect(mDesktopPalette, SIGNAL(uniboardClick()), this, SLOT(goToUniboard())); @@ -115,8 +117,6 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) connect(mDesktopPalette, SIGNAL(minimizeStart(eMinimizedLocation)), this, SLOT(onDesktopPaletteMinimize())); connect(UBApplication::mainWindow->actionVirtualKeyboard, SIGNAL(triggered(bool)), this, SLOT(showKeyboard(bool))); -// connect(mDesktopPalette, SIGNAL(showVirtualKeyboard(bool)), this, SLOT()); - connect(mTransparentDrawingView, SIGNAL(resized(QResizeEvent*)), this, SLOT(onTransparentWidgetResized())); @@ -158,9 +158,10 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) connect(&mHoldTimerMarker, SIGNAL(timeout()), this, SLOT(markerActionReleased())); connect(&mHoldTimerEraser, SIGNAL(timeout()), this, SLOT(eraserActionReleased())); +#ifdef Q_WS_X11 connect(mDesktopPalette, SIGNAL(moving()), this, SLOT(refreshMask())); connect(mLibPalette, SIGNAL(resized()), this, SLOT(refreshMask())); - +#endif onDesktopPaletteMaximized(); } @@ -176,8 +177,11 @@ void UBDesktopAnnotationController::showKeyboard(bool show) if(show) UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector); mKeyboardPalette->setVisible(show); - updateMask(true); - // mDesktopPalette->showVirtualKeyboard(show); + + #ifdef Q_WS_X11 + updateMask(true); + #endif + } } @@ -349,7 +353,6 @@ void UBDesktopAnnotationController::showWindow() { QRect desktopRect = QApplication::desktop()->screenGeometry(mDesktopPalette->pos()); - //mDesktopPalette->move((desktopRect.right() - (mDesktopPalette->width() + 20)), desktopRect.top() + 150); mDesktopPalette->move(5, desktopRect.top() + 150); mWindowPositionInitialized = true; @@ -385,7 +388,7 @@ void UBDesktopAnnotationController::stylusToolChanged(int tool) if(eTool != UBStylusTool::Selector && eTool != UBStylusTool::Text) { if(mKeyboardPalette->m_isVisible) - UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction::Trigger); + UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction::Trigger); } updateBackground(); @@ -439,8 +442,6 @@ void UBDesktopAnnotationController::goToUniboard() UBPlatformUtils::setDesktopMode(false); -// UBApplication::mainWindow->actionVirtualKeyboard->setEnabled(true); - emit restoreUniboard(); } @@ -799,8 +800,6 @@ void UBDesktopAnnotationController::onDesktopPaletteMinimize() */ void UBDesktopAnnotationController::onTransparentWidgetResized() { -// qDebug() << "mTransparentDrawingView (" << mTransparentDrawingView->width() << "," << mTransparentDrawingView->height() << ")"; -// qDebug() << "mLibPalette (" << mLibPalette->width() << "," << mLibPalette->height() << ")"; mLibPalette->resize(mLibPalette->width(), mTransparentDrawingView->height()); } diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index 5b265ebd..fedbebe1 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -70,7 +70,7 @@ UBDocumentController::UBDocumentController(UBMainWindow* mainWindow) , mToolsPalette(0) , mToolsPalettePositionned(false) , mTrashTi(0) - , mKeyboardPalette(0) + , mKeyboardPalette(0) { setupViews(); setupToolbar(); diff --git a/src/domain/UBW3CWidget.cpp b/src/domain/UBW3CWidget.cpp index 79c3536c..e4ca197c 100644 --- a/src/domain/UBW3CWidget.cpp +++ b/src/domain/UBW3CWidget.cpp @@ -40,7 +40,6 @@ UBW3CWidget::UBW3CWidget(const QUrl& pWidgetUrl, QWidget *parent) { QString path = pWidgetUrl.toLocalFile(); - QDir potentialDir(path); if (!path.endsWith(".wgt") && !path.endsWith(".wgt/") && !potentialDir.exists()) @@ -58,7 +57,7 @@ UBW3CWidget::UBW3CWidget(const QUrl& pWidgetUrl, QWidget *parent) int width = 300; int height = 150; - QFile configFile(path + "/config.xml"); + QFile configFile(path + "config.xml"); configFile.open(QFile::ReadOnly); QDomDocument doc; @@ -202,6 +201,8 @@ UBW3CWidget::UBW3CWidget(const QUrl& pWidgetUrl, QWidget *parent) connect(page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared())); connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(javaScriptWindowObjectCleared())); + QWebView::load(mMainHtmlUrl); + setFixedSize(QSize(width, height)); mNominalSize = QSize(width, height); diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp index 49fbddd6..1b37e1de 100644 --- a/src/gui/UBDockPalette.cpp +++ b/src/gui/UBDockPalette.cpp @@ -330,7 +330,14 @@ void UBDockPalette::paintEvent(QPaintEvent *event) path.addRect(0.0, 0.0, width()-2*border(), height()); path.addRoundedRect(width()-4*border(), mHTab, 4*border(), TABSIZE, radius(), radius()); painter.drawPath(path); - painter.drawPixmap(width() - border() + 1, mHTab + 1 , border() - 4, TABSIZE - 2, mIcon); + if(mCollapseWidth >= width()) + { + painter.drawPixmap(width() - 2*border() + 1, mHTab + 1 , 2*border() - 4, TABSIZE - 2, mCollapsedIcon); + } + else + { + painter.drawPixmap(width() - 2*border() + 1, mHTab + 1 , 2*border() - 4, TABSIZE - 2, mIcon); + } } else if(mOrientation == eUBDockOrientation_Right) { @@ -339,7 +346,14 @@ void UBDockPalette::paintEvent(QPaintEvent *event) path.addRect(2*border(), 0.0, width()-2*border(), height()); path.addRoundedRect(0.0, mHTab, 4*border(), TABSIZE, radius(), radius()); painter.drawPath(path); - painter.drawPixmap(2, mHTab + 1, border() - 3, TABSIZE - 2, mIcon); + if(width() <= mCollapseWidth) + { + painter.drawPixmap(2, mHTab + 1, 2*border() - 3, TABSIZE - 2, mCollapsedIcon); + } + else + { + painter.drawPixmap(2, mHTab + 1, 2*border() - 3, TABSIZE - 2, mIcon); + } } else { diff --git a/src/gui/UBDockPalette.h b/src/gui/UBDockPalette.h index 17440662..02fd32c2 100644 --- a/src/gui/UBDockPalette.h +++ b/src/gui/UBDockPalette.h @@ -95,6 +95,7 @@ protected: QPoint mMousePressPos; /** The palette icon */ QPixmap mIcon; + QPixmap mCollapsedIcon; /** The tab orientation */ eUBDockTabOrientation mTabsOrientation; /** The h position of the tab */ diff --git a/src/gui/UBFloatingPalette.cpp b/src/gui/UBFloatingPalette.cpp index 6be7d5bc..6be397c7 100644 --- a/src/gui/UBFloatingPalette.cpp +++ b/src/gui/UBFloatingPalette.cpp @@ -33,8 +33,9 @@ UBFloatingPalette::UBFloatingPalette(Qt::Corner position, QWidget *parent) setAttribute(Qt::WA_MacAlwaysShowToolWindow); #endif #ifdef Q_WS_MAC - //setAttribute(Qt::WA_MacNonActivatingToolWindow); - //setAttribute(Qt::WA_MacNoShadow); + setAttribute(Qt::WA_MacAlwaysShowToolWindow); + setAttribute(Qt::WA_MacNonActivatingToolWindow); + setAttribute(Qt::WA_MacNoShadow); #endif } diff --git a/src/gui/UBLibPalette.cpp b/src/gui/UBLibPalette.cpp index fb5c9a1f..da9bb420 100644 --- a/src/gui/UBLibPalette.cpp +++ b/src/gui/UBLibPalette.cpp @@ -31,7 +31,9 @@ UBLibPalette::UBLibPalette(QWidget *parent, const char *name):UBDockPalette(pare , mDropWidget(NULL) { setOrientation(eUBDockOrientation_Right); - mIcon = QPixmap(":images/paletteLibrary.png"); + //mIcon = QPixmap(":images/paletteLibrary.png"); + mCollapsedIcon = QPixmap(":images/library_open.png"); + mIcon = QPixmap(":images/library_close.png"); setAcceptDrops(true); resize(UBSettings::settings()->libPaletteWidth->get().toInt(), parentWidget()->height()); diff --git a/src/gui/UBMainWindow.cpp b/src/gui/UBMainWindow.cpp index bdf25ba4..284698cc 100644 --- a/src/gui/UBMainWindow.cpp +++ b/src/gui/UBMainWindow.cpp @@ -28,7 +28,6 @@ UBMainWindow::UBMainWindow(QWidget *parent, Qt::WindowFlags flags) , mBoardWidget(0) , mWebWidget(0) , mDocumentsWidget(0) - , mSankoreWebDocumentWidget(0) { Ui::MainWindow::setupUi(this); diff --git a/src/gui/UBMainWindow.h b/src/gui/UBMainWindow.h index 12d7e457..87e9510c 100644 --- a/src/gui/UBMainWindow.h +++ b/src/gui/UBMainWindow.h @@ -60,8 +60,6 @@ class UBMainWindow : public QMainWindow, public Ui::MainWindow QWidget *mBoardWidget; QWidget *mWebWidget; QWidget *mDocumentsWidget; - QWebView* mSankoreWebDocumentWidget; - }; #endif /* UBMAINWINDOW_H_ */ diff --git a/src/gui/UBNavigatorPalette.cpp b/src/gui/UBNavigatorPalette.cpp index 8ac69e5e..3e035ae3 100644 --- a/src/gui/UBNavigatorPalette.cpp +++ b/src/gui/UBNavigatorPalette.cpp @@ -32,7 +32,9 @@ UBNavigatorPalette::UBNavigatorPalette(QWidget *parent, const char *name):UBDock { setOrientation(eUBDockOrientation_Left); setMaximumWidth(300); - mIcon = QPixmap(":images/paletteNavigator.png"); + //mIcon = QPixmap(":images/paletteNavigator.png"); + mCollapsedIcon = QPixmap(":images/pages_open.png"); + mIcon = QPixmap(":images/pages_close.png"); resize(UBSettings::settings()->navigPaletteWidth->get().toInt(), height()); mLastWidth = 300; diff --git a/src/gui/UBUpdateDlg.cpp b/src/gui/UBUpdateDlg.cpp index 31893fd7..2c2ba56b 100644 --- a/src/gui/UBUpdateDlg.cpp +++ b/src/gui/UBUpdateDlg.cpp @@ -168,6 +168,7 @@ void UBUpdateDlg::onBrowse() void UBUpdateDlg::onUpdate() { mProgressLabel = new QLabel(mProgressWidget); + mProgressLabel->setText(tr("Please wait the import process will start soon...")); mProgressLayout = new QHBoxLayout(); mProgressLayout->addWidget(mProgressLabel); mProgressWidget->setLayout(mProgressLayout); diff --git a/src/podcast/quicktime/UBAudioQueueRecorder.cpp b/src/podcast/quicktime/UBAudioQueueRecorder.cpp index 44dd6c0d..dda9057c 100644 --- a/src/podcast/quicktime/UBAudioQueueRecorder.cpp +++ b/src/podcast/quicktime/UBAudioQueueRecorder.cpp @@ -349,7 +349,10 @@ void UBAudioQueueRecorder::audioQueueInputCallback (void *inUserData, AudioQueue void UBAudioQueueRecorder::emitNewWaveBuffer(AudioQueueBufferRef pBuffer, int inNumberPacketDescriptions, const AudioStreamPacketDescription *inPacketDescs) { - emit newWaveBuffer(pBuffer->mAudioData, pBuffer->mAudioDataByteSize, inNumberPacketDescriptions, inPacketDescs); + AudioStreamPacketDescription* tmpPackages = (AudioStreamPacketDescription*)malloc(inNumberPacketDescriptions *sizeof(AudioStreamPacketDescription)); + memcpy(tmpPackages,inPacketDescs,inNumberPacketDescriptions * sizeof(AudioStreamPacketDescription)); + + emit newWaveBuffer(pBuffer->mAudioData, pBuffer->mAudioDataByteSize, inNumberPacketDescriptions, tmpPackages); qreal level = 0; UInt32 size; diff --git a/src/podcast/quicktime/UBQuickTimeFile.cpp b/src/podcast/quicktime/UBQuickTimeFile.cpp index e0519839..2947df66 100644 --- a/src/podcast/quicktime/UBQuickTimeFile.cpp +++ b/src/podcast/quicktime/UBQuickTimeFile.cpp @@ -629,6 +629,9 @@ void UBQuickTimeFile::appendAudioBuffer(void* pBuffer, long pLength, int inNumbe } } } +#ifdef Q_WS_MACX + free((void*)inPacketDescs); +#endif } diff --git a/src/tools/UBAbstractDrawRuler.cpp b/src/tools/UBAbstractDrawRuler.cpp index 4c39f789..3c8b8169 100644 --- a/src/tools/UBAbstractDrawRuler.cpp +++ b/src/tools/UBAbstractDrawRuler.cpp @@ -107,9 +107,15 @@ QFont UBAbstractDrawRuler::font() const } void UBAbstractDrawRuler::StartLine(const QPointF& position, qreal width) -{} +{ + Q_UNUSED(position); + Q_UNUSED(width); +} void UBAbstractDrawRuler::DrawLine(const QPointF& position, qreal width) -{} +{ + Q_UNUSED(position); + Q_UNUSED(width); +} void UBAbstractDrawRuler::EndLine() {} diff --git a/src/tools/UBGraphicsTriangle.cpp b/src/tools/UBGraphicsTriangle.cpp index ea60c4e0..f6459f97 100644 --- a/src/tools/UBGraphicsTriangle.cpp +++ b/src/tools/UBGraphicsTriangle.cpp @@ -29,12 +29,12 @@ const UBGraphicsTriangle::UBGraphicsTriangleOrientation UBGraphicsTriangle::sDef UBGraphicsTriangle::BottomLeft; UBGraphicsTriangle::UBGraphicsTriangle() - : QGraphicsPolygonItem() - , UBAbstractDrawRuler() + : UBAbstractDrawRuler() + , QGraphicsPolygonItem() + , angle(0) , mResizing1(false) , mResizing2(false) , mRotating(false) - , angle(0) { setRect(sDefaultRect, sDefaultOrientation); diff --git a/src/tools/UBGraphicsTriangle.h b/src/tools/UBGraphicsTriangle.h index dc61e05c..da12bd0c 100644 --- a/src/tools/UBGraphicsTriangle.h +++ b/src/tools/UBGraphicsTriangle.h @@ -66,12 +66,24 @@ class UBGraphicsTriangle : public UBAbstractDrawRuler, public QGraphicsPolygonIt if (str == "TopRight") return TopRight; return sDefaultOrientation; } + static QString orientationToStr(UBGraphicsTriangleOrientation orientation) + { + QString result; + if (orientation == 0) result = "BottomLeft"; + else if (orientation == 1) result = "BottomRight"; + else if (orientation == 2) result = "TopLeft"; + else if (orientation == 3) result = "TopRight"; + + return result; + } + void setRect(const QRectF &rect, UBGraphicsTriangleOrientation orientation) { setRect(rect.x(), rect.y(), rect.width(), rect.height(), orientation); } void setRect(qreal x, qreal y, qreal w, qreal h, UBGraphicsTriangleOrientation orientation); void setOrientation(UBGraphicsTriangleOrientation orientation); + UBGraphicsTriangleOrientation getOrientation() const {return mOrientation;} QRectF rect() const {return boundingRect();} UBGraphicsScene* scene() const; diff --git a/src/transition/UniboardSankoreTransition.cpp b/src/transition/UniboardSankoreTransition.cpp index 4f384045..5e6821c5 100644 --- a/src/transition/UniboardSankoreTransition.cpp +++ b/src/transition/UniboardSankoreTransition.cpp @@ -111,7 +111,7 @@ bool UniboardSankoreTransition::checkPage(QString& sankorePagePath) file.close(); QString sankoreDirectory = sankorePagePath.left(sankorePagePath.indexOf("/page")); - ; + sankoreDirectory = QUrl::fromLocalFile(sankoreDirectory).toString(); QString documentString(documentByteArray);