Skip to content

Commit 43307c0

Browse files
committed
FRInDocDialog is now resizable...
1 parent 53bdc9f commit 43307c0

File tree

2 files changed

+29
-12
lines changed

2 files changed

+29
-12
lines changed

FlashDevelop/Dialogs/FRInDocDialog.cs

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
using FlashDevelop.Helpers;
1010
using PluginCore.FRService;
1111
using PluginCore.Managers;
12+
using PluginCore.Controls;
1213
using PluginCore.Helpers;
1314
using ScintillaNet;
1415
using PluginCore;
1516

1617
namespace FlashDevelop.Dialogs
1718
{
18-
public class FRInDocDialog : Form
19+
public class FRInDocDialog : SmartForm
1920
{
2021
private System.Windows.Forms.Label infoLabel;
2122
private System.Windows.Forms.Label findLabel;
@@ -43,6 +44,7 @@ public FRInDocDialog()
4344
{
4445
this.Owner = Globals.MainForm;
4546
this.Font = Globals.Settings.DefaultFont;
47+
this.FormGuid = "24910809-a60a-4b7c-8d2a-d53a363f595f";
4648
this.InitializeComponent();
4749
this.InitializeProperties();
4850
this.ApplyLocalizedTexts();
@@ -82,7 +84,8 @@ private void InitializeComponent()
8284
this.SuspendLayout();
8385
//
8486
// replaceButton
85-
//
87+
//
88+
this.replaceButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
8689
this.replaceButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
8790
this.replaceButton.Location = new System.Drawing.Point(277, 112);
8891
this.replaceButton.Name = "replaceButton";
@@ -93,6 +96,7 @@ private void InitializeComponent()
9396
//
9497
// findNextButton
9598
//
99+
this.findNextButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
96100
this.findNextButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
97101
this.findNextButton.Location = new System.Drawing.Point(277, 22);
98102
this.findNextButton.Name = "findNextButton";
@@ -125,6 +129,7 @@ private void InitializeComponent()
125129
//
126130
// closeButton
127131
//
132+
this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
128133
this.closeButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
129134
this.closeButton.Location = new System.Drawing.Point(277, 172);
130135
this.closeButton.Name = "closeButton";
@@ -135,6 +140,7 @@ private void InitializeComponent()
135140
//
136141
// findPrevButton
137142
//
143+
this.findPrevButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
138144
this.findPrevButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
139145
this.findPrevButton.Location = new System.Drawing.Point(277, 52);
140146
this.findPrevButton.Name = "findPrevButton";
@@ -144,7 +150,8 @@ private void InitializeComponent()
144150
this.findPrevButton.Click += new System.EventHandler(this.FindPrevButtonClick);
145151
//
146152
// findComboBox
147-
//
153+
//
154+
this.findComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
148155
this.findComboBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
149156
this.findComboBox.Location = new System.Drawing.Point(13, 23);
150157
this.findComboBox.Name = "findComboBox";
@@ -187,6 +194,7 @@ private void InitializeComponent()
187194
//
188195
// infoPictureBox
189196
//
197+
this.infoPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
190198
this.infoPictureBox.BackColor = System.Drawing.SystemColors.Control;
191199
this.infoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
192200
this.infoPictureBox.Location = new System.Drawing.Point(14, 202);
@@ -196,7 +204,8 @@ private void InitializeComponent()
196204
this.infoPictureBox.TabStop = false;
197205
//
198206
// infoLabel
199-
//
207+
//
208+
this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
200209
this.infoLabel.AutoSize = true;
201210
this.infoLabel.BackColor = System.Drawing.SystemColors.Control;
202211
this.infoLabel.FlatStyle = System.Windows.Forms.FlatStyle.System;
@@ -208,7 +217,8 @@ private void InitializeComponent()
208217
this.infoLabel.Text = "No suitable results found.";
209218
//
210219
// optionsGroupBox
211-
//
220+
//
221+
this.optionsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
212222
this.optionsGroupBox.Controls.Add(this.useRegexCheckBox);
213223
this.optionsGroupBox.Controls.Add(this.escapedCheckBox);
214224
this.optionsGroupBox.Controls.Add(this.wholeWordCheckBox);
@@ -222,7 +232,8 @@ private void InitializeComponent()
222232
this.optionsGroupBox.Text = " Options";
223233
//
224234
// replaceComboBox
225-
//
235+
//
236+
this.replaceComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
226237
this.replaceComboBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
227238
this.replaceComboBox.Location = new System.Drawing.Point(13, 62);
228239
this.replaceComboBox.Name = "replaceComboBox";
@@ -241,7 +252,8 @@ private void InitializeComponent()
241252
this.replaceLabel.Text = "Replace with:";
242253
//
243254
// replaceAllButton
244-
//
255+
//
256+
this.replaceAllButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
245257
this.replaceAllButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
246258
this.replaceAllButton.Location = new System.Drawing.Point(277, 142);
247259
this.replaceAllButton.Name = "replaceAllButton";
@@ -251,7 +263,8 @@ private void InitializeComponent()
251263
this.replaceAllButton.Click += new System.EventHandler(this.ReplaceAllButtonClick);
252264
//
253265
// lookComboBox
254-
//
266+
//
267+
this.lookComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
255268
this.lookComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
256269
this.lookComboBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
257270
this.lookComboBox.Items.AddRange(new object[] {
@@ -277,7 +290,8 @@ private void InitializeComponent()
277290
this.lookLabel.Text = "Look in:";
278291
//
279292
// bookmarkAllButton
280-
//
293+
//
294+
this.bookmarkAllButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
281295
this.bookmarkAllButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
282296
this.bookmarkAllButton.Location = new System.Drawing.Point(277, 82);
283297
this.bookmarkAllButton.Name = "bookmarkAllButton";
@@ -293,6 +307,8 @@ private void InitializeComponent()
293307
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
294308
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
295309
this.ClientSize = new System.Drawing.Size(384, 228);
310+
this.MinimumSize = new System.Drawing.Size(384, 268);
311+
//this.MaximumSize = new System.Drawing.Size(1000, 268);
296312
this.Controls.Add(this.bookmarkAllButton);
297313
this.Controls.Add(this.replaceComboBox);
298314
this.Controls.Add(this.lookComboBox);
@@ -308,11 +324,12 @@ private void InitializeComponent()
308324
this.Controls.Add(this.closeButton);
309325
this.Controls.Add(this.findLabel);
310326
this.Controls.Add(this.findNextButton);
311-
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
327+
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Sizable;
312328
this.MaximizeBox = false;
313329
this.MinimizeBox = false;
314330
this.Name = "FRInDocDialog";
315331
this.ShowInTaskbar = false;
332+
this.ShowIcon = false;
316333
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
317334
this.Text = " Find And Replace";
318335
this.Load += new System.EventHandler(this.DialogLoad);

FlashDevelop/Dialogs/FRInFilesDialog.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
using System.Windows.Forms;
66
using System.ComponentModel;
77
using System.Collections.Generic;
8+
using System.Text.RegularExpressions;
89
using PluginCore.Localization;
910
using FlashDevelop.Utilities;
1011
using PluginCore.Utilities;
1112
using PluginCore.Controls;
1213
using PluginCore.FRService;
1314
using PluginCore.Managers;
1415
using PluginCore.Helpers;
16+
using Ookii.Dialogs;
1517
using ScintillaNet;
1618
using PluginCore;
17-
using Ookii.Dialogs;
18-
using System.Text.RegularExpressions;
1919

2020
namespace FlashDevelop.Dialogs
2121
{

0 commit comments

Comments
 (0)