Skip to content

Conversation

@aoblet
Copy link
Contributor

@aoblet aoblet commented Jul 13, 2015

Rearrange #117
Improve git semantic #178

JamesWrigley and others added 30 commits August 23, 2014 21:48
…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.
…nto dialogs_clean

Conflicts:
	buttleofx/MainWindow.qml
	buttleofx/main.py
	- Exit dialog custom (also triggered by alt+f4)
	- Use buttle browser for save/open a graph
with qt async connections the bItems list is not ensured to be filled
immediatly before the recurse process
@aoblet aoblet added this to the V3 - Beta milestone Jul 13, 2015
@landscape-bot
Copy link

Code Health
Repository health decreased by 0.13% when pulling fc763e2 on aoblet:dialogs_clean into 8a5241a on buttleofx:develop.

fabiencastan added a commit that referenced this pull request Jul 18, 2015
@fabiencastan fabiencastan merged commit 91fb2ca 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.

4 participants