Skip to content

Conversation

oleitao
Copy link
Contributor

@oleitao oleitao commented Mar 29, 2021

Details of Changes
Add details of changes here.

  • Added on settings Preferencies panel an option to set folder click open on new tab.

Closes #2129

Screenshots (optional)
Capture

@yaira2 yaira2 requested a review from gave92 March 30, 2021 01:06
@yaira2 yaira2 added the changes requested Changes are needed for this pull request label Mar 30, 2021
@yaira2
Copy link
Member

yaira2 commented Mar 30, 2021

@oleitao To prevent these kinds of merge conflicts in the future, a good trick is to revert changes to all the resource files (with the exception of the en-US resource file). Doing this will make it much easier to resolve conflicts since you only need to fix one file.

@yaira2 yaira2 added ready for review Pull requests that are ready for review and removed changes requested Changes are needed for this pull request labels Mar 30, 2021
@yaira2
Copy link
Member

yaira2 commented Mar 31, 2021

@oleitao can you solve the merge conflicts?

@oleitao
Copy link
Contributor Author

oleitao commented Mar 31, 2021

@oleitao can you solve the merge conflicts?

@yaichenbaum I can, but i don't have access to do that

@yaira2
Copy link
Member

yaira2 commented Mar 31, 2021

@oleitao Do you have the GitHub desktop app? It's fairly simple to solve the conflicts using the UI when you merge the main branch into your dev branch.

@d2dyno1
Copy link
Member

d2dyno1 commented Mar 31, 2021

@oleitao in Files repo, open cmd:

git remote add upstream https://github.com/files-community/Files.git
git fetch upstream
git merge upstream/main

After executing these commands, open VS and resolve conflicts by following VS' instructions

# Conflicts:
#	Files/Interacts/Interaction.cs
#	Files/Strings/ar/Resources.resw
#	Files/Strings/da-DK/Resources.resw
#	Files/Strings/da/Resources.resw
#	Files/Strings/de-DE/Resources.resw
#	Files/Strings/es-ES/Resources.resw
#	Files/Strings/fr-FR/Resources.resw
#	Files/Strings/hi-IN/Resources.resw
#	Files/Strings/hu-HU/Resources.resw
#	Files/Strings/it-IT/Resources.resw
#	Files/Strings/ja-JP/Resources.resw
#	Files/Strings/ko-KR/Resources.resw
#	Files/Strings/nl-NL/Resources.resw
#	Files/Strings/or-IN/Resources.resw
#	Files/Strings/pl-PL/Resources.resw
#	Files/Strings/ru-RU/Resources.resw
#	Files/Strings/sv-SE/Resources.resw
#	Files/Strings/ta/Resources.resw
#	Files/Strings/tr-TR/Resources.resw
#	Files/Strings/uk-UA/Resources.resw
#	Files/Strings/zh-Hans/Resources.resw
#	Files/Strings/zh-Hant/Resources.resw
#	Files/ViewModels/SettingsViewModels/PreferencesViewModel.cs
@yaira2 yaira2 requested review from tsvietOK and winston-de and removed request for gave92 and tsvietOK April 5, 2021 22:47
Copy link
Contributor

@winston-de winston-de left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oleitao You seem to have not created the OpenFoldersNewTab property in PreferencesViewModel.cs, just the field, so the bindings on the toggle switch aren't working.

image

You need to add something like this:

  public bool OpenFoldersNewTab
  {
      get => openFoldersNewTab;

      set
      {
          if (SetProperty(ref openFoldersNewTab, value))
          {
              App.AppSettings.OpenFoldersNewTab = value;
          }
      }
  }

@winston-de
Copy link
Contributor

winston-de commented Apr 6, 2021

@oleitao It looks like opening folders when in grid or tiles view still opens them in the same tab, even though open folders in new tab is enabled.

@yaira2 yaira2 requested a review from winston-de April 12, 2021 23:44
@yaira2 yaira2 added changes requested Changes are needed for this pull request and removed ready for review Pull requests that are ready for review labels Apr 15, 2021
@yaira2 yaira2 requested a review from winston-de April 27, 2021 02:27
Copy link
Contributor

@winston-de winston-de left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, nice work!

@yaira2 yaira2 changed the title Added a setting to always open folders in a new tab #2129 Added a setting to always open folders in a new tab Apr 27, 2021
@yaira2 yaira2 added ready to merge Pull requests that are approved and ready to merge and removed changes requested Changes are needed for this pull request labels Apr 27, 2021
@yaira2 yaira2 merged commit 94ab922 into files-community:main Apr 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready to merge Pull requests that are approved and ready to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add a setting to always open folders in a new tab

4 participants