Minor fixes

luwrain · Dec 31, 2022 · c083273 · c083273
1 parent acc4691
commit c083273
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 24 deletions.
diff --git a/src/main/java/org/luwrain/app/mail/Extension.java b/src/main/java/org/luwrain/app/mail/Extension.java
@@ -37,10 +37,7 @@ public final class Extension extends EmptyExtension
  return new ExtensionObject[]{
  new SimpleShortcut("mail", App.class),
  new Shortcut() {
- @Override public String getExtObjName()
- {
- return "message";
- }
+ @Override public String getExtObjName() { return "message"; }
  @Override public Application[] prepareApp(String[] args)
  {
  if (args.length == 0)

diff --git a/src/main/java/org/luwrain/app/mail/Hooks.java b/src/main/java/org/luwrain/app/mail/Hooks.java
@@ -77,21 +77,15 @@ List<SummaryItem> organizeSummary(MailMessage[] messages)
  return items;
  }
 
- boolean makeReply(MailMessage message)
+ void makeReply(MailMessage message)
  {
- /*
- NullCheck.notNull(message, "message");
- final Object[] args = new Object[]{new MessageHookObject(message)};
  try {
- return new ChainOfResponsibilityHook(luwrain).run(REPLY_HOOK_NAME, args);
+chainOfResponsibility(luwrain, REPLY, new Object[]{new MessageObj(message)});
  }
  catch(RuntimeException e)
  {
- Log.error(LOG_COMPONENT, "unable to run the " + REPLY_HOOK_NAME + ":" + e.getClass().getName() + ":" + e.getMessage());
- return false;
+ luwrain.crash(e);
  }
- */
- return false;
  }
 
  Map<String, MailAccount> server(String mailAddr)

diff --git a/src/main/java/org/luwrain/app/mail/MainLayout.java b/src/main/java/org/luwrain/app/mail/MainLayout.java
@@ -38,6 +38,9 @@
 
 final class MainLayout extends LayoutBase implements TreeListArea.LeafClickHandler<MailFolder>, ClickHandler<SummaryItem>
 {
+ static private final InputEvent
+ HOT_KEY_REPLY = new InputEvent('r', EnumSet.of(InputEvent.Modifiers.ALT));
+
  final App app;
  final TreeListArea<MailFolder> foldersArea;
  final ListArea<SummaryItem> summaryArea;
@@ -91,6 +94,7 @@ final class MainLayout extends LayoutBase implements TreeListArea.LeafClickHandl
  action("new-folder", app.getStrings().actionNewFolder(), new InputEvent(InputEvent.Special.INSERT), MainLayout.this::actNewFolder),
  fetchIncomingBkg),
  summaryArea, actions(
+ action("reply", app.getStrings().actionReply(), HOT_KEY_REPLY, this::actSummaryReply),
  fetchIncomingBkg
  ),
  messageArea, actions(
@@ -200,7 +204,8 @@ private boolean actSummaryReply()
  final SummaryItem item = summaryArea.selected();
  if (item == null || item.message == null)
  return false;
- return app.getHooks().makeReply(item.message);
+app.getHooks().makeReply(item.message);
+return true;
  }
 
  boolean saveAttachment(String fileName)

diff --git a/src/main/java/org/luwrain/app/mail/Strings.java b/src/main/java/org/luwrain/app/mail/Strings.java
@@ -25,16 +25,18 @@ public interface Strings
  String appName();
 
  String foldersAreaName();
-
  String actionNewFolder();
  String newFolderNamePopupName();
  String newFolderNamePopupPrefix();
-
  String actionRemoveFolder();
  String removeFolderPopupName();
  String removeFolderPopupText();
+ String actionFetchIncomingBkg();
+
+ String summaryAreaName();
+ String actionReply();
+ String actionReplyAll();
 
-
  String messageAreaAttachment();
  String messageAreaCc();
  String messageAreaContentType();
@@ -43,8 +45,8 @@ public interface Strings
  String messageAreaName();
  String messageAreaSubject();
  String messageAreaTo();
- String summaryAreaName();
- String actionFetchIncomingBkg();
+
+
 
  String wizardIntro();
  String wizardContinue();

diff --git a/src/main/java/org/luwrain/app/message/App.java b/src/main/java/org/luwrain/app/message/App.java
@@ -42,7 +42,7 @@ public App()
 
  public App(Message message)
  {
- super(Strings.NAME, Strings.class);
+ super(Strings.NAME, Strings.class, "luwrain.message");
  this.message = message != null?message:new Message();
  }
 
@@ -98,7 +98,7 @@ private void send(MailAccount account, MailMessage message) throws PimException
  message.setFrom(getFromLine(account));
  if (message.getFrom().trim().isEmpty())
  throw new RuntimeException("No sender address");//FIXME:
- message.setExtInfo(mailStoring.getAccounts().getUniRef(account));
+ //FIXME:  message.setExtInfo(mailStoring.getAccounts().getUniRef(account));
  fillMessageData(message);
  /*
  final MailFolder folder = mailStoring.getFolders().findFirstByProperty("defaultOutgoing", "true");

diff --git a/src/main/java/org/luwrain/app/message/MainLayout.java b/src/main/java/org/luwrain/app/message/MainLayout.java
@@ -49,6 +49,8 @@ final class MainLayout extends LayoutBase
  params.context = getControlContext();
  params.name = app.getStrings().appName();
  params.text = text.toArray(new String[text.size()]);
+ params.to = app.message.getTo() != null?app.message.getTo().trim():"";
+ params.subject = app.message.getSubject() != null?app.message.getSubject().trim():"";
  if (app.message.getAttachments() != null)
  params.attachments = app.message.getAttachments().toArray(new String[app.message.getAttachments().size()]);
  this.messageArea = new MessageArea(params){

diff --git a/src/main/resources/org/luwrain/app/mail/strings-mail.properties b/src/main/resources/org/luwrain/app/mail/strings-mail.properties
@@ -13,21 +13,24 @@ RemoveFolderPopupText = Вы действительно хотите удали
 
 
 
+
+SummaryAreaName = Сообщения
 ActionDeleteMessage = Удалить сообщение
-ActionForward = Переслать
 ActionReply = Ответить
 ActionReplyAll = Ответить всем
+ActionForward = Переслать
 
 
+MessageAreaName = Сообщение
 MessageAreaAttachment = Прикрепление:
 MessageAreaContentType = Тип данных:
 MessageAreaCc = Копия:
 MessageAreaDate = Время отправления:
 MessageAreaFrom = От:
-MessageAreaName = Сообщение
+
 MessageAreaSubject = Тема:
 MessageAreaTo = Кому:
-SummaryAreaName = Сообщения
+
 
 WizardIntro = Необходимо произвести подключение к учётной записи вашей электронной почты. Укажите ваш адрес электронной почты в поле ниже и нажмите кнопку "Продолжить".
 WizardContinue = Продолжить