add toolbar (note add item)

diff --git a/application/Makefile b/application/Makefile
index 24b3e939b68ed85b42629eb8959bf1c472e0731a..bd8a5953e019ae5041c570e1944d61d7dd59d8fc 100644 (file)
--- a/application/Makefile
+++ b/application/Makefile
@@ -33,6 +33,7 @@ CFLAGS += -I../ui/ -I../ucx -I..
 
 SRC  = main.c
 SRC += application.c
+SRC += menu.c
 SRC += window.c
 SRC += types.c
 SRC += store.c

diff --git a/application/application.c b/application/application.c
index 340f796a629e604ffa87bc099b1f8dd2f641205f..f72724e9c0f48ffb93956b8c9956f7458efbad2f 100644 (file)
--- a/application/application.c
+++ b/application/application.c
@@ -29,12 +29,18 @@
 #include "application.h"
 #include "window.h"
 #include "store.h"
+#include "menu.h"
 
 #include <unistd.h>
 #include <limits.h>
 
 #include <cx/mempool.h>
 
+void application_init() {
+    menu_init();
+    toolbar_init();
+}
+
 void application_startup(UiEvent *event, void *data) {
     if(init_note_store()) {
         fprintf(stderr, "note store initialization failed\n");
@@ -90,3 +96,10 @@ void application_startup(UiEvent *event, void *data) {
     
     window_create();
 }
+
+
+/* ------------------------------- Actions ------------------------------- */
+
+void action_note_new(UiEvent *event, void *data) {
+    
+}

diff --git a/application/application.h b/application/application.h
index ee8806c212130e9a0372451ecd2f8e36ad47b9d7..5c711c1ba57e8f58c0ebce642775f5523fd48e2c 100644 (file)
--- a/application/application.h
+++ b/application/application.h
@@ -46,9 +46,15 @@ typedef struct MainWindow {
     UiList *test2;
 } MainWindow;
    
+
+void application_init();
+
 void application_startup(UiEvent *event, void *data);
 
 
+void action_note_new(UiEvent *event, void *data);
+
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/application/main.c b/application/main.c
index b2b5f77fd5b4a91f84b1b5c5e60b00e7d74cae04..207e79b80832ddc44ff01fdb26ab2872a44a409e 100644 (file)
--- a/application/main.c
+++ b/application/main.c
@@ -41,6 +41,7 @@
 int app_main(int argc, char **argv) {\r
     register_types();\r
     ui_init("note", argc, argv);\r
+    application_init();\r
     ui_onstartup(application_startup, NULL);\r
     ui_main();\r
     return 0;\r