Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve startingDirectory functionality #604

Merged
merged 6 commits into from
May 11, 2019
Merged

Improve startingDirectory functionality #604

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4ef0cf
Improve `startingDirectory` functionality
fghzxm May 8, 2019
43e9b9c
Use %USERPROFILE% to replace %HOMEDRIVE%%HOMEPATH%
fghzxm May 9, 2019
37ac537
Improve `startingDirectory` functionality
fghzxm May 8, 2019
94ea1d7
Use %USERPROFILE% to replace %HOMEDRIVE%%HOMEPATH%
fghzxm May 9, 2019
e65f8ff
Merge upstream master
fghzxm May 11, 2019
a4e4780
Consolidate constant
fghzxm May 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/cascadia/TerminalApp/CascadiaSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ void CascadiaSettings::_CreateDefaultSchemes()
_globals.GetColorSchemes().emplace_back(_CreateCampbellScheme());
_globals.GetColorSchemes().emplace_back(_CreateSolarizedDarkScheme());
_globals.GetColorSchemes().emplace_back(_CreateSolarizedLightScheme());

}

// Method Description:
Expand All @@ -123,6 +122,7 @@ void CascadiaSettings::_CreateDefaultProfiles()
Profile cmdProfile{};
cmdProfile.SetFontFace(L"Consolas");
cmdProfile.SetCommandline(L"cmd.exe");
cmdProfile.SetStartingDirectory(L"%USERPROFILE%");
fghzxm marked this conversation as resolved.
Show resolved Hide resolved
cmdProfile.SetColorScheme({ L"Campbell" });
cmdProfile.SetAcrylicOpacity(0.75);
cmdProfile.SetUseAcrylic(true);
Expand All @@ -143,6 +143,7 @@ void CascadiaSettings::_CreateDefaultProfiles()
}
powershellProfile.SetFontFace(L"Courier New");
powershellProfile.SetCommandline(psCmdline);
powershellProfile.SetStartingDirectory(L"%USERPROFILE%");
fghzxm marked this conversation as resolved.
Show resolved Hide resolved
powershellProfile.SetColorScheme({ L"Campbell" });
powershellProfile.SetDefaultBackground(RGB(1, 36, 86));
powershellProfile.SetUseAcrylic(false);
Expand Down
5 changes: 5 additions & 0 deletions src/cascadia/TerminalApp/Profile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,11 @@ void Profile::SetCommandline(std::wstring cmdline) noexcept
_commandline = cmdline;
}

void Profile::SetStartingDirectory(std::wstring startingDirectory) noexcept
{
_startingDirectory = startingDirectory;
}

void Profile::SetName(std::wstring name) noexcept
{
_name = name;
Expand Down
1 change: 1 addition & 0 deletions src/cascadia/TerminalApp/Profile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class TerminalApp::Profile final
void SetColorScheme(std::optional<std::wstring> schemeName) noexcept;
void SetAcrylicOpacity(double opacity) noexcept;
void SetCommandline(std::wstring cmdline) noexcept;
void SetStartingDirectory(std::wstring startingDirectory) noexcept;
void SetName(std::wstring name) noexcept;
void SetUseAcrylic(bool useAcrylic) noexcept;
void SetDefaultForeground(COLORREF defaultForeground) noexcept;
Expand Down