Merge pull request #240 from gdt050579/miscelaneous-improvements

Miscelaneous improvements
gdt050579 · Mar 1, 2024 · 5bf822a · 5bf822a
2 parents 4f9608f + 431765c
commit 5bf822a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/GView/src/GView.cpp b/GView/src/GView.cpp
@@ -165,8 +165,8 @@ int main(int argc, const char** argv)
 {
     if (argc < 2)
     {
-        ShowHelp();
-        return 0;
+        const char* openCurrentFolderCommand[] = { "."};
+        return ProcessOpenCommand(1, openCurrentFolderCommand, 0);
     }
 
     auto cmdID = GetCommandID(argv[1]);

diff --git a/GViewCore/src/App/Instance.cpp b/GViewCore/src/App/Instance.cpp
@@ -26,6 +26,8 @@ constexpr _MenuCommand_ menuFileList[] = {
     { "", 0, Key::None },
     { "E&xit", MenuCommands::EXIT_GVIEW, Key::Shift | Key::Escape },
 };
+constexpr ItemHandle menuFileDisabledCommandsList[] = { 3, 4 };
+
 constexpr _MenuCommand_ menuWindowList[] = {
     { "Arrange &Vertically", MenuCommands::ARRANGE_VERTICALLY, Key::None },
     { "Arrange &Horizontally", MenuCommands::ARRANGE_HORIZONTALLY, Key::None },
@@ -129,6 +131,9 @@ bool Instance::BuildMainMenus()
 {
     CHECK(mnuFile = AppCUI::Application::AddMenu("File"), false, "Unable to create 'File' menu");
     CHECK(AddMenuCommands(mnuFile, menuFileList, ARRAY_LEN(menuFileList)), false, "");
+    for (auto itemHandle : menuFileDisabledCommandsList) {
+        CHECK(mnuFile->SetEnable(itemHandle, false), false, "Fail to disable menu item");
+    }
     CHECK(mnuWindow = AppCUI::Application::AddMenu("&Windows"), false, "Unable to create 'Windows' menu");
     CHECK(AddMenuCommands(mnuWindow, menuWindowList, ARRAY_LEN(menuWindowList)), false, "");
     CHECK(mnuHelp = AppCUI::Application::AddMenu("&Help"), false, "Unable to create 'Help' menu");
@@ -495,6 +500,14 @@ void Instance::OpenFile()
             ShowErrors();
     }
 }
+void Instance::OpenFolder()
+{
+    auto res = Dialogs::FileDialog::ShowOpenFileWindow("", "GVIEW:IGNORE-EVERYTHING", ".");
+    if (res.has_value()) {
+        if (AddFileWindow(res.value(), OpenMethod::BestMatch, "") == false)
+            ShowErrors();
+    }
+}
 void Instance::UpdateCommandBar(AppCUI::Application::CommandBar& commandBar)
 {
     auto idx = GENERIC_PLUGINS_CMDID;
@@ -567,6 +580,9 @@ bool Instance::OnEvent(Reference<Control> control, Event eventType, int ID)
         case MenuCommands::OPEN_FILE:
             OpenFile();
             return true;
+        case MenuCommands::OPEN_FOLDER:
+            OpenFolder();
+            return true;
         }
         if ((ID >= GENERIC_PLUGINS_CMDID) && (ID < GENERIC_PLUGINS_CMDID + GENERIC_PLUGINS_FRAME * 1000))
         {

diff --git a/GViewCore/src/include/Internal.hpp b/GViewCore/src/include/Internal.hpp
@@ -499,6 +499,7 @@ namespace App
         bool BuildMainMenus();
         bool LoadSettings();
         void OpenFile();
+        void OpenFolder();
         void ShowErrors();
 
         Reference<Type::Plugin> IdentifyTypePlugin_FirstMatch(