diff --git a/data/resources/StringResources.cz.resx b/data/resources/StringResources.cz.resx index a6328b9dbf..88093be92e 100644 --- a/data/resources/StringResources.cz.resx +++ b/data/resources/StringResources.cz.resx @@ -231,6 +231,9 @@ Ukázat diagram třídy + + Pro spuštění tohoto příkazu musí být nainstalován TortoiseGit. + Přidat nápovědu k Oblíbeným. @@ -1505,6 +1508,9 @@ Chcete přidat nový soubor do projektu ${CurrentProjectName}? K vytvoření tohoto souboru je nutné vyplnit některé dodatečné vlastnosti. + + Označený soubor {0} má nastaveny atributy pouze ke čtení. Soubor nebude do projektu vložen. + Š&ablony: @@ -6855,7 +6861,6 @@ Došlo k chybě při spuštění: Odkomentovat oblast - Tento resource není používán. Jeho účelem je testování kvality překladu a obsahuje -zlom řádku + Tento zdroj není používán. Jeho účelem je testování kvality překladu a konce řádku \ No newline at end of file diff --git a/data/resources/StringResources.de.resx b/data/resources/StringResources.de.resx index bb4a3ca75d..99ef81ab32 100644 --- a/data/resources/StringResources.de.resx +++ b/data/resources/StringResources.de.resx @@ -6774,6 +6774,12 @@ SharpDevelop 2 kompiliert Ressourcendateien anders: der Ressourcenname ist nicht Tagesdatum + + Gruppenfuß + + + Gruppenkopf + Bild @@ -6786,6 +6792,9 @@ SharpDevelop 2 kompiliert Ressourcendateien anders: der Ressourcenname ist nicht Rechteck + + Tabelle + Beschriftung @@ -6822,6 +6831,21 @@ SharpDevelop 2 kompiliert Ressourcendateien anders: der Ressourcenname ist nicht Reporttyp + + Gruppierung auswählen + + + Gruppierung + + + Listenansicht + + + Reportansicht + + + Tabellenansicht + Pull Datenmodell diff --git a/data/resources/StringResources.es-mx.resx b/data/resources/StringResources.es-mx.resx index 96b938051a..242698d690 100644 --- a/data/resources/StringResources.es-mx.resx +++ b/data/resources/StringResources.es-mx.resx @@ -6505,6 +6505,10 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Todos los formatos de proyecto conocidos + + Esta versión de SharpDevelop no puede cargar proyectos creados usando Visual Studio .NET 2003 (o anterior). +Intente usar SharpDevelop 3.2 para la converisón; o cree un nuevo proyecto y agregue los archivos fuente existentes. + No se pudo guardar {0}:\n{1} @@ -7609,6 +7613,9 @@ Los archivos de recursos han sido renombrados/movidos convenientemente. Abrir nuevo búfer + + &Proyecto... + &Solución... diff --git a/data/resources/StringResources.es.resx b/data/resources/StringResources.es.resx index 64dd00e4e3..6e306c9f7b 100644 --- a/data/resources/StringResources.es.resx +++ b/data/resources/StringResources.es.resx @@ -6509,6 +6509,10 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Todos los formatos conocidos + + Esta versión de SharpDevelop no puede cargar proyectos creados usando Visual Studio .NET 2003 (o anterior). +Intente usar SharpDevelop 3.2 para la converisón; o cree un nuevo proyecto y agregue los archivos fuente existentes. + No se pudo salvar {0}:\n{1} @@ -7614,6 +7618,9 @@ Los archivos de recursos han sido renombrados o cambiados de ubicación de acuer Abrir búfer nuevo + + &Proyecto... + &Solución... diff --git a/data/resources/StringResources.fr.resx b/data/resources/StringResources.fr.resx index 955b437e82..c95dfff7a2 100644 --- a/data/resources/StringResources.fr.resx +++ b/data/resources/StringResources.fr.resx @@ -5556,6 +5556,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace Heure + + Afficher/Cacher le zoom + Local @@ -5631,6 +5634,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace Graphe d'objet + + Visualiser les processus + Exécuter jusqu'au curseur @@ -5679,6 +5685,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace Changement de thread + + Basculer vers la vue "par méthodes" + Espions @@ -5925,6 +5934,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace Ouvrir le répertoire dans l'explorateur + + Réduire tous les noeuds + Ajouter fichiers existants diff --git a/data/resources/StringResources.nl.resx b/data/resources/StringResources.nl.resx index 3b016629f1..6049b7e73d 100644 --- a/data/resources/StringResources.nl.resx +++ b/data/resources/StringResources.nl.resx @@ -2740,6 +2740,9 @@ Wilt u het nieuwe bestand toevoegen aan project ${CurrentProjectName}? Toon cursor regel + + Animatie mogelijk maken + &EOL markeringen weergeven @@ -5556,6 +5559,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie Tijd + + Toon/verberg zoom control + Locaal @@ -5631,6 +5637,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie Object Graph + + Parallelle stapels + Uitvoeren tot de cursor @@ -5679,6 +5688,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie Thread wissel + + Wissel methode weergave + Observeren @@ -5925,6 +5937,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie Open de map met document in de Explorer + + Alle knooppunten invouwen + Toevoegen bestaande bestanden diff --git a/data/resources/StringResources.pt-br.resx b/data/resources/StringResources.pt-br.resx index e93dafb9e2..054e4babe7 100644 --- a/data/resources/StringResources.pt-br.resx +++ b/data/resources/StringResources.pt-br.resx @@ -231,6 +231,9 @@ Mostrar Diagrama de Classes + + TortoiseGit precisa ser instalado para executar essa ação. + Conteudo @@ -715,6 +718,9 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda. Verificar com StyleCop + + Analise do Fonte + Adicionar a lista ignore. @@ -940,6 +946,9 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda. Usar a extensão de conclusão de marcação + + Usar destaques avançados + O arquivo não pode ser salvo com a codificação corrente ${encoding} sem perder dados @@ -2471,7 +2480,7 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã &Atualizar mudanças quando salvo - Sempre cri&ar cópia de segurança + Usar arquivo &temporario para salvar. Codificação padrão de arquivo: @@ -2489,7 +2498,7 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã &Abrir configurações específicas de usuário com o documento - Macintosh + Macintosh (CR) Abrir/Salvar @@ -2498,13 +2507,13 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Salvar - Unix + Unix (LF) Usar &Lixeira quando deletar arquivos - Windows + Windows (CRLF) Formato @@ -2515,6 +2524,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Rolagem de palavra + + Perfil + Opções de Compilação e Execução @@ -2713,9 +2725,15 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Antes do Circunflexo + + Mostra linha do cursor + Mostrar marcas de &EOL + + Simbolos em destaque + Destacar &chave correspondente @@ -2845,6 +2863,18 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã String do arquivo localizado: + + &Manifest da aplicação + + + Não embutir o manifest + + + Embutir o manifest padrão + + + Arquivos manifest + Nome de Saída: @@ -3145,6 +3175,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Adicionar interface para a classe + + Nome gerado + Incluir Comentarios @@ -3157,6 +3190,18 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Selecionar membros públicos + + Criar nova classe: + + + O metodo não pode ser criado diretamente porque não há codigo fonte disponivel na classe. Favor selecionar a classe estatica onde o metodo será criado como uma extensão. + + + Introduzir metodo + + + Usar classe existente: + Navegador de Assembly .NET @@ -3250,6 +3295,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Erro durante gravação + + O arquivo é muito grande para ser aberto. + Por favor corrija todos os erros do código fonte antes de modelar o formulário @@ -3319,6 +3367,18 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Pasta + + Estilo do fonte + + + Personalizar + + + Selecionar fonte + + + Traço baixo + &Ajuda @@ -3376,6 +3436,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Por favor, aguarde... + + Prever + Questão @@ -3395,7 +3458,7 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Tentar de novo - Selecionar todos + Selecion&ar todos Ícones Pequenos @@ -3424,6 +3487,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Abrir + + Abrir diretorio no Explorer + Abrir Com... @@ -3448,6 +3514,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Editor de texto + + Editor de texto (escolher codificação) + Navegador Web embutido @@ -3490,6 +3559,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Chave de recurso não pode ser vazia! + + Ocorreu um erro ao processar o arquivo de recursos na linha '{0}'. + Achar chaves de recursos perdidos @@ -3508,21 +3580,60 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Referências para chaves de recursos perdidas + + Referencias para ${ResourceKey} (em ${ResourceFileName}) + + + Não foi possivel encontrar e renomear a definição dessa chave de recurso. + Digite novo nome da chave de recurso + + O recurso selecionado não é do tipo 'string' e não pode ser editado. + Adicionar este recurso + + Editar recurso + Ferramentas de Recurso <CHAVE NÃO ENCONTRADA> + + Recurso em {0}: + + + Objeto do tipo {0}: + + + <Desconhecido> + + + Esconde os recursos de ICSharpCode.Core + + + Quando selecionadas, as teclas dos recursos que estão contidas no arquivo de recurso do aplicativo ICSharpCode.Core, não estão listadas. + + + Não foi encontrada na solução nenhuma tecla de recurso não utilizado. + + + Teclas de recursos não utilizados + Valor + + Valor do recurso: + + + Pressione Ctrl+Espaço para mostrar os itens de todos os namespaces + Tradutor Boo @@ -3541,15 +3652,42 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Executa comandos no programa depurado + + O SharpDevelop não achou FxCop. Favor selecionar o diretório de instalação do FxCop nas opções do SharpDevelop. + + + Não pode ler o arquivo de log do FxCop: + Mono não está instalado. + + Executando analise de codigo... + + + Desconhecida a versão do Mono Framework: + Análise de Código Verificar com FxCop + + O diretorio selecionado não contem a instalação completa do FxCop. + + + Selecione o caminho para o FxCop + + + O FxCop foi encontrado no seguinte diretorio: + + + O FxCop não foi encontrado. Para mostrar o SharpDevelop onde o FxCop está instalado, instale o FxCop e clique em 'Selecionar Caminho para FxCop'. + + + Caminho para FxCop + Adicionar/Remover regras de assembler. @@ -3583,6 +3721,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Executando com FxCop + + Suprimir mensagem + Código Coberto @@ -3637,6 +3778,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Atributos excluidos + + Excluir + Rodando cobertura de código... diff --git a/data/resources/StringResources.pt.resx b/data/resources/StringResources.pt.resx index 8474c7b8cd..c941440833 100644 --- a/data/resources/StringResources.pt.resx +++ b/data/resources/StringResources.pt.resx @@ -289,6 +289,18 @@ Faça o download de um AddIn através da Internet, depois pressione 'Instalar Ad Elementos + + Dados + + + Deslocamento + + + Sistema numérico + + + Escalar para caber na largura actual + Adicionar para favoritos de Ajuda @@ -455,6 +467,33 @@ Precisa de instalar o .NET Framework SDK para utilizar o sistema de ajuda. Utilizar a linguagem de projecto actual + + Resultado + + + Nós Juntos + + + Todas as funções para {0} + + + O perfil de sessão SharpDevelop seleccionado foi criado por uma versão mais recente de SharpDevelop e assim não pode ser aberto. + + + Este projecto não pode ser iniciado porque o ficheiro executável não foi encontrado, assegure-se, por favor,de que o projecto e todas as suas dependências são construídas correctamente! + + + Nenhum projecto iniciável foi encontrado. Abortar... + + + Ciclos CPU: + + + Executar inquérito + + + Nome + Extrair method diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx index f60e37e8a8..4555abd4ab 100644 --- a/data/resources/StringResources.resx +++ b/data/resources/StringResources.resx @@ -2817,6 +2817,9 @@ system. I don't think that it needs translation. Show caret line + + Enable animations + Show &end-of-line markers @@ -5852,6 +5855,9 @@ Stop/terminate the debuggee. Time + + Show/Hide Zoom Control + Local @@ -5937,6 +5943,9 @@ Shows the full callstack of the error. Object Graph + + Parallel Stacks + Run to cursor @@ -5985,6 +5994,9 @@ Shows the full callstack of the error. Thread switch + + Toggle Method View + Watch @@ -6245,6 +6257,9 @@ Removed the end part of the original message ", reason '${Message}'" since this Open Containing Folder In Explorer String for the editor tab context menu that will open the directory in which a documents file is contained in Windows Explorer. + + Collapse all nodes + Add existing files @@ -7146,6 +7161,12 @@ The resources files have been renamed/moved accordingly. Today + + GroupFooter + + + GroupHeader + Image @@ -7158,6 +7179,9 @@ The resources files have been renamed/moved accordingly. Rectangle + + Table + Label @@ -7194,6 +7218,21 @@ The resources files have been renamed/moved accordingly. Report Type + + Select the GroupColumn + + + Grouping + + + List Layout + + + Report layout + + + Table Layout + Pull Data Model diff --git a/data/resources/StringResources.ru.resx b/data/resources/StringResources.ru.resx index 9e24d1ba69..f3e2c7adbf 100644 --- a/data/resources/StringResources.ru.resx +++ b/data/resources/StringResources.ru.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - О Менеджере Надстроек + О Менеджере Плагинов Отменить удаление @@ -145,68 +145,68 @@ Обновить - Для работы этого AddInа требуется другой AddIn. Установите его чтобы включить этот. + Для работы этого плагина нужен другой плагин. Установите его, чтобы включить этот. Отключен - Надстройка будет включена после перезапуска SharpDevelop + Плагин станет доступным после перезапуска SharpDevelop - Надстройка будет установлена после перезапуска SharpDevelop + Плагин будет установлен после перезапуска SharpDevelop - Надстройка установлена дважды. Пожалуйста, удалите одну копию. + Установлены две копии плагина. Пожалуйста, удалите одну из копий. - Эта Надстройка должна иметь <Identity> для использовании в Менеджере Надстроек + У этого плагина должен быть <Identity> для использовании в Менеджере Плагинов - Надстройка будет удалена после перезапуска SharpDevelop + Плагин будет удален после перезапуска SharpDevelop - Надстройка будет обновлена после перезапуска SharpDevelop + Плагин будет обновлен после перезапуска SharpDevelop - Надстройка будет отключена после перезапуска SharpDevelop + Плагин станет недоступным после перезапуска SharpDevelop - Вы не можете отключить Менеджер Надстроек. Он необходим для переподключения Надстроек! + Вы не можете отключить Менеджер Плагинов. Он необходим для переподключения Плагинов! - Надстройки внутри папки ${ProductName} не нужно устанавливать, они предустанавливаются автоматически. + Нельзя устанавливать плагины внутри папки ${ProductName}, так как они будут считаться предустановленными. - Отменяет удаление выделеных Надстроек. + Отменяет удаление выделеных плагинов. - Отменяет установку выделенных Надстроек. + Отменяет установку выделенных плагинов. - Отменяет обновление выделенных Надстроек. + Отменяет обновление выделенных плагинов. - Выключает выбранные Надстройки + Отключает выбранные плагины. - Включает выбранные Надстройки + Включает выбранные плагины. - Неправильное выделение, пожалуйста выделите Надстройки с одинаковым статусом. + Неправильное выделение, пожалуйста, выделите плагины с одинаковым статусом. - Пакет установки Надстройки + Установочный пакет плагина - Надстройки SharpDevelop|*.addin;*.sdaddin|Все файлы|*.* + Плагины SharpDevelop|*.addin;*.sdaddin|Все файлы|*.* - Установить Надстройку + Установить плагин - У вас нет установленных Надстроек. -Вы можете скачать их из Интернета, потом нажать 'Установить Надстройку' и выбрать скачаный файл, чтобы установить его. + У Вас не установлено ни одного плагина. +Скачайте их из Интернета, нажмите 'Установить плагин' и выберите скачаный файл, чтобы установить его. Открыть Web-сайт @@ -215,16 +215,16 @@ Опции - Надстройки необходимы для: + Плагины необходимы для работы: - Необходимые зависимости: + Требуемые для работы плагины: - Показать предустановленные Надстройки + Показать предустановленные плагины - Менеджер Надстроек + Менеджер Плагинов Неизвестный формат файла: diff --git a/data/resources/StringResources.tr.resx b/data/resources/StringResources.tr.resx index 043df070ea..bd93d43c8c 100644 --- a/data/resources/StringResources.tr.resx +++ b/data/resources/StringResources.tr.resx @@ -232,12 +232,69 @@ Sınıf Şemasını Göster + + Bu işlemi gerçekleştirebilmek için TortoiseGit yüklü olmalıdır. + + + İçerikler + + + İçeriği Göster + + + Arama + + + Yardım Kütüphanesi + + + Yardım Modu + + + Yüklü Yardım Katalogları + + + Microsoft Yardım Görüntüleyici + + + Çevrimiçi yardım modunda çevrimdışı bir özellik kullanmaya çalıştın. Bu özelliği kullanabilmek için yardım modunu değiştirmelisin. + + + Ara + + + Ne için: + + + Arama + + + Yardımı Göster + + + Harici yardımı kullan + + + Yerel yardımı kullanmak istiyorum + + + Çevrimiçi yardımı kullanmak istiyorum + Tek satırdaki bayt Gösterim + + Nesneler + + + Veri + + + Ofset + Sayısal sistem @@ -410,6 +467,87 @@ Yardım sistemini elde edebilmek için .NET Framework SDK 'yı yüklemelisiniz.< Şu anki proje dilini kullan + + Sonuçlar + + + Birleşik Parçalar + + + {0} için olan tüm fonksiyonlar + + + Seçili SharpDevelop profil oturumu yeni bir SharpDevelop sürümü ile oluşturulmuş ve açılamıyor. + + + SharpDevelop Profil Oturumu + + + Çalıştırılabilir dosya bulunamadığı için proje başlatılamadı, lütfen projenin kendisinin ve tüm bağlantılarının doğruluğundan emin olunuz. + + + Açılabilir bir proje bulunamadı. İptal ediliyor... + + + Analiz için hazırlanıyor... + + + COM kayıt istemcisine profil kaydı girilemedi. Profilleme başlatılamıyor. + + + COM kayıt istemcisinden profil kaydı silinemedi! + + + Profil + + + Yinelenen çağrıları birleştir. + + + İç .NET çağrılarını profilleme. + + + Verileri sadece bu oturumun sonunda derle. + + + Verilerin derlenmesini hemen oturum açılınca başlat. + + + Veri Koleksiyonu + + + Geçici depolama dosyasının boyutu: + + + Olayları takip et + + + Genel + + + Profilleme + + + Veri geçersiz, lütfen tekrar deneyin. + + + Veri topla + + + Kapat + + + Ad + + + Ara: + + + Geçen süre + + + Süre: + Çıkartma yöntemi @@ -425,6 +563,12 @@ Yardım sistemini elde edebilmek için .NET Framework SDK 'yı yüklemelisiniz.< {0} içinden çıkarım yöntemi desteklenmemektedir! + + Değişken + + + Arayüz ekle {0} + StyleCop ile Kontrol Et @@ -530,6 +674,9 @@ Yardım sistemini elde edebilmek için .NET Framework SDK 'yı yüklemelisiniz.< Kontrolü yenile + + Katılımınız için teşekkürler. İstediğiniz zaman SharpDevelop seçeneklerini kullanarak çıkabilirsiniz. + Katılmak istiyorum. Kullanım bilgilerini topla ve gönder diff --git a/samples/SharpDevelopReports/src/ReportSamples.sln b/samples/SharpDevelopReports/src/ReportSamples.sln index 2258aa18e8..17ea8cced5 100644 --- a/samples/SharpDevelopReports/src/ReportSamples.sln +++ b/samples/SharpDevelopReports/src/ReportSamples.sln @@ -1,9 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.0.0.5930 +# SharpDevelop 4.1.0.7014 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpReportSamples", "SharpReportSamples\SharpReportSamples.csproj", "{BB5D34DA-3561-48B1-894A-46765C2A18C1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "..\..\..\src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -20,6 +22,14 @@ Global {BB5D34DA-3561-48B1-894A-46765C2A18C1}.Debug|x86.ActiveCfg = Debug|x86 {BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|x86.Build.0 = Release|x86 {BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|x86.ActiveCfg = Release|x86 + {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|x86.Build.0 = Debug|Any CPU + {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|x86.ActiveCfg = Debug|Any CPU + {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.Build.0 = Release|Any CPU + {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|x86.Build.0 = Release|Any CPU + {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs index 87f5144785..4673dcc811 100644 --- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs +++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs @@ -98,9 +98,7 @@ namespace SharpReportSamples this.RunContributors(reportName); } else if (s == "ContributorsListWithParameters"){ - //this.V1_RunContributorsWithParameters(reportName); -// this.V2_RunContributorsWithParameters(string fileName) - this.V3_RunContributorsWithParameters(reportName); + this.RunContributorsWithParameters(reportName); } else if (s == "NoConnectionReport") { @@ -221,7 +219,7 @@ namespace SharpReportSamples } - private void V3_RunContributorsWithParameters(string fileName) + private void RunContributorsWithParameters(string fileName) { var model = ReportEngine.LoadReportModel(fileName); ReportParameters parameters = ReportEngine.LoadParameters(fileName); @@ -231,10 +229,6 @@ namespace SharpReportSamples List list = ContributorsReportData.CreateContributorsList(); -// IDataManager dataManager = DataManager.CreateInstance(list,model.ReportSettings); - - - //IReportCreator creator = ReportEngine.CreatePageBuilder(model,eventLogger.EventLog,null); IReportCreator creator = ReportEngine.CreatePageBuilder(model,list,parameters); @@ -291,7 +285,7 @@ namespace SharpReportSamples ReportModel model = ReportEngine.LoadReportModel(fileName); IDataManager dataManager = DataManager.CreateInstance(eLog.EventLog,model.ReportSettings); - this.previewControl1.SectionRendering += PushPrinting; +// this.previewControl1.SectionRendering += PushPrinting; this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e) diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj b/samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj index f0b3fa7ebb..e09f5b2627 100644 --- a/samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj +++ b/samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj @@ -32,8 +32,8 @@ - - ..\..\..\..\AddIns\AddIns\Misc\SharpDevelopReports\ICSharpCode.Reports.Core.dll + + ..\..\..\..\src\AddIns\Misc\Reports\Irony\obj\Debug\Irony.dll @@ -71,4 +71,10 @@ + + + {4B2239FF-8FD6-431D-9D22-1B8049BA6917} + ICSharpCode.Reports.Core + + \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/PreviewCommands.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/PreviewCommands.cs index 1c7cdb8a3d..94af309b46 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/PreviewCommands.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/PreviewCommands.cs @@ -2,13 +2,8 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using System.Globalization; -using System.Windows.Forms; - using ICSharpCode.Core; using ICSharpCode.Reports.Core; -using ICSharpCode.SharpDevelop; -using ICSharpCode.Reports.Core.ReportViewer; using ICSharpCode.SharpDevelop.Gui; namespace ICSharpCode.Reports.Addin.Commands @@ -16,8 +11,6 @@ namespace ICSharpCode.Reports.Addin.Commands public class AbstractPreviewCommand :AbstractCommand { - ReportModel model; - ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer; public AbstractPreviewCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer) { @@ -28,31 +21,29 @@ namespace ICSharpCode.Reports.Addin.Commands throw new ArgumentNullException("reportViewer"); } - this.model = model; - this.reportViewer = reportViewer; + this.Model = model; + this.ReportViewer = reportViewer; } public override void Run() { - CollectParametersCommand sql = new CollectParametersCommand(model); - sql.Run(); + CollectParametersCommand cmd = new CollectParametersCommand(Model); + cmd.Run(); } - public ICSharpCode.Reports.Core.ReportViewer.PreviewControl ReportViewer { - get { return reportViewer; } - } + public ICSharpCode.Reports.Core.ReportViewer.PreviewControl ReportViewer {get;private set;} + + + public ReportModel Model {get;private set;} - public ReportModel Model { - get { return this.model; } - } } - public class AsyncFormsSheetPreviewCommand:AbstractPreviewCommand + public class FormSheetToReportViewerCommand:AbstractPreviewCommand { - public AsyncFormsSheetPreviewCommand(ReportModel model, + public FormSheetToReportViewerCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer):base (model,reportViewer) { } @@ -65,10 +56,10 @@ namespace ICSharpCode.Reports.Addin.Commands } - public class AsyncPullModelPreviewCommand:AbstractPreviewCommand + public class PullModelToReportViewerCommand:AbstractPreviewCommand { - public AsyncPullModelPreviewCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer):base (model,reportViewer) + public PullModelToReportViewerCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer):base (model,reportViewer) { } @@ -81,9 +72,9 @@ namespace ICSharpCode.Reports.Addin.Commands } - public class AsyncPushModelPreviewCommand:AbstractPreviewCommand + public class PushModelToReportViewerCommand:AbstractPreviewCommand { - public AsyncPushModelPreviewCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer):base (model,reportViewer) + public PushModelToReportViewerCommand(ReportModel model, ICSharpCode.Reports.Core.ReportViewer.PreviewControl reportViewer):base (model,reportViewer) { } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs index 35f8199d21..4d57e43b4a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs @@ -5,13 +5,20 @@ using System; using System.Collections; using System.ComponentModel.Design; using System.ComponentModel.Design.Serialization; +using System.Data; using System.Drawing.Design; +using System.Drawing.Printing; using System.IO; using System.Text; using System.Windows.Forms; using ICSharpCode.Core; +using ICSharpCode.Reports.Addin.Commands; using ICSharpCode.Reports.Addin.Designer; +using ICSharpCode.Reports.Core; +using ICSharpCode.Reports.Core.BaseClasses.Printing; +using ICSharpCode.Reports.Core.Exporter; +using ICSharpCode.Reports.Core.Exporter.ExportRenderer; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; @@ -185,21 +192,11 @@ namespace ICSharpCode.Reports.Addin LoggingService.Debug("FormsDesigner loaded, setting ActiveDesignSurface to " + this.designSurface.ToString()); designSurfaceManager.ActiveDesignSurface = this.designSurface; this.UpdatePropertyPad(); - } else { - // This method can not only be called during initialization, - // but also when the designer reloads itself because of - // a language change. - // When a load error occurs there, we are not somewhere - // below the Load method which handles load errors. - // That is why we create an error text box here anyway. - - -// TextBox errorTextBox = new TextBox() { Multiline=true, ScrollBars=ScrollBars.Both, ReadOnly=true, BackColor=SystemColors.Window, Dock=DockStyle.Fill }; -// errorTextBox.Text = String.Concat(this.LoadErrorHeaderText, FormatLoadErrors(designSurface)); -// this.UserContent = errorTextBox; } } + + private void CreatePanel () { this.panel = new Panel(); @@ -220,10 +217,6 @@ namespace ICSharpCode.Reports.Addin { LoggingService.Debug("Forms designer: DesignerLoader unloading..."); this.unloading = true; -// if (!this.disposing) { -// this.UserContent = this.pleaseWaitLabel; -// Application.DoEvents(); -// } } @@ -284,7 +277,6 @@ namespace ICSharpCode.Reports.Addin this.MakeDirty(); ReportExplorerPad explorerPad = CheckReportExplorer(); IComponentChangeService change = Host.GetService(typeof(IComponentChangeService)) as IComponentChangeService; -// change.OnComponentChanged(explorerPad.ReportModel.ReportSettings.SortColumnsCollection, null, null, null); change.OnComponentChanged(explorerPad, null, null, null); } @@ -557,16 +549,47 @@ namespace ICSharpCode.Reports.Addin #region IPrintable - public System.Drawing.Printing.PrintDocument PrintDocument { + + public PrintDocument PrintDocument + { get { - ICSharpCode.Reports.Core.ReportModel model = this.loader.CreateRenderableModel(); - StandartPreviewManager reportManager = new StandartPreviewManager(); - ICSharpCode.Reports.Core.AbstractRenderer r = reportManager.CreateRenderer (model); - r.ReportDocument.PrintController = new ICSharpCode.Reports.Core.ExtendedPrintController(new System.Drawing.Printing.PreviewPrintController()); - return r.ReportDocument; + ReportModel model = loader.CreateRenderableModel(); + IReportCreator reportCreator = null; + var paramCmd = new CollectParametersCommand(model); + paramCmd.Run(); + switch (model.DataModel) { + case GlobalEnums.PushPullModel.FormSheet : + { + reportCreator = FormPageBuilder.CreateInstance(model); + break; + } + case GlobalEnums.PushPullModel.PullData: + { + IDataManager dataManager = DataManagerFactory.CreateDataManager(model,(ReportParameters)null); + reportCreator = DataPageBuilder.CreateInstance(model,dataManager); + break; + } + case GlobalEnums.PushPullModel.PushData:{ + var cmd = new ICSharpCode.Reports.Addin.Commands.DataSetFromXsdCommand(); + cmd.Run(); + DataSet ds = cmd.DataSet; + IDataManager dataManager = DataManagerFactory.CreateDataManager(model,ds.Tables[0]); + reportCreator = DataPageBuilder.CreateInstance(model,dataManager); + break; + } + default: + throw new InvalidReportModelException(); + } + + reportCreator.BuildExportList(); + PrintRenderer printer = PrintRenderer.CreateInstance(reportCreator.Pages); + printer.Start(); + printer.RenderOutput(); + printer.End(); + return printer.PrintDocument; } } - + #endregion diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs index c3221f723c..74e40aed9f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs @@ -20,14 +20,14 @@ namespace ICSharpCode.Reports.Addin.ReportWizard public LayoutPanel() { - base.EnableFinish = true; + base.EnableFinish = true; base.EnableCancel = true; base.EnableNext = true; base.Refresh(); layoutControl = new LayoutPanelControl(); layoutControl.Location = new Point (20,20); this.Controls.Add(layoutControl); - + } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs index 9ce4704a03..ea33d84982 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs @@ -32,38 +32,50 @@ namespace ICSharpCode.Reports.Addin.ReportWizard private void InitializeComponent() { this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.radioTableLayout = new System.Windows.Forms.RadioButton(); this.radioListLayout = new System.Windows.Forms.RadioButton(); this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // groupBox1 // - this.groupBox1.Controls.Add(this.comboBox1); + this.groupBox1.Controls.Add(this.groupBox2); this.groupBox1.Controls.Add(this.checkBox1); this.groupBox1.Controls.Add(this.radioTableLayout); this.groupBox1.Controls.Add(this.radioListLayout); this.groupBox1.Location = new System.Drawing.Point(17, 18); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(232, 205); + this.groupBox1.Size = new System.Drawing.Size(232, 242); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "Report Layout"; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.comboBox1); + this.groupBox2.Location = new System.Drawing.Point(55, 146); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(200, 64); + this.groupBox2.TabIndex = 6; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "groupBox2"; + this.groupBox2.Visible = false; + // // comboBox1 // this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(64, 160); + this.comboBox1.Location = new System.Drawing.Point(6, 28); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(121, 21); - this.comboBox1.TabIndex = 5; - this.comboBox1.Visible = false; + this.comboBox1.TabIndex = 6; // // checkBox1 // - this.checkBox1.Location = new System.Drawing.Point(64, 116); + this.checkBox1.Location = new System.Drawing.Point(64, 106); this.checkBox1.Name = "checkBox1"; this.checkBox1.Size = new System.Drawing.Size(104, 24); this.checkBox1.TabIndex = 4; @@ -97,10 +109,12 @@ namespace ICSharpCode.Reports.Addin.ReportWizard this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.groupBox1); this.Name = "LayoutPanelControl"; - this.Size = new System.Drawing.Size(270, 252); + this.Size = new System.Drawing.Size(331, 284); this.groupBox1.ResumeLayout(false); + this.groupBox2.ResumeLayout(false); this.ResumeLayout(false); } + private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.CheckBox checkBox1; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.RadioButton radioTableLayout; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs index 39da9c8733..bf4e6ecdbe 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs @@ -5,6 +5,8 @@ using System; using System.ComponentModel; using System.Drawing; using System.Windows.Forms; + +using ICSharpCode.Core; using ICSharpCode.Reports.Core; namespace ICSharpCode.Reports.Addin.ReportWizard @@ -22,6 +24,11 @@ namespace ICSharpCode.Reports.Addin.ReportWizard public LayoutPanelControl() { InitializeComponent(); + groupBox1.Text = ResourceService.GetString("SharpReport.Wizard.Layout.ReportLayout"); + radioListLayout.Text = ResourceService.GetString("SharpReport.Wizard.Layout.ListLayout"); + radioTableLayout.Text = ResourceService.GetString("SharpReport.Wizard.Layout.TableLayout"); + groupBox2.Text = ResourceService.GetString("SharpReport.Wizard.Layout.Column"); + checkBox1.Text = ResourceService.GetString("SharpReport.Wizard.Layout.Grouping"); } @@ -49,6 +56,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard } } + public GlobalEnums.ReportLayout ReportLayout { get { GetLayout(); @@ -61,7 +69,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard void CheckBox1CheckedChanged(object sender, System.EventArgs e) { - comboBox1.Visible = checkBox1.Checked; + //comboBox1.Visible = checkBox1.Checked; + this.groupBox2.Visible = checkBox1.Checked; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs index 5f0ef18ec1..53ea9f5a58 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs @@ -28,7 +28,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard private System.Windows.Forms.Label label3; private bool firstDrag; private string connectionString; - private CommandType commandType; +// private CommandType commandType; private ReportStructure reportStructure; private Properties customizer; private IDatabaseObjectBase currentNode; @@ -60,7 +60,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard base.EnableCancel = true; this.firstDrag = true; base.IsLastPanel = false; - commandType = CommandType.Text; + //commandType = CommandType.Text; this.txtSqlString.Enabled = false; this.databasesTreeHost = new ElementHost() { Dock = DockStyle.Fill }; @@ -90,12 +90,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard } if (message == DialogMessage.Next) { - - - commandType = CommandType.Text; - customizer.Set("SqlString", this.txtSqlString.Text.Trim()); - reportStructure.CommandType = commandType; + //reportStructure.CommandType = commandType; reportStructure.SqlString = this.txtSqlString.Text.Trim(); reportStructure.ConnectionString = connectionString; base.EnableFinish = true; @@ -123,6 +119,9 @@ namespace ICSharpCode.Reports.Addin.ReportWizard if (e.Data.GetFormats().Length > 0) { string draggedFormat = e.Data.GetFormats()[0]; + + String str = String.Format("drag {0}",draggedFormat); + System.Diagnostics.Trace.WriteLine(str); Type draggedType = null; @@ -173,9 +172,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard // we insert Select * from.... otherwise we have to scan //the whole string for incorrect columnNames this.txtSqlString.Clear(); - // AbstractSharpQuerySchemaClass tbl = (AbstractSharpQuerySchemaClass)this.currentNode.SchemaClass; this.txtSqlString.Text = "SELECT * FROM " + (draggedObject as ICSharpCode.Data.Core.Interfaces.ITable).Name; - + reportStructure.CommandType = CommandType.Text; break; case NodeType.ColumnImage: @@ -184,9 +182,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard { this.txtSqlString.AppendText("SELECT "); this.txtSqlString.AppendText(colName); - } - //FxCop : http://msdn.microsoft.com/library/bb386042(VS.100).aspx + else if (this.txtSqlString.Text.ToUpper(CultureInfo.InvariantCulture).IndexOf("where", StringComparison.OrdinalIgnoreCase) > 0) { this.txtSqlString.AppendText(colName + " = ?"); @@ -196,6 +193,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard this.txtSqlString.AppendText(", "); this.txtSqlString.AppendText(colName); } + reportStructure.CommandType = CommandType.Text; break; case NodeType.ProcedureImage: @@ -204,7 +202,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard // we can't use the dragobject because it returns an string like 'EXECUTE ProcName' IProcedure procedure = draggedObject as IProcedure; this.txtSqlString.Text = "EXECUTE " + procedure.Name; - + reportStructure.CommandType = CommandType.StoredProcedure; // reportStructure.SharpQueryProcedure = new SharpQueryProcedure(new SharpQuery.Connection.OLEDBConnectionWrapper(this.connectionString), procedure.Parent.Name, procedure.SchemaName, string.Empty, procedure.Name); break; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs index 09c076c233..27a5c98ca9 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs @@ -50,6 +50,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard #endregion + #region Fill data private DataSet FillGrid() @@ -62,7 +63,23 @@ namespace ICSharpCode.Reports.Addin.ReportWizard model.ReportSettings.CommandText); DataSet dataSet = ResultPanel.CreateDataSet (); - this.txtSqlString.Text = model.ReportSettings.CommandText; + + switch (model.ReportSettings.CommandType) { + case CommandType.Text: + this.txtSqlString.Text = model.ReportSettings.CommandText; + dataSet = BuildFromSqlString(); + break; + case CommandType.StoredProcedure: + MessageService.ShowError("Stored Procedures are not suppurted at the moment"); + break; + case CommandType.TableDirect: + MessageService.ShowError("TableDirect is not suppurted at the moment"); + break; + default: + throw new Exception("Invalid value for CommandType"); + } + + if (model.ReportSettings.CommandType == CommandType.StoredProcedure){ /* if (reportStructure.SharpQueryProcedure == null) { @@ -81,10 +98,10 @@ namespace ICSharpCode.Reports.Addin.ReportWizard } // from here we create from an SqlString like "Select...." - if (model.ReportSettings.CommandType == CommandType.Text){ - this.txtSqlString.Text = model.ReportSettings.CommandText; - dataSet = BuildFromSqlString(); - } +// if (model.ReportSettings.CommandType == CommandType.Text){ +// this.txtSqlString.Text = model.ReportSettings.CommandText; +// dataSet = BuildFromSqlString(); +// } return dataSet; } @@ -247,6 +264,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard #endregion + #region overrides public override bool ReceiveDialogMessage(DialogMessage message) @@ -257,9 +275,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard } if (message == DialogMessage.Activated) { - this.model = reportStructure.CreateAndFillReportModel(); - this.resultDataSet = FillGrid(); - SetupGrid (); + ShowData(); base.EnableNext = true; base.EnableFinish = true; @@ -281,6 +297,17 @@ namespace ICSharpCode.Reports.Addin.ReportWizard } + void ShowData() + { + this.model = reportStructure.CreateAndFillReportModel(); + this.resultDataSet = FillGrid(); + if (resultDataSet.Tables.Count > 0) { + SetupGrid (); + } + + } + + private void SetupGrid() { if (this.resultDataSet != null) { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs index 9af6ac3c14..825cbfaef2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs @@ -50,15 +50,15 @@ namespace ICSharpCode.Reports.Addin AbstractPreviewCommand cmd = null; switch (model.DataModel) { case GlobalEnums.PushPullModel.FormSheet : { - cmd = new AsyncFormsSheetPreviewCommand (model,control); + cmd = new FormSheetToReportViewerCommand (model,control); break; } case GlobalEnums.PushPullModel.PullData:{ - cmd = new AsyncPullModelPreviewCommand(model,control); + cmd = new PullModelToReportViewerCommand(model,control); break; } case GlobalEnums.PushPullModel.PushData:{ - cmd = new AsyncPushModelPreviewCommand(model,control); + cmd = new PushModelToReportViewerCommand(model,control); break; } default: diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs index 0d84d4cc96..042dbd331b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs @@ -15,6 +15,9 @@ using ICSharpCode.SharpDevelop.Widgets.SideBar; namespace ICSharpCode.Reports.Addin { + //http://developer.sharpdevelop.net/corsavy/translation/default.asp + + internal sealed class ReportingSideTabProvider { @@ -61,39 +64,41 @@ namespace ICSharpCode.Reports.Addin tb.Bitmap = WinFormsResourceService.GetIcon("Icons.16.16.SharpReport.Textbox").ToBitmap(); sideTab.Items.Add(new SideTabItemDesigner(tb)); - // Row - tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseRowItem)); - tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table"); - tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.DataRow"); - sideTab.Items.Add(new SideTabItemDesigner(tb)); + //GroupHeader tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.GroupHeader)); - tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table"); - tb.DisplayName = "GroupHeader"; + tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.NameSpace"); + tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.GroupHeader"); sideTab.Items.Add(new SideTabItemDesigner(tb)); //GroupFooter tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.GroupFooter)); - tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table"); - tb.DisplayName = "GroupFooter"; + tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.NameSpace"); + tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.GroupFooter"); sideTab.Items.Add(new SideTabItemDesigner(tb)); + // Row + tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseRowItem)); + tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table"); + tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.DataRow"); + sideTab.Items.Add(new SideTabItemDesigner(tb)); //BaseTable +// tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table"); tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table"); tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseTableItem)); - tb.DisplayName ="Table"; + tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.Table"); sideTab.Items.Add(new SideTabItemDesigner(tb)); - - tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table"); //BaseDataItem tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseDataItem)); tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.DataField"); +// tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Column"); + tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Column"); sideTab.Items.Add(new SideTabItemDesigner(tb)); //Grahics diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj index ca2350f731..264bb5786e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj @@ -252,7 +252,6 @@ - @@ -260,7 +259,6 @@ - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs index b6ea39b395..b3f63ca23a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs @@ -33,8 +33,8 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing return Rectangle.Empty; } - Console.WriteLine("\tlayouter for container <{0}>",container.ToString()); - +// Console.WriteLine("\tlayouter for container <{0}>",container.ToString()); + Console.WriteLine("\tLayouter for Container"); Rectangle desiredContainerRectangle = new Rectangle (container.Location,container.Size); System.Collections.Generic.IEnumerable canGrowShrinkCollection = from bt in container.Items where bt.CanGrow == true select bt; @@ -58,7 +58,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing // // Console.WriteLine("Diff {0} - {1} dif {2}",desiredContainerRectangle,r1,desiredContainerRectangle.Height - r1.Height); } - Console.WriteLine("\tContainer : {0} - DesiredContainerRectangle {1} ",container.Size,desiredContainerRectangle.Size); +// Console.WriteLine("\tContainer : {0} - DesiredContainerRectangle {1} ",container.Size,desiredContainerRectangle.Size); return desiredContainerRectangle; } @@ -72,8 +72,8 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing throw new ArgumentNullException("section"); } - Console.WriteLine("\tlayouter for section <{0}>",section.Name); - +// Console.WriteLine("\tLayouter for Container");Console.WriteLine("\tlayouter for section <{0}>",section.Name); + Console.WriteLine("\tLayouter for Section"); IEnumerable canGrowShrinkCollection = from bt in section.Items where bt.CanGrow == true select bt; Rectangle desiredSectionRectangle = new Rectangle(section.Location.X, @@ -93,7 +93,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing surroundingRec.Size.Height); } } - Console.WriteLine("\tSection : {0} - DesiredContainerRectangle {1} ",section.Size,desiredSectionRectangle.Size); +// Console.WriteLine("\tSection : {0} - DesiredContainerRectangle {1} ",section.Size,desiredSectionRectangle.Size); return desiredSectionRectangle; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs index 84e8a66302..710b951c4d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs @@ -143,7 +143,6 @@ namespace ICSharpCode.Reports.Core{ protected override void RemoveItem(int index) { - BaseReportItem item = this[index]; base.RemoveItem(index); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs index 53250ed5c9..2bb1e1570f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs @@ -191,23 +191,7 @@ namespace ICSharpCode.Reports.Core { } } - /* - private void CheckReportColumns() - { - - if (this.reportSettings.SortColumnCollection.Count > 0) { - if (this.dataViewStrategy.AvailableFields.Count > 0) { - foreach (SortColumn col in this.reportSettings.SortColumnCollection) { - string colName = col.ColumnName; - AbstractColumn c = this.dataViewStrategy.AvailableFields.Find (colName); - if (c == null) { - throw new WrongColumnException(col.ColumnName); - } - } - } - } - } - */ + #endregion @@ -245,23 +229,6 @@ namespace ICSharpCode.Reports.Core { } } - /* - public IndexList ChildRows - { - get { - return this.dataViewStrategy.ChildRows; - } - } - - - - public bool IsGrouped - { - get { - return this.dataViewStrategy.IsGrouped; - } - } - */ public bool IsSorted { @@ -270,17 +237,11 @@ namespace ICSharpCode.Reports.Core { } } - /* - public bool IsFiltered - { - get { - return this.dataViewStrategy.IsFiltered; - } - } - */ + #endregion #region System.IDisposable interface implementation + public void Dispose() { this.Dispose(true); GC.SuppressFinalize(this); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs index d7ce3cfc6b..dcc7992816 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs @@ -130,7 +130,7 @@ namespace ICSharpCode.Reports.Core { #endregion #region Debug Code - + /* protected static void ShowIndexList (IndexList list) { @@ -151,7 +151,7 @@ namespace ICSharpCode.Reports.Core { } } } - + */ #endregion public virtual void Reset() diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs index 750882841d..aea67f8779 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs @@ -14,7 +14,7 @@ namespace ICSharpCode.Reports.Core /// /// - public class SqlDataAccessStrategy:IDataAccessStrategy + internal class SqlDataAccessStrategy:IDataAccessStrategy { private ConnectionObject connectionObject; private ReportSettings reportSettings; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs index 5d28570ad0..f2b726cf33 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs @@ -27,16 +27,15 @@ namespace ICSharpCode.Reports.Core.Exporter #region Constructor - public BasePager(IReportModel reportModel,ILayouter layouter) + public BasePager(IReportModel reportModel) { if (reportModel == null) { throw new ArgumentNullException("reportModel"); } - if (layouter == null) { - throw new ArgumentNullException ("layouter"); - } + this.ReportModel = reportModel; - this.Layouter = layouter; + //this.Layouter = layouter; + this.Layouter = new Layouter(); this.Graphics = CreateGraphicObject.FromSize(this.ReportModel.ReportSettings.PageSize); } @@ -210,7 +209,7 @@ namespace ICSharpCode.Reports.Core.Exporter ExportText et = be as ExportText; if (et != null) { - if (et.Text.StartsWith("=")) { + if (et.Text.StartsWith("=",StringComparison.InvariantCulture)) { et.Text = evaluatorFassade.Evaluate(et.Text); } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs index 6ea374ca63..1c0bff7623 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs @@ -78,7 +78,7 @@ namespace ICSharpCode.Reports.Core.Exporter if (row == null) { throw new ArgumentException("row"); } - Console.WriteLine("\tFireRowRendering"); +// Console.WriteLine("\tFireRowRendering"); RowRenderEventArgs rrea = new RowRenderEventArgs(row,currentNavigator.Current); EventHelper.Raise(RowRendering,this,rrea); } @@ -86,7 +86,7 @@ namespace ICSharpCode.Reports.Core.Exporter protected void FireGroupHeaderRendering (GroupHeader groupHeader) { - Console.WriteLine("\tFireGroupHeaderRendering"); +// Console.WriteLine("\tFireGroupHeaderRendering"); GroupHeaderEventArgs ghea = new GroupHeaderEventArgs(groupHeader); EventHelper.Raise(GroupHeaderRendering,this,ghea); } @@ -94,7 +94,7 @@ namespace ICSharpCode.Reports.Core.Exporter protected void FireGroupFooterRendering (GroupFooter groupFooter) { - Console.WriteLine("\tFireGroupFooterRendering"); +// Console.WriteLine("\tFireGroupFooterRendering"); GroupFooterEventArgs gfea = new GroupFooterEventArgs(groupFooter); EventHelper.Raise(GroupFooterRendering,this,gfea); } @@ -136,27 +136,18 @@ namespace ICSharpCode.Reports.Core.Exporter #region Grouping - protected void ConvertGroupFooter (BaseSection section,ISimpleContainer container,ExporterCollection exporterCollection) + protected void ConvertGroupFooter (ISimpleContainer container,ExporterCollection exporterCollection) { var footers = BaseConverter.FindGroupFooter(container); if (footers.Count > 0) { Size rowSize = footers[0].Size; - CurrentPosition = ConvertStandardRow(exporterCollection,section,(ISimpleContainer)footers[0]); + CurrentPosition = ConvertStandardRow(exporterCollection,(ISimpleContainer)footers[0]); FireGroupFooterRendering(footers[0]); footers[0].Size = rowSize; } } - protected Point ConvertGroupChilds(ExporterCollection mylist, BaseSection section, - ISimpleContainer simpleContainer) - { - PrepareContainerForConverting(section,simpleContainer); - Point curPos = ConvertContainer(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition); - AfterConverting (mylist); - return curPos; - } - protected void PageBreakAfterGroupChange(BaseSection section,ExporterCollection exporterCollection) { @@ -247,21 +238,25 @@ namespace ICSharpCode.Reports.Core.Exporter } - protected Point ConvertStandardRow(ExporterCollection mylist, BaseSection section, ISimpleContainer simpleContainer) + protected void PrepareContainerForConverting(BaseSection section,ISimpleContainer simpleContainer) + { + Console.WriteLine("\tPrepareContainerForConverting"); + + FireSectionRendering(section); + LayoutRow(simpleContainer); + } + + + protected Point ConvertStandardRow(ExporterCollection mylist, ISimpleContainer simpleContainer) { var rowSize = simpleContainer.Size; - PrepareContainerForConverting(section,simpleContainer); +Console.WriteLine("ConvertStandardRow"); Point curPos = ConvertContainer(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition); AfterConverting (mylist); simpleContainer.Size = rowSize; + Console.WriteLine(""); return curPos; - } - - - protected void PrepareContainerForConverting(BaseSection section,ISimpleContainer simpleContainer) - { - FireSectionRendering(section); - LayoutRow(simpleContainer); + } @@ -279,10 +274,10 @@ namespace ICSharpCode.Reports.Core.Exporter } - protected void FillRow (ISimpleContainer row) + protected static void FillRow (ISimpleContainer row,IDataNavigator currentNavigator) { - Console.WriteLine("\tFillRow"); - DataNavigator.Fill(row.Items); + Console.WriteLine("\tFillrow"); + currentNavigator.Fill(row.Items); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs index 7de663af78..5ff2050a82 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs @@ -96,21 +96,22 @@ namespace ICSharpCode.Reports.Core.Exporter StandardPrinter.AdjustBackColor(simpleContainer,GlobalValues.DefaultBackColor); do { - Console.WriteLine(""); section.Size = base.RestoreSectionSize; section.Items[0].Size = groupSize; section.Items[1].Size = childSize; - Console.WriteLine("\tFillRow"); - childNavigator.Fill(simpleContainer.Items); - base.CurrentPosition = ConvertGroupChilds (exporterCollection,section,simpleContainer); + + FillRow(simpleContainer,childNavigator); FireRowRendering(simpleContainer,childNavigator); + PrepareContainerForConverting(section,simpleContainer); + +// FireRowRendering(simpleContainer,childNavigator); + base.CurrentPosition = ConvertStandardRow(exporterCollection,simpleContainer); CheckForPageBreak(section,exporterCollection); - Console.WriteLine(""); } while ( childNavigator.MoveNext()); // GroupFooter - base.ConvertGroupFooter(section,section,exporterCollection); + base.ConvertGroupFooter(section,exporterCollection); base.PageBreakAfterGroupChange(section,exporterCollection); @@ -120,15 +121,15 @@ namespace ICSharpCode.Reports.Core.Exporter else { // No Grouping at all, the first item in section.items is the DetailRow - Console.WriteLine(""); + Size containerSize = section.Items[0].Size; - base.FillRow(simpleContainer); - - base.CurrentPosition = ConvertStandardRow (exporterCollection,section,simpleContainer); - base.FireRowRendering(simpleContainer,base.DataNavigator); + FillRow(simpleContainer,base.DataNavigator); + FireRowRendering(simpleContainer,base.DataNavigator); + base.PrepareContainerForConverting(section,simpleContainer); +// FireRowRendering(simpleContainer,base.DataNavigator); + base.CurrentPosition = ConvertStandardRow (exporterCollection,simpleContainer); section.Size = base.RestoreSectionSize; section.Items[0].Size = containerSize; - Console.WriteLine(""); } CheckForPageBreak (section,exporterCollection); ShouldDrawBorder (section,exporterCollection); @@ -185,10 +186,11 @@ namespace ICSharpCode.Reports.Core.Exporter AfterConverting (list); retVal = new Point (DefaultLeftPosition,offset.Y + groupCollection[0].Size.Height + 20 + (3 *GlobalValues.GapBetweenContainer)); } else { - FillRow(groupedRows[0]); + FillRow(groupedRows[0],base.DataNavigator); rowSize = groupedRows[0].Size; - retVal = ConvertStandardRow(exportList,section,groupedRows[0]); base.FireGroupHeaderRendering(groupedRows[0]); + retVal = ConvertStandardRow(exportList,groupedRows[0]); + groupedRows[0].Size = rowSize; } return retVal; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs index e59fab02fa..6ebcc10687 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs @@ -38,7 +38,7 @@ namespace ICSharpCode.Reports.Core.Exporter ExporterCollection mylist = base.Convert(parent,item); this.table = (BaseTableItem)item ; this.table.Parent = parent; - this.table.DataNavigator = base.DataNavigator; +// this.table.DataNavigator = base.DataNavigator; return ConvertInternal(mylist); } @@ -95,7 +95,14 @@ namespace ICSharpCode.Reports.Core.Exporter childNavigator.Reset(); childNavigator.MoveNext(); - + +/* +---- GroupTableConverter.cs Zeile 151: +FillRow(simpleContainer,base.DataNavigator); +FireRowRendering(simpleContainer,base.DataNavigator); +base.PrepareContainerForConverting(section,simpleContainer); +---- +*/ //Convert children if (childNavigator != null) { do @@ -104,10 +111,12 @@ namespace ICSharpCode.Reports.Core.Exporter simpleContainer = table.Items[2] as ISimpleContainer; containerSize = simpleContainer.Size; - childNavigator.Fill(simpleContainer.Items); - - base.CurrentPosition = ConvertGroupChilds (exporterCollection,section,simpleContainer); - + FillRow(simpleContainer,childNavigator); +// PrepareContainerForConverting(section,simpleContainer); + FireRowRendering(simpleContainer,childNavigator); + PrepareContainerForConverting(section,simpleContainer); + base.CurrentPosition = ConvertStandardRow(exporterCollection,simpleContainer); + simpleContainer.Size = containerSize; CheckForPageBreak(section,simpleContainer,headerRow,exporterCollection); @@ -115,7 +124,7 @@ namespace ICSharpCode.Reports.Core.Exporter while ( childNavigator.MoveNext()); // GroupFooter - base.ConvertGroupFooter(section,table,exporterCollection); + base.ConvertGroupFooter(table,exporterCollection); base.PageBreakAfterGroupChange(section,exporterCollection); base.Evaluator.SinglePage.IDataNavigator = base.DataNavigator; @@ -131,22 +140,22 @@ namespace ICSharpCode.Reports.Core.Exporter simpleContainer = table.Items[1] as ISimpleContainer; base.SaveSectionSize(section.Size); containerSize = simpleContainer.Size; - Console.WriteLine("datasection - NO grouping"); + do { - Console.WriteLine(""); PrintHelper.AdjustSectionLocation(section); CheckForPageBreak(section,simpleContainer,headerRow,exporterCollection); - FillRow(simpleContainer); - base.CurrentPosition = ConvertStandardRow (exporterCollection,section,simpleContainer); + + FillRow(simpleContainer,base.DataNavigator); +// base.PrepareContainerForConverting(section,simpleContainer); FireRowRendering(simpleContainer,base.DataNavigator); + base.PrepareContainerForConverting(section,simpleContainer); + + base.CurrentPosition = ConvertStandardRow (exporterCollection,simpleContainer); simpleContainer.Size = containerSize; section.Size = base.RestoreSectionSize; - Console.WriteLine(""); } while (base.DataNavigator.MoveNext()); - Console.WriteLine(""); - Console.WriteLine("END of datasection - NO grouping"); base.DataNavigator.Reset(); base.DataNavigator.MoveNext(); SectionBounds.ReportFooterRectangle = new Rectangle(SectionBounds.ReportFooterRectangle.Left, @@ -168,7 +177,7 @@ namespace ICSharpCode.Reports.Core.Exporter { base.CurrentPosition = ForcePageBreak(exporterCollection,section); - base.CurrentPosition = ConvertStandardRow (exporterCollection,section,headerRow); + base.CurrentPosition = ConvertStandardRow (exporterCollection,headerRow); } } @@ -208,9 +217,11 @@ namespace ICSharpCode.Reports.Core.Exporter } else { + rowSize = groupedRow[0].Size; + FillRow(groupedRow[0],base.DataNavigator); base.FireGroupHeaderRendering(groupedRow[0]); - retVal = ConvertStandardRow(exportList,section,groupedRow[0]); + retVal = ConvertStandardRow(exportList,groupedRow[0]); groupedRow[0].Size = rowSize; } return retVal; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs index 4fcfcb06e5..ed0a7a24ee 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs @@ -19,8 +19,8 @@ namespace ICSharpCode.Reports.Core.Exporter #region Constructor - - public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter) + public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager) +// public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter) { if (reportModel == null) { throw new ArgumentNullException("reportModel"); @@ -28,15 +28,12 @@ namespace ICSharpCode.Reports.Core.Exporter if (dataManager == null) { throw new ArgumentNullException("dataManager"); } - if (layouter == null) { - throw new ArgumentNullException("layouter"); - } - DataPageBuilder instance = new DataPageBuilder(reportModel,dataManager,layouter); + DataPageBuilder instance = new DataPageBuilder(reportModel,dataManager); return instance; } - private DataPageBuilder (IReportModel reportModel,IDataManager dataManager,ILayouter layouter):base(reportModel,layouter) + private DataPageBuilder (IReportModel reportModel,IDataManager dataManager):base(reportModel) { this.dataManager = dataManager; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/BaseExportRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/BaseExportRenderer.cs index 963f3de630..f219aa2de0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/BaseExportRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/BaseExportRenderer.cs @@ -11,6 +11,7 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{ /// /// public class BaseExportRenderer{ + PagesCollection pages; public BaseExportRenderer () @@ -46,6 +47,7 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{ { } + public virtual void RenderOutput () { } @@ -54,6 +56,7 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{ { } + public PagesCollection Pages { get {if (this.pages == null) { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PreviewRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PreviewRenderer.cs index ec4b775058..d5162d7f64 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PreviewRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PreviewRenderer.cs @@ -11,10 +11,8 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer /// - public class PreviewRenderer:BaseExportRenderer + internal class PreviewRenderer:BaseExportRenderer { - Graphics graphics; - ExporterPage page; #region Constructor @@ -29,23 +27,18 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer public override void RenderOutput(){ base.RenderOutput(); - if (this.graphics != null) { - BaseExportRenderer.DrawItems(this.graphics,this.page.Items); + if (this.Graphics != null) { + BaseExportRenderer.DrawItems(this.Graphics,this.Page.Items); } else { return; } } - public Graphics Graphics { - get { return this.graphics;} - set { this.graphics = value;} - } + public Graphics Graphics {get;set;} + - public ExporterPage Page { - get {return this.page;} - set { page = value; } - } + public ExporterPage Page {get;set;} } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PrintRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PrintRenderer.cs index ccf877fafe..7e05a601a3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PrintRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PrintRenderer.cs @@ -10,7 +10,7 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{ /// Description of PrintRenderer. /// public class PrintRenderer:BaseExportRenderer,IDisposable{ - PrintDocument doc; + int currentPage; PrinterSettings printerSettings; @@ -43,11 +43,14 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{ private PrintRenderer(PagesCollection pages):base(pages) { - doc = new PrintDocument(); + this.PrintDocument = new PrintDocument(); + this.PrintDocument.PrinterSettings = new PrinterSettings(); + + // doc.QueryPageSettings += new QueryPageSettingsEventHandler(OnQueryPage); - doc.BeginPrint += new PrintEventHandler(OnBeginPrint); - doc.EndPrint += new PrintEventHandler(OnEndPrint); - doc.PrintPage += new PrintPageEventHandler(OnPrintPage); + this.PrintDocument.BeginPrint += new PrintEventHandler(OnBeginPrint); + this.PrintDocument.EndPrint += new PrintEventHandler(OnEndPrint); + this.PrintDocument.PrintPage += new PrintPageEventHandler(OnPrintPage); } #endregion @@ -87,22 +90,25 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{ { base.RenderOutput(); if (this.printerSettings != null) { - doc.PrinterSettings = this.printerSettings; + this.PrintDocument.PrinterSettings = this.printerSettings; } - doc.Print(); } + public override void End() { base.End(); } + public PrintDocument PrintDocument {get;private set;} + internal PrinterSettings PrinterSettings { set { printerSettings = value; } } + #region IDisposable public void Dispose() @@ -116,10 +122,10 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{ if (disposing) { // free managed resources - if (this.doc != null) + if (this.PrintDocument != null) { - doc.Dispose(); - doc = null; + this.PrintDocument.Dispose(); + this.PrintDocument = null; } } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs index 4bfde611d1..63ec24a5f7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs @@ -16,18 +16,17 @@ namespace ICSharpCode.Reports.Core.Exporter #region Constructure - public static FormPageBuilder CreateInstance(IReportModel reportModel,ILayouter layouter) + public static FormPageBuilder CreateInstance(IReportModel reportModel) { if (reportModel == null) { throw new ArgumentNullException("reportModel"); } - - FormPageBuilder instance = new FormPageBuilder(reportModel,layouter); + FormPageBuilder instance = new FormPageBuilder(reportModel); return instance; } - private FormPageBuilder(IReportModel reportModel,ILayouter layouter):base(reportModel,layouter) + private FormPageBuilder(IReportModel reportModel):base(reportModel) { } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs deleted file mode 100644 index eae93ece42..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -//ToDo with NET2.0 change this Interface to the one provided by NET2.0 -using System; - -namespace ICSharpCode.Reports.Core { - - public interface IHierarchyData{ - - IndexList GetChildren { - get; - } - - bool HasChildren { - get; - } - - object Item { - get; - } - string Path { - get; - } - - string Type { - get; - } - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ExtendedPrintController.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ExtendedPrintController.cs deleted file mode 100644 index 1e5f2fb385..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ExtendedPrintController.cs +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Drawing.Printing; - -namespace ICSharpCode.Reports.Core -{ - /// - /// Description of ExtendedPrintController. - /// - - - public class ExtendedPrintController:PrintController - { - PrintController controller; - - public ExtendedPrintController(PrintController controller):base() - { - if (controller == null) { - throw new ArgumentNullException("controller"); - } - this.controller = controller; - } - - public override System.Drawing.Graphics OnStartPage(PrintDocument document, PrintPageEventArgs e) - { - System.Diagnostics.Trace.WriteLine("ExtPrintcontroller OnStartPage"); - return this.controller.OnStartPage (document, e); - } - - - public override void OnStartPrint(PrintDocument document, PrintEventArgs e) - { - System.Diagnostics.Trace.WriteLine("ExtPrintcontroller OnStartPrint"); - this.controller.OnStartPrint(document, e); - } - - - public override void OnEndPage(PrintDocument document, PrintPageEventArgs e) - { - System.Diagnostics.Trace.WriteLine("ExtPrintcontroller OnEndPage"); - this.controller.OnEndPage (document, e); - } - - public override void OnEndPrint(PrintDocument document, PrintEventArgs e) - { - System.Diagnostics.Trace.WriteLine("ExtPrintcontroller OnEndprint"); - PreviewPrintController c = this.controller as PreviewPrintController; - if (c != null) { - PreviewPageInfo[] ppia = c.GetPreviewPageInfo(); - } - this.controller.OnEndPrint(document,e); - } - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs index 2cf0999347..5d9957e2d6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs @@ -21,7 +21,6 @@ namespace ICSharpCode.Reports.Core { public class ReportEngine : IDisposable { private PreviewControl previewControl; -// private IDataManager dataMan; /// /// This event is fired before a Section is Rendered, you can use @@ -470,13 +469,12 @@ namespace ICSharpCode.Reports.Core { IReportModel reportModel = LoadReportModel (fileName); IReportCreator builder = null; - Layouter layouter = new Layouter(); if (reportModel.DataModel == GlobalEnums.PushPullModel.FormSheet) { - builder = FormPageBuilder.CreateInstance(reportModel,layouter); + builder = FormPageBuilder.CreateInstance(reportModel); } else { CheckForParameters(reportModel,reportParameters); IDataManager dataMan = DataManagerFactory.CreateDataManager(reportModel,reportParameters); - builder = DataPageBuilder.CreateInstance(reportModel, dataMan,layouter); + builder = DataPageBuilder.CreateInstance(reportModel, dataMan); } return builder; } @@ -494,8 +492,7 @@ namespace ICSharpCode.Reports.Core { throw new ArgumentNullException("reportModel"); } IDataManager dataMan = DataManagerFactory.CreateDataManager(reportModel,(ReportParameters)null); - Layouter layouter = new Layouter(); - IReportCreator builder = DataPageBuilder.CreateInstance(reportModel, dataMan,layouter); + IReportCreator builder = DataPageBuilder.CreateInstance(reportModel, dataMan); return builder; } @@ -544,8 +541,7 @@ namespace ICSharpCode.Reports.Core { IDataManager dataMan = DataManager.CreateInstance(dataTable,reportModel.ReportSettings); if (dataMan != null) { - Layouter layouter = new Layouter(); - return DataPageBuilder.CreateInstance(reportModel, dataMan,layouter); + return DataPageBuilder.CreateInstance(reportModel, dataMan); } else { throw new MissingDataManagerException(); } @@ -572,8 +568,7 @@ namespace ICSharpCode.Reports.Core { ReportEngine.CheckForParameters(reportModel,reportParameters); IDataManager dataMan = DataManager.CreateInstance(list,reportModel.ReportSettings); if (dataMan != null) { - Layouter layouter = new Layouter(); - return DataPageBuilder.CreateInstance(reportModel,dataMan,layouter); + return DataPageBuilder.CreateInstance(reportModel,dataMan); } else { throw new MissingDataManagerException(); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs index b426d6dd8e..298990622d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs @@ -23,7 +23,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer public partial class PreviewControl { public event EventHandler PreviewLayoutChanged; -// public event EventHandler SectionRendering; + private float zoom; @@ -151,9 +151,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer private void RunFormSheet (ReportModel reportModel) { - - Layouter layouter = new Layouter(); - IReportCreator reportCreator = FormPageBuilder.CreateInstance(reportModel,layouter); + IReportCreator reportCreator = FormPageBuilder.CreateInstance(reportModel); reportCreator.SectionRendering += new EventHandler(PushPrinting); reportCreator.PageCreated += OnPageCreated; reportCreator.BuildExportList(); @@ -163,8 +161,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer private void RunDataReport (ReportModel reportModel,IDataManager data) { - ILayouter layouter = new Layouter(); - IReportCreator reportCreator = DataPageBuilder.CreateInstance(reportModel,data,layouter); + IReportCreator reportCreator = DataPageBuilder.CreateInstance(reportModel,data); reportCreator.SectionRendering += new EventHandler(PushPrinting); reportCreator.GroupHeaderRendering += new EventHandler(GroupHeaderRendering); reportCreator.GroupFooterRendering += GroupFooterRendering; @@ -195,7 +192,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer private void PushPrinting (object sender,SectionRenderEventArgs e) { - string sectionName = e.Section.Name; +// string sectionName = e.Section.Name; /* if (sectionName == ReportSectionNames.ReportHeader) { Console.WriteLine("PushPrinting :" + ReportSectionNames.ReportHeader);