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.

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

Merging this fork into a new branch to play with #2484

Merged
merged 6 commits into from
Dec 27, 2018

Conversation

jonoomph
Copy link
Member

No description provided.

The central widget, which will auto-expand to the width of the area
between the left and right dock areas, but is fixed at `1px` in height,
effectively becomes part of the dual splitter handle separating the
top and bottom dock areas.
* Timeline dock will now include the "Timeline" title in its titlebar
* The dock is constrained to be non-closeable (only movable and
  resizeable)
* The dock has a minimum size of `250px`×`150px`.
@jonoomph jonoomph merged commit 9d3a6ae into OpenShot:improved-docking Dec 27, 2018
jonoomph added a commit that referenced this pull request Dec 28, 2018
…s in pillar mode) (#2490)

* Merging this fork into a new branch to play with (#2484)
* Add 'Properties View' menu item
* Add custom fallback icon for Properties View
* Implement Properties View
* Place the Timeline in a QDockWidget, other changes
* Add 1-pixel-high central widget

The central widget, which will auto-expand to the width of the area
between the left and right dock areas, but is fixed at `1px` in height,
effectively becomes part of the dual splitter handle separating the
top and bottom dock areas.

* Title and constrain Timeline dock
* Timeline dock will now include the "Timeline" title in its titlebar
* The dock is constrained to be non-closeable (only movable and
  resizeable)
* The dock has a minimum size of `250px`×`150px`.

* Updating window_state and window_geometry for new dockable timeline and dock settings. Also renaming the settings, to wipe out existing user preference which would make the screen go crazy on first launch (for existing users).

* Updating advanced view (properties on right side)

* Removing some & from the main window ui file (for translation reasons... since I would prefer we not have to retranslate those things before our next release). Also removing "Properties View" which was a bit experimental, since we are aleady forcing Properties into pillar mode with both "simple" and "advanced" views.

* Updating "simple" and "advanced" window states again
* Changing the background color of the timeline to better match the timeline.
@ferdnyc ferdnyc deleted the dockable-timeline branch April 14, 2019 06:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants