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

Shortcut manager #558

Closed
wants to merge 20 commits into from
Closed

Shortcut manager #558

wants to merge 20 commits into from

Conversation

andresmmera
Copy link
Contributor

@andresmmera andresmmera commented Sep 8, 2016 •
edited by guitorri
Loading

Hello,

This PR is a rebase of the shortcut manager written by yodalee. Personally, I find this feature quite useful so I'd like to see it merged someday :)

Cheers

rebased from yodalee feature54-custom-shortcut

@andresmmera andresmmera added this to the 0.0.21 milestone Sep 8, 2016
@felix-salfelder
Copy link
Member

cc6986a reverts a cleanup.

the use of stdio.h is an implementation detail. it has been moved to logging.cc intentionally.

@andresmmera
Copy link
Contributor Author

Hang on! I've almost forgotten #536 !!

@felix-salfelder Should we/I/whoever fork this branch and rebase it with develop and then merge it? This way I can avoid cc6986a. Finally, I'll rebase this PR with develop and that's all.
... am I right?

@in3otd
Copy link
Contributor

in3otd commented Sep 9, 2016

you could simply cherry-pick the commit(s) from release-0.0.19; but I guess the "right" thing would be to merge release-0.0.19 into develop and then rebase your branch...

@felix-salfelder
Copy link
Member

[..] merge release-0.0.19 into develop

you could open a PR on this. but please just merge... any time, for any value of 0.0.19 (if you need it).

@andresmmera
Copy link
Contributor Author

@felix-salfelder just for checking... Should I do "git push" after merging release-0.0.19 into develop?

@felix-salfelder
Copy link
Member

Should I do "git push" after merging release-0.0.19 into develop?

yes please. what you want to to is git push $remote develop, where $remote is what you call the remote (such as origin). details may vary depending on your setup...

@andresmmera andresmmera force-pushed the Shortcut-Manager-rebased-yodalee branch from cc6986a to 93e1536 Compare September 9, 2016 20:06
@nvdl
Copy link
Contributor

nvdl commented Nov 5, 2016

This is a good step forward. I was thinking if that was a sinking ship.

@andresmmera andresmmera mentioned this pull request Jan 29, 2017
Closed
11 tasks
@guitorri guitorri changed the title Shortcut manager (rebased from yodalee feature54-custom-shortcut) Shortcut manager Feb 12, 2017
@guitorri guitorri force-pushed the Shortcut-Manager-rebased-yodalee branch from 93e1536 to 0c71cb4 Compare February 12, 2017 21:44
@guitorri
Copy link
Member

guitorri commented Feb 12, 2017 •
edited
Loading

@andresmmera, I just rebased, resolved the conflicts and force updated your branch.

@andresmmera
Copy link
Contributor Author

@guitorri Thank you! :-)

@andresmmera
Copy link
Contributor Author

...should I merge this? It doesn't contain commits from me

@guitorri
Copy link
Member

I would like to understand/document the file format used to store the settings.

@andresmmera andresmmera force-pushed the Shortcut-Manager-rebased-yodalee branch 2 times, most recently from 1bdf0ab to c901c25 Compare August 24, 2017 15:30
@andresmmera andresmmera mentioned this pull request Dec 21, 2017
Merged
@andresmmera andresmmera force-pushed the Shortcut-Manager-rebased-yodalee branch from c901c25 to f8f395d Compare April 7, 2018 15:02
@andresmmera
Copy link
Contributor Author

Re-rebased

@andresmmera andresmmera force-pushed the Shortcut-Manager-rebased-yodalee branch 4 times, most recently from dfdd02b to e8c19a9 Compare April 14, 2018 07:52
@yodalee @andresmmera
create user input key sequence detector
231abcc
@yodalee @andresmmera
add shortcut setting button in qucssettingdialog
2e23779 
custom shortcut needs a new dialog to handle
add button "custom shortcut" in qucssettingdialog to open the new dialog
`
yodalee and others added 17 commits April 14, 2018 19:53
@yodalee @andresmmera
default shortcut initialize in qucs_init
b90ba83
@yodalee @andresmmera
load/save shortcut setting in main
f12ce25
@yodalee @andresmmera
modify indent
07a226c
@yodalee @andresmmera
add shortcut setting dialog, with initial layout
9e8be51
@yodalee @andresmmera
fill table with qucssettings
5f1d30f
@yodalee @andresmmera
set/remove/default function in qucsshortcutdialog
23f8540
@yodalee @andresmmera
implement check unique in setShortcut
3ab92d1
@yodalee @andresmmera
move set shortcut into a indep function
ab25530
@yodalee @andresmmera
add invalid key in shortcut setting
275f5a9
@yodalee @andresmmera
prevent invalid key to be set
c6d0f47 
Previous version if press funcion key like ctrl, alt
along, the keysequenceedit will print out gibberish
@yodalee @andresmmera
set focus on sequenceinput when click on list
de56b69
@yodalee @andresmmera
add import, export button
09323af
@yodalee @andresmmera
export function
7bae6b9
@yodalee @andresmmera
import function
5de9ae7
@yodalee @andresmmera
modify include, change function call to slot
54a3f7e
@yodalee @andresmmera
modify dialog call, prevent memory leak
e166aa9
@andresmmera
Several fixes after the re-rebase
24f806e
@andresmmera andresmmera force-pushed the Shortcut-Manager-rebased-yodalee branch from 65facc1 to 24f806e Compare April 14, 2018 18:41
This was referenced Nov 15, 2023
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
new-feature
Projects
None yet
Milestone
0.0.21
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@andresmmera @felix-salfelder @in3otd @nvdl @guitorri @yodalee