Merge pull request #4 from Okarisu/posudky

Posudky
Okarisu · May 18, 2023 · 8f1a116 · 8f1a116
2 parents 7bf8349 + 0e3a1e9
commit 8f1a116
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 12 deletions.
diff --git a/FileCommander/GUI/App.cs b/FileCommander/GUI/App.cs
@@ -10,6 +10,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using Pango;
 
 namespace FileCommander.GUI;
 
@@ -203,7 +204,24 @@ public static DirectoryInfo OnItemActivated(ItemActivatedArgs args, DirectoryInf
     }
     /* Konec citace */
     public static int GetFocusedPanel() => _focusedPanel;
-    public static void SetFocusedPanel(int panel) => _focusedPanel = panel;
+
+    public static void SetFocusedPanel(int panel)
+    {
+        _focusedPanel = panel;
+
+        //Zvýraznění aktivního panelu
+        switch (panel)
+        {
+            case 1:
+                LeftRootLabel.ModifyFg(StateType.Normal, new Gdk.Color(0, 200, 0));
+                RightRootLabel.ModifyFg(StateType.Normal, new Gdk.Color(255, 255, 255));
+                break;
+            case 2:
+                RightRootLabel.ModifyFg(StateType.Normal, new Gdk.Color(0, 200, 0));
+                LeftRootLabel.ModifyFg(StateType.Normal, new Gdk.Color(255, 255, 255));
+                break;
+        }
+    }
 
     public static Item[] GetSelectedItems()
     {

diff --git a/FileCommander/GUI/Controllers/NavigationController.cs b/FileCommander/GUI/Controllers/NavigationController.cs
@@ -10,16 +10,20 @@ namespace FileCommander.GUI.Controllers;
 
 public abstract class NavigationController
 {
-    public static DirectoryInfo OnHomeClicked(ListStore store)
+    public static DirectoryInfo OnHomeClicked(DirectoryInfo root, Stack<DirectoryInfo> history, ListStore store)
     {
-        var root = new DirectoryInfo(Environment.GetFolderPath(
+        history.Push(root);
+
+        root = new DirectoryInfo(Environment.GetFolderPath(
             Environment.SpecialFolder.Personal));
         FillStore(store, root);
         return root;
     }
 
-    public static DirectoryInfo OnUpClicked(DirectoryInfo root, ListStore store)
+    public static DirectoryInfo OnUpClicked(DirectoryInfo root, Stack<DirectoryInfo> history, ListStore store)
     {
+        history.Push(root);
+
         if (root.Parent == null)
             return root;
 

diff --git a/FileCommander/GUI/Controllers/TargetController.cs b/FileCommander/GUI/Controllers/TargetController.cs
@@ -42,6 +42,13 @@ public static (string path, bool cancel, bool addSuffix) GetTargetPath(string di
             NullPath();
         } while (path.path == "" && !path.cancel);
 
+        foreach (var c in Path.GetInvalidFileNameChars())
+        {
+            if (!path.path.Contains(c)) continue;
+            new PromptUserDialogWindow("Invalid character in file name.");
+            return GetTargetPath(dialogTitle, promptSuffix);
+        }
+
         return (path.path, path.cancel, path.addSuffix);
     }
 }
diff --git a/FileCommander/GUI/Dialogs/PromptTargetPanelDialogWindow.cs b/FileCommander/GUI/Dialogs/PromptTargetPanelDialogWindow.cs
@@ -51,6 +51,4 @@ public static void NullPrompt()
     {
         _cancel = false;
     }
-
-
 }
diff --git a/FileCommander/GUI/Toolbars/TwinToolbars.cs b/FileCommander/GUI/Toolbars/TwinToolbars.cs
@@ -28,15 +28,15 @@ public static Toolbar DrawLeftToolbar()
         leftToolbar.Insert(leftHomeButton, 0);
         leftHomeButton.Clicked += (sender, args) =>
         {
-            LeftRoot = OnHomeClicked(LeftStore);
+            LeftRoot = OnHomeClicked(LeftRoot, LeftHistory, LeftStore);
             UpdateRootLabel(LeftRootLabel, LeftRoot);
         };
 
         var leftUpButton = new ToolButton(Stock.GoUp);
         leftToolbar.Insert(leftUpButton, 1);
         leftUpButton.Clicked += (_, _) =>
         {
-            LeftRoot = OnUpClicked(LeftRoot, LeftStore);
+            LeftRoot = OnUpClicked(LeftRoot, LeftHistory, LeftStore);
             UpdateRootLabel(LeftRootLabel, LeftRoot);
         };
 
@@ -68,15 +68,15 @@ public static Toolbar DrawRightToolbar()
         rightPanelBar.Insert(rightHomeButton, 0);
         rightHomeButton.Clicked += (_, args) =>
         {
-            RightRoot = OnHomeClicked(RightStore);
+            RightRoot = OnHomeClicked(RightRoot, RightHistory, RightStore);
             UpdateRootLabel(RightRootLabel, RightRoot);
         };
 
         var rightUpButton = new ToolButton(Stock.GoUp);
         rightPanelBar.Insert(rightUpButton, 1);
         rightUpButton.Clicked += (_, _) =>
         {
-            RightRoot = OnUpClicked(RightRoot, RightStore);
+            RightRoot = OnUpClicked(RightRoot, RightHistory, RightStore);
             UpdateRootLabel(RightRootLabel, RightRoot);
         };
 

diff --git a/FileCommander/GUI/TwinPanels.cs b/FileCommander/GUI/TwinPanels.cs
@@ -22,6 +22,7 @@ public static void DrawLeftPanel()
         FillStore(LeftStore, LeftRoot);
         LeftScrolledWindow.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); //Nastavení chování posuvníku
         LeftIconView.GrabFocus(); //Jeden z panelů musí být na začátku zaktivován kvůli předejití chybám
+        LeftRootLabel.ModifyFg(StateType.Normal, new Gdk.Color(0, 200, 0)); //Zvýraznění aktivního panelu
         LeftIconView.SelectionMode = SelectionMode.Multiple; //Možnost výběru více souborů
         LeftIconView.TextColumn = ColDisplayName; //Zobrazení jména souboru pod ikonou
         LeftIconView.PixbufColumn = ColPixbuf; //Zobrazení ikony souboru

diff --git a/FileCommander/core/New.cs b/FileCommander/core/New.cs
@@ -2,6 +2,8 @@
 // ReSharper disable ObjectCreationAsStatement
 // ReSharper disable ClassNeverInstantiated.Global
 
+using System.Data;
+
 namespace FileCommander.core;
 
 using System;
@@ -48,9 +50,14 @@ public static void OnNewClicked(object sender, EventArgs e)
             new PromptUserDialogWindow("Malformed folder name");
             return;
         }
