From 86c96ed00f36dcd167e9afcbc5f0c88b021b02d7 Mon Sep 17 00:00:00 2001 From: Gustavo Junior Alves Date: Mon, 9 May 2016 14:48:22 -0300 Subject: [PATCH 01/11] Brazilian portuguese translation --- resources/i18n/OpenBoard_pt_BR.ts | 2626 +++++++++++++++++++++++++++++ 1 file changed, 2626 insertions(+) create mode 100644 resources/i18n/OpenBoard_pt_BR.ts diff --git a/resources/i18n/OpenBoard_pt_BR.ts b/resources/i18n/OpenBoard_pt_BR.ts new file mode 100644 index 00000000..689613d3 --- /dev/null +++ b/resources/i18n/OpenBoard_pt_BR.ts @@ -0,0 +1,2626 @@ + + + + + BlackoutWidget + + Click to Return to Application + Clicar para voltar para a Aplicação + + + + DownloadDialog + + Downloads + Transferências + + + Clean Up + Limpar + + + 0 Items + 0 Itens + + + + DownloadItem + + Form + Formulário + + + Filename + Nome do arquivo + + + Try Again + Tentar novamente + + + Stop + Parar + + + Open + Abrir + + + + IntranetPodcastPublishingDialog + + Publish Podcast to YouTube + Publicar o Podcast no YouTube + + + Title + Título + + + Description + Descrição + + + Author + Autor + + + + MainWindow + + Board + Quadro + + + Web + Web + + + Documents + Documentos + + + Stylus + Paleta + + + Ctrl+T + Ctrl+T + + + Backgrounds + Fundo + + + Change Background + Mudar Fundo + + + Undo + Desfazer + + + Ctrl+Z + Ctrl+Z + + + Redo + Refazer + + + Ctrl+Y + Ctrl+Y + + + Previous + Anterior + + + Previous Page + Página anterior + + + PgUp + Subir na página + + + Next + Próximo + + + Next Page + Próxima Página + + + PgDown + Descer na página + + + Manage Documents + Gerir Documentos + + + Ctrl+D + Ctrl+D + + + Web Browsing + Navegar na Web + + + Ctrl+W + Ctrl+W + + + Line + Linha + + + Small Line + Traço Fino + + + Medium Line + Traço Médio + + + Large Line + Traço Grosso + + + Quit + Sair + + + Eraser + Borracha + + + Smalle Eraser + Borracha Pequena + + + Medium Eraser + Borracha Média + + + Large Eraser + Borracha Grande + + + Color + Cores + + + Back + Recuar + + + Left + Esquerda + + + Forward + Avançar + + + Right + Direita + + + Reload + Recarregar + + + Reload Current Page + Recarregar a página atual + + + Home + Página Inicial + + + Load Home Page + Carregar a Página Inicial + + + Bookmarks + Favoritos + + + Show Bookmarks + Mostrar os Favoritos + + + Bookmark + Favorito + + + Add Bookmark + Adicionar aos Favoritos + + + Display Board + Mostrar o Quadro + + + Ctrl+B + Ctrl+B + + + Erase + Apagar + + + Erase Content + Apagar Conteúdo + + + Preferences + Preferências + + + Display Preferences + Mostrar Preferências + + + Library + Biblioteca + + + Show Library + Mostrar Biblioteca + + + Ctrl+L + Ctrl+L + + + Show Desktop + "Mostrar Ambiente de Trabalho" (muito longo) - Mostrar a mesa + Ver desktop + + + Show Computer Desktop + Mostrar o ambiente de trabalho do Computador + + + Ctrl+Shift+H + Ctrl+Shift+H + + + Bigger + Ampliar + + + Zoom In + Aproximar + + + Ctrl++ + Ctrl++ + + + Smaller + Reduzir + + + Zoom Out + Afastar + + + Ctrl+- + Ctrl+- + + + New Folder + Nova Pasta + + + Create a New Folder + Criar uma Nova Pasta + + + New Document + Novo Documento + + + Create a New Document + Criar um Novo Documento + + + Import + Importar + + + Import a Document + Importar um Documento + + + Export + Exportar + + + Export a Document + Exportar um Documento + + + Open in Board + Abrir no Quadro + + + Open Page in Board + Abrir Página no Quadro + + + Ctrl+O + Ctrl+O + + + Duplicate + Duplicar + + + Duplicate Selected Content + Duplicar o Conteúdo Selecionado + + + Delete + Apagar + + + Delete Selected Content + Apagar o Conteúdo Selecionado + + + Del + Del + + + Add to Working Document + Adicionar ao Documento de Trabalho + + + Add Selected Content to Open Document + Adicionar o Conteúdo Selecionado ao Documento Aberto + + + Add + Adicionar + + + Add Content to Document + Adicionar Conteúdo ao Documento + + + Rename + Mudar o Nome + + + Rename Content + Mudar o Nome do Conteúdo + + + Tools + Ferramentas + + + Display Tools + Mostrar Ferramentas + + + Multi Screen + Múltiplos Monitores + + + Wide Size (16/9) + Formato Panorâmico (16/9) + + + Use Document Wide Size (16/9) + Usar documento no Formato Panorâmico (16/9) + + + Regular Size (4/3) + Formato Tradicional (4/3) + + + Use Document Regular Size (4/3) + Usar documento no Formato Tradicional (4/3) + + + Custom Size + Tamanho Personalizado + + + Use Custom Document Size + Usar documento no Tamanho Personalizado + + + Stop Loading + Parar de Carregar + + + Stop Loading Web Page + Parar de Carregar a Página Web + + + Cut + Cortar + + + Copy + Copiar + + + Paste + Colar + + + Sleep + Modo "Espera" + + + Put Presentation to Sleep + Colocar a Apresentaçãao em modo "Espera" + + + Virtual Keyboard + Teclado Virtual + + + Display Virtual Keyboard + Mostrar o Teclado Virtual + + + Plain Light Background + Fundo Branco e Liso + + + Light + Claro + + + Grid Light Background + Fundo Branco e Quadriculado + + + Plain Dark Background + Fundo Preto e Liso + + + Dark + Escuro + + + Grid Dark Background + Fundo Preto e Quadriculado + + + Podcast + Podcast + + + Record Presentation to Video + Gravar a Apresentação em Vídeo + + + Record + Gravar + + + Start Screen Recording + Iniciar a Gravação do Vídeo + + + Erase Items + Apagar Itens + + + Erase All Items + Apagar Todos os Itens + + + Erase Annotations + Apagar Anotações + + + Erase All Annotations + Apagar Todas as Anotações + + + Clear Page + Limpar a Página + + + Clear All Elements + Limpar Todos os Elementos + + + Pen + Caneta + + + Annotate Document + Escrever + + + Ctrl+I + Ctrl+I + + + Erase Annotation + Apagar + + + Ctrl+E + Ctrl+E + + + Marker + Marcador + + + Highlight + Marcador + + + Ctrl+M + Ctrl+M + + + Selector + Seletor + + + Select And Modify Objects + Selecionar e Modificar Objetos + + + Ctrl+F + Ctrl+F + + + Hand + Mão + + + Scroll Page + Desloca-se na página + + + Laser Pointer + Apontador Laser + + + Virtual Laser Pointer + Apontador Laser Virtual + + + Ctrl+G + Ctrl+G + + + Draw Lines + Desenhar Linhas + + + Ctrl+J + Ctrl+J + + + Text + Texto + + + Write Text + Escrever Texto + + + Ctrl+K + Ctrl+K + + + Capture + Capturar + + + Capture Part of the Screen + Capturar uma Parte da Tela + + + Add To Current Page + Adicionar à Página Atual + + + Add Item To Current Page + Adicionar Item à Página Atual + + + Add To New Page + Adicionar a uma Página Nova + + + Add Item To New Page + Adicionar Item a uma Página Nova + + + Add To Library + Adicionar à Biblioteca + + + Add Item To Library + Adicionar Item à Biblioteca + + + Pages + Páginas + + + Create a New Page + Criar uma Nova Página + + + New Page + Nova Página + + + Duplicate Page + Duplicar Página + + + Duplicate the Current Page + Duplicar a Página Atual + + + Import Page + Importar Página + + + Import an External Page + Importar uma Página Externa + + + Pause + Pausa + + + Pause Podcast Recording + Pausar a Gravação do Podcast + + + Podcast Config + Configuração do Podcast + + + Configure Podcast Recording + Configuração da Gravação de Podcast + + + Flash Trap + Captura de Flash + + + Trap Flash Content + Captura de Conteúdo Flash + + + Web Trap + Captura de Web + + + Trap Web Content + Captura de Conteúdo Web + + + Custom Capture + Captura Personalizada + + + Window Capture + Captura da Janela + + + Capture a Window + Capturar uma Janela + + + Embed Web Content + Conteúdo Web Embutido + + + Capture Embeddable Web Content + Capturar Conteúdo Web Embutido + + + Show on Display + Mostrar no Vídeo + + + Show Main Screen on Display Screen + Mostrar a Tela Principal no Vídeo + + + Erase all Annotations + Apagar todas as notas + + + eduMedia + eduMedia + + + Import eduMedia simulation + Importar uma simulação eduMedia + + + Check Update + Verificar Atualização + + + Ctrl+H + Ctrl+H + + + OpenBoard + OpenBoard + + + Quit OpenBoard + Sair do OpenBoard + + + Hide OpenBoard + Ocultar o OpenBoard + + + Hide OpenBoard Application + Ocultar a Aplicação OpenBoard + + + Play + Começar(?) + Iniciar + + + Interact with items + Interagir com itens + + + Erase Background + Apagar o fundo + + + Remove the backgound + Remover o fundo + + + Open Tutorial + + + + Open the tutorial web page + + + + + PasswordDialog + + Authentication Required + Autenticação Necessária + + + Username: + Nome de Utilizador: + + + Password: + Senha: + + + + ProxyDialog + + Proxy Authentication + Autenticação do Proxy + + + Connect to Proxy + Conetar ao Proxy + + + Username: + Nome de Utilizador: + + + Password: + Senha: + + + Save username and password for future use + Gravar "Nome de Usuário" e "Senha" para futuras utilizações + + + + QObject + + Element ID = + ID do Elemento + + + Content is not supported in destination format. + O conteúdo não é suportado no formato de destino. + + + Remove Page + Remover Página + + + Are you sure you want to remove 1 page from the selected document '%0'? + Tem a certeza que quer remover 1 página do documento selecionado '%0'? + + + + UBApplication + + Page Size + Tamanho da Página + + + Podcast + Podcast + + + + UBApplicationController + + Web + Web + + + Update available + Atualização disponível + + + New update available, would you go to the web page ? + Nova atualização disponível. Ir para a página web? + + + No update available + Nenhuma atualização disponível + + + Update + Atualizar + + + + UBBoardController + + Downloading content %1 failed + A transferência de conteúdos falhou %1 + + + Download finished + Transferência Completa + + + Unknown tool type %1 + Tipo de ferramenta desconhecido %1 + + + Unknown content type %1 + Tipo de conteúdo desconhecido %1 + + + Add Item + Adicionar Item + + + All Supported (%1) + Tudo Suportado (%1) + + + Delete page %1 from document + Apagar a página %1 do documento + + + Page %1 deleted + Página %1 apagada + + + Add file operation failed: file copying error + Falha na operação de adição de arquivo: erro na cópia do arquivo + + + Group + Agrupar + + + Ungroup + Desagrupar + + + Saving document... + + + + Document has just been saved... + + + + + UBBoardPaletteManager + + Error Adding Image to Library + Erro ao Adicionar Imagem à Biblioteca + + + CapturedImage + Imagem capturada + + + + UBCachePropertiesWidget + + Cache Properties + Propriedades da Cache + + + Color: + Cor: + + + Shape: + Forma: + + + Size: + Tamanho: + + + Close + Fechar + + + + UBDesktopPalette + + Capture Part of the Screen + Capturar Parte da Tela + + + Capture the Screen + Capturar Tela + + + Show the stylus palette + Mostrar Paleta + + + Show Board on Secondary Screen + Mostrar o Quadro num Vídeo Secundário + + + Show Desktop on Secondary Screen + Mostrar Ambiente de Trabalho num Vídeo Secundário + + + Show OpenBoard + + + + + UBDocumentController + + New Folder + Nova Pasta + + + Page %1 + Página %1 + + + Add Folder of Images + Adicionar Pasta de Imagens + + + Add Images + Adicionar Imagens + + + Add Pages from File + Adicionar Páginas de um Arquivo + + + Duplicating Document %1 + A Duplicar Documento %1 + + + Document %1 copied + Documento %1 Copiado + + + Remove Page + Remover Página + + + Remove Document + Remover Documento + + + Are you sure you want to remove the document '%1'? + Tem a certeza que quer remover o documento '%1'? + + + Empty Trash + Vazar Lixo + + + Are you sure you want to empty trash? + Tem a certeza que quer vazar a pasta Lixo? + + + Emptying trash + A vazar Lixo + + + Emptied trash + Pasta Lixo limpa + + + Remove Folder + Apagar Pasta + + + Are you sure you want to remove the folder '%1' and all its content? + Tem a certeza que quer apagar a pasta '%1' e todo o seu conteúdo? + + + No document selected! + Não há documentos selecionados! + + + Open Supported File + Abrir Arquivo Suportado + + + Importing file %1... + Importando arquivo %1... + + + Failed to import file ... + Falha ao importar arquivo ... + + + Import all Images from Folder + Importar todas as Imagens de uma Pasta + + + Delete + Apagar + + + Empty + Vazio + + + Trash + Lixo + + + Open Document + Abrir Documento + + + Add all Images to Document + Adicionar todas as imagens ao Documento + + + All Images (%1) + Todas as Imagens (%1) + + + Selection does not contain any image files! + A seleção não contém arquivos de Imagem! + + + Are you sure you want to remove %n page(s) from the selected document '%1'? + + Tem a certeza que quer apagar %n página(s) do documento selecionado '%1'? + + + + + Folder does not contain any image files + O diretório não contém imagens + + + Untitled Documents + Documentos sem nome + + + The document '%1' has been generated with a newer version of OpenBoard (%2). By opening it, you may lose some information. Do you want to proceed? + + + + Are you sure you want to remove all selected documents? + + + + Remove multiple documents + + + + + UBDocumentManager + + images + imagens + + + videos + vídeos + + + objects + objetos + + + widgets + widgets + + + All supported files (*.%1) + Todos os arquivos suportados (*.%1) + + + File %1 saved + Arquivo %1 gravado + + + Inserting page %1 of %2 + A inserir página %1 de %2 + + + Import successful. + Importação bem sucedida. + + + Import of file %1 successful. + Importação do arquivo %1 bem sucedida. + + + Importing file %1 + Importando o arquivo %1 + + + + UBDocumentNavigator + + Page %0 + Página %0 + + + + UBDocumentTreeWidget + + %1 (copy) + %1 (cópia) + + + Copying page %1/%2 + Copiando página %1/%2 + + + %1 pages copied + + %1 de páginas copiadas + + + + + + UBDownloadWidget + + Downloading files + Baixando arquivos + + + Cancel + Cancelar + + + + UBExportAdaptor + + Warnings during export was appeared + Surgiram alertas durante a exportação + + + + UBExportCFF + + Export to IWB + Exportar para IWB + + + Export as IWB File + Exportar como arquivo IWB + + + Exporting document... + A exportar documento... + + + Export successful. + Exportação bem sucedida. + + + Export failed. + Falha na Exportação. + + + + UBExportDocument + + Page + Página + + + Export as UBZ File + Exportar como Arquivo UBZ + + + Exporting document... + A exportar documento... + + + Export successful. + Exportação bem sucedida. + + + Exporting %1 %2 of %3 + A exportar %1 %2 de %3 + + + Export to OpenBoard Format + + + + Export failed: location not writable + + + + Export failed + + + + Unable to export to the selected location. You do not have the permissions necessary to save the file. + + + + + UBExportFullPDF + + Export as PDF File + Exportar como Arquivo PDF + + + Exporting document... + A exportar documento... + + + Export successful. + Exportação bem sucedida. + + + Export to PDF + Exportar para PDF + + + Export failed: location not writable + + + + Export failed + + + + Unable to export to the selected location. You do not have the permissions necessary to save the file. + + + + + UBExportPDF + + Export as PDF File + Exportar como Arquivo PDF + + + Exporting document... + Exportando documento... + + + Export successful. + Exportação bem sucedida. + + + Exporting page %1 of %2 + Exportando página %1 de %2 + + + Export to PDF + Exportar para PDF + + + + UBExportWeb + + Page + Página + + + Export as Web data + Exportar para formato de Web + + + Exporting document... + Exportando documento... + + + Export successful. + Exportação bem sucedida. + + + Export failed. + Falha na exportação. + + + Export to Web Browser + Exportar para Explorador Web + + + + UBFeatureProperties + + Add to page + Adicionar à página + + + Set as background + Definir como fundo + + + Add to library + Adicionar à biblioteca + + + Object informations + Informações do Objecto + + + + UBFeaturesActionBar + + Add to favorites + Adicionar aos favoritos + + + Share + Partilhar + + + Search + Procurar + + + Delete + Apagar + + + Back to folder + Voltar à pasta + + + Remove from favorites + Remover dos favoritos + + + Create new folder + Criar uma nova pasta + + + Rescan file system + "Procurar arquivo de Sistema"(?) + Voltar a procurar arquivo de Sistema + + + + UBFeaturesController + + ImportedImage + Imagem Importada + + + Audios + Áudios + + + Movies + Vídeos + + + Pictures + Imagens + + + Animations + Animações + + + Interactivities + Atividades Interativas + + + Applications + Aplicações + + + Shapes + Formas + + + Favorites + Favoritos + + + Web search + Busca na web + + + Trash + Lixo + + + + UBFeaturesNewFolderDialog + + Accept + Aceitar + + + Cancel + Cancelar + + + Enter a new folder name + Escrever um novo nome para o diretório + + + + UBFeaturesProgressInfo + + Loading + A carregar + + + + UBGraphicsGroupContainerItemDelegate + + Locked + Bloqueado + + + Visible on Extended Screen + Visível em Vídeo Expandido + + + + UBGraphicsItemDelegate + + Locked + Bloqueado + + + Visible on Extended Screen + Visível em Vídeo Expandido + + + Go to Content Source + Ir para a Fonte do Conteúdo + + + + UBGraphicsMediaItem + + Media resource couldn't be resolved + + + + Unsupported media format + + + + Media playback service not found + + + + Media error: + + + + + UBGraphicsTextItem + + <Type Text Here> + <Introduzir o Texto Aqui> + + + + UBGraphicsTextItemDelegate + + Text Color + Cor do Texto + + + Editable + Editável + + + + UBGraphicsW3CWidgetItem + + Web + Web + + + + UBGraphicsWidgetItem + + Loading ... + Carregando ... + + + + UBGraphicsWidgetItemDelegate + + Frozen + Congelado + + + Transform as Tool + Transformar em Ferramenta + + + + UBImportCFF + + Common File Format ( + Formato de Arquivo Frequente ( + + + Importing file %1... + Importando arquivos %1... + + + Import of file %1 failed. + Falha a importar arquivo %1. + + + Import successful. + Importação bem sucedida. + + + Import failed. + Falha na importação. + + + + UBImportDocument + + Importing file %1... + Importando arquivo %1... + + + Import of file %1 failed. + Falha a importar arquivo %1. + + + Import successful. + Importação bem sucedida. + + + OpenBoard (*.ubz) + + + + + UBImportImage + + Image Format ( + Formato da Imagem ( + + + + UBImportPDF + + Portable Document Format (*.pdf) + Portable Document Format (*.pdf) + + + PDF import failed. + Falha na importação de PDF. + + + Importing page %1 of %2 + Importando página %1 de %2 + + + + UBIntranetPodcastPublisher + + Error while publishing video to intranet (%1) + Erro durante a publicação do vídeo na intranet (%1) + + + Publishing to Intranet in progress %1 % + Publicação na Intranet em progresso %1 % + + + + UBIntranetPodcastPublishingDialog + + Publish + Publicar + + + + UBKeyboardPalette + + Enter + Enter + + + + UBMainWindow + + Yes + Sim + + + No + Não + + + Ok + Ok + + + + UBMessagesDialog + + Close + Fechar + + + + UBNetworkAccessManager + + <qt>Enter username and password for "%1" at %2</qt> + <qt>Introduzir o Nome de Usuário e Senha "%1" em %2</qt> + + + Failed to log to Proxy + Falha ao entrar no Proxy + + + SSL Errors: + +%1 + +%2 + +Do you want to ignore these errors for this host? + Erros SSL: + +%1 + +%2 + +Quer ignorar estes erros, deste servidor? + + + Yes + Sim + + + No + Não + + + + UBOpenSankoreImporterWidget + + Open-Sankore Documents Detected + + + + Show this panel next time + + + + You can always access the OpenBoard Document Importer through the Preferences panel in the About tab. Warning, if you have already imported your Open-Sankore datas, you might loose your current OpenBoard documents. + + + + Cancel + Cancelar + + + Proceed + + + + Open-Sankoré documents are present on your computer. It is possible to import them to OpenBoard by pressing the “Proceed” button to launch the importer application. + + + + + UBPersistenceManager + + (copy) + (cópia) + + + Document Repository Loss + Repositório de Documentos perdido + + + 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. + + + + + UBPlatformUtils + + English + Inglês + + + Russian + Russo + + + German + Alemão + + + French + Francês + + + Swiss French + Francês (Suiço) + + + + UBPodcastController + + Failed to start encoder ... + Falha ao iniciar o codificador ... + + + No Podcast encoder available ... + Nenhum codificador de Podcast disponível ... + + + Part %1 + Parte %1 + + + on your desktop ... + no seu ambiente de trabalho ... + + + in folder %1 + na pasta %1 + + + Podcast created %1 + Podcast criado %1 + + + Podcast recording error (%1) + Erro de gravação do Podcast (%1) + + + Default Audio Input + Entrada de áudio padrão + + + No Audio Recording + Sem gravação de áudio + + + Small + Pequeno + + + Medium + Médio + + + Full + Completo + + + Publish to Intranet + Publicar na Intranet + + + Publish to Youtube + Publicar no Youtube + + + OpenBoard Cast + + + + + UBPreferencesController + + version: + versão: + + + Marker is pressure sensitive + O marcador é sensível à pressão + + + + UBProxyLoginDlg + + Proxy Login + Iniciar sessão no Proxy + + + Username: + Nome de Utilizador: + + + Password: + Senha: + + + + UBPublicationDlg + + Publish document on the web + Publicar documentos na web + + + Title: + Título: + + + Description: + Descrição: + + + Publish + Publicar + + + + UBSettings + + My Movies + Os meus filmes + + + + UBStartupHintsPalette + + Visible next time + + + + + UBThumbnailAdaptor + + Generating preview thumbnails ... + A gerar pré-visualização de miniaturas ... + + + %1 thumbnails generated ... + %1 de miniaturas geradas ... + + + + UBToolsManager + + Mask + Cortina + + + Ruler + Régua + + + Compass + Compasso + + + Protractor + Transferidor + + + Triangle + Esquadro + + + Magnifier + Lupa + + + Cache + Cache + + + + UBTrapFlashController + + Whole page + Página completa + + + Web + Web + + + + UBUpdateDlg + + Document updater + Atualizador de documento + + + files require an update. + arquivos requerem uma atualização. + + + Backup path: + Localização da Cópia de Segurança: + + + Browse + Procurar + + + Update + Atualizar + + + Select a backup folder + Selecione uma pasta para a Cópia de Segurança + + + Please wait the import process will start soon... + Aguarde. O processo de importação vai começar em breve... + + + Files update successful! +Please reboot the application to access the updated documents. + Atualização de arquivos bem sucedida! +Por favor, reinicie o aplicativo para ir aos documentos atualizados. + + + An error occured during the update. The files have not been affected. + Ocorreu um erro durante a atualização. Os arquivos não foram afetados. + + + Files update results + Resultados da atualização de arquivos + + + Updating file + Atualizando o arquivo + + + Remind me later + Lembrar-me depois + + + + UBWebPluginWidget + + Loading... + Carregando... + + + + UBWidgetUniboardAPI + + %0 called (method=%1, status=%2) + %0 pedido (método=%1, estado=%2) + + + + UBYouTubePublisher + + YouTube authentication failed. + Erro de autenticação no YouTube. + + + Error while uploading video to YouTube (%1) + Erro no envio do vídeo para o YouTube (%1) + + + Upload to YouTube in progress %1 % + Envio para o YouTube em curso %1 % + + + + UBYouTubePublishingDialog + + Upload + Enviar + + + Autos & Vehicles + Automóveis + + + Music + Música + + + Pets & Animals + Animais + + + Sports + Esportes + + + Travel & Events + Viagens e Eventos + + + Gaming + Jogos + + + Comedy + Humor + + + People & Blogs + Pessoas e Blogues + + + News & Politics + Notícias e Política + + + Entertainment + Entretenimento + + + Education + Educação + + + Howto & Style + Guias e Estilo + + + Nonprofits & Activism + Sem fins lucrativos e Ativismo + + + Science & Technology + Ciência e Tecnologia + + + + UBZoomPalette + + %1 x + %1 x + + + + WBClearButton + + Clear + Limpar + + + + WBDownloadItem + + Save File + Gravar arquivo + + + Download canceled: %1 + Download cancelado: %1 + + + Error opening saved file: %1 + Erro a abrir o arquivo gravado: %1 + + + Error saving: %1 + Erro ao gravar: %1 + + + Network Error: %1 + Erro na Ligação: %1 + + + seconds + Segundos + + + minutes + Minutos + + + - %4 %5 remaining + - %4 %5 de tempo restante + + + %1 of %2 (%3/sec) %4 + %1 de %2 (%3/seg) %4 + + + ? + unknown file size + Tamanho do arquivo desconhecido + ? + + + %1 of %2 - Stopped + %1 de %2 - Parado + + + bytes + bytes + + + KB + KB + + + MB + MB + + + + WBDownloadManager + + 1 Download + 1 arquivo baixado + + + %1 Downloads + always >= 2 + Sempre >= 2 + %1 arquivos baixados + + + + WBHistoryModel + + Title + Título + + + Address + Endereço + + + + WBHistoryTreeModel + + Earlier Today + Hoje + + + %1 items + %1 item(s) + + + + WBSearchLineEdit + + Search + Pesquisar + + + + WBTabBar + + New &Tab + Novo &Separador + + + Clone Tab + Duplicar Separador + + + &Close Tab + &Fechar Separador + + + Close &Other Tabs + Fechar os &Outros Separadores + + + Reload Tab + Atualizar Separador + + + Reload All Tabs + Atualizar todos os Separadores + + + + WBTabWidget + + Recently Closed Tabs + Separadores recentemente fechados + + + (Untitled) + (Sem Título) + + + + WBToolbarSearch + + Search + Pesquisar + + + No Recent Searches + Sem pesquisas recentes + + + Recent Searches + Pesquisas recentes + + + Clear Recent Searches + Limpar as pesquisas recentes + + + + WBWebPage + + Download + Baixar + + + Add to Current Document + Adicionar ao documento atual + + + PDF + PDF + + + Error loading page: %1 + Erro ao carregar a página: %1 + + + Download PDF Document: would you prefer to download the PDF file or add it to the current OpenBoard document? + + + + + WBWebView + + Open in New Tab + Abrir num Novo Separador + + + + YouTubePublishingDialog + + Publish Podcast to YouTube + Publicar Podcast no Youtube + + + Title + Título + + + Description + Descrição + + + Keywords + Palavras chave + + + Category + Categoria + + + YouTube Username + Nome de utilizador do Youtube + + + YouTube Password + Senha do Youtube + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">By clicking 'Upload,' you certify that you own all rights to the content or that you are authorized by the owner to make the content publicly available on YouTube, and that it otherwise complies with the YouTube Terms of Service located at </span><a href="http://www.youtube.com/t/terms"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">http://www.youtube.com/t/terms</span></a></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:10pt;">Clicando em 'Enviar', você certifica que possui todos os direitos sobre o conteúdo ou que está autorizado pelo proprietário a tornar o conteúdo disponível publicamente no YouTube, e que esta de acordo com os Termos de Serviço do YouTube localizado em</span><a href="http://www.youtube.com/t/terms"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">http://www.youtube.com/t/terms</span></a></p></body></html> + + + Restore credentials on reboot + + + + OpenBoard + OpenBoard + + + + brushProperties + + On Light Background + Num fundo branco + + + On Dark Background + Num fundo preto + + + Opacity + Opacidade + + + Line Width + Largura da linha + + + Medium + Médio + + + Strong + Largo + + + Fine + Fino + + + Pen is Pressure Sensitive + Caneta sensível à pressão + + + + capturePublishingDialog + + Dialog + Caixa de Diálogo + + + Title + Título + + + E-mail + E-mail + + + Author + Autor + + + Description + Descrição + + + + documents + + OpenBoard Documents + + + + + preferencesDialog + + Preferences + Preferências + + + version : … + versão : ... + + + Default Settings + Configuração por defeito + + + Close + Fechar + + + Display + Exibir + + + Internet + Internet + + + Show Page with External Browser + Mostrar a página num Browser externo + + + Home Page: + Página de entrada: + + + Virtual Keyboard + Teclado virtual + + + Keyboard button size: + Tamanho dos botões do teclado: + + + Toolbar + Barra de ferramentas + + + Positioned at the Top (recommended for tablets) + Posicionado no topo (recomendado para tablets) + + + Positioned at the Bottom (recommended for white boards) + Posicionado em baixo (recomendado para quadros brancos) + + + Display Text Under Button + Mostrar o texto por debaixo dos botões + + + Stylus Palette + Paleta + + + Horizontal + Horizontal + + + Vertical + Vertical + + + Pen + Caneta + + + Marker + Marcador + + + Licences + Licenças + + + About + Sobre + + + Software Update + Atualização de Software + + + Check software update at launch + Verificar atualizações de software no arranque + + + Network + Rede + + + Multi display + Múltiplos Monitores + + + Show internal web page content on secondary screen or projector + Mostrar o conteúdo interno da página web num monitor ou projetor secundário + + + Swap control display and view display + Trocar entre o monitor de controle e apresentação? + Trocar entre o monitor de controle e visualização + + + Mode + Modo + + + Mode to start in: + "Mode to start in:" + Modo iniciar: + + + Board + Quadro + + + Desktop + Área de Trabalho + + + Proxy User: + Proxy User: + + + Pass: + Senha: + + + Credits + Créditos + + + Open-Sankoré Importer + + + + Check if Open-Sankoré data could be imported at launch + + + + Use system keyboard (recommended) + + + + Built-in virtual keyboard button size: + + + + + trapFlashDialog + + Trap flash + Capturar flash + + + Select a flash to trap + Selecionar o flash a capturar + + + about:blank + Acerca:em branco + + + Application name + Nome da Aplicação + + + Create Application + Criar Aplicação + + + From 9b30de177ce190c7ab0447519829693f82f3e2a6 Mon Sep 17 00:00:00 2001 From: Gustavo Junior Alves Date: Wed, 11 May 2016 12:50:59 -0300 Subject: [PATCH 02/11] Improve pt and pt_BR translations --- resources/i18n/OpenBoard_pt.ts | 86 +++++++++++++++--------------- resources/i18n/OpenBoard_pt_BR.ts | 87 +++++++++++++++---------------- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/resources/i18n/OpenBoard_pt.ts b/resources/i18n/OpenBoard_pt.ts index edc24147..e1a02ee9 100644 --- a/resources/i18n/OpenBoard_pt.ts +++ b/resources/i18n/OpenBoard_pt.ts @@ -50,7 +50,7 @@ IntranetPodcastPublishingDialog Publish Podcast to YouTube - Publicar o Podcast no YouTube + Publicar Podcast no YouTube Title @@ -795,11 +795,11 @@ Open Tutorial - + Abrir Tutorial Open the tutorial web page - + Abrir a página web de tutorial @@ -810,7 +810,7 @@ Username: - Nome de Utilizador: + Usuário: Password: @@ -941,11 +941,11 @@ Saving document... - + Gravando documento... Document has just been saved... - + Documento acaba de ser gravado... @@ -1006,7 +1006,7 @@ Show OpenBoard - + Mostrar OpenBoard @@ -1126,8 +1126,8 @@ Are you sure you want to remove %n page(s) from the selected document '%1'? - Tem a certeza que quer apagar %n página(s) do documento selecionado '%1'? - + Tem certeza que quer apagar %n página do documento selecionado '%1'? + Tem certeza que quer apagar %n páginas do documento selecionado '%1'? @@ -1140,15 +1140,15 @@ The document '%1' has been generated with a newer version of OpenBoard (%2). By opening it, you may lose some information. Do you want to proceed? - + O documento '%1' foi produzido com uma versão mais nova do OpenBoard (%2). Ao abri-lo, você poderá perder alguma informação. Gostaria de continuar? Are you sure you want to remove all selected documents? - + Você tem certeza que deseja remover todos os documentos selecionados? Remove multiple documents - + Remover múltiplos documentos @@ -1214,8 +1214,8 @@ %1 pages copied - %1 de páginas copiadas - + %1 página copiada + %1 páginas copiadas @@ -1284,19 +1284,19 @@ Export to OpenBoard Format - + Exportar para o formato OpenBoard Export failed: location not writable - + Exportação falhou: localização não gravável Export failed - + Exportação falhou Unable to export to the selected location. You do not have the permissions necessary to save the file. - + Impossível exportar para a localização selcionada. Você não possui as permissões necessárias para gravar o arquivo. @@ -1319,15 +1319,15 @@ Export failed: location not writable - + Exportação falhou: localização não gravável Export failed - + Exportação falhou Unable to export to the selected location. You do not have the permissions necessary to save the file. - + Impossível exportar para a localização selecionada. Você não possui as permissões necessárias para gravar o arquivo. @@ -1534,19 +1534,19 @@ UBGraphicsMediaItem Media resource couldn't be resolved - + Recurso de mídia não pode ser resolvido Unsupported media format - + Formato de mídia não suportado Media playback service not found - + Serviço de reprodução de mídia não encontrado Media error: - + Erro de mídia: @@ -1631,7 +1631,7 @@ OpenBoard (*.ubz) - + OpenBoard (*.ubz) @@ -1742,27 +1742,27 @@ Quer ignorar estes erros, deste servidor? UBOpenSankoreImporterWidget Open-Sankore Documents Detected - + Documentos do Open-Sankore Detectado Show this panel next time - + Mostrar este painel da próxima vez You can always access the OpenBoard Document Importer through the Preferences panel in the About tab. Warning, if you have already imported your Open-Sankore datas, you might loose your current OpenBoard documents. - + Você sempre poderá acessar o Importador de Documentos OpenBoard através do painel de Preferências na aba Sobre. Aviso, se você já importou seus dados do Open-Sankoré, você poderá perder seus atuais documentos do OpenBoard. Cancel - Cancelar + Cancelar Proceed - + Prosseguir Open-Sankoré documents are present on your computer. It is possible to import them to OpenBoard by pressing the “Proceed” button to launch the importer application. - + Documentos do Open-Sankoré estão presentes em seu computador. É possível importá-los para o OpenBoard pressionando o botão "Prosseguir" para lançar a aplicação de importação. @@ -1777,7 +1777,7 @@ Quer ignorar estes erros, deste servidor? 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. - + Acesso ao repositório '%1' foi perdido. Infelizmente a aplicação deverá desligar para avitar a corrupção de dados. As últimas alterações também serão perdidas. @@ -1863,7 +1863,7 @@ Quer ignorar estes erros, deste servidor? OpenBoard Cast - + OpenBoard Cast @@ -1922,7 +1922,7 @@ Quer ignorar estes erros, deste servidor? UBStartupHintsPalette Visible next time - + Visível na próxima vez @@ -2317,7 +2317,7 @@ Por favor, reinicie o aplicativo para aceder aos documentos atualizados. Download PDF Document: would you prefer to download the PDF file or add it to the current OpenBoard document? - + Download de Documento PDF: você prefere baixar o arquivo PDF ou adicioná-lo ao atual documento OpenBoard? @@ -2371,11 +2371,11 @@ p, li { white-space: pre-wrap; } Restore credentials on reboot - + Reestabelecer credenciais ao reiniciar OpenBoard - OpenBoard + OpenBoard @@ -2440,7 +2440,7 @@ p, li { white-space: pre-wrap; } documents OpenBoard Documents - + Documentos OpenBoard @@ -2585,19 +2585,19 @@ p, li { white-space: pre-wrap; } Open-Sankoré Importer - + Importador Open-Sankoré Check if Open-Sankoré data could be imported at launch - + Verifique se os dados do Open-Sankoré poderão ser importados na inicialização Use system keyboard (recommended) - + Usar teclado do sistema (recomendado) Built-in virtual keyboard button size: - + Tamanho da tecla do teclado virtual embarcado: diff --git a/resources/i18n/OpenBoard_pt_BR.ts b/resources/i18n/OpenBoard_pt_BR.ts index 689613d3..cd9995ac 100644 --- a/resources/i18n/OpenBoard_pt_BR.ts +++ b/resources/i18n/OpenBoard_pt_BR.ts @@ -50,7 +50,7 @@ IntranetPodcastPublishingDialog Publish Podcast to YouTube - Publicar o Podcast no YouTube + Publicar Podcast no YouTube Title @@ -277,7 +277,6 @@ Show Desktop - "Mostrar Ambiente de Trabalho" (muito longo) - Mostrar a mesa Ver desktop @@ -795,11 +794,11 @@ Open Tutorial - + Abrir Tutorial Open the tutorial web page - + Abrir a página web de tutorial @@ -810,7 +809,7 @@ Username: - Nome de Utilizador: + Usuário: Password: @@ -941,11 +940,11 @@ Saving document... - + Gravando documento... Document has just been saved... - + Documento acaba de ser gravado... @@ -1006,7 +1005,7 @@ Show OpenBoard - + Mostrar OpenBoard @@ -1126,8 +1125,8 @@ Are you sure you want to remove %n page(s) from the selected document '%1'? - Tem a certeza que quer apagar %n página(s) do documento selecionado '%1'? - + Tem certeza que quer apagar %n página do documento selecionado '%1'? + Tem certeza que quer apagar %n páginas do documento selecionado '%1'? @@ -1140,15 +1139,15 @@ The document '%1' has been generated with a newer version of OpenBoard (%2). By opening it, you may lose some information. Do you want to proceed? - + O documento '%1' foi produzido com uma versão mais nova do OpenBoard (%2). Ao abri-lo, você poderá perder alguma informação. Gostaria de continuar? Are you sure you want to remove all selected documents? - + Você tem certeza que deseja remover todos os documentos selecionados? Remove multiple documents - + Remover múltiplos documentos @@ -1214,8 +1213,8 @@ %1 pages copied - %1 de páginas copiadas - + %1 página copiada + %1 páginas copiadas @@ -1284,19 +1283,19 @@ Export to OpenBoard Format - + Exportar para o formato OpenBoard Export failed: location not writable - + Exportação falhou: localização não gravável Export failed - + Exportação falhou Unable to export to the selected location. You do not have the permissions necessary to save the file. - + Impossível exportar para a localização selcionada. Você não possui as permissões necessárias para gravar o arquivo. @@ -1319,15 +1318,15 @@ Export failed: location not writable - + Exportação falhou: localização não gravável Export failed - + Exportação falhou Unable to export to the selected location. You do not have the permissions necessary to save the file. - + Impossível exportar para a localização selecionada. Você não possui as permissões necessárias para gravar o arquivo. @@ -1534,19 +1533,19 @@ UBGraphicsMediaItem Media resource couldn't be resolved - + Recurso de mídia não pode ser resolvido Unsupported media format - + Formato de mídia não suportado Media playback service not found - + Serviço de reprodução de mídia não encontrado Media error: - + Erro de mídia: @@ -1631,7 +1630,7 @@ OpenBoard (*.ubz) - + OpenBoard (*.ubz) @@ -1742,27 +1741,27 @@ Quer ignorar estes erros, deste servidor? UBOpenSankoreImporterWidget Open-Sankore Documents Detected - + Documentos do Open-Sankore Detectado Show this panel next time - + Mostrar este painel da próxima vez You can always access the OpenBoard Document Importer through the Preferences panel in the About tab. Warning, if you have already imported your Open-Sankore datas, you might loose your current OpenBoard documents. - + Você sempre poderá acessar o Importador de Documentos OpenBoard através do painel de Preferências na aba Sobre. Aviso, se você já importou seus dados do Open-Sankoré, você poderá perder seus atuais documentos do OpenBoard. Cancel - Cancelar + Cancelar Proceed - + Prosseguir Open-Sankoré documents are present on your computer. It is possible to import them to OpenBoard by pressing the “Proceed” button to launch the importer application. - + Documentos do Open-Sankoré estão presentes em seu computador. É possível importá-los para o OpenBoard pressionando o botão "Prosseguir" para lançar a aplicação de importação. @@ -1777,7 +1776,7 @@ Quer ignorar estes erros, deste servidor? 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. - + Acesso ao repositório '%1' foi perdido. Infelizmente a aplicação deverá desligar para avitar a corrupção de dados. As últimas alterações também serão perdidas. @@ -1863,7 +1862,7 @@ Quer ignorar estes erros, deste servidor? OpenBoard Cast - + OpenBoard Cast @@ -1922,7 +1921,7 @@ Quer ignorar estes erros, deste servidor? UBStartupHintsPalette Visible next time - + Visível na próxima vez @@ -2317,7 +2316,7 @@ Por favor, reinicie o aplicativo para ir aos documentos atualizados. Download PDF Document: would you prefer to download the PDF file or add it to the current OpenBoard document? - + Download de Documento PDF: você prefere baixar o arquivo PDF ou adicioná-lo ao atual documento OpenBoard? @@ -2371,11 +2370,11 @@ p, li { white-space: pre-wrap; } Restore credentials on reboot - + Reestabelecer credenciais ao reiniciar OpenBoard - OpenBoard + OpenBoard @@ -2440,7 +2439,7 @@ p, li { white-space: pre-wrap; } documents OpenBoard Documents - + Documentos OpenBoard @@ -2585,19 +2584,19 @@ p, li { white-space: pre-wrap; } Open-Sankoré Importer - + Importador Open-Sankoré Check if Open-Sankoré data could be imported at launch - + Verifique se os dados do Open-Sankoré poderão ser importados na inicialização Use system keyboard (recommended) - + Usar teclado do sistema (recomendado) Built-in virtual keyboard button size: - + Tamanho da tecla do teclado virtual embarcado: From 9c6074607989bfc3bae952c20951adc8ee9a16ab Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Thu, 12 May 2016 17:30:39 +0200 Subject: [PATCH 03/11] Hack for building pre-release versions on Windows --- OpenBoard.pro | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index 50ea777a..e1bc733f 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -91,8 +91,6 @@ UB_FONTS.files = resources/fonts UB_THIRDPARTY_INTERACTIVE.files = thirdparty/interactive DEFINES += NO_THIRD_PARTY_WARNINGS -DEFINES += UBVERSION=\"\\\"$${LONG_VERSION}\"\\\" \ - UBVERSION_RC=$$VERSION_RC ALPHA_BETA_STR = $$find(VERSION, "[ab]") count(ALPHA_BETA_STR, 1):DEFINES += PRE_RELEASE BUILD_DIR = build @@ -140,6 +138,19 @@ win32 { DEFINES += NOMINMAX # avoids compilation error in qdatetime.h + # Windows doesn't support file versions with more than 4 fields, so + # we omit the build number (which is only used for pre-release versions + # anyway) + + VERSION_RC = $$VERSION_MAJ,$$VERSION_MIN,$$VERSION_PATCH,$$VERSION_TYPE + VERSION_RC = $$replace(VERSION_RC, "a", "160") # 0xA0 + VERSION_RC = $$replace(VERSION_RC, "b", "176") # 0xB0 + VERSION_RC = $$replace(VERSION_RC, "rc", "192" ) # 0xC0 + VERSION_RC = $$replace(VERSION_RC, "r", "240") # 0xF0 + + + DEFINES += UBVERSION=\"\\\"$${VERSION}\"\\\" \ + UBVERSION_RC=$$VERSION_RC } macx { From 575d14a5c2827c9ac7eeba97ca4e80e573969201 Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Fri, 13 May 2016 08:29:27 +0200 Subject: [PATCH 04/11] Updated headers --- C++StandardHeaderFile.txt | 4 ++-- src/adaptors/UBExportAdaptor.cpp | 2 ++ src/adaptors/UBExportAdaptor.h | 2 ++ src/adaptors/UBExportDocument.cpp | 2 ++ src/adaptors/UBExportDocument.h | 2 ++ src/adaptors/UBExportFullPDF.cpp | 2 ++ src/adaptors/UBExportFullPDF.h | 2 ++ src/adaptors/UBExportPDF.cpp | 2 ++ src/adaptors/UBExportPDF.h | 2 ++ src/adaptors/UBExportWeb.cpp | 2 ++ src/adaptors/UBExportWeb.h | 2 ++ src/adaptors/UBImportAdaptor.cpp | 2 ++ src/adaptors/UBImportAdaptor.h | 2 ++ src/adaptors/UBImportDocument.cpp | 2 ++ src/adaptors/UBImportDocument.h | 2 ++ src/adaptors/UBImportImage.cpp | 2 ++ src/adaptors/UBImportImage.h | 2 ++ src/adaptors/UBImportPDF.cpp | 2 ++ src/adaptors/UBImportPDF.h | 2 ++ src/adaptors/UBMetadataDcSubsetAdaptor.cpp | 2 ++ src/adaptors/UBMetadataDcSubsetAdaptor.h | 2 ++ src/adaptors/UBSvgSubsetAdaptor.cpp | 2 ++ src/adaptors/UBSvgSubsetAdaptor.h | 2 ++ src/adaptors/UBThumbnailAdaptor.cpp | 2 ++ src/adaptors/UBThumbnailAdaptor.h | 2 ++ src/adaptors/publishing/UBDocumentPublisher.cpp | 2 ++ src/adaptors/publishing/UBDocumentPublisher.h | 2 ++ .../publishing/UBSvgSubsetRasterizer.cpp | 2 ++ src/adaptors/publishing/UBSvgSubsetRasterizer.h | 2 ++ src/api/UBLibraryAPI.cpp | 2 ++ src/api/UBLibraryAPI.h | 2 ++ src/api/UBW3CWidgetAPI.cpp | 2 ++ src/api/UBW3CWidgetAPI.h | 2 ++ src/api/UBWidgetMessageAPI.cpp | 2 ++ src/api/UBWidgetMessageAPI.h | 2 ++ src/api/UBWidgetUniboardAPI.cpp | 2 ++ src/api/UBWidgetUniboardAPI.h | 2 ++ src/board/UBBoardController.cpp | 2 ++ src/board/UBBoardController.h | 2 ++ src/board/UBBoardPaletteManager.cpp | 2 ++ src/board/UBBoardPaletteManager.h | 2 ++ src/board/UBBoardView.cpp | 2 ++ src/board/UBBoardView.h | 2 ++ src/board/UBDrawingController.cpp | 2 ++ src/board/UBDrawingController.h | 2 ++ src/board/UBFeaturesController.cpp | 2 ++ src/board/UBFeaturesController.h | 2 ++ src/core/UB.h | 2 ++ src/core/UBApplication.cpp | 2 ++ src/core/UBApplication.h | 2 ++ src/core/UBApplicationController.cpp | 2 ++ src/core/UBApplicationController.h | 2 ++ src/core/UBDisplayManager.cpp | 2 ++ src/core/UBDisplayManager.h | 2 ++ src/core/UBDocumentManager.cpp | 2 ++ src/core/UBDocumentManager.h | 2 ++ src/core/UBDownloadManager.cpp | 2 ++ src/core/UBDownloadManager.h | 2 ++ src/core/UBDownloadThread.cpp | 2 ++ src/core/UBDownloadThread.h | 2 ++ src/core/UBIdleTimer.cpp | 2 ++ src/core/UBIdleTimer.h | 2 ++ src/core/UBMimeData.cpp | 2 ++ src/core/UBMimeData.h | 2 ++ src/core/UBOpenSankoreImporter.cpp | 2 ++ src/core/UBOpenSankoreImporter.h | 2 ++ src/core/UBPersistenceManager.cpp | 2 ++ src/core/UBPersistenceManager.h | 2 ++ src/core/UBPersistenceWorker.cpp | 6 +++++- src/core/UBPersistenceWorker.h | 6 +++++- src/core/UBPreferencesController.cpp | 2 ++ src/core/UBPreferencesController.h | 2 ++ src/core/UBSceneCache.cpp | 2 ++ src/core/UBSceneCache.h | 2 ++ src/core/UBSetting.cpp | 2 ++ src/core/UBSetting.h | 2 ++ src/core/UBSettings.cpp | 2 ++ src/core/UBSettings.h | 2 ++ src/core/UBTextTools.cpp | 2 ++ src/core/UBTextTools.h | 2 ++ src/core/main.cpp | 2 ++ src/core/memcheck.h | 2 ++ src/desktop/UBCustomCaptureWindow.cpp | 2 ++ src/desktop/UBCustomCaptureWindow.h | 2 ++ src/desktop/UBDesktopAnnotationController.cpp | 2 ++ src/desktop/UBDesktopAnnotationController.h | 2 ++ src/desktop/UBDesktopPalette.cpp | 2 ++ src/desktop/UBDesktopPalette.h | 2 ++ src/desktop/UBDesktopPropertyPalette.cpp | 2 ++ src/desktop/UBDesktopPropertyPalette.h | 2 ++ src/desktop/UBWindowCapture.h | 2 ++ src/desktop/UBWindowCaptureDelegate_win.cpp | 2 ++ src/desktop/UBWindowCaptureDelegate_win.h | 2 ++ src/desktop/UBWindowCapture_linux.cpp | 2 ++ src/desktop/UBWindowCapture_mac.mm | 2 ++ src/desktop/UBWindowCapture_win.cpp | 2 ++ src/document/UBDocumentContainer.cpp | 2 ++ src/document/UBDocumentContainer.h | 2 ++ src/document/UBDocumentController.cpp | 2 ++ src/document/UBDocumentController.h | 2 ++ src/document/UBDocumentProxy.cpp | 2 ++ src/document/UBDocumentProxy.h | 2 ++ src/domain/UBGraphicsDelegateFrame.cpp | 2 ++ src/domain/UBGraphicsDelegateFrame.h | 2 ++ src/domain/UBGraphicsGroupContainerItem.cpp | 2 ++ src/domain/UBGraphicsGroupContainerItem.h | 2 ++ .../UBGraphicsGroupContainerItemDelegate.cpp | 2 ++ .../UBGraphicsGroupContainerItemDelegate.h | 2 ++ src/domain/UBGraphicsItemDelegate.cpp | 2 ++ src/domain/UBGraphicsItemDelegate.h | 2 ++ src/domain/UBGraphicsItemGroupUndoCommand.cpp | 2 ++ src/domain/UBGraphicsItemGroupUndoCommand.h | 2 ++ .../UBGraphicsItemTransformUndoCommand.cpp | 2 ++ src/domain/UBGraphicsItemTransformUndoCommand.h | 2 ++ src/domain/UBGraphicsItemUndoCommand.cpp | 2 ++ src/domain/UBGraphicsItemUndoCommand.h | 2 ++ src/domain/UBGraphicsItemZLevelUndoCommand.cpp | 2 ++ src/domain/UBGraphicsItemZLevelUndoCommand.h | 2 ++ src/domain/UBGraphicsMediaItem.cpp | 2 ++ src/domain/UBGraphicsMediaItem.h | 2 ++ src/domain/UBGraphicsMediaItemDelegate.cpp | 2 ++ src/domain/UBGraphicsMediaItemDelegate.h | 2 ++ src/domain/UBGraphicsPDFItem.cpp | 2 ++ src/domain/UBGraphicsPDFItem.h | 2 ++ src/domain/UBGraphicsPixmapItem.cpp | 2 ++ src/domain/UBGraphicsPixmapItem.h | 2 ++ src/domain/UBGraphicsPolygonItem.cpp | 2 ++ src/domain/UBGraphicsPolygonItem.h | 2 ++ src/domain/UBGraphicsProxyWidget.cpp | 2 ++ src/domain/UBGraphicsProxyWidget.h | 2 ++ src/domain/UBGraphicsScene.cpp | 2 ++ src/domain/UBGraphicsScene.h | 2 ++ src/domain/UBGraphicsStroke.cpp | 2 ++ src/domain/UBGraphicsStroke.h | 2 ++ src/domain/UBGraphicsStrokesGroup.cpp | 2 ++ src/domain/UBGraphicsStrokesGroup.h | 2 ++ src/domain/UBGraphicsSvgItem.cpp | 2 ++ src/domain/UBGraphicsSvgItem.h | 2 ++ src/domain/UBGraphicsTextItem.cpp | 2 ++ src/domain/UBGraphicsTextItem.h | 2 ++ src/domain/UBGraphicsTextItemDelegate.cpp | 2 ++ src/domain/UBGraphicsTextItemDelegate.h | 2 ++ src/domain/UBGraphicsTextItemUndoCommand.cpp | 2 ++ src/domain/UBGraphicsTextItemUndoCommand.h | 2 ++ src/domain/UBGraphicsWidgetItem.cpp | 2 ++ src/domain/UBGraphicsWidgetItem.h | 2 ++ src/domain/UBGraphicsWidgetItemDelegate.cpp | 2 ++ src/domain/UBGraphicsWidgetItemDelegate.h | 2 ++ src/domain/UBItem.cpp | 2 ++ src/domain/UBItem.h | 2 ++ src/domain/UBPageSizeUndoCommand.cpp | 2 ++ src/domain/UBPageSizeUndoCommand.h | 2 ++ src/domain/UBResizableGraphicsItem.cpp | 2 ++ src/domain/UBResizableGraphicsItem.h | 2 ++ src/domain/UBSelectionFrame.cpp | 2 ++ src/domain/UBSelectionFrame.h | 2 ++ src/domain/UBUndoCommand.cpp | 2 ++ src/domain/UBUndoCommand.h | 2 ++ src/frameworks/MacUtils.h | 2 ++ src/frameworks/UBBase32.cpp | 2 ++ src/frameworks/UBBase32.h | 2 ++ src/frameworks/UBCoreGraphicsScene.cpp | 2 ++ src/frameworks/UBCoreGraphicsScene.h | 2 ++ src/frameworks/UBCryptoUtils.cpp | 2 ++ src/frameworks/UBCryptoUtils.h | 2 ++ src/frameworks/UBFileSystemUtils.cpp | 2 ++ src/frameworks/UBFileSystemUtils.h | 2 ++ src/frameworks/UBGeometryUtils.cpp | 2 ++ src/frameworks/UBGeometryUtils.h | 2 ++ src/frameworks/UBPlatformUtils.cpp | 2 ++ src/frameworks/UBPlatformUtils.h | 2 ++ src/frameworks/UBPlatformUtils_linux.cpp | 2 ++ src/frameworks/UBPlatformUtils_mac.mm | 2 ++ src/frameworks/UBPlatformUtils_win.cpp | 2 ++ src/frameworks/UBStringUtils.cpp | 2 ++ src/frameworks/UBStringUtils.h | 2 ++ src/frameworks/UBVersion.cpp | 2 ++ src/frameworks/UBVersion.h | 2 ++ src/globals/UBGlobals.h | 2 ++ src/gui/UBActionPalette.cpp | 2 ++ src/gui/UBActionPalette.h | 2 ++ src/gui/UBBlackoutWidget.cpp | 2 ++ src/gui/UBBlackoutWidget.h | 2 ++ src/gui/UBCachePropertiesWidget.cpp | 2 ++ src/gui/UBCachePropertiesWidget.h | 2 ++ src/gui/UBCircleFrame.cpp | 2 ++ src/gui/UBCircleFrame.h | 2 ++ src/gui/UBClockPalette.h | 2 ++ src/gui/UBColorPicker.cpp | 2 ++ src/gui/UBColorPicker.h | 2 ++ src/gui/UBDockDownloadWidget.cpp | 2 ++ src/gui/UBDockDownloadWidget.h | 2 ++ src/gui/UBDockPalette.cpp | 2 ++ src/gui/UBDockPalette.h | 2 ++ src/gui/UBDockPaletteWidget.cpp | 2 ++ src/gui/UBDockPaletteWidget.h | 2 ++ src/gui/UBDocumentNavigator.cpp | 2 ++ src/gui/UBDocumentNavigator.h | 2 ++ src/gui/UBDocumentThumbnailWidget.cpp | 2 ++ src/gui/UBDocumentThumbnailWidget.h | 2 ++ src/gui/UBDocumentToolsPalette.cpp | 2 ++ src/gui/UBDocumentToolsPalette.h | 2 ++ src/gui/UBDocumentTreeWidget.cpp | 2 ++ src/gui/UBDocumentTreeWidget.h | 2 ++ src/gui/UBDownloadWidget.cpp | 2 ++ src/gui/UBDownloadWidget.h | 2 ++ src/gui/UBFavoriteToolPalette.cpp | 2 ++ src/gui/UBFavoriteToolPalette.h | 2 ++ src/gui/UBFeaturesActionBar.cpp | 2 ++ src/gui/UBFeaturesActionBar.h | 2 ++ src/gui/UBFeaturesWidget.cpp | 2 ++ src/gui/UBFeaturesWidget.h | 2 ++ src/gui/UBFloatingPalette.cpp | 2 ++ src/gui/UBFloatingPalette.h | 2 ++ src/gui/UBIconButton.cpp | 2 ++ src/gui/UBIconButton.h | 2 ++ src/gui/UBKeyboardPalette.cpp | 2 ++ src/gui/UBKeyboardPalette.h | 2 ++ src/gui/UBKeyboardPalette_linux.cpp | 2 ++ src/gui/UBKeyboardPalette_mac.mm | 2 ++ src/gui/UBKeyboardPalette_win.cpp | 2 ++ src/gui/UBLeftPalette.cpp | 2 ++ src/gui/UBLeftPalette.h | 2 ++ src/gui/UBMagnifer.cpp | 2 ++ src/gui/UBMagnifer.h | 2 ++ src/gui/UBMainWindow.cpp | 2 ++ src/gui/UBMainWindow.h | 2 ++ src/gui/UBMessageWindow.cpp | 2 ++ src/gui/UBMessageWindow.h | 2 ++ src/gui/UBMessagesDialog.cpp | 2 ++ src/gui/UBMessagesDialog.h | 2 ++ src/gui/UBMousePressFilter.cpp | 2 ++ src/gui/UBMousePressFilter.h | 2 ++ src/gui/UBOpenSankoreImporterWidget.cpp | 2 ++ src/gui/UBOpenSankoreImporterWidget.h | 2 ++ src/gui/UBPageNavigationWidget.cpp | 2 ++ src/gui/UBPageNavigationWidget.h | 2 ++ src/gui/UBPropertyPalette.cpp | 2 ++ src/gui/UBPropertyPalette.h | 2 ++ src/gui/UBResources.cpp | 2 ++ src/gui/UBResources.h | 2 ++ src/gui/UBRightPalette.cpp | 2 ++ src/gui/UBRightPalette.h | 2 ++ src/gui/UBRubberBand.cpp | 2 ++ src/gui/UBRubberBand.h | 2 ++ src/gui/UBScreenMirror.cpp | 2 ++ src/gui/UBScreenMirror.h | 2 ++ src/gui/UBSpinningWheel.cpp | 2 ++ src/gui/UBSpinningWheel.h | 2 ++ src/gui/UBStartupHintsPalette.cpp | 17 +++++++++++------ src/gui/UBStartupHintsPalette.h | 17 +++++++++++------ src/gui/UBStylusPalette.cpp | 2 ++ src/gui/UBStylusPalette.h | 2 ++ src/gui/UBThumbnailView.cpp | 2 ++ src/gui/UBThumbnailView.h | 2 ++ src/gui/UBThumbnailWidget.cpp | 2 ++ src/gui/UBThumbnailWidget.h | 2 ++ src/gui/UBToolWidget.cpp | 2 ++ src/gui/UBToolWidget.h | 2 ++ src/gui/UBToolbarButtonGroup.cpp | 2 ++ src/gui/UBToolbarButtonGroup.h | 2 ++ src/gui/UBUpdateDlg.cpp | 2 ++ src/gui/UBUpdateDlg.h | 2 ++ src/gui/UBWebToolsPalette.cpp | 2 ++ src/gui/UBWebToolsPalette.h | 2 ++ src/gui/UBWidgetMirror.cpp | 2 ++ src/gui/UBWidgetMirror.h | 2 ++ src/gui/UBZoomPalette.cpp | 2 ++ src/gui/UBZoomPalette.h | 2 ++ src/network/UBAutoSaver.cpp | 2 ++ src/network/UBAutoSaver.h | 2 ++ src/network/UBCookieJar.cpp | 2 ++ src/network/UBCookieJar.h | 2 ++ src/network/UBHttpFileDownloader.cpp | 2 ++ src/network/UBHttpFileDownloader.h | 2 ++ src/network/UBHttpGet.cpp | 2 ++ src/network/UBHttpGet.h | 2 ++ src/network/UBNetworkAccessManager.cpp | 2 ++ src/network/UBNetworkAccessManager.h | 2 ++ src/network/UBServerXMLHttpRequest.cpp | 2 ++ src/network/UBServerXMLHttpRequest.h | 2 ++ src/pdf-merger/ASCII85Decode.cpp | 2 ++ src/pdf-merger/ASCII85Decode.h | 2 ++ src/pdf-merger/ASCIIHexDecode.cpp | 2 ++ src/pdf-merger/ASCIIHexDecode.h | 2 ++ src/pdf-merger/AbstractBoxElementHandler.h | 2 ++ src/pdf-merger/AnnotsHandler.cpp | 2 ++ src/pdf-merger/AnnotsHandler.h | 2 ++ src/pdf-merger/CCITTFaxDecode.cpp | 2 ++ src/pdf-merger/CCITTFaxDecode.h | 2 ++ src/pdf-merger/Config.h | 2 ++ src/pdf-merger/ContentHandler.cpp | 2 ++ src/pdf-merger/ContentHandler.h | 2 ++ src/pdf-merger/CropBoxElementHandler.h | 2 ++ src/pdf-merger/DCTDecode.cpp | 2 ++ src/pdf-merger/DCTDecode.h | 2 ++ src/pdf-merger/Decoder.h | 2 ++ src/pdf-merger/Document.cpp | 2 ++ src/pdf-merger/Document.h | 2 ++ src/pdf-merger/Exception.h | 2 ++ src/pdf-merger/FileIsAbsentException.h | 2 ++ src/pdf-merger/Filter.cpp | 2 ++ src/pdf-merger/Filter.h | 2 ++ src/pdf-merger/FilterPredictor.cpp | 2 ++ src/pdf-merger/FilterPredictor.h | 2 ++ src/pdf-merger/FlateDecode.cpp | 2 ++ src/pdf-merger/FlateDecode.h | 2 ++ src/pdf-merger/JBIG2Decode.cpp | 2 ++ src/pdf-merger/JBIG2Decode.h | 2 ++ src/pdf-merger/LZWDecode.cpp | 2 ++ src/pdf-merger/LZWDecode.h | 2 ++ src/pdf-merger/MediaBoxElementHandler.h | 2 ++ src/pdf-merger/MergePageDescription.h | 2 ++ src/pdf-merger/Merger.cpp | 2 ++ src/pdf-merger/Merger.h | 2 ++ src/pdf-merger/Object.cpp | 2 ++ src/pdf-merger/Object.h | 2 ++ src/pdf-merger/OverlayDocumentParser.cpp | 2 ++ src/pdf-merger/OverlayDocumentParser.h | 2 ++ src/pdf-merger/Page.cpp | 2 ++ src/pdf-merger/Page.h | 2 ++ src/pdf-merger/PageElementHandler.cpp | 2 ++ src/pdf-merger/PageElementHandler.h | 2 ++ src/pdf-merger/PageParser.h | 2 ++ src/pdf-merger/Parser.cpp | 2 ++ src/pdf-merger/Parser.h | 2 ++ src/pdf-merger/Rectangle.cpp | 2 ++ src/pdf-merger/Rectangle.h | 2 ++ src/pdf-merger/RemoveHimSelfHandler.h | 2 ++ src/pdf-merger/RemoveHimselfHandler.cpp | 2 ++ src/pdf-merger/RotationHandler.h | 2 ++ src/pdf-merger/RunLengthDecode.cpp | 2 ++ src/pdf-merger/RunLengthDecode.h | 2 ++ src/pdf-merger/Transformation.h | 2 ++ src/pdf-merger/TypeElementHandler.h | 2 ++ src/pdf-merger/Utils.cpp | 2 ++ src/pdf-merger/Utils.h | 2 ++ src/pdf/GraphicsPDFItem.cpp | 2 ++ src/pdf/GraphicsPDFItem.h | 2 ++ src/pdf/PDFRenderer.cpp | 2 ++ src/pdf/PDFRenderer.h | 2 ++ src/pdf/UBWebPluginPDFWidget.cpp | 2 ++ src/pdf/UBWebPluginPDFWidget.h | 2 ++ src/pdf/XPDFRenderer.cpp | 2 ++ src/pdf/XPDFRenderer.h | 2 ++ src/podcast/UBAbstractVideoEncoder.cpp | 2 ++ src/podcast/UBAbstractVideoEncoder.h | 2 ++ src/podcast/UBPodcastController.cpp | 2 ++ src/podcast/UBPodcastController.h | 2 ++ src/podcast/UBPodcastRecordingPalette.cpp | 2 ++ src/podcast/UBPodcastRecordingPalette.h | 2 ++ .../intranet/UBIntranetPodcastPublisher.cpp | 2 ++ .../intranet/UBIntranetPodcastPublisher.h | 2 ++ src/podcast/quicktime/UBAudioQueueRecorder.cpp | 2 ++ src/podcast/quicktime/UBAudioQueueRecorder.h | 2 ++ src/podcast/quicktime/UBQuickTimeFile.h | 2 ++ src/podcast/quicktime/UBQuickTimeFile.mm | 2 ++ .../quicktime/UBQuickTimeVideoEncoder.cpp | 2 ++ src/podcast/quicktime/UBQuickTimeVideoEncoder.h | 2 ++ src/podcast/windowsmedia/UBWaveRecorder.cpp | 2 ++ src/podcast/windowsmedia/UBWaveRecorder.h | 2 ++ src/podcast/windowsmedia/UBWindowsMediaFile.cpp | 2 ++ src/podcast/windowsmedia/UBWindowsMediaFile.h | 2 ++ .../windowsmedia/UBWindowsMediaVideoEncoder.cpp | 2 ++ .../windowsmedia/UBWindowsMediaVideoEncoder.h | 2 ++ src/podcast/youtube/UBYouTubePublisher.cpp | 2 ++ src/podcast/youtube/UBYouTubePublisher.h | 2 ++ src/tools/UBAbstractDrawRuler.cpp | 2 ++ src/tools/UBAbstractDrawRuler.h | 2 ++ src/tools/UBGraphicsCache.cpp | 2 ++ src/tools/UBGraphicsCache.h | 2 ++ src/tools/UBGraphicsCompass.cpp | 2 ++ src/tools/UBGraphicsCompass.h | 2 ++ src/tools/UBGraphicsCurtainItem.cpp | 2 ++ src/tools/UBGraphicsCurtainItem.h | 2 ++ src/tools/UBGraphicsCurtainItemDelegate.cpp | 2 ++ src/tools/UBGraphicsCurtainItemDelegate.h | 2 ++ src/tools/UBGraphicsProtractor.cpp | 2 ++ src/tools/UBGraphicsProtractor.h | 2 ++ src/tools/UBGraphicsRuler.cpp | 2 ++ src/tools/UBGraphicsRuler.h | 2 ++ src/tools/UBGraphicsTriangle.cpp | 2 ++ src/tools/UBGraphicsTriangle.h | 2 ++ src/tools/UBToolsManager.cpp | 2 ++ src/tools/UBToolsManager.h | 2 ++ src/web/UBOEmbedParser.cpp | 2 ++ src/web/UBOEmbedParser.h | 2 ++ src/web/UBTrapFlashController.cpp | 2 ++ src/web/UBTrapFlashController.h | 2 ++ src/web/UBWebController.cpp | 2 ++ src/web/UBWebController.h | 2 ++ src/web/UBWebKitUtils.cpp | 2 ++ src/web/UBWebKitUtils.h | 2 ++ src/web/UBWebPage.cpp | 2 ++ src/web/UBWebPage.h | 2 ++ src/web/UBWebPluginWidget.cpp | 2 ++ src/web/UBWebPluginWidget.h | 2 ++ src/web/browser/WBBrowserWindow.cpp | 2 ++ src/web/browser/WBBrowserWindow.h | 2 ++ src/web/browser/WBChaseWidget.cpp | 2 ++ src/web/browser/WBChaseWidget.h | 2 ++ src/web/browser/WBDownloadManager.cpp | 2 ++ src/web/browser/WBDownloadManager.h | 2 ++ src/web/browser/WBEditTableView.cpp | 2 ++ src/web/browser/WBEditTableView.h | 2 ++ src/web/browser/WBHistory.cpp | 2 ++ src/web/browser/WBHistory.h | 2 ++ src/web/browser/WBModelMenu.cpp | 2 ++ src/web/browser/WBModelMenu.h | 2 ++ src/web/browser/WBSearchLineEdit.cpp | 2 ++ src/web/browser/WBSearchLineEdit.h | 2 ++ src/web/browser/WBSqueezeLabel.cpp | 2 ++ src/web/browser/WBSqueezeLabel.h | 2 ++ src/web/browser/WBTabWidget.cpp | 2 ++ src/web/browser/WBTabWidget.h | 2 ++ src/web/browser/WBToolBarSearch.cpp | 2 ++ src/web/browser/WBToolBarSearch.h | 2 ++ src/web/browser/WBUrlLineEdit.cpp | 2 ++ src/web/browser/WBUrlLineEdit.h | 2 ++ src/web/browser/WBWebTrapWebView.cpp | 2 ++ src/web/browser/WBWebTrapWebView.h | 2 ++ src/web/browser/WBWebView.cpp | 2 ++ src/web/browser/WBWebView.h | 2 ++ 423 files changed, 870 insertions(+), 16 deletions(-) diff --git a/C++StandardHeaderFile.txt b/C++StandardHeaderFile.txt index e7d33d80..af17dcf1 100644 --- a/C++StandardHeaderFile.txt +++ b/C++StandardHeaderFile.txt @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour @@ -21,5 +23,3 @@ * You should have received a copy of the GNU General Public License * along with OpenBoard. If not, see . */ - - diff --git a/src/adaptors/UBExportAdaptor.cpp b/src/adaptors/UBExportAdaptor.cpp index 0a8855db..7d985eaa 100644 --- a/src/adaptors/UBExportAdaptor.cpp +++ b/src/adaptors/UBExportAdaptor.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBExportAdaptor.h b/src/adaptors/UBExportAdaptor.h index f82c4002..d80f34f9 100644 --- a/src/adaptors/UBExportAdaptor.h +++ b/src/adaptors/UBExportAdaptor.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBExportDocument.cpp b/src/adaptors/UBExportDocument.cpp index f10af164..63928615 100644 --- a/src/adaptors/UBExportDocument.cpp +++ b/src/adaptors/UBExportDocument.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBExportDocument.h b/src/adaptors/UBExportDocument.h index cbd44ef5..a0e55287 100644 --- a/src/adaptors/UBExportDocument.h +++ b/src/adaptors/UBExportDocument.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBExportFullPDF.cpp b/src/adaptors/UBExportFullPDF.cpp index d370e548..823c21d0 100644 --- a/src/adaptors/UBExportFullPDF.cpp +++ b/src/adaptors/UBExportFullPDF.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBExportFullPDF.h b/src/adaptors/UBExportFullPDF.h index 0f29e227..ffe214f1 100644 --- a/src/adaptors/UBExportFullPDF.h +++ b/src/adaptors/UBExportFullPDF.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBExportPDF.cpp b/src/adaptors/UBExportPDF.cpp index 22bccfe8..ad9aaa5a 100644 --- a/src/adaptors/UBExportPDF.cpp +++ b/src/adaptors/UBExportPDF.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBExportPDF.h b/src/adaptors/UBExportPDF.h index 1ee7596c..4980399a 100644 --- a/src/adaptors/UBExportPDF.h +++ b/src/adaptors/UBExportPDF.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBExportWeb.cpp b/src/adaptors/UBExportWeb.cpp index 583e19c9..ad9ef75f 100644 --- a/src/adaptors/UBExportWeb.cpp +++ b/src/adaptors/UBExportWeb.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBExportWeb.h b/src/adaptors/UBExportWeb.h index 577f5c6d..b2eafc92 100644 --- a/src/adaptors/UBExportWeb.h +++ b/src/adaptors/UBExportWeb.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBImportAdaptor.cpp b/src/adaptors/UBImportAdaptor.cpp index 2d6a3958..5ba9baa4 100644 --- a/src/adaptors/UBImportAdaptor.cpp +++ b/src/adaptors/UBImportAdaptor.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBImportAdaptor.h b/src/adaptors/UBImportAdaptor.h index e40ccfe7..d53e0f05 100644 --- a/src/adaptors/UBImportAdaptor.h +++ b/src/adaptors/UBImportAdaptor.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBImportDocument.cpp b/src/adaptors/UBImportDocument.cpp index b22645a7..43e517d8 100644 --- a/src/adaptors/UBImportDocument.cpp +++ b/src/adaptors/UBImportDocument.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBImportDocument.h b/src/adaptors/UBImportDocument.h index 32a35b68..526f1533 100644 --- a/src/adaptors/UBImportDocument.h +++ b/src/adaptors/UBImportDocument.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBImportImage.cpp b/src/adaptors/UBImportImage.cpp index b10a1592..d0926bd8 100644 --- a/src/adaptors/UBImportImage.cpp +++ b/src/adaptors/UBImportImage.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBImportImage.h b/src/adaptors/UBImportImage.h index b878e965..59c086cf 100644 --- a/src/adaptors/UBImportImage.h +++ b/src/adaptors/UBImportImage.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBImportPDF.cpp b/src/adaptors/UBImportPDF.cpp index e4de2da1..205fe5d7 100644 --- a/src/adaptors/UBImportPDF.cpp +++ b/src/adaptors/UBImportPDF.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBImportPDF.h b/src/adaptors/UBImportPDF.h index 335cb31b..83205761 100644 --- a/src/adaptors/UBImportPDF.h +++ b/src/adaptors/UBImportPDF.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp index f8ba2f52..521873a1 100644 --- a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp +++ b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBMetadataDcSubsetAdaptor.h b/src/adaptors/UBMetadataDcSubsetAdaptor.h index c593311e..f3e5ce39 100644 --- a/src/adaptors/UBMetadataDcSubsetAdaptor.h +++ b/src/adaptors/UBMetadataDcSubsetAdaptor.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 408cb648..733a9e49 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBSvgSubsetAdaptor.h b/src/adaptors/UBSvgSubsetAdaptor.h index 91f61e94..e081e6a4 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.h +++ b/src/adaptors/UBSvgSubsetAdaptor.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBThumbnailAdaptor.cpp b/src/adaptors/UBThumbnailAdaptor.cpp index 660e3a7f..b0b6a141 100644 --- a/src/adaptors/UBThumbnailAdaptor.cpp +++ b/src/adaptors/UBThumbnailAdaptor.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/UBThumbnailAdaptor.h b/src/adaptors/UBThumbnailAdaptor.h index 1c2404a8..1e55ab38 100644 --- a/src/adaptors/UBThumbnailAdaptor.h +++ b/src/adaptors/UBThumbnailAdaptor.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/publishing/UBDocumentPublisher.cpp b/src/adaptors/publishing/UBDocumentPublisher.cpp index b285d493..991486b0 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.cpp +++ b/src/adaptors/publishing/UBDocumentPublisher.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/publishing/UBDocumentPublisher.h b/src/adaptors/publishing/UBDocumentPublisher.h index 21f993b2..7ee2be65 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.h +++ b/src/adaptors/publishing/UBDocumentPublisher.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/publishing/UBSvgSubsetRasterizer.cpp b/src/adaptors/publishing/UBSvgSubsetRasterizer.cpp index 6bc85368..b0ca3d4e 100644 --- a/src/adaptors/publishing/UBSvgSubsetRasterizer.cpp +++ b/src/adaptors/publishing/UBSvgSubsetRasterizer.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/adaptors/publishing/UBSvgSubsetRasterizer.h b/src/adaptors/publishing/UBSvgSubsetRasterizer.h index 8dd0226a..dcbe1e50 100644 --- a/src/adaptors/publishing/UBSvgSubsetRasterizer.h +++ b/src/adaptors/publishing/UBSvgSubsetRasterizer.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/api/UBLibraryAPI.cpp b/src/api/UBLibraryAPI.cpp index 5d270764..f5d7ca29 100644 --- a/src/api/UBLibraryAPI.cpp +++ b/src/api/UBLibraryAPI.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/api/UBLibraryAPI.h b/src/api/UBLibraryAPI.h index ba9a547a..61e1e0f8 100644 --- a/src/api/UBLibraryAPI.h +++ b/src/api/UBLibraryAPI.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/api/UBW3CWidgetAPI.cpp b/src/api/UBW3CWidgetAPI.cpp index a4a4d4d4..e5ead103 100644 --- a/src/api/UBW3CWidgetAPI.cpp +++ b/src/api/UBW3CWidgetAPI.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/api/UBW3CWidgetAPI.h b/src/api/UBW3CWidgetAPI.h index 408ce228..d8c9095f 100644 --- a/src/api/UBW3CWidgetAPI.h +++ b/src/api/UBW3CWidgetAPI.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/api/UBWidgetMessageAPI.cpp b/src/api/UBWidgetMessageAPI.cpp index 9d6c6aba..7f34c93b 100644 --- a/src/api/UBWidgetMessageAPI.cpp +++ b/src/api/UBWidgetMessageAPI.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/api/UBWidgetMessageAPI.h b/src/api/UBWidgetMessageAPI.h index 10ccc3c5..552171d4 100644 --- a/src/api/UBWidgetMessageAPI.h +++ b/src/api/UBWidgetMessageAPI.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/api/UBWidgetUniboardAPI.cpp b/src/api/UBWidgetUniboardAPI.cpp index c4d381e9..c84bb546 100644 --- a/src/api/UBWidgetUniboardAPI.cpp +++ b/src/api/UBWidgetUniboardAPI.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/api/UBWidgetUniboardAPI.h b/src/api/UBWidgetUniboardAPI.h index b1683d4d..3d78f6b5 100644 --- a/src/api/UBWidgetUniboardAPI.h +++ b/src/api/UBWidgetUniboardAPI.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index 6ebe8ee5..c7e1c657 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/board/UBBoardController.h b/src/board/UBBoardController.h index bc1481d5..f57b21ef 100644 --- a/src/board/UBBoardController.h +++ b/src/board/UBBoardController.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index ec28609e..89cf5067 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/board/UBBoardPaletteManager.h b/src/board/UBBoardPaletteManager.h index 516dfeb7..e6b42aa1 100644 --- a/src/board/UBBoardPaletteManager.h +++ b/src/board/UBBoardPaletteManager.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index d4db4b75..34ed6f1f 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/board/UBBoardView.h b/src/board/UBBoardView.h index 6883590f..9605e27d 100644 --- a/src/board/UBBoardView.h +++ b/src/board/UBBoardView.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/board/UBDrawingController.cpp b/src/board/UBDrawingController.cpp index 318a0d08..8fcd01ed 100644 --- a/src/board/UBDrawingController.cpp +++ b/src/board/UBDrawingController.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/board/UBDrawingController.h b/src/board/UBDrawingController.h index 5f6be108..e5269c28 100644 --- a/src/board/UBDrawingController.h +++ b/src/board/UBDrawingController.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp index 8f2c9ff0..a53edd8f 100644 --- a/src/board/UBFeaturesController.cpp +++ b/src/board/UBFeaturesController.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/board/UBFeaturesController.h b/src/board/UBFeaturesController.h index 52337eb1..aac1cf5e 100644 --- a/src/board/UBFeaturesController.h +++ b/src/board/UBFeaturesController.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UB.h b/src/core/UB.h index d4bc8db6..651ac139 100644 --- a/src/core/UB.h +++ b/src/core/UB.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index 9e08461b..e364027d 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBApplication.h b/src/core/UBApplication.h index 848b96d3..914077f7 100644 --- a/src/core/UBApplication.h +++ b/src/core/UBApplication.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index daee10dd..48d670ad 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBApplicationController.h b/src/core/UBApplicationController.h index 4774e033..03ace3a9 100644 --- a/src/core/UBApplicationController.h +++ b/src/core/UBApplicationController.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp index 89a80b96..8176da50 100644 --- a/src/core/UBDisplayManager.cpp +++ b/src/core/UBDisplayManager.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBDisplayManager.h b/src/core/UBDisplayManager.h index a305716e..0c96cb80 100644 --- a/src/core/UBDisplayManager.h +++ b/src/core/UBDisplayManager.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBDocumentManager.cpp b/src/core/UBDocumentManager.cpp index 60aaa408..6e95158c 100644 --- a/src/core/UBDocumentManager.cpp +++ b/src/core/UBDocumentManager.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBDocumentManager.h b/src/core/UBDocumentManager.h index ed47115b..dd598e04 100644 --- a/src/core/UBDocumentManager.h +++ b/src/core/UBDocumentManager.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBDownloadManager.cpp b/src/core/UBDownloadManager.cpp index 666f5690..134318c2 100644 --- a/src/core/UBDownloadManager.cpp +++ b/src/core/UBDownloadManager.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBDownloadManager.h b/src/core/UBDownloadManager.h index 628173a1..3f8d00a7 100644 --- a/src/core/UBDownloadManager.h +++ b/src/core/UBDownloadManager.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBDownloadThread.cpp b/src/core/UBDownloadThread.cpp index 5be1d73d..b7394ec3 100644 --- a/src/core/UBDownloadThread.cpp +++ b/src/core/UBDownloadThread.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBDownloadThread.h b/src/core/UBDownloadThread.h index bd71335e..aa77dc00 100644 --- a/src/core/UBDownloadThread.h +++ b/src/core/UBDownloadThread.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBIdleTimer.cpp b/src/core/UBIdleTimer.cpp index 7915aea0..bcf22534 100644 --- a/src/core/UBIdleTimer.cpp +++ b/src/core/UBIdleTimer.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBIdleTimer.h b/src/core/UBIdleTimer.h index 18899360..771c350c 100644 --- a/src/core/UBIdleTimer.h +++ b/src/core/UBIdleTimer.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBMimeData.cpp b/src/core/UBMimeData.cpp index fecfcfe6..8634d9bd 100644 --- a/src/core/UBMimeData.cpp +++ b/src/core/UBMimeData.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBMimeData.h b/src/core/UBMimeData.h index 128f0f01..c7f7433a 100644 --- a/src/core/UBMimeData.h +++ b/src/core/UBMimeData.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBOpenSankoreImporter.cpp b/src/core/UBOpenSankoreImporter.cpp index 1f0c2db5..955f3f71 100644 --- a/src/core/UBOpenSankoreImporter.cpp +++ b/src/core/UBOpenSankoreImporter.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBOpenSankoreImporter.h b/src/core/UBOpenSankoreImporter.h index 87f47727..b2c08a9e 100644 --- a/src/core/UBOpenSankoreImporter.h +++ b/src/core/UBOpenSankoreImporter.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index ebd31f25..bcef40aa 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBPersistenceManager.h b/src/core/UBPersistenceManager.h index e2380493..bd981106 100644 --- a/src/core/UBPersistenceManager.h +++ b/src/core/UBPersistenceManager.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBPersistenceWorker.cpp b/src/core/UBPersistenceWorker.cpp index e19c09c9..cd92277d 100644 --- a/src/core/UBPersistenceWorker.cpp +++ b/src/core/UBPersistenceWorker.cpp @@ -1,6 +1,10 @@ /* - * Copyright (C) 2013-2014 Open Education Foundation + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) * + * Copyright (C) 2013 Open Education Foundation + * + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour + * l'Education Numérique en Afrique (GIP ENA) * * This file is part of OpenBoard. * diff --git a/src/core/UBPersistenceWorker.h b/src/core/UBPersistenceWorker.h index b4f77a0a..2b8370f4 100644 --- a/src/core/UBPersistenceWorker.h +++ b/src/core/UBPersistenceWorker.h @@ -1,6 +1,10 @@ /* - * Copyright (C) 2013-2014 Open Education Foundation + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) * + * Copyright (C) 2013 Open Education Foundation + * + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour + * l'Education Numérique en Afrique (GIP ENA) * * This file is part of OpenBoard. * diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp index e2ec529e..9fef16a1 100644 --- a/src/core/UBPreferencesController.cpp +++ b/src/core/UBPreferencesController.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBPreferencesController.h b/src/core/UBPreferencesController.h index a73ffc4a..3c129d03 100644 --- a/src/core/UBPreferencesController.h +++ b/src/core/UBPreferencesController.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBSceneCache.cpp b/src/core/UBSceneCache.cpp index 078ed317..086535e5 100644 --- a/src/core/UBSceneCache.cpp +++ b/src/core/UBSceneCache.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBSceneCache.h b/src/core/UBSceneCache.h index 08a4070f..dcc47fb3 100644 --- a/src/core/UBSceneCache.h +++ b/src/core/UBSceneCache.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBSetting.cpp b/src/core/UBSetting.cpp index 8cedb8f0..3340ea8f 100644 --- a/src/core/UBSetting.cpp +++ b/src/core/UBSetting.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBSetting.h b/src/core/UBSetting.h index 01ac9f35..18d6cdf7 100644 --- a/src/core/UBSetting.h +++ b/src/core/UBSetting.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index d0dfc237..7943066f 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index b7e0bc08..7b676e96 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBTextTools.cpp b/src/core/UBTextTools.cpp index de032f25..398ca175 100644 --- a/src/core/UBTextTools.cpp +++ b/src/core/UBTextTools.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/UBTextTools.h b/src/core/UBTextTools.h index 1ebd04cc..d274de62 100644 --- a/src/core/UBTextTools.h +++ b/src/core/UBTextTools.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/main.cpp b/src/core/main.cpp index ab2aa08e..bd8ca102 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/core/memcheck.h b/src/core/memcheck.h index 8a39e88a..95c416ab 100644 --- a/src/core/memcheck.h +++ b/src/core/memcheck.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBCustomCaptureWindow.cpp b/src/desktop/UBCustomCaptureWindow.cpp index 19e3434a..da8011f5 100644 --- a/src/desktop/UBCustomCaptureWindow.cpp +++ b/src/desktop/UBCustomCaptureWindow.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBCustomCaptureWindow.h b/src/desktop/UBCustomCaptureWindow.h index af0c8b63..79f51c62 100644 --- a/src/desktop/UBCustomCaptureWindow.h +++ b/src/desktop/UBCustomCaptureWindow.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index 1fb97835..894b33bc 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBDesktopAnnotationController.h b/src/desktop/UBDesktopAnnotationController.h index b9cac63b..24c80f3b 100644 --- a/src/desktop/UBDesktopAnnotationController.h +++ b/src/desktop/UBDesktopAnnotationController.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBDesktopPalette.cpp b/src/desktop/UBDesktopPalette.cpp index de53f032..30baa8c5 100644 --- a/src/desktop/UBDesktopPalette.cpp +++ b/src/desktop/UBDesktopPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBDesktopPalette.h b/src/desktop/UBDesktopPalette.h index 6ed1f89d..950dd75c 100644 --- a/src/desktop/UBDesktopPalette.h +++ b/src/desktop/UBDesktopPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBDesktopPropertyPalette.cpp b/src/desktop/UBDesktopPropertyPalette.cpp index 6a65c43c..17c2e7cd 100644 --- a/src/desktop/UBDesktopPropertyPalette.cpp +++ b/src/desktop/UBDesktopPropertyPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBDesktopPropertyPalette.h b/src/desktop/UBDesktopPropertyPalette.h index 49fa330b..25f4e005 100644 --- a/src/desktop/UBDesktopPropertyPalette.h +++ b/src/desktop/UBDesktopPropertyPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBWindowCapture.h b/src/desktop/UBWindowCapture.h index 65f3f9fa..0fdc7bf9 100644 --- a/src/desktop/UBWindowCapture.h +++ b/src/desktop/UBWindowCapture.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBWindowCaptureDelegate_win.cpp b/src/desktop/UBWindowCaptureDelegate_win.cpp index cc43b489..a0a690a6 100644 --- a/src/desktop/UBWindowCaptureDelegate_win.cpp +++ b/src/desktop/UBWindowCaptureDelegate_win.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBWindowCaptureDelegate_win.h b/src/desktop/UBWindowCaptureDelegate_win.h index 7db5a5b7..ab40a6e5 100644 --- a/src/desktop/UBWindowCaptureDelegate_win.h +++ b/src/desktop/UBWindowCaptureDelegate_win.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBWindowCapture_linux.cpp b/src/desktop/UBWindowCapture_linux.cpp index bc84b2ac..a45ed0a1 100644 --- a/src/desktop/UBWindowCapture_linux.cpp +++ b/src/desktop/UBWindowCapture_linux.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBWindowCapture_mac.mm b/src/desktop/UBWindowCapture_mac.mm index 1de369fe..0cbd590f 100644 --- a/src/desktop/UBWindowCapture_mac.mm +++ b/src/desktop/UBWindowCapture_mac.mm @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/desktop/UBWindowCapture_win.cpp b/src/desktop/UBWindowCapture_win.cpp index 6af4f4d5..601fe587 100644 --- a/src/desktop/UBWindowCapture_win.cpp +++ b/src/desktop/UBWindowCapture_win.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/document/UBDocumentContainer.cpp b/src/document/UBDocumentContainer.cpp index fcd9803a..e6f30d03 100644 --- a/src/document/UBDocumentContainer.cpp +++ b/src/document/UBDocumentContainer.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/document/UBDocumentContainer.h b/src/document/UBDocumentContainer.h index f84232bf..4fc35b96 100644 --- a/src/document/UBDocumentContainer.h +++ b/src/document/UBDocumentContainer.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index c333d8d8..80f0be5a 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/document/UBDocumentController.h b/src/document/UBDocumentController.h index 60e3b19d..f4614174 100644 --- a/src/document/UBDocumentController.h +++ b/src/document/UBDocumentController.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/document/UBDocumentProxy.cpp b/src/document/UBDocumentProxy.cpp index a87ae4c0..cd5847d3 100644 --- a/src/document/UBDocumentProxy.cpp +++ b/src/document/UBDocumentProxy.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/document/UBDocumentProxy.h b/src/document/UBDocumentProxy.h index 8ccfbe4a..bb9d7794 100644 --- a/src/document/UBDocumentProxy.h +++ b/src/document/UBDocumentProxy.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp index 90c0f4b0..9eb2c597 100644 --- a/src/domain/UBGraphicsDelegateFrame.cpp +++ b/src/domain/UBGraphicsDelegateFrame.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsDelegateFrame.h b/src/domain/UBGraphicsDelegateFrame.h index 8e16e2b2..44b8a87b 100644 --- a/src/domain/UBGraphicsDelegateFrame.h +++ b/src/domain/UBGraphicsDelegateFrame.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsGroupContainerItem.cpp b/src/domain/UBGraphicsGroupContainerItem.cpp index 78bd4431..a4f45a62 100644 --- a/src/domain/UBGraphicsGroupContainerItem.cpp +++ b/src/domain/UBGraphicsGroupContainerItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsGroupContainerItem.h b/src/domain/UBGraphicsGroupContainerItem.h index ac2a0254..13b2c22a 100644 --- a/src/domain/UBGraphicsGroupContainerItem.h +++ b/src/domain/UBGraphicsGroupContainerItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp index 2c24be42..af19335d 100644 --- a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp +++ b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsGroupContainerItemDelegate.h b/src/domain/UBGraphicsGroupContainerItemDelegate.h index 27046481..800fae15 100644 --- a/src/domain/UBGraphicsGroupContainerItemDelegate.h +++ b/src/domain/UBGraphicsGroupContainerItemDelegate.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp index 2d7caccb..f7f76f5c 100644 --- a/src/domain/UBGraphicsItemDelegate.cpp +++ b/src/domain/UBGraphicsItemDelegate.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsItemDelegate.h b/src/domain/UBGraphicsItemDelegate.h index 2dd3a33a..ef9f1e0f 100644 --- a/src/domain/UBGraphicsItemDelegate.h +++ b/src/domain/UBGraphicsItemDelegate.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsItemGroupUndoCommand.cpp b/src/domain/UBGraphicsItemGroupUndoCommand.cpp index 53f5d257..d654c34d 100644 --- a/src/domain/UBGraphicsItemGroupUndoCommand.cpp +++ b/src/domain/UBGraphicsItemGroupUndoCommand.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsItemGroupUndoCommand.h b/src/domain/UBGraphicsItemGroupUndoCommand.h index a6fa5c09..2a97c18a 100644 --- a/src/domain/UBGraphicsItemGroupUndoCommand.h +++ b/src/domain/UBGraphicsItemGroupUndoCommand.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsItemTransformUndoCommand.cpp b/src/domain/UBGraphicsItemTransformUndoCommand.cpp index 2c6d6771..fad0a3af 100644 --- a/src/domain/UBGraphicsItemTransformUndoCommand.cpp +++ b/src/domain/UBGraphicsItemTransformUndoCommand.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsItemTransformUndoCommand.h b/src/domain/UBGraphicsItemTransformUndoCommand.h index 86e4d0d7..da67efad 100644 --- a/src/domain/UBGraphicsItemTransformUndoCommand.h +++ b/src/domain/UBGraphicsItemTransformUndoCommand.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsItemUndoCommand.cpp b/src/domain/UBGraphicsItemUndoCommand.cpp index 7660d5d8..ee23a7bb 100644 --- a/src/domain/UBGraphicsItemUndoCommand.cpp +++ b/src/domain/UBGraphicsItemUndoCommand.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsItemUndoCommand.h b/src/domain/UBGraphicsItemUndoCommand.h index 51852bb8..e2975b0c 100644 --- a/src/domain/UBGraphicsItemUndoCommand.h +++ b/src/domain/UBGraphicsItemUndoCommand.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsItemZLevelUndoCommand.cpp b/src/domain/UBGraphicsItemZLevelUndoCommand.cpp index db8f8b3f..2e5eefe6 100644 --- a/src/domain/UBGraphicsItemZLevelUndoCommand.cpp +++ b/src/domain/UBGraphicsItemZLevelUndoCommand.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsItemZLevelUndoCommand.h b/src/domain/UBGraphicsItemZLevelUndoCommand.h index 610fbd24..45117c60 100644 --- a/src/domain/UBGraphicsItemZLevelUndoCommand.h +++ b/src/domain/UBGraphicsItemZLevelUndoCommand.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp index a7bde3ee..a9ed21f3 100644 --- a/src/domain/UBGraphicsMediaItem.cpp +++ b/src/domain/UBGraphicsMediaItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsMediaItem.h b/src/domain/UBGraphicsMediaItem.h index c69f9372..34b70b95 100644 --- a/src/domain/UBGraphicsMediaItem.h +++ b/src/domain/UBGraphicsMediaItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsMediaItemDelegate.cpp b/src/domain/UBGraphicsMediaItemDelegate.cpp index a9082f2f..1c7635ad 100644 --- a/src/domain/UBGraphicsMediaItemDelegate.cpp +++ b/src/domain/UBGraphicsMediaItemDelegate.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsMediaItemDelegate.h b/src/domain/UBGraphicsMediaItemDelegate.h index a9e20041..47b59cf4 100644 --- a/src/domain/UBGraphicsMediaItemDelegate.h +++ b/src/domain/UBGraphicsMediaItemDelegate.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsPDFItem.cpp b/src/domain/UBGraphicsPDFItem.cpp index 09e68b9a..7b79d864 100644 --- a/src/domain/UBGraphicsPDFItem.cpp +++ b/src/domain/UBGraphicsPDFItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsPDFItem.h b/src/domain/UBGraphicsPDFItem.h index 5a457298..9f4a6ede 100644 --- a/src/domain/UBGraphicsPDFItem.h +++ b/src/domain/UBGraphicsPDFItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsPixmapItem.cpp b/src/domain/UBGraphicsPixmapItem.cpp index 522a9cb6..6a5e6072 100644 --- a/src/domain/UBGraphicsPixmapItem.cpp +++ b/src/domain/UBGraphicsPixmapItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsPixmapItem.h b/src/domain/UBGraphicsPixmapItem.h index 2884a05a..4c3e0670 100644 --- a/src/domain/UBGraphicsPixmapItem.h +++ b/src/domain/UBGraphicsPixmapItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsPolygonItem.cpp b/src/domain/UBGraphicsPolygonItem.cpp index 3ba4861c..d5f8d4f6 100644 --- a/src/domain/UBGraphicsPolygonItem.cpp +++ b/src/domain/UBGraphicsPolygonItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsPolygonItem.h b/src/domain/UBGraphicsPolygonItem.h index 600e4598..eb5eb815 100644 --- a/src/domain/UBGraphicsPolygonItem.h +++ b/src/domain/UBGraphicsPolygonItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsProxyWidget.cpp b/src/domain/UBGraphicsProxyWidget.cpp index efae1bca..6e68fc26 100644 --- a/src/domain/UBGraphicsProxyWidget.cpp +++ b/src/domain/UBGraphicsProxyWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsProxyWidget.h b/src/domain/UBGraphicsProxyWidget.h index dc369453..94d4a061 100644 --- a/src/domain/UBGraphicsProxyWidget.h +++ b/src/domain/UBGraphicsProxyWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index f4091c21..b38c8936 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h index b040cf2e..f445beef 100644 --- a/src/domain/UBGraphicsScene.h +++ b/src/domain/UBGraphicsScene.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsStroke.cpp b/src/domain/UBGraphicsStroke.cpp index f6954b47..7e124a11 100644 --- a/src/domain/UBGraphicsStroke.cpp +++ b/src/domain/UBGraphicsStroke.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsStroke.h b/src/domain/UBGraphicsStroke.h index d7f8852d..4b6759d6 100644 --- a/src/domain/UBGraphicsStroke.h +++ b/src/domain/UBGraphicsStroke.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsStrokesGroup.cpp b/src/domain/UBGraphicsStrokesGroup.cpp index b2275a1e..a2606700 100644 --- a/src/domain/UBGraphicsStrokesGroup.cpp +++ b/src/domain/UBGraphicsStrokesGroup.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsStrokesGroup.h b/src/domain/UBGraphicsStrokesGroup.h index 1d249d0c..1d70ac3a 100644 --- a/src/domain/UBGraphicsStrokesGroup.h +++ b/src/domain/UBGraphicsStrokesGroup.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsSvgItem.cpp b/src/domain/UBGraphicsSvgItem.cpp index b2afec66..81f81333 100644 --- a/src/domain/UBGraphicsSvgItem.cpp +++ b/src/domain/UBGraphicsSvgItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsSvgItem.h b/src/domain/UBGraphicsSvgItem.h index bdfe6a0d..b5b52543 100644 --- a/src/domain/UBGraphicsSvgItem.h +++ b/src/domain/UBGraphicsSvgItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsTextItem.cpp b/src/domain/UBGraphicsTextItem.cpp index aa389856..f559bee3 100644 --- a/src/domain/UBGraphicsTextItem.cpp +++ b/src/domain/UBGraphicsTextItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsTextItem.h b/src/domain/UBGraphicsTextItem.h index 806b2112..bb001a26 100644 --- a/src/domain/UBGraphicsTextItem.h +++ b/src/domain/UBGraphicsTextItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsTextItemDelegate.cpp b/src/domain/UBGraphicsTextItemDelegate.cpp index fe9f15bb..1d9267b6 100644 --- a/src/domain/UBGraphicsTextItemDelegate.cpp +++ b/src/domain/UBGraphicsTextItemDelegate.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsTextItemDelegate.h b/src/domain/UBGraphicsTextItemDelegate.h index de07c738..bfd99229 100644 --- a/src/domain/UBGraphicsTextItemDelegate.h +++ b/src/domain/UBGraphicsTextItemDelegate.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsTextItemUndoCommand.cpp b/src/domain/UBGraphicsTextItemUndoCommand.cpp index d60d33eb..a655cd38 100644 --- a/src/domain/UBGraphicsTextItemUndoCommand.cpp +++ b/src/domain/UBGraphicsTextItemUndoCommand.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsTextItemUndoCommand.h b/src/domain/UBGraphicsTextItemUndoCommand.h index 1ec468f9..ecb4d93f 100644 --- a/src/domain/UBGraphicsTextItemUndoCommand.h +++ b/src/domain/UBGraphicsTextItemUndoCommand.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index 47be954f..af2b36aa 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsWidgetItem.h b/src/domain/UBGraphicsWidgetItem.h index ab2633fe..37f21ba1 100644 --- a/src/domain/UBGraphicsWidgetItem.h +++ b/src/domain/UBGraphicsWidgetItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsWidgetItemDelegate.cpp b/src/domain/UBGraphicsWidgetItemDelegate.cpp index 7e4dc7c6..842eb569 100644 --- a/src/domain/UBGraphicsWidgetItemDelegate.cpp +++ b/src/domain/UBGraphicsWidgetItemDelegate.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBGraphicsWidgetItemDelegate.h b/src/domain/UBGraphicsWidgetItemDelegate.h index bc483253..501ad00c 100644 --- a/src/domain/UBGraphicsWidgetItemDelegate.h +++ b/src/domain/UBGraphicsWidgetItemDelegate.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBItem.cpp b/src/domain/UBItem.cpp index 34a2ccb8..7d756258 100644 --- a/src/domain/UBItem.cpp +++ b/src/domain/UBItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBItem.h b/src/domain/UBItem.h index 71966a6b..b52268d7 100644 --- a/src/domain/UBItem.h +++ b/src/domain/UBItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBPageSizeUndoCommand.cpp b/src/domain/UBPageSizeUndoCommand.cpp index 83e90344..dee14e13 100644 --- a/src/domain/UBPageSizeUndoCommand.cpp +++ b/src/domain/UBPageSizeUndoCommand.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBPageSizeUndoCommand.h b/src/domain/UBPageSizeUndoCommand.h index 2792a76b..ff175489 100644 --- a/src/domain/UBPageSizeUndoCommand.h +++ b/src/domain/UBPageSizeUndoCommand.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBResizableGraphicsItem.cpp b/src/domain/UBResizableGraphicsItem.cpp index 49829aa6..fd4eeadb 100644 --- a/src/domain/UBResizableGraphicsItem.cpp +++ b/src/domain/UBResizableGraphicsItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBResizableGraphicsItem.h b/src/domain/UBResizableGraphicsItem.h index 8af55d4e..1a2ddad8 100644 --- a/src/domain/UBResizableGraphicsItem.h +++ b/src/domain/UBResizableGraphicsItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBSelectionFrame.cpp b/src/domain/UBSelectionFrame.cpp index 72a28de9..ed3cbbd3 100644 --- a/src/domain/UBSelectionFrame.cpp +++ b/src/domain/UBSelectionFrame.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBSelectionFrame.h b/src/domain/UBSelectionFrame.h index 3428f4eb..47d482a6 100644 --- a/src/domain/UBSelectionFrame.h +++ b/src/domain/UBSelectionFrame.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBUndoCommand.cpp b/src/domain/UBUndoCommand.cpp index bbeaa9c3..bd89dc32 100644 --- a/src/domain/UBUndoCommand.cpp +++ b/src/domain/UBUndoCommand.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/domain/UBUndoCommand.h b/src/domain/UBUndoCommand.h index a59e13a4..dd5dcbc8 100644 --- a/src/domain/UBUndoCommand.h +++ b/src/domain/UBUndoCommand.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/MacUtils.h b/src/frameworks/MacUtils.h index e745bdc3..c7460594 100644 --- a/src/frameworks/MacUtils.h +++ b/src/frameworks/MacUtils.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBBase32.cpp b/src/frameworks/UBBase32.cpp index 92f755d2..6473cb5d 100644 --- a/src/frameworks/UBBase32.cpp +++ b/src/frameworks/UBBase32.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBBase32.h b/src/frameworks/UBBase32.h index 630378ad..f5110822 100644 --- a/src/frameworks/UBBase32.h +++ b/src/frameworks/UBBase32.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBCoreGraphicsScene.cpp b/src/frameworks/UBCoreGraphicsScene.cpp index 3d3c69c4..a63b278e 100644 --- a/src/frameworks/UBCoreGraphicsScene.cpp +++ b/src/frameworks/UBCoreGraphicsScene.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBCoreGraphicsScene.h b/src/frameworks/UBCoreGraphicsScene.h index 281ac820..c7cb6232 100644 --- a/src/frameworks/UBCoreGraphicsScene.h +++ b/src/frameworks/UBCoreGraphicsScene.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBCryptoUtils.cpp b/src/frameworks/UBCryptoUtils.cpp index f35d0f2c..814c7b65 100644 --- a/src/frameworks/UBCryptoUtils.cpp +++ b/src/frameworks/UBCryptoUtils.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBCryptoUtils.h b/src/frameworks/UBCryptoUtils.h index 1be44f6c..a063745f 100644 --- a/src/frameworks/UBCryptoUtils.h +++ b/src/frameworks/UBCryptoUtils.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBFileSystemUtils.cpp b/src/frameworks/UBFileSystemUtils.cpp index 1be67088..c0a988dd 100644 --- a/src/frameworks/UBFileSystemUtils.cpp +++ b/src/frameworks/UBFileSystemUtils.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBFileSystemUtils.h b/src/frameworks/UBFileSystemUtils.h index 62a26d39..243fcd89 100644 --- a/src/frameworks/UBFileSystemUtils.h +++ b/src/frameworks/UBFileSystemUtils.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBGeometryUtils.cpp b/src/frameworks/UBGeometryUtils.cpp index ea5f22b2..a453e9b8 100644 --- a/src/frameworks/UBGeometryUtils.cpp +++ b/src/frameworks/UBGeometryUtils.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBGeometryUtils.h b/src/frameworks/UBGeometryUtils.h index b54cfe97..83832401 100644 --- a/src/frameworks/UBGeometryUtils.h +++ b/src/frameworks/UBGeometryUtils.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBPlatformUtils.cpp b/src/frameworks/UBPlatformUtils.cpp index 5a6f1f3d..ed6df6f4 100644 --- a/src/frameworks/UBPlatformUtils.cpp +++ b/src/frameworks/UBPlatformUtils.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBPlatformUtils.h b/src/frameworks/UBPlatformUtils.h index af5578de..43d2d530 100644 --- a/src/frameworks/UBPlatformUtils.h +++ b/src/frameworks/UBPlatformUtils.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp index 08976488..23028a97 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index 1feb678c..f2a483e3 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp index 8f717504..38755449 100644 --- a/src/frameworks/UBPlatformUtils_win.cpp +++ b/src/frameworks/UBPlatformUtils_win.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBStringUtils.cpp b/src/frameworks/UBStringUtils.cpp index 4f41b3a6..9a12dd8a 100644 --- a/src/frameworks/UBStringUtils.cpp +++ b/src/frameworks/UBStringUtils.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBStringUtils.h b/src/frameworks/UBStringUtils.h index 1b72963a..5d590cf4 100644 --- a/src/frameworks/UBStringUtils.h +++ b/src/frameworks/UBStringUtils.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBVersion.cpp b/src/frameworks/UBVersion.cpp index 564f7777..a08c4fc7 100644 --- a/src/frameworks/UBVersion.cpp +++ b/src/frameworks/UBVersion.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/frameworks/UBVersion.h b/src/frameworks/UBVersion.h index ddda6edd..81f7de62 100644 --- a/src/frameworks/UBVersion.h +++ b/src/frameworks/UBVersion.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/globals/UBGlobals.h b/src/globals/UBGlobals.h index 89c6d272..f582345b 100644 --- a/src/globals/UBGlobals.h +++ b/src/globals/UBGlobals.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBActionPalette.cpp b/src/gui/UBActionPalette.cpp index 2eb69dae..ffbf6ac2 100644 --- a/src/gui/UBActionPalette.cpp +++ b/src/gui/UBActionPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBActionPalette.h b/src/gui/UBActionPalette.h index ed18d602..97752769 100644 --- a/src/gui/UBActionPalette.h +++ b/src/gui/UBActionPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBBlackoutWidget.cpp b/src/gui/UBBlackoutWidget.cpp index bfe43b76..676a6ecc 100644 --- a/src/gui/UBBlackoutWidget.cpp +++ b/src/gui/UBBlackoutWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBBlackoutWidget.h b/src/gui/UBBlackoutWidget.h index b76ecc15..5f9c8ab3 100644 --- a/src/gui/UBBlackoutWidget.h +++ b/src/gui/UBBlackoutWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBCachePropertiesWidget.cpp b/src/gui/UBCachePropertiesWidget.cpp index e60439da..3850017a 100644 --- a/src/gui/UBCachePropertiesWidget.cpp +++ b/src/gui/UBCachePropertiesWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBCachePropertiesWidget.h b/src/gui/UBCachePropertiesWidget.h index d51c606b..dc5e132b 100644 --- a/src/gui/UBCachePropertiesWidget.h +++ b/src/gui/UBCachePropertiesWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBCircleFrame.cpp b/src/gui/UBCircleFrame.cpp index 5608f6b0..afe5a794 100644 --- a/src/gui/UBCircleFrame.cpp +++ b/src/gui/UBCircleFrame.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBCircleFrame.h b/src/gui/UBCircleFrame.h index ec61e025..ef4a4bfc 100644 --- a/src/gui/UBCircleFrame.h +++ b/src/gui/UBCircleFrame.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBClockPalette.h b/src/gui/UBClockPalette.h index 85148f78..a0756bbd 100644 --- a/src/gui/UBClockPalette.h +++ b/src/gui/UBClockPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBColorPicker.cpp b/src/gui/UBColorPicker.cpp index b4add3fc..80e8dfa1 100644 --- a/src/gui/UBColorPicker.cpp +++ b/src/gui/UBColorPicker.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBColorPicker.h b/src/gui/UBColorPicker.h index d8894cc4..c9d6d1d1 100644 --- a/src/gui/UBColorPicker.h +++ b/src/gui/UBColorPicker.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDockDownloadWidget.cpp b/src/gui/UBDockDownloadWidget.cpp index ad0c2a83..edec35ab 100644 --- a/src/gui/UBDockDownloadWidget.cpp +++ b/src/gui/UBDockDownloadWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDockDownloadWidget.h b/src/gui/UBDockDownloadWidget.h index 5b47c03c..15c6f1ab 100644 --- a/src/gui/UBDockDownloadWidget.h +++ b/src/gui/UBDockDownloadWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp index f8bfbc1d..401a3c6d 100644 --- a/src/gui/UBDockPalette.cpp +++ b/src/gui/UBDockPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDockPalette.h b/src/gui/UBDockPalette.h index 51318751..d2476b8f 100644 --- a/src/gui/UBDockPalette.h +++ b/src/gui/UBDockPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDockPaletteWidget.cpp b/src/gui/UBDockPaletteWidget.cpp index e588ea23..c3ff364f 100644 --- a/src/gui/UBDockPaletteWidget.cpp +++ b/src/gui/UBDockPaletteWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDockPaletteWidget.h b/src/gui/UBDockPaletteWidget.h index 0c73ea21..0e49a960 100644 --- a/src/gui/UBDockPaletteWidget.h +++ b/src/gui/UBDockPaletteWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDocumentNavigator.cpp b/src/gui/UBDocumentNavigator.cpp index c8838dfd..db8c19ce 100644 --- a/src/gui/UBDocumentNavigator.cpp +++ b/src/gui/UBDocumentNavigator.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDocumentNavigator.h b/src/gui/UBDocumentNavigator.h index 04058a8d..aebcce18 100644 --- a/src/gui/UBDocumentNavigator.h +++ b/src/gui/UBDocumentNavigator.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDocumentThumbnailWidget.cpp b/src/gui/UBDocumentThumbnailWidget.cpp index 66d6efea..19ad39b1 100644 --- a/src/gui/UBDocumentThumbnailWidget.cpp +++ b/src/gui/UBDocumentThumbnailWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDocumentThumbnailWidget.h b/src/gui/UBDocumentThumbnailWidget.h index 109355d9..617cee13 100644 --- a/src/gui/UBDocumentThumbnailWidget.h +++ b/src/gui/UBDocumentThumbnailWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDocumentToolsPalette.cpp b/src/gui/UBDocumentToolsPalette.cpp index 2df56ee5..2d6aec7b 100644 --- a/src/gui/UBDocumentToolsPalette.cpp +++ b/src/gui/UBDocumentToolsPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDocumentToolsPalette.h b/src/gui/UBDocumentToolsPalette.h index 32046ad8..e226ee2b 100644 --- a/src/gui/UBDocumentToolsPalette.h +++ b/src/gui/UBDocumentToolsPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDocumentTreeWidget.cpp b/src/gui/UBDocumentTreeWidget.cpp index ea660133..d0248d59 100644 --- a/src/gui/UBDocumentTreeWidget.cpp +++ b/src/gui/UBDocumentTreeWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDocumentTreeWidget.h b/src/gui/UBDocumentTreeWidget.h index 4856b06c..02d12ff9 100644 --- a/src/gui/UBDocumentTreeWidget.h +++ b/src/gui/UBDocumentTreeWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDownloadWidget.cpp b/src/gui/UBDownloadWidget.cpp index 71c0b695..9ac9874a 100644 --- a/src/gui/UBDownloadWidget.cpp +++ b/src/gui/UBDownloadWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBDownloadWidget.h b/src/gui/UBDownloadWidget.h index 48cfee91..e764c2da 100644 --- a/src/gui/UBDownloadWidget.h +++ b/src/gui/UBDownloadWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBFavoriteToolPalette.cpp b/src/gui/UBFavoriteToolPalette.cpp index de29a830..4d4dc305 100644 --- a/src/gui/UBFavoriteToolPalette.cpp +++ b/src/gui/UBFavoriteToolPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBFavoriteToolPalette.h b/src/gui/UBFavoriteToolPalette.h index 2f654327..ac049428 100644 --- a/src/gui/UBFavoriteToolPalette.h +++ b/src/gui/UBFavoriteToolPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBFeaturesActionBar.cpp b/src/gui/UBFeaturesActionBar.cpp index 3ffec315..ef71983c 100644 --- a/src/gui/UBFeaturesActionBar.cpp +++ b/src/gui/UBFeaturesActionBar.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBFeaturesActionBar.h b/src/gui/UBFeaturesActionBar.h index c27cbf89..6e19e05a 100644 --- a/src/gui/UBFeaturesActionBar.h +++ b/src/gui/UBFeaturesActionBar.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp index 95768264..8779fb50 100644 --- a/src/gui/UBFeaturesWidget.cpp +++ b/src/gui/UBFeaturesWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBFeaturesWidget.h b/src/gui/UBFeaturesWidget.h index f9f67a47..6fbd920a 100644 --- a/src/gui/UBFeaturesWidget.h +++ b/src/gui/UBFeaturesWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBFloatingPalette.cpp b/src/gui/UBFloatingPalette.cpp index 2ed4eb31..492d7ad2 100644 --- a/src/gui/UBFloatingPalette.cpp +++ b/src/gui/UBFloatingPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBFloatingPalette.h b/src/gui/UBFloatingPalette.h index f14005b9..59c9d436 100644 --- a/src/gui/UBFloatingPalette.h +++ b/src/gui/UBFloatingPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBIconButton.cpp b/src/gui/UBIconButton.cpp index ee24564c..e4c07a90 100644 --- a/src/gui/UBIconButton.cpp +++ b/src/gui/UBIconButton.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBIconButton.h b/src/gui/UBIconButton.h index 68b93ad0..36c5b8f6 100644 --- a/src/gui/UBIconButton.h +++ b/src/gui/UBIconButton.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBKeyboardPalette.cpp b/src/gui/UBKeyboardPalette.cpp index da2fc7d0..c9a947b6 100644 --- a/src/gui/UBKeyboardPalette.cpp +++ b/src/gui/UBKeyboardPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBKeyboardPalette.h b/src/gui/UBKeyboardPalette.h index de381e74..d8b9607c 100644 --- a/src/gui/UBKeyboardPalette.h +++ b/src/gui/UBKeyboardPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBKeyboardPalette_linux.cpp b/src/gui/UBKeyboardPalette_linux.cpp index 7e56cb2e..8d2af604 100644 --- a/src/gui/UBKeyboardPalette_linux.cpp +++ b/src/gui/UBKeyboardPalette_linux.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBKeyboardPalette_mac.mm b/src/gui/UBKeyboardPalette_mac.mm index f5d12959..0d3bcfcd 100644 --- a/src/gui/UBKeyboardPalette_mac.mm +++ b/src/gui/UBKeyboardPalette_mac.mm @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBKeyboardPalette_win.cpp b/src/gui/UBKeyboardPalette_win.cpp index e6c496fd..613ad137 100644 --- a/src/gui/UBKeyboardPalette_win.cpp +++ b/src/gui/UBKeyboardPalette_win.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBLeftPalette.cpp b/src/gui/UBLeftPalette.cpp index be0d7ae5..d126b437 100644 --- a/src/gui/UBLeftPalette.cpp +++ b/src/gui/UBLeftPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBLeftPalette.h b/src/gui/UBLeftPalette.h index fd23de01..6b93fd1d 100644 --- a/src/gui/UBLeftPalette.h +++ b/src/gui/UBLeftPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBMagnifer.cpp b/src/gui/UBMagnifer.cpp index 20d4a101..d64019e4 100644 --- a/src/gui/UBMagnifer.cpp +++ b/src/gui/UBMagnifer.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBMagnifer.h b/src/gui/UBMagnifer.h index 0e942605..24a57958 100644 --- a/src/gui/UBMagnifer.h +++ b/src/gui/UBMagnifer.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBMainWindow.cpp b/src/gui/UBMainWindow.cpp index 5269c5dd..f3052f6e 100644 --- a/src/gui/UBMainWindow.cpp +++ b/src/gui/UBMainWindow.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBMainWindow.h b/src/gui/UBMainWindow.h index cf6b715d..2d5b99a4 100644 --- a/src/gui/UBMainWindow.h +++ b/src/gui/UBMainWindow.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBMessageWindow.cpp b/src/gui/UBMessageWindow.cpp index 3a1c5109..1d499a98 100644 --- a/src/gui/UBMessageWindow.cpp +++ b/src/gui/UBMessageWindow.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBMessageWindow.h b/src/gui/UBMessageWindow.h index db3dc895..55be041d 100644 --- a/src/gui/UBMessageWindow.h +++ b/src/gui/UBMessageWindow.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBMessagesDialog.cpp b/src/gui/UBMessagesDialog.cpp index 45c458f9..bed30135 100644 --- a/src/gui/UBMessagesDialog.cpp +++ b/src/gui/UBMessagesDialog.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBMessagesDialog.h b/src/gui/UBMessagesDialog.h index 4a6197cb..b5561be4 100644 --- a/src/gui/UBMessagesDialog.h +++ b/src/gui/UBMessagesDialog.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBMousePressFilter.cpp b/src/gui/UBMousePressFilter.cpp index 126432a7..9df6526f 100644 --- a/src/gui/UBMousePressFilter.cpp +++ b/src/gui/UBMousePressFilter.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBMousePressFilter.h b/src/gui/UBMousePressFilter.h index 5e292c34..9dd750f5 100644 --- a/src/gui/UBMousePressFilter.h +++ b/src/gui/UBMousePressFilter.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBOpenSankoreImporterWidget.cpp b/src/gui/UBOpenSankoreImporterWidget.cpp index 1586278f..fcb1f395 100644 --- a/src/gui/UBOpenSankoreImporterWidget.cpp +++ b/src/gui/UBOpenSankoreImporterWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBOpenSankoreImporterWidget.h b/src/gui/UBOpenSankoreImporterWidget.h index afde8b5e..f106df4e 100644 --- a/src/gui/UBOpenSankoreImporterWidget.h +++ b/src/gui/UBOpenSankoreImporterWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBPageNavigationWidget.cpp b/src/gui/UBPageNavigationWidget.cpp index 1c8608e5..a6564573 100644 --- a/src/gui/UBPageNavigationWidget.cpp +++ b/src/gui/UBPageNavigationWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBPageNavigationWidget.h b/src/gui/UBPageNavigationWidget.h index c1c8effa..9fe7a388 100644 --- a/src/gui/UBPageNavigationWidget.h +++ b/src/gui/UBPageNavigationWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBPropertyPalette.cpp b/src/gui/UBPropertyPalette.cpp index e8439f30..3a1d7e68 100644 --- a/src/gui/UBPropertyPalette.cpp +++ b/src/gui/UBPropertyPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBPropertyPalette.h b/src/gui/UBPropertyPalette.h index a21eb3f1..acfd9ecb 100644 --- a/src/gui/UBPropertyPalette.h +++ b/src/gui/UBPropertyPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBResources.cpp b/src/gui/UBResources.cpp index 9402e238..ba9f3ea1 100644 --- a/src/gui/UBResources.cpp +++ b/src/gui/UBResources.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBResources.h b/src/gui/UBResources.h index 84a50446..f74920da 100644 --- a/src/gui/UBResources.h +++ b/src/gui/UBResources.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBRightPalette.cpp b/src/gui/UBRightPalette.cpp index 649e034b..95a90c2e 100644 --- a/src/gui/UBRightPalette.cpp +++ b/src/gui/UBRightPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBRightPalette.h b/src/gui/UBRightPalette.h index 8cadd224..cd6eeb4c 100644 --- a/src/gui/UBRightPalette.h +++ b/src/gui/UBRightPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBRubberBand.cpp b/src/gui/UBRubberBand.cpp index 2dab3ede..3974760a 100644 --- a/src/gui/UBRubberBand.cpp +++ b/src/gui/UBRubberBand.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBRubberBand.h b/src/gui/UBRubberBand.h index 5b4eeb9d..3a1d45dc 100644 --- a/src/gui/UBRubberBand.h +++ b/src/gui/UBRubberBand.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBScreenMirror.cpp b/src/gui/UBScreenMirror.cpp index e9fd0020..5ebb2f74 100644 --- a/src/gui/UBScreenMirror.cpp +++ b/src/gui/UBScreenMirror.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBScreenMirror.h b/src/gui/UBScreenMirror.h index 6954d48f..e4ece8a9 100644 --- a/src/gui/UBScreenMirror.h +++ b/src/gui/UBScreenMirror.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBSpinningWheel.cpp b/src/gui/UBSpinningWheel.cpp index 185420bf..b4eba9a0 100644 --- a/src/gui/UBSpinningWheel.cpp +++ b/src/gui/UBSpinningWheel.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBSpinningWheel.h b/src/gui/UBSpinningWheel.h index 40f8fa8b..8d84a29a 100644 --- a/src/gui/UBSpinningWheel.h +++ b/src/gui/UBSpinningWheel.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBStartupHintsPalette.cpp b/src/gui/UBStartupHintsPalette.cpp index 8a831990..2d049f6b 100644 --- a/src/gui/UBStartupHintsPalette.cpp +++ b/src/gui/UBStartupHintsPalette.cpp @@ -1,22 +1,27 @@ /* - * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) * - * This file is part of Open-Sankoré. + * Copyright (C) 2013 Open Education Foundation * - * Open-Sankoré is free software: you can redistribute it and/or modify + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour + * l'Education Numérique en Afrique (GIP ENA) + * + * This file is part of OpenBoard. + * + * OpenBoard 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, version 3 of the License, * with a specific linking exception for the OpenSSL project's * "OpenSSL" library (or with modified versions of it that use the * same license as the "OpenSSL" library). * - * Open-Sankoré is distributed in the hope that it will be useful, + * OpenBoard 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 + * 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 Open-Sankoré. If not, see . + * along with OpenBoard. If not, see . */ diff --git a/src/gui/UBStartupHintsPalette.h b/src/gui/UBStartupHintsPalette.h index 07f4a227..5376ddbf 100644 --- a/src/gui/UBStartupHintsPalette.h +++ b/src/gui/UBStartupHintsPalette.h @@ -1,22 +1,27 @@ /* - * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) * - * This file is part of Open-Sankoré. + * Copyright (C) 2013 Open Education Foundation * - * Open-Sankoré is free software: you can redistribute it and/or modify + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour + * l'Education Numérique en Afrique (GIP ENA) + * + * This file is part of OpenBoard. + * + * OpenBoard 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, version 3 of the License, * with a specific linking exception for the OpenSSL project's * "OpenSSL" library (or with modified versions of it that use the * same license as the "OpenSSL" library). * - * Open-Sankoré is distributed in the hope that it will be useful, + * OpenBoard 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 + * 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 Open-Sankoré. If not, see . + * along with OpenBoard. If not, see . */ diff --git a/src/gui/UBStylusPalette.cpp b/src/gui/UBStylusPalette.cpp index 82be4b7c..6be2b278 100644 --- a/src/gui/UBStylusPalette.cpp +++ b/src/gui/UBStylusPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBStylusPalette.h b/src/gui/UBStylusPalette.h index 97bb0924..2a77ab50 100644 --- a/src/gui/UBStylusPalette.h +++ b/src/gui/UBStylusPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBThumbnailView.cpp b/src/gui/UBThumbnailView.cpp index e86b7ac5..c6fc2713 100644 --- a/src/gui/UBThumbnailView.cpp +++ b/src/gui/UBThumbnailView.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBThumbnailView.h b/src/gui/UBThumbnailView.h index ec329e32..c2f00fb0 100644 --- a/src/gui/UBThumbnailView.h +++ b/src/gui/UBThumbnailView.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBThumbnailWidget.cpp b/src/gui/UBThumbnailWidget.cpp index 1acfd3a3..95d2b4cf 100644 --- a/src/gui/UBThumbnailWidget.cpp +++ b/src/gui/UBThumbnailWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBThumbnailWidget.h b/src/gui/UBThumbnailWidget.h index 310a95d5..8d9770ab 100644 --- a/src/gui/UBThumbnailWidget.h +++ b/src/gui/UBThumbnailWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBToolWidget.cpp b/src/gui/UBToolWidget.cpp index 660617d0..79809450 100644 --- a/src/gui/UBToolWidget.cpp +++ b/src/gui/UBToolWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBToolWidget.h b/src/gui/UBToolWidget.h index 56fc5e41..e4023657 100644 --- a/src/gui/UBToolWidget.h +++ b/src/gui/UBToolWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBToolbarButtonGroup.cpp b/src/gui/UBToolbarButtonGroup.cpp index db79e7ac..cacea386 100644 --- a/src/gui/UBToolbarButtonGroup.cpp +++ b/src/gui/UBToolbarButtonGroup.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBToolbarButtonGroup.h b/src/gui/UBToolbarButtonGroup.h index d802950c..8ba80957 100644 --- a/src/gui/UBToolbarButtonGroup.h +++ b/src/gui/UBToolbarButtonGroup.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBUpdateDlg.cpp b/src/gui/UBUpdateDlg.cpp index 635eb561..fa86c551 100644 --- a/src/gui/UBUpdateDlg.cpp +++ b/src/gui/UBUpdateDlg.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBUpdateDlg.h b/src/gui/UBUpdateDlg.h index 6e036bf9..962c0491 100644 --- a/src/gui/UBUpdateDlg.h +++ b/src/gui/UBUpdateDlg.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBWebToolsPalette.cpp b/src/gui/UBWebToolsPalette.cpp index 5694ce19..0af5ab9c 100644 --- a/src/gui/UBWebToolsPalette.cpp +++ b/src/gui/UBWebToolsPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBWebToolsPalette.h b/src/gui/UBWebToolsPalette.h index 9e80a3b1..c84f8bb8 100644 --- a/src/gui/UBWebToolsPalette.h +++ b/src/gui/UBWebToolsPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBWidgetMirror.cpp b/src/gui/UBWidgetMirror.cpp index 49221744..053c9727 100644 --- a/src/gui/UBWidgetMirror.cpp +++ b/src/gui/UBWidgetMirror.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBWidgetMirror.h b/src/gui/UBWidgetMirror.h index 6ca2b3d1..a22d63a8 100644 --- a/src/gui/UBWidgetMirror.h +++ b/src/gui/UBWidgetMirror.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBZoomPalette.cpp b/src/gui/UBZoomPalette.cpp index 10194113..772d71be 100644 --- a/src/gui/UBZoomPalette.cpp +++ b/src/gui/UBZoomPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/gui/UBZoomPalette.h b/src/gui/UBZoomPalette.h index c56b29ed..77200d6e 100644 --- a/src/gui/UBZoomPalette.h +++ b/src/gui/UBZoomPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBAutoSaver.cpp b/src/network/UBAutoSaver.cpp index 29a91aaf..078560b1 100644 --- a/src/network/UBAutoSaver.cpp +++ b/src/network/UBAutoSaver.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBAutoSaver.h b/src/network/UBAutoSaver.h index 80464937..585c7d39 100644 --- a/src/network/UBAutoSaver.h +++ b/src/network/UBAutoSaver.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBCookieJar.cpp b/src/network/UBCookieJar.cpp index 092a33f2..ddfe4de2 100644 --- a/src/network/UBCookieJar.cpp +++ b/src/network/UBCookieJar.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBCookieJar.h b/src/network/UBCookieJar.h index b9ee0943..4ba6aef9 100644 --- a/src/network/UBCookieJar.h +++ b/src/network/UBCookieJar.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBHttpFileDownloader.cpp b/src/network/UBHttpFileDownloader.cpp index 483dd499..88103cb9 100644 --- a/src/network/UBHttpFileDownloader.cpp +++ b/src/network/UBHttpFileDownloader.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBHttpFileDownloader.h b/src/network/UBHttpFileDownloader.h index bf19849c..f07f8bd6 100644 --- a/src/network/UBHttpFileDownloader.h +++ b/src/network/UBHttpFileDownloader.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBHttpGet.cpp b/src/network/UBHttpGet.cpp index ed58b3f6..f66d7c42 100644 --- a/src/network/UBHttpGet.cpp +++ b/src/network/UBHttpGet.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBHttpGet.h b/src/network/UBHttpGet.h index 3a2d63b8..b7c3838c 100644 --- a/src/network/UBHttpGet.h +++ b/src/network/UBHttpGet.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBNetworkAccessManager.cpp b/src/network/UBNetworkAccessManager.cpp index 87f3a1ea..a491b30f 100644 --- a/src/network/UBNetworkAccessManager.cpp +++ b/src/network/UBNetworkAccessManager.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBNetworkAccessManager.h b/src/network/UBNetworkAccessManager.h index 07eaa837..f29c5175 100644 --- a/src/network/UBNetworkAccessManager.h +++ b/src/network/UBNetworkAccessManager.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBServerXMLHttpRequest.cpp b/src/network/UBServerXMLHttpRequest.cpp index 3b7c41c8..bbd93000 100644 --- a/src/network/UBServerXMLHttpRequest.cpp +++ b/src/network/UBServerXMLHttpRequest.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/network/UBServerXMLHttpRequest.h b/src/network/UBServerXMLHttpRequest.h index 94c8cfaf..34b7f2b3 100644 --- a/src/network/UBServerXMLHttpRequest.h +++ b/src/network/UBServerXMLHttpRequest.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/ASCII85Decode.cpp b/src/pdf-merger/ASCII85Decode.cpp index 172cbf58..920c4e4e 100644 --- a/src/pdf-merger/ASCII85Decode.cpp +++ b/src/pdf-merger/ASCII85Decode.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/ASCII85Decode.h b/src/pdf-merger/ASCII85Decode.h index a11fcda2..96dc4317 100644 --- a/src/pdf-merger/ASCII85Decode.h +++ b/src/pdf-merger/ASCII85Decode.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/ASCIIHexDecode.cpp b/src/pdf-merger/ASCIIHexDecode.cpp index b1ae1300..5d17d36e 100644 --- a/src/pdf-merger/ASCIIHexDecode.cpp +++ b/src/pdf-merger/ASCIIHexDecode.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/ASCIIHexDecode.h b/src/pdf-merger/ASCIIHexDecode.h index cc510963..b5568b72 100644 --- a/src/pdf-merger/ASCIIHexDecode.h +++ b/src/pdf-merger/ASCIIHexDecode.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/AbstractBoxElementHandler.h b/src/pdf-merger/AbstractBoxElementHandler.h index 65135214..2a071fc3 100644 --- a/src/pdf-merger/AbstractBoxElementHandler.h +++ b/src/pdf-merger/AbstractBoxElementHandler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/AnnotsHandler.cpp b/src/pdf-merger/AnnotsHandler.cpp index 5d0047f4..df4e739c 100644 --- a/src/pdf-merger/AnnotsHandler.cpp +++ b/src/pdf-merger/AnnotsHandler.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/AnnotsHandler.h b/src/pdf-merger/AnnotsHandler.h index e274443b..e4c84014 100644 --- a/src/pdf-merger/AnnotsHandler.h +++ b/src/pdf-merger/AnnotsHandler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/CCITTFaxDecode.cpp b/src/pdf-merger/CCITTFaxDecode.cpp index f178b3a0..88874328 100644 --- a/src/pdf-merger/CCITTFaxDecode.cpp +++ b/src/pdf-merger/CCITTFaxDecode.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/CCITTFaxDecode.h b/src/pdf-merger/CCITTFaxDecode.h index 042e46ae..78b7860c 100644 --- a/src/pdf-merger/CCITTFaxDecode.h +++ b/src/pdf-merger/CCITTFaxDecode.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Config.h b/src/pdf-merger/Config.h index aa430da1..ae31722a 100644 --- a/src/pdf-merger/Config.h +++ b/src/pdf-merger/Config.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/ContentHandler.cpp b/src/pdf-merger/ContentHandler.cpp index 3f2fae28..5fb0515a 100644 --- a/src/pdf-merger/ContentHandler.cpp +++ b/src/pdf-merger/ContentHandler.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/ContentHandler.h b/src/pdf-merger/ContentHandler.h index 06887886..6452d22c 100644 --- a/src/pdf-merger/ContentHandler.h +++ b/src/pdf-merger/ContentHandler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/CropBoxElementHandler.h b/src/pdf-merger/CropBoxElementHandler.h index fe0aa741..2f5dcf12 100644 --- a/src/pdf-merger/CropBoxElementHandler.h +++ b/src/pdf-merger/CropBoxElementHandler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/DCTDecode.cpp b/src/pdf-merger/DCTDecode.cpp index 7849bfb5..265215aa 100644 --- a/src/pdf-merger/DCTDecode.cpp +++ b/src/pdf-merger/DCTDecode.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/DCTDecode.h b/src/pdf-merger/DCTDecode.h index a4451453..1437948e 100644 --- a/src/pdf-merger/DCTDecode.h +++ b/src/pdf-merger/DCTDecode.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Decoder.h b/src/pdf-merger/Decoder.h index 3bbef7cd..c6ff4d66 100644 --- a/src/pdf-merger/Decoder.h +++ b/src/pdf-merger/Decoder.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Document.cpp b/src/pdf-merger/Document.cpp index a07e6129..de014986 100644 --- a/src/pdf-merger/Document.cpp +++ b/src/pdf-merger/Document.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Document.h b/src/pdf-merger/Document.h index d73a4432..17f93d19 100644 --- a/src/pdf-merger/Document.h +++ b/src/pdf-merger/Document.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Exception.h b/src/pdf-merger/Exception.h index c3e6844d..80402aa4 100644 --- a/src/pdf-merger/Exception.h +++ b/src/pdf-merger/Exception.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/FileIsAbsentException.h b/src/pdf-merger/FileIsAbsentException.h index 324ce438..fd8950e6 100644 --- a/src/pdf-merger/FileIsAbsentException.h +++ b/src/pdf-merger/FileIsAbsentException.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Filter.cpp b/src/pdf-merger/Filter.cpp index a2317f55..c676ee3c 100644 --- a/src/pdf-merger/Filter.cpp +++ b/src/pdf-merger/Filter.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Filter.h b/src/pdf-merger/Filter.h index f8b4dc75..9bc4b5dd 100644 --- a/src/pdf-merger/Filter.h +++ b/src/pdf-merger/Filter.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/FilterPredictor.cpp b/src/pdf-merger/FilterPredictor.cpp index b9da8a0a..095a800d 100644 --- a/src/pdf-merger/FilterPredictor.cpp +++ b/src/pdf-merger/FilterPredictor.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/FilterPredictor.h b/src/pdf-merger/FilterPredictor.h index 936a6046..44587ff2 100644 --- a/src/pdf-merger/FilterPredictor.h +++ b/src/pdf-merger/FilterPredictor.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/FlateDecode.cpp b/src/pdf-merger/FlateDecode.cpp index 77474085..38be2a39 100644 --- a/src/pdf-merger/FlateDecode.cpp +++ b/src/pdf-merger/FlateDecode.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/FlateDecode.h b/src/pdf-merger/FlateDecode.h index 5947abb3..9326564f 100644 --- a/src/pdf-merger/FlateDecode.h +++ b/src/pdf-merger/FlateDecode.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/JBIG2Decode.cpp b/src/pdf-merger/JBIG2Decode.cpp index 350d187f..0b16e37c 100644 --- a/src/pdf-merger/JBIG2Decode.cpp +++ b/src/pdf-merger/JBIG2Decode.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/JBIG2Decode.h b/src/pdf-merger/JBIG2Decode.h index 03d9b08b..a0aaeb97 100644 --- a/src/pdf-merger/JBIG2Decode.h +++ b/src/pdf-merger/JBIG2Decode.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/LZWDecode.cpp b/src/pdf-merger/LZWDecode.cpp index 9ef38f85..2adc9d9f 100644 --- a/src/pdf-merger/LZWDecode.cpp +++ b/src/pdf-merger/LZWDecode.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/LZWDecode.h b/src/pdf-merger/LZWDecode.h index e74be21e..6dc87f9f 100644 --- a/src/pdf-merger/LZWDecode.h +++ b/src/pdf-merger/LZWDecode.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/MediaBoxElementHandler.h b/src/pdf-merger/MediaBoxElementHandler.h index b46194a2..46f2920b 100644 --- a/src/pdf-merger/MediaBoxElementHandler.h +++ b/src/pdf-merger/MediaBoxElementHandler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/MergePageDescription.h b/src/pdf-merger/MergePageDescription.h index 0891599d..0003766a 100644 --- a/src/pdf-merger/MergePageDescription.h +++ b/src/pdf-merger/MergePageDescription.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Merger.cpp b/src/pdf-merger/Merger.cpp index 509f39d0..a79daedd 100644 --- a/src/pdf-merger/Merger.cpp +++ b/src/pdf-merger/Merger.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Merger.h b/src/pdf-merger/Merger.h index d9cafc95..40e51467 100644 --- a/src/pdf-merger/Merger.h +++ b/src/pdf-merger/Merger.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Object.cpp b/src/pdf-merger/Object.cpp index 82b70f79..9eeba4b6 100644 --- a/src/pdf-merger/Object.cpp +++ b/src/pdf-merger/Object.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Object.h b/src/pdf-merger/Object.h index 7d1c2d01..f436c252 100644 --- a/src/pdf-merger/Object.h +++ b/src/pdf-merger/Object.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/OverlayDocumentParser.cpp b/src/pdf-merger/OverlayDocumentParser.cpp index 837cd7bb..9c5f797f 100644 --- a/src/pdf-merger/OverlayDocumentParser.cpp +++ b/src/pdf-merger/OverlayDocumentParser.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/OverlayDocumentParser.h b/src/pdf-merger/OverlayDocumentParser.h index ce0636b8..d980e906 100644 --- a/src/pdf-merger/OverlayDocumentParser.h +++ b/src/pdf-merger/OverlayDocumentParser.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Page.cpp b/src/pdf-merger/Page.cpp index 44ec7e99..7ac46201 100644 --- a/src/pdf-merger/Page.cpp +++ b/src/pdf-merger/Page.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Page.h b/src/pdf-merger/Page.h index 17c92ae5..08bbfabc 100644 --- a/src/pdf-merger/Page.h +++ b/src/pdf-merger/Page.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/PageElementHandler.cpp b/src/pdf-merger/PageElementHandler.cpp index 316f2055..9ee609d9 100644 --- a/src/pdf-merger/PageElementHandler.cpp +++ b/src/pdf-merger/PageElementHandler.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/PageElementHandler.h b/src/pdf-merger/PageElementHandler.h index bc6b8b0e..06787d54 100644 --- a/src/pdf-merger/PageElementHandler.h +++ b/src/pdf-merger/PageElementHandler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/PageParser.h b/src/pdf-merger/PageParser.h index b9bb0566..09db3b2f 100644 --- a/src/pdf-merger/PageParser.h +++ b/src/pdf-merger/PageParser.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Parser.cpp b/src/pdf-merger/Parser.cpp index d6266b64..11133f5c 100644 --- a/src/pdf-merger/Parser.cpp +++ b/src/pdf-merger/Parser.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Parser.h b/src/pdf-merger/Parser.h index 3c9be705..47e452ff 100644 --- a/src/pdf-merger/Parser.h +++ b/src/pdf-merger/Parser.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Rectangle.cpp b/src/pdf-merger/Rectangle.cpp index 8372c949..22473a91 100644 --- a/src/pdf-merger/Rectangle.cpp +++ b/src/pdf-merger/Rectangle.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Rectangle.h b/src/pdf-merger/Rectangle.h index 03dc410d..ec3735ab 100644 --- a/src/pdf-merger/Rectangle.h +++ b/src/pdf-merger/Rectangle.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/RemoveHimSelfHandler.h b/src/pdf-merger/RemoveHimSelfHandler.h index b1b43929..3a981958 100644 --- a/src/pdf-merger/RemoveHimSelfHandler.h +++ b/src/pdf-merger/RemoveHimSelfHandler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/RemoveHimselfHandler.cpp b/src/pdf-merger/RemoveHimselfHandler.cpp index b5292c61..28111c5d 100644 --- a/src/pdf-merger/RemoveHimselfHandler.cpp +++ b/src/pdf-merger/RemoveHimselfHandler.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/RotationHandler.h b/src/pdf-merger/RotationHandler.h index 146840b9..a106a11e 100644 --- a/src/pdf-merger/RotationHandler.h +++ b/src/pdf-merger/RotationHandler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/RunLengthDecode.cpp b/src/pdf-merger/RunLengthDecode.cpp index 4b0e9aa3..0aa1bf0c 100644 --- a/src/pdf-merger/RunLengthDecode.cpp +++ b/src/pdf-merger/RunLengthDecode.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/RunLengthDecode.h b/src/pdf-merger/RunLengthDecode.h index e2a2a125..5575641b 100644 --- a/src/pdf-merger/RunLengthDecode.h +++ b/src/pdf-merger/RunLengthDecode.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Transformation.h b/src/pdf-merger/Transformation.h index c60fb1b5..0e916e13 100644 --- a/src/pdf-merger/Transformation.h +++ b/src/pdf-merger/Transformation.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/TypeElementHandler.h b/src/pdf-merger/TypeElementHandler.h index 8e570f2f..e4236809 100644 --- a/src/pdf-merger/TypeElementHandler.h +++ b/src/pdf-merger/TypeElementHandler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Utils.cpp b/src/pdf-merger/Utils.cpp index c7e75098..8cb68f60 100644 --- a/src/pdf-merger/Utils.cpp +++ b/src/pdf-merger/Utils.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf-merger/Utils.h b/src/pdf-merger/Utils.h index 539e6c7f..094f1866 100644 --- a/src/pdf-merger/Utils.h +++ b/src/pdf-merger/Utils.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf/GraphicsPDFItem.cpp b/src/pdf/GraphicsPDFItem.cpp index 85761898..643c12ed 100644 --- a/src/pdf/GraphicsPDFItem.cpp +++ b/src/pdf/GraphicsPDFItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf/GraphicsPDFItem.h b/src/pdf/GraphicsPDFItem.h index e85a6953..c12eac14 100644 --- a/src/pdf/GraphicsPDFItem.h +++ b/src/pdf/GraphicsPDFItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf/PDFRenderer.cpp b/src/pdf/PDFRenderer.cpp index 5fdc09c3..9782ce07 100644 --- a/src/pdf/PDFRenderer.cpp +++ b/src/pdf/PDFRenderer.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf/PDFRenderer.h b/src/pdf/PDFRenderer.h index c64b4f63..b015c244 100644 --- a/src/pdf/PDFRenderer.h +++ b/src/pdf/PDFRenderer.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf/UBWebPluginPDFWidget.cpp b/src/pdf/UBWebPluginPDFWidget.cpp index 9dd054e9..0ae731fd 100644 --- a/src/pdf/UBWebPluginPDFWidget.cpp +++ b/src/pdf/UBWebPluginPDFWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf/UBWebPluginPDFWidget.h b/src/pdf/UBWebPluginPDFWidget.h index 99c82837..93b7d5c3 100644 --- a/src/pdf/UBWebPluginPDFWidget.h +++ b/src/pdf/UBWebPluginPDFWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp index 6c65ce9e..fd68e34e 100644 --- a/src/pdf/XPDFRenderer.cpp +++ b/src/pdf/XPDFRenderer.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/pdf/XPDFRenderer.h b/src/pdf/XPDFRenderer.h index 5b4a8334..c69a0f22 100644 --- a/src/pdf/XPDFRenderer.h +++ b/src/pdf/XPDFRenderer.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/UBAbstractVideoEncoder.cpp b/src/podcast/UBAbstractVideoEncoder.cpp index 7768df2a..8cab1784 100644 --- a/src/podcast/UBAbstractVideoEncoder.cpp +++ b/src/podcast/UBAbstractVideoEncoder.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/UBAbstractVideoEncoder.h b/src/podcast/UBAbstractVideoEncoder.h index ea722734..8bb49623 100644 --- a/src/podcast/UBAbstractVideoEncoder.h +++ b/src/podcast/UBAbstractVideoEncoder.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/UBPodcastController.cpp b/src/podcast/UBPodcastController.cpp index 9ac2fc1d..598b5135 100644 --- a/src/podcast/UBPodcastController.cpp +++ b/src/podcast/UBPodcastController.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/UBPodcastController.h b/src/podcast/UBPodcastController.h index dddfbc80..205dbbf5 100644 --- a/src/podcast/UBPodcastController.h +++ b/src/podcast/UBPodcastController.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/UBPodcastRecordingPalette.cpp b/src/podcast/UBPodcastRecordingPalette.cpp index 66b982f4..b66c9c9d 100644 --- a/src/podcast/UBPodcastRecordingPalette.cpp +++ b/src/podcast/UBPodcastRecordingPalette.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/UBPodcastRecordingPalette.h b/src/podcast/UBPodcastRecordingPalette.h index bde6d785..d0af0fdb 100644 --- a/src/podcast/UBPodcastRecordingPalette.h +++ b/src/podcast/UBPodcastRecordingPalette.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/intranet/UBIntranetPodcastPublisher.cpp b/src/podcast/intranet/UBIntranetPodcastPublisher.cpp index b322d12b..521cd417 100644 --- a/src/podcast/intranet/UBIntranetPodcastPublisher.cpp +++ b/src/podcast/intranet/UBIntranetPodcastPublisher.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/intranet/UBIntranetPodcastPublisher.h b/src/podcast/intranet/UBIntranetPodcastPublisher.h index 5ae1cf94..3558aa08 100644 --- a/src/podcast/intranet/UBIntranetPodcastPublisher.h +++ b/src/podcast/intranet/UBIntranetPodcastPublisher.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/quicktime/UBAudioQueueRecorder.cpp b/src/podcast/quicktime/UBAudioQueueRecorder.cpp index 02e23117..f2ed0a2f 100644 --- a/src/podcast/quicktime/UBAudioQueueRecorder.cpp +++ b/src/podcast/quicktime/UBAudioQueueRecorder.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/quicktime/UBAudioQueueRecorder.h b/src/podcast/quicktime/UBAudioQueueRecorder.h index 0443ce7a..6cacc795 100644 --- a/src/podcast/quicktime/UBAudioQueueRecorder.h +++ b/src/podcast/quicktime/UBAudioQueueRecorder.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/quicktime/UBQuickTimeFile.h b/src/podcast/quicktime/UBQuickTimeFile.h index ef07ab6b..c26a8268 100644 --- a/src/podcast/quicktime/UBQuickTimeFile.h +++ b/src/podcast/quicktime/UBQuickTimeFile.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/quicktime/UBQuickTimeFile.mm b/src/podcast/quicktime/UBQuickTimeFile.mm index d7c57745..548dbd04 100644 --- a/src/podcast/quicktime/UBQuickTimeFile.mm +++ b/src/podcast/quicktime/UBQuickTimeFile.mm @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp b/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp index 89a51dca..c685e390 100644 --- a/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp +++ b/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/quicktime/UBQuickTimeVideoEncoder.h b/src/podcast/quicktime/UBQuickTimeVideoEncoder.h index 20a5c9ba..3768a281 100644 --- a/src/podcast/quicktime/UBQuickTimeVideoEncoder.h +++ b/src/podcast/quicktime/UBQuickTimeVideoEncoder.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/windowsmedia/UBWaveRecorder.cpp b/src/podcast/windowsmedia/UBWaveRecorder.cpp index 31a27835..4791914c 100644 --- a/src/podcast/windowsmedia/UBWaveRecorder.cpp +++ b/src/podcast/windowsmedia/UBWaveRecorder.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/windowsmedia/UBWaveRecorder.h b/src/podcast/windowsmedia/UBWaveRecorder.h index d78e974b..de216287 100644 --- a/src/podcast/windowsmedia/UBWaveRecorder.h +++ b/src/podcast/windowsmedia/UBWaveRecorder.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/windowsmedia/UBWindowsMediaFile.cpp b/src/podcast/windowsmedia/UBWindowsMediaFile.cpp index dbb4fe06..beeede06 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaFile.cpp +++ b/src/podcast/windowsmedia/UBWindowsMediaFile.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/windowsmedia/UBWindowsMediaFile.h b/src/podcast/windowsmedia/UBWindowsMediaFile.h index 0f3d869c..ef3c9b3c 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaFile.h +++ b/src/podcast/windowsmedia/UBWindowsMediaFile.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp index d474cb0f..91508d01 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp +++ b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h index 56139a44..8807b82b 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h +++ b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/youtube/UBYouTubePublisher.cpp b/src/podcast/youtube/UBYouTubePublisher.cpp index b029daa7..27becd45 100644 --- a/src/podcast/youtube/UBYouTubePublisher.cpp +++ b/src/podcast/youtube/UBYouTubePublisher.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/podcast/youtube/UBYouTubePublisher.h b/src/podcast/youtube/UBYouTubePublisher.h index c3485309..24c68445 100644 --- a/src/podcast/youtube/UBYouTubePublisher.h +++ b/src/podcast/youtube/UBYouTubePublisher.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBAbstractDrawRuler.cpp b/src/tools/UBAbstractDrawRuler.cpp index 167d6bca..170c4b2b 100644 --- a/src/tools/UBAbstractDrawRuler.cpp +++ b/src/tools/UBAbstractDrawRuler.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBAbstractDrawRuler.h b/src/tools/UBAbstractDrawRuler.h index 5916c5cf..60bc2e5f 100644 --- a/src/tools/UBAbstractDrawRuler.h +++ b/src/tools/UBAbstractDrawRuler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsCache.cpp b/src/tools/UBGraphicsCache.cpp index 1b2d3565..4f603a5f 100644 --- a/src/tools/UBGraphicsCache.cpp +++ b/src/tools/UBGraphicsCache.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsCache.h b/src/tools/UBGraphicsCache.h index 1a4142db..12ed61d5 100644 --- a/src/tools/UBGraphicsCache.h +++ b/src/tools/UBGraphicsCache.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsCompass.cpp b/src/tools/UBGraphicsCompass.cpp index 0bdc58a1..20c1c28b 100644 --- a/src/tools/UBGraphicsCompass.cpp +++ b/src/tools/UBGraphicsCompass.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsCompass.h b/src/tools/UBGraphicsCompass.h index 0962bbac..485237db 100644 --- a/src/tools/UBGraphicsCompass.h +++ b/src/tools/UBGraphicsCompass.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsCurtainItem.cpp b/src/tools/UBGraphicsCurtainItem.cpp index 9e7c512d..7c57e3ff 100644 --- a/src/tools/UBGraphicsCurtainItem.cpp +++ b/src/tools/UBGraphicsCurtainItem.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsCurtainItem.h b/src/tools/UBGraphicsCurtainItem.h index abe4dba8..780450a4 100644 --- a/src/tools/UBGraphicsCurtainItem.h +++ b/src/tools/UBGraphicsCurtainItem.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsCurtainItemDelegate.cpp b/src/tools/UBGraphicsCurtainItemDelegate.cpp index 5525e69e..0209cd74 100644 --- a/src/tools/UBGraphicsCurtainItemDelegate.cpp +++ b/src/tools/UBGraphicsCurtainItemDelegate.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsCurtainItemDelegate.h b/src/tools/UBGraphicsCurtainItemDelegate.h index 8a973e64..4dd55322 100644 --- a/src/tools/UBGraphicsCurtainItemDelegate.h +++ b/src/tools/UBGraphicsCurtainItemDelegate.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsProtractor.cpp b/src/tools/UBGraphicsProtractor.cpp index 228e873d..85ef4b93 100644 --- a/src/tools/UBGraphicsProtractor.cpp +++ b/src/tools/UBGraphicsProtractor.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsProtractor.h b/src/tools/UBGraphicsProtractor.h index e3c0a92f..74f68155 100644 --- a/src/tools/UBGraphicsProtractor.h +++ b/src/tools/UBGraphicsProtractor.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsRuler.cpp b/src/tools/UBGraphicsRuler.cpp index 45c50093..cb95cc88 100644 --- a/src/tools/UBGraphicsRuler.cpp +++ b/src/tools/UBGraphicsRuler.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsRuler.h b/src/tools/UBGraphicsRuler.h index 4b37571b..de20fdbe 100644 --- a/src/tools/UBGraphicsRuler.h +++ b/src/tools/UBGraphicsRuler.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsTriangle.cpp b/src/tools/UBGraphicsTriangle.cpp index 0613628c..5ba3ab91 100644 --- a/src/tools/UBGraphicsTriangle.cpp +++ b/src/tools/UBGraphicsTriangle.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBGraphicsTriangle.h b/src/tools/UBGraphicsTriangle.h index dbbd6703..cdf62e53 100644 --- a/src/tools/UBGraphicsTriangle.h +++ b/src/tools/UBGraphicsTriangle.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBToolsManager.cpp b/src/tools/UBToolsManager.cpp index 878b5f44..a56e7daf 100644 --- a/src/tools/UBToolsManager.cpp +++ b/src/tools/UBToolsManager.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/tools/UBToolsManager.h b/src/tools/UBToolsManager.h index 4335319c..4208f79b 100644 --- a/src/tools/UBToolsManager.h +++ b/src/tools/UBToolsManager.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBOEmbedParser.cpp b/src/web/UBOEmbedParser.cpp index 0760f74e..913681b3 100644 --- a/src/web/UBOEmbedParser.cpp +++ b/src/web/UBOEmbedParser.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBOEmbedParser.h b/src/web/UBOEmbedParser.h index c5371fad..28980e30 100644 --- a/src/web/UBOEmbedParser.h +++ b/src/web/UBOEmbedParser.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBTrapFlashController.cpp b/src/web/UBTrapFlashController.cpp index d00c1434..a4ada160 100644 --- a/src/web/UBTrapFlashController.cpp +++ b/src/web/UBTrapFlashController.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBTrapFlashController.h b/src/web/UBTrapFlashController.h index 4937400f..9850f0cb 100644 --- a/src/web/UBTrapFlashController.h +++ b/src/web/UBTrapFlashController.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp index 97c6dfbf..e132e8c5 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBWebController.h b/src/web/UBWebController.h index d7292a00..8d29321f 100644 --- a/src/web/UBWebController.h +++ b/src/web/UBWebController.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBWebKitUtils.cpp b/src/web/UBWebKitUtils.cpp index 1dce1da9..256f4ddb 100644 --- a/src/web/UBWebKitUtils.cpp +++ b/src/web/UBWebKitUtils.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBWebKitUtils.h b/src/web/UBWebKitUtils.h index 5f902ca4..aef3ff8f 100644 --- a/src/web/UBWebKitUtils.h +++ b/src/web/UBWebKitUtils.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBWebPage.cpp b/src/web/UBWebPage.cpp index 42ca708c..c8d7acd2 100644 --- a/src/web/UBWebPage.cpp +++ b/src/web/UBWebPage.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBWebPage.h b/src/web/UBWebPage.h index a340a8d4..ae483021 100644 --- a/src/web/UBWebPage.h +++ b/src/web/UBWebPage.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBWebPluginWidget.cpp b/src/web/UBWebPluginWidget.cpp index 874ef465..bf97b089 100644 --- a/src/web/UBWebPluginWidget.cpp +++ b/src/web/UBWebPluginWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/UBWebPluginWidget.h b/src/web/UBWebPluginWidget.h index 6817e988..ef324065 100644 --- a/src/web/UBWebPluginWidget.h +++ b/src/web/UBWebPluginWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBBrowserWindow.cpp b/src/web/browser/WBBrowserWindow.cpp index 520b861e..6333b507 100644 --- a/src/web/browser/WBBrowserWindow.cpp +++ b/src/web/browser/WBBrowserWindow.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBBrowserWindow.h b/src/web/browser/WBBrowserWindow.h index 0b5705d1..eab2ffc9 100644 --- a/src/web/browser/WBBrowserWindow.h +++ b/src/web/browser/WBBrowserWindow.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBChaseWidget.cpp b/src/web/browser/WBChaseWidget.cpp index e536eb38..c887f249 100644 --- a/src/web/browser/WBChaseWidget.cpp +++ b/src/web/browser/WBChaseWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBChaseWidget.h b/src/web/browser/WBChaseWidget.h index 90b2a0fc..1f35dfe5 100644 --- a/src/web/browser/WBChaseWidget.h +++ b/src/web/browser/WBChaseWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBDownloadManager.cpp b/src/web/browser/WBDownloadManager.cpp index e52a314d..0df391e4 100644 --- a/src/web/browser/WBDownloadManager.cpp +++ b/src/web/browser/WBDownloadManager.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBDownloadManager.h b/src/web/browser/WBDownloadManager.h index 53d013d6..2a73cc72 100644 --- a/src/web/browser/WBDownloadManager.h +++ b/src/web/browser/WBDownloadManager.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBEditTableView.cpp b/src/web/browser/WBEditTableView.cpp index 834e9756..83d6a7ec 100644 --- a/src/web/browser/WBEditTableView.cpp +++ b/src/web/browser/WBEditTableView.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBEditTableView.h b/src/web/browser/WBEditTableView.h index 0a33617f..d16ad2ec 100644 --- a/src/web/browser/WBEditTableView.h +++ b/src/web/browser/WBEditTableView.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBHistory.cpp b/src/web/browser/WBHistory.cpp index b59d5acb..cd461181 100644 --- a/src/web/browser/WBHistory.cpp +++ b/src/web/browser/WBHistory.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBHistory.h b/src/web/browser/WBHistory.h index c53e5f3f..c4fbb38b 100644 --- a/src/web/browser/WBHistory.h +++ b/src/web/browser/WBHistory.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBModelMenu.cpp b/src/web/browser/WBModelMenu.cpp index c874cea6..1c208d03 100644 --- a/src/web/browser/WBModelMenu.cpp +++ b/src/web/browser/WBModelMenu.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBModelMenu.h b/src/web/browser/WBModelMenu.h index af921b26..e1aff08d 100644 --- a/src/web/browser/WBModelMenu.h +++ b/src/web/browser/WBModelMenu.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBSearchLineEdit.cpp b/src/web/browser/WBSearchLineEdit.cpp index c8344675..e443f569 100644 --- a/src/web/browser/WBSearchLineEdit.cpp +++ b/src/web/browser/WBSearchLineEdit.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBSearchLineEdit.h b/src/web/browser/WBSearchLineEdit.h index 236d52eb..568ad890 100644 --- a/src/web/browser/WBSearchLineEdit.h +++ b/src/web/browser/WBSearchLineEdit.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBSqueezeLabel.cpp b/src/web/browser/WBSqueezeLabel.cpp index 0c03f11b..fb4c3524 100644 --- a/src/web/browser/WBSqueezeLabel.cpp +++ b/src/web/browser/WBSqueezeLabel.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBSqueezeLabel.h b/src/web/browser/WBSqueezeLabel.h index 712df8cc..4bedfa59 100644 --- a/src/web/browser/WBSqueezeLabel.h +++ b/src/web/browser/WBSqueezeLabel.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBTabWidget.cpp b/src/web/browser/WBTabWidget.cpp index 23430c88..9665235a 100644 --- a/src/web/browser/WBTabWidget.cpp +++ b/src/web/browser/WBTabWidget.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBTabWidget.h b/src/web/browser/WBTabWidget.h index 75c47fc4..a8055e40 100644 --- a/src/web/browser/WBTabWidget.h +++ b/src/web/browser/WBTabWidget.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBToolBarSearch.cpp b/src/web/browser/WBToolBarSearch.cpp index b8ddc4c7..1d4e2c8d 100644 --- a/src/web/browser/WBToolBarSearch.cpp +++ b/src/web/browser/WBToolBarSearch.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBToolBarSearch.h b/src/web/browser/WBToolBarSearch.h index 55a9f49b..1d5fd53e 100644 --- a/src/web/browser/WBToolBarSearch.h +++ b/src/web/browser/WBToolBarSearch.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBUrlLineEdit.cpp b/src/web/browser/WBUrlLineEdit.cpp index 246895bf..f16fae80 100644 --- a/src/web/browser/WBUrlLineEdit.cpp +++ b/src/web/browser/WBUrlLineEdit.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBUrlLineEdit.h b/src/web/browser/WBUrlLineEdit.h index 37090eff..1784dd41 100644 --- a/src/web/browser/WBUrlLineEdit.h +++ b/src/web/browser/WBUrlLineEdit.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBWebTrapWebView.cpp b/src/web/browser/WBWebTrapWebView.cpp index 0526158e..d2b194ed 100644 --- a/src/web/browser/WBWebTrapWebView.cpp +++ b/src/web/browser/WBWebTrapWebView.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBWebTrapWebView.h b/src/web/browser/WBWebTrapWebView.h index 00679fe1..a00ffef1 100644 --- a/src/web/browser/WBWebTrapWebView.h +++ b/src/web/browser/WBWebTrapWebView.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBWebView.cpp b/src/web/browser/WBWebView.cpp index 52bbef37..fc2d74ee 100644 --- a/src/web/browser/WBWebView.cpp +++ b/src/web/browser/WBWebView.cpp @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour diff --git a/src/web/browser/WBWebView.h b/src/web/browser/WBWebView.h index d44456d7..c2deb1aa 100644 --- a/src/web/browser/WBWebView.h +++ b/src/web/browser/WBWebView.h @@ -1,4 +1,6 @@ /* + * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM) + * * Copyright (C) 2013 Open Education Foundation * * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour From 13a471168a5b970beb28c6d6316eef1685671d99 Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Fri, 13 May 2016 10:57:15 +0200 Subject: [PATCH 05/11] Fixed build error on Linux caused by 9c607460 --- OpenBoard.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenBoard.pro b/OpenBoard.pro index e1bc733f..5a64ea8d 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -91,6 +91,8 @@ UB_FONTS.files = resources/fonts UB_THIRDPARTY_INTERACTIVE.files = thirdparty/interactive DEFINES += NO_THIRD_PARTY_WARNINGS +DEFINES += UBVERSION=\"\\\"$${LONG_VERSION}\"\\\" \ + UBVERSION_RC=$$VERSION_RC ALPHA_BETA_STR = $$find(VERSION, "[ab]") count(ALPHA_BETA_STR, 1):DEFINES += PRE_RELEASE BUILD_DIR = build From 468373292caace17286184252c69d1e233bcefc6 Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Mon, 13 Jun 2016 05:10:15 +0200 Subject: [PATCH 06/11] When using the system OSK, don't show/hide the inbuilt OSK when switching modes --- src/board/UBBoardPaletteManager.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 89cf5067..bb7324d1 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -664,11 +664,11 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is mRightPalette->assignParent(mContainer); mRightPalette->stackUnder(mStylusPalette); mLeftPalette->stackUnder(mStylusPalette); - if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) + if (UBPlatformUtils::hasVirtualKeyboard() + && mKeyboardPalette != NULL + && UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false) { - - if(mKeyboardPalette->m_isVisible) - { + if(mKeyboardPalette->m_isVisible) { mKeyboardPalette->hide(); mKeyboardPalette->setParent(UBApplication::boardController->controlContainer()); mKeyboardPalette->show(); @@ -698,7 +698,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is mRightPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView()); mStylusPalette->raise(); - if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) + if (UBPlatformUtils::hasVirtualKeyboard() + && mKeyboardPalette != NULL + && UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false) { if(mKeyboardPalette->m_isVisible) @@ -745,7 +747,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is case eUBDockPaletteWidget_WEB: { mAddItemPalette->setParent(UBApplication::mainWindow); - if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) + if (UBPlatformUtils::hasVirtualKeyboard() + && mKeyboardPalette != NULL + && UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false) { // tmp variable? // WBBrowserWindow* brWnd = UBApplication::webController->GetCurrentWebBrowser(); @@ -769,7 +773,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is mRightPalette->setVisible(rightPaletteVisible); mLeftPalette->assignParent(UBApplication::documentController->controlView()); mRightPalette->assignParent(UBApplication::documentController->controlView()); - if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) + if (UBPlatformUtils::hasVirtualKeyboard() + && mKeyboardPalette != NULL + && UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false) { if(mKeyboardPalette->m_isVisible) @@ -792,7 +798,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is mRightPalette->setVisible(rightPaletteVisible); mLeftPalette->assignParent(0); mRightPalette->assignParent(0); - if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL) + if (UBPlatformUtils::hasVirtualKeyboard() + && mKeyboardPalette != NULL + && UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false) { if(mKeyboardPalette->m_isVisible) From 9ed35d1d0d24f1a58efa17e9ea272c7646e84400 Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Wed, 22 Jun 2016 15:43:17 +0200 Subject: [PATCH 07/11] Version bumped to 1.3.2 (hotfix release) --- OpenBoard.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index 5a64ea8d..6bca6050 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -10,7 +10,7 @@ CONFIG += debug_and_release \ VERSION_MAJ = 1 VERSION_MIN = 3 -VERSION_PATCH = 1 +VERSION_PATCH = 2 VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error VERSION_BUILD = 0 From 3995d007a3ca5370a48252f20610c68ca8c2f94f Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Wed, 22 Jun 2016 16:16:13 +0200 Subject: [PATCH 08/11] Document's pageDpi is now stored in UBDocumentProxy rather than in UBSettings This fixes an issue where if one document was imported with a different DPI than the current one, any document created thereafter would have this same value (which could then cause problems if a PDF was added to that new document). Saving this value to UBDocumentProxy not only makes more sense, it also fixes this issue. --- src/adaptors/UBExportFullPDF.cpp | 3 ++- src/adaptors/UBSvgSubsetAdaptor.cpp | 27 ++++++++++++++------------- src/adaptors/UBSvgSubsetAdaptor.h | 6 +++--- src/core/UBSettings.cpp | 4 ---- src/core/UBSettings.h | 2 -- src/document/UBDocumentProxy.cpp | 11 +++++++++++ src/document/UBDocumentProxy.h | 5 +++++ 7 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/adaptors/UBExportFullPDF.cpp b/src/adaptors/UBExportFullPDF.cpp index 823c21d0..2f426a46 100644 --- a/src/adaptors/UBExportFullPDF.cpp +++ b/src/adaptors/UBExportFullPDF.cpp @@ -211,7 +211,8 @@ bool UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS // If the PDF was scaled when added to the scene (e.g if it was loaded from a document with a different DPI // than the current one), it should also be scaled here. qreal currentDpi = (UBApplication::desktop()->physicalDpiX() + UBApplication::desktop()->physicalDpiY()) / 2; - qreal pdfScale = qreal(UBSettings::pageDpi)/currentDpi; + qreal documentDpi = pDocumentProxy->pageDpi(); + qreal pdfScale = documentDpi != 0 ? documentDpi/currentDpi : 1; TransformationDescription pdfTransform(xPdfOffset, yPdfOffset, scaleFactor * pdfScale, 0); TransformationDescription annotationTransform(xAnnotationsOffset, yAnnotationsOffset, 1, 0); diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 733a9e49..9e0cbd92 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -334,7 +334,7 @@ QUuid UBSvgSubsetAdaptor::sceneUuid(UBDocumentProxy* proxy, const int pageIndex) UBGraphicsScene* UBSvgSubsetAdaptor::loadScene(UBDocumentProxy* proxy, const QByteArray& pArray) { UBSvgSubsetReader reader(proxy, UBTextTools::cleanHtmlCData(QString(pArray)).toUtf8()); - return reader.loadScene(); + return reader.loadScene(proxy); } UBSvgSubsetAdaptor::UBSvgSubsetReader::UBSvgSubsetReader(UBDocumentProxy* pProxy, const QByteArray& pXmlData) @@ -347,7 +347,7 @@ UBSvgSubsetAdaptor::UBSvgSubsetReader::UBSvgSubsetReader(UBDocumentProxy* pProxy } -UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() +UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene(UBDocumentProxy* proxy) { qDebug() << "loadScene() : starting reading..."; QTime time; @@ -435,9 +435,9 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() QStringRef pageDpi = mXmlReader.attributes().value("pageDpi"); if (!pageDpi.isNull()) - UBSettings::pageDpi = pageDpi.toInt(); + proxy->setPageDpi(pageDpi.toInt()); else - UBSettings::pageDpi = (UBApplication::desktop()->physicalDpiX() + UBApplication::desktop()->physicalDpiY())/2; + proxy->setPageDpi((UBApplication::desktop()->physicalDpiX() + UBApplication::desktop()->physicalDpiY())/2); bool darkBackground = false; bool crossedBackground = false; @@ -769,7 +769,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() QDesktopWidget* desktop = UBApplication::desktop(); qreal currentDpi = (desktop->physicalDpiX() + desktop->physicalDpiY()) / 2; qDebug() << "currentDpi (" << desktop->physicalDpiX() << " + " << desktop->physicalDpiY() << ")/2 = " << currentDpi; - qreal pdfScale = qreal(UBSettings::pageDpi)/currentDpi; + qreal pdfScale = qreal(proxy->pageDpi())/currentDpi; qDebug() << "pdfScale " << pdfScale; pdfItem->setScale(pdfScale); pdfItem->setFlag(QGraphicsItem::ItemIsMovable, true); @@ -829,7 +829,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() { QDesktopWidget* desktop = UBApplication::desktop(); qreal currentDpi = (desktop->physicalDpiX() + desktop->physicalDpiY()) / 2; - qreal textSizeMultiplier = qreal(UBSettings::pageDpi)/currentDpi; + qreal textSizeMultiplier = qreal(proxy->pageDpi())/currentDpi; //textDelegate->scaleTextSize(textSizeMultiplier); } @@ -1013,7 +1013,7 @@ QGraphicsItem *UBSvgSubsetAdaptor::UBSvgSubsetReader::readElementFromGroup() void UBSvgSubsetAdaptor::persistScene(UBDocumentProxy* proxy, UBGraphicsScene* pScene, const int pageIndex) { UBSvgSubsetWriter writer(proxy, pScene, pageIndex); - writer.persistScene(pageIndex); + writer.persistScene(proxy, pageIndex); } @@ -1027,7 +1027,7 @@ UBSvgSubsetAdaptor::UBSvgSubsetWriter::UBSvgSubsetWriter(UBDocumentProxy* proxy, } -void UBSvgSubsetAdaptor::UBSvgSubsetWriter::writeSvgElement() +void UBSvgSubsetAdaptor::UBSvgSubsetWriter::writeSvgElement(UBDocumentProxy* proxy) { mXmlWriter.writeStartElement("svg"); @@ -1053,10 +1053,11 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::writeSvgElement() QDesktopWidget* desktop = UBApplication::desktop(); - if (UBSettings::pageDpi == 0) - UBSettings::pageDpi = (desktop->physicalDpiX() + desktop->physicalDpiY()) / 2; + if (proxy->pageDpi() == 0) + proxy->setPageDpi((desktop->physicalDpiX() + desktop->physicalDpiY()) / 2); + + mXmlWriter.writeAttribute("pageDpi", QString::number(proxy->pageDpi())); - mXmlWriter.writeAttribute("pageDpi", QString::number(UBSettings::pageDpi)); mXmlWriter.writeStartElement("rect"); mXmlWriter.writeAttribute("fill", mScene->isDarkBackground() ? "black" : "white"); @@ -1068,7 +1069,7 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::writeSvgElement() mXmlWriter.writeEndElement(); } -bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) +bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(UBDocumentProxy* proxy, int pageIndex) { Q_UNUSED(pageIndex); @@ -1089,7 +1090,7 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) mXmlWriter.writeNamespace(UBSettings::uniboardDocumentNamespaceUri, "ub"); mXmlWriter.writeNamespace(nsXHtml, "xhtml"); - writeSvgElement(); + writeSvgElement(proxy); // Get the items from the scene QList items = mScene->items(); diff --git a/src/adaptors/UBSvgSubsetAdaptor.h b/src/adaptors/UBSvgSubsetAdaptor.h index e081e6a4..48e3b1d7 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.h +++ b/src/adaptors/UBSvgSubsetAdaptor.h @@ -114,7 +114,7 @@ class UBSvgSubsetAdaptor virtual ~UBSvgSubsetReader(){} - UBGraphicsScene* loadScene(); + UBGraphicsScene* loadScene(UBDocumentProxy *proxy); private: @@ -180,7 +180,7 @@ class UBSvgSubsetAdaptor UBSvgSubsetWriter(UBDocumentProxy* proxy, UBGraphicsScene* pScene, const int pageIndex); - bool persistScene(int pageIndex); + bool persistScene(UBDocumentProxy *proxy, int pageIndex); virtual ~UBSvgSubsetWriter(){} @@ -249,7 +249,7 @@ class UBSvgSubsetAdaptor void protractorToSvg(UBGraphicsProtractor *item); void cacheToSvg(UBGraphicsCache* item); void triangleToSvg(UBGraphicsTriangle *item); - void writeSvgElement(); + void writeSvgElement(UBDocumentProxy *proxy); private: diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 7943066f..c344908a 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -112,8 +112,6 @@ const int UBSettings::longClickInterval = 1200; const qreal UBSettings::minScreenRatio = 1.33; // 800/600 or 1024/768 -int UBSettings::pageDpi = 0; - QStringList UBSettings::bitmapFileExtensions; QStringList UBSettings::vectoFileExtensions; QStringList UBSettings::imageFileExtensions; @@ -274,8 +272,6 @@ void UBSettings::init() pageSize = new UBSetting(this, "Board", "DefaultPageSize", documentSizes.value(DocumentSizeRatio::Ratio4_3)); - pageDpi = (UBApplication::desktop()->physicalDpiX() + UBApplication::desktop()->physicalDpiY())/ 2; - QStringList penLightBackgroundColors; penLightBackgroundColors << "#000000" << "#FF0000" <<"#004080" << "#008000" << "#FFDD00" << "#C87400" << "#800040" << "#008080" << "#5F2D0A" << "#FFFFFF"; boardPenLightBackgroundColors = new UBColorListSetting(this, "Board", "PenLightBackgroundColors", penLightBackgroundColors, 1.0); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index 7b676e96..9d04f0dc 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -232,8 +232,6 @@ class UBSettings : public QObject static QString appPingMessage; - static int pageDpi; - UBSetting* productWebUrl; QString softwareHomeUrl; diff --git a/src/document/UBDocumentProxy.cpp b/src/document/UBDocumentProxy.cpp index cd5847d3..f90e6286 100644 --- a/src/document/UBDocumentProxy.cpp +++ b/src/document/UBDocumentProxy.cpp @@ -41,6 +41,7 @@ UBDocumentProxy::UBDocumentProxy() : mPageCount(0) + , mPageDpi(0) { init(); } @@ -48,6 +49,7 @@ UBDocumentProxy::UBDocumentProxy() UBDocumentProxy::UBDocumentProxy(const QString& pPersistancePath) : mPageCount(0) + , mPageDpi(0) { init(); setPersistencePath(pPersistancePath); @@ -98,6 +100,15 @@ void UBDocumentProxy::setPageCount(int pPageCount) mPageCount = pPageCount; } +int UBDocumentProxy::pageDpi() +{ + return mPageDpi; +} + +void UBDocumentProxy::setPageDpi(int dpi) +{ + mPageDpi = dpi; +} int UBDocumentProxy::incPageCount() { diff --git a/src/document/UBDocumentProxy.h b/src/document/UBDocumentProxy.h index bb9d7794..3012b6a3 100644 --- a/src/document/UBDocumentProxy.h +++ b/src/document/UBDocumentProxy.h @@ -79,6 +79,9 @@ class UBDocumentProxy : public QObject int pageCount(); + int pageDpi(); + void setPageDpi(int dpi); + protected: void setPageCount(int pPageCount); int incPageCount(); @@ -96,6 +99,8 @@ class UBDocumentProxy : public QObject int mPageCount; + int mPageDpi; + }; inline bool operator==(const UBDocumentProxy &proxy1, const UBDocumentProxy &proxy2) From b323f2f9bbf6d9bc23bceb0999d5fd918ad55912 Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Wed, 22 Jun 2016 16:34:23 +0200 Subject: [PATCH 09/11] Fix PDF export of documents containing both PDFs and tools In some cases, the PDF background of a document could be scaled badly when tools such as the ruler, compass etc. were present on the page. This happened with PDFs of version <= 1.4, and when the tools were outside of / larger than the page. --- src/adaptors/UBExportFullPDF.cpp | 6 +++--- src/domain/UBGraphicsScene.cpp | 15 +++++++++++++++ src/domain/UBGraphicsScene.h | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/adaptors/UBExportFullPDF.cpp b/src/adaptors/UBExportFullPDF.cpp index 2f426a46..6d69aef2 100644 --- a/src/adaptors/UBExportFullPDF.cpp +++ b/src/adaptors/UBExportFullPDF.cpp @@ -182,7 +182,7 @@ bool UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS { QString pdfName = UBPersistenceManager::objectDirectory + "/" + pdfItem->fileUuid().toString() + ".pdf"; QString backgroundPath = pDocumentProxy->persistencePath() + "/" + pdfName; - QRectF annotationsRect = scene->itemsBoundingRect(); + QRectF annotationsRect = scene->annotationsBoundingRect(); // Original datas double xAnnotation = qRound(annotationsRect.x()); @@ -192,8 +192,8 @@ bool UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS double hPdf = qRound(pdfItem->sceneBoundingRect().height()); // Exportation-transformed datas - double hScaleFactor = pageSize.width()/scene->itemsBoundingRect().width(); - double vScaleFactor = pageSize.height()/scene->itemsBoundingRect().height(); + double hScaleFactor = pageSize.width()/annotationsRect.width(); + double vScaleFactor = pageSize.height()/annotationsRect.height(); double scaleFactor = qMin(hScaleFactor, vScaleFactor); double xAnnotationsOffset = 0; diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index b38c8936..5181af4a 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -1811,6 +1811,21 @@ void UBGraphicsScene::deselectAllItemsExcept(QGraphicsItem* item) } } +/** + * Return the bounding rectangle of all items on the page except for tools (ruler, compass,...) + */ +QRectF UBGraphicsScene::annotationsBoundingRect() const +{ + QRectF boundingRect; + + foreach (QGraphicsItem *item, items()) { + if (!mTools.contains(rootItem(item))) + boundingRect |= item->sceneBoundingRect(); + } + + return boundingRect; +} + bool UBGraphicsScene::isEmpty() const { return mItemCount == 0; diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h index f445beef..29966f6d 100644 --- a/src/domain/UBGraphicsScene.h +++ b/src/domain/UBGraphicsScene.h @@ -321,6 +321,8 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem void notifyZChanged(QGraphicsItem *item, qreal zValue); void deselectAllItemsExcept(QGraphicsItem* graphicsItem); + QRectF annotationsBoundingRect() const; + public slots: void updateSelectionFrame(); void updateSelectionFrameWrapper(int); From 3abf154dfd6c48d553ebe501e23179946452ff03 Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Mon, 27 Jun 2016 14:28:54 +0200 Subject: [PATCH 10/11] Fixes to import and export of files containing PDFs The scale of PDF items was sometimes badly calculated when opening a document made with a previous version of OpenBoard or made on another computer. Specifically, this solves the following issues: - PDF scale calculation in documents that did not specify the pageDPI used to render the PDF (happened with documents created with some old versions of OpenBoard) - PDF scale calculation in multi-page documents (it was set correctly for the first page, but not the following ones) --- src/adaptors/UBExportFullPDF.cpp | 4 +--- src/adaptors/UBSvgSubsetAdaptor.cpp | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/adaptors/UBExportFullPDF.cpp b/src/adaptors/UBExportFullPDF.cpp index 6d69aef2..64b989a0 100644 --- a/src/adaptors/UBExportFullPDF.cpp +++ b/src/adaptors/UBExportFullPDF.cpp @@ -210,9 +210,7 @@ bool UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS // If the PDF was scaled when added to the scene (e.g if it was loaded from a document with a different DPI // than the current one), it should also be scaled here. - qreal currentDpi = (UBApplication::desktop()->physicalDpiX() + UBApplication::desktop()->physicalDpiY()) / 2; - qreal documentDpi = pDocumentProxy->pageDpi(); - qreal pdfScale = documentDpi != 0 ? documentDpi/currentDpi : 1; + qreal pdfScale = pdfItem->scale(); TransformationDescription pdfTransform(xPdfOffset, yPdfOffset, scaleFactor * pdfScale, 0); TransformationDescription annotationTransform(xAnnotationsOffset, yAnnotationsOffset, 1, 0); diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 9e0cbd92..e44eba15 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -354,6 +354,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene(UBDocumentProx time.start(); mScene = 0; UBGraphicsWidgetItem *currentWidget = 0; + bool pageDpiSpecified = true; mFileVersion = 40100; // default to 4.1.0 @@ -436,8 +437,11 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene(UBDocumentProx if (!pageDpi.isNull()) proxy->setPageDpi(pageDpi.toInt()); - else + + else if (proxy->pageDpi() == 0) { proxy->setPageDpi((UBApplication::desktop()->physicalDpiX() + UBApplication::desktop()->physicalDpiY())/2); + pageDpiSpecified = false; + } bool darkBackground = false; bool crossedBackground = false; @@ -768,9 +772,22 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene(UBDocumentProx { QDesktopWidget* desktop = UBApplication::desktop(); qreal currentDpi = (desktop->physicalDpiX() + desktop->physicalDpiY()) / 2; - qDebug() << "currentDpi (" << desktop->physicalDpiX() << " + " << desktop->physicalDpiY() << ")/2 = " << currentDpi; + // qDebug() << "currentDpi (" << desktop->physicalDpiX() << " + " << desktop->physicalDpiY() << ")/2 = " << currentDpi; qreal pdfScale = qreal(proxy->pageDpi())/currentDpi; - qDebug() << "pdfScale " << pdfScale; + // qDebug() << "pdfScale " << pdfScale; + + // If the PDF is in the background, it occupies the whole page; so we can simply + // use that information to calculate its scale. + if (isBackground) { + qreal pageWidth = mScene->nominalSize().width(); + qreal pageHeight = mScene->nominalSize().height(); + + qreal scaleX = pageWidth / pdfItem->sceneBoundingRect().width(); + qreal scaleY = pageHeight / pdfItem->sceneBoundingRect().height(); + + pdfScale = (scaleX+scaleY)/2.; + } + pdfItem->setScale(pdfScale); pdfItem->setFlag(QGraphicsItem::ItemIsMovable, true); pdfItem->setFlag(QGraphicsItem::ItemIsSelectable, true); From 3a7c2945c3bc9ff10c11bdc942fbf9b62fbc02ef Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Mon, 27 Jun 2016 15:43:57 +0200 Subject: [PATCH 11/11] Bumped version to 1.3.3 --- OpenBoard.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index 6bca6050..a164d483 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -10,7 +10,7 @@ CONFIG += debug_and_release \ VERSION_MAJ = 1 VERSION_MIN = 3 -VERSION_PATCH = 2 +VERSION_PATCH = 3 VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error VERSION_BUILD = 0