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

Fix bad build-features/PowerLauncher merge #2489

Merged
merged 2,307 commits into from
Apr 29, 2020
Merged

Fix bad build-features/PowerLauncher merge #2489

merged 2,307 commits into from
Apr 29, 2020

Conversation

traies
Copy link
Member

@traies traies commented Apr 29, 2020 •
edited
Loading

Summary of the Pull Request

  • Reverted previous merge
  • Merged in previous changes from dev/traies/build_feature_launcher_integration

References

PR Checklist

  • Applies to Merge PowerLauncher branch #2345
  • CLA signed. If not, go over here and sign the CLA
  • [] Tests added/passed
  • [] Requires documentation to be updated
  • [] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

Detailed Description of the Pull Request / Additional comments

Previous merge was squashed in instead of rebased into dev/build-features

Validation Steps Performed

  • Building and running contains PowerLauncher/Settings integration
  • Can build a working MSI.

@alekhyareddy28
updated README with setup, build launcher and pull code from other re…
5540c8b 
…positories
@alekhyareddy28
minor modifications in README
eb535ac
@alekhyareddy28
Merge pull request #1 from microsoft/integrateWox
174789e 
Integrate Wox projects into PowerToys
@alekhyareddy28
Added launcher project and changed references to common
c4b49ce
@alekhyareddy28
Added the code to launch another process
078656f
@alekhyareddy28
added shellapi header
113c39c
@alekhyareddy28
Added launcher to runner
aebdc0c
@alekhyareddy28
added functions to remove the abstract class error
94387e8
@alekhyareddy28
added the wox launcher dll
f77bacb
@alekhyareddy28
Readded the reference to common
78a6ab8
@alekhyareddy28
modified the additional include directories for the release version
06eac36
@alekhyareddy28
changed the name to be displayed from Wox.Launcher to Launcher
16d1245
@alekhyareddy28
Localized the strings of Launcher
9537dd7
@alekhyareddy28
Merge pull request #2 from microsoft/updateREADME
40cc4f3 
Update readme
@alekhyareddy28
Added a SearchResult Helper class
dacd13e
@alekhyareddy28
Created a helper class to use indexer and return search results
8e45c41
@alekhyareddy28
Added the main and settings file which declare most of the plugin int…
ea75a56 
…erfaces
@alekhyareddy28
Added references and renamed a class
415b7bf
@alekhyareddy28
Added the images folder which contains the windows indexer icon
657a1aa
@alekhyareddy28
Added the image
4da33b8
@alekhyareddy28
Added the plugin.json file
248a689
@alekhyareddy28
Minor changes in project files
9a84fc5
@alekhyareddy28
Added plugin.json to the project
f5e474f
@alekhyareddy28
Modified the output paths to create the dll for the plugin in the cor…
7164260 
…rect location
@alekhyareddy28
Refactored the code to make it unit testable
69758b8
@alekhyareddy28
Made the code unit testable and added unit tests for the indexer plugin
ca916de
@alekhyareddy28
Removed commented out code
cafe267
@alekhyareddy28
Merge pull request #4 from microsoft/launcherInRunner
855f092 
Added wox to the runner of PowerToys
@alekhyareddy28
Merge branch 'master' of https://github.com/microsoft/Launcher into w…
1842c9e 
…indowsIndexerPlugin
@alekhyareddy28
Code to terminate wox when we exit PowerToys
7a3c326
traies and others added 22 commits April 24, 2020 10:26
@traies
Merge branch 'dev/build-features' into dev/traies/buld-features-integ…
22cb0b6 
…ration
@crutkas
Removing WinR (#2381)
368640b
@dsrivastavv
Updated program execution to call action on background thread. (#2370)
a6e8cbc
@traies
PowerLauncher Settings integration
fa31fbb
@traies
Merge branch 'dev/PowerLauncher' into dev/traies/build_features_launc…
ad9e7b5 
…her_integration
@dsrivastavv
Added cold start fix (#2385)
6290630
@ryanbodrug-microsoft
- Fixes cursor jumping around issue.
15b7b20 
- Seperating the ability to set the text from initiating a query.
- Plugins have to explicitly request the query be updated.
- Updating Folder plugin to explicty update the query on folder selection.
- Removing unused changes from 'Wox' that don't compile.
@ryanbodrug-microsoft
Fixing gap in logic where query was triggering when programatically s…
aa79325 
…etting text.

Updating the binding and settext both will trigger the TextChanged event on a seperate event dispatcher.  For this reason we dynamically detect which eventhandler is most approapriate on the textchanging event.
@ryanbodrug-microsoft
Updating the QueryText to the selected item when navigating up/down w…
9d37205 
…ith the arrow keys.
@ryanbodrug-microsoft
Removing action on folder result, and displaying folder path on selec…
8f7305e 
…ting a folder result from the folder plugin.
@ryanbodrug-microsoft
Making folder results from the search indexer plugin behave like fold…
2b04d7a 
…er results from folder plugin.
@ryanbodrug-microsoft
Folder Results open the explorer window when selected.
9f609ac
@ryanbodrug-microsoft
The Open Current Folder result shouldn't change the query text to 'Op…
53e68c0 
…en {folder path}' when selecting the results.
@ryanbodrug-microsoft
Initializing query text strings.
ad0f965
@ryanbodrug-microsoft
Defensive check for QueryText being empty
eaf05aa
@ryanbodrug-microsoft
Adding file watchers for UWP detecting when apps are installed or del…
3753ecd 
…eted and reindexing the uwp apps
@ryanbodrug-microsoft
Removing unused namespace.
3dd181c
@ryanbodrug-microsoft
Looking at files and not filtering is better because the timer is mor…
a047ff2 
…e likely to reset while an install is happening, preventing uneeded indexing
@traies
Merge branch 'dev/build-features' into dev/traies/build_features_laun…
e6b43e1 
…cher_integration
@traies
Merge branch 'dev/PowerLauncher' into dev/traies/build_features_launc…
fe77a7e 
…her_integration
@traies
Revert "Merge PowerLauncher branch (#2345)"
6029f0e 
This reverts commit d9c4abe.
@traies
Settings + PowerLauncher integration
c505875 
* Fix project references

* Fix MaxResultsToShow

* Fix Alt + Space display

* Fix settings defaults
@traies traies requested review from ryanbodrug-microsoft and a team April 29, 2020 18:58
@traies
Merge branch 'dev/traies/build_features_launcher_integration' into de…
b9d14d3 
…v/traies/fix-bad-build-features-launcher-merge
@traies traies marked this pull request as draft April 29, 2020 19:06
@traies traies marked this pull request as ready for review April 29, 2020 20:20
ryanbodrug-microsoft
ryanbodrug-microsoft approved these changes Apr 29, 2020
View reviewed changes
Copy link
Contributor

@ryanbodrug-microsoft ryanbodrug-microsoft left a comment

Choose a reason for hiding this comment

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

Works for me thanks!

@traies traies merged commit 518da7e into dev/build-features Apr 29, 2020
@traies traies deleted the dev/traies/fix-bad-build-features-launcher-merge branch April 29, 2020 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryanbodrug-microsoft ryanbodrug-microsoft ryanbodrug-microsoft approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@traies @ryanbodrug-microsoft @alekhyareddy28 @bkudiess @dsrivastavv @jjw24 @crutkas @udit3333 @betsegaw