New dialogs #117
Merged
New dialogs #117
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…et because it's completely non-functional. Changed the exit dialog to use signals instead of global variables and switched to using relative paths for the ButtleOFX logo.
…directory if a QUrl was passed to it. Also removed file extension checks elsewhere, since this is covered in saveData().
…ave to stick to passing in absolute paths to buttleData.loadData().
…e workflow is a bit buggy still, will need a bit more work.
…me dir first by means of the new _buttleData.homeDir property and FileViewerDialog.folderModelFolder property, replaced FileViewerDialog.currentFolder with FileViewerDialog.currentFile, and changed the way the URL bar text is assigned.
…in MainWindow.qml, and exposed the text of the dialog as a property so it can be modified more easily.
…ttonClicked signal from ExitDialog.qml since it's always handled the same way (hide the ExitDialog), and set the ExitDialog to hide itself automatically when a button is clicked instead of having to do it manually when instanced. Fixed up the interaction between the ExitDialog's and finderSaveGraph, we now pass a bool in signals from the ExitDialog's to trigger finderSaveGraph.show(). The bool indicates whether to create a new graph or quit the application.
… to be taken, and set buttleData.saveData() to use .toLocalFile() to turn URL's into proper paths.
…tDialog.qml is initialized to a default value, and we now send the filepath of the selected file in FileViewerDialog.qml with the buttonClicked() signal (cleaner since we don't need the extra property).
… fix it so that the current URL is displayed when the dialog is launched from the file menu, which is broken with this commit. On the upside, it now displays properly when the dialog is launched when the user hits the close button or hits Alt + F4 (haven't committed that bit of the code yet).
This just replaces the QMessageDialog's for the close event with our own. Todo: figure out how to make the dialogs modal.
… that the graph is only cleared when necessary, and made some wee cleanups.
Member
|
I'm interested to merge this PR. But there are 2 problems:
|
Contributor
Author
|
Hmm, weird. I'm having some trouble getting ButtleOFX going, but will fix this as soon as I can. |
Contributor
Author
|
I can confirm the graph widget being hidden in the default view, but the Save As dialog works fine here. How does it crash for you? |
been introduced by mistake in 0089ca5.
Contributor
|
Merge in progress, some troubles with FileModelFolder are occurring. Do you mind if I update the graphic dialogs to new graphic browser ? |
Contributor
|
As we have implemented a new browser, I think use it in openGraph and saveGraph is better. It is more homogeneous, and more friendly (we can use browser features).
|
Contributor
Author
|
Sure, do whatever you want with it (I'd love to help, but unfortunately ButtleOFX doesn't run on my system). And nice work on the browser, it looks good :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi there :)
I've been working on some new dialogs for a while and I think it's ready to merge now.
Some notes:
main.py.FolderListModel.get()returns avariant(line 133), which technically may not have a.toLowerCase(). Would be nice to suppress these if no solution can be found.ToDo:
I'm also a little unsure of the way the code works with
EventFilter()inmain.py. Dunno if it's the cleanest way to create the dialogs.This fixes #72.