Changeset 1158 for trunk/eraser6


Ignore:
Timestamp:
7/3/2009 11:51:09 AM (4 years ago)
Author:
lowjoel
Message:

-Fixed r1091. By using properties the designer could not be used.
-Let the user decide whether he wants locked files to be closed when encountered. We won't create a new task for running on restart anymore.

Location:
trunk/eraser6
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/eraser6/Eraser.Manager/DirectExecutor.cs

    r1156 r1158  
    946946                catch (FileLoadException) 
    947947                { 
     948                    if (!ManagerLibrary.Settings.ForceUnlockLockedFiles) 
     949                        throw; 
     950 
    948951                    List<System.Diagnostics.Process> processes = new List<System.Diagnostics.Process>(); 
    949952                    foreach (OpenHandle handle in OpenHandle.Items) 

  • trunk/eraser6/Eraser.Manager/Settings.cs

    r1088 r1158  
    277277 
    278278        /// <summary> 
    279         /// Whether files which are locked when being erased can be scheduled for 
    280         /// erasure on system restart. 
    281         /// </summary> 
    282         public bool EraseLockedFilesOnRestart 
    283         { 
    284             get 
    285             { 
    286                 return settings["EraseLockedFilesOnRestart"] == null ? true : 
    287                     Convert.ToBoolean(settings["EraseLockedFilesOnRestart"], 
     279        /// Whether files which are locked when being erased should be forcibly 
     280        /// unlocked for erasure. 
     281        /// </summary> 
     282        public bool ForceUnlockLockedFiles 
     283        { 
     284            get 
     285            { 
     286                return settings["ForceUnlockLockedFiles"] == null ? true : 
     287                    Convert.ToBoolean(settings["ForceUnlockLockedFiles"], 
    288288                        CultureInfo.InvariantCulture); 
    289289            } 
    290290            set 
    291291            { 
    292                 settings["EraseLockedFilesOnRestart"] = value; 
    293             } 
    294         } 
    295  
    296         /// <summary> 
    297         /// Whether scheduling files for restart erase should get the blessing of 
    298         /// the user first. 
    299         /// </summary> 
    300         public bool ConfirmEraseOnRestart 
    301         { 
    302             get 
    303             { 
    304                 return settings["ConfirmEraseOnRestart"] == null ? 
    305                     true : Convert.ToBoolean(settings["ConfirmEraseOnRestart"], 
    306                         CultureInfo.InvariantCulture); 
    307             } 
    308             set 
    309             { 
    310                 settings["ConfirmEraseOnRestart"] = value; 
     292                settings["ForceUnlockLockedFiles"] = value; 
    311293            } 
    312294        } 

  • trunk/eraser6/Eraser.Manager/Task.cs

    r1157 r1158  
    402402            { 
    403403                //The system cannot open the file, try to force the file handle to close. 
     404                if (!ManagerLibrary.Settings.ForceUnlockLockedFiles) 
     405                    throw; 
     406 
    404407                foreach (OpenHandle handle in OpenHandle.Items) 
    405408                    if (handle.Path == file && handle.Close()) 

  • trunk/eraser6/Eraser.fxcop

    r1156 r1158  
    5656  <Settings /> 
    5757 </Rules> 
    58  <FxCopReport Version="1.36" LastAnalysis="2009-07-03 06:57:16Z"> 
     58 <FxCopReport Version="1.36" LastAnalysis="2009-07-03 10:46:36Z"> 
    5959  <Namespaces> 
    6060   <Namespace Name="Eraser.Unlocker"> 
    … …  
    313313            <Messages> 
    314314             <Message TypeName="DoNotCallOverridableMethodsInConstructors" Category="Microsoft.Usage" CheckId="CA2214" Created="2009-05-01 03:14:45Z"> 
    315               <Issue Path="D:\Development\Projects\Eraser\Eraser.Manager" File="DirectExecutor.cs" Line="1049"> 
     315              <Issue Path="D:\Development\Projects\Eraser\Eraser.Manager" File="DirectExecutor.cs" Line="1048"> 
    316316               <Item>'DirectExecutor.DirectExecutor()'</Item> 
    317317               <Item>&#xD;&#xA;&#xD;&#xA;DirectExecutor..ctor()&#xD;&#xA;Executor.set_TaskAdded(EventHandler&lt;TaskEventArgs&gt;):Void&#xD;&#xA;Executor.set_TaskDeleted(EventHandler&lt;TaskEventArgs&gt;):Void&#xD;&#xA;Executor.set_Tasks(ExecutorTasksCollection):Void</Item> 
    … …  
    323323            <Messages> 
    324324             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2009-05-01 03:14:45Z"> 
    325               <Issue Name="Parameter" Path="D:\Development\Projects\Eraser\Eraser.Manager" File="DirectExecutor.cs" Line="977"> 
     325              <Issue Name="Parameter" Path="D:\Development\Projects\Eraser\Eraser.Manager" File="DirectExecutor.cs" Line="976"> 
    326326               <Item>'target'</Item> 
    327327               <Item>'FolderTarget'</Item> 
    … …  
    412412              <Messages> 
    413413               <Message TypeName="DoNotRaiseExceptionsInUnexpectedLocations" Category="Microsoft.Design" CheckId="CA1065" Created="2009-07-03 06:55:12Z" FixCategory="Breaking"> 
    414                 <Issue Name="PropertyGetter" Level="Warning" Path="D:\Development\Projects\Eraser\Eraser.Manager" File="Task.cs" Line="294"> 
     414                <Issue Name="PropertyGetter" Level="Warning" Path="D:\Development\Projects\Eraser\Eraser.Manager" File="Task.cs" Line="296"> 
    415415                 <Item>'ErasureTarget.Method.get()'</Item> 
    416416                 <Item>'NotImplementedException'</Item> 
    … …  
    462462            <Messages> 
    463463             <Message Id="1#" TypeName="AvoidOutParameters" Category="Microsoft.Design" CheckId="CA1021" Created="2009-05-01 03:23:16Z"> 
    464               <Issue Path="D:\Development\Projects\Eraser\Eraser.Manager" File="Task.cs" Line="382"> 
     464              <Issue Path="D:\Development\Projects\Eraser\Eraser.Manager" File="Task.cs" Line="384"> 
    465465               <Item>'totalSize'</Item> 
    466466              </Issue> 
    … …  
    492492            <Messages> 
    493493             <Message TypeName="CollectionPropertiesShouldBeReadOnly" Category="Microsoft.Usage" CheckId="CA2227" Created="2009-05-01 03:14:45Z"> 
    494               <Issue Path="D:\Development\Projects\Eraser\Eraser.Manager" File="Settings.cs" Line="357"> 
     494              <Issue Path="D:\Development\Projects\Eraser\Eraser.Manager" File="Settings.cs" Line="339"> 
    495495               <Item>'ManagerSettings.PlausibleDeniabilityFiles'</Item> 
    496496              </Issue> 
    497497             </Message> 
    498498             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2009-05-01 03:14:45Z"> 
    499               <Issue Path="D:\Development\Projects\Eraser\Eraser.Manager" File="Settings.cs" Line="357"> 
     499              <Issue Path="D:\Development\Projects\Eraser\Eraser.Manager" File="Settings.cs" Line="339"> 
    500500               <Item>'List&lt;string&gt;'</Item> 
    501501               <Item>'ManagerSettings.PlausibleDeniabilityFiles'</Item> 
    … …  
    507507            <Messages> 
    508508             <Message TypeName="CollectionPropertiesShouldBeReadOnly" Category="Microsoft.Usage" CheckId="CA2227" Created="2009-05-01 03:14:45Z"> 
    509               <Issue Path="D:\Development\Projects\Eraser\Eraser.Manager" File="Settings.cs" Line="490"> 
     509              <Issue Path="D:\Development\Projects\Eraser\Eraser.Manager" File="Settings.cs" Line="472"> 
    510510               <Item>'ManagerSettings.PluginApprovals'</Item> 
    511511              </Issue> 
    … …  
    637637            </Messages> 
    638638           </Member> 
    639            <Member Name="#Items"> 
    640             <Messages> 
    641              <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2009-06-02 07:31:56Z"> 
    642               <Issue Path="d:\development\projects\eraser\eraser.unlocker" File="eraser.unlocker.cpp" Line="28"> 
    643                <Item>'List&lt;OpenHandle&gt;'</Item> 
    644                <Item>'OpenHandle.Items'</Item> 
    645               </Issue> 
    646              </Message> 
    647             </Messages> 
    648            </Member> 
    649639           <Member Name="#ResolveHandlePath(System.IntPtr,System.Int32)"> 
    650640            <Messages> 
    … …  
    741731              <Issue Path="D:\Development\Projects\Eraser\Eraser.DefaultPlugins" File="CustomMethodPassEditor.cs" Line="57"> 
    742732               <Item>'CustomMethodPassEditor.PassData'</Item> 
    743               </Issue> 
    744              </Message> 
    745             </Messages> 
    746            </Member> 
    747           </Members> 
    748          </Type> 
    749          <Type Name="FirstLast16KB"> 
    750           <Members> 
    751            <Member Name="#.ctor()"> 
    752             <Messages> 
    753              <Message TypeName="DoNotCallOverridableMethodsInConstructors" Category="Microsoft.Usage" CheckId="CA2214" Created="2009-04-28 13:43:02Z"> 
    754               <Issue Path="D:\Development\Projects\Eraser\Eraser.DefaultPlugins" File="EraseFirstLast16KB.cs" Line="36"> 
    755                <Item>'FirstLast16KB.FirstLast16KB()'</Item> 
    756                <Item>&#xD;&#xA;&#xD;&#xA;FirstLast16KB..ctor()&#xD;&#xA;ErasureMethod.get_Name():String</Item> 
    757733              </Issue> 
    758734             </Message> 

  • trunk/eraser6/Eraser/BasePanel.Designer.cs

    r1091 r1158  
    5151        { 
    5252            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BasePanel)); 
    53             this.TitleLabel = new System.Windows.Forms.Label(); 
    54             this.Content = new System.Windows.Forms.Panel(); 
    55             this.TitleIcon = new System.Windows.Forms.PictureBox(); 
    56             ((System.ComponentModel.ISupportInitialize)(this.TitleIcon)).BeginInit(); 
     53            this.titleLabel = new System.Windows.Forms.Label(); 
     54            this.content = new System.Windows.Forms.Panel(); 
     55            this.titleIcon = new System.Windows.Forms.PictureBox(); 
     56            ((System.ComponentModel.ISupportInitialize)(this.titleIcon)).BeginInit(); 
    5757            this.SuspendLayout(); 
    5858            //  
    5959            // titleLabel 
    6060            //  
    61             resources.ApplyResources(this.TitleLabel, "titleLabel"); 
    62             this.TitleLabel.Name = "titleLabel"; 
     61            resources.ApplyResources(this.titleLabel, "titleLabel"); 
     62            this.titleLabel.Name = "titleLabel"; 
    6363            //  
    6464            // content 
    6565            //  
    66             resources.ApplyResources(this.Content, "content"); 
    67             this.Content.Name = "content"; 
     66            resources.ApplyResources(this.content, "content"); 
     67            this.content.Name = "content"; 
    6868            //  
    6969            // titleIcon 
    7070            //  
    71             resources.ApplyResources(this.TitleIcon, "titleIcon"); 
    72             this.TitleIcon.Name = "titleIcon"; 
    73             this.TitleIcon.TabStop = false; 
     71            resources.ApplyResources(this.titleIcon, "titleIcon"); 
     72            this.titleIcon.Name = "titleIcon"; 
     73            this.titleIcon.TabStop = false; 
    7474            //  
    7575            // BasePanel 
    7676            //  
    7777            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 
    78             this.Controls.Add(this.Content); 
    79             this.Controls.Add(this.TitleIcon); 
    80             this.Controls.Add(this.TitleLabel); 
     78            this.Controls.Add(this.content); 
     79            this.Controls.Add(this.titleIcon); 
     80            this.Controls.Add(this.titleLabel); 
    8181            this.Name = "BasePanel"; 
    8282            resources.ApplyResources(this, "$this"); 
    83             ((System.ComponentModel.ISupportInitialize)(this.TitleIcon)).EndInit(); 
     83            ((System.ComponentModel.ISupportInitialize)(this.titleIcon)).EndInit(); 
    8484            this.ResumeLayout(false); 
    8585            this.PerformLayout(); 
    … …  
    8989        #endregion 
    9090 
    91         private System.Windows.Forms.Label titleLabel; 
    92         private System.Windows.Forms.PictureBox titleIcon; 
    93         private System.Windows.Forms.Panel content; 
    94  
     91        protected System.Windows.Forms.Label titleLabel; 
     92        protected System.Windows.Forms.PictureBox titleIcon; 
     93        protected System.Windows.Forms.Panel content; 
    9594    } 
    9695} 

  • trunk/eraser6/Eraser/BasePanel.cs

    r1091 r1158  
    3030namespace Eraser 
    3131{ 
    32     public partial class BasePanel : UserControl 
     32    internal partial class BasePanel : UserControl 
    3333    { 
    3434        public BasePanel() 
    … …  
    3737            titleLabel.Font = new Font(SystemFonts.MessageBoxFont.Name, 18f); 
    3838        } 
    39  
    40         /// <summary> 
    41         /// The content panel displaying controls for the current panel 
    42         /// </summary> 
    43         protected Panel Content 
    44         { 
    45             get { return content; } 
    46             set { content = value; } 
    47         } 
    48  
    49         /// <summary> 
    50         /// The title of the current panel 
    51         /// </summary> 
    52         protected Label TitleLabel 
    53         { 
    54             get { return titleLabel; } 
    55             set { titleLabel = value; } 
    56         } 
    57  
    58         /// <summary> 
    59         /// The icon representing the content of the current panel 
    60         /// </summary> 
    61         protected PictureBox TitleIcon 
    62         { 
    63             get { return titleIcon; } 
    64             set { titleIcon = value; } 
    65         } 
    6639    } 
    6740} 

  • trunk/eraser6/Eraser/SchedulerPanel.Designer.cs

    r1091 r1158  
    6767            this.schedulerDefaultMenu = new System.Windows.Forms.ContextMenuStrip(this.components); 
    6868            this.newTaskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    69             ((System.ComponentModel.ISupportInitialize)(this.TitleIcon)).BeginInit(); 
    70             this.Content.SuspendLayout(); 
     69            ((System.ComponentModel.ISupportInitialize)(this.titleIcon)).BeginInit(); 
     70            this.content.SuspendLayout(); 
    7171            this.schedulerMenu.SuspendLayout(); 
    7272            this.schedulerDefaultMenu.SuspendLayout(); 
    … …  
    7575            // titleLabel 
    7676            //  
    77             resources.ApplyResources(this.TitleLabel, "titleLabel"); 
     77            resources.ApplyResources(this.titleLabel, "titleLabel"); 
    7878            //  
    7979            // titleIcon 
    8080            //  
    81             this.TitleIcon.Image = global::Eraser.Properties.Resources.ToolbarSchedule; 
     81            this.titleIcon.Image = global::Eraser.Properties.Resources.ToolbarSchedule; 
    8282            //  
    8383            // content 
    8484            //  
    85             this.Content.Controls.Add(this.schedulerProgress); 
    86             this.Content.Controls.Add(this.scheduler); 
     85            this.content.Controls.Add(this.schedulerProgress); 
     86            this.content.Controls.Add(this.scheduler); 
    8787            //  
    8888            // scheduler 
    … …  
    202202            this.DoubleBuffered = true; 
    203203            this.Name = "SchedulerPanel"; 
    204             this.Controls.SetChildIndex(this.TitleLabel, 0); 
    205             this.Controls.SetChildIndex(this.TitleIcon, 0); 
    206             this.Controls.SetChildIndex(this.Content, 0); 
    207             ((System.ComponentModel.ISupportInitialize)(this.TitleIcon)).EndInit(); 
    208             this.Content.ResumeLayout(false); 
     204            this.Controls.SetChildIndex(this.titleLabel, 0); 
     205            this.Controls.SetChildIndex(this.titleIcon, 0); 
     206            this.Controls.SetChildIndex(this.content, 0); 
     207            ((System.ComponentModel.ISupportInitialize)(this.titleIcon)).EndInit(); 
     208            this.content.ResumeLayout(false); 
    209209            this.schedulerMenu.ResumeLayout(false); 
    210210            this.schedulerDefaultMenu.ResumeLayout(false); 

  • trunk/eraser6/Eraser/SchedulerPanel.cs

    r1102 r1158  
    3838namespace Eraser 
    3939{ 
    40     public partial class SchedulerPanel : Eraser.BasePanel 
     40    internal partial class SchedulerPanel : Eraser.BasePanel 
    4141    { 
    4242        public SchedulerPanel() 

  • trunk/eraser6/Eraser/SettingsPanel.Designer.cs

    r1091 r1158  
    2323namespace Eraser 
    2424{ 
    25     partial class SettingsPanel : Eraser.BasePanel 
     25    partial class SettingsPanel 
    2626    { 
    2727        /// <summary> 
    … …  
    5555            this.ui = new Eraser.LightGroup(); 
    5656            this.uiContextMenu = new System.Windows.Forms.CheckBox(); 
    57             this.lockedAllow = new System.Windows.Forms.CheckBox(); 
    58             this.lockedConfirm = new System.Windows.Forms.CheckBox(); 
     57            this.lockedForceUnlock = new System.Windows.Forms.CheckBox(); 
    5958            this.erase = new Eraser.LightGroup(); 
    6059            this.eraseFilesMethodLbl = new System.Windows.Forms.Label(); 
    … …  
    8988            this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); 
    9089            this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); 
    91             ((System.ComponentModel.ISupportInitialize)(this.TitleIcon)).BeginInit(); 
    92             this.Content.SuspendLayout(); 
     90            ((System.ComponentModel.ISupportInitialize)(this.titleIcon)).BeginInit(); 
     91            this.content.SuspendLayout(); 
    9392            this.pluginsMenu.SuspendLayout(); 
    9493            ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 
    9594            this.SuspendLayout(); 
    9695            //  
    97             // titleLbl 
    98             //  
    99             this.errorProvider.SetIconAlignment(base.TitleLabel, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("titleLbl.IconAlignment")))); 
    100             resources.ApplyResources(base.TitleLabel, "titleLbl"); 
     96            // titleLabel 
     97            //  
     98            this.errorProvider.SetIconAlignment(this.titleLabel, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("titleLabel.IconAlignment")))); 
     99            resources.ApplyResources(this.titleLabel, "titleLabel"); 
    101100            //  
    102101            // titleIcon 
    103102            //  
    104             this.errorProvider.SetIconAlignment(this.TitleIcon, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("titleIcon.IconAlignment")))); 
    105             this.TitleIcon.Image = global::Eraser.Properties.Resources.ToolbarSettings; 
     103            this.errorProvider.SetIconAlignment(this.titleIcon, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("titleIcon.IconAlignment")))); 
     104            this.titleIcon.Image = global::Eraser.Properties.Resources.ToolbarSettings; 
    106105            //  
    107106            // content 
    108107            //  
    109             this.Content.Controls.Add(this.schedulerClearCompleted); 
    110             this.Content.Controls.Add(this.plausibleDeniabilityFilesAddFolder); 
    111             this.Content.Controls.Add(this.plausibleDeniabilityFilesRemove); 
    112             this.Content.Controls.Add(this.plausibleDeniabilityFilesAddFile); 
    113             this.Content.Controls.Add(this.plausibleDeniabilityFiles); 
    114             this.Content.Controls.Add(this.uiLanguage); 
    115             this.Content.Controls.Add(this.uiLanguageLbl); 
    116             this.Content.Controls.Add(this.plausibleDeniability); 
    117             this.Content.Controls.Add(this.erasePRNG); 
    118             this.Content.Controls.Add(this.erasePRNGLbl); 
    119             this.Content.Controls.Add(this.schedulerMissedIgnore); 
    120             this.Content.Controls.Add(this.schedulerMissedImmediate); 
    121             this.Content.Controls.Add(this.schedulerMissed); 
    122             this.Content.Controls.Add(this.scheduler); 
    123             this.Content.Controls.Add(this.pluginsManager); 
    124             this.Content.Controls.Add(this.plugins); 
    125             this.Content.Controls.Add(this.eraseUnusedMethod); 
    126             this.Content.Controls.Add(this.eraseFilesMethod); 
    127             this.Content.Controls.Add(this.eraseUnusedMethodLbl); 
    128             this.Content.Controls.Add(this.eraseFilesMethodLbl); 
    129             this.Content.Controls.Add(this.erase); 
    130             this.Content.Controls.Add(this.lockedConfirm); 
    131             this.Content.Controls.Add(this.lockedAllow); 
    132             this.Content.Controls.Add(this.uiContextMenu); 
    133             this.Content.Controls.Add(this.ui); 
    134             this.errorProvider.SetIconAlignment(this.Content, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("content.IconAlignment")))); 
    135             resources.ApplyResources(this.Content, "content"); 
     108            this.content.Controls.Add(this.schedulerClearCompleted); 
     109            this.content.Controls.Add(this.plausibleDeniabilityFilesAddFolder); 
     110            this.content.Controls.Add(this.plausibleDeniabilityFilesRemove); 
     111            this.content.Controls.Add(this.plausibleDeniabilityFilesAddFile); 
     112            this.content.Controls.Add(this.plausibleDeniabilityFiles); 
     113            this.content.Controls.Add(this.uiLanguage); 
     114            this.content.Controls.Add(this.uiLanguageLbl); 
     115            this.content.Controls.Add(this.plausibleDeniability); 
     116            this.content.Controls.Add(this.erasePRNG); 
     117            this.content.Controls.Add(this.erasePRNGLbl); 
     118            this.content.Controls.Add(this.schedulerMissedIgnore); 
     119            this.content.Controls.Add(this.schedulerMissedImmediate); 
     120            this.content.Controls.Add(this.schedulerMissed); 
     121            this.content.Controls.Add(this.scheduler); 
     122            this.content.Controls.Add(this.pluginsManager); 
     123            this.content.Controls.Add(this.plugins); 
     124            this.content.Controls.Add(this.eraseUnusedMethod); 
     125            this.content.Controls.Add(this.eraseFilesMethod); 
     126            this.content.Controls.Add(this.eraseUnusedMethodLbl); 
     127            this.content.Controls.Add(this.eraseFilesMethodLbl); 
     128            this.content.Controls.Add(this.erase); 
     129            this.content.Controls.Add(this.lockedForceUnlock); 
     130            this.content.Controls.Add(this.uiContextMenu); 
     131            this.content.Controls.Add(this.ui); 
     132            this.errorProvider.SetIconAlignment(this.content, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("content.IconAlignment")))); 
     133            resources.ApplyResources(this.content, "content"); 
    136134            //  
    137135            // ui 
    … …  
    150148            this.uiContextMenu.UseVisualStyleBackColor = true; 
    151149            //  
    152             // lockedAllow 
    153             //  
    154             resources.ApplyResources(this.lockedAllow, "lockedAllow"); 
    155             this.lockedAllow.Checked = true; 
    156             this.lockedAllow.CheckState = System.Windows.Forms.CheckState.Checked; 
    157             this.errorProvider.SetIconAlignment(this.lockedAllow, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lockedAllow.IconAlignment")))); 
    158             this.lockedAllow.Name = "lockedAllow"; 
    159             this.lockedAllow.UseVisualStyleBackColor = true; 
    160             this.lockedAllow.CheckedChanged += new System.EventHandler(this.lockedAllow_CheckedChanged); 
    161             //  
    162             // lockedConfirm 
    163             //  
    164             resources.ApplyResources(this.lockedConfirm, "lockedConfirm"); 
    165             this.errorProvider.SetIconAlignment(this.lockedConfirm, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lockedConfirm.IconAlignment")))); 
    166             this.lockedConfirm.Name = "lockedConfirm"; 
    167             this.lockedConfirm.UseVisualStyleBackColor = true; 
     150            // lockedForceUnlock 
     151            //  
     152            resources.ApplyResources(this.lockedForceUnlock, "lockedForceUnlock"); 
     153            this.lockedForceUnlock.Checked = true; 
     154            this.lockedForceUnlock.CheckState = System.Windows.Forms.CheckState.Checked; 
     155            this.errorProvider.SetIconAlignment(this.lockedForceUnlock, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("lockedForceUnlock.IconAlignment")))); 
     156            this.lockedForceUnlock.Name = "lockedForceUnlock"; 
     157            this.lockedForceUnlock.UseVisualStyleBackColor = true; 
    168158            //  
    169159            // erase 
    … …  
    391381            resources.ApplyResources(this, "$this"); 
    392382            this.Controls.SetChildIndex(this.saveSettings, 0); 
    393             this.Controls.SetChildIndex(this.TitleLabel, 0); 
    394             this.Controls.SetChildIndex(this.TitleIcon, 0); 
    395             this.Controls.SetChildIndex(this.Content, 0); 
    396             ((System.ComponentModel.ISupportInitialize)(this.TitleIcon)).EndInit(); 
    397             this.Content.ResumeLayout(false); 
    398             this.Content.PerformLayout(); 
     383            this.Controls.SetChildIndex(this.titleLabel, 0); 
     384            this.Controls.SetChildIndex(this.titleIcon, 0); 
     385            this.Controls.SetChildIndex(this.content, 0); 
     386            ((System.ComponentModel.ISupportInitialize)(this.titleIcon)).EndInit(); 
     387            this.content.ResumeLayout(false); 
     388            this.content.PerformLayout(); 
    399389            this.pluginsMenu.ResumeLayout(false); 
    400390            ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); 
    … …  
    406396        #endregion 
    407397 
    408         private System.Windows.Forms.CheckBox lockedConfirm; 
    409         private System.Windows.Forms.CheckBox lockedAllow; 
     398        private System.Windows.Forms.CheckBox lockedForceUnlock; 
    410399        private System.Windows.Forms.CheckBox uiContextMenu; 
    411400        private LightGroup ui; 

  • trunk/eraser6/Eraser/SettingsPanel.cs

    r1101 r1158  
    3838namespace Eraser 
    3939{ 
    40     public partial class SettingsPanel 
     40    internal partial class SettingsPanel : BasePanel 
    4141    { 
    4242        public SettingsPanel() 
    … …  
    179179 
    180180            uiContextMenu.Checked = settings.IntegrateWithShell; 
    181             lockedAllow.Checked = 
    182                 ManagerLibrary.Settings.EraseLockedFilesOnRestart; 
    183             lockedConfirm.Checked = 
    184                 ManagerLibrary.Settings.ConfirmEraseOnRestart; 
    185             lockedAllow_CheckedChanged(lockedAllow, new EventArgs()); 
     181            lockedForceUnlock.Checked = 
     182                ManagerLibrary.Settings.ForceUnlockLockedFiles; 
    186183            schedulerMissedImmediate.Checked = 
    187184                ManagerLibrary.Settings.ExecuteMissedTasksImmediately; 
    … …  
    250247        } 
    251248 
    252         private void lockedAllow_CheckedChanged(object sender, EventArgs e) 
    253         { 
    254             lockedConfirm.Enabled = lockedAllow.Checked; 
    255         } 
    256  
    257249        private void plausableDeniabilityFilesRemoveUpdate() 
    258250        { 
    … …  
    349341 
    350342            //Save the settings that don't fail first. 
    351             managerSettings.EraseLockedFilesOnRestart = lockedAllow.Checked; 
    352             managerSettings.ConfirmEraseOnRestart = lockedConfirm.Checked; 
     343            managerSettings.ForceUnlockLockedFiles = lockedForceUnlock.Checked; 
    353344            managerSettings.ExecuteMissedTasksImmediately = schedulerMissedImmediate.Checked; 
    354345            settings.ClearCompletedTasks = schedulerClearCompleted.Checked; 

  • trunk/eraser6/Eraser/SettingsPanel.resx

    r858 r1158  
    221221  </data> 
    222222  <data name="&gt;&gt;$this.Type" xml:space="preserve"> 
    223     <value>Eraser.BasePanel, Eraser, Version=6.0.3.847, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
     223    <value>Eraser.BasePanel, Eraser, Version=6.0.5.1157, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
    224224  </data> 
    225225  <data name="titleIcon.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
    … …  
    242242  </data> 
    243243  <data name="schedulerClearCompleted.Location" type="System.Drawing.Point, System.Drawing"> 
    244     <value>20, 451</value> 
     244    <value>20, 427</value> 
    245245  </data> 
    246246  <data name="schedulerClearCompleted.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    272272  </data> 
    273273  <data name="plausibleDeniabilityFilesAddFolder.Location" type="System.Drawing.Point, System.Drawing"> 
    274     <value>543, 236</value> 
     274    <value>543, 212</value> 
    275275  </data> 
    276276  <data name="plausibleDeniabilityFilesAddFolder.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    302302  </data> 
    303303  <data name="plausibleDeniabilityFilesRemove.Location" type="System.Drawing.Point, System.Drawing"> 
    304     <value>634, 236</value> 
     304    <value>634, 212</value> 
    305305  </data> 
    306306  <data name="plausibleDeniabilityFilesRemove.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    332332  </data> 
    333333  <data name="plausibleDeniabilityFilesAddFile.Location" type="System.Drawing.Point, System.Drawing"> 
    334     <value>462, 236</value> 
     334    <value>462, 212</value> 
    335335  </data> 
    336336  <data name="plausibleDeniabilityFilesAddFile.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    362362  </data> 
    363363  <data name="plausibleDeniabilityFiles.Location" type="System.Drawing.Point, System.Drawing"> 
    364     <value>36, 263</value> 
     364    <value>36, 239</value> 
    365365  </data> 
    366366  <data name="plausibleDeniabilityFiles.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    443443  </data> 
    444444  <data name="plausibleDeniability.Location" type="System.Drawing.Point, System.Drawing"> 
    445     <value>20, 240</value> 
     445    <value>20, 216</value> 
    446446  </data> 
    447447  <data name="plausibleDeniability.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    527527  </data> 
    528528  <data name="schedulerMissedIgnore.Location" type="System.Drawing.Point, System.Drawing"> 
    529     <value>36, 511</value> 
     529    <value>36, 487</value> 
    530530  </data> 
    531531  <data name="schedulerMissedIgnore.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    557557  </data> 
    558558  <data name="schedulerMissedImmediate.Location" type="System.Drawing.Point, System.Drawing"> 
    559     <value>36, 491</value> 
     559    <value>36, 467</value> 
    560560  </data> 
    561561  <data name="schedulerMissedImmediate.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    587587  </data> 
    588588  <data name="schedulerMissed.Location" type="System.Drawing.Point, System.Drawing"> 
    589     <value>17, 475</value> 
     589    <value>17, 451</value> 
    590590  </data> 
    591591  <data name="schedulerMissed.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    623623  </data> 
    624624  <data name="scheduler.Location" type="System.Drawing.Point, System.Drawing"> 
    625     <value>0, 413</value> 
     625    <value>0, 389</value> 
    626626  </data> 
    627627  <data name="scheduler.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> 
    … …  
    638638  </data> 
    639639  <data name="&gt;&gt;scheduler.Type" xml:space="preserve"> 
    640     <value>Eraser.LightGroup, Eraser, Version=6.0.3.847, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
     640    <value>Eraser.LightGroup, Eraser, Version=6.0.5.1157, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
    641641  </data> 
    642642  <data name="&gt;&gt;scheduler.Parent" xml:space="preserve"> 
    … …  
    678678  <data name="pluginsMenu.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
    679679    <value>TopLeft</value> 
    680   </data> 
    681   <data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
    682     <value>125, 22</value> 
    683   </data> 
    684   <data name="settingsToolStripMenuItem.Text" xml:space="preserve"> 
    685     <value>Settings...</value> 
    686680  </data> 
    687681  <data name="pluginsMenu.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    718712  </data> 
    719713  <data name="pluginsManager.Location" type="System.Drawing.Point, System.Drawing"> 
    720     <value>20, 572</value> 
     714    <value>20, 548</value> 
    721715  </data> 
    722716  <data name="pluginsManager.Size" type="System.Drawing.Size, System.Drawing"> 
    … …  
    730724        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w 
    731725        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 
    732         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA 
    733         AwAAAk1TRnQBSQFMAwEBAAEEAQABBAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA 
    734         ARADAAEBAQABIAYAARAuAAM/AW0BLQFKAXkB/wM6AWL0AAEiAXkBxwH/AUMBzQH8Af8BNQFaAYcB//QA 
    735         ASIBeQHHAf8BPAGgAdIB/wNEAXn0AAEiAXkBxwH/AUUB0QH8Af8BNQFaAYcB//QAASIBeQHHAf8BPgGh 
    736         AdEB/wNEAXn0AAEiAXkBxwH/AU8B4gH9Af8BNgFWAYAB//QAASIBeQHHAf8BVgHXAfwB/wE2AVYBgAH/ 
    737         8AADLQFGASIBeQHHAf8BbAHeAfwB/wE2AVYBgAH/AyQBNegAAzUBVgEvAYcBxwH/AVkBwAHwAf8BTgHL 
    738         Af4B/wFPAbMB3QH/AToBSwFkAf8DKgFB4AADMQFNAS8BhwHIAf8BUAG6AfcB/wFSAcIB+QH/AUgBtwH5 
    739         Af8BZgHWAfsB/wFDAaYB6AH/AToBSgFiAf8DJAE23AABVAFoAXsB4QFSAcEB+QH/AU4BtwH5Af8BkwHu 
    740         Af4B/wGPAewB/gH/AVABtAHzAf8BjQHjAf4B/wFNAboB4gH/AVcBWwFhAdrcAAE4AXsBsQH8AVcBxgH5 
    741         Af8BZwGKAawB/wFnAYoBrAH/AWcBigGsAf8BZwGKAawB/wFnAYoBrAH/AWAB1QH6Af8BNgFHAWYB/NwA 
    742         AVMBbQGCAecBWgHSAfoB/wFIAWIBhAH/DAABSwGQAcEB/wFRAbsB4QH/AVQBVwFfAd/cAAJMAU0BkgFE 
    743         AZ0B0AH/AXgB4wH6Af8BSAGFAZ4B/wFPAWIBhwH/AU8BdAGcAf8BWwF8AYoB4QFGAYwBqgH/A0gBhdwA 
    744         AxIBGAFTAlYBrAFEAZoBzQH/AWwB1QH1Af8BbwHpAf4B/wFrAdQB8wH/AUgBkgGyAf8BTwJRAZwDFwEg 
    745         4AADEgEYA0cBggFXAV4BYQHHAUMBhgGnAfsBVwFmAXUB2wNHAYIDFwEg0AABQgFNAT4HAAE+AwABKAMA 
    746         AUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAf4BPwYAAf4BPwYAAf4BPwYAAf4BPwYAAf4BPwYAAf4BPwYA 
    747         Af4BPwYAAfwBHwYAAfgBDwYAAfABBwYAAfABBwYAAfABBwYAAfEBxwYAAfABBwYAAfABBwYAAfgBDwYA 
    748         Cw== 
     726        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB8 
     727        AwAAAk1TRnQBSQFMAwEBAAEUAQABFAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA 
     728        ARADAAEBAQABIAYAARAuAAM/AW0BKwFIAXcB/wM6AWL0AAEgAXcBxwH/AUEBzQH8Af8BMwFYAYcB//QA 
     729        ASABdwHHAf8BOgGgAdIB/wNEAXn0AAEgAXcBxwH/AUMB0QH8Af8BMwFYAYcB//QAASABdwHHAf8BPAGh 
     730        AdEB/wNEAXn0AAEgAXcBxwH/AU0B4gH9Af8BNAFUAYAB//QAASABdwHHAf8BVAHXAfwB/wE0AVQBgAH/ 
     731        8AADLQFGASABdwHHAf8BagHeAfwB/wE0AVQBgAH/AyQBNegAAzUBVgEtAYcBxwH/AVcBwAHwAf8BTAHL 
     732        Af4B/wFNAbMB3QH/ATgBSQFiAf8DKgFB4AADMQFNAS0BhwHIAf8BTgG6AfcB/wFQAcIB+QH/AUYBtwH5 
     733        Af8BZAHWAfsB/wFBAaYB6AH/ATgBSAFgAf8DJAE23AABWAFkAXEB4QFQAcEB+QH/AUwBtwH5Af8BkwHu 
     734        Af4B/wGPAewB/gH/AU4BtAHzAf8BjQHjAf4B/wFLAboB4gH/AVoBXQFhAdrcAAE2AXkBrQH8AVUBxgH5 
     735        Af8BZQGKAawB/wFlAYoBrAH/AWUBigGsAf8BZQGKAawB/wFlAYoBrAH/AV4B1QH6Af8BNAFDAWQB/NwA 
     736        AVUBaQF4AecBWAHSAfoB/wFGAWABhAH/DAABSQGQAcEB/wFPAbsB4QH/AlcBXQHf3AADTAGSAUIBnQHQ 
     737        Af8BdgHjAfoB/wFGAYUBngH/AU0BYAGHAf8BTQFyAZwB/wFbAXEBewHhAUQBjAGqAf8DSAGF3AADEgEY 
     738        AVMCVAGsAUIBmgHNAf8BagHVAfUB/wFtAekB/gH/AWkB1AHzAf8BRgGSAbIB/wFPAlEBnAMXASDgAAMS 
     739        ARgDRwGCAVkBWwFcAccBQwGEAZ8B+wFaAWMBagHbA0cBggMXASDQAAFCAU0BPgcAAT4DAAEoAwABQAMA 
     740        ARADAAEBAQABAQUAAYAXAAP/AQAB/gE/BgAB/gE/BgAB/gE/BgAB/gE/BgAB/gE/BgAB/gE/BgAB/gE/ 
     741        BgAB/AEfBgAB+AEPBgAB8AEHBgAB8AEHBgAB8AEHBgAB8QHHBgAB8AEHBgAB8AEHBgAB+AEPBgAL 
    749742</value> 
    750743  </data> 
    … …  
    777770  </data> 
    778771  <data name="plugins.Location" type="System.Drawing.Point, System.Drawing"> 
    779     <value>0, 534</value> 
     772    <value>0, 510</value> 
    780773  </data> 
    781774  <data name="plugins.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> 
    … …  
    792785  </data> 
    793786  <data name="&gt;&gt;plugins.Type" xml:space="preserve"> 
    794     <value>Eraser.LightGroup, Eraser, Version=6.0.3.847, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
     787    <value>Eraser.LightGroup, Eraser, Version=6.0.5.1157, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
    795788  </data> 
    796789  <data name="&gt;&gt;plugins.Parent" xml:space="preserve"> 
    … …  
    936929  </data> 
    937930  <data name="&gt;&gt;erase.Type" xml:space="preserve"> 
    938     <value>Eraser.LightGroup, Eraser, Version=6.0.3.847, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
     931    <value>Eraser.LightGroup, Eraser, Version=6.0.5.1157, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
    939932  </data> 
    940933  <data name="&gt;&gt;erase.Parent" xml:space="preserve"> 
    … …  
    944937    <value>20</value> 
    945938  </data> 
    946   <data name="lockedConfirm.AutoSize" type="System.Boolean, mscorlib"> 
    947     <value>True</value> 
    948   </data> 
    949   <data name="lockedConfirm.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
    950     <value>TopLeft</value> 
    951   </data> 
    952   <data name="lockedConfirm.Location" type="System.Drawing.Point, System.Drawing"> 
    953     <value>36, 216</value> 
    954   </data> 
    955   <data name="lockedConfirm.Size" type="System.Drawing.Size, System.Drawing"> 
    956     <value>182, 17</value> 
    957   </data> 
    958   <data name="lockedConfirm.TabIndex" type="System.Int32, mscorlib"> 
    959     <value>16</value> 
    960   </data> 
    961   <data name="lockedConfirm.Text" xml:space="preserve"> 
    962     <value>Confirm with user before doing so</value> 
    963   </data> 
    964   <data name="&gt;&gt;lockedConfirm.Name" xml:space="preserve"> 
    965     <value>lockedConfirm</value> 
    966   </data> 
    967   <data name="&gt;&gt;lockedConfirm.Type" xml:space="preserve"> 
     939  <data name="lockedForceUnlock.AutoSize" type="System.Boolean, mscorlib"> 
     940    <value>True</value> 
     941  </data> 
     942  <data name="lockedForceUnlock.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
     943    <value>TopLeft</value> 
     944  </data> 
     945  <data name="lockedForceUnlock.Location" type="System.Drawing.Point, System.Drawing"> 
     946    <value>20, 193</value> 
     947  </data> 
     948  <data name="lockedForceUnlock.Size" type="System.Drawing.Size, System.Drawing"> 
     949    <value>236, 17</value> 
     950  </data> 
     951  <data name="lockedForceUnlock.TabIndex" type="System.Int32, mscorlib"> 
     952    <value>15</value> 
     953  </data> 
     954  <data name="lockedForceUnlock.Text" xml:space="preserve"> 
     955    <value>Force locked files to be unlocked for erasure</value> 
     956  </data> 
     957  <data name="&gt;&gt;lockedForceUnlock.Name" xml:space="preserve"> 
     958    <value>lockedForceUnlock</value> 
     959  </data> 
     960  <data name="&gt;&gt;lockedForceUnlock.Type" xml:space="preserve"> 
    968961    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    969962  </data> 
    970   <data name="&gt;&gt;lockedConfirm.Parent" xml:space="preserve"> 
    971     <value>content</value> 
    972   </data> 
    973   <data name="&gt;&gt;lockedConfirm.ZOrder" xml:space="preserve"> 
     963  <data name="&gt;&gt;lockedForceUnlock.Parent" xml:space="preserve"> 
     964    <value>content</value> 
     965  </data> 
     966  <data name="&gt;&gt;lockedForceUnlock.ZOrder" xml:space="preserve"> 
    974967    <value>21</value> 
    975   </data> 
    976   <data name="lockedAllow.AutoSize" type="System.Boolean, mscorlib"> 
    977     <value>True</value> 
    978   </data> 
    979   <data name="lockedAllow.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
    980     <value>TopLeft</value> 
    981   </data> 
    982   <data name="lockedAllow.Location" type="System.Drawing.Point, System.Drawing"> 
    983     <value>20, 193</value> 
    984   </data> 
    985   <data name="lockedAllow.Size" type="System.Drawing.Size, System.Drawing"> 
    986     <value>251, 17</value> 
    987   </data> 
    988   <data name="lockedAllow.TabIndex" type="System.Int32, mscorlib"> 
    989     <value>15</value> 
    990   </data> 
    991   <data name="lockedAllow.Text" xml:space="preserve"> 
    992     <value>Allow locked files to be erased on system restart</value> 
    993   </data> 
    994   <data name="&gt;&gt;lockedAllow.Name" xml:space="preserve"> 
    995     <value>lockedAllow</value> 
    996   </data> 
    997   <data name="&gt;&gt;lockedAllow.Type" xml:space="preserve"> 
    998     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    999   </data> 
    1000   <data name="&gt;&gt;lockedAllow.Parent" xml:space="preserve"> 
    1001     <value>content</value> 
    1002   </data> 
    1003   <data name="&gt;&gt;lockedAllow.ZOrder" xml:space="preserve"> 
    1004     <value>22</value> 
    1005968  </data> 
    1006969  <data name="uiContextMenu.AutoSize" type="System.Boolean, mscorlib"> 
    … …  
    1032995  </data> 
    1033996  <data name="&gt;&gt;uiContextMenu.ZOrder" xml:space="preserve"> 
    1034     <value>23</value> 
     997    <value>22</value> 
    1035998  </data> 
    1036999  <data name="ui.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> 
    … …  
    10621025  </data> 
    10631026  <data name="&gt;&gt;ui.Type" xml:space="preserve"> 
    1064     <value>Eraser.LightGroup, Eraser, Version=6.0.3.847, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
     1027    <value>Eraser.LightGroup, Eraser, Version=6.0.5.1157, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
    10651028  </data> 
    10661029  <data name="&gt;&gt;ui.Parent" xml:space="preserve"> 
    … …  
    10681031  </data> 
    10691032  <data name="&gt;&gt;ui.ZOrder" xml:space="preserve"> 
    1070     <value>24</value> 
     1033    <value>23</value> 
    10711034  </data> 
    10721035  <data name="content.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
    … …  
    10741037  </data> 
    10751038  <data name="content.Size" type="System.Drawing.Size, System.Drawing"> 
    1076     <value>712, 810</value> 
     1039    <value>712, 786</value> 
    10771040  </data> 
    10781041  <data name="&gt;&gt;content.Name" xml:space="preserve"> 
    … …  
    10881051    <value>0</value> 
    10891052  </data> 
    1090   <data name="titleLbl.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
    1091     <value>TopLeft</value> 
    1092   </data> 
    1093   <data name="titleLbl.Size" type="System.Drawing.Size, System.Drawing"> 
     1053  <data name="titleLabel.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
     1054    <value>TopLeft</value> 
     1055  </data> 
     1056  <data name="titleLabel.Size" type="System.Drawing.Size, System.Drawing"> 
    10941057    <value>101, 32</value> 
    10951058  </data> 
    1096   <data name="titleLbl.Text" xml:space="preserve"> 
     1059  <data name="titleLabel.Text" xml:space="preserve"> 
    10971060    <value>Settings</value> 
    10981061  </data> 
    1099   <data name="&gt;&gt;titleLbl.Name" xml:space="preserve"> 
    1100     <value>titleLbl</value> 
    1101   </data> 
    1102   <data name="&gt;&gt;titleLbl.Type" xml:space="preserve"> 
     1062  <data name="&gt;&gt;titleLabel.Name" xml:space="preserve"> 
     1063    <value>titleLabel</value> 
     1064  </data> 
     1065  <data name="&gt;&gt;titleLabel.Type" xml:space="preserve"> 
    11031066    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    11041067  </data> 
    1105   <data name="&gt;&gt;titleLbl.Parent" xml:space="preserve"> 
     1068  <data name="&gt;&gt;titleLabel.Parent" xml:space="preserve"> 
    11061069    <value>$this</value> 
    11071070  </data> 
    1108   <data name="&gt;&gt;titleLbl.ZOrder" xml:space="preserve"> 
     1071  <data name="&gt;&gt;titleLabel.ZOrder" xml:space="preserve"> 
    11091072    <value>2</value> 
     1073  </data> 
     1074  <data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> 
     1075    <value>125, 22</value> 
     1076  </data> 
     1077  <data name="settingsToolStripMenuItem.Text" xml:space="preserve"> 
     1078    <value>Settings...</value> 
    11101079  </data> 
    11111080  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
Note: See TracChangeset for help on using the changeset viewer.