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