Mercurial > hg > idav / file diff

--- a/ui/qt/window.cpp	Tue Feb 25 21:11:00 2025 +0100
+++ b/ui/qt/window.cpp	Sat Apr 05 16:46:11 2025 +0200
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ucx/mempool.h>
+#include <cx/mempool.h>
 #include "../common/context.h"
 
 #include "window.h"
@@ -36,34 +36,36 @@
 
 #include <QVBoxLayout>
 #include <QFileDialog>
+#include <QPushButton>
 
-static UiObject* create_window(char *title, void *window_data, bool simple) {
-    UcxMempool *mp = ucx_mempool_new(256);
-    UiObject *obj = (UiObject*)ucx_mempool_calloc(mp, 1, sizeof(UiObject));
+static UiObject* create_window(const char *title, void *window_data, bool simple) {
+    CxMempool *mp = cxMempoolCreateSimple(256);
+    UiObject *obj = (UiObject*)cxCalloc(mp->allocator, 1, sizeof(UiObject));
     obj->ctx = uic_context(obj, mp);
     obj->window = window_data;
     obj->next = NULL;
     
     QMainWindow *window = new QMainWindow();
+    window->setWindowTitle(title);
     obj->widget = window;
     
     if(!simple) {
         ui_add_menus(obj, window);
-        QToolBar *toolbar = ui_create_toolbar(obj);
-        window->addToolBar(Qt::TopToolBarArea, toolbar);
+        //QToolBar *toolbar = ui_create_toolbar(obj);
+        //window->addToolBar(Qt::TopToolBarArea, toolbar);
     }
     
     QBoxLayout *box = new QVBoxLayout();
     QWidget *boxWidget = new QWidget();
     boxWidget->setLayout(box);
     window->setCentralWidget(boxWidget);
-    obj->container = new UiBoxContainer(box);
+    ui_container_add(obj, new UiBoxContainer(box));
     
     obj->widget = window;
     return obj;
 }
 
-UiObject* ui_window(char *title, void *window_data) {
+UiObject* ui_window(const char *title, void *window_data) {
     return create_window(title, window_data, FALSE);
 }