Changeset 7609


Ignore:
Timestamp:
02/22/19 06:42:45 (2 months ago)
Author:
rohit_tandon
Message:

-> important update for adding Comment on a phrase.
-> Preference commit for warning before delete section.

Location:
trunk/Obi/Obi
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/Obi/Obi/Dialogs/Preferences.cs

    r7598 r7609  
    11451145                mSettings.Project_ImportNCCFileWithWindows1252Encoding= m_CheckBoxListView.Items[16].Checked; 
    11461146                mSettings.Project_DoNotDisplayMessageBoxForShowingSection = m_CheckBoxListView.Items[17].Checked; 
    1147                 mSettings.Project_ReadOnlyMode = m_CheckBoxListView.Items[18].Checked;  
     1147                mSettings.Project_ReadOnlyMode = m_CheckBoxListView.Items[18].Checked; 
     1148                mSettings.Project_DisplayWarningsForSectionDelete = m_CheckBoxListView.Items[19].Checked; 
    11481149            } 
    11491150            if (mTab.SelectedTab == mAudioTab) 
     
    12941295                m_CheckBoxListView.Items.Add(Localizer.Message("Project_DoNotDisplayMessageBoxForShowingSection")); 
    12951296                m_CheckBoxListView.Items.Add(Localizer.Message("Project_ReadOnlyMode")); 
     1297                m_CheckBoxListView.Items.Add(Localizer.Message("Project_DisplayWarningsForSectionDelete")); 
    12961298                
    12971299                m_CheckBoxListView.Items[0].Checked = mSettings.Project_OpenLastProject; 
     
    13321334                m_CheckBoxListView.Items[17].ToolTipText = Localizer.Message("Project_DoNotDisplayMessageBoxForShowingSection"); 
    13331335                m_CheckBoxListView.Items[18].Checked = mSettings.Project_ReadOnlyMode; 
    1334                 m_CheckBoxListView.Items[18].ToolTipText = Localizer.Message("Project_ReadOnlyMode");  
     1336                m_CheckBoxListView.Items[18].ToolTipText = Localizer.Message("Project_ReadOnlyMode"); 
     1337                m_CheckBoxListView.Items[19].Checked = mSettings.Project_DisplayWarningsForSectionDelete; 
     1338                m_CheckBoxListView.Items[19].ToolTipText = Localizer.Message("Project_DisplayWarningsForSectionDelete");  
    13351339 
    13361340            } 
     
    14291433                mSettings.Project_MaximumPhrasesSelectLimit = m_DefaultSettings.Project_MaximumPhrasesSelectLimit; 
    14301434                mSettings.Project_ReadOnlyMode = m_DefaultSettings.Project_ReadOnlyMode; 
     1435                mSettings.Project_DisplayWarningsForSectionDelete = m_DefaultSettings.Project_DisplayWarningsForSectionDelete; 
    14311436                InitializeProjectTab(); 
    14321437            } 
     
    21012106                    mSettings.Project_MaximumPhrasesSelectLimit = true; 
    21022107                    mSettings.Project_ReadOnlyMode = false; 
     2108                    mSettings.Project_DisplayWarningsForSectionDelete = false; 
    21032109                    // UpdateBoolSettings(); 
    21042110                } 
     
    21752181                    mSettings.Project_MaximumPhrasesSelectLimit = true; 
    21762182                    mSettings.Project_ReadOnlyMode = false; 
     2183                    mSettings.Project_DisplayWarningsForSectionDelete = false; 
    21772184                    // UpdateBoolSettings(); 
    21782185                } 
     
    22482255                    mSettings.Project_MaximumPhrasesSelectLimit = true; 
    22492256                    mSettings.Project_ReadOnlyMode = false; 
     2257                    mSettings.Project_DisplayWarningsForSectionDelete = false; 
    22502258                    // UpdateBoolSettings(); 
    22512259                } 
     
    23212329                    mSettings.Project_MaximumPhrasesSelectLimit = true; 
    23222330                    mSettings.Project_ReadOnlyMode = false; 
     2331                    mSettings.Project_DisplayWarningsForSectionDelete = false; 
    23232332                    // UpdateBoolSettings(); 
    23242333 
     
    23962405                    mSettings.Project_MaximumPhrasesSelectLimit = true; 
    23972406                    mSettings.Project_ReadOnlyMode = false; 
     2407                    mSettings.Project_DisplayWarningsForSectionDelete = false; 
    23982408                    // UpdateBoolSettings(); 
    23992409 
     
    24712481                    mSettings.Project_MaximumPhrasesSelectLimit = true; 
    24722482                    mSettings.Project_ReadOnlyMode = false; 
     2483                    mSettings.Project_DisplayWarningsForSectionDelete = false; 
    24732484                    // UpdateBoolSettings(); 
    24742485 
     
    25452556                    mSettings.Project_MaximumPhrasesSelectLimit = true; 
    25462557                    mSettings.Project_ReadOnlyMode = false; 
     2558                    mSettings.Project_DisplayWarningsForSectionDelete = false; 
    25472559                    // UpdateBoolSettings(); 
    25482560 
  • trunk/Obi/Obi/Dialogs/Preferences.resx

    r7563 r7609  
    266266  </data> 
    267267  <data name="m_btnSaveProfile.Text" xml:space="preserve"> 
    268     <value>&amp;Save As</value> 
     268    <value>&amp;Save as</value> 
    269269  </data> 
    270270  <metadata name="m_Preference_ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
     
    605605  </data> 
    606606  <data name="m_lblSelectedShortcuts.Size" type="System.Drawing.Size, System.Drawing"> 
    607     <value>152, 16</value> 
     607    <value>149, 16</value> 
    608608  </data> 
    609609  <data name="m_lblSelectedShortcuts.TabIndex" type="System.Int32, mscorlib"> 
     
    611611  </data> 
    612612  <data name="m_lblSelectedShortcuts.Text" xml:space="preserve"> 
    613     <value>Current Shorcuts Profile :</value> 
     613    <value>Current shorcuts profile :</value> 
    614614  </data> 
    615615  <data name="&gt;&gt;m_lblSelectedShortcuts.Name" xml:space="preserve"> 
     
    683683  </data> 
    684684  <data name="m_rdb_KeyboardShortcuts.Size" type="System.Drawing.Size, System.Drawing"> 
    685     <value>143, 20</value> 
     685    <value>141, 20</value> 
    686686  </data> 
    687687  <data name="m_rdb_KeyboardShortcuts.TabIndex" type="System.Int32, mscorlib"> 
     
    689689  </data> 
    690690  <data name="m_rdb_KeyboardShortcuts.Text" xml:space="preserve"> 
    691     <value>&amp;Keyboard Shortcuts</value> 
     691    <value>&amp;Keyboard shortcuts</value> 
    692692  </data> 
    693693  <data name="&gt;&gt;m_rdb_KeyboardShortcuts.Name" xml:space="preserve"> 
     
    746746  </data> 
    747747  <data name="m_gpBox_SelectProfile.Text" xml:space="preserve"> 
    748     <value>Select Profile Options</value> 
     748    <value>Select profile options</value> 
    749749  </data> 
    750750  <data name="&gt;&gt;m_gpBox_SelectProfile.Name" xml:space="preserve"> 
     
    770770  </data> 
    771771  <data name="m_lblSelectedProfile.Size" type="System.Drawing.Size, System.Drawing"> 
    772     <value>97, 16</value> 
     772    <value>96, 16</value> 
    773773  </data> 
    774774  <data name="m_lblSelectedProfile.TabIndex" type="System.Int32, mscorlib"> 
     
    776776  </data> 
    777777  <data name="m_lblSelectedProfile.Text" xml:space="preserve"> 
    778     <value>Current Profile :</value> 
     778    <value>Current profile :</value> 
    779779  </data> 
    780780  <data name="&gt;&gt;m_lblSelectedProfile.Name" xml:space="preserve"> 
     
    803803  </data> 
    804804  <data name="m_lblShortcutsProfile.Size" type="System.Drawing.Size, System.Drawing"> 
    805     <value>151, 16</value> 
     805    <value>148, 16</value> 
    806806  </data> 
    807807  <data name="m_lblShortcutsProfile.TabIndex" type="System.Int32, mscorlib"> 
     
    809809  </data> 
    810810  <data name="m_lblShortcutsProfile.Text" xml:space="preserve"> 
    811     <value>Select Shortcuts Profile :</value> 
     811    <value>Select shortcuts profile :</value> 
    812812  </data> 
    813813  <data name="&gt;&gt;m_lblShortcutsProfile.Name" xml:space="preserve"> 
     
    926926  </data> 
    927927  <data name="m_lblSelectProfile.Size" type="System.Drawing.Size, System.Drawing"> 
    928     <value>93, 16</value> 
     928    <value>92, 16</value> 
    929929  </data> 
    930930  <data name="m_lblSelectProfile.TabIndex" type="System.Int32, mscorlib"> 
     
    932932  </data> 
    933933  <data name="m_lblSelectProfile.Text" xml:space="preserve"> 
    934     <value>Select Profile :</value> 
     934    <value>Select profile :</value> 
    935935  </data> 
    936936  <data name="&gt;&gt;m_lblSelectProfile.Name" xml:space="preserve"> 
     
    22962296  </data> 
    22972297  <data name="labelTTSvoice.AccessibleName" xml:space="preserve"> 
    2298     <value>Set TTS Synthetic Voice</value> 
     2298    <value>Set TTS synthetic voice</value> 
    22992299  </data> 
    23002300  <data name="labelTTSvoice.AutoSize" type="System.Boolean, mscorlib"> 
     
    23112311  </data> 
    23122312  <data name="labelTTSvoice.Size" type="System.Drawing.Size, System.Drawing"> 
    2313     <value>157, 16</value> 
     2313    <value>155, 16</value> 
    23142314  </data> 
    23152315  <data name="labelTTSvoice.TabIndex" type="System.Int32, mscorlib"> 
     
    23172317  </data> 
    23182318  <data name="labelTTSvoice.Text" xml:space="preserve"> 
    2319     <value>Set TTS Synthetic voice :</value> 
     2319    <value>Set TTS synthetic voice :</value> 
    23202320  </data> 
    23212321  <data name="&gt;&gt;labelTTSvoice.Name" xml:space="preserve"> 
     
    35293529  </data> 
    35303530  <data name="m_btnAdvanceSettingsPreferences.Text" xml:space="preserve"> 
    3531     <value>Additional Settings  &gt;&gt;</value> 
     3531    <value>Additional settings  &gt;&gt;</value> 
    35323532  </data> 
    35333533  <data name="m_btnAdvanceSettingsPreferences.Visible" type="System.Boolean, mscorlib"> 
  • trunk/Obi/Obi/EmptyNode.cs

    r7607 r7609  
    283283        } 
    284284 
    285         public string AddNoteText 
     285        public string CommentText 
    286286        { 
    287287            get { return m_AddNoteText; } 
  • trunk/Obi/Obi/KeyboardShortcuts_Settings.cs

    r7314 r7609  
    5454        public KeyboardShortcut ContentView_ZoomWaveformPanel = new KeyboardShortcut(Keys.Z, "KeyS_ZoomWaveformPanel"); 
    5555 
     56        // Post Obi 4.3  
     57        [OptionalField] 
     58        public KeyboardShortcut ContentView_AddComment = new KeyboardShortcut(Keys.M, "KeyS_AddCommentSingleKey"); 
     59 
    5660        //Zoom Paenl Shortcuts         
    5761        public KeyboardShortcut ZoomPanel_Close = new KeyboardShortcut(Keys.Alt | Keys.C, "KeyS_CloseZoomPanel"); 
     
    369373 
    370374            KeyboardShortcutsDescription.Add(Localizer.Message(ContentView_ZoomWaveformPanel.Description), ContentView_ZoomWaveformPanel); 
     375            KeyboardShortcutsDescription.Add(Localizer.Message(ContentView_AddComment.Description), ContentView_AddComment); 
    371376            KeyboardShortcutsDescription.Add(Localizer.Message(ContentView_TransportBarRecordSingleKey.Description), ContentView_TransportBarRecordSingleKey); 
    372377            KeyboardShortcutsDescription.Add(Localizer.Message(ContentView_TransportBarStopSingleKey.Description), ContentView_TransportBarStopSingleKey); 
  • trunk/Obi/Obi/ObiForm.Designer.cs

    r7607 r7609  
    166166            this.mCheckForPhrasesWithImproperAudioMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    167167            this.mDeleteFollowingPhrasesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    168             this.m_AddNoteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    169             this.m_AddViewNoteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    170             this.m_ClearNoteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
     168            this.m_CommentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
     169            this.m_AddViewCommentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
     170            this.m_ClearCommentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    171171            this.transportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    172172            this.mPlayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
     
    827827            this.mCheckForPhrasesWithImproperAudioMenuItem, 
    828828            this.mDeleteFollowingPhrasesToolStripMenuItem, 
    829             this.m_AddNoteToolStripMenuItem}); 
     829            this.m_CommentToolStripMenuItem}); 
    830830            this.mPhrasesToolStripMenuItem.Name = "mPhrasesToolStripMenuItem"; 
    831831            resources.ApplyResources(this.mPhrasesToolStripMenuItem, "mPhrasesToolStripMenuItem"); 
     
    12051205            this.mDeleteFollowingPhrasesToolStripMenuItem.Click += new System.EventHandler(this.mDeleteFollowingPhrasesToolStripMenuItem_Click); 
    12061206            //  
    1207             // m_AddNoteToolStripMenuItem 
    1208             //  
    1209             this.m_AddNoteToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 
    1210             this.m_AddViewNoteToolStripMenuItem, 
    1211             this.m_ClearNoteToolStripMenuItem}); 
    1212             this.m_AddNoteToolStripMenuItem.Name = "m_AddNoteToolStripMenuItem"; 
    1213             resources.ApplyResources(this.m_AddNoteToolStripMenuItem, "m_AddNoteToolStripMenuItem"); 
    1214             this.m_AddNoteToolStripMenuItem.Click += new System.EventHandler(this.m_AddNoteToolStripMenuItem_Click); 
    1215             //  
    1216             // m_AddViewNoteToolStripMenuItem 
    1217             //  
    1218             this.m_AddViewNoteToolStripMenuItem.Name = "m_AddViewNoteToolStripMenuItem"; 
    1219             resources.ApplyResources(this.m_AddViewNoteToolStripMenuItem, "m_AddViewNoteToolStripMenuItem"); 
    1220             this.m_AddViewNoteToolStripMenuItem.Click += new System.EventHandler(this.m_AddViewNoteToolStripMenuItem_Click); 
    1221             //  
    1222             // m_ClearNoteToolStripMenuItem 
    1223             //  
    1224             this.m_ClearNoteToolStripMenuItem.Name = "m_ClearNoteToolStripMenuItem"; 
    1225             resources.ApplyResources(this.m_ClearNoteToolStripMenuItem, "m_ClearNoteToolStripMenuItem"); 
    1226             this.m_ClearNoteToolStripMenuItem.Click += new System.EventHandler(this.m_ClearNoteToolStripMenuItem_Click); 
     1207            // m_CommentToolStripMenuItem 
     1208            //  
     1209            this.m_CommentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 
     1210            this.m_AddViewCommentToolStripMenuItem, 
     1211            this.m_ClearCommentToolStripMenuItem}); 
     1212            this.m_CommentToolStripMenuItem.Name = "m_CommentToolStripMenuItem"; 
     1213            resources.ApplyResources(this.m_CommentToolStripMenuItem, "m_CommentToolStripMenuItem"); 
     1214            //  
     1215            // m_AddViewCommentToolStripMenuItem 
     1216            //  
     1217            this.m_AddViewCommentToolStripMenuItem.Name = "m_AddViewCommentToolStripMenuItem"; 
     1218            resources.ApplyResources(this.m_AddViewCommentToolStripMenuItem, "m_AddViewCommentToolStripMenuItem"); 
     1219            this.m_AddViewCommentToolStripMenuItem.Click += new System.EventHandler(this.m_AddViewCommentToolStripMenuItem_Click); 
     1220            //  
     1221            // m_ClearCommentToolStripMenuItem 
     1222            //  
     1223            this.m_ClearCommentToolStripMenuItem.Name = "m_ClearCommentToolStripMenuItem"; 
     1224            resources.ApplyResources(this.m_ClearCommentToolStripMenuItem, "m_ClearCommentToolStripMenuItem"); 
     1225            this.m_ClearCommentToolStripMenuItem.Click += new System.EventHandler(this.m_ClearCommentToolStripMenuItem_Click); 
    12271226            //  
    12281227            // transportToolStripMenuItem 
     
    19401939        private System.Windows.Forms.ToolStripMenuItem mImportTOCMenuItem; 
    19411940        private System.Windows.Forms.ToolStripMenuItem m_pasteMultiplePhrasesToolStripMenuItem; 
    1942         private System.Windows.Forms.ToolStripMenuItem m_AddNoteToolStripMenuItem; 
    1943         private System.Windows.Forms.ToolStripMenuItem m_AddViewNoteToolStripMenuItem; 
    1944         private System.Windows.Forms.ToolStripMenuItem m_ClearNoteToolStripMenuItem; 
     1941        private System.Windows.Forms.ToolStripMenuItem m_CommentToolStripMenuItem; 
     1942        private System.Windows.Forms.ToolStripMenuItem m_AddViewCommentToolStripMenuItem; 
     1943        private System.Windows.Forms.ToolStripMenuItem m_ClearCommentToolStripMenuItem; 
    19451944    } 
    19461945} 
  • trunk/Obi/Obi/ObiForm.cs

    r7607 r7609  
    23182318                                                          && !mProjectView.TransportBar.IsRecorderActive; 
    23192319                m_pasteMultiplePhrasesToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsRecorderActive &&  mProjectView.CanPasteMultiplePhrases; 
    2320                 m_AddNoteToolStripMenuItem.Enabled =  m_AddViewNoteToolStripMenuItem.Enabled = m_ClearNoteToolStripMenuItem.Enabled = mProjectView.IsBlockSelected;                 
     2320                m_CommentToolStripMenuItem.Enabled =  m_AddViewCommentToolStripMenuItem.Enabled = m_ClearCommentToolStripMenuItem.Enabled = mProjectView.IsBlockSelected;                 
    23212321            } 
    23222322 
     
    64836483            } 
    64846484 
    6485             private void m_AddNoteToolStripMenuItem_Click(object sender, EventArgs e) 
    6486             { 
    6487                
    6488             } 
    6489  
    6490             private void m_AddViewNoteToolStripMenuItem_Click(object sender, EventArgs e) 
    6491             { 
    6492                   if (mProjectView.Selection.Node is EmptyNode) 
    6493                 { 
    6494                     Obi.ProjectView.EditableLabel editLabel = new ProjectView.EditableLabel(mProjectView.Selection.Node as EmptyNode); 
    6495                     mProjectView.ShowEditLabelToAddNote(editLabel); 
    6496                 } 
    6497             } 
    6498  
    6499             private void m_ClearNoteToolStripMenuItem_Click(object sender, EventArgs e) 
     6485 
     6486            private void m_AddViewCommentToolStripMenuItem_Click(object sender, EventArgs e) 
    65006487            { 
    65016488                if (mProjectView.Selection.Node is EmptyNode) 
    65026489                { 
     6490                    mProjectView.ShowEditLabelToAddNote(); 
     6491                } 
     6492            } 
     6493 
     6494            private void m_ClearCommentToolStripMenuItem_Click(object sender, EventArgs e) 
     6495            { 
     6496                if (mProjectView.Selection.Node is EmptyNode) 
     6497                { 
    65036498                    mProjectView.ClearNote(); 
    65046499                } 
    65056500 
    65066501            } 
    6507  
    65086502 
    65096503 
  • trunk/Obi/Obi/ObiForm.resx

    r7607 r7609  
    121121    <value>0, 0</value> 
    122122  </metadata> 
     123  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> 
     124  <data name="mMenuStrip.Location" type="System.Drawing.Point, System.Drawing"> 
     125    <value>0, 0</value> 
     126  </data> 
     127  <data name="mMenuStrip.Size" type="System.Drawing.Size, System.Drawing"> 
     128    <value>876, 24</value> 
     129  </data> 
     130  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
     131  <data name="mMenuStrip.TabIndex" type="System.Int32, mscorlib"> 
     132    <value>1</value> 
     133  </data> 
     134  <data name="mMenuStrip.Text" xml:space="preserve"> 
     135    <value>menuStrip1</value> 
     136  </data> 
     137  <data name="&gt;&gt;mMenuStrip.Name" xml:space="preserve"> 
     138    <value>mMenuStrip</value> 
     139  </data> 
     140  <data name="&gt;&gt;mMenuStrip.Type" xml:space="preserve"> 
     141    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     142  </data> 
     143  <data name="&gt;&gt;mMenuStrip.Parent" xml:space="preserve"> 
     144    <value>$this</value> 
     145  </data> 
     146  <data name="&gt;&gt;mMenuStrip.ZOrder" xml:space="preserve"> 
     147    <value>2</value> 
     148  </data> 
    123149  <data name="mFileToolStripMenuItem.AccessibleName" xml:space="preserve"> 
    124150    <value>File</value> 
     
    127153    <value>New project Ctrl+N</value> 
    128154  </data> 
    129   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> 
    130155  <data name="mFile_NewProjectMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> 
    131156    <value>Magenta</value> 
     
    243268    <value>278, 6</value> 
    244269  </data> 
     270  <data name="mFile_RecentProjectMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     271    <value>281, 22</value> 
     272  </data> 
     273  <data name="mFile_RecentProjectMenuItem.Text" xml:space="preserve"> 
     274    <value>&amp;Recent projects</value> 
     275  </data> 
     276  <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing"> 
     277    <value>278, 6</value> 
     278  </data> 
     279  <data name="mFile_ExitMenuItem.AccessibleName" xml:space="preserve"> 
     280    <value>Exit Alt+F4</value> 
     281  </data> 
     282  <data name="mFile_ExitMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> 
     283    <value>Alt+F4</value> 
     284  </data> 
     285  <data name="mFile_ExitMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     286    <value>281, 22</value> 
     287  </data> 
     288  <data name="mFile_ExitMenuItem.Text" xml:space="preserve"> 
     289    <value>E&amp;xit</value> 
     290  </data> 
     291  <data name="mFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     292    <value>37, 20</value> 
     293  </data> 
     294  <data name="mFileToolStripMenuItem.Text" xml:space="preserve"> 
     295    <value>&amp;File</value> 
     296  </data> 
    245297  <data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing"> 
    246298    <value>116, 6</value> 
     
    252304    <value>&amp;Clear list</value> 
    253305  </data> 
    254   <data name="mFile_RecentProjectMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    255     <value>281, 22</value> 
    256   </data> 
    257   <data name="mFile_RecentProjectMenuItem.Text" xml:space="preserve"> 
    258     <value>&amp;Recent projects</value> 
    259   </data> 
    260   <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing"> 
    261     <value>278, 6</value> 
    262   </data> 
    263   <data name="mFile_ExitMenuItem.AccessibleName" xml:space="preserve"> 
    264     <value>Exit Alt+F4</value> 
    265   </data> 
    266   <data name="mFile_ExitMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> 
    267     <value>Alt+F4</value> 
    268   </data> 
    269   <data name="mFile_ExitMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    270     <value>281, 22</value> 
    271   </data> 
    272   <data name="mFile_ExitMenuItem.Text" xml:space="preserve"> 
    273     <value>E&amp;xit</value> 
    274   </data> 
    275   <data name="mFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    276     <value>37, 20</value> 
    277   </data> 
    278   <data name="mFileToolStripMenuItem.Text" xml:space="preserve"> 
    279     <value>&amp;File</value> 
     306  <data name="mEditToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> 
     307    <value>39, 20</value> 
     308  </data> 
     309  <data name="mEditToolStripMenuItem1.Text" xml:space="preserve"> 
     310    <value>&amp;Edit</value> 
    280311  </data> 
    281312  <data name="mUndoToolStripMenuItem.AccessibleName" xml:space="preserve"> 
     
    438469    <value>Bookmark</value> 
    439470  </data> 
     471  <data name="mEdit_BookmarkToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     472    <value>247, 22</value> 
     473  </data> 
     474  <data name="mEdit_BookmarkToolStripMenuItem.Text" xml:space="preserve"> 
     475    <value>Book&amp;mark</value> 
     476  </data> 
    440477  <data name="mEdit_AssignBookmarkToolStripMenuItem.AccessibleName" xml:space="preserve"> 
    441478    <value>Set as bookmark</value> 
     
    456493    <value>Goto bookmar&amp;k</value> 
    457494  </data> 
    458   <data name="mEdit_BookmarkToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    459     <value>247, 22</value> 
    460   </data> 
    461   <data name="mEdit_BookmarkToolStripMenuItem.Text" xml:space="preserve"> 
    462     <value>Book&amp;mark</value> 
    463   </data> 
    464   <data name="mEditToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> 
    465     <value>39, 20</value> 
    466   </data> 
    467   <data name="mEditToolStripMenuItem1.Text" xml:space="preserve"> 
    468     <value>&amp;Edit</value> 
     495  <data name="mViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     496    <value>44, 20</value> 
     497  </data> 
     498  <data name="mViewToolStripMenuItem.Text" xml:space="preserve"> 
     499    <value>&amp;View</value> 
    469500  </data> 
    470501  <data name="mShowTOCViewToolStripMenuItem.AccessibleName" xml:space="preserve"> 
     
    543574    <value>Focus on co&amp;ntent view</value> 
    544575  </data> 
    545   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
    546576  <data name="mFocusOnStripsViewToolStripMenuItem.Visible" type="System.Boolean, mscorlib"> 
    547577    <value>False</value> 
     
    748778    <value>Pro&amp;ject properties</value> 
    749779  </data> 
    750   <data name="mViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    751     <value>44, 20</value> 
    752   </data> 
    753   <data name="mViewToolStripMenuItem.Text" xml:space="preserve"> 
    754     <value>&amp;View</value> 
     780  <data name="mSectionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     781    <value>63, 20</value> 
     782  </data> 
     783  <data name="mSectionsToolStripMenuItem.Text" xml:space="preserve"> 
     784    <value>&amp;Sections</value> 
    755785  </data> 
    756786  <data name="mAddSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> 
     
    883913    <value>Section is &amp;used</value> 
    884914  </data> 
    885   <data name="mSectionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    886     <value>63, 20</value> 
    887   </data> 
    888   <data name="mSectionsToolStripMenuItem.Text" xml:space="preserve"> 
    889     <value>&amp;Sections</value> 
     915  <data name="mPhrasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     916    <value>59, 20</value> 
     917  </data> 
     918  <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve"> 
     919    <value>&amp;Phrases</value> 
    890920  </data> 
    891921  <data name="mAddBlankPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> 
     
    937967    <value>&amp;Split phrase</value> 
    938968  </data> 
     969  <data name="mMergeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     970    <value>240, 22</value> 
     971  </data> 
     972  <data name="mMergeToolStripMenuItem.Text" xml:space="preserve"> 
     973    <value>&amp;Merge</value> 
     974  </data> 
    939975  <data name="mMergePhraseWithNextToolStripMenuItem.AccessibleName" xml:space="preserve"> 
    940976    <value>Merge with next phrase Ctrl+M</value> 
     
    9791015    <value>Merge with &amp;preceding phrases</value> 
    9801016  </data> 
    981   <data name="mMergeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    982     <value>240, 22</value> 
    983   </data> 
    984   <data name="mMergeToolStripMenuItem.Text" xml:space="preserve"> 
    985     <value>&amp;Merge</value> 
    986   </data> 
    9871017  <data name="mCropAudiotoolStripMenuItem.AccessibleName" xml:space="preserve"> 
    9881018    <value>Crop audio Ctrl+Alt+Q</value> 
     
    10181048    <value>Phrase is &amp;used</value> 
    10191049  </data> 
     1050  <data name="MultiPhraseOperationMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1051    <value>240, 22</value> 
     1052  </data> 
     1053  <data name="MultiPhraseOperationMenuItem.Text" xml:space="preserve"> 
     1054    <value>Multi phrase/page &amp;operation</value> 
     1055  </data> 
    10201056  <data name="beginMarkToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    10211057    <value>256, 22</value> 
     
    10541090    <value>&amp;Paste Multiple Phrases</value> 
    10551091  </data> 
    1056   <data name="MultiPhraseOperationMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1057     <value>240, 22</value> 
    1058   </data> 
    1059   <data name="MultiPhraseOperationMenuItem.Text" xml:space="preserve"> 
    1060     <value>Multi phrase/page &amp;operation</value> 
    1061   </data> 
    10621092  <data name="mSkippableNoteToolStripMenuItem.AccessibleName" xml:space="preserve"> 
    10631093    <value>Skippable note</value> 
    10641094  </data> 
     1095  <data name="mSkippableNoteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1096    <value>240, 22</value> 
     1097  </data> 
     1098  <data name="mSkippableNoteToolStripMenuItem.Text" xml:space="preserve"> 
     1099    <value>Skippab&amp;le note...</value> 
     1100  </data> 
    10651101  <data name="mSkippableBeginNoteToolStripMenuItem.AccessibleName" xml:space="preserve"> 
    10661102    <value>Begin note</value> 
     
    11651201    <value>&amp;Clear role from note</value> 
    11661202  </data> 
    1167   <data name="mSkippableNoteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1168     <value>240, 22</value> 
    1169   </data> 
    1170   <data name="mSkippableNoteToolStripMenuItem.Text" xml:space="preserve"> 
    1171     <value>Skippab&amp;le note...</value> 
    1172   </data> 
    11731203  <data name="mAutoPageGenerationMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    11741204    <value>240, 22</value> 
     
    11801210    <value>237, 6</value> 
    11811211  </data> 
     1212  <data name="mPhrases_AssignRoleMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1213    <value>240, 22</value> 
     1214  </data> 
     1215  <data name="mPhrases_AssignRoleMenuItem.Text" xml:space="preserve"> 
     1216    <value>&amp;Assign role</value> 
     1217  </data> 
    11821218  <data name="mPhrases_AssignRole_PlainMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    11831219    <value>193, 22</value> 
     
    12371273    <value>(&amp;New custom role...)</value> 
    12381274  </data> 
    1239   <data name="mPhrases_AssignRoleMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1240     <value>240, 22</value> 
    1241   </data> 
    1242   <data name="mPhrases_AssignRoleMenuItem.Text" xml:space="preserve"> 
    1243     <value>&amp;Assign role</value> 
    1244   </data> 
    12451275  <data name="mPhrases_ClearRoleMenuItem.AccessibleName" xml:space="preserve"> 
    12461276    <value>Clear role Ctrl+Shift+C</value> 
     
    12671297    <value>237, 6</value> 
    12681298  </data> 
     1299  <data name="mPhraseDetectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1300    <value>240, 22</value> 
     1301  </data> 
     1302  <data name="mPhraseDetectionToolStripMenuItem.Text" xml:space="preserve"> 
     1303    <value>Apply phrase &amp;detection...</value> 
     1304  </data> 
    12691305  <data name="mPhrases_ApplyPhraseDetectionMenuItem.AccessibleName" xml:space="preserve"> 
    12701306    <value>Selected item Ctrl+Shift+P</value> 
     
    13031339    <value>False</value> 
    13041340  </data> 
    1305   <data name="mPhraseDetectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1341  <data name="mPhrases_AudioSelectionMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    13061342    <value>240, 22</value> 
    13071343  </data> 
    1308   <data name="mPhraseDetectionToolStripMenuItem.Text" xml:space="preserve"> 
    1309     <value>Apply phrase &amp;detection...</value> 
     1344  <data name="mPhrases_AudioSelectionMenuItem.Text" xml:space="preserve"> 
     1345    <value>Audi&amp;o selection</value> 
    13101346  </data> 
    13111347  <data name="mPhrases_AudioSelection_BeginAudioSelectionMenuItem.AccessibleName" xml:space="preserve"> 
     
    13391375    <value>&amp;End audio selection</value> 
    13401376  </data> 
    1341   <data name="mPhrases_AudioSelectionMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1377  <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    13421378    <value>240, 22</value> 
    13431379  </data> 
    1344   <data name="mPhrases_AudioSelectionMenuItem.Text" xml:space="preserve"> 
    1345     <value>Audi&amp;o selection</value> 
     1380  <data name="mGoToToolStripMenuItem.Text" xml:space="preserve"> 
     1381    <value>&amp;Go to...</value> 
    13461382  </data> 
    13471383  <data name="mNextTODOPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> 
     
    13961432    <value>Collect &amp;Special Phrases</value> 
    13971433  </data> 
    1398   <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1399     <value>240, 22</value> 
    1400   </data> 
    1401   <data name="mGoToToolStripMenuItem.Text" xml:space="preserve"> 
    1402     <value>&amp;Go to...</value> 
    1403   </data> 
    14041434  <data name="mCheckForPhrasesWithImproperAudioMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    14051435    <value>240, 22</value> 
     
    14171447    <value>Delete &amp;following phrases</value> 
    14181448  </data> 
    1419   <data name="m_AddViewNoteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1420     <value>155, 22</value> 
    1421   </data> 
    1422   <data name="m_AddViewNoteToolStripMenuItem.Text" xml:space="preserve"> 
    1423     <value>Add/View Note</value> 
    1424   </data> 
    1425   <data name="m_ClearNoteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1426     <value>155, 22</value> 
    1427   </data> 
    1428   <data name="m_ClearNoteToolStripMenuItem.Text" xml:space="preserve"> 
    1429     <value>Clear Note</value> 
    1430   </data> 
    1431   <data name="m_AddNoteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1449  <data name="m_CommentToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    14321450    <value>240, 22</value> 
    14331451  </data> 
    1434   <data name="m_AddNoteToolStripMenuItem.Text" xml:space="preserve"> 
    1435     <value>Add &amp;Note</value> 
    1436   </data> 
    1437   <data name="mPhrasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1438     <value>59, 20</value> 
    1439   </data> 
    1440   <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve"> 
    1441     <value>&amp;Phrases</value> 
     1452  <data name="m_CommentToolStripMenuItem.Text" xml:space="preserve"> 
     1453    <value>&amp;Comment</value> 
     1454  </data> 
     1455  <data name="m_AddViewCommentToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1456    <value>183, 22</value> 
     1457  </data> 
     1458  <data name="m_AddViewCommentToolStripMenuItem.Text" xml:space="preserve"> 
     1459    <value>&amp;Add/View Comment</value> 
     1460  </data> 
     1461  <data name="m_ClearCommentToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1462    <value>183, 22</value> 
     1463  </data> 
     1464  <data name="m_ClearCommentToolStripMenuItem.Text" xml:space="preserve"> 
     1465    <value>&amp;Clear Comment</value> 
     1466  </data> 
     1467  <data name="transportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1468    <value>69, 20</value> 
     1469  </data> 
     1470  <data name="transportToolStripMenuItem.Text" xml:space="preserve"> 
     1471    <value>Tr&amp;ansport</value> 
     1472  </data> 
     1473  <data name="mPlayToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1474    <value>176, 22</value> 
     1475  </data> 
     1476  <data name="mPlayToolStripMenuItem.Text" xml:space="preserve"> 
     1477    <value>&amp;Play</value> 
    14421478  </data> 
    14431479  <data name="mPlayAllToolStripMenuItem.AccessibleName" xml:space="preserve"> 
     
    14831519    <value>Play Section Heading</value> 
    14841520  </data> 
    1485   <data name="mPlayToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1486     <value>176, 22</value> 
    1487   </data> 
    1488   <data name="mPlayToolStripMenuItem.Text" xml:space="preserve"> 
    1489     <value>&amp;Play</value> 
    1490   </data> 
    14911521  <data name="mPauseToolStripMenuItem.AccessibleName" xml:space="preserve"> 
    14921522    <value>Pause Space</value> 
     
    15251555    <value>&amp;Stop</value> 
    15261556  </data> 
     1557  <data name="mFastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1558    <value>176, 22</value> 
     1559  </data> 
     1560  <data name="mFastPlaytoolStripMenuItem.Text" xml:space="preserve"> 
     1561    <value>Fast p&amp;lay</value> 
     1562  </data> 
    15271563  <data name="NormalSpeedtoolStripMenuItem.AccessibleName" xml:space="preserve"> 
    15281564    <value>Normal speed Ctrl+0</value> 
     
    15731609    <value>Slow &amp;down</value> 
    15741610  </data> 
    1575   <data name="mFastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1611  <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    15761612    <value>176, 22</value> 
    15771613  </data> 
    1578   <data name="mFastPlaytoolStripMenuItem.Text" xml:space="preserve"> 
    1579     <value>Fast p&amp;lay</value> 
     1614  <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve"> 
     1615    <value>Pre&amp;view</value> 
    15801616  </data> 
    15811617  <data name="mPreviewFromToolStripMenuItem.AccessibleName" xml:space="preserve"> 
     
    16031639    <value>Preview &amp;selected</value> 
    16041640  </data> 
    1605   <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1641  <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    16061642    <value>176, 22</value> 
    16071643  </data> 
    1608   <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve"> 
    1609     <value>Pre&amp;view</value> 
     1644  <data name="mRecordToolStripMenuItem.Text" xml:space="preserve"> 
     1645    <value>&amp;Record</value> 
    16101646  </data> 
    16111647  <data name="mStartMonitoringToolStripMenuItem.AccessibleName" xml:space="preserve"> 
     
    16721708    <value>Allow &amp;overwrite</value> 
    16731709  </data> 
    1674   <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1675     <value>176, 22</value> 
    1676   </data> 
    1677   <data name="mRecordToolStripMenuItem.Text" xml:space="preserve"> 
    1678     <value>&amp;Record</value> 
    1679   </data> 
    16801710  <data name="mGenerateSpeechToolStripMenuItem.AccessibleDescription" xml:space="preserve"> 
    16811711    <value>Generate speech</value> 
    16821712  </data> 
     1713  <data name="mGenerateSpeechToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1714    <value>176, 22</value> 
     1715  </data> 
     1716  <data name="mGenerateSpeechToolStripMenuItem.Text" xml:space="preserve"> 
     1717    <value>&amp;Generate speech</value> 
     1718  </data> 
    16831719  <data name="selectedPageToolStripMenuItem.AccessibleName" xml:space="preserve"> 
    16841720    <value>Generate speech for selected page.</value> 
     
    16991735    <value>&amp;All empty pages</value> 
    17001736  </data> 
    1701   <data name="mGenerateSpeechToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1702     <value>176, 22</value> 
    1703   </data> 
    1704   <data name="mGenerateSpeechToolStripMenuItem.Text" xml:space="preserve"> 
    1705     <value>&amp;Generate speech</value> 
    1706   </data> 
    17071737  <data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing"> 
    17081738    <value>173, 6</value> 
    17091739  </data> 
     1740  <data name="navigationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1741    <value>176, 22</value> 
     1742  </data> 
     1743  <data name="navigationToolStripMenuItem.Text" xml:space="preserve"> 
     1744    <value>&amp;Navigation</value> 
     1745  </data> 
    17101746  <data name="mPreviousSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> 
    17111747    <value>Previous section Alt+Up</value> 
     
    18101846    <value>Fine na&amp;vigation</value> 
    18111847  </data> 
    1812   <data name="navigationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1813     <value>176, 22</value> 
    1814   </data> 
    1815   <data name="navigationToolStripMenuItem.Text" xml:space="preserve"> 
    1816     <value>&amp;Navigation</value> 
    1817   </data> 
    18181848  <data name="mRewindToolStripMenuItem.AccessibleName" xml:space="preserve"> 
    18191849    <value>Rewind Ctrl+comma</value> 
     
    18461876    <value>&amp;Fast forward</value> 
    18471877  </data> 
    1848   <data name="transportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1849     <value>69, 20</value> 
    1850   </data> 
    1851   <data name="transportToolStripMenuItem.Text" xml:space="preserve"> 
    1852     <value>Tr&amp;ansport</value> 
     1878  <data name="mToolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1879    <value>47, 20</value> 
     1880  </data> 
     1881  <data name="mToolsToolStripMenuItem.Text" xml:space="preserve"> 
     1882    <value>&amp;Tools</value> 
    18531883  </data> 
    18541884  <data name="mTools_PreferencesMenuItem.AccessibleName" xml:space="preserve"> 
     
    18941924    <value>Clean unreferenced audio</value> 
    18951925  </data> 
     1926  <data name="mTools_CleanUnreferencedAudioMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1927    <value>229, 22</value> 
     1928  </data> 
     1929  <data name="mTools_CleanUnreferencedAudioMenuItem.Text" xml:space="preserve"> 
     1930    <value>C&amp;lean unreferenced audio</value> 
     1931  </data> 
    18961932  <data name="m_Tools_CompleteCleanupToolStripMenuItem.AccessibleName" xml:space="preserve"> 
    18971933    <value>Complete Cleanup</value> 
     
    19241960    <value>&amp;Rollback</value> 
    19251961  </data> 
    1926   <data name="mTools_CleanUnreferencedAudioMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1927     <value>229, 22</value> 
    1928   </data> 
    1929   <data name="mTools_CleanUnreferencedAudioMenuItem.Text" xml:space="preserve"> 
    1930     <value>C&amp;lean unreferenced audio</value> 
    1931   </data> 
    19321962  <data name="mTools_ExportAsDAISYMenuItem.AccessibleName" xml:space="preserve"> 
    19331963    <value>Export as DAISY Ctrl+E</value> 
     
    19511981    <value>EPUB 3 Validator</value> 
    19521982  </data> 
    1953   <data name="mToolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    1954     <value>47, 20</value> 
    1955   </data> 
    1956   <data name="mToolsToolStripMenuItem.Text" xml:space="preserve"> 
    1957     <value>&amp;Tools</value> 
     1983  <data name="mHelpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1984    <value>44, 20</value> 
     1985  </data> 
     1986  <data name="mHelpToolStripMenuItem.Text" xml:space="preserve"> 
     1987    <value>&amp;Help</value> 
    19581988  </data> 
    19591989  <data name="mHelp_WhatsNewMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     
    19982028  <data name="checkForUpdatesToolStripMenuItem.Text" xml:space="preserve"> 
    19992029    <value>Check for &amp;updates</value> 
    2000   </data> 
    2001   <data name="mHelpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    2002     <value>44, 20</value> 
    2003   </data> 
    2004   <data name="mHelpToolStripMenuItem.Text" xml:space="preserve"> 
    2005     <value>&amp;Help</value> 
    2006   </data> 
    2007   <data name="mMenuStrip.Location" type="System.Drawing.Point, System.Drawing"> 
    2008     <value>0, 0</value> 
    2009   </data> 
    2010   <data name="mMenuStrip.Size" type="System.Drawing.Size, System.Drawing"> 
    2011     <value>876, 24</value> 
    2012   </data> 
    2013   <data name="mMenuStrip.TabIndex" type="System.Int32, mscorlib"> 
    2014     <value>1</value> 
    2015   </data> 
    2016   <data name="mMenuStrip.Text" xml:space="preserve"> 
    2017     <value>menuStrip1</value> 
    2018   </data> 
    2019   <data name="&gt;&gt;mMenuStrip.Name" xml:space="preserve"> 
    2020     <value>mMenuStrip</value> 
    2021   </data> 
    2022   <data name="&gt;&gt;mMenuStrip.Type" xml:space="preserve"> 
    2023     <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    2024   </data> 
    2025   <data name="&gt;&gt;mMenuStrip.Parent" xml:space="preserve"> 
    2026     <value>$this</value> 
    2027   </data> 
    2028   <data name="&gt;&gt;mMenuStrip.ZOrder" xml:space="preserve"> 
    2029     <value>2</value> 
    20302030  </data> 
    20312031  <metadata name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    20322032    <value>0, 520</value> 
    20332033  </metadata> 
     2034  <data name="mStatusStrip.Location" type="System.Drawing.Point, System.Drawing"> 
     2035    <value>0, 520</value> 
     2036  </data> 
     2037  <data name="mStatusStrip.Size" type="System.Drawing.Size, System.Drawing"> 
     2038    <value>876, 22</value> 
     2039  </data> 
     2040  <data name="mStatusStrip.TabIndex" type="System.Int32, mscorlib"> 
     2041    <value>3</value> 
     2042  </data> 
     2043  <data name="mStatusStrip.Text" xml:space="preserve"> 
     2044    <value>statusStrip1</value> 
     2045  </data> 
     2046  <data name="&gt;&gt;mStatusStrip.Name" xml:space="preserve"> 
     2047    <value>mStatusStrip</value> 
     2048  </data> 
     2049  <data name="&gt;&gt;mStatusStrip.Type" xml:space="preserve"> 
     2050    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     2051  </data> 
     2052  <data name="&gt;&gt;mStatusStrip.Parent" xml:space="preserve"> 
     2053    <value>$this</value> 
     2054  </data> 
     2055  <data name="&gt;&gt;mStatusStrip.ZOrder" xml:space="preserve"> 
     2056    <value>1</value> 
     2057  </data> 
    20342058  <data name="mStatusLabel.Font" type="System.Drawing.Font, System.Drawing"> 
    20352059    <value>Microsoft Sans Serif, 9.75pt</value> 
     
    20472071    <value>False</value> 
    20482072  </data> 
    2049   <data name="mStatusStrip.Location" type="System.Drawing.Point, System.Drawing"> 
    2050     <value>0, 520</value> 
    2051   </data> 
    2052   <data name="mStatusStrip.Size" type="System.Drawing.Size, System.Drawing"> 
    2053     <value>876, 22</value> 
    2054   </data> 
    2055   <data name="mStatusStrip.TabIndex" type="System.Int32, mscorlib"> 
    2056     <value>3</value> 
    2057   </data> 
    2058   <data name="mStatusStrip.Text" xml:space="preserve"> 
    2059     <value>statusStrip1</value> 
    2060   </data> 
    2061   <data name="&gt;&gt;mStatusStrip.Name" xml:space="preserve"> 
    2062     <value>mStatusStrip</value> 
    2063   </data> 
    2064   <data name="&gt;&gt;mStatusStrip.Type" xml:space="preserve"> 
    2065     <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    2066   </data> 
    2067   <data name="&gt;&gt;mStatusStrip.Parent" xml:space="preserve"> 
    2068     <value>$this</value> 
    2069   </data> 
    2070   <data name="&gt;&gt;mStatusStrip.ZOrder" xml:space="preserve"> 
    2071     <value>1</value> 
    2072   </data> 
    20732073  <data name="mProjectView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> 
    20742074    <value>Fill</value> 
     
    20902090  </data> 
    20912091  <data name="&gt;&gt;mProjectView.Type" xml:space="preserve"> 
    2092     <value>Obi.ProjectView.ProjectView, Obi, Version=4.3.0.36829, Culture=neutral, PublicKeyToken=null</value> 
     2092    <value>Obi.ProjectView.ProjectView, Obi, Version=4.3.0.20179, Culture=neutral, PublicKeyToken=null</value> 
    20932093  </data> 
    20942094  <data name="&gt;&gt;mProjectView.Parent" xml:space="preserve"> 
     
    31763176    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    31773177  </data> 
    3178   <data name="&gt;&gt;m_AddNoteToolStripMenuItem.Name" xml:space="preserve"> 
    3179     <value>m_AddNoteToolStripMenuItem</value> 
    3180   </data> 
    3181   <data name="&gt;&gt;m_AddNoteToolStripMenuItem.Type" xml:space="preserve"> 
    3182     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    3183   </data> 
    3184   <data name="&gt;&gt;m_AddViewNoteToolStripMenuItem.Name" xml:space="preserve"> 
    3185     <value>m_AddViewNoteToolStripMenuItem</value> 
    3186   </data> 
    3187   <data name="&gt;&gt;m_AddViewNoteToolStripMenuItem.Type" xml:space="preserve"> 
    3188     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    3189   </data> 
    3190   <data name="&gt;&gt;m_ClearNoteToolStripMenuItem.Name" xml:space="preserve"> 
    3191     <value>m_ClearNoteToolStripMenuItem</value> 
    3192   </data> 
    3193   <data name="&gt;&gt;m_ClearNoteToolStripMenuItem.Type" xml:space="preserve"> 
     3178  <data name="&gt;&gt;m_CommentToolStripMenuItem.Name" xml:space="preserve"> 
     3179    <value>m_CommentToolStripMenuItem</value> 
     3180  </data> 
     3181  <data name="&gt;&gt;m_CommentToolStripMenuItem.Type" xml:space="preserve"> 
     3182    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     3183  </data> 
     3184  <data name="&gt;&gt;m_AddViewCommentToolStripMenuItem.Name" xml:space="preserve"> 
     3185    <value>m_AddViewCommentToolStripMenuItem</value> 
     3186  </data> 
     3187  <data name="&gt;&gt;m_AddViewCommentToolStripMenuItem.Type" xml:space="preserve"> 
     3188    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     3189  </data> 
     3190  <data name="&gt;&gt;m_ClearCommentToolStripMenuItem.Name" xml:space="preserve"> 
     3191    <value>m_ClearCommentToolStripMenuItem</value> 
     3192  </data> 
     3193  <data name="&gt;&gt;m_ClearCommentToolStripMenuItem.Type" xml:space="preserve"> 
    31943194    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    31953195  </data> 
  • trunk/Obi/Obi/ProjectView/Block.Designer.cs

    r7607 r7609  
    3333            this.mLabel = new System.Windows.Forms.Label(); 
    3434            this.mToolTip = new System.Windows.Forms.ToolTip(this.components); 
    35             this.m_NotePictureBox = new System.Windows.Forms.PictureBox(); 
    36             ((System.ComponentModel.ISupportInitialize)(this.m_NotePictureBox)).BeginInit(); 
     35            this.m_CommentPictureBox = new System.Windows.Forms.PictureBox(); 
     36            ((System.ComponentModel.ISupportInitialize)(this.m_CommentPictureBox)).BeginInit(); 
    3737            this.SuspendLayout(); 
    3838            //  
     
    5252            // m_NotePictureBox 
    5353            //  
    54             this.m_NotePictureBox.Image = ((System.Drawing.Image)(resources.GetObject("m_NotePictureBox.Image"))); 
    55             this.m_NotePictureBox.Location = new System.Drawing.Point(0, 0); 
    56             this.m_NotePictureBox.Name = "m_NotePictureBox"; 
    57             this.m_NotePictureBox.Size = new System.Drawing.Size(12, 19); 
    58             this.m_NotePictureBox.TabIndex = 3; 
    59             this.m_NotePictureBox.TabStop = false; 
    60             this.m_NotePictureBox.Visible = false; 
     54            this.m_CommentPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("m_NotePictureBox.Image"))); 
     55            this.m_CommentPictureBox.Location = new System.Drawing.Point(0, 0); 
     56            this.m_CommentPictureBox.Name = "m_NotePictureBox"; 
     57            this.m_CommentPictureBox.Size = new System.Drawing.Size(12, 19); 
     58            this.m_CommentPictureBox.TabIndex = 3; 
     59            this.m_CommentPictureBox.TabStop = false; 
     60            this.m_CommentPictureBox.Visible = false; 
    6161            //  
    6262            // Block 
     
    6666            this.BackColor = System.Drawing.Color.HotPink; 
    6767            this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; 
    68             this.Controls.Add(this.m_NotePictureBox); 
     68            this.Controls.Add(this.m_CommentPictureBox); 
    6969            this.Controls.Add(this.mLabel); 
    7070            this.DoubleBuffered = true; 
     
    7575            this.Click += new System.EventHandler(this.Block_Click); 
    7676            this.Enter += new System.EventHandler(this.Block_Enter); 
    77             ((System.ComponentModel.ISupportInitialize)(this.m_NotePictureBox)).EndInit(); 
     77            ((System.ComponentModel.ISupportInitialize)(this.m_CommentPictureBox)).EndInit(); 
    7878            this.ResumeLayout(false); 
    7979            this.PerformLayout(); 
     
    8585        protected System.Windows.Forms.Label mLabel; 
    8686        private System.Windows.Forms.ToolTip mToolTip; 
    87         private System.Windows.Forms.PictureBox m_NotePictureBox; 
     87        private System.Windows.Forms.PictureBox m_CommentPictureBox; 
    8888 
    8989    } 
  • trunk/Obi/Obi/ProjectView/Block.cs

    r7607 r7609  
    194194                mLabel.AccessibleName = GetAccessibleName; 
    195195                mToolTip.SetToolTip(this, Node.BaseStringShort()); 
    196                 mToolTip.SetToolTip(mLabel, Node.BaseStringShort()); 
    197                 if (Node.AddNoteText != null && Node.AddNoteText != string.Empty) 
    198                 { 
    199                     m_NotePictureBox.Visible = true; 
    200                     mLabel.Location = new Point(m_NotePictureBox.Width, mLabel.Location.Y); 
    201                     mToolTip.SetToolTip(m_NotePictureBox,Node.AddNoteText); 
    202                     mLabel.AccessibleName = GetAccessibleName + "Note attached"; 
    203                 } 
    204                 else if (Node.AddNoteText != null && Node.AddNoteText == string.Empty) 
    205                 { 
    206                     m_NotePictureBox.Visible = false; 
     196                if (Node.CommentText == null || Node.CommentText == string.Empty) 
     197                { 
     198                    mToolTip.SetToolTip(mLabel, Node.BaseStringShort()); 
     199                } 
     200                if (Node.CommentText != null && Node.CommentText != string.Empty) 
     201                { 
     202                    m_CommentPictureBox.Visible = true; 
     203                    mLabel.Location = new Point(m_CommentPictureBox.Width, mLabel.Location.Y); 
     204                    mToolTip.SetToolTip(m_CommentPictureBox, Node.BaseStringShort() + "\n" + Node.CommentText); 
     205                    mToolTip.SetToolTip(mLabel, Node.BaseStringShort() + "\n" + Node.CommentText); 
     206                    mLabel.AccessibleName = GetAccessibleName + Localizer.Message("CommentAttachedFlagForAccessibleName"); 
     207                } 
     208                else if (Node.CommentText != null && Node.CommentText == string.Empty) 
     209                { 
     210                    m_CommentPictureBox.Visible = false; 
    207211                    mLabel.Location = new Point(0, mLabel.Location.Y); 
    208212                } 
  • trunk/Obi/Obi/ProjectView/ContentView.Designer.cs

    r7465 r7609  
    6464            this.Context_AssignRole_NewCustomRoleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    6565            this.Context_ClearRoleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
     66            this.Context_CommentMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
     67            this.Context_AddViewCommentMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
     68            this.Context_ClearCommentMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    6669            this.Context_PhraseDetectionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    6770            this.Context_ApplyPhraseDetectionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
     
    132135            this.Context_AssignRoleMenuItem, 
    133136            this.Context_ClearRoleMenuItem, 
     137            this.Context_CommentMenuItem, 
    134138            this.Context_PhraseDetectionMenuItem, 
    135139            this.toolStripMenuItem1, 
     
    356360            resources.ApplyResources(this.Context_ClearRoleMenuItem, "Context_ClearRoleMenuItem"); 
    357361            this.Context_ClearRoleMenuItem.Click += new System.EventHandler(this.Context_ClearRoleMenuItem_Click); 
     362            //  
     363            // Context_CommentMenuItem 
     364            //  
     365            this.Context_CommentMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 
     366            this.Context_AddViewCommentMenuItem, 
     367            this.Context_ClearCommentMenuItem}); 
     368            this.Context_CommentMenuItem.Name = "Context_CommentMenuItem"; 
     369            resources.ApplyResources(this.Context_CommentMenuItem, "Context_CommentMenuItem"); 
     370            //  
     371            // Context_AddViewCommentMenuItem 
     372            //  
     373            this.Context_AddViewCommentMenuItem.Name = "Context_AddViewCommentMenuItem"; 
     374            resources.ApplyResources(this.Context_AddViewCommentMenuItem, "Context_AddViewCommentMenuItem"); 
     375            this.Context_AddViewCommentMenuItem.Click += new System.EventHandler(this.Context_AddViewCommentMenuItem_Click); 
     376            //  
     377            // Context_ClearCommentMenuItem 
     378            //  
     379            this.Context_ClearCommentMenuItem.Name = "Context_ClearCommentMenuItem"; 
     380            resources.ApplyResources(this.Context_ClearCommentMenuItem, "Context_ClearCommentMenuItem"); 
     381            this.Context_ClearCommentMenuItem.Click += new System.EventHandler(this.Context_ClearCommentMenuItem_Click); 
    358382            //  
    359383            // Context_PhraseDetectionMenuItem 
     
    733757        private System.Windows.Forms.ToolStripMenuItem ContextEndMarkToolStripMenuItem; 
    734758        private System.Windows.Forms.ToolStripMenuItem ContextPasteMultiplePhrasesToolStripMenuItem; 
     759        private System.Windows.Forms.ToolStripMenuItem Context_CommentMenuItem; 
     760        private System.Windows.Forms.ToolStripMenuItem Context_AddViewCommentMenuItem; 
     761        private System.Windows.Forms.ToolStripMenuItem Context_ClearCommentMenuItem; 
    735762    } 
    736763} 
  • trunk/Obi/Obi/ProjectView/ContentView.cs

    r7607 r7609  
    39473947            mShortcutKeys[keyboardShortcuts.ContentView_TransportBarRecordSingleKey.Value] = mProjectView.TransportBar.Record_Button; 
    39483948            mShortcutKeys[keyboardShortcuts.ContentView_TransportBarStopSingleKey.Value] = mProjectView.TransportBar.Stop ; 
     3949 
     3950            mShortcutKeys[keyboardShortcuts.ContentView_AddComment.Value] = ShowEditLabelToAddComment; 
    39493951        } 
    39503952 
     
    41074109            ContextPasteMultiplePhrasesToolStripMenuItem.ShortcutKeyDisplayString = ObiForm.RefineKeyboardShortcutStringForAccessibleName(keyboardShortcuts.FormatKeyboardShorcut(keyboardShortcuts.MenuNameDictionary["m_pasteMultiplePhrasesToolStripMenuItem"].Value.ToString())); 
    41084110            ContextPasteMultiplePhrasesToolStripMenuItem.AccessibleName = ContextPasteMultiplePhrasesToolStripMenuItem.Text.Replace("&", "") + " " + ContextPasteMultiplePhrasesToolStripMenuItem.ShortcutKeyDisplayString; 
     4111 
     4112            Context_AddViewCommentMenuItem.ShortcutKeyDisplayString = ObiForm.RefineKeyboardShortcutStringForAccessibleName(keyboardShortcuts.FormatKeyboardShorcut(keyboardShortcuts.ContentView_AddComment.Value.ToString())); 
     4113            Context_AddViewCommentMenuItem.AccessibleName = Context_AddViewCommentMenuItem.Text.Replace("&", "") + " " + Context_AddViewCommentMenuItem.ShortcutKeyDisplayString; 
    41094114 
    41104115        } 
     
    52555260            ContextEndMarkToolStripMenuItem.Enabled = mProjectView.CanEndSpecialNote; 
    52565261            ContextPasteMultiplePhrasesToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsRecorderActive && mProjectView.CanPasteMultiplePhrases && !Settings.Project_ReadOnlyMode; 
     5262            Context_CommentMenuItem.Enabled = Context_AddViewCommentMenuItem.Enabled = Context_ClearCommentMenuItem.Enabled = mProjectView.IsBlockSelected; 
    52575263            } 
    52585264 
     
    56105616                if (this.Controls.Contains(m_EditableLabel)) 
    56115617                { 
    5612                     m_EditableLabel.AddNote -= new EventHandler(EditableLabel_AddNote); 
    5613                     m_EditableLabel.CloseAddNote -= new EventHandler(EditLabel_CloseAddNote); 
     5618                    m_EditableLabel.AddComment -= new EventHandler(EditableLabel_AddNote); 
     5619                    m_EditableLabel.CloseComment -= new EventHandler(EditLabel_CloseAddNote); 
    56145620                    this.Controls.Remove(m_EditableLabel); 
    56155621                } 
     
    59745980            mProjectView.SplitAndMerge(mergeWithNext); 
    59755981        } 
    5976         public void ShowEditLabelToAddNote(EditableLabel editLabel) 
    5977         { 
     5982        public bool ShowEditLabelToAddComment() 
     5983        { 
     5984            EditableLabel editLabel = new EditableLabel(mProjectView.Selection.Node as EmptyNode); 
    59785985            this.Controls.Add(editLabel); 
    59795986            m_EditableLabel = editLabel; 
     
    59915998            } 
    59925999            editLabel.BringToFront(); 
    5993             editLabel.AddNote += new EventHandler(EditableLabel_AddNote); 
    5994             editLabel.CloseAddNote +=new EventHandler(EditLabel_CloseAddNote); 
    5995         } 
    5996  
    5997         public void ClearNote() 
     6000            editLabel.AddComment += new EventHandler(EditableLabel_AddNote); 
     6001            editLabel.CloseComment +=new EventHandler(EditLabel_CloseAddNote); 
     6002            return true; 
     6003        } 
     6004 
     6005        public void ClearComment() 
    59986006        { 
    59996007            Block tempBlock = FindBlock(mProjectView.Selection.Node as EmptyNode); 
     
    60036011                { 
    60046012                    EmptyNode tempNode = (EmptyNode)mProjectView.Selection.Node; 
    6005                     tempNode.AddNoteText = string.Empty; 
     6013                    tempNode.CommentText = string.Empty; 
    60066014                } 
    60076015                tempBlock.UpdateLabelsText(); 
     
    61046112            { 
    61056113                tempBlock.UpdateLabelsText(); 
    6106                 m_EditableLabel.AddNote -= new EventHandler(EditableLabel_AddNote); 
    6107                 m_EditableLabel.CloseAddNote -= new EventHandler(EditLabel_CloseAddNote); 
     6114                m_EditableLabel.AddComment -= new EventHandler(EditableLabel_AddNote); 
     6115                m_EditableLabel.CloseComment -= new EventHandler(EditLabel_CloseAddNote); 
    61086116                this.Controls.Remove(m_EditableLabel); 
    61096117 
     
    61136121        private void EditLabel_CloseAddNote(object sender, EventArgs e) 
    61146122        { 
    6115             m_EditableLabel.AddNote -= new EventHandler(EditableLabel_AddNote); 
    6116             m_EditableLabel.CloseAddNote -= new EventHandler(EditLabel_CloseAddNote); 
     6123            m_EditableLabel.AddComment -= new EventHandler(EditableLabel_AddNote); 
     6124            m_EditableLabel.CloseComment -= new EventHandler(EditLabel_CloseAddNote); 
    61176125            this.Controls.Remove(m_EditableLabel); 
    61186126        } 
     
    61446152        } 
    61456153 
     6154        private void Context_AddViewCommentMenuItem_Click(object sender, EventArgs e) 
     6155        { 
     6156            this.ShowEditLabelToAddComment(); 
     6157        } 
     6158 
     6159        private void Context_ClearCommentMenuItem_Click(object sender, EventArgs e) 
     6160        { 
     6161            this.ClearComment(); 
     6162        } 
     6163 
    61466164      
    61476165 
  • trunk/Obi/Obi/ProjectView/ContentView.resx

    r7465 r7609  
    311311    <value>Clear role</value> 
    312312  </data> 
     313  <data name="Context_AddViewCommentMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     314    <value>183, 22</value> 
     315  </data> 
     316  <data name="Context_AddViewCommentMenuItem.Text" xml:space="preserve"> 
     317    <value>Add/View Comment</value> 
     318  </data> 
     319  <data name="Context_ClearCommentMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     320    <value>183, 22</value> 
     321  </data> 
     322  <data name="Context_ClearCommentMenuItem.Text" xml:space="preserve"> 
     323    <value>Clear Comment</value> 
     324  </data> 
     325  <data name="Context_CommentMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     326    <value>208, 22</value> 
     327  </data> 
     328  <data name="Context_CommentMenuItem.Text" xml:space="preserve"> 
     329    <value>Comment</value> 
     330  </data> 
    313331  <data name="Context_ApplyPhraseDetectionMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    314332    <value>285, 22</value> 
     
    692710  </data> 
    693711  <data name="&gt;&gt;verticalScrollToolStripContainer1.Type" xml:space="preserve"> 
    694     <value>Obi.ProjectView.VerticalScrollToolStripContainer, Obi, Version=4.1.0.33211, Culture=neutral, PublicKeyToken=null</value> 
     712    <value>Obi.ProjectView.VerticalScrollToolStripContainer, Obi, Version=4.3.0.20259, Culture=neutral, PublicKeyToken=null</value> 
    695713  </data> 
    696714  <data name="&gt;&gt;verticalScrollToolStripContainer1.Parent" xml:space="preserve"> 
     
    725743  </data> 
    726744  <data name="&gt;&gt;contentViewLabel1.Type" xml:space="preserve"> 
    727     <value>Obi.ProjectView.ContentViewLabel, Obi, Version=4.1.0.33211, Culture=neutral, PublicKeyToken=null</value> 
     745    <value>Obi.ProjectView.ContentViewLabel, Obi, Version=4.3.0.20259, Culture=neutral, PublicKeyToken=null</value> 
    728746  </data> 
    729747  <data name="&gt;&gt;contentViewLabel1.Parent" xml:space="preserve"> 
     
    934952    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    935953  </data> 
     954  <data name="&gt;&gt;Context_CommentMenuItem.Name" xml:space="preserve"> 
     955    <value>Context_CommentMenuItem</value> 
     956  </data> 
     957  <data name="&gt;&gt;Context_CommentMenuItem.Type" xml:space="preserve"> 
     958    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     959  </data> 
     960  <data name="&gt;&gt;Context_AddViewCommentMenuItem.Name" xml:space="preserve"> 
     961    <value>Context_AddViewCommentMenuItem</value> 
     962  </data> 
     963  <data name="&gt;&gt;Context_AddViewCommentMenuItem.Type" xml:space="preserve"> 
     964    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     965  </data> 
     966  <data name="&gt;&gt;Context_ClearCommentMenuItem.Name" xml:space="preserve"> 
     967    <value>Context_ClearCommentMenuItem</value> 
     968  </data> 
     969  <data name="&gt;&gt;Context_ClearCommentMenuItem.Type" xml:space="preserve"> 
     970    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     971  </data> 
    936972  <data name="&gt;&gt;Context_PhraseDetectionMenuItem.Name" xml:space="preserve"> 
    937973    <value>Context_PhraseDetectionMenuItem</value> 
  • trunk/Obi/Obi/ProjectView/EditableLabel.cs

    r7607 r7609  
    1717        public event EventHandler EditableChanged;    // editable status changed 
    1818        public event EventHandler LabelEditedByUser;  // raised when the user has edited the label 
    19         public event EventHandler AddNote; 
    20         public event EventHandler CloseAddNote; 
    21  
    22         public bool m_EditPhraseNote = false; 
     19        public event EventHandler AddComment; 
     20        public event EventHandler CloseComment; 
     21 
     22        public bool m_EditPhraseComment = false; 
    2323         
    2424        private EmptyNode m_Node;  
     
    3737            m_Node = node; 
    3838            InitializeComponent(); 
    39             mTextBox.Text = m_Node.AddNoteText; 
    40             m_EditPhraseNote = true; 
     39            mTextBox.Text = m_Node.CommentText; 
     40            m_EditPhraseComment = true; 
    4141        } 
    4242 
     
    6565                    if (mEditable) 
    6666                    { 
    67                         if (!m_EditPhraseNote) 
     67                        if (!m_EditPhraseComment) 
    6868                        { 
    6969                            mTextBox.Text = mLabel.Text; 
     
    7373                    } 
    7474                    UpdateSize(); 
    75                     if (!m_EditPhraseNote && EditableChanged != null) EditableChanged(this, new EventArgs()); 
     75                    if (!m_EditPhraseComment && EditableChanged != null) EditableChanged(this, new EventArgs()); 
    7676                } 
    7777            } 
     
    140140                "This button cannot be clicked when the label is not editable."); 
    141141            Editable = false; 
    142             if (m_EditPhraseNote) 
    143             { 
    144                 if (CloseAddNote != null) CloseAddNote(this, new EventArgs()); 
     142            if (m_EditPhraseComment) 
     143            { 
     144                if (CloseComment != null) CloseComment(this, new EventArgs()); 
    145145            } 
    146146        } 
     
    154154            System.Diagnostics.Debug.Assert(mEditable, 
    155155                "This button cannot be clicked when the label is not editable."); 
    156             if (m_EditPhraseNote && m_Node != null) 
    157             { 
    158                 m_Node.AddNoteText = mTextBox.Text; 
     156            if (m_EditPhraseComment && m_Node != null) 
     157            { 
     158                m_Node.CommentText = mTextBox.Text; 
    159159            } 
    160160 
     
    170170            if (e.KeyCode == Keys.Return) 
    171171            { 
    172                 if (m_EditPhraseNote && m_Node != null) 
    173                 { 
    174                     m_Node.AddNoteText = mTextBox.Text; 
     172                if (m_EditPhraseComment && m_Node != null) 
     173                { 
     174                    m_Node.CommentText = mTextBox.Text; 
    175175                } 
    176176                UpdateText(); 
     
    179179            { 
    180180                Editable = false; 
    181                 if (m_EditPhraseNote) 
    182                 { 
    183                     if (CloseAddNote != null) CloseAddNote(this, new EventArgs()); 
     181                if (m_EditPhraseComment) 
     182                { 
     183                    if (CloseComment != null) CloseComment(this, new EventArgs()); 
    184184                } 
    185185            } 
     
    194194                new Point(mOKButton.Location.X + mOKButton.Width + mOKButton.Margin.Right + mCancelButton.Margin.Left, h); 
    195195            int wlabel = mLabel.Location.X + mLabel.Width + mLabel.Margin.Right; 
    196             if (m_EditPhraseNote) 
     196            if (m_EditPhraseComment) 
    197197            { 
    198198                wlabel = wlabel * 4; 
     
    209209        private void UpdateText() 
    210210        { 
    211             if (!m_EditPhraseNote) 
     211            if (!m_EditPhraseComment) 
    212212            { 
    213213                if (mTextBox.Text != "") 
     
    219219            else 
    220220            { 
    221                 if (m_Node != null && m_Node.AddNoteText != null) 
    222                 { 
    223                     if (AddNote != null) AddNote(this, new EventArgs()); 
     221                if (m_Node != null && m_Node.CommentText != null) 
     222                { 
     223                    if (AddComment != null) AddComment(this, new EventArgs()); 
    224224                } 
    225225            } 
    226226            Editable = false; 
    227             m_EditPhraseNote = false; 
     227            m_EditPhraseComment = false; 
    228228        } 
    229229 
  • trunk/Obi/Obi/ProjectView/ProjectView.cs

    r7608 r7609  
    182182            } 
    183183 
    184             public void ShowEditLabelToAddNote(EditableLabel editLabel) 
    185             { 
    186                 mContentView.ShowEditLabelToAddNote(editLabel); 
     184            public void ShowEditLabelToAddNote() 
     185            { 
     186                mContentView.ShowEditLabelToAddComment(); 
    187187            } 
    188188 
    189189            public void ClearNote() 
    190190            { 
    191                 mContentView.ClearNote(); 
     191                mContentView.ClearComment(); 
    192192            } 
    193193 
  • trunk/Obi/Obi/messages.Designer.cs

    r7608 r7609  
    11081108         
    11091109        /// <summary> 
     1110        ///   Looks up a localized string similar to Comment attached. 
     1111        /// </summary> 
     1112        internal static string CommentAttachedFlagForAccessibleName { 
     1113            get { 
     1114                return ResourceManager.GetString("CommentAttachedFlagForAccessibleName", resourceCulture); 
     1115            } 
     1116        } 
     1117         
     1118        /// <summary> 
    11101119        ///   Looks up a localized string similar to Welcome to OBI. Please select appropriate settings from the options provided below. If you would like to configure Obi as per default settings, you can simply click on OK button or press the enter key and proceed. You can always change settings later from Obi Preferences.. 
    11111120        /// </summary> 
     
    28442853            get { 
    28452854                return ResourceManager.GetString("KeyboardShortcuts_TextboxAccessibleName", resourceCulture); 
     2855            } 
     2856        } 
     2857         
     2858        /// <summary> 
     2859        ///   Looks up a localized string similar to Add Comment: single key shortcut. 
     2860        /// </summary> 
     2861        internal static string KeyS_AddCommentSingleKey { 
     2862            get { 
     2863                return ResourceManager.GetString("KeyS_AddCommentSingleKey", resourceCulture); 
    28462864            } 
    28472865        } 
  • trunk/Obi/Obi/messages.resx

    r7608 r7609  
    30893089    <value>Warn before deleting section</value> 
    30903090  </data> 
     3091  <data name="KeyS_AddCommentSingleKey" xml:space="preserve"> 
     3092    <value>Add Comment: single key shortcut</value> 
     3093  </data> 
     3094  <data name="CommentAttachedFlagForAccessibleName" xml:space="preserve"> 
     3095    <value>Comment attached</value> 
     3096  </data> 
    30913097</root> 
Note: See TracChangeset for help on using the changeset viewer.