comparison: application/main.c
application/main.c
- changeset 19
- f8f22eb0b575
- parent 18
- 06be29a56f8b
- child 20
- 2dda1ad6dc7a
equal
deleted
inserted
replaced
| 18:06be29a56f8b | 19:f8f22eb0b575 |
|---|---|
| 116 ui_menuitem_st(UI_STOCK_OPEN, action_open, NULL); | 116 ui_menuitem_st(UI_STOCK_OPEN, action_open, NULL); |
| 117 ui_menuseparator(); | 117 ui_menuseparator(); |
| 118 ui_menuitem("Dokument 1", action_doc1, NULL); | 118 ui_menuitem("Dokument 1", action_doc1, NULL); |
| 119 ui_menuitem("Dokument 2", action_doc2, NULL); | 119 ui_menuitem("Dokument 2", action_doc2, NULL); |
| 120 void ui_menuseparator(); | 120 void ui_menuseparator(); |
| 121 ui_menuseparator(); | 121 |
| 122 ui_checkitem_nv("Check", "check1"); | 122 ui_checkitem_nv("Check", "check1"); |
| 123 //ui_checkitem("Check", action_open, NULL); | 123 //ui_checkitem("Check", action_open, NULL); |
| 124 <<<<<<< local | |
| 125 | |
| 126 ======= | |
| 124 ui_menuitem_st(UI_STOCK_CLOSE, action_close, NULL); | 127 ui_menuitem_st(UI_STOCK_CLOSE, action_close, NULL); |
| 128 >>>>>>> other | |
| 125 void ui_menuseparator(); | 129 void ui_menuseparator(); |
| 126 ui_menuitem_list(list, action_document, list); | 130 ui_menuitem_list(list, action_document, list); |
| 127 | 131 ui_menuseparator(); |
| 132 ui_menuitem("Close", action_close, NULL); | |
| 128 | 133 |
| 129 | 134 |
| 130 ui_toolitem_st("new", UI_STOCK_NEW, action_new, NULL); | 135 ui_toolitem_st("new", UI_STOCK_NEW, action_new, NULL); |
| 131 ui_toolitem_st("open", UI_STOCK_GO_BACK, action_open, NULL); | 136 ui_toolitem_st("open", UI_STOCK_GO_BACK, action_open, NULL); |
| 132 ui_toolitem_st("save", UI_STOCK_GO_FORWARD, action_save, NULL); | 137 ui_toolitem_st("save", UI_STOCK_GO_FORWARD, action_save, NULL); |
