diff --git a/VirtualDestopCycle/Form1.Designer.cs b/VirtualDestopCycle/Form1.Designer.cs index ee2ab39..aff1a8b 100644 --- a/VirtualDestopCycle/Form1.Designer.cs +++ b/VirtualDestopCycle/Form1.Designer.cs @@ -34,20 +34,18 @@ private void InitializeComponent() this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.checkBoxAlternateCombination = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.removeButton = new System.Windows.Forms.Button(); + this.removeFileButton = new System.Windows.Forms.Button(); this.downButton = new System.Windows.Forms.Button(); this.upButton = new System.Windows.Forms.Button(); - this.listView1 = new System.Windows.Forms.ListView(); + this.listViewFiles = new System.Windows.Forms.ListView(); this.addFileButton = new System.Windows.Forms.Button(); this.saveButton = new System.Windows.Forms.Button(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.labelStatus = new System.Windows.Forms.Label(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); + this.labelStatus = new System.Windows.Forms.Label(); this.contextMenuStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // notifyIcon1 @@ -56,7 +54,7 @@ private void InitializeComponent() this.notifyIcon1.Icon = global::VirtualDesktopManager.Properties.Resources.mainIco; this.notifyIcon1.Text = "Virtual Desktop Manager"; this.notifyIcon1.Visible = true; - this.notifyIcon1.DoubleClick += new System.EventHandler(this.notifyIcon1_DoubleClick); + this.notifyIcon1.DoubleClick += new System.EventHandler(this.openSettings); // // contextMenuStrip1 // @@ -65,48 +63,48 @@ private void InitializeComponent() this.settingsToolStripMenuItem, this.exitToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(117, 48); + this.contextMenuStrip1.Size = new System.Drawing.Size(138, 56); // // settingsToolStripMenuItem // this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(116, 22); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(137, 26); this.settingsToolStripMenuItem.Text = "Settings"; - this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); + this.settingsToolStripMenuItem.Click += new System.EventHandler(this.openSettings); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(116, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(137, 26); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // - // checkBox1 + // checkBoxAlternateCombination // - this.checkBox1.AutoSize = true; - this.checkBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.checkBox1.ForeColor = System.Drawing.Color.White; - this.checkBox1.Location = new System.Drawing.Point(14, 54); - this.checkBox1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(353, 21); - this.checkBox1.TabIndex = 1; - this.checkBox1.Text = "Use alternate key combination (Shift+Alt+Left/Right)"; - this.checkBox1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.checkBox1.UseVisualStyleBackColor = true; + this.checkBoxAlternateCombination.AutoSize = true; + this.checkBoxAlternateCombination.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.checkBoxAlternateCombination.ForeColor = System.Drawing.Color.White; + this.checkBoxAlternateCombination.Location = new System.Drawing.Point(14, 54); + this.checkBoxAlternateCombination.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.checkBoxAlternateCombination.Name = "checkBoxAlternateCombination"; + this.checkBoxAlternateCombination.Size = new System.Drawing.Size(420, 24); + this.checkBoxAlternateCombination.TabIndex = 1; + this.checkBoxAlternateCombination.Text = "Use alternate key combination (Shift+Alt+Left/Right)"; + this.checkBoxAlternateCombination.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.checkBoxAlternateCombination.UseVisualStyleBackColor = true; // // groupBox1 // this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox1.BackColor = System.Drawing.Color.Black; - this.groupBox1.Controls.Add(this.removeButton); + this.groupBox1.Controls.Add(this.removeFileButton); this.groupBox1.Controls.Add(this.downButton); this.groupBox1.Controls.Add(this.upButton); - this.groupBox1.Controls.Add(this.listView1); + this.groupBox1.Controls.Add(this.listViewFiles); this.groupBox1.Controls.Add(this.addFileButton); this.groupBox1.Controls.Add(this.saveButton); - this.groupBox1.Controls.Add(this.checkBox1); + this.groupBox1.Controls.Add(this.checkBoxAlternateCombination); this.groupBox1.Font = new System.Drawing.Font("Segoe UI", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.groupBox1.ForeColor = System.Drawing.Color.White; this.groupBox1.Location = new System.Drawing.Point(8, 9); @@ -118,21 +116,21 @@ private void InitializeComponent() this.groupBox1.TabStop = false; this.groupBox1.Text = "Settings"; // - // removeButton - // - this.removeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.removeButton.BackColor = System.Drawing.Color.Black; - this.removeButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.removeButton.Font = new System.Drawing.Font("Segoe UI", 12F); - this.removeButton.ForeColor = System.Drawing.Color.White; - this.removeButton.Location = new System.Drawing.Point(175, 282); - this.removeButton.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.removeButton.Name = "removeButton"; - this.removeButton.Size = new System.Drawing.Size(144, 37); - this.removeButton.TabIndex = 7; - this.removeButton.Text = "Remove file"; - this.removeButton.UseVisualStyleBackColor = false; - this.removeButton.Click += new System.EventHandler(this.removeButton_Click); + // removeFileButton + // + this.removeFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.removeFileButton.BackColor = System.Drawing.Color.Black; + this.removeFileButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.removeFileButton.Font = new System.Drawing.Font("Segoe UI", 12F); + this.removeFileButton.ForeColor = System.Drawing.Color.White; + this.removeFileButton.Location = new System.Drawing.Point(175, 282); + this.removeFileButton.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.removeFileButton.Name = "removeFileButton"; + this.removeFileButton.Size = new System.Drawing.Size(144, 37); + this.removeFileButton.TabIndex = 7; + this.removeFileButton.Text = "Remove file"; + this.removeFileButton.UseVisualStyleBackColor = false; + this.removeFileButton.Click += new System.EventHandler(this.removeButton_Click); // // downButton // @@ -166,21 +164,21 @@ private void InitializeComponent() this.upButton.UseVisualStyleBackColor = false; this.upButton.Click += new System.EventHandler(this.upButton_Click); // - // listView1 + // listViewFiles // - this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.listViewFiles.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))); - this.listView1.Font = new System.Drawing.Font("Segoe UI", 12F); - this.listView1.HideSelection = false; - this.listView1.Location = new System.Drawing.Point(14, 98); - this.listView1.Name = "listView1"; - this.listView1.ShowGroups = false; - this.listView1.ShowItemToolTips = true; - this.listView1.Size = new System.Drawing.Size(508, 168); - this.listView1.TabIndex = 4; - this.listView1.UseCompatibleStateImageBehavior = false; - this.listView1.View = System.Windows.Forms.View.Details; + this.listViewFiles.Font = new System.Drawing.Font("Segoe UI", 12F); + this.listViewFiles.HideSelection = false; + this.listViewFiles.Location = new System.Drawing.Point(14, 98); + this.listViewFiles.Name = "listViewFiles"; + this.listViewFiles.ShowGroups = false; + this.listViewFiles.ShowItemToolTips = true; + this.listViewFiles.Size = new System.Drawing.Size(508, 168); + this.listViewFiles.TabIndex = 4; + this.listViewFiles.UseCompatibleStateImageBehavior = false; + this.listViewFiles.View = System.Windows.Forms.View.Details; // // addFileButton // @@ -214,42 +212,30 @@ private void InitializeComponent() this.saveButton.UseVisualStyleBackColor = false; this.saveButton.Click += new System.EventHandler(this.saveButton_Click); // - // pictureBox1 + // openFileDialog1 // - this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.pictureBox1.Location = new System.Drawing.Point(8, 363); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(171, 76); - this.pictureBox1.TabIndex = 4; - this.pictureBox1.TabStop = false; + this.openFileDialog1.FileName = "openFileDialog1"; // // labelStatus // this.labelStatus.AutoSize = true; this.labelStatus.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.labelStatus.Location = new System.Drawing.Point(184, 363); + this.labelStatus.Location = new System.Drawing.Point(18, 364); this.labelStatus.Name = "labelStatus"; - this.labelStatus.Size = new System.Drawing.Size(0, 17); + this.labelStatus.Size = new System.Drawing.Size(0, 20); this.labelStatus.TabIndex = 5; // - // openFileDialog1 - // - this.openFileDialog1.FileName = "openFileDialog1"; - // // Form1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ActiveCaptionText; - this.ClientSize = new System.Drawing.Size(609, 451); + this.ClientSize = new System.Drawing.Size(609, 402); this.Controls.Add(this.labelStatus); - this.Controls.Add(this.pictureBox1); this.Controls.Add(this.groupBox1); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.ForeColor = System.Drawing.Color.White; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(1); this.Name = "Form1"; this.ShowIcon = false; @@ -260,7 +246,6 @@ private void InitializeComponent() this.contextMenuStrip1.ResumeLayout(false); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -274,17 +259,16 @@ private void InitializeComponent() private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; - private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.CheckBox checkBoxAlternateCombination; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Button saveButton; - private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.Label labelStatus; private System.Windows.Forms.Button addFileButton; private System.Windows.Forms.OpenFileDialog openFileDialog1; - private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.ListView listViewFiles; private System.Windows.Forms.Button downButton; private System.Windows.Forms.Button upButton; - private System.Windows.Forms.Button removeButton; + private System.Windows.Forms.Button removeFileButton; + private System.Windows.Forms.Label labelStatus; } } diff --git a/VirtualDestopCycle/Form1.cs b/VirtualDestopCycle/Form1.cs index 1aa076c..55f7b3f 100644 --- a/VirtualDestopCycle/Form1.cs +++ b/VirtualDestopCycle/Form1.cs @@ -32,8 +32,6 @@ public partial class Form1 : Form private bool closeToTray; - private bool useAltKeySettings; - public Form1() { InitializeComponent(); @@ -57,33 +55,23 @@ public Form1() this.FormClosing += Form1_FormClosing; - useAltKeySettings = Properties.Settings.Default.AltHotKey; - checkBox1.Checked = useAltKeySettings; + checkBoxAlternateCombination.Checked = Properties.Settings.Default.AltHotKey; - listView1.Items.Clear(); - listView1.Columns.Add("File").Width = 400; + listViewFiles.Items.Clear(); + listViewFiles.Columns.Add("File").Width = 400; foreach (var file in Properties.Settings.Default.DesktopBackgroundFiles) { - listView1.Items.Add(NewListViewItem(file)); + listViewFiles.Items.Add(NewListViewItem(file)); } } private void NumberHotkeyPressed(object sender, KeyPressedEventArgs e) - { - var index = (int) e.HotKey.Key - (int)Key.D0 - 1; - var currentDesktopIndex = getCurrentDesktopIndex(); - - if (index == currentDesktopIndex) - { - return; - } - - if (index > desktops.Count - 1) + { + var index = (int)e.HotKey.Key - (int)Key.D0 - 1; + if (index != CurrentDesktopIndex && index < desktops.Count) { - return; + desktops.ElementAt(index)?.Switch(); } - - desktops.ElementAt(index)?.Switch(); } private void Form1_FormClosing(object sender, FormClosingEventArgs e) @@ -118,7 +106,7 @@ private void VirtualDesktop_Destroyed(object sender, VirtualDesktopDestroyEventA private void VirtualDesktop_CurrentChanged(object sender, VirtualDesktopChangedEventArgs e) { // 0 == first - int currentDesktopIndex = getCurrentDesktopIndex(); + int currentDesktopIndex = CurrentDesktopIndex; string pictureFile = PickNthFile(currentDesktopIndex); if (pictureFile != null) @@ -151,7 +139,7 @@ private void exitToolStripMenuItem_Click(object sender, EventArgs e) } private void normalHotkeys() - { + { try { _rightHotkey.Register(Key.Right, System.Windows.Input.ModifierKeys.Control | System.Windows.Input.ModifierKeys.Alt); @@ -199,28 +187,33 @@ private void Form1_Load(object sender, EventArgs e) { labelStatus.Text = ""; - if (!useAltKeySettings) - normalHotkeys(); - else - alternateHotkeys(); - + RegisterHotKeys(checkBoxAlternateCombination.Checked); var desktop = initialDesktopState(); changeTrayIcon(); this.Visible = false; } - private int getCurrentDesktopIndex() + private void RegisterHotKeys(bool condition) { - return desktops.IndexOf(VirtualDesktop.Current); + if (condition) + { + normalHotkeys(); + } + else + { + alternateHotkeys(); + } } + private int CurrentDesktopIndex => desktops.IndexOf(VirtualDesktop.Current); + private void saveApplicationFocus(int currentDesktopIndex = -1) { IntPtr activeAppWindow = GetForegroundWindow(); if (currentDesktopIndex == -1) - currentDesktopIndex = getCurrentDesktopIndex(); + currentDesktopIndex = CurrentDesktopIndex; activePrograms[currentDesktopIndex] = activeAppWindow; } @@ -228,7 +221,7 @@ private void saveApplicationFocus(int currentDesktopIndex = -1) private void restoreApplicationFocus(int currentDesktopIndex = -1) { if (currentDesktopIndex == -1) - currentDesktopIndex = getCurrentDesktopIndex(); + currentDesktopIndex = CurrentDesktopIndex; if (activePrograms[currentDesktopIndex] != null && activePrograms[currentDesktopIndex] != IntPtr.Zero) { @@ -238,8 +231,8 @@ private void restoreApplicationFocus(int currentDesktopIndex = -1) private void changeTrayIcon(int currentDesktopIndex = -1) { - if(currentDesktopIndex == -1) - currentDesktopIndex = getCurrentDesktopIndex(); + if (currentDesktopIndex == -1) + currentDesktopIndex = CurrentDesktopIndex; var desktopNumber = currentDesktopIndex + 1; var desktopNumberString = desktopNumber.ToString(); @@ -248,12 +241,13 @@ private void changeTrayIcon(int currentDesktopIndex = -1) var xPlacement = 100; var yPlacement = 50; - if(desktopNumber > 9 && desktopNumber < 100) + if (desktopNumber > 9 && desktopNumber < 100) { fontSize = 125; xPlacement = 75; yPlacement = 65; - } else if(desktopNumber > 99) + } + else if (desktopNumber > 99) { fontSize = 80; xPlacement = 90; @@ -278,7 +272,7 @@ private void changeTrayIcon(int currentDesktopIndex = -1) VirtualDesktop initialDesktopState() { var desktop = VirtualDesktop.Current; - int desktopIndex = getCurrentDesktopIndex(); + int desktopIndex = CurrentDesktopIndex; saveApplicationFocus(desktopIndex); @@ -287,73 +281,31 @@ VirtualDesktop initialDesktopState() void RightKeyManagerPressed(object sender, KeyPressedEventArgs e) { - var desktop = initialDesktopState(); - - if(desktop.GetRight() != null) - { - desktop.GetRight()?.Switch(); - } else - { - desktops.First()?.Switch(); - } + desktops[(CurrentDesktopIndex + 1) % desktops.Count].Switch(); } void LeftKeyManagerPressed(object sender, KeyPressedEventArgs e) { - var desktop = initialDesktopState(); - - if (desktop.GetLeft() != null) - { - desktop.GetLeft()?.Switch(); - } - else - { - desktops.Last()?.Switch(); - } + desktops[(CurrentDesktopIndex - 1 + desktops.Count) % desktops.Count].Switch(); } - private void openSettings() + private void openSettings(object sender = null, EventArgs e = null) { this.Visible = true; - this.WindowState = System.Windows.Forms.FormWindowState.Normal; + this.WindowState = FormWindowState.Normal; this.ShowInTaskbar = true; } - private void settingsToolStripMenuItem_Click(object sender, EventArgs e) - { - openSettings(); - } - - private void notifyIcon1_DoubleClick(object sender, EventArgs e) - { - openSettings(); - } - private void upButton_Click(object sender, EventArgs e) { try { - if (listView1.SelectedItems.Count > 0) - { - ListViewItem selected = listView1.SelectedItems[0]; - int indx = selected.Index; - int totl = listView1.Items.Count; - - if (indx == 0) - { - listView1.Items.Remove(selected); - listView1.Items.Insert(totl - 1, selected); - } - else - { - listView1.Items.Remove(selected); - listView1.Items.Insert(indx - 1, selected); - } - } - else + int total = listViewFiles.Items.Count; + foreach (ListViewItem selected in listViewFiles.SelectedItems) { - MessageBox.Show("You can only move one item at a time. Please select only one item and try again.", - "Item Select", MessageBoxButtons.OK, MessageBoxIcon.Stop); + int index = selected.Index; + listViewFiles.Items.RemoveAt(index); + listViewFiles.Items.Insert((index - 1 + total) % total, selected); } } catch (Exception ex) @@ -366,27 +318,14 @@ private void downButton_Click(object sender, EventArgs e) { try { - if (listView1.SelectedItems.Count > 0) + int total = listViewFiles.Items.Count; + ListViewItem[] items = new ListViewItem[listViewFiles.SelectedIndices.Count]; + listViewFiles.SelectedItems.CopyTo(items, 0); + foreach (ListViewItem selected in items.Reverse()) { - ListViewItem selected = listView1.SelectedItems[0]; - int indx = selected.Index; - int totl = listView1.Items.Count; - - if (indx == totl - 1) - { - listView1.Items.Remove(selected); - listView1.Items.Insert(0, selected); - } - else - { - listView1.Items.Remove(selected); - listView1.Items.Insert(indx + 1, selected); - } - } - else - { - MessageBox.Show("You can only move one item at a time. Please select only one item and try again.", - "Item Select", MessageBoxButtons.OK, MessageBoxIcon.Stop); + int index = selected.Index; + listViewFiles.Items.RemoveAt(index); + listViewFiles.Items.Insert((index + 1) % total, selected); } } catch (Exception ex) @@ -401,19 +340,11 @@ private void saveButton_Click(object sender, EventArgs e) _rightHotkey.Unregister(Key.Right, System.Windows.Input.ModifierKeys.Shift | System.Windows.Input.ModifierKeys.Alt); _leftHotkey.Unregister(Key.Left, System.Windows.Input.ModifierKeys.Shift | System.Windows.Input.ModifierKeys.Alt); - if (checkBox1.Checked) - { - alternateHotkeys(); - Properties.Settings.Default.AltHotKey = true; - } - else - { - normalHotkeys(); - Properties.Settings.Default.AltHotKey = false; - } + Properties.Settings.Default.AltHotKey = checkBoxAlternateCombination.Checked; + RegisterHotKeys(checkBoxAlternateCombination.Checked); Properties.Settings.Default.DesktopBackgroundFiles.Clear(); - foreach (ListViewItem item in listView1.Items) + foreach (ListViewItem item in listViewFiles.Items) { Properties.Settings.Default.DesktopBackgroundFiles.Add(item.Tag.ToString()); } @@ -435,7 +366,7 @@ private void addFileButton_Click(object sender, EventArgs e) { foreach (string file in openFileDialog1.FileNames) { - listView1.Items.Add(NewListViewItem(file)); + listViewFiles.Items.Add(NewListViewItem(file)); } } } @@ -455,10 +386,9 @@ private void removeButton_Click(object sender, EventArgs e) { try { - if (listView1.SelectedItems.Count > 0) + foreach (int index in listViewFiles.SelectedIndices) { - ListViewItem selected = listView1.SelectedItems[0]; - listView1.Items.Remove(selected); + listViewFiles.Items.RemoveAt(index); } } catch (Exception ex) diff --git a/VirtualDestopCycle/Properties/Resources.Designer.cs b/VirtualDestopCycle/Properties/Resources.Designer.cs index 0c90cb5..1773d82 100644 --- a/VirtualDestopCycle/Properties/Resources.Designer.cs +++ b/VirtualDestopCycle/Properties/Resources.Designer.cs @@ -59,97 +59,7 @@ internal Resources() { resourceCulture = value; } } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon _1 { - get { - object obj = ResourceManager.GetObject("_1", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon _2 { - get { - object obj = ResourceManager.GetObject("_2", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon _3 { - get { - object obj = ResourceManager.GetObject("_3", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon _4 { - get { - object obj = ResourceManager.GetObject("_4", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon _5 { - get { - object obj = ResourceManager.GetObject("_5", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon _6 { - get { - object obj = ResourceManager.GetObject("_6", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon _7 { - get { - object obj = ResourceManager.GetObject("_7", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon _8 { - get { - object obj = ResourceManager.GetObject("_8", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon _9 { - get { - object obj = ResourceManager.GetObject("_9", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// diff --git a/VirtualDestopCycle/Properties/Resources.resx b/VirtualDestopCycle/Properties/Resources.resx index 92cecf5..4953831 100644 --- a/VirtualDestopCycle/Properties/Resources.resx +++ b/VirtualDestopCycle/Properties/Resources.resx @@ -124,31 +124,4 @@ ..\Resources\mainIco.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\3.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\4.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\5.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\6.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\7.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\8.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\9.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - \ No newline at end of file + \ No newline at end of file diff --git a/VirtualDestopCycle/Resources/1.ico b/VirtualDestopCycle/Resources/1.ico deleted file mode 100644 index 71b99eb..0000000 Binary files a/VirtualDestopCycle/Resources/1.ico and /dev/null differ diff --git a/VirtualDestopCycle/Resources/2.ico b/VirtualDestopCycle/Resources/2.ico deleted file mode 100644 index 1a6d326..0000000 Binary files a/VirtualDestopCycle/Resources/2.ico and /dev/null differ diff --git a/VirtualDestopCycle/Resources/3.ico b/VirtualDestopCycle/Resources/3.ico deleted file mode 100644 index c94bf6e..0000000 Binary files a/VirtualDestopCycle/Resources/3.ico and /dev/null differ diff --git a/VirtualDestopCycle/Resources/4.ico b/VirtualDestopCycle/Resources/4.ico deleted file mode 100644 index f3c17e3..0000000 Binary files a/VirtualDestopCycle/Resources/4.ico and /dev/null differ diff --git a/VirtualDestopCycle/Resources/5.ico b/VirtualDestopCycle/Resources/5.ico deleted file mode 100644 index d5baec1..0000000 Binary files a/VirtualDestopCycle/Resources/5.ico and /dev/null differ diff --git a/VirtualDestopCycle/Resources/6.ico b/VirtualDestopCycle/Resources/6.ico deleted file mode 100644 index 706610d..0000000 Binary files a/VirtualDestopCycle/Resources/6.ico and /dev/null differ diff --git a/VirtualDestopCycle/Resources/7.ico b/VirtualDestopCycle/Resources/7.ico deleted file mode 100644 index 231204b..0000000 Binary files a/VirtualDestopCycle/Resources/7.ico and /dev/null differ diff --git a/VirtualDestopCycle/Resources/8.ico b/VirtualDestopCycle/Resources/8.ico deleted file mode 100644 index d2ba8ed..0000000 Binary files a/VirtualDestopCycle/Resources/8.ico and /dev/null differ diff --git a/VirtualDestopCycle/Resources/9.ico b/VirtualDestopCycle/Resources/9.ico deleted file mode 100644 index ae0a785..0000000 Binary files a/VirtualDestopCycle/Resources/9.ico and /dev/null differ diff --git a/VirtualDestopCycle/Resources/9plus.ico b/VirtualDestopCycle/Resources/9plus.ico deleted file mode 100644 index e48ce69..0000000 Binary files a/VirtualDestopCycle/Resources/9plus.ico and /dev/null differ diff --git a/VirtualDestopCycle/VirtualDesktopManager.csproj b/VirtualDestopCycle/VirtualDesktopManager.csproj index 9c4b7f5..bca10d9 100644 --- a/VirtualDestopCycle/VirtualDesktopManager.csproj +++ b/VirtualDestopCycle/VirtualDesktopManager.csproj @@ -71,7 +71,8 @@ true - Resources\mainIco.ico + + @@ -141,37 +142,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -