diff --git a/.gitignore b/.gitignore index 76594b5..55487bd 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,8 @@ *.exe *.cache *.p12 +*.cmd +*.opendb Debug Release @@ -43,3 +45,4 @@ Release IndexerLog.txt + diff --git a/IndexerGUI/MainWindow.xaml b/IndexerGUI/MainWindow.xaml index 504bbea..d70eec0 100644 --- a/IndexerGUI/MainWindow.xaml +++ b/IndexerGUI/MainWindow.xaml @@ -316,6 +316,7 @@ diff --git a/IndexerGUI/MainWindow.xaml.cs b/IndexerGUI/MainWindow.xaml.cs index 65a7847..b8d6c7c 100644 --- a/IndexerGUI/MainWindow.xaml.cs +++ b/IndexerGUI/MainWindow.xaml.cs @@ -331,7 +331,10 @@ private void InitPart2() filtersVisibility = Visibility.Visible; searchDirPath = initialDirPath; - OnPropertyChanged(""); + searchTextUserInputTextbox.Focusable = true; + Keyboard.Focus(searchTextUserInputTextbox); + +; OnPropertyChanged(""); } private void PopulateDrives() diff --git a/Installer/IndexerInstaller.nsi b/Installer/IndexerInstaller.nsi index 83edb93..13e370e 100644 --- a/Installer/IndexerInstaller.nsi +++ b/Installer/IndexerInstaller.nsi @@ -115,7 +115,6 @@ Section "Bare minimum" Section1 file "icon_v3_2.ico" file "vcomp120.dll" file "ifind.exe" - file "helpText.txt" file "BasicRE2Syntax.txt" file "LICENSE" file "README" diff --git a/ifind/HelpText.h b/ifind/HelpText.h new file mode 100644 index 0000000..2716e92 --- /dev/null +++ b/ifind/HelpText.h @@ -0,0 +1,31 @@ +// This file is the part of the Indexer++ project. +// Copyright (C) 2016 Anna Krykora . All rights reserved. +// Use of this source code is governed by a MIT-style license that can be found in the LICENSE file. + +#pragma once + +namespace ifind +{ + +const char* gHelpText = R"(Usage: ifind [path...] [expression] + +default path is the current directory; '/' will search the whole system; +expression may consist of tests and actions: + +tests (N can be +N or -N or N): + -amin N -atime N + -cmin N -ctime N + -mmin N -mtime N + -iname PATTERN -name PATTERN + -size N[kMG] + 'k' for Kilobytes (units of 1024 bytes) (this is default value) + 'M' for Megabytes (units of 1048576 bytes) + 'G' for Gigabytes (units of 1073741824 bytes) + -type [fd] + +actions: + -printf format + -fprint file + -fprintf file format)"; + +} //namespace ifind \ No newline at end of file diff --git a/ifind/helpText.txt b/ifind/helpText.txt deleted file mode 100644 index 9228cec..0000000 --- a/ifind/helpText.txt +++ /dev/null @@ -1,22 +0,0 @@ - -Usage: ifind [path...] [expression] - -default path is the current directory; '/' will search the whole system; -expression may consist of: tests and actions: - -tests (N can be +N or -N or N): - -amin N -atime N - -cmin N -ctime N - -mmin N -mtime N - -iname PATTERN -name PATTERN - -size N[kMG] - 'k' for Kilobytes (units of 1024 bytes) (this is default value) - 'M' for Megabytes (units of 1048576 bytes) - 'G' for Gigabytes (units of 1073741824 bytes) - -type [fd] - - actions - -printf format - -fprint file - -fprintf file format - diff --git a/ifind/ifind.cpp b/ifind/ifind.cpp index aa001bb..82f07be 100644 --- a/ifind/ifind.cpp +++ b/ifind/ifind.cpp @@ -19,6 +19,8 @@ #include "UserArgsParser.h" #include "SearchQueryBuilder.h" +#include "HelpText.h" + using std::wcout; using std::endl; using std::wstring; @@ -43,12 +45,9 @@ int wmain(int argc, wchar_t* argv[]) { wstring first_arg = argv[1]; if (first_arg == L"-help" || first_arg == L"--help") { - std::wifstream help_file("helpText.txt"); - wstring line; - while (getline(help_file, line)) - wcout << line << endl; - return 0; - } + wcout << ifind::gHelpText; + return 0; + } if (!IsUserAnAdmin()) { wcout << "Please run console with administrator privileges and try again." << endl; diff --git a/ifind/ifind.vcxproj b/ifind/ifind.vcxproj index 6a714a7..32a026b 100644 --- a/ifind/ifind.vcxproj +++ b/ifind/ifind.vcxproj @@ -69,9 +69,6 @@ true shell32.lib;%(AdditionalDependencies) - - xcopy /y $(ProjectDir)helpText.txt $(ProjectDir)$(OutDir) - @@ -94,9 +91,6 @@ true true - - xcopy /y $(ProjectDir)helpText.txt $(ProjectDir)$(OutDir) - @@ -110,6 +104,9 @@ + + + diff --git a/installerPickingUpScript.cmd b/installerPickingUpScript.cmd index fe30bc1..6899d3c 100644 --- a/installerPickingUpScript.cmd +++ b/installerPickingUpScript.cmd @@ -8,7 +8,6 @@ copy /y CLIInterop\Release\CLIInterop.dll Installer copy /y "IndexerGUI\bin\Release\Indexer++.exe" "Installer\Indexer++ Beta.exe" copy /y IndexerGUI\bin\Release\UserSettings.xml Installer copy /y ifind\Release\ifind.exe Installer -copy /y ifind\Release\helpText.txt Installer copy /y BasicRE2Syntax.txt Installer