Zbiór zmian 981 dla trunk

Pokaż
Ignoruj:
Data:
2009-12-23 14:44:57 (16 years ago)
Autor:
sylwek
Opis:

Re #235 Migracja źródeł do VS 2008

Lokalizacja:
trunk
Pliki:
19 dodane
23 zmodyfikowane

Legenda:

Bez zmian
Dodane
Usunięte

  • trunk/BazaReklam.Updater/BazaReklam.Updater.csproj

    r609 r981  
    1 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
     1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> 
    22  <PropertyGroup> 
    33    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
    … …  
    1111    <AssemblyName>BazaReklam.Updater</AssemblyName> 
    1212    <ApplicationIcon>29.ico</ApplicationIcon> 
     13    <FileUpgradeFlags> 
     14    </FileUpgradeFlags> 
     15    <OldToolsVersion>2.0</OldToolsVersion> 
     16    <UpgradeBackupLocation> 
     17    </UpgradeBackupLocation> 
    1318  </PropertyGroup> 
    1419  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 

  • trunk/BazaReklam.Updater/Properties/Resources.Designer.cs

    r597 r981  
    22// <auto-generated> 
    33//     This code was generated by a tool. 
    4 //     Runtime Version:2.0.50727.3053 
     4//     Runtime Version:2.0.50727.4200 
    55// 
    66//     Changes to this file may cause incorrect behavior and will be lost if 

  • trunk/BazaReklam.Updater/Properties/Settings.Designer.cs

    r597 r981  
    22// <auto-generated> 
    33//     This code was generated by a tool. 
    4 //     Runtime Version:2.0.50727.3053 
     4//     Runtime Version:2.0.50727.4200 
    55// 
    66//     Changes to this file may cause incorrect behavior and will be lost if 
    … …  
    1313     
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] 
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] 
    1616    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { 
    1717         

  • trunk/BazaReklam.sln

    r609 r981  
    11 
    2 Microsoft Visual Studio Solution File, Format Version 9.00 
    3 # Visual Studio 2005 
     2Microsoft Visual Studio Solution File, Format Version 10.00 
     3# Visual Studio 2008 
    44Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baza Reklam", "BazaReklam\Baza Reklam.csproj", "{BBBFA978-486C-4BE9-88C7-F24C0496D0FC}" 
    5 EndProject 
    6 Project("{F14B399A-7131-4C87-9E4B-1186C45EF12D}") = "RaportySQL", "RaportySQL\RaportySQL.rptproj", "{C21ED0FA-2806-4BE2-8843-530364FBA631}" 
    75EndProject 
    86Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "BazaReklamSetup", "BazaReklamSetup\BazaReklamSetup.vdproj", "{376FC7DF-ED3D-4EF4-81F9-92249C2A8335}" 
    … …  
    2826                {BBBFA978-486C-4BE9-88C7-F24C0496D0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU 
    2927                {BBBFA978-486C-4BE9-88C7-F24C0496D0FC}.Release|Any CPU.Build.0 = Release|Any CPU 
    30                 {C21ED0FA-2806-4BE2-8843-530364FBA631}.Debug|Any CPU.ActiveCfg = Debug 
    31                 {C21ED0FA-2806-4BE2-8843-530364FBA631}.DebugLocal|Any CPU.ActiveCfg = DebugLocal 
    32                 {C21ED0FA-2806-4BE2-8843-530364FBA631}.Production|Any CPU.ActiveCfg = Debug 
    33                 {C21ED0FA-2806-4BE2-8843-530364FBA631}.Release|Any CPU.ActiveCfg = Production 
    3428                {376FC7DF-ED3D-4EF4-81F9-92249C2A8335}.Debug|Any CPU.ActiveCfg = Debug 
    3529                {376FC7DF-ED3D-4EF4-81F9-92249C2A8335}.DebugLocal|Any CPU.ActiveCfg = Debug 

  • trunk/BazaReklam/Baza Reklam.csproj

    r961 r981  
    1 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
     1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> 
    22  <PropertyGroup> 
    33    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
    44    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 
    5     <ProductVersion>8.0.50727</ProductVersion> 
     5    <ProductVersion>9.0.30729</ProductVersion> 
    66    <SchemaVersion>2.0</SchemaVersion> 
    77    <ProjectGuid>{BBBFA978-486C-4BE9-88C7-F24C0496D0FC}</ProjectGuid> 
    … …  
    1616    <SignManifests>true</SignManifests> 
    1717    <IsWebBootstrapper>true</IsWebBootstrapper> 
     18    <FileUpgradeFlags> 
     19    </FileUpgradeFlags> 
     20    <OldToolsVersion>2.0</OldToolsVersion> 
     21    <UpgradeBackupLocation> 
     22    </UpgradeBackupLocation> 
    1823    <PublishUrl>C:\CT\BazaReklam_ClickOnce\</PublishUrl> 
    1924    <Install>true</Install> 
    … …  
    3338    <WebPage>index.htm</WebPage> 
    3439    <OpenBrowserOnPublish>false</OpenBrowserOnPublish> 
     40    <ApplicationRevision>0</ApplicationRevision> 
    3541    <ApplicationVersion>1.2.8.0</ApplicationVersion> 
     42    <UseApplicationTrust>false</UseApplicationTrust> 
    3643    <BootstrapperEnabled>false</BootstrapperEnabled> 
    3744  </PropertyGroup> 
    … …  
    782789    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> 
    783790      <Visible>False</Visible> 
    784       <ProductName>.NET Framework 2.0</ProductName> 
     791      <ProductName>.NET Framework 2.0 %28x86%29</ProductName> 
    785792      <Install>true</Install> 
     793    </BootstrapperPackage> 
     794    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0"> 
     795      <Visible>False</Visible> 
     796      <ProductName>.NET Framework 3.0 %28x86%29</ProductName> 
     797      <Install>false</Install> 
     798    </BootstrapperPackage> 
     799    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5"> 
     800      <Visible>False</Visible> 
     801      <ProductName>.NET Framework 3.5</ProductName> 
     802      <Install>false</Install> 
    786803    </BootstrapperPackage> 
    787804  </ItemGroup> 

  • trunk/BazaReklam/Baza Reklam.csproj.user

    r890 r981  
    99    <BootstrapperUrlHistory> 
    1010    </BootstrapperUrlHistory> 
    11     <ApplicationRevision>0</ApplicationRevision> 
    1211    <FallbackCulture>en-US</FallbackCulture> 
    1312    <VerifyUploadedFiles>true</VerifyUploadedFiles> 

  • trunk/BazaReklam/ClientsForm.Designer.cs

    r889 r981  
    70897089        private System.Windows.Forms.Button btnAddSubscription; 
    70907090        private System.Windows.Forms.DataGridView gridSubscriptions; 
    7091         private System.Windows.Forms.DataGridViewTextBoxColumn Price; 
    70927091        private System.Windows.Forms.Button btnEditSubscription; 
    70937092        private System.Windows.Forms.Button btnDelSubscription; 

  • trunk/BazaReklam/FactureViewer.cs

    r961 r981  
    510510                Dispose(); 
    511511            } 
    512  
    513512        } 
    514513 

  • trunk/BazaReklam/KorektyForm.cs

    r676 r981  
    2020        private SqlDataAdapter sqlDataAdapter; 
    2121 
    22         private bool commandExecuted = false; 
     22        //private bool commandExecuted = false; 
    2323 
    2424        public static KorektyForm getFacturesForm(MDIBazaReklam parent) 
    … …  
    169169                                        command.Parameters.AddWithValue("@miesiac", e.Node.Name); 
    170170                                        sqlDataAdapter.Fill(this.rEKLAMADataSet.VIEW_ZESTAWIENIE_FAKTUR_NOWE); 
    171                                         commandExecuted = true; 
     171                                        //commandExecuted = true; 
    172172                                        fakturyDataGridView.Refresh(); 
    173173 
    … …  
    183183                                        command.Parameters.AddWithValue("@miesiac", e.Node.Name); 
    184184                                        sqlDataAdapter.Fill(this.rEKLAMADataSet.VIEW_KOREKTY); 
    185                                         commandExecuted = true; 
     185                                        //commandExecuted = true; 
    186186                                        fakturyDataGridView.Refresh(); 
    187187 
    … …  
    381381            { 
    382382                sqlDataAdapter.Fill(rEKLAMADataSet.VIEW_KOREKTY); 
    383                 commandExecuted = true; 
     383                //commandExecuted = true; 
    384384            } 
    385385            finally 

  • trunk/BazaReklam/OrderViewer.cs

    r923 r981  
    1212using System.IO; 
    1313using System.Reflection; 
    14  
    1514using Baza_Reklam.Classes.Helpers; 
    1615using Baza_Reklam.Classes.Interfaces; 
    … …  
    3938            reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("zamowienie", zamowienieTableAdapter.GetDataByReklamaId(reklamaId))); 
    4039 
    41              
    4240            SqlCommand cm = new SqlCommand(); 
    4341            cm.Connection = new SqlConnection(); 
    44             cm.CommandText = "declare @test varchar(800); set @test = ''; declare @nr_wyd int; " + 
     42            cm.CommandText =  
     43                " declare @test varchar(800); " + 
     44                " set @test = ''; " + 
     45                " declare @nr_wyd int; " + 
    4546                " DECLARE kur2 CURSOR FOR SELECT [Nr Wydania] FROM [UKA¯E SIÊ W NR] WHERE (ReklamaId = @param) order by [Nr Wydania];" + 
    46                 " OPEN kur2; FETCH NEXT from kur2 into @nr_wyd; while @@fetch_status=0 begin   set @test  = @test + ', ' + CAST(@nr_wyd AS varchar); " + 
    47                 " fetch next from kur2 into @nr_wyd; end CLOSE kur2; DEALLOCATE kur2; select @test; "; 
     47                " OPEN kur2; " + 
     48                " FETCH NEXT from kur2 into @nr_wyd; " + 
     49                " while @@fetch_status=0 " + 
     50                "  begin " + 
     51                "   set @test = @test + ', ' + CAST(@nr_wyd AS varchar); " + 
     52                "   fetch next from kur2 into @nr_wyd; " + 
     53                "  end " + 
     54                " CLOSE kur2; " + 
     55                " DEALLOCATE kur2; " + 
     56                " select @test; "; 
     57 
    4858            cm.Parameters.AddWithValue("@param", reklamaId); 
    4959            cm.Connection.ConnectionString = ConnString.getConnString().Value; 

  • trunk/BazaReklam/ProjectForm.cs

    r889 r981  
    154154            row2["kolor"] = row["KOLOR"]; 
    155155            row2["lokalizacja"] = row["strona"]; 
    156             row2["dataemisji"] = piewrszaEmisja(ReklamaId); 
     156            row2["dataemisji"] = PierwszaEmisja(ReklamaId); 
    157157            row2["AGENT"] = User.Instance().Login; 
    158158            row2["DATA_AGENT"] = DateTime.Now; 
    … …  
    253253        /// Wyszukuje nr pierwszej emisji... 
    254254        /// </summary> 
    255         private static int piewrszaEmisja(int reklamaId) { 
    256  
     255        private static int PierwszaEmisja(int reklamaId) 
     256        { 
    257257            SqlConnection conn = new SqlConnection(ConnString.getConnString().Value); 
    258258 
    … …  
    276276                conn.Close();     
    277277            } 
    278             return 0; 
    279278        } 
    280279               

  • trunk/BazaReklam/Properties/Settings.Designer.cs

    r906 r981  
    1313     
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] 
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] 
    1616    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { 
    1717         

  • trunk/BazaReklam/ZestawienieZamowienForm.Designer.cs

    r791 r981  
    10981098        private System.Windows.Forms.BindingSource VIEW_ZESTAWIENIE_ZAMOWIEN_NOWEBindingSource; 
    10991099        private Baza_Reklam.REKLAMADataSetTableAdapters.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter; 
    1100         private System.Windows.Forms.DataGridViewTextBoxColumn usernameDataGridViewTextBoxColumn; 
    1101         private System.Windows.Forms.DataGridViewTextBoxColumn column1DataGridViewTextBoxColumn; 
    11021100        private System.Windows.Forms.SplitContainer splitContainer2; 
    11031101        private System.Windows.Forms.DataGridView fakturyDataGridView; 
    … …  
    11201118        private System.Windows.Forms.ToolStripTextBox rokToolStripTextBox; 
    11211119        private System.Windows.Forms.ToolStripTextBox kodKlientaToolStripTextBox; 
    1122         private System.Windows.Forms.DataGridViewTextBoxColumn iloscDataGridViewTextBoxColumn; 
    1123         private System.Windows.Forms.DataGridViewTextBoxColumn wartoscNettoZafakturowanaDataGridViewTextBoxColumn; 
    11241120        private System.Windows.Forms.Label label2; 
    11251121        private System.Windows.Forms.Label label1; 

  • trunk/BazaReklamSetup/BazaReklamSetup.vdproj

    r924 r981  
    578578        "Name" = "8:Microsoft Visual Studio" 
    579579        "ProductName" = "8:Baza Reklam" 
    580         "ProductCode" = "8:{C1C574BC-ED7C-4CEA-B487-ADC2A164F25D}" 
    581         "PackageCode" = "8:{251D93B0-039F-4CC7-9ED8-3F5EF4F936B2}" 
     580        "ProductCode" = "8:{0553529D-70F2-40D5-9ED7-0DAB681B62BB}" 
     581        "PackageCode" = "8:{F7CFD8B8-FE02-4E5C-9665-28F5691FBC7C}" 
    582582        "UpgradeCode" = "8:{4E2DBBA4-3139-4790-8DDB-7AADFC963A7D}" 
    583583        "RestartWWWService" = "11:FALSE" 
    … …  
    585585        "DetectNewerInstalledVersion" = "11:TRUE" 
    586586        "InstallAllUsers" = "11:TRUE" 
    587         "ProductVersion" = "8:1.2.7" 
     587        "ProductVersion" = "8:1.2.8" 
    588588        "Manufacturer" = "8:AACT" 
    589589        "ARPHELPTELEPHONE" = "8:" 

  • trunk/BazaZamowien

    • Włąściwość: svn:mergeinfo deleted

  • trunk/BazaZamowien_Instalka

    • Włąściwość: svn:mergeinfo deleted

  • trunk/BazaZamowien_Updater

    • Włąściwość: svn:mergeinfo deleted

  • trunk/RaportySQL/ErrorLog.rdl

    r554 r981  
    193193  </DataSets> 
    194194  <Code /> 
    195   <Width>27cm</Width> 
     195  <Width>26.82002cm</Width> 
    196196  <Body> 
    197197    <ColumnSpacing>1cm</ColumnSpacing> 
    … …  
    199199      <Textbox Name="textbox1"> 
    200200        <rd:DefaultName>textbox1</rd:DefaultName> 
     201        <Width>26.75cm</Width> 
    201202        <Style> 
    202203          <FontSize>14pt</FontSize> 
    … …  
    497498          </TableGroup> 
    498499        </TableGroups> 
    499         <Width>26.82002cm</Width> 
    500500        <Details> 
    501501          <TableRows> 

  • trunk/TruckExpoCDN/CDNDataSet.Designer.cs

    r479 r981  
    22// <auto-generated> 
    33//     This code was generated by a tool. 
    4 //     Runtime Version:2.0.50727.3053 
     4//     Runtime Version:2.0.50727.4200 
    55// 
    66//     Changes to this file may cause incorrect behavior and will be lost if 

  • trunk/TruckExpoCDN/EXPODataSet.Designer.cs

    r834 r981  
    22// <auto-generated> 
    33//     This code was generated by a tool. 
    4 //     Runtime Version:2.0.50727.3082 
     4//     Runtime Version:2.0.50727.4200 
    55// 
    66//     Changes to this file may cause incorrect behavior and will be lost if 

  • trunk/TruckExpoCDN/ExportToCDN.csproj

    r528 r981  
    1 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
     1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> 
    22  <PropertyGroup> 
    33    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
    … …  
    1010    <RootNamespace>ExportFaktur</RootNamespace> 
    1111    <AssemblyName>ExportToCDN</AssemblyName> 
     12    <FileUpgradeFlags> 
     13    </FileUpgradeFlags> 
     14    <OldToolsVersion>2.0</OldToolsVersion> 
     15    <UpgradeBackupLocation> 
     16    </UpgradeBackupLocation> 
    1217  </PropertyGroup> 
    1318  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 

  • trunk/TruckExpoCDN/Properties/Resources.Designer.cs

    r479 r981  
    22// <auto-generated> 
    33//     This code was generated by a tool. 
    4 //     Runtime Version:2.0.50727.3053 
     4//     Runtime Version:2.0.50727.4200 
    55// 
    66//     Changes to this file may cause incorrect behavior and will be lost if 

  • trunk/TruckExpoCDN/Properties/Settings.Designer.cs

    r479 r981  
    22// <auto-generated> 
    33//     This code was generated by a tool. 
    4 //     Runtime Version:2.0.50727.3053 
     4//     Runtime Version:2.0.50727.4200 
    55// 
    66//     Changes to this file may cause incorrect behavior and will be lost if 
    … …  
    1313     
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] 
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] 
    1616    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { 
    1717