Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10313


Ignore:
Timestamp:
01/08/14 16:24:17 (9 years ago)
Author:
aesterer
Message:

Changed buttons to icon buttons and added icons to content elements

Location:
branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

    r10311 r10313  
    9595    <Compile Include="Interfaces\ITransformationLogic.cs" />
    9696    <Compile Include="PreprocessingCloner.cs" />
     97    <Compile Include="Properties\Resources.Designer.cs">
     98      <AutoGen>True</AutoGen>
     99      <DesignTime>True</DesignTime>
     100      <DependentUpon>Resources.resx</DependentUpon>
     101    </Compile>
    97102    <Compile Include="Views\FilterView.cs">
    98103      <SubType>UserControl</SubType>
     
    219224    </ProjectReference>
    220225  </ItemGroup>
     226  <ItemGroup>
     227    <EmbeddedResource Include="Properties\Resources.resx">
     228      <Generator>ResXFileCodeGenerator</Generator>
     229      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     230    </EmbeddedResource>
     231    <EmbeddedResource Include="Views\DataPreprocessingView.resx">
     232      <DependentUpon>DataPreprocessingView.cs</DependentUpon>
     233    </EmbeddedResource>
     234    <EmbeddedResource Include="Views\StatisticsView.resx">
     235      <DependentUpon>StatisticsView.cs</DependentUpon>
     236    </EmbeddedResource>
     237  </ItemGroup>
    221238  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    222239  <PropertyGroup>
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridContent.cs

    r10312 r10313  
    77namespace HeuristicLab.DataPreprocessing {
    88
    9   [Item("DataGridContent", "Represents a data grid.")]
     9  [Item("DataGrid", "Represents a data grid.")]
    1010  public class DataGridContent : Item, IDataGridContent, IContent {
    1111
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilterContent.cs

    r10303 r10313  
    99namespace HeuristicLab.DataPreprocessing
    1010{
    11   [Item("FilterContent", "Represents the filter grid.")]
     11  [Item("Filter", "Represents the filter grid.")]
    1212  public class FilterContent : Item
    1313  {
     14
     15    public static new Image StaticItemImage {
     16      get { return HeuristicLab.Common.Resources.VSImageLibrary.Filter; }
     17    }
    1418
    1519    private readonly IFilterLogic filterLogic;
     
    3236    }
    3337
    34     public static new Image StaticItemImage
    35     {
    36       get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; }
    37     }
    38 
    3938    public override IDeepCloneable Clone(Cloner cloner)
    4039    {
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/HistogramContent.cs

    r10303 r10313  
    1010namespace HeuristicLab.DataPreprocessing
    1111{
    12   [Item("HistogramContent", "Represents the histogram grid.")]
     12  [Item("Histogram", "Represents the histogram grid.")]
    1313  public class HistogramContent : Item
    1414  {
     
    3636    public static new Image StaticItemImage
    3737    {
    38       get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; }
     38      get { return HeuristicLab.Common.Resources.VSImageLibrary.PieChart; }
    3939    }
    4040
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartContent.cs

    r10303 r10313  
    99namespace HeuristicLab.DataPreprocessing
    1010{
    11   [Item("LineChartContent", "Represents the line chart grid.")]
     11  [Item("LineChart", "Represents the line chart grid.")]
    1212  public class LineChartContent : Item
    1313  {
     
    3535    public static new Image StaticItemImage
    3636    {
    37       get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; }
     37      get { return HeuristicLab.Common.Resources.VSImageLibrary.PieChart; }
    3838    }
    3939
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/StatisticsContent.cs

    r10303 r10313  
    99namespace HeuristicLab.DataPreprocessing
    1010{
    11   [Item("StatisticsContent", "Represents the statistics grid.")]
     11  [Item("Statistics", "Represents the statistics grid.")]
    1212  public class StatisticsContent : Item
    1313  {
     
    3535    public static new Image StaticItemImage
    3636    {
    37       get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; }
     37      get { return HeuristicLab.Common.Resources.VSImageLibrary.Statistics; }
    3838    }
    3939
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/TransformationContent.cs

    r10303 r10313  
    99namespace HeuristicLab.DataPreprocessing
    1010{
    11   [Item("TransformationContent", "Represents the transformation grid.")]
     11  [Item("Transformation", "Represents the transformation grid.")]
    1212  public class TransformationContent : Item
    1313  {
     
    3535    public static new Image StaticItemImage
    3636    {
    37       get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; }
     37      get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
    3838    }
    3939
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/DataPreprocessingView.cs

    r10310 r10313  
    3434
    3535      listViewItem.Text = item.ToString();
    36       //listViewItem.ToolTipText = item.ItemName + ": " + item.ItemDescription;
    37       //itemsListView.SmallImageList.Images.Add(content.);
    38       //listViewItem.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
    39       //listViewItem.Tag = item;
     36      listViewItem.ToolTipText = item.ItemName + ": " + item.ItemDescription;
     37      contentListView.SmallImageList.Images.Add(item.ItemImage);
     38      listViewItem.ImageIndex = contentListView.SmallImageList.Images.Count - 1;
     39      listViewItem.Tag = item;
    4040      return listViewItem;
    4141    }
     
    5252
    5353      listViewItemItemMapping = new Dictionary<ListViewItem, IItem>();
     54      contentListView.SmallImageList = new ImageList();
    5455      ListViewItem contentListViewItem = CreateListViewItem(dataGridContent);
    5556      listViewItemItemMapping[contentListViewItem] = dataGridContent;
     
    8990      if (contentListView.SelectedItems.Count > 0) {
    9091        ListViewItem listViewItem = (ListViewItem)contentListView.SelectedItems[0];
    91         this.viewHost.Content = listViewItemItemMapping[listViewItem];
     92        //this.viewHost.Content = listViewItemItemMapping[listViewItem];
     93        this.viewHost.Content = (IItem)listViewItem.Tag;
    9294      }
    9395    }
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/DataPreprocessingView.designer.cs

    r10307 r10313  
    2424    /// </summary>
    2525    private void InitializeComponent() {
     26      this.components = new System.ComponentModel.Container();
     27      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DataPreprocessingView));
    2628      this.splitContainer1 = new System.Windows.Forms.SplitContainer();
     29      this.undoButton = new System.Windows.Forms.Button();
    2730      this.contentListView = new System.Windows.Forms.ListView();
    2831      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    29       this.exportProblemButton = new System.Windows.Forms.Button();
    30       this.applyInNewTabButton = new System.Windows.Forms.Button();
     32      this.saveButton = new System.Windows.Forms.Button();
     33      this.tryOutAlgorithmButton = new System.Windows.Forms.Button();
    3134      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
    3235      this.splitContainer1.Panel1.SuspendLayout();
     
    3841      //
    3942      this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
     43      this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
    4044      this.splitContainer1.Location = new System.Drawing.Point(0, 0);
    4145      this.splitContainer1.Name = "splitContainer1";
     
    4347      // splitContainer1.Panel1
    4448      //
     49      this.splitContainer1.Panel1.Controls.Add(this.undoButton);
    4550      this.splitContainer1.Panel1.Controls.Add(this.contentListView);
     51      this.splitContainer1.Panel1.Controls.Add(this.tryOutAlgorithmButton);
     52      this.splitContainer1.Panel1.Controls.Add(this.saveButton);
    4653      //
    4754      // splitContainer1.Panel2
    4855      //
    4956      this.splitContainer1.Panel2.Controls.Add(this.viewHost);
    50       this.splitContainer1.Panel2.Controls.Add(this.exportProblemButton);
    51       this.splitContainer1.Panel2.Controls.Add(this.applyInNewTabButton);
     57      this.splitContainer1.Panel2.Controls.Add(this.saveButton);
     58      this.splitContainer1.Panel2.Controls.Add(this.tryOutAlgorithmButton);
    5259      this.splitContainer1.Size = new System.Drawing.Size(838, 449);
    53       this.splitContainer1.SplitterDistance = 278;
     60      this.splitContainer1.SplitterDistance = 181;
    5461      this.splitContainer1.TabIndex = 0;
     62      //
     63      // undoButton
     64      //
     65      this.undoButton.Image = ((System.Drawing.Image)(resources.GetObject("undoButton.Image")));
     66      this.undoButton.Location = new System.Drawing.Point(72, 15);
     67      this.undoButton.Name = "undoButton";
     68      this.undoButton.Size = new System.Drawing.Size(24, 24);
     69      this.undoButton.TabIndex = 3;
     70      this.toolTip.SetToolTip(this.undoButton, "Undo");
     71      this.undoButton.UseVisualStyleBackColor = true;
    5572      //
    5673      // contentListView
     
    5976            | System.Windows.Forms.AnchorStyles.Left)
    6077            | System.Windows.Forms.AnchorStyles.Right)));
    61       this.contentListView.Location = new System.Drawing.Point(12, 15);
     78      this.contentListView.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
     79      this.contentListView.Location = new System.Drawing.Point(12, 44);
    6280      this.contentListView.Name = "contentListView";
    63       this.contentListView.Size = new System.Drawing.Size(254, 389);
     81      this.contentListView.Size = new System.Drawing.Size(157, 391);
    6482      this.contentListView.TabIndex = 0;
    6583      this.contentListView.UseCompatibleStateImageBehavior = false;
     
    6785      this.contentListView.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged);
    6886      this.contentListView.DoubleClick += new System.EventHandler(this.listView1_DoubleClick);
     87      //
     88      // tryOutAlgorithmButton
     89      //
     90      this.tryOutAlgorithmButton.Image = ((System.Drawing.Image)(resources.GetObject("tryOutAlgorithmButton.Image")));
     91      this.tryOutAlgorithmButton.Location = new System.Drawing.Point(42, 15);
     92      this.tryOutAlgorithmButton.Name = "tryOutAlgorithmButton";
     93      this.tryOutAlgorithmButton.Size = new System.Drawing.Size(24, 24);
     94      this.tryOutAlgorithmButton.TabIndex = 2;
     95      this.toolTip.SetToolTip(this.tryOutAlgorithmButton, "Try Out Algorithm");
     96      this.tryOutAlgorithmButton.UseVisualStyleBackColor = true;
     97      this.tryOutAlgorithmButton.Click += new System.EventHandler(this.tryOutAlgorithmButton_Click);
     98      //
     99      // saveButton
     100      //
     101      this.saveButton.Image = ((System.Drawing.Image)(resources.GetObject("saveButton.Image")));
     102      this.saveButton.Location = new System.Drawing.Point(12, 15);
     103      this.saveButton.Name = "saveButton";
     104      this.saveButton.Size = new System.Drawing.Size(24, 24);
     105      this.saveButton.TabIndex = 1;
     106      this.toolTip.SetToolTip(this.saveButton, "Save");
     107      this.saveButton.UseVisualStyleBackColor = true;
    69108      //
    70109      // viewHost
     
    76115      this.viewHost.Content = null;
    77116      this.viewHost.Enabled = false;
    78       this.viewHost.Location = new System.Drawing.Point(14, 15);
     117      this.viewHost.Location = new System.Drawing.Point(16, 44);
    79118      this.viewHost.Name = "viewHost";
    80119      this.viewHost.ReadOnly = false;
    81       this.viewHost.Size = new System.Drawing.Size(526, 389);
     120      this.viewHost.Size = new System.Drawing.Size(621, 391);
    82121      this.viewHost.TabIndex = 4;
    83122      this.viewHost.ViewsLabelVisible = true;
    84123      this.viewHost.ViewType = null;
    85124      //
    86       // exportProblemButton
     125      // saveButton
    87126      //
    88       this.exportProblemButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    89       this.exportProblemButton.Location = new System.Drawing.Point(318, 410);
    90       this.exportProblemButton.Name = "exportProblemButton";
    91       this.exportProblemButton.Size = new System.Drawing.Size(100, 23);
    92       this.exportProblemButton.TabIndex = 3;
    93       this.exportProblemButton.Text = "Export Problem";
    94       this.exportProblemButton.UseVisualStyleBackColor = true;
    95       this.exportProblemButton.Click += new System.EventHandler(this.exportProblemButton_Click);
     127      this.saveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
     128      this.saveButton.Location = new System.Drawing.Point(343, 410);
     129      this.saveButton.Name = "saveButton";
     130      this.saveButton.Size = new System.Drawing.Size(75, 23);
     131      this.saveButton.TabIndex = 3;
     132      this.saveButton.Text = "Save";
     133      this.saveButton.UseVisualStyleBackColor = true;
    96134      //
    97       // applyInNewTabButton
     135      // tryOutAlgorithmButton
    98136      //
    99       this.applyInNewTabButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    100       this.applyInNewTabButton.Location = new System.Drawing.Point(432, 410);
    101       this.applyInNewTabButton.Name = "applyInNewTabButton";
    102       this.applyInNewTabButton.Size = new System.Drawing.Size(108, 23);
    103       this.applyInNewTabButton.TabIndex = 2;
    104       this.applyInNewTabButton.Text = "Apply in new Tab";
    105       this.applyInNewTabButton.UseVisualStyleBackColor = true;
    106       this.applyInNewTabButton.Click += new System.EventHandler(this.applyInNewTabButton_Click);
     137      this.tryOutAlgorithmButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
     138      this.tryOutAlgorithmButton.Location = new System.Drawing.Point(443, 410);
     139      this.tryOutAlgorithmButton.Name = "tryOutAlgorithmButton";
     140      this.tryOutAlgorithmButton.Size = new System.Drawing.Size(97, 23);
     141      this.tryOutAlgorithmButton.TabIndex = 2;
     142      this.tryOutAlgorithmButton.Text = "Try Out Algorithm";
     143      this.tryOutAlgorithmButton.UseVisualStyleBackColor = true;
     144      this.tryOutAlgorithmButton.Click += new System.EventHandler(this.tryOutAlgorithmButton_Click);
    107145      //
    108146      // DataPreprocessingView
     
    127165    private System.Windows.Forms.Button applyInNewTabButton;
    128166    private MainForm.WindowsForms.ViewHost viewHost;
    129     private System.Windows.Forms.SplitContainer splitContainer1;
    130167
    131168  }
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/StatisticsView.Designer.cs

    r10303 r10313  
    2424    /// </summary>
    2525    private void InitializeComponent() {
    26       components = new System.ComponentModel.Container();
     26      this.SuspendLayout();
     27      //
     28      // StatisticsView
     29      //
     30      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    2731      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     32      this.Name = "StatisticsView";
     33      this.Size = new System.Drawing.Size(549, 408);
     34      this.ResumeLayout(false);
     35
    2836    }
    2937
Note: See TracChangeset for help on using the changeset viewer.