These are chat archives for jacobsenmd/opengcs

7th
Nov 2015
Scott Slaughter
@sslaughter
Nov 07 2015 00:15

Do ya'll know the best way to keep a local branch up to date with master? Currently I have the forked repo and I work on it from two different machines. So, generally I pull from the origin to a local repo, rebase my branch and then push back to the fork. If I switch machines I pull from the forked repo, usually just my branch. It seems though that when I rebase my local branch, I always have to correct merge errors in my branch files, including the one that is not even in origin/master at the moment. Is this avoidable, or is it just something that has to be done?

Also, I'm now up to date with master and am getting the toolbar/menu errors (windows). I looked into it for a bit as well, but didn't solve anything. It seems that the toolbar is working fine though it's just that the menubar isn't being isolated.

Mark Jacobsen
@jacobsenmd
Nov 07 2015 00:18
Scott, has the menu/toolbar always been that way, or did it just break recently? I'm not an expert on fit, but I use SourceTree, which lets you easily pull changes from multiple remotes... So you can update your local repo directly from master, the push those into your own remote fork
Scott Slaughter
@sslaughter
Nov 07 2015 00:21

@jacobsenmd - it just broke with the newest commits I think. It was working fine previously and I'm able to pull up a simple mainwindow w/ toolbar/menu/dockwidget and it works fine.

Also, does one of the positions in the .ini file correspond to a central widget?

Mark Jacobsen
@jacobsenmd
Nov 07 2015 02:47
Ok that's actually a relief to know that I broke something... I redid all the menu and toolbar code the other day. I will try to figure it out. Central widgets aren't currently restored properly because they are handled differently than other positions. All this layout code is pretty challenging and definitely a work in progress. I will keep at it.
Scott Slaughter
@sslaughter
Nov 07 2015 03:04
Ok, i was curious about the central widget being set because during my search i saw in a couple of places they said that main window does not support a lack of a central widget. That part seems to work fine, so im not sure what they mean by it not supporting it.
Mark Jacobsen
@jacobsenmd
Nov 07 2015 03:45
I'm not sure, as a central widget definitely isn't necessary. It is nice to have but a little quirky because it doesn't behave like all the other widgets
Mark Jacobsen
@jacobsenmd
Nov 07 2015 14:35
Guys, I just wanted to say thanks for all the work so far. This is a huge project, but it’s great to have help. Scott, thanks for the pull request addresisng the menu issue… I will take a look at it soon. In the meantime, I’ve been working on a doc to lay out a little more of the vision and where this is headed: https://docs.google.com/document/d/1g6_ey_sOw8qdqtJL6FWyrmpb0R0w37EvVxKhRhBdCVQ/edit?usp=sharing