comparison: ui/qt/toolkit.cpp
ui/qt/toolkit.cpp
- changeset 516
- 4b31c74666d7
- parent 130
- 212b63dd61be
- child 518
- 45ed276ba7a4
equal
deleted
inserted
replaced
| 515:9e18cb8c4412 | 516:4b31c74666d7 |
|---|---|
| 34 #include "stock.h" | 34 #include "stock.h" |
| 35 | 35 |
| 36 #include "../common/document.h" | 36 #include "../common/document.h" |
| 37 #include "../common/properties.h" | 37 #include "../common/properties.h" |
| 38 | 38 |
| 39 static char *application_name; | 39 static const char *application_name; |
| 40 | 40 |
| 41 static ui_callback appclose_fnc; | 41 static ui_callback appclose_fnc; |
| 42 static void *appclose_udata; | 42 static void *appclose_udata; |
| 43 | 43 |
| 44 //static QApplication app(qargc, qargv); | 44 //static QApplication app(qargc, qargv); |
| 45 int app_argc; | 45 int app_argc; |
| 46 char **app_argv; | 46 char **app_argv; |
| 47 QApplication *application = NULL; | 47 QApplication *application = NULL; |
| 48 | 48 |
| 49 void ui_init(char *appname, int argc, char **argv) { | 49 void ui_init(const char *appname, int argc, char **argv) { |
| 50 application_name = appname; | 50 application_name = appname; |
| 51 | 51 |
| 52 app_argc = argc; | 52 app_argc = argc; |
| 53 app_argv = argv; | 53 app_argv = argv; |
| 54 application = new QApplication(app_argc, app_argv); | 54 application = new QApplication(app_argc, app_argv); |
| 55 | 55 |
| 56 uic_docmgr_init(); | 56 uic_docmgr_init(); |
| 57 | 57 |
| 58 uic_load_app_properties(); | 58 uic_load_app_properties(); |
| 59 | 59 |
| 60 ui_stock_init(); | |
| 61 } | 60 } |
| 62 | 61 |
| 63 char* ui_appname() { | 62 const char* ui_appname() { |
| 64 return application_name; | 63 return application_name; |
| 65 } | 64 } |
| 66 | 65 |
| 67 void ui_exitfunc(ui_callback f, void *udata) { | 66 void ui_exitfunc(ui_callback f, void *udata) { |
| 68 appclose_fnc = f; | 67 appclose_fnc = f; |
| 83 | 82 |
| 84 delete application; | 83 delete application; |
| 85 } | 84 } |
| 86 | 85 |
| 87 void ui_show(UiObject *obj) { | 86 void ui_show(UiObject *obj) { |
| 88 obj->widget->show(); | 87 //obj->widget->show(); |
| 89 } | 88 } |
| 90 | 89 |
| 91 void ui_close(UiObject *obj) { | 90 void ui_close(UiObject *obj) { |
| 92 QMainWindow *window = (QMainWindow*)obj->widget; | 91 QMainWindow *window = (QMainWindow*)obj->widget; |
| 93 window->close(); | 92 window->close(); |
