Skip to content

Commit

Permalink
add local settings
Browse files Browse the repository at this point in the history
  • Loading branch information
UmSenhorQualquer committed May 22, 2018
1 parent 7fa1662 commit a86edca
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pyforms/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
conf += 'pyforms.settings'

try:
import settings
conf += settings
import local_settings
conf += local_settings
except:
pass
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@
],
packages=find_packages(),
package_data={'pyforms_gui': [
'gui/controls/uipics/*.png',
'gui/mainWindow.ui', 'gui/controls/*.ui', 'gui/controls/control_player/*.ui',
'gui/controls/control_event_timeline/*.ui']
'controls/uipics/*.png',
'controls/*.ui',
'controls/control_player/*.ui',
'controls/control_event_timeline/*.ui']
},
)

0 comments on commit a86edca

Please sign in to comment.