WebSVN – Code-Repo – Path Comparison – / – /SWAT Office App/ Rev 49 and /SWAT Office App/ Rev 50

Ignore whitespace Rev 49 → Rev 50

 /SWAT Office App/trunk/SWAT Office App/AboutBox.cs
 ,7 → 15,7
             InitializeComponent();
             this.Text = "Program Info";
             this.labelProductName.Text = "SWAT Office App";
-            this.labelVersion.Text = "Version 2.5";
+            this.labelVersion.Text = "Version 2.5.1";
             this.labelCopyright.Text = "Copyright to Kevin Lee @ Virginia Tech";
             this.labelCompanyName.Text = "Author: Kevin Lee";
             this.textBoxDescription.Text = "This program has been written by Kevin Lee for use " +

 /SWAT Office App/trunk/SWAT Office App/DriveLogger_Form.cs
 ,7 → 97,7
                         if (Settings_Form.driveLoggerDrivesToIgnore.Contains(drive.Name))
                             continue;
-                        // Check for non-matching entries in the two lists
+                        // Check for non-matching entries
                         if (!drivesPreviouslyDetectedList.Contains(drive.Name))
                         {
                             // Creates and populates a new DriveEntry

 /SWAT Office App/trunk/SWAT Office App/Main_Menu_Form.Designer.cs
 ,6 → 1,6
 namespace SWAT_Office_App
 {
-    partial class Menu1_Main
+    partial class Menu_Main
     {
         /// <summary>
         /// Required designer variable.
 ,7 → 28,7
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Menu1_Main));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Menu_Main));
             this.groupBox_Menu1 = new System.Windows.Forms.GroupBox();
             this.btn_DriveLogger = new System.Windows.Forms.Button();
             this.btn_Settings = new System.Windows.Forms.Button();

 /SWAT Office App/trunk/SWAT Office App/Main_Menu_Form.cs
 ,16 → 9,16
 namespace SWAT_Office_App
 {
-    public partial class Menu1_Main : Form
+    public partial class Menu_Main : Form
     {
-        public Menu1_Main()
+        public Menu_Main()
         {
             InitializeComponent();
             Settings_Form.ImportSettings();
-            this.KeyPress += new KeyPressEventHandler(Menu1_Main_KeyPress);
+            this.KeyPress += new KeyPressEventHandler(Menu_Main_KeyPress);
         }
-        void Menu1_Main_KeyPress(object sender, KeyPressEventArgs e)
+        void Menu_Main_KeyPress(object sender, KeyPressEventArgs e)
         {
             // Monitors for keypresses
             switch (e.KeyChar)

 /SWAT Office App/trunk/SWAT Office App/Manage_User_Accounts.cs
 ,34 → 234,6
             long size = GetDirSize(dir);
             return size;
         }
-        private static long GetDirSize(DirectoryInfo input)
-        {
-            try
-            {
-                if (input.Exists)
-                {
-                    long size = 0;
-                    FileInfo[] files = input.GetFiles();
-                    foreach (FileInfo file in files)
-                    {
-                        size += file.Length;
-                    }
-                    DirectoryInfo[] dirs = input.GetDirectories();
-                    foreach (DirectoryInfo dir in dirs)
-                    {
-                        size += GetDirSize(dir);
-                    }
-                    return size;
-                }
-                else
-                    return 0;
-            }
-            catch (Exception e)
-            {
-                MessageBox.Show(e.ToString(), "Error");
-                return 0;
-            }
-        }
         public static void ChangeUserPassword(string username, string password)
         {
             try
 ,6 → 282,34
             }
             return sessionsOpen;
         }
+        private static long GetDirSize(DirectoryInfo entry)
+        {
+            try
+            {
+                if (entry.Exists)
+                {
+                    long size = 0;
+                    FileInfo[] files = entry.GetFiles();
+                    foreach (FileInfo file in files)
+                    {
+                        size += file.Length;
+                    }
+                    DirectoryInfo[] dirs = entry.GetDirectories();
+                    foreach (DirectoryInfo dir in dirs)
+                    {
+                        size += GetDirSize(dir);
+                    }
+                    return size;
+                }
+                else
+                    return 0;
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show(e.ToString(), "Error");
+                return 0;
+            }
+        }
         private static void SetSharePermissions(string username)
         {
             string combinationString = "";

 /SWAT Office App/trunk/SWAT Office App/Manage_User_Accounts_Form.cs
 ,11 → 99,18
                         s_share.Text = "No";
                     entry.SubItems.Add(s_share);
                     ListViewItem.ListViewSubItem s_size = new ListViewItem.ListViewSubItem();
-                    long size = ManageUserAccounts.GetShareSize(user);
-                    if ((size / 1073741824) > 0)
-                        s_size.Text = (size / 1073741824).ToString() + " GB";
+                    if (Settings_Form.showFileSizes)
+                    {
+                        long size = ManageUserAccounts.GetShareSize(user);
+                        if ((size / 1073741824) > 0)
+                            s_size.Text = (size / 1073741824).ToString() + " GB";
+                        else
+                            s_size.Text = (size / 1048576).ToString() + " MB";
+                    }
                     else
-                        s_size.Text = (size / 1048576).ToString() + " MB";
+                    {
+                        s_size.Text = "NA";
+                    }
                     entry.SubItems.Add(s_size);
                     ListViewItem.ListViewSubItem s_datecreated = new ListViewItem.ListViewSubItem();
                     s_datecreated.Text = extraUserInformation[1];

 /SWAT Office App/trunk/SWAT Office App/Program.cs
 ,7 → 15,7
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Menu1_Main());
+            Application.Run(new Menu_Main());
         }
     }
 }