+        catch (ReadOnlyException)
+        {
+            new PromptUserDialogWindow("Directory is read-only.");
+            return;
+        }
         catch (IOException)
         {
-            new PromptUserDialogWindow("Parent directory is read-only.");
+            new PromptUserDialogWindow("Input/output error has occurred.");
             return;
         }
         catch (UnauthorizedAccessException)

diff --git a/FileCommander/core/Rename.cs b/FileCommander/core/Rename.cs
@@ -2,6 +2,8 @@
 // ReSharper disable ObjectCreationAsStatement
 // ReSharper disable ClassNeverInstantiated.Global
 
+using System.Data;
+
 namespace FileCommander.core;
 
 using System;
@@ -88,9 +90,14 @@ public static void OnRenameClicked(object sender, EventArgs e)
                     new PromptUserDialogWindow("Malformed name");
                     return;
                 }
+                catch (ReadOnlyException) //#[[ReadOnlyException]]
+                {
+                    new PromptUserDialogWindow("Directory is read-only.");
+                    return;
+                }
                 catch (IOException)
                 {
-                    new PromptUserDialogWindow("Parent directory is read-only.");
+                    new PromptUserDialogWindow("Input/output error has occurred.");
                     return;
                 }
                 catch (UnauthorizedAccessException)

diff --git a/Obhajoba.pptx b/Obhajoba.pptx