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

Issue1288 Comments to frames #1292

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Issue1288 Comments to frames #1292

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d43eff2
Comment dockable added. Basic connects added
davidlamhauge Nov 2, 2019
cccf4f9
Comments saved on keyframe. Minor ui changes
davidlamhauge Nov 2, 2019
635dfdd
save and load xml works
davidlamhauge Nov 5, 2019
3fc602f
Fixed update error, and start char values
davidlamhauge Nov 5, 2019
8b490c0
Limit raised to 250 chars. whole keyframe exp can be used
davidlamhauge Nov 6, 2019
778ce5b
Deleted two irrelevant files
davidlamhauge Nov 8, 2019
c30f8ea
Simplify UI
MrStevns Nov 9, 2019
4293464
Fix memory issues caused by accessing values that no longer exists.
MrStevns Nov 9, 2019
e57d784
No need to hide dock, can simply remove the widget by default
MrStevns Nov 9, 2019
cbd0c25
Refactor load/save comments in filemanager
MrStevns Nov 9, 2019
561fb98
Add forgotten nullptr check
MrStevns Nov 9, 2019
ec81770
Merge pull request #10 from CandyFace/PR_1292_changes
davidlamhauge Nov 9, 2019
4bda3b9
Make sure frame is updated when changing layer
MrStevns Nov 9, 2019
c04e5f4
Clear focus on FocusOutEvent
MrStevns Nov 9, 2019
3b53ea1
Merge branch 'master' into issue1288_comments_to_frames
davidlamhauge Nov 9, 2019
5ae84ed
Remove no longer valid function
MrStevns Nov 10, 2019
1590477
Apply comments when leaving widget, out of focus is too late
MrStevns Nov 10, 2019
331edbc
Refactor getKeyFrame
MrStevns Nov 10, 2019
c8a27ba
Apply comments per keystroke
MrStevns Nov 10, 2019
ebe6a95
Merge branch 'issue1288_comments_to_frames' into PR_1292_changes
candyface Nov 10, 2019
1bc46ce
Merge pull request #11 from CandyFace/PR_1292_changes
davidlamhauge Nov 10, 2019
87323e9
Disable comment fields during playback
davidlamhauge Nov 10, 2019
b529f44
merge conflicts with Master solved
davidlamhauge Jan 17, 2020
1033c24
Solved most merge conflicts with master. Not saving comments!
davidlamhauge Apr 6, 2022
1da6252
Fixed saving comments
davidlamhauge Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
No need to hide dock, can simply remove the widget by default
  • Loading branch information
@MrStevns
MrStevns committed Nov 9, 2019
commit e57d784f709fc37bad8f0214538eb865f67b81f1
3 changes: 1 addition & 2 deletions app/src/mainwindow2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,11 @@ void MainWindow2::createDockWidgets()
addDockWidget(Qt::RightDockWidgetArea, mColorBox);
addDockWidget(Qt::RightDockWidgetArea, mColorInspector);
addDockWidget(Qt::RightDockWidgetArea, mColorPalette);
addDockWidget(Qt::RightDockWidgetArea, mFrameComments);
mFrameComments->hide();
addDockWidget(Qt::LeftDockWidgetArea, mToolBox);
addDockWidget(Qt::LeftDockWidgetArea, mToolOptions);
addDockWidget(Qt::LeftDockWidgetArea, mDisplayOptionWidget);
addDockWidget(Qt::BottomDockWidgetArea, mTimeLine);

setDockNestingEnabled(true);

/*
Expand Down