comparison: ui/qt/window.cpp
ui/qt/window.cpp
- changeset 516
- 4b31c74666d7
- parent 157
- 0b33b9396851
- child 519
- 8884c7fbe4cb
equal
deleted
inserted
replaced
| 515:9e18cb8c4412 | 516:4b31c74666d7 |
|---|---|
| 24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| 25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| 26 * POSSIBILITY OF SUCH DAMAGE. | 26 * POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include <ucx/mempool.h> | 29 #include <cx/mempool.h> |
| 30 #include "../common/context.h" | 30 #include "../common/context.h" |
| 31 | 31 |
| 32 #include "window.h" | 32 #include "window.h" |
| 33 #include "menu.h" | 33 #include "menu.h" |
| 34 #include "toolbar.h" | 34 #include "toolbar.h" |
| 36 | 36 |
| 37 #include <QVBoxLayout> | 37 #include <QVBoxLayout> |
| 38 #include <QFileDialog> | 38 #include <QFileDialog> |
| 39 | 39 |
| 40 static UiObject* create_window(char *title, void *window_data, bool simple) { | 40 static UiObject* create_window(char *title, void *window_data, bool simple) { |
| 41 UcxMempool *mp = ucx_mempool_new(256); | 41 CxMempool *mp = cxMempoolCreateSimple(256); |
| 42 UiObject *obj = (UiObject*)ucx_mempool_calloc(mp, 1, sizeof(UiObject)); | 42 UiObject *obj = (UiObject*)cxCalloc(mp->allocator, 1, sizeof(UiObject)); |
| 43 obj->ctx = uic_context(obj, mp); | 43 obj->ctx = uic_context(obj, mp); |
| 44 obj->window = window_data; | 44 obj->window = window_data; |
| 45 obj->next = NULL; | 45 obj->next = NULL; |
| 46 | 46 |
| 47 QMainWindow *window = new QMainWindow(); | 47 QMainWindow *window = new QMainWindow(); |
| 48 obj->widget = window; | 48 obj->widget = window; |
| 49 | 49 |
| 50 /* | |
| 50 if(!simple) { | 51 if(!simple) { |
| 51 ui_add_menus(obj, window); | |
| 52 QToolBar *toolbar = ui_create_toolbar(obj); | 52 QToolBar *toolbar = ui_create_toolbar(obj); |
| 53 window->addToolBar(Qt::TopToolBarArea, toolbar); | 53 window->addToolBar(Qt::TopToolBarArea, toolbar); |
| 54 } | 54 } |
| 55 */ | |
| 55 | 56 |
| 56 QBoxLayout *box = new QVBoxLayout(); | 57 QBoxLayout *box = new QVBoxLayout(); |
| 57 QWidget *boxWidget = new QWidget(); | 58 QWidget *boxWidget = new QWidget(); |
| 58 boxWidget->setLayout(box); | 59 boxWidget->setLayout(box); |
| 59 window->setCentralWidget(boxWidget); | 60 window->setCentralWidget(boxWidget); |
| 60 obj->container = new UiBoxContainer(box); | 61 //obj->container = new UiBoxContainer(box); |
| 61 | 62 |
| 62 obj->widget = window; | 63 obj->widget = window; |
| 63 return obj; | 64 return obj; |
| 64 } | 65 } |
| 65 | 66 |
