- Posts: 4402
GUI
- PhracturedBlue
- Offline
I'm not sure what your 'something' was. Right now you have pushed a clone of my repo without any changes of your own. So I'd hope if looks a lot like mineFDR wrote: Well, I've done something...
Mine now looks almost exactly like yours, is that supposed to be?
Please Log in or Create an account to join the conversation.
- FDR
- Offline
If I pull your repository again, it will overwrite everything, won't it?
Or will it offer some kind of merging?
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
no it won't ever overwrite anything. You can't pull with un-committed changes. You must 1st commit or revert all your changes. Then when you pull, different things may happen. If my commits do not overlap with your own changes, they will be merged automatically. If there are conflicts, you will be given the option on how to merge them.FDR wrote: So, than what can I change?
If I pull your repository again, it will overwrite everything, won't it?
Or will it offer some kind of merging?
when pulling you probably want to use 'hg pull -u' which is a pull + update. otherwise it will fetch the changes from my repo but not apply them to yours.
EDIT: I recommend this tutorial if you have questions about using mercurial, though of course, I'll e happy to help too:
wiki.alliedmods.net/Mercurial_Tutorial
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
I added initial control for selecting a widget via the buttons. For the time being, you can use up/down to select widgets. I didn't modify left/right, so those still chnage pages. You cannot use 'Ent' or 'Esc' to press buuttons or spinboxes yet.
I am using an overdrawn rectangle to indicate highlight (notyet color confgurable). If we use an alternate BMP for this, it will be tricky because the spinboxes and listboxes contain multiple objects, so you won't be able to get a consistent interface for indicating selection. The rect may be a better answer.
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
We can change the semantics if needed once we've worked out how page switching should be handled.
I haven't yet added support for long-press enter/exit on the pages with ok/cancel. I'd like to make sure I got the basics right 1st.
Also, you can change the color of the select rectangle through config.ini.
Let me know what you think.
Please Log in or Create an account to join the conversation.
- FDR
- Offline
Up/down button doesn't select boxes, even when I click on them or chenge their value they are not selected...
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
Are you working in mercurial or with a direct download?FDR wrote: I don't see any changes since pressed button changes.
Up/down button doesn't select boxes, even when I click on them or chenge their value they are not selected...
I verified in a clean pull that it works (only on meus with buttons though)
If you are trying with mercurial, did you do a 'hg pull'
whatis the result of:
hg id -n -i -b
It should be:
4f88de957e30 270 default
if have the latest files in your repo. If not, do 'hg pull -u' and check it again.
Please Log in or Create an account to join the conversation.
- FDR
- Offline
FDR@FDR-PC ~/src/deviation
$ hg pull
pulling from https://bitbucket.org/PhracturedBlue/deviation
searching for changes
no changes found
FDR@FDR-PC ~/src/deviation
$ hg id -n -i -b
825daaafb4f3 271 default
FDR@FDR-PC ~/src/deviation
$ hg pull -u
pulling from https://bitbucket.org/PhracturedBlue/deviation
searching for changes
no changes found
FDR@FDR-PC ~/src/deviation
$ hg id -n -i -b
825daaafb4f3 271 default
Something is fishy...
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
and show me the top 10 entries
Please Log in or Create an account to join the conversation.
- FDR
- Offline
changeset: 271:825daaafb4f3
tag: tip
parent: 265:3def202a15b6
parent: 270:4f88de957e30
user: FDR <fdr@fdr.hu>
date: Sat Jul 14 19:57:35 2012 +0200
summary: Merge
changeset: 270:4f88de957e30
user: PhracturedBlue <rc2012@pblue.org>
date: Sat Jul 14 06:23:02 2012 -0700
summary: Support changing select rectangle color through config.ini
changeset: 269:1638ab30a5e8
user: PhracturedBlue <rc2012@pblue.org>
date: Sat Jul 14 06:07:28 2012 -0700
summary: Full control of gui using buttons
changeset: 268:9b6c4d89ba37
user: PhracturedBlue <rc2012@pblue.org>
date: Fri Jul 13 20:02:42 2012 -0700
summary: Add some data analysis scripts
changeset: 267:d350a17ee7c6
user: PhracturedBlue <rc2012@pblue.org>
date: Fri Jul 13 19:59:07 2012 -0700
summary: split up gui into 1 file per widget
changeset: 266:787fd404979e
user: PhracturedBlue <rc2012@pblue.org>
date: Fri Jul 13 15:25:11 2012 -0700
summary: Test button select
changeset: 265:3def202a15b6
user: PhracturedBlue <rc2012@pblue.org>
date: Fri Jul 13 12:40:39 2012 -0700
summary: Buttons trigger on release. arrow and button icons change when pressed
changeset: 264:7c8047f3eff7
user: PhracturedBlue <rc2012@pblue.org>
date: Fri Jul 13 09:24:28 2012 -0700
summary: use file maps for buttons
I've made changes to the bitmaps, and since then I couldn't go back on track, whatever I tried...
EDIT: So it caused to branch there. I've updated to your last revision, now it shows your version.
I'm compiling...
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
Please Log in or Create an account to join the conversation.
- FDR
- Offline
However, it feels a bit half-legged without the proper enter/escape support.
I can tab to a button with up/down, but cannot press it with the enter.
Furthermore the program crashes if I press escape one more (or without selecting a control)...
I think I like Walkera's approach, that the selection goes away after a few seconds... (but it remembers where it was, so next time it continues from there)
BTW there sould be some pressable equivalent of the left/right buttons to change pages if you insist on this paging method. Or if we will use a menu, then we will need an exit button, which returns to the menu.
So basicly it is working, but so far it is hard to judge if it will be good enough...
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
Please Log in or Create an account to join the conversation.
- FDR
- Offline
No enter doesn't work.
And yet another thing: on the mixer page if I select the Ch1 with the down button, and then change the value with the right button, the selection goes away...
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
Maybe your enter key doesn't give the same keycode mine does. I just pushed a change that uses space instead of enter for select. Can you give that a try?
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
That will be tricky to fix since it works by removing the widget and replacing it with another one. I'll give it some thought.FDR wrote: And yet another thing: on the mixer page if I select the Ch1 with the down button, and then change the value with the right button, the selection goes away...
Please Log in or Create an account to join the conversation.
- FDR
- Offline
PhracturedBlue wrote: Enter support was in 269, which I know you have because I see it in your log above..
Maybe your enter key doesn't give the same keycode mine does. I just pushed a change that uses space instead of enter for select. Can you give that a try?
Yep, it works now with the space...
In the meantime I have deleted and recreated my deiation repository, so it's once again identical to yours.
From now I will try to use the command line hg, because TortoiseHg is quite confusing...
Please Log in or Create an account to join the conversation.
- FDR
- Offline
Please Log in or Create an account to join the conversation.
- FDR
- Offline
FDR wrote: One more thing: the enter (space) doesn't work on the clickable spinbuttons.
Thanks, it works now...
Please Log in or Create an account to join the conversation.
- PhracturedBlue
- Offline
- Posts: 4402
FDR wrote:
FDR wrote: One more thing: the enter (space) doesn't work on the clickable spinbuttons.
Thanks, it works now...
If you still have the place where you built fltk, can you go into that dir (for me ~/src/fltk-1.3.0) then cd into 'test' and run keyboard.exe
Then press 'Enter' and tell me what the event_key() and Event_text() value have
I prefer using 'enter' and would like to know why it doesn't work for you.
Please Log in or Create an account to join the conversation.