Skip to content

Conversation

@JamesWrigley
Copy link
Contributor

Hi there :)
I've been working on some new dialogs for a while and I think it's ready to merge now.
Some notes:

  • The dialogs created when clicking the titlebar close button or hitting Alt + F4 are not modal, I haven't figured out how to do that yet (they are modal when launched from QML).
  • For some reason the path of the initial folder for the FileViewerDialog's will not be displayed when launched from QML, but will when created as a component from main.py.
  • Changing folder in a FileViewerDialog causes masses of errors, I think because FolderListModel.get() returns a variant (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() in main.py. Dunno if it's the cleanest way to create the dialogs.

This fixes #72.

…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.
@fabiencastan
Copy link
Member

I'm interested to merge this PR. But there are 2 problems:

  • when opening the application, the Graph widget is hidden
  • the "save as" window crashes the application

@JamesWrigley
Copy link
Contributor Author

Hmm, weird. I'm having some trouble getting ButtleOFX going, but will fix this as soon as I can.

@JamesWrigley
Copy link
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?

@aoblet
Copy link
Contributor

aoblet commented Jul 8, 2015

Merge in progress, some troubles with FileModelFolder are occurring. Do you mind if I update the graphic dialogs to new graphic browser ?

@aoblet aoblet assigned aoblet and unassigned fabiencastan Jul 9, 2015
@aoblet aoblet removed this from the Soutenance 1 - Finalisation milestone Jul 9, 2015
@aoblet
Copy link
Contributor

aoblet commented Jul 11, 2015

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).

cropped-buttle

@JamesWrigley
Copy link
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 :)

This was referenced Jul 12, 2015
@aoblet aoblet added this to the V3 - Beta milestone Jul 13, 2015
@fabiencastan fabiencastan merged commit 1c9b9b3 into buttleofx:develop Jul 18, 2015
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.

Popup window on close

4 participants