Changeset 7414


Ignore:
Timestamp:
11/23/17 13:27:57 (19 months ago)
Author:
rohit_tandon
Message:

Tab order of Import audio files dialog corrected.
Continuation of last commit "Import audio files in each section" exception handling.

Location:
trunk/Obi/Obi
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Obi/Obi/Dialogs/ImportFileSplitSize.Designer.cs

    r7410 r7414  
    3434            this.mOKButton = new System.Windows.Forms.Button(); 
    3535            this.mCancelButton = new System.Windows.Forms.Button(); 
    36             this.mCreateAudioFilePerSectionCheckBox = new System.Windows.Forms.CheckBox(); 
    3736            this.lstManualArrange = new System.Windows.Forms.ListBox(); 
    3837            this.m_btnMoveUp = new System.Windows.Forms.Button(); 
     
    9190            this.mCancelButton.UseVisualStyleBackColor = true; 
    9291            //  
    93             // mCreateAudioFilePerSectionCheckBox 
    94             //  
    95             resources.ApplyResources(this.mCreateAudioFilePerSectionCheckBox, "mCreateAudioFilePerSectionCheckBox"); 
    96             this.mCreateAudioFilePerSectionCheckBox.Name = "mCreateAudioFilePerSectionCheckBox"; 
    97             this.mCreateAudioFilePerSectionCheckBox.UseVisualStyleBackColor = true; 
    98             this.mCreateAudioFilePerSectionCheckBox.CheckedChanged += new System.EventHandler(this.mCreateAudioFilePerSectionCheckBox_CheckedChanged); 
    99             //  
    10092            // lstManualArrange 
    10193            //  
     
    197189            this.m_grpCreateSectionForEachAudioFile.Controls.Add(this.mchkCountToTruncateFromStart); 
    198190            this.m_grpCreateSectionForEachAudioFile.Controls.Add(this.mchkToReplaceWithSpace); 
    199             this.m_grpCreateSectionForEachAudioFile.Controls.Add(this.mCreateAudioFilePerSectionCheckBox); 
    200191            this.m_grpCreateSectionForEachAudioFile.Controls.Add(this.m_txtCharToReplaceWithSpace); 
    201192            this.m_grpCreateSectionForEachAudioFile.Controls.Add(this.m_numCharCountToTruncateFromStart); 
     
    315306        private System.Windows.Forms.Button mOKButton; 
    316307        private System.Windows.Forms.Button mCancelButton; 
    317         private System.Windows.Forms.CheckBox mCreateAudioFilePerSectionCheckBox; 
    318308        private System.Windows.Forms.ListBox lstManualArrange; 
    319309        private System.Windows.Forms.Button m_btnMoveUp; 
  • trunk/Obi/Obi/Dialogs/ImportFileSplitSize.cs

    r7409 r7414  
    253253        } 
    254254 
    255         private void mCreateAudioFilePerSectionCheckBox_CheckedChanged(object sender, EventArgs e) 
    256         { 
    257             mchkCountToTruncateFromStart.Enabled = 
    258                 mchkToReplaceWithSpace.Enabled = 
    259                 mchktPageIdentificationString.Enabled = mCreateAudioFilePerSectionCheckBox.Checked; 
    260             if(mCreateAudioFilePerSectionCheckBox.Checked) 
    261             { 
    262                 m_txtCharToReplaceWithSpace.Enabled = true; 
    263                 m_numCharCountToTruncateFromStart.Enabled = true; 
    264                 m_txtPageIdentificationString.Enabled = true; 
    265                 mchkToReplaceWithSpace.Checked = true; 
    266                 mchkCountToTruncateFromStart.Checked = true; 
    267                 mchktPageIdentificationString.Checked = true; 
    268             } 
    269             else 
    270             { 
    271                 m_txtCharToReplaceWithSpace.Enabled = false; 
    272                 m_numCharCountToTruncateFromStart.Enabled = false; 
    273                 m_txtPageIdentificationString.Enabled = false; 
    274                 mchkToReplaceWithSpace.Checked = false; 
    275                 mchkCountToTruncateFromStart.Checked = false; 
    276                 mchktPageIdentificationString.Checked = false; 
    277             } 
    278         } 
    279255 
    280256        private void m_rdbSplitPhrasesOnImport_CheckedChanged(object sender, EventArgs e) 
  • trunk/Obi/Obi/Dialogs/ImportFileSplitSize.resx

    r7410 r7414  
    238238    <value>3</value> 
    239239  </data> 
    240   <data name="mCreateAudioFilePerSectionCheckBox.AccessibleName" xml:space="preserve"> 
    241     <value>create section for each audio file.</value> 
    242   </data> 
    243   <data name="mCreateAudioFilePerSectionCheckBox.AutoSize" type="System.Boolean, mscorlib"> 
    244     <value>True</value> 
    245   </data> 
    246   <data name="mCreateAudioFilePerSectionCheckBox.Location" type="System.Drawing.Point, System.Drawing"> 
    247     <value>13, 47</value> 
    248   </data> 
    249   <data name="mCreateAudioFilePerSectionCheckBox.Size" type="System.Drawing.Size, System.Drawing"> 
    250     <value>221, 20</value> 
    251   </data> 
    252   <data name="mCreateAudioFilePerSectionCheckBox.TabIndex" type="System.Int32, mscorlib"> 
    253     <value>10</value> 
    254   </data> 
    255   <data name="mCreateAudioFilePerSectionCheckBox.Text" xml:space="preserve"> 
    256     <value>&amp;Create section for each audio file</value> 
    257   </data> 
    258   <data name="mCreateAudioFilePerSectionCheckBox.Visible" type="System.Boolean, mscorlib"> 
    259     <value>False</value> 
    260   </data> 
    261   <data name="&gt;&gt;mCreateAudioFilePerSectionCheckBox.Name" xml:space="preserve"> 
    262     <value>mCreateAudioFilePerSectionCheckBox</value> 
    263   </data> 
    264   <data name="&gt;&gt;mCreateAudioFilePerSectionCheckBox.Type" xml:space="preserve"> 
    265     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    266   </data> 
    267   <data name="&gt;&gt;mCreateAudioFilePerSectionCheckBox.Parent" xml:space="preserve"> 
    268     <value>m_grpCreateSectionForEachAudioFile</value> 
    269   </data> 
    270   <data name="&gt;&gt;mCreateAudioFilePerSectionCheckBox.ZOrder" xml:space="preserve"> 
    271     <value>6</value> 
    272   </data> 
    273240  <data name="lstManualArrange.AccessibleName" xml:space="preserve"> 
    274241    <value>Audio files list box.</value> 
     
    539506  </data> 
    540507  <data name="m_txtCharToReplaceWithSpace.TabIndex" type="System.Int32, mscorlib"> 
    541     <value>13</value> 
     508    <value>14</value> 
    542509  </data> 
    543510  <data name="&gt;&gt;m_txtCharToReplaceWithSpace.Name" xml:space="preserve"> 
     
    551518  </data> 
    552519  <data name="&gt;&gt;m_txtCharToReplaceWithSpace.ZOrder" xml:space="preserve"> 
    553     <value>7</value> 
     520    <value>6</value> 
    554521  </data> 
    555522  <data name="m_txtPageIdentificationString.AccessibleName" xml:space="preserve"> 
     
    566533  </data> 
    567534  <data name="m_txtPageIdentificationString.TabIndex" type="System.Int32, mscorlib"> 
    568     <value>17</value> 
     535    <value>18</value> 
    569536  </data> 
    570537  <data name="&gt;&gt;m_txtPageIdentificationString.Name" xml:space="preserve"> 
     
    578545  </data> 
    579546  <data name="&gt;&gt;m_txtPageIdentificationString.ZOrder" xml:space="preserve"> 
    580     <value>9</value> 
     547    <value>8</value> 
    581548  </data> 
    582549  <data name="m_numCharCountToTruncateFromStart.AccessibleName" xml:space="preserve"> 
     
    593560  </data> 
    594561  <data name="m_numCharCountToTruncateFromStart.TabIndex" type="System.Int32, mscorlib"> 
    595     <value>15</value> 
     562    <value>16</value> 
    596563  </data> 
    597564  <data name="&gt;&gt;m_numCharCountToTruncateFromStart.Name" xml:space="preserve"> 
     
    605572  </data> 
    606573  <data name="&gt;&gt;m_numCharCountToTruncateFromStart.ZOrder" xml:space="preserve"> 
    607     <value>8</value> 
     574    <value>7</value> 
    608575  </data> 
    609576  <data name="m_grpCreateSectionForEachAudioFile.AccessibleName" xml:space="preserve"> 
     
    620587  </data> 
    621588  <data name="m_rdbCreateAudioFilePerSection.TabIndex" type="System.Int32, mscorlib"> 
    622     <value>11</value> 
     589    <value>12</value> 
    623590  </data> 
    624591  <data name="m_rdbCreateAudioFilePerSection.Text" xml:space="preserve"> 
     
    647614  </data> 
    648615  <data name="m_rdbImportAudioFileInEachSection.TabIndex" type="System.Int32, mscorlib"> 
    649     <value>18</value> 
     616    <value>11</value> 
    650617  </data> 
    651618  <data name="m_rdbImportAudioFileInEachSection.Text" xml:space="preserve"> 
     
    710677  </data> 
    711678  <data name="mchktPageIdentificationString.TabIndex" type="System.Int32, mscorlib"> 
    712     <value>16</value> 
     679    <value>17</value> 
    713680  </data> 
    714681  <data name="mchktPageIdentificationString.Text" xml:space="preserve"> 
     
    740707  </data> 
    741708  <data name="mchkCountToTruncateFromStart.TabIndex" type="System.Int32, mscorlib"> 
    742     <value>14</value> 
     709    <value>15</value> 
    743710  </data> 
    744711  <data name="mchkCountToTruncateFromStart.Text" xml:space="preserve"> 
     
    770737  </data> 
    771738  <data name="mchkToReplaceWithSpace.TabIndex" type="System.Int32, mscorlib"> 
    772     <value>12</value> 
     739    <value>13</value> 
    773740  </data> 
    774741  <data name="mchkToReplaceWithSpace.Text" xml:space="preserve"> 
  • trunk/Obi/Obi/ProjectView/ProjectView.cs

    r7413 r7414  
    28322832                                        if (this.Selection != null && this.Selection.Node != null) 
    28332833                                        { 
    2834                                             if ((this.Selection.Node is PhraseNode || this.Selection.Node is EmptyNode) && this.Selection.Node.Parent is SectionNode) 
     2834                                            if (this.Selection.Node is EmptyNode && this.Selection.Node.Parent is SectionNode) 
    28352835                                            { 
    28362836                                                tempSectionNodeSelected = (SectionNode)this.Selection.Node.Parent; 
     
    28442844                                        int tempRequiredPositionOfLastSection = 0; 
    28452845                                        if(tempSectionNodeSelected != null) 
    2846                                         tempRequiredPositionOfLastSection = tempSectionNodeSelected.Position + phraseNodes.Count - 1;  
    2847                                
    2848                                         if (phraseNodes.Count <= sectionsList.Count && tempRequiredPositionOfLastSection <= sectionsList[sectionsList.Count-1].Position) 
     2846                                        tempRequiredPositionOfLastSection = tempSectionNodeSelected.Position + phraseNodes.Count - 1; 
     2847 
     2848                                        if (phraseNodes.Count <= sectionsList.Count && tempSectionNodeSelected != null && tempRequiredPositionOfLastSection <= sectionsList[sectionsList.Count - 1].Position) 
    28492849                                        { 
    28502850                                            CompositeCommand ImportSectionCommand = GetCommandForImportAudioFileInEachSection(phraseNodes); 
     
    28532853                                        else 
    28542854                                        { 
     2855                                            MessageBox.Show(Localizer.Message("NotEnoughSectionsToImportFiles"), Localizer.Message("Caption_Error")); 
    28552856                                            return; 
    28562857                                        } 
  • trunk/Obi/Obi/messages.Designer.cs

    r7407 r7414  
    45714571         
    45724572        /// <summary> 
     4573        ///   Looks up a localized string similar to You do not have enough sections to import all the files.. 
     4574        /// </summary> 
     4575        internal static string NotEnoughSectionsToImportFiles { 
     4576            get { 
     4577                return ResourceManager.GetString("NotEnoughSectionsToImportFiles", resourceCulture); 
     4578            } 
     4579        } 
     4580         
     4581        /// <summary> 
    45734582        ///   Looks up a localized string similar to Nothing to search!. 
    45744583        /// </summary> 
  • trunk/Obi/Obi/messages.resx

    r7407 r7414  
    30043004    <value>no audio</value> 
    30053005  </data> 
     3006  <data name="NotEnoughSectionsToImportFiles" xml:space="preserve"> 
     3007    <value>You do not have enough sections to import all the files.</value> 
     3008  </data> 
    30063009</root> 
Note: See TracChangeset for help on using the changeset viewer.