add toolbar app menu

diff --git a/application/application.c b/application/application.c
index 47263d94fdc7704d31d4637714e804936644a1d6..6af37245792853894d2d485e93844c004e9978af 100644 (file)
--- a/application/application.c
+++ b/application/application.c
@@ -107,6 +107,14 @@ void application_startup(UiEvent *event, void *data) {
 
 /* ------------------------------- Actions ------------------------------- */
 
 
 /* ------------------------------- Actions ------------------------------- */
 

+void action_new_window(UiEvent *event, void *data) {
+    window_create();
+}
+
+void action_preferences(UiEvent *event, void *data) {
+    // TODO
+}
+

 void action_go_back(UiEvent *event, void *data) {
     MainWindow *w = event->window;
     if(cxListSize(w->navstack) > 0 && w->navstack_pos > 0) {
 void action_go_back(UiEvent *event, void *data) {
     MainWindow *w = event->window;
     if(cxListSize(w->navstack) > 0 && w->navstack_pos > 0) {

diff --git a/application/application.h b/application/application.h
index 3ef47d4b2038c3ac91bbd1ee882baa5daad2a447..f895467cae4906c13f28e5480740cb7f20832a61 100644 (file)
--- a/application/application.h
+++ b/application/application.h
@@ -183,6 +183,8 @@ void application_init();
 
 void application_startup(UiEvent *event, void *data);
 
 
 void application_startup(UiEvent *event, void *data);
 

+void action_new_window(UiEvent *event, void *data);
+void action_preferences(UiEvent *event, void *data);

 
 void action_go_back(UiEvent *event, void *data);
 void action_go_forward(UiEvent *event, void *data);
 
 void action_go_back(UiEvent *event, void *data);
 void action_go_forward(UiEvent *event, void *data);

diff --git a/application/menu.c b/application/menu.c
index 9a590d655cd09b689c57de956a0e907696cf95d7..f23b4f508c457dd766f6da54804ab844733dfc9f 100644 (file)
--- a/application/menu.c
+++ b/application/menu.c
@@ -49,6 +49,15 @@ void toolbar_init() {
     ui_toolbar_item("GoBack2", .icon = UI_ICON_GO_BACK, .onclick = action_go_back, .visibility_states = UI_GROUPS(APP_STATE_HIDE_NOTELIST));
     ui_toolbar_item("GoForward2", .icon = UI_ICON_GO_FORWARD, .onclick = action_go_forward, .visibility_states = UI_GROUPS(APP_STATE_HIDE_NOTELIST));
     
     ui_toolbar_item("GoBack2", .icon = UI_ICON_GO_BACK, .onclick = action_go_back, .visibility_states = UI_GROUPS(APP_STATE_HIDE_NOTELIST));
     ui_toolbar_item("GoForward2", .icon = UI_ICON_GO_FORWARD, .onclick = action_go_forward, .visibility_states = UI_GROUPS(APP_STATE_HIDE_NOTELIST));
     

+    ui_toolbar_appmenu() {
+        ui_menuitem("New Window", .onclick = action_new_window);
+        
+        ui_menuseparator();
+        
+        
+        ui_menuitem("Preferences", .onclick = action_preferences);
+    }
+    

     ui_toolbar_add_default("GoBack", UI_TOOLBAR_LEFT);
     ui_toolbar_add_default("GoForward", UI_TOOLBAR_LEFT);
     ui_toolbar_add_default("AddNote", UI_TOOLBAR_LEFT);
     ui_toolbar_add_default("GoBack", UI_TOOLBAR_LEFT);
     ui_toolbar_add_default("GoForward", UI_TOOLBAR_LEFT);
     ui_toolbar_add_default("AddNote", UI_TOOLBAR_LEFT);