/SWAT Office App/trunk/SWAT Office App/Settings.xml
1,6 → 1,7
<?xml version="1.0" encoding="utf-8"?>
<Settings>
<ProgramSettings>
<ShowFileSizes>false</ShowFileSizes>
<SystemAccounts>Administrators,Administrator</SystemAccounts>
<HiddenAccounts>Administrator,Guest</HiddenAccounts>
<SharedFolderLocation>C:\</SharedFolderLocation>

 /SWAT Office App/trunk/SWAT Office App/Settings_Form.cs
 ,13 → 14,16
     public partial class Settings_Form : Form
     {
         public static bool defaultSettings { get; set; }
+        public static bool showFileSizes { get; set; }
         public static List<string> systemAccounts = new List<string>();
         public static List<string> hiddenAccounts = new List<string>();
         public static string sharedFolderLocation { get; set; }
         public static string usbMasterx32CopyLocation { get; set; }
         public static string usbMasterx64CopyLocation { get; set; }
+        // Static variables for use by DriveLogger
+        public static int driveLoggerRefreshInterval { get; set; }
         public static List<string> driveLoggerDockLabels = new List<string>();
-        public static int driveLoggerRefreshInterval { get; set; }
         public static List<string> driveLoggerDrivesToIgnore = new List<string>();
         private static Settings_Form _Settings_Form = null;
 ,6 → 73,8
                     // XML Parsing using System.XML.Linq
                     XElement Settings = XElement.Load("Settings.xml");
+                    showFileSizes = bool.Parse(Settings.Element("ProgramSettings").Element("ShowFileSizes").Value);
                     systemAccounts.Clear();
                     string tempSystemAccounts = Settings.Element("ProgramSettings").Element("SystemAccounts").Value;
                     string[] tempStringArray = tempSystemAccounts.Split(new char[] { ',' });

/SWAT Office App/trunk/SWAT Office App/bin/Debug/SWAT Office App.exe
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/SWAT Office App/trunk/SWAT Office App/bin/Debug/SWAT Office App.pdb
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/SWAT Office App/trunk/SWAT Office App/bin/Debug/Settings.xml
1,6 → 1,7
<?xml version="1.0" encoding="utf-8"?>
<Settings>
<ProgramSettings>
<ShowFileSizes>false</ShowFileSizes>
<SystemAccounts>Administrators,Administrator</SystemAccounts>
<HiddenAccounts>Administrator,Guest</HiddenAccounts>
<SharedFolderLocation>C:\</SharedFolderLocation>

/SWAT Office App/trunk/SWAT Office App/bin/Release/SWAT Office App.exe
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/SWAT Office App/trunk/SWAT Office App/bin/Release/SWAT Office App.pdb
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/SWAT Office App/trunk/SWAT Office App/bin/Release/Settings.xml
1,6 → 1,7
<?xml version="1.0" encoding="utf-8"?>
<Settings>
<ProgramSettings>
<ShowFileSizes>false</ShowFileSizes>
<SystemAccounts>Administrators,Administrator</SystemAccounts>
<HiddenAccounts>Administrator,Guest</HiddenAccounts>
<SharedFolderLocation>C:\</SharedFolderLocation>

/SWAT Office App/trunk/SWAT Office App/obj/x86/Debug/GenerateResource.write.1.tlog
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/SWAT Office App/trunk/SWAT Office App/obj/x86/Debug/SWAT Office App.csproj.FileListAbsolute.txt
50,7 → 50,6
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\SWAT_Office_App.AddSystemAccount_Form.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\SWAT_Office_App.AddUserAccount_Form.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\SWAT_Office_App.DeleteUserVerify_Form.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\SWAT_Office_App.Menu1_Main.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\SWAT_Office_App.ManageUserAccounts_Form.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\SWAT_Office_App.Properties.Resources.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\SWAT_Office_App.Reimage_USB_Drive_Progress_Form.resources
62,3 → 61,4
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\GenerateResource.write.1.tlog
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\SWAT_Office_App.DriveLogger_Form.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\SWAT_Office_App.DriveLogger_LabelPrompt_Form.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Debug\SWAT_Office_App.Menu_Main.resources

/SWAT Office App/trunk/SWAT Office App/obj/x86/Debug/SWAT Office App.exe
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/SWAT Office App/trunk/SWAT Office App/obj/x86/Debug/SWAT Office App.pdb
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/SWAT Office App/trunk/SWAT Office App/obj/x86/Release/GenerateResource.write.1.tlog
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/SWAT Office App/trunk/SWAT Office App/obj/x86/Release/SWAT Office App.csproj.FileListAbsolute.txt
48,7 → 48,6
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\SWAT_Office_App.DeleteUserVerify_Form.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\SWAT_Office_App.DriveLogger_Form.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\SWAT_Office_App.DriveLogger_LabelPrompt_Form.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\SWAT_Office_App.Menu1_Main.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\SWAT_Office_App.ManageUserAccounts_Form.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\SWAT_Office_App.Properties.Resources.resources
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\SWAT_Office_App.Reimage_USB_Drive_Progress_Form.resources
60,3 → 59,4
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\GenerateResource.write.1.tlog
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\SWAT Office App.exe
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\SWAT Office App.pdb
C:\Users\Kevin\Documents\Visual Studio 2010\Projects\SWAT Office App\SWAT Office App\obj\x86\Release\SWAT_Office_App.Menu_Main.resources

/SWAT Office App/trunk/SWAT Office App/obj/x86/Release/SWAT Office App.exe
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/SWAT Office App/trunk/SWAT Office App/obj/x86/Release/SWAT Office App.pdb
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Subversion Repositories Code-Repo

Compare Revisions

Ignore whitespace Rev 49 → Rev 50