Changeset 1017


Ignore:
Timestamp:
05/08/09 10:02:04 (4 years ago)
Author:
lowjoel
Message:

Fixed the padding/margin values in the toolbar such that it looks more organised. Padding now defaults to 0 and margin between items are 10px.

Location:
branches/eraser6/Eraser
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eraser6/Eraser/MainForm.Designer.cs

    r1011 r1017  
    6767            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); 
    6868            this.exportTaskListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
     69            this.importTaskListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    6970            this.tbSettings = new System.Windows.Forms.ToolStripMenuItem(); 
    7071            this.tbHelp = new System.Windows.Forms.ToolStripMenuItem(); 
    … …  
    7475            this.aboutEraserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    7576            this.checkForUpdatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    76             this.importTaskListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    7777            this.notificationMenu.SuspendLayout(); 
    7878            this.ToolBar.SuspendLayout(); 
    … …  
    9191            this.tbSchedule.Image = global::Eraser.Properties.Resources.ToolbarSchedule; 
    9292            this.tbSchedule.Name = "tbSchedule"; 
    93             this.tbSchedule.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); 
     93            this.tbSchedule.Padding = new System.Windows.Forms.Padding(0); 
    9494            resources.ApplyResources(this.tbSchedule, "tbSchedule"); 
    9595            this.tbSchedule.Click += new System.EventHandler(this.tbSchedule_Click); 
    … …  
    158158            this.tbScheduleDropDown.Image = global::Eraser.Properties.Resources.ToolbarArrow; 
    159159            resources.ApplyResources(this.tbScheduleDropDown, "tbScheduleDropDown"); 
     160            this.tbScheduleDropDown.Margin = new System.Windows.Forms.Padding(0, 0, 10, 0); 
    160161            this.tbScheduleDropDown.Name = "tbScheduleDropDown"; 
    161162            this.tbScheduleDropDown.Padding = new System.Windows.Forms.Padding(0); 
    … …  
    189190            this.exportTaskListToolStripMenuItem.Click += new System.EventHandler(this.exportTaskListToolStripMenuItem_Click); 
    190191            //  
     192            // importTaskListToolStripMenuItem 
     193            //  
     194            this.importTaskListToolStripMenuItem.Name = "importTaskListToolStripMenuItem"; 
     195            resources.ApplyResources(this.importTaskListToolStripMenuItem, "importTaskListToolStripMenuItem"); 
     196            this.importTaskListToolStripMenuItem.Click += new System.EventHandler(this.importTaskListToolStripMenuItem_Click); 
     197            //  
    191198            // tbSettings 
    192199            //  
    193200            this.tbSettings.Image = global::Eraser.Properties.Resources.ToolbarSettings; 
     201            this.tbSettings.Margin = new System.Windows.Forms.Padding(0, 0, 10, 0); 
    194202            this.tbSettings.Name = "tbSettings"; 
     203            this.tbSettings.Padding = new System.Windows.Forms.Padding(0); 
    195204            resources.ApplyResources(this.tbSettings, "tbSettings"); 
    196205            this.tbSettings.Click += new System.EventHandler(this.tbSettings_Click); 
    … …  
    200209            this.tbHelp.Image = global::Eraser.Properties.Resources.ToolbarHelp; 
    201210            this.tbHelp.Name = "tbHelp"; 
    202             this.tbHelp.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); 
     211            this.tbHelp.Padding = new System.Windows.Forms.Padding(0); 
    203212            resources.ApplyResources(this.tbHelp, "tbHelp"); 
    204213            //  
    … …  
    210219            resources.ApplyResources(this.tbHelpDropDown, "tbHelpDropDown"); 
    211220            this.tbHelpDropDown.Name = "tbHelpDropDown"; 
    212             this.tbHelpDropDown.Padding = new System.Windows.Forms.Padding(2, 0, 4, 0); 
     221            this.tbHelpDropDown.Padding = new System.Windows.Forms.Padding(0); 
    213222            //  
    214223            // tbHelpMenu 
    … …  
    218227            this.aboutEraserToolStripMenuItem}); 
    219228            this.tbHelpMenu.Name = "tbHelpMenu"; 
    220             this.tbHelpMenu.OwnerItem = this.tbHelpDropDown; 
    221229            resources.ApplyResources(this.tbHelpMenu, "tbHelpMenu"); 
    222230            //  
    … …  
    238246            resources.ApplyResources(this.checkForUpdatesToolStripMenuItem, "checkForUpdatesToolStripMenuItem"); 
    239247            this.checkForUpdatesToolStripMenuItem.Click += new System.EventHandler(this.checkForUpdatesToolStripMenuItem_Click); 
    240             //  
    241             // importTaskListToolStripMenuItem 
    242             //  
    243             this.importTaskListToolStripMenuItem.Name = "importTaskListToolStripMenuItem"; 
    244             resources.ApplyResources(this.importTaskListToolStripMenuItem, "importTaskListToolStripMenuItem"); 
    245             this.importTaskListToolStripMenuItem.Click += new System.EventHandler(this.importTaskListToolStripMenuItem_Click); 
    246248            //  
    247249            // MainForm 

  • branches/eraser6/Eraser/MainForm.resx

    r1011 r1017  
    149149  </data> 
    150150  <data name="tbSchedule.Size" type="System.Drawing.Size, System.Drawing"> 
    151     <value>117, 28</value> 
     151    <value>113, 28</value> 
    152152  </data> 
    153153  <data name="tbSchedule.Text" xml:space="preserve"> 
    … …  
    17631763  </metadata> 
    17641764  <metadata name="ToolBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    1765     <value>0, 0</value> 
     1765    <value>14, 27</value> 
    17661766  </metadata> 
    17671767  <data name="ToolBar.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> 
    … …  
    18171817  </data> 
    18181818  <data name="tbSettings.Size" type="System.Drawing.Size, System.Drawing"> 
    1819     <value>85, 28</value> 
     1819    <value>77, 28</value> 
    18201820  </data> 
    18211821  <data name="tbSettings.Text" xml:space="preserve"> 
    … …  
    18231823  </data> 
    18241824  <data name="tbHelp.Size" type="System.Drawing.Size, System.Drawing"> 
    1825     <value>64, 28</value> 
     1825    <value>60, 28</value> 
    18261826  </data> 
    18271827  <data name="tbHelp.Text" xml:space="preserve"> 
    … …  
    18591859  </data> 
    18601860  <data name="tbHelpDropDown.Size" type="System.Drawing.Size, System.Drawing"> 
    1861     <value>22, 28</value> 
     1861    <value>16, 28</value> 
    18621862  </data> 
    18631863  <data name="tbHelpDropDown.Text" xml:space="preserve"> 
    … …  
    18651865  </data> 
    18661866  <data name="ToolBar.Location" type="System.Drawing.Point, System.Drawing"> 
    1867     <value>14, 27</value> 
     1867    <value>10, 27</value> 
    18681868  </data> 
    18691869  <data name="ToolBar.Size" type="System.Drawing.Size, System.Drawing"> 
    1870     <value>404, 32</value> 
     1870    <value>402, 32</value> 
    18711871  </data> 
    18721872  <data name="ToolBar.TabIndex" type="System.Int32, mscorlib"> 
    … …  
    18801880  </data> 
    18811881  <data name="&gt;&gt;ToolBar.Type" xml:space="preserve"> 
    1882     <value>Eraser.ToolBar, Eraser, Version=6.0.5.986, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
     1882    <value>Eraser.ToolBar, Eraser, Version=6.0.5.1015, Culture=neutral, PublicKeyToken=311f5aaf640c645d</value> 
    18831883  </data> 
    18841884  <data name="&gt;&gt;ToolBar.Parent" xml:space="preserve"> 
    … …  
    35383538    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    35393539  </data> 
     3540  <data name="&gt;&gt;importTaskListToolStripMenuItem.Name" xml:space="preserve"> 
     3541    <value>importTaskListToolStripMenuItem</value> 
     3542  </data> 
     3543  <data name="&gt;&gt;importTaskListToolStripMenuItem.Type" xml:space="preserve"> 
     3544    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     3545  </data> 
    35403546  <data name="&gt;&gt;tbSettings.Name" xml:space="preserve"> 
    35413547    <value>tbSettings</value> 
    … …  
    35743580    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    35753581  </data> 
    3576   <data name="&gt;&gt;importTaskListToolStripMenuItem.Name" xml:space="preserve"> 
    3577     <value>importTaskListToolStripMenuItem</value> 
    3578   </data> 
    3579   <data name="&gt;&gt;importTaskListToolStripMenuItem.Type" xml:space="preserve"> 
    3580     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    3581   </data> 
    35823582  <data name="&gt;&gt;$this.Name" xml:space="preserve"> 
    35833583    <value>MainForm</value> 

  • branches/eraser6/Eraser/ToolBar.cs

    r970 r1017  
    4848                base.Initialize(toolStrip); 
    4949                owner = toolStrip; 
    50             } 
    51  
    52             protected override void InitializeItem(ToolStripItem item) 
    53             { 
    54                 base.InitializeItem(item); 
    5550            } 
    5651 
Note: See TracChangeset for help on using the changeset viewer.