diff options
| -rw-r--r-- | core/events.lua | 7 | ||||
| -rw-r--r-- | core/file_io.lua | 8 | ||||
| -rw-r--r-- | core/locale.conf | 24 |
3 files changed, 22 insertions, 17 deletions
diff --git a/core/events.lua b/core/events.lua index cf522a9e..2707c272 100644 --- a/core/events.lua +++ b/core/events.lua @@ -495,12 +495,13 @@ add_handler('quit', end end if any and - textadept.dialog('yesno-msgbox', + textadept.dialog('msgbox', '--title', locale.EVENTS_QUIT_TITLE, '--text', locale.EVENTS_QUIT_TEXT, '--informative-text', - string.format(locale.EVENTS_QUIT_MSG, - table.concat(list, '\n')), + string.format('%s', table.concat(list, '\n')), + '--button1', 'gtk-cancel', + '--button2', locale.EVENTS_QUIT_BUTTON2, '--no-newline') ~= '2' then return false end diff --git a/core/file_io.lua b/core/file_io.lua index fa878c39..ced71eb8 100644 --- a/core/file_io.lua +++ b/core/file_io.lua @@ -323,10 +323,14 @@ end function close(buffer) textadept.check_focused_buffer(buffer) if buffer.dirty and - textadept.dialog('yesno-msgbox', + textadept.dialog('msgbox', '--title', locale.IO_CLOSE_TITLE, '--text', locale.IO_CLOSE_TEXT, - '--informative-text', locale.IO_CLOSE_MSG, + '--informative-text', + string.format('%s', (buffer.filename or + buffer._type or locale.UNTITLED)), + '--button1', 'gtk-cancel', + '--button2', locale.IO_CLOSE_BUTTON2, '--no-newline') ~= '2' then return false end diff --git a/core/locale.conf b/core/locale.conf index ef059beb..7450b884 100644 --- a/core/locale.conf +++ b/core/locale.conf @@ -52,16 +52,16 @@ STATUS_SPACES "Spaces: " DOCSTATUSBAR_TEXT "Line: %d/%d Col: %d %s %s %s %s" % core/events.lua -% "Save?" -EVENTS_QUIT_TITLE "Save?" +% "Quit without saving?" +EVENTS_QUIT_TITLE "Quit without saving?" % core/events.lua -% "Save changes before quitting?" -EVENTS_QUIT_TEXT "Save changes before quitting?" +% "The following buffers are unsaved:" +EVENTS_QUIT_TEXT "The following buffers are unsaved:" % core/events.lua -% "The following buffers are unsaved:\n\n%s\n\nYou will have to save changes manually." -EVENTS_QUIT_MSG "The following buffers are unsaved:\n\n%s\n\nYou will have to save changes manually." +% "Quit _without saving" +EVENTS_QUIT_BUTTON2 "Quit _without saving" % core/events.lua % "[Error Buffer]" @@ -80,16 +80,16 @@ IO_OPEN_TITLE "Open" IO_SAVE_TITLE "Save" % core/file_io.lua -% "Save?" -IO_CLOSE_TITLE "Save?" +% "Close without saving?" +IO_CLOSE_TITLE "Close without saving?" % core/file_io.lua -% "Save changes before closing?" -IO_CLOSE_TEXT "Save changes before closing?" +% "There are unsaved changes in" +IO_CLOSE_TEXT "There are unsaved changes in" % core/file_io.lua -% "You will have to save changes manually." -IO_CLOSE_MSG "You will have to save changes manually." +% "Close _without saving" +IO_CLOSE_BUTTON2 "Close _without saving" % core/file_io.lua % "Reload?" |