projects
/
ipypbx
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes to table creation
[ipypbx]
/
src
/
ipypbx
/
main.py
diff --git
a/src/ipypbx/main.py
b/src/ipypbx/main.py
index
aeb2478
..
a99a34d
100644
(file)
--- a/
src/ipypbx/main.py
+++ b/
src/ipypbx/main.py
@@
-53,9
+53,9
@@
def setupDb(prefix=PREFIX, dbname=DB_NAME):
# Split into individual queries.
sql_queries = sql_script.split(';')
# Split into individual queries.
sql_queries = sql_script.split(';')
- # Execute all queries except BEGIN/COMMIT sequences.
+ # Execute all queries except last that is empty.
query = QtSql.QSqlQuery()
query = QtSql.QSqlQuery()
- for query_string in sql_queries[1:-2]:
+ for query_string in sql_queries[:-1]:
query.exec_(query_string)
else:
# Something went horribly wrong.
query.exec_(query_string)
else:
# Something went horribly wrong.
@@
-70,12
+70,8
@@
if __name__ == '__main__':
locale = QtCore.QLocale.system().name()
translator = QtCore.QTranslator()
locale = QtCore.QLocale.system().name()
translator = QtCore.QTranslator()
-# if translator.load("/home/antisvin/dev/git/ipypbx/src/ipypbx/locale/ipypbx_ru.qm"):
if translator.load("ipypbx_%s" % locale.toLower(), "ipypbx/locale"):
QtGui.QApplication.installTranslator(translator)
if translator.load("ipypbx_%s" % locale.toLower(), "ipypbx/locale"):
QtGui.QApplication.installTranslator(translator)
- else:
- print locale
- print translator.translate('MainWindow', 'Name').toUtf8()
setupDb()
main = QtGui.QMainWindow()
setupDb()
main = QtGui.QMainWindow()
@@
-89,5
+85,5
@@
if __name__ == '__main__':
controllers.EndpointController, controllers.ExtensionController):
controllerClass(parent=main, views=views)
controllers.EndpointController, controllers.ExtensionController):
controllerClass(parent=main, views=views)
- app.exec_()
-# sys.exit()
+ sys.exit(app.exec_())
+