diff --git a/bin/lang/en-us.txt b/bin/lang/en-us.txt index 1962215..c3e6913 100644 --- a/bin/lang/en-us.txt +++ b/bin/lang/en-us.txt @@ -49,7 +49,7 @@ OptionsPensThin = "Thin" OptionsPensNormal = "Normal" OptionsPensThick = "Thick" -OptionsHotkeysglobal = "Global hotkey (start drawing, switch between mouse pointer and drawing)" +OptionsHotkeysglobal = "Global hotkey (starts drawing, switches between mouse pointer and drawing)" OptionsHotkeysEnableinpointer = "Enable all following hotkeys in mouse pointer mode (may cause a mess)" NotificationSnapshot = "Snapshot saved. Click here to browse snapshots." \ No newline at end of file diff --git a/bin/lang/test.txt b/bin/lang/test.txt new file mode 100644 index 0000000..a9dc79c --- /dev/null +++ b/bin/lang/test.txt @@ -0,0 +1,55 @@ +LanguageName = "Test" + +ButtonNamePen0 = "Pen 0 very long" +ButtonNamePen1 = "Pen 1 very long" +ButtonNamePen2 = "Pen 2 very long" +ButtonNamePen3 = "Pen 3 very long" +ButtonNamePen4 = "Pen 4 very long" +ButtonNamePen5 = "Pen 5 very long" +ButtonNamePen6 = "Pen 6 very long" +ButtonNamePen7 = "Pen 7 very long" +ButtonNamePen8 = "Pen 8 very long" +ButtonNamePen9 = "Pen 9 very long" + +ButtonNamePenwidth = "Pen width very long" +ButtonNameErasor = "Eraser very long" +ButtonNamePan = "Pan very long" +ButtonNameMousePointer = "Mouse pointer very long" +ButtonNameInkVisible = "Ink visible very long" +ButtonNameSnapshot = "Snapshot very long" +ButtonNameUndo = "Undo very long" +ButtonNameRedo = "Redo very long" +ButtonNameClear = "Clear very long" +ButtonNameExit = "Exit drawing very long" +ButtonNameDock = "Dock/Undock very long" + +MenuEntryExit = "Exit very long" +MenuEntryOptions = "Options very long" +MenuEntryAbout = "About very long" + +OptionsTabGeneral = "General very long" +OptionsTabPens = "Pens very long" +OptionsTabHotkeys = "Hotkeys very long" + +OptionsGeneralCanvascursor = "Canvus cursor very long" +OptionsGeneralCanvascursorArrow = "Arrow very long" +OptionsGeneralCanvascursorPentip = "Pen tip very long" +OptionsGeneralSnapshotsavepath = "Snapshot save path very long" +OptionsGeneralWhitetrayicon = "Use white tray icon very long" +OptionsGeneralAllowdragging = "Allow dragging toolbar very long" +OptionsGeneralNotePenwidth = "Note: pen width panel overides each individual pen width settings" + +OptionsPensShow = "Show very long" +OptionsPensColor = "Color very long" +OptionsPensAlpha = "Alpha very long" +OptionsPensWidth = "Width very long" +OptionsPensPencil = "Pencil very long" +OptionsPensHighlighter = "Highlighter very long" +OptionsPensThin = "Thin very long" +OptionsPensNormal = "Normal very long" +OptionsPensThick = "Thick very long" + +OptionsHotkeysglobal = "Global hotkey (start drawing, switch between mouse pointer and drawing)" +OptionsHotkeysEnableinpointer = "Enable all following hotkeys in mouse pointer mode (may cause a mess)" + +NotificationSnapshot = "Snapshot saved. Click here to browse snapshots." \ No newline at end of file diff --git a/src/FormOptions.Designer.cs b/src/FormOptions.Designer.cs index 7a204f1..9c05821 100644 --- a/src/FormOptions.Designer.cs +++ b/src/FormOptions.Designer.cs @@ -56,6 +56,7 @@ private void InitializeComponent() this.comboCanvasCursor = new System.Windows.Forms.ComboBox(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.comboLanguage = new System.Windows.Forms.ComboBox(); this.cbInkVisibleEnabled = new System.Windows.Forms.CheckBox(); @@ -73,7 +74,6 @@ private void InitializeComponent() this.lbHkUndo = new System.Windows.Forms.Label(); this.lbHkEraser = new System.Windows.Forms.Label(); this.lbGlobalHotkey = new System.Windows.Forms.Label(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.hiInkVisible = new gInk.HotkeyInputBox(); this.hiSnapshot = new gInk.HotkeyInputBox(); this.hiClear = new gInk.HotkeyInputBox(); @@ -85,18 +85,17 @@ private void InitializeComponent() this.hiGlobal = new gInk.HotkeyInputBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabPage3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // cbEraserEnabled // this.cbEraserEnabled.AutoSize = true; - this.cbEraserEnabled.Location = new System.Drawing.Point(72, 150); - this.cbEraserEnabled.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbEraserEnabled.Location = new System.Drawing.Point(39, 81); this.cbEraserEnabled.Name = "cbEraserEnabled"; - this.cbEraserEnabled.Size = new System.Drawing.Size(22, 21); + this.cbEraserEnabled.Size = new System.Drawing.Size(15, 14); this.cbEraserEnabled.TabIndex = 0; this.cbEraserEnabled.UseVisualStyleBackColor = true; this.cbEraserEnabled.CheckedChanged += new System.EventHandler(this.cbEraserEnabled_CheckedChanged); @@ -104,10 +103,9 @@ private void InitializeComponent() // cbPointerEnabled // this.cbPointerEnabled.AutoSize = true; - this.cbPointerEnabled.Location = new System.Drawing.Point(251, 150); - this.cbPointerEnabled.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbPointerEnabled.Location = new System.Drawing.Point(137, 81); this.cbPointerEnabled.Name = "cbPointerEnabled"; - this.cbPointerEnabled.Size = new System.Drawing.Size(22, 21); + this.cbPointerEnabled.Size = new System.Drawing.Size(15, 14); this.cbPointerEnabled.TabIndex = 0; this.cbPointerEnabled.UseVisualStyleBackColor = true; this.cbPointerEnabled.CheckedChanged += new System.EventHandler(this.cbPointerEnabled_CheckedChanged); @@ -115,10 +113,9 @@ private void InitializeComponent() // cbSnapEnabled // this.cbSnapEnabled.AutoSize = true; - this.cbSnapEnabled.Location = new System.Drawing.Point(596, 151); - this.cbSnapEnabled.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbSnapEnabled.Location = new System.Drawing.Point(325, 82); this.cbSnapEnabled.Name = "cbSnapEnabled"; - this.cbSnapEnabled.Size = new System.Drawing.Size(22, 21); + this.cbSnapEnabled.Size = new System.Drawing.Size(15, 14); this.cbSnapEnabled.TabIndex = 0; this.cbSnapEnabled.UseVisualStyleBackColor = true; this.cbSnapEnabled.CheckedChanged += new System.EventHandler(this.cbSnapEnabled_CheckedChanged); @@ -126,10 +123,9 @@ private void InitializeComponent() // cbUndoEnabled // this.cbUndoEnabled.AutoSize = true; - this.cbUndoEnabled.Location = new System.Drawing.Point(691, 151); - this.cbUndoEnabled.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbUndoEnabled.Location = new System.Drawing.Point(377, 82); this.cbUndoEnabled.Name = "cbUndoEnabled"; - this.cbUndoEnabled.Size = new System.Drawing.Size(22, 21); + this.cbUndoEnabled.Size = new System.Drawing.Size(15, 14); this.cbUndoEnabled.TabIndex = 0; this.cbUndoEnabled.UseVisualStyleBackColor = true; this.cbUndoEnabled.CheckedChanged += new System.EventHandler(this.cbUndoEnabled_CheckedChanged); @@ -137,10 +133,9 @@ private void InitializeComponent() // cbClearEnabled // this.cbClearEnabled.AutoSize = true; - this.cbClearEnabled.Location = new System.Drawing.Point(781, 151); - this.cbClearEnabled.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbClearEnabled.Location = new System.Drawing.Point(426, 82); this.cbClearEnabled.Name = "cbClearEnabled"; - this.cbClearEnabled.Size = new System.Drawing.Size(22, 21); + this.cbClearEnabled.Size = new System.Drawing.Size(15, 14); this.cbClearEnabled.TabIndex = 0; this.cbClearEnabled.UseVisualStyleBackColor = true; this.cbClearEnabled.CheckedChanged += new System.EventHandler(this.cbClearEnabled_CheckedChanged); @@ -148,10 +143,9 @@ private void InitializeComponent() // cbWidthEnabled // this.cbWidthEnabled.AutoSize = true; - this.cbWidthEnabled.Location = new System.Drawing.Point(407, 153); - this.cbWidthEnabled.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbWidthEnabled.Location = new System.Drawing.Point(222, 83); this.cbWidthEnabled.Name = "cbWidthEnabled"; - this.cbWidthEnabled.Size = new System.Drawing.Size(22, 21); + this.cbWidthEnabled.Size = new System.Drawing.Size(15, 14); this.cbWidthEnabled.TabIndex = 0; this.cbWidthEnabled.UseVisualStyleBackColor = true; this.cbWidthEnabled.CheckedChanged += new System.EventHandler(this.cbWidthEnabled_CheckedChanged); @@ -159,10 +153,9 @@ private void InitializeComponent() // cbWhiteIcon // this.cbWhiteIcon.AutoSize = true; - this.cbWhiteIcon.Location = new System.Drawing.Point(20, 439); - this.cbWhiteIcon.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbWhiteIcon.Location = new System.Drawing.Point(11, 238); this.cbWhiteIcon.Name = "cbWhiteIcon"; - this.cbWhiteIcon.Size = new System.Drawing.Size(201, 29); + this.cbWhiteIcon.Size = new System.Drawing.Size(116, 17); this.cbWhiteIcon.TabIndex = 0; this.cbWhiteIcon.Text = "Use white tray icon"; this.cbWhiteIcon.UseVisualStyleBackColor = true; @@ -170,29 +163,26 @@ private void InitializeComponent() // // tbSnapPath // - this.tbSnapPath.Location = new System.Drawing.Point(270, 364); - this.tbSnapPath.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.tbSnapPath.Location = new System.Drawing.Point(157, 197); this.tbSnapPath.Name = "tbSnapPath"; - this.tbSnapPath.Size = new System.Drawing.Size(514, 29); + this.tbSnapPath.Size = new System.Drawing.Size(272, 20); this.tbSnapPath.TabIndex = 1; this.tbSnapPath.ModifiedChanged += new System.EventHandler(this.tbSnapPath_ModifiedChanged); // // lbSnapshotsavepath // this.lbSnapshotsavepath.AutoSize = true; - this.lbSnapshotsavepath.Location = new System.Drawing.Point(15, 373); - this.lbSnapshotsavepath.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbSnapshotsavepath.Location = new System.Drawing.Point(8, 202); this.lbSnapshotsavepath.Name = "lbSnapshotsavepath"; - this.lbSnapshotsavepath.Size = new System.Drawing.Size(186, 25); + this.lbSnapshotsavepath.Size = new System.Drawing.Size(102, 13); this.lbSnapshotsavepath.TabIndex = 2; this.lbSnapshotsavepath.Text = "Snapshot save path"; // // btSnapPath // - this.btSnapPath.Location = new System.Drawing.Point(798, 362); - this.btSnapPath.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.btSnapPath.Location = new System.Drawing.Point(435, 196); this.btSnapPath.Name = "btSnapPath"; - this.btSnapPath.Size = new System.Drawing.Size(57, 42); + this.btSnapPath.Size = new System.Drawing.Size(31, 23); this.btSnapPath.TabIndex = 3; this.btSnapPath.Text = "..."; this.btSnapPath.UseVisualStyleBackColor = true; @@ -201,10 +191,9 @@ private void InitializeComponent() // lbNote // this.lbNote.AutoSize = true; - this.lbNote.Location = new System.Drawing.Point(17, 589); - this.lbNote.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbNote.Location = new System.Drawing.Point(9, 319); this.lbNote.Name = "lbNote"; - this.lbNote.Size = new System.Drawing.Size(573, 25); + this.lbNote.Size = new System.Drawing.Size(316, 13); this.lbNote.TabIndex = 4; this.lbNote.Text = "Note: pen width panel overides each individual pen width settings"; // @@ -217,23 +206,22 @@ private void InitializeComponent() // lbCanvascursor // this.lbCanvascursor.AutoSize = true; - this.lbCanvascursor.Location = new System.Drawing.Point(17, 312); - this.lbCanvascursor.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbCanvascursor.Location = new System.Drawing.Point(9, 167); this.lbCanvascursor.Name = "lbCanvascursor"; - this.lbCanvascursor.Size = new System.Drawing.Size(139, 25); + this.lbCanvascursor.Size = new System.Drawing.Size(75, 13); this.lbCanvascursor.TabIndex = 5; this.lbCanvascursor.Text = "Canvas cursor"; // // comboCanvasCursor // + this.comboCanvasCursor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboCanvasCursor.FormattingEnabled = true; this.comboCanvasCursor.Items.AddRange(new object[] { "Arrow", "Pen tip"}); - this.comboCanvasCursor.Location = new System.Drawing.Point(270, 305); - this.comboCanvasCursor.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.comboCanvasCursor.Location = new System.Drawing.Point(157, 162); this.comboCanvasCursor.Name = "comboCanvasCursor"; - this.comboCanvasCursor.Size = new System.Drawing.Size(514, 32); + this.comboCanvasCursor.Size = new System.Drawing.Size(272, 21); this.comboCanvasCursor.TabIndex = 6; this.comboCanvasCursor.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // @@ -247,7 +235,7 @@ private void InitializeComponent() this.tabControl1.Name = "tabControl1"; this.tabControl1.Padding = new System.Drawing.Point(0, 0); this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(902, 846); + this.tabControl1.Size = new System.Drawing.Size(492, 458); this.tabControl1.TabIndex = 7; // // tabPage1 @@ -272,18 +260,28 @@ private void InitializeComponent() this.tabPage1.Controls.Add(this.cbAllowDragging); this.tabPage1.Controls.Add(this.cbWhiteIcon); this.tabPage1.Controls.Add(this.tbSnapPath); - this.tabPage1.Location = new System.Drawing.Point(4, 33); + this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Margin = new System.Windows.Forms.Padding(0); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Size = new System.Drawing.Size(894, 809); + this.tabPage1.Size = new System.Drawing.Size(484, 432); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "General"; // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = global::gInk.Properties.Resources.i18n; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.pictureBox2.Location = new System.Drawing.Point(12, 128); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(0); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(22, 19); + this.pictureBox2.TabIndex = 8; + this.pictureBox2.TabStop = false; + // // pictureBox1 // this.pictureBox1.Image = global::gInk.Properties.Resources.paneloption; - this.pictureBox1.Location = new System.Drawing.Point(15, 28); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.pictureBox1.Location = new System.Drawing.Point(8, 15); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(468, 53); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -292,21 +290,20 @@ private void InitializeComponent() // // comboLanguage // + this.comboLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboLanguage.FormattingEnabled = true; - this.comboLanguage.Location = new System.Drawing.Point(270, 244); - this.comboLanguage.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.comboLanguage.Location = new System.Drawing.Point(157, 127); this.comboLanguage.Name = "comboLanguage"; - this.comboLanguage.Size = new System.Drawing.Size(514, 32); + this.comboLanguage.Size = new System.Drawing.Size(272, 21); this.comboLanguage.TabIndex = 6; this.comboLanguage.SelectedIndexChanged += new System.EventHandler(this.comboLanguage_SelectedIndexChanged); // // cbInkVisibleEnabled // this.cbInkVisibleEnabled.AutoSize = true; - this.cbInkVisibleEnabled.Location = new System.Drawing.Point(504, 151); - this.cbInkVisibleEnabled.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbInkVisibleEnabled.Location = new System.Drawing.Point(275, 82); this.cbInkVisibleEnabled.Name = "cbInkVisibleEnabled"; - this.cbInkVisibleEnabled.Size = new System.Drawing.Size(22, 21); + this.cbInkVisibleEnabled.Size = new System.Drawing.Size(15, 14); this.cbInkVisibleEnabled.TabIndex = 0; this.cbInkVisibleEnabled.UseVisualStyleBackColor = true; this.cbInkVisibleEnabled.CheckedChanged += new System.EventHandler(this.cbInkVisibleEnabled_CheckedChanged); @@ -314,10 +311,9 @@ private void InitializeComponent() // cbPanEnabled // this.cbPanEnabled.AutoSize = true; - this.cbPanEnabled.Location = new System.Drawing.Point(160, 150); - this.cbPanEnabled.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbPanEnabled.Location = new System.Drawing.Point(87, 81); this.cbPanEnabled.Name = "cbPanEnabled"; - this.cbPanEnabled.Size = new System.Drawing.Size(22, 21); + this.cbPanEnabled.Size = new System.Drawing.Size(15, 14); this.cbPanEnabled.TabIndex = 0; this.cbPanEnabled.UseVisualStyleBackColor = true; this.cbPanEnabled.CheckedChanged += new System.EventHandler(this.cbPanEnabled_CheckedChanged); @@ -325,10 +321,9 @@ private void InitializeComponent() // cbAllowDragging // this.cbAllowDragging.AutoSize = true; - this.cbAllowDragging.Location = new System.Drawing.Point(20, 495); - this.cbAllowDragging.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbAllowDragging.Location = new System.Drawing.Point(11, 268); this.cbAllowDragging.Name = "cbAllowDragging"; - this.cbAllowDragging.Size = new System.Drawing.Size(360, 29); + this.cbAllowDragging.Size = new System.Drawing.Size(198, 17); this.cbAllowDragging.TabIndex = 0; this.cbAllowDragging.Text = "Allow dragging toolbar (experimental)"; this.cbAllowDragging.UseVisualStyleBackColor = true; @@ -337,11 +332,10 @@ private void InitializeComponent() // tabPage2 // this.tabPage2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.tabPage2.Location = new System.Drawing.Point(4, 33); - this.tabPage2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6); - this.tabPage2.Size = new System.Drawing.Size(894, 809); + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(484, 432); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Pens"; // @@ -367,20 +361,18 @@ private void InitializeComponent() this.tabPage3.Controls.Add(this.hiUndo); this.tabPage3.Controls.Add(this.hiEraser); this.tabPage3.Controls.Add(this.hiGlobal); - this.tabPage3.Location = new System.Drawing.Point(4, 33); - this.tabPage3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(894, 809); + this.tabPage3.Size = new System.Drawing.Size(484, 432); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Hotkeys"; // // cbAllowHotkeyInPointer // this.cbAllowHotkeyInPointer.AutoSize = true; - this.cbAllowHotkeyInPointer.Location = new System.Drawing.Point(35, 148); - this.cbAllowHotkeyInPointer.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cbAllowHotkeyInPointer.Location = new System.Drawing.Point(19, 87); this.cbAllowHotkeyInPointer.Name = "cbAllowHotkeyInPointer"; - this.cbAllowHotkeyInPointer.Size = new System.Drawing.Size(652, 29); + this.cbAllowHotkeyInPointer.Size = new System.Drawing.Size(356, 17); this.cbAllowHotkeyInPointer.TabIndex = 18; this.cbAllowHotkeyInPointer.Text = "Allow all following hotkeys in mouse pointer mode (may cause a mess):"; this.cbAllowHotkeyInPointer.UseVisualStyleBackColor = true; @@ -389,50 +381,45 @@ private void InitializeComponent() // lbHkInkVisible // this.lbHkInkVisible.AutoSize = true; - this.lbHkInkVisible.Location = new System.Drawing.Point(433, 351); - this.lbHkInkVisible.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbHkInkVisible.Location = new System.Drawing.Point(236, 202); this.lbHkInkVisible.Name = "lbHkInkVisible"; - this.lbHkInkVisible.Size = new System.Drawing.Size(101, 25); + this.lbHkInkVisible.Size = new System.Drawing.Size(57, 13); this.lbHkInkVisible.TabIndex = 16; this.lbHkInkVisible.Text = "View/Hide"; // // lbHkSnapshot // this.lbHkSnapshot.AutoSize = true; - this.lbHkSnapshot.Location = new System.Drawing.Point(433, 401); - this.lbHkSnapshot.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbHkSnapshot.Location = new System.Drawing.Point(236, 229); this.lbHkSnapshot.Name = "lbHkSnapshot"; - this.lbHkSnapshot.Size = new System.Drawing.Size(96, 25); + this.lbHkSnapshot.Size = new System.Drawing.Size(52, 13); this.lbHkSnapshot.TabIndex = 12; this.lbHkSnapshot.Text = "Snapshot"; // // lbHkClear // this.lbHkClear.AutoSize = true; - this.lbHkClear.Location = new System.Drawing.Point(433, 550); - this.lbHkClear.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbHkClear.Location = new System.Drawing.Point(236, 310); this.lbHkClear.Name = "lbHkClear"; - this.lbHkClear.Size = new System.Drawing.Size(59, 25); + this.lbHkClear.Size = new System.Drawing.Size(31, 13); this.lbHkClear.TabIndex = 13; this.lbHkClear.Text = "Clear"; // // lbHkPan // this.lbHkPan.AutoSize = true; - this.lbHkPan.Location = new System.Drawing.Point(433, 249); - this.lbHkPan.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbHkPan.Location = new System.Drawing.Point(236, 147); this.lbHkPan.Name = "lbHkPan"; - this.lbHkPan.Size = new System.Drawing.Size(47, 25); + this.lbHkPan.Size = new System.Drawing.Size(26, 13); this.lbHkPan.TabIndex = 10; this.lbHkPan.Text = "Pan"; // // lbHkPointer // this.lbHkPointer.AutoSize = true; - this.lbHkPointer.Location = new System.Drawing.Point(433, 301); - this.lbHkPointer.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbHkPointer.Location = new System.Drawing.Point(236, 175); this.lbHkPointer.Name = "lbHkPointer"; - this.lbHkPointer.Size = new System.Drawing.Size(136, 25); + this.lbHkPointer.Size = new System.Drawing.Size(74, 13); this.lbHkPointer.TabIndex = 6; this.lbHkPointer.Text = "Mouse pointer"; this.lbHkPointer.Visible = false; @@ -440,64 +427,48 @@ private void InitializeComponent() // lbHkRedo // this.lbHkRedo.AutoSize = true; - this.lbHkRedo.Location = new System.Drawing.Point(433, 500); - this.lbHkRedo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbHkRedo.Location = new System.Drawing.Point(236, 283); this.lbHkRedo.Name = "lbHkRedo"; - this.lbHkRedo.Size = new System.Drawing.Size(58, 25); + this.lbHkRedo.Size = new System.Drawing.Size(33, 13); this.lbHkRedo.TabIndex = 7; this.lbHkRedo.Text = "Redo"; // // lbHkUndo // this.lbHkUndo.AutoSize = true; - this.lbHkUndo.Location = new System.Drawing.Point(433, 450); - this.lbHkUndo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbHkUndo.Location = new System.Drawing.Point(236, 256); this.lbHkUndo.Name = "lbHkUndo"; - this.lbHkUndo.Size = new System.Drawing.Size(59, 25); + this.lbHkUndo.Size = new System.Drawing.Size(33, 13); this.lbHkUndo.TabIndex = 4; this.lbHkUndo.Text = "Undo"; // // lbHkEraser // this.lbHkEraser.AutoSize = true; - this.lbHkEraser.Location = new System.Drawing.Point(433, 199); - this.lbHkEraser.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbHkEraser.Location = new System.Drawing.Point(236, 120); this.lbHkEraser.Name = "lbHkEraser"; - this.lbHkEraser.Size = new System.Drawing.Size(69, 25); + this.lbHkEraser.Size = new System.Drawing.Size(37, 13); this.lbHkEraser.TabIndex = 4; this.lbHkEraser.Text = "Eraser"; // // lbGlobalHotkey // this.lbGlobalHotkey.AutoSize = true; - this.lbGlobalHotkey.Location = new System.Drawing.Point(31, 33); - this.lbGlobalHotkey.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lbGlobalHotkey.Location = new System.Drawing.Point(17, 18); this.lbGlobalHotkey.Name = "lbGlobalHotkey"; - this.lbGlobalHotkey.Size = new System.Drawing.Size(642, 25); + this.lbGlobalHotkey.Size = new System.Drawing.Size(351, 13); this.lbGlobalHotkey.TabIndex = 4; this.lbGlobalHotkey.Text = "Global hotkey (start drawing, switch between mouse pointer and drawing)"; // - // pictureBox2 - // - this.pictureBox2.BackgroundImage = global::gInk.Properties.Resources.i18n; - this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pictureBox2.Location = new System.Drawing.Point(22, 244); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(0); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(40, 35); - this.pictureBox2.TabIndex = 8; - this.pictureBox2.TabStop = false; - // // hiInkVisible // this.hiInkVisible.BackColor = System.Drawing.Color.White; this.hiInkVisible.ExternalConflictFlag = false; this.hiInkVisible.Hotkey = hotkey1; - this.hiInkVisible.Location = new System.Drawing.Point(567, 351); - this.hiInkVisible.Margin = new System.Windows.Forms.Padding(6); + this.hiInkVisible.Location = new System.Drawing.Point(340, 202); this.hiInkVisible.Name = "hiInkVisible"; this.hiInkVisible.RequireModifier = false; - this.hiInkVisible.Size = new System.Drawing.Size(272, 29); + this.hiInkVisible.Size = new System.Drawing.Size(120, 20); this.hiInkVisible.TabIndex = 17; this.hiInkVisible.Text = "None"; this.hiInkVisible.OnHotkeyChanged += new System.EventHandler(this.hi_OnHotkeyChanged); @@ -507,11 +478,10 @@ private void InitializeComponent() this.hiSnapshot.BackColor = System.Drawing.Color.White; this.hiSnapshot.ExternalConflictFlag = false; this.hiSnapshot.Hotkey = hotkey2; - this.hiSnapshot.Location = new System.Drawing.Point(567, 401); - this.hiSnapshot.Margin = new System.Windows.Forms.Padding(6); + this.hiSnapshot.Location = new System.Drawing.Point(340, 229); this.hiSnapshot.Name = "hiSnapshot"; this.hiSnapshot.RequireModifier = false; - this.hiSnapshot.Size = new System.Drawing.Size(272, 29); + this.hiSnapshot.Size = new System.Drawing.Size(120, 20); this.hiSnapshot.TabIndex = 14; this.hiSnapshot.Text = "None"; this.hiSnapshot.OnHotkeyChanged += new System.EventHandler(this.hi_OnHotkeyChanged); @@ -521,11 +491,10 @@ private void InitializeComponent() this.hiClear.BackColor = System.Drawing.Color.White; this.hiClear.ExternalConflictFlag = false; this.hiClear.Hotkey = hotkey3; - this.hiClear.Location = new System.Drawing.Point(567, 550); - this.hiClear.Margin = new System.Windows.Forms.Padding(6); + this.hiClear.Location = new System.Drawing.Point(340, 310); this.hiClear.Name = "hiClear"; this.hiClear.RequireModifier = false; - this.hiClear.Size = new System.Drawing.Size(272, 29); + this.hiClear.Size = new System.Drawing.Size(120, 20); this.hiClear.TabIndex = 15; this.hiClear.Text = "None"; this.hiClear.OnHotkeyChanged += new System.EventHandler(this.hi_OnHotkeyChanged); @@ -535,11 +504,10 @@ private void InitializeComponent() this.hiPan.BackColor = System.Drawing.Color.White; this.hiPan.ExternalConflictFlag = false; this.hiPan.Hotkey = hotkey4; - this.hiPan.Location = new System.Drawing.Point(567, 249); - this.hiPan.Margin = new System.Windows.Forms.Padding(6); + this.hiPan.Location = new System.Drawing.Point(340, 147); this.hiPan.Name = "hiPan"; this.hiPan.RequireModifier = false; - this.hiPan.Size = new System.Drawing.Size(272, 29); + this.hiPan.Size = new System.Drawing.Size(120, 20); this.hiPan.TabIndex = 11; this.hiPan.Text = "None"; this.hiPan.OnHotkeyChanged += new System.EventHandler(this.hi_OnHotkeyChanged); @@ -549,11 +517,10 @@ private void InitializeComponent() this.hiPointer.BackColor = System.Drawing.Color.White; this.hiPointer.ExternalConflictFlag = false; this.hiPointer.Hotkey = hotkey5; - this.hiPointer.Location = new System.Drawing.Point(567, 301); - this.hiPointer.Margin = new System.Windows.Forms.Padding(6); + this.hiPointer.Location = new System.Drawing.Point(340, 175); this.hiPointer.Name = "hiPointer"; this.hiPointer.RequireModifier = false; - this.hiPointer.Size = new System.Drawing.Size(272, 29); + this.hiPointer.Size = new System.Drawing.Size(120, 20); this.hiPointer.TabIndex = 8; this.hiPointer.Text = "None"; this.hiPointer.Visible = false; @@ -564,11 +531,10 @@ private void InitializeComponent() this.hiRedo.BackColor = System.Drawing.Color.White; this.hiRedo.ExternalConflictFlag = false; this.hiRedo.Hotkey = hotkey6; - this.hiRedo.Location = new System.Drawing.Point(567, 500); - this.hiRedo.Margin = new System.Windows.Forms.Padding(6); + this.hiRedo.Location = new System.Drawing.Point(340, 283); this.hiRedo.Name = "hiRedo"; this.hiRedo.RequireModifier = false; - this.hiRedo.Size = new System.Drawing.Size(272, 29); + this.hiRedo.Size = new System.Drawing.Size(120, 20); this.hiRedo.TabIndex = 9; this.hiRedo.Text = "None"; this.hiRedo.OnHotkeyChanged += new System.EventHandler(this.hi_OnHotkeyChanged); @@ -578,11 +544,10 @@ private void InitializeComponent() this.hiUndo.BackColor = System.Drawing.Color.White; this.hiUndo.ExternalConflictFlag = false; this.hiUndo.Hotkey = hotkey7; - this.hiUndo.Location = new System.Drawing.Point(567, 450); - this.hiUndo.Margin = new System.Windows.Forms.Padding(6); + this.hiUndo.Location = new System.Drawing.Point(340, 256); this.hiUndo.Name = "hiUndo"; this.hiUndo.RequireModifier = false; - this.hiUndo.Size = new System.Drawing.Size(272, 29); + this.hiUndo.Size = new System.Drawing.Size(120, 20); this.hiUndo.TabIndex = 5; this.hiUndo.Text = "None"; this.hiUndo.OnHotkeyChanged += new System.EventHandler(this.hi_OnHotkeyChanged); @@ -592,11 +557,10 @@ private void InitializeComponent() this.hiEraser.BackColor = System.Drawing.Color.White; this.hiEraser.ExternalConflictFlag = false; this.hiEraser.Hotkey = hotkey8; - this.hiEraser.Location = new System.Drawing.Point(567, 199); - this.hiEraser.Margin = new System.Windows.Forms.Padding(6); + this.hiEraser.Location = new System.Drawing.Point(340, 120); this.hiEraser.Name = "hiEraser"; this.hiEraser.RequireModifier = false; - this.hiEraser.Size = new System.Drawing.Size(272, 29); + this.hiEraser.Size = new System.Drawing.Size(120, 20); this.hiEraser.TabIndex = 5; this.hiEraser.Text = "None"; this.hiEraser.OnHotkeyChanged += new System.EventHandler(this.hi_OnHotkeyChanged); @@ -606,23 +570,21 @@ private void InitializeComponent() this.hiGlobal.BackColor = System.Drawing.Color.White; this.hiGlobal.ExternalConflictFlag = false; this.hiGlobal.Hotkey = hotkey9; - this.hiGlobal.Location = new System.Drawing.Point(35, 72); - this.hiGlobal.Margin = new System.Windows.Forms.Padding(6); + this.hiGlobal.Location = new System.Drawing.Point(19, 39); this.hiGlobal.Name = "hiGlobal"; this.hiGlobal.RequireModifier = true; - this.hiGlobal.Size = new System.Drawing.Size(272, 29); + this.hiGlobal.Size = new System.Drawing.Size(120, 20); this.hiGlobal.TabIndex = 5; this.hiGlobal.Text = "None"; this.hiGlobal.OnHotkeyChanged += new System.EventHandler(this.hi_OnHotkeyChanged); // // FormOptions // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.ClientSize = new System.Drawing.Size(893, 836); + this.ClientSize = new System.Drawing.Size(487, 453); this.Controls.Add(this.tabControl1); - this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.MaximizeBox = false; this.Name = "FormOptions"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; @@ -632,10 +594,10 @@ private void InitializeComponent() this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); } diff --git a/src/FormOptions.cs b/src/FormOptions.cs index b812999..9510c8b 100644 --- a/src/FormOptions.cs +++ b/src/FormOptions.cs @@ -64,25 +64,25 @@ private void FormOptions_Load(object sender, EventArgs e) lbNote.ForeColor = Color.Black; lbcbPens = new Label(); - lbcbPens.Left = 90; + lbcbPens.Left = 105; lbcbPens.Width = 35; lbcbPens.Top = 15; tabPage2.Controls.Add(lbcbPens); lbpboxPens = new Label(); - lbpboxPens.Left = 125; + lbpboxPens.Left = 145; lbpboxPens.Width = 35; lbpboxPens.Top = 15; tabPage2.Controls.Add(lbpboxPens); lbcomboPensAlpha = new Label(); - lbcomboPensAlpha.Left = 160; + lbcomboPensAlpha.Left = 190; lbcomboPensAlpha.Width = 55; lbcomboPensAlpha.Top = 15; tabPage2.Controls.Add(lbcomboPensAlpha); lbcomboPensWidth = new Label(); - lbcomboPensWidth.Left = 250; + lbcomboPensWidth.Left = 315; lbcomboPensWidth.Width = 55; lbcomboPensWidth.Top = 15; @@ -90,14 +90,14 @@ private void FormOptions_Load(object sender, EventArgs e) for (int p = 0; p < Root.MaxPenCount; p++) { - int top = p * 25 + 40; + int top = p * 30 + 40; lbPens[p] = new Label(); - lbPens[p].Left = 40; - lbPens[p].Width = 40; + lbPens[p].Left = 20; + lbPens[p].Width = 90; lbPens[p].Top = top; cbPens[p] = new CheckBox(); - cbPens[p].Left = 90; + cbPens[p].Left = 110; cbPens[p].Width = 15; cbPens[p].Top = top - 5; cbPens[p].Text = ""; @@ -105,7 +105,7 @@ private void FormOptions_Load(object sender, EventArgs e) cbPens[p].CheckedChanged += cbPens_CheckedChanged; pboxPens[p] = new PictureBox(); - pboxPens[p].Left = 125; + pboxPens[p].Left = 150; pboxPens[p].Top = top; pboxPens[p].Width = 15; pboxPens[p].Height = 15; @@ -114,17 +114,17 @@ private void FormOptions_Load(object sender, EventArgs e) comboPensAlpha[p] = new ComboBox(); - comboPensAlpha[p].Left = 160; + comboPensAlpha[p].Left = 195; comboPensAlpha[p].Top = top - 2; - comboPensAlpha[p].Width = 70; + comboPensAlpha[p].Width = 100; comboPensAlpha[p].Text = (255 - Root.PenAttr[p].Transparency).ToString(); comboPensAlpha[p].TextChanged += comboPensAlpha_TextChanged; comboPensWidth[p] = new ComboBox(); - comboPensWidth[p].Left = 250; + comboPensWidth[p].Left = 320; comboPensWidth[p].Top = top - 2; - comboPensWidth[p].Width = 70; + comboPensWidth[p].Width = 100; comboPensWidth[p].Text = ((int)Root.PenAttr[p].Width).ToString(); comboPensWidth[p].TextChanged += comboPensWidth_TextChanged; @@ -137,16 +137,16 @@ private void FormOptions_Load(object sender, EventArgs e) for (int p = 0; p < Root.MaxPenCount; p++) { - int top = p * 25 + 100; + int top = p * 25 + 120; lbHotkeyPens[p] = new Label(); lbHotkeyPens[p].Left = 20; - lbHotkeyPens[p].Width = 40; + lbHotkeyPens[p].Width = 80; lbHotkeyPens[p].Top = top; hiPens[p] = new HotkeyInputBox(); hiPens[p].Hotkey = Root.Hotkey_Pens[p]; - hiPens[p].Left = 70; - hiPens[p].Width = 150; + hiPens[p].Left = 100; + hiPens[p].Width = 120; hiPens[p].Top = top; hiPens[p].OnHotkeyChanged += hi_OnHotkeyChanged;