Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
beat
beat.editor
Commits
a1a0972f
Commit
a1a0972f
authored
May 09, 2019
by
Samuel GAIST
Browse files
[widgets] Cleanup: make all slots camel case
parent
afd55e03
Changes
3
Hide whitespace changes
Inline
Side-by-side
beat/editor/test/test_assetwidget.py
View file @
a1a0972f
...
...
@@ -301,6 +301,6 @@ class TestAssetWidget:
asset_path
=
self
.
get_asset_path
(
test_prefix
,
asset_type
,
asset_name
)
asset_widget
.
load_json
(
asset_path
)
assert
asset_widget
.
current_editor
.
asset_type
!=
AssetType
.
UNKNOWN
asset_widget
.
delete
_a
sset
(
asset_path
)
asset_widget
.
delete
A
sset
(
asset_path
)
assert
asset_widget
.
current_editor
.
asset_type
==
AssetType
.
UNKNOWN
assert
not
os
.
path
.
exists
(
asset_path
)
beat/editor/widgets/assetwidget.py
View file @
a1a0972f
...
...
@@ -158,9 +158,9 @@ class AssetWidget(QWidget):
layout
.
addLayout
(
button_layout
)
self
.
watcher
.
fileChanged
.
connect
(
self
.
__reload
_f
rom
_h
arddrive
)
self
.
update_timer
.
timeout
.
connect
(
self
.
__enable
_s
ave
)
self
.
update_timer
.
timeout
.
connect
(
self
.
__update
_j
son
_w
idget
)
self
.
watcher
.
fileChanged
.
connect
(
self
.
__reload
F
rom
H
arddrive
)
self
.
update_timer
.
timeout
.
connect
(
self
.
__enable
S
ave
)
self
.
update_timer
.
timeout
.
connect
(
self
.
__update
J
son
W
idget
)
self
.
save_button
.
clicked
.
connect
(
self
.
save_json
)
@
property
...
...
@@ -220,13 +220,13 @@ class AssetWidget(QWidget):
self
.
watcher
.
removePaths
(
files
)
@
pyqtSlot
()
def
__enable
_s
ave
(
self
):
def
__enable
S
ave
(
self
):
"""Enable the save button"""
self
.
save_button
.
setEnabled
(
True
)
@
pyqtSlot
()
def
__reload
_f
rom
_h
arddrive
(
self
):
def
__reload
F
rom
H
arddrive
(
self
):
"""Reload the content of this widget from the hard drive"""
answer
=
QMessageBox
.
question
(
...
...
@@ -242,7 +242,7 @@ class AssetWidget(QWidget):
self
.
__update_content
()
@
pyqtSlot
()
def
__update
_j
son
_w
idget
(
self
):
def
__update
J
son
W
idget
(
self
):
self
.
json_widget
.
setText
(
self
.
current_editor
.
dump_as_string
())
def
closeEvent
(
self
,
event
):
...
...
@@ -283,7 +283,7 @@ class AssetWidget(QWidget):
return
filter
(
None
,
action_list
)
@
pyqtSlot
(
"QString"
)
def
delete
_a
sset
(
self
,
file_path
):
def
delete
A
sset
(
self
,
file_path
):
"""Delete the requested asset
:param file_path str: path to the json file of the asset to delete
...
...
beat/editor/widgets/mainwindow.py
View file @
a1a0972f
...
...
@@ -69,7 +69,7 @@ class MainWindow(QMainWindow):
self
.
setCentralWidget
(
centralWidget
)
self
.
assetBrowser
.
jsonSelected
.
connect
(
self
.
assetWidget
.
load_json
)
self
.
assetBrowser
.
deletionRequested
.
connect
(
self
.
assetWidget
.
delete
_a
sset
)
self
.
assetBrowser
.
deletionRequested
.
connect
(
self
.
assetWidget
.
delete
A
sset
)
quitAction
.
triggered
.
connect
(
qApp
.
quit
)
aboutAction
.
triggered
.
connect
(
self
.
show_about
)
aboutQtAction
.
triggered
.
connect
(
self
.
show_about_qt
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment