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

Locate Blender executable via File Manager #2255

Merged
merged 11 commits into from
Oct 24, 2018
Merged

Locate Blender executable via File Manager #2255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4e64633
Merge pull request #1 from OpenShot/develop
DylanC Oct 4, 2018
8ec3a22
Add button to browse to the executable location
DylanC Oct 18, 2018
852b295
Merge branch 'develop' into blender_locate
DylanC Oct 18, 2018
2cfea16
Connect button and set the filename to be result of file dialog
DylanC Oct 19, 2018
4cbd215
Merge branch 'blender_locate' of github.com:DylanC/openshot-qt into b…
DylanC Oct 19, 2018
7bd4e3c
Set filename to QLineEdit after selection
DylanC Oct 20, 2018
664178c
Add the same browse type for inkscape field
DylanC Oct 20, 2018
1b5fbc7
Add cross platform path to root
DylanC Oct 21, 2018
0d54467
Use the rootPath from Qt instead of Python
DylanC Oct 22, 2018
7818408
Get rid of underscore
DylanC Oct 22, 2018
5b6fd84
Merge branch 'develop' into blender_locate
DylanC Oct 23, 2018
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
Add button to browse to the executable location
  • Loading branch information
@DylanC
DylanC committed Oct 18, 2018
commit 8ec3a221bffc62b18108460aaa675b49e2fedbe8
2 changes: 1 addition & 1 deletion src/settings/_default.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
{
"value": "blender",
"title": "Blender Command (path)",
"type": "text",
"type": "browse",
"category": "General",
"setting": "blender_command"
},
Expand Down
9 changes: 9 additions & 0 deletions src/windows/preferences.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ def __init__(self):

# Create Label
widget = None
extraWidget = None
label = QLabel()
label.setText(_(param["title"]))
label.setToolTip(_(param["title"]))
Expand Down Expand Up @@ -167,6 +168,13 @@ def __init__(self):
widget.setText(_(param["value"]))
widget.textChanged.connect(functools.partial(self.text_value_changed, widget, param))

elif param["type"] == "browse":
# create QLineEdit
widget = QLineEdit()
widget.setText(_(param["value"]))
widget.textChanged.connect(functools.partial(self.text_value_changed, widget, param))
extraWidget = QPushButton("Browse")

elif param["type"] == "bool":
# create spinner
widget = QCheckBox()
Expand Down Expand Up @@ -238,6 +246,7 @@ def __init__(self):
layout_hbox = QHBoxLayout()
layout_hbox.addWidget(label)
layout_hbox.addWidget(widget)
layout_hbox.addWidget(extraWidget)

# Add widget to layout
tabWidget.layout().addLayout(layout_hbox)
Expand Down