Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10739


Ignore:
Timestamp:
04/09/14 13:16:54 (9 years ago)
Author:
sbreuer
Message:
  • close find and replace dialog when switching to other view
  • scroll to found cell on find next
  • fix search bug (search even if nothing is selected)
  • set cursor in search field and set find next button to default
  • do not show any icon in find and replace dialog
Location:
branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs

    r10719 r10739  
    8686    protected override void OnContentChanged() {
    8787      base.OnContentChanged();
     88      if (Content == null && findAndReplaceDialog != null) {
     89        findAndReplaceDialog.Close();
     90      }
    8891    }
    8992
     
    196199      if (currentCell != null) {
    197200        HightlightedCells = TransformToDictionary(currentCell);
     201        dataGridView.FirstDisplayedCell = dataGridView[currentCell.Item1, currentCell.Item2];
    198202      } else {
    199203        ResetHighlightedCells();
     
    207211    void findAndReplaceDialog_FindAllEvent(object sender, EventArgs e) {
    208212      HightlightedCells = FindAll(findAndReplaceDialog.GetSearchText());
    209       searchIterator.Reset();
    210213    }
    211214
     
    224227        IList<int> selectedList;
    225228        if (searchInSelection && HightlightedCellsBackground.TryGetValue(i, out selectedList)) {
    226           foundCells[i].Intersect(selectedList);
    227         } else {
     229          foundCells[i] = foundCells[i].Intersect(selectedList).ToList<int>();
     230        } else if (searchInSelection) {
    228231          foundCells[i].Clear();
    229232        }
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FindAndReplaceDialog.Designer.cs

    r10706 r10739  
    6060      this.tabSearch.Name = "tabSearch";
    6161      this.tabSearch.Padding = new System.Windows.Forms.Padding(3);
    62       this.tabSearch.Size = new System.Drawing.Size(556, 117);
     62      this.tabSearch.Size = new System.Drawing.Size(556, 106);
    6363      this.tabSearch.TabIndex = 0;
    6464      this.tabSearch.Text = "Search";
     
    178178      this.ClientSize = new System.Drawing.Size(588, 156);
    179179      this.Controls.Add(this.tabSearchReplace);
     180      this.MaximizeBox = false;
     181      this.MinimizeBox = false;
    180182      this.Name = "FindAndReplaceDialog";
     183      this.ShowIcon = false;
     184      this.ShowInTaskbar = false;
    181185      this.Text = "Find and Replace";
    182186      this.tabSearchReplace.ResumeLayout(false);
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FindAndReplaceDialog.cs

    r10706 r10739  
    2323
    2424    public void ActivateSearch() {
    25       tabSearch.Focus();
     25      tabSearchReplace.SelectTab(tabSearch);
    2626      AddControlsToCurrentTab();
    2727    }
    2828
    2929    public void ActivateReplace() {
    30       tabReplace.Focus();
     30      tabSearchReplace.SelectTab(tabReplace);
    3131      AddControlsToCurrentTab();
    3232    }
     
    4545      tabSearchReplace.SelectedTab.Controls.Add(lblSearch);
    4646      tabSearchReplace.SelectedTab.Controls.Add(txtSearchString);
     47      ActiveControl = txtSearchString;
     48      AcceptButton = btnFindNext;
    4749    }
    4850
Note: See TracChangeset for help on using the changeset viewer.