Adding strings-message.properties

luwrain · Apr 13, 2023 · d6e0a8e · d6e0a8e
1 parent 5714a1f
commit d6e0a8e
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 3 deletions.
diff --git a/src/main/java/org/luwrain/app/mail/Extension.java b/src/main/java/org/luwrain/app/mail/Extension.java
@@ -57,13 +57,17 @@ public final class Extension extends EmptyExtension
  };
  }
 
-  @Override public void i18nExtension(Luwrain luwrain, org.luwrain.i18n.I18nExtension i18nExt)
+ @Override public void i18nExtension(Luwrain luwrain, org.luwrain.i18n.I18nExtension i18nExt)
  {
  i18nExt.addCommandTitle(Lang.EN, "mail", "Mail");
  i18nExt.addCommandTitle(Lang.RU, "mail", "Почта");
+ i18nExt.addCommandTitle(Lang.EN, "message", "Message");
+ i18nExt.addCommandTitle(Lang.RU, "message", "Сообщение");
  try {
  i18nExt.addStrings(Lang.EN, Strings.NAME, new ResourceStringsObj(luwrain, getClass().getClassLoader(), getClass(), "strings-mail.properties").create(Lang.EN, Strings.class));
  i18nExt.addStrings(Lang.RU, Strings.NAME, new ResourceStringsObj(luwrain, getClass().getClassLoader(), getClass(), "strings-mail.properties").create(Lang.RU, Strings.class));
+ i18nExt.addStrings(Lang.EN, org.luwrain.app.message.Strings.NAME, new ResourceStringsObj(luwrain, getClass().getClassLoader(), getClass(), "strings-message.properties").create(Lang.EN, org.luwrain.app.message.Strings.class));
+ i18nExt.addStrings(Lang.RU, org.luwrain.app.message.Strings.NAME, new ResourceStringsObj(luwrain, getClass().getClassLoader(), getClass(), "strings-message.properties").create(Lang.RU, org.luwrain.app.message.Strings.class));
  }
  catch(java.io.IOException e)
  {

diff --git a/src/main/java/org/luwrain/app/message/App.java b/src/main/java/org/luwrain/app/message/App.java
@@ -66,6 +66,9 @@ public App(Message message)
 
  @Override public boolean onEscape()
  {
+ if (this.mainLayout.modified)
+ if (!conv.closeModified())
+ return true;
  closeApp();
  return true;
  }

diff --git a/src/main/java/org/luwrain/app/message/Conv.java b/src/main/java/org/luwrain/app/message/Conv.java
@@ -1,5 +1,5 @@
 /*
- Copyright 2012-2022 Michael Pozhidaev <[email protected]>
+ Copyright 2012-2023 Michael Pozhidaev <[email protected]>
 
  This file is part of LUWRAIN.
 
@@ -27,6 +27,8 @@
 import org.luwrain.pim.contacts.*;
 import org.luwrain.popups.pim.*;
 
+import static org.luwrain.popups.Popups.*;
+
 final class Conv
 {
  private final App app;
@@ -115,4 +117,9 @@ MailAccount accountToSend() throws PimException
  return null;
  return (MailAccount)res;
  }
+
+ boolean closeModified()
+ {
+ return confirmDefaultNo(luwrain, strings.closeModifiedPopupName(), strings.closeModifiedPopupText());
+ }
 }
diff --git a/src/main/java/org/luwrain/app/message/MainLayout.java b/src/main/java/org/luwrain/app/message/MainLayout.java
@@ -34,6 +34,7 @@ final class MainLayout extends LayoutBase
  final App app;
  final MessageArea messageArea;
  final FormSpellChecking spellChecking;
+ boolean modified = false;
 
  MainLayout(App app)
  {
@@ -68,6 +69,7 @@ final class MainLayout extends LayoutBase
  return super.onSystemEvent(event);
  }
  };
+ messageArea.getMultilineEditChangeListeners().add((area, event, lines, hotPoint)->{ modified = true; });
  messageArea.getMultilineEditChangeListeners().add(spellChecking);
  setAreaLayout(messageArea, actions(
  action("sent", app.getStrings().actionSend(), ()->app.send(getMailMessage(), false)),
@@ -86,7 +88,6 @@ private boolean actEditTo()
 
  private boolean actEditCc(MessageArea area)
  {
- NullCheck.notNull(area, "area");
  final String res = app.getConv().editCc(area.getCc());
  if (res != null)
  area.setCc(res);

diff --git a/src/main/java/org/luwrain/app/message/Strings.java b/src/main/java/org/luwrain/app/message/Strings.java
@@ -32,4 +32,7 @@ public interface Strings
  String attachmentPopupName();
  String attachmentPopupPrefix();
  // String attachment(String f);
+
+ String closeModifiedPopupName();
+ String closeModifiedPopupText();
 }
diff --git a/src/main/resources/org/luwrain/app/mail/strings-message.properties b/src/main/resources/org/luwrain/app/mail/strings-message.properties
@@ -0,0 +1,13 @@
+ActionAttachFile = Прикрепить файл
+ActionChooseCc = Выбрать получателей копии
+ActionChooseTo = Выбрать получателя
+ActionDeleteAttachment = Удалить прикрепление
+ActionSend = Отправить
+ActionSendAnotherAccount = Отправить с выбором учётной записи
+AppName = Сообщение
+AttachmentPopupName = Новое прикрепление
+AttachmentPopupPrefix = Выберите файл для прикрепления:
+Attachment = Прикрепление "$1"
+
+CloseModifiedPopupName = Отмена редактирования
+CloseModifiedPopupText = Отмена редактирования приведёт к потере несохранённых данных. Всё равно продолжить?