Changeset e0cf963 in mainline
- Timestamp:
- 2021-09-29T14:30:00Z (3 years ago)
- Branches:
- master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 9bf5da6f
- Parents:
- 6c0766b
- git-author:
- Jiri Svoboda <jiri@…> (2021-09-28 14:29:47)
- git-committer:
- Jiri Svoboda <jiri@…> (2021-09-29 14:30:00)
- Location:
- uspace
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/edit/edit.c
r6c0766b re0cf963 928 928 static void file_save_as(void) 929 929 { 930 //const char *old_fname = (doc.file_name != NULL) ? doc.file_name : "";930 const char *old_fname = (doc.file_name != NULL) ? doc.file_name : ""; 931 931 ui_file_dialog_params_t fdparams; 932 932 ui_file_dialog_t *dialog; … … 935 935 ui_file_dialog_params_init(&fdparams); 936 936 fdparams.caption = "Save As"; 937 // TODO: Set initial file name to old_fname937 fdparams.ifname = old_fname; 938 938 939 939 rc = ui_file_dialog_create(edit.ui, &fdparams, &dialog); … … 1821 1821 pdparams.caption = reverse ? "Reverse Search" : "Search"; 1822 1822 pdparams.prompt = "Search text"; 1823 1824 // const char *default_value = ""; 1825 //if (pane.previous_search)1826 // default_value= pane.previous_search;1823 pdparams.itext = ""; 1824 1825 if (pane.previous_search) 1826 pdparams.itext = pane.previous_search; 1827 1827 1828 1828 rc = ui_prompt_dialog_create(edit.ui, &pdparams, &dialog); -
uspace/lib/ui/include/types/ui/filedialog.h
r6c0766b re0cf963 49 49 /** Window caption */ 50 50 const char *caption; 51 /** Initial file name */ 52 const char *ifname; 51 53 } ui_file_dialog_params_t; 52 54 -
uspace/lib/ui/include/types/ui/promptdialog.h
r6c0766b re0cf963 51 51 /** Prompt text */ 52 52 const char *prompt; 53 /** Initial entry text */ 54 const char *itext; 53 55 } ui_prompt_dialog_params_t; 54 56 -
uspace/lib/ui/src/filedialog.c
r6c0766b re0cf963 76 76 { 77 77 memset(params, 0, sizeof(ui_file_dialog_params_t)); 78 params->ifname = ""; 78 79 } 79 80 … … 159 160 label = NULL; 160 161 161 rc = ui_entry_create(window, "", &entry);162 rc = ui_entry_create(window, params->ifname, &entry); 162 163 if (rc != EOK) 163 164 goto error; … … 183 184 184 185 ui_entry_activate(entry); 186 187 /* Select all */ 188 ui_entry_seek_start(entry, false); 189 ui_entry_seek_end(entry, true); 185 190 186 191 dialog->ename = entry; -
uspace/lib/ui/src/promptdialog.c
r6c0766b re0cf963 76 76 { 77 77 memset(params, 0, sizeof(ui_prompt_dialog_params_t)); 78 params->itext = ""; 78 79 } 79 80 … … 159 160 label = NULL; 160 161 161 rc = ui_entry_create(window, "", &entry);162 rc = ui_entry_create(window, params->itext, &entry); 162 163 if (rc != EOK) 163 164 goto error; … … 183 184 184 185 ui_entry_activate(entry); 186 187 /* Select all */ 188 ui_entry_seek_start(entry, false); 189 ui_entry_seek_end(entry, true); 185 190 186 191 dialog->ename = entry;
Note:
See TracChangeset
for help on using the changeset viewer.