Skip to content

Commit

Permalink
fully functional prototype, some slight functional gaps remain. issue #…
Browse files Browse the repository at this point in the history 
…2018
  • Loading branch information
@j-dimension
j-dimension committed Sep 26, 2023
1 parent fd1bdd8 commit 44440bd
Show file tree
Hide file tree
Showing 25 changed files with 1,472 additions and 119 deletions.
Binary file modified j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar
View file
Binary file not shown.
46 changes: 44 additions & 2 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/JKanzleiGUI.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1041,15 +1041,17 @@
<Component id="lblSystemStatus" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="statusLabel" min="-2" pref="385" max="-2" attributes="0"/>
<EmptySpace pref="180" max="32767" attributes="0"/>
<EmptySpace pref="189" max="32767" attributes="0"/>
<Component id="lblTimesheetStatus" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="lblUpdateStatus" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="lblNewsStatus" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="lblFaxStatus" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
<Component id="lblUnreadInstantMessages" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblMailStatus" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="lblScanStatus" min="-2" max="-2" attributes="0"/>
Expand All @@ -1072,6 +1074,7 @@
<Component id="lblDrebisStatus" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="lblBeaStatus" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="lblTimesheetStatus" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="lblUnreadInstantMessages" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="lblSystemStatus" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
Expand Down Expand Up @@ -1106,6 +1109,11 @@
</Component>
<Component class="javax.swing.JLabel" name="lblScanStatus">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font component="lblScanStatus" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons/scanner.png"/>
</Property>
Expand All @@ -1115,6 +1123,11 @@
</Component>
<Component class="javax.swing.JLabel" name="lblMailStatus">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font component="lblMailStatus" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons/folder_inbox.png"/>
</Property>
Expand All @@ -1134,6 +1147,11 @@
</Component>
<Component class="javax.swing.JLabel" name="lblFaxStatus">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font component="lblFaxStatus" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="0" green="0" red="ff" type="rgb"/>
</Property>
Expand All @@ -1160,6 +1178,11 @@
</Component>
<Component class="javax.swing.JLabel" name="lblDrebisStatus">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font component="lblDrebisStatus" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons16/drebis16.png"/>
</Property>
Expand All @@ -1169,6 +1192,11 @@
</Component>
<Component class="javax.swing.JLabel" name="lblBeaStatus">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font component="lblBeaStatus" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons16/bea16.png"/>
</Property>
Expand Down Expand Up @@ -1196,6 +1224,20 @@
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="lblTimesheetStatusMouseClicked"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="lblUnreadInstantMessages">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font component="lblUnreadInstantMessages" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons16/material/baseline_chat_blue_48dp.png"/>
</Property>
<Property name="text" type="java.lang.String" value="?"/>
<Property name="enabled" type="boolean" value="false"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Component class="com.jdimension.jlawyer.client.modulebar.ModuleBar" name="moduleBar">
Expand Down
33 changes: 29 additions & 4 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/JKanzleiGUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,7 @@
import com.jdimension.jlawyer.client.events.Event;
import com.jdimension.jlawyer.client.events.EventBroker;
import com.jdimension.jlawyer.client.events.FaxStatusEvent;
import com.jdimension.jlawyer.client.events.NewInstantMessagesEvent;
import com.jdimension.jlawyer.client.events.NewsEvent;
import com.jdimension.jlawyer.client.events.OpenTimesheetPositionsEvent;
import com.jdimension.jlawyer.client.events.ScannerStatusEvent;
Expand All @@ -707,7 +708,6 @@
import com.jdimension.jlawyer.server.constants.OptionConstants;
import com.jdimension.jlawyer.server.modules.ModuleMetadata;
import com.jdimension.jlawyer.services.JLawyerServiceLocator;
import com.jdimension.jlawyer.services.SystemManagementRemote;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Rectangle;
Expand Down Expand Up @@ -778,6 +778,7 @@ public JKanzleiGUI() {
b.subscribeConsumer(this, Event.TYPE_BEASTATUS);
b.subscribeConsumer(this, Event.TYPE_DREBISSTATUS);
b.subscribeConsumer(this, Event.TYPE_OPENTIMESHEETPOSITIONS);
b.subscribeConsumer(this, Event.TYPE_INSTANTMESSAGING_NEWMESSAGES);

ClientSettings settings = ClientSettings.getInstance();
String randomBackgrounds = UserSettings.getInstance().getSetting(UserSettings.CONF_DESKTOP_RANDOM_BACKGROUND, "0");
Expand Down Expand Up @@ -1043,6 +1044,15 @@ public void onEvent(Event e) {
this.lblBeaStatus.setText("-");
this.lblBeaStatus.setToolTipText("keine ungelesenen beA-Nachrichten");
}
} else if (e instanceof NewInstantMessagesEvent) {
this.lblUnreadInstantMessages.setEnabled(true);
if (((NewInstantMessagesEvent) e).getNewMessages().size() > 0) {
this.lblUnreadInstantMessages.setText("" + ((NewInstantMessagesEvent) e).getNewMessages().size());
this.lblUnreadInstantMessages.setToolTipText("ungelesene Elemente im Nachrichtencenter");
} else {
this.lblUnreadInstantMessages.setText("");
this.lblUnreadInstantMessages.setToolTipText("keine ungelesenen Elemente im Nachrichtencenter");
}
} else if (e instanceof DrebisStatusEvent) {

if (((DrebisStatusEvent) e).getMessages() > 0) {
Expand Down Expand Up @@ -1088,6 +1098,7 @@ private void initComponents() {
lblDrebisStatus = new javax.swing.JLabel();
lblBeaStatus = new javax.swing.JLabel();
lblTimesheetStatus = new javax.swing.JLabel();
lblUnreadInstantMessages = new javax.swing.JLabel();
moduleBar = new com.jdimension.jlawyer.client.modulebar.ModuleBar();
jPanel1 = new javax.swing.JPanel();
jMenuBar1 = new javax.swing.JMenuBar();
Expand Down Expand Up @@ -1210,10 +1221,12 @@ public void windowClosing(java.awt.event.WindowEvent evt) {
lblUpdateStatus.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblUpdateStatus.setText(" ");

lblScanStatus.setFont(lblScanStatus.getFont());
lblScanStatus.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/scanner.png"))); // NOI18N
lblScanStatus.setText("?");
lblScanStatus.setEnabled(false);

lblMailStatus.setFont(lblMailStatus.getFont());
lblMailStatus.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/folder_inbox.png"))); // NOI18N
lblMailStatus.setText("?");
lblMailStatus.setEnabled(false);
Expand All @@ -1225,6 +1238,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
}
});

lblFaxStatus.setFont(lblFaxStatus.getFont());
lblFaxStatus.setForeground(new java.awt.Color(255, 0, 0));
lblFaxStatus.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/printer.png"))); // NOI18N
lblFaxStatus.setText("?");
Expand All @@ -1235,10 +1249,12 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
lblNewsStatus.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
lblNewsStatus.setText(" ");

lblDrebisStatus.setFont(lblDrebisStatus.getFont());
lblDrebisStatus.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/drebis16.png"))); // NOI18N
lblDrebisStatus.setText("?");
lblDrebisStatus.setEnabled(false);

lblBeaStatus.setFont(lblBeaStatus.getFont());
lblBeaStatus.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/bea16.png"))); // NOI18N
lblBeaStatus.setText("?");
lblBeaStatus.setToolTipText("noch nicht eingeloggt");
Expand All @@ -1254,6 +1270,11 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
}
});

lblUnreadInstantMessages.setFont(lblUnreadInstantMessages.getFont());
lblUnreadInstantMessages.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/material/baseline_chat_blue_48dp.png"))); // NOI18N
lblUnreadInstantMessages.setText("?");
lblUnreadInstantMessages.setEnabled(false);

org.jdesktop.layout.GroupLayout statusPanelLayout = new org.jdesktop.layout.GroupLayout(statusPanel);
statusPanel.setLayout(statusPanelLayout);
statusPanelLayout.setHorizontalGroup(
Expand All @@ -1262,15 +1283,17 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
.add(lblSystemStatus)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(statusLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 385, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 180, Short.MAX_VALUE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 189, Short.MAX_VALUE)
.add(lblTimesheetStatus)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(lblUpdateStatus)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(lblNewsStatus)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(lblFaxStatus)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(12, 12, 12)
.add(lblUnreadInstantMessages)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(lblMailStatus)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(lblScanStatus)
Expand All @@ -1290,7 +1313,8 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
.add(statusLabel)
.add(lblDrebisStatus)
.add(lblBeaStatus)
.add(lblTimesheetStatus))
.add(lblTimesheetStatus)
.add(lblUnreadInstantMessages))
.add(org.jdesktop.layout.GroupLayout.TRAILING, lblSystemStatus)
);

Expand Down Expand Up @@ -2860,6 +2884,7 @@ public static void main(String args[]) {
private javax.swing.JLabel lblScanStatus;
private javax.swing.JLabel lblSystemStatus;
private javax.swing.JLabel lblTimesheetStatus;
private javax.swing.JLabel lblUnreadInstantMessages;
private javax.swing.JLabel lblUpdateStatus;
private javax.swing.JMenuItem mnuAbout;
private javax.swing.JMenuItem mnuAddressBookSync;
Expand Down
3 changes: 2 additions & 1 deletion j-lawyer-client/src/com/jdimension/jlawyer/client/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,8 @@ private void showSplash(String cmdHost, String cmdPort, String cmdUser, String c
instantMessages.setModuleName("Post");
instantMessages.setDefaultIcon(new javax.swing.ImageIcon(getClass().getResource("/icons32/material/baseline_chat_blue_48dp.png")));
instantMessages.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/icons32/material/baseline_chat_green_48dp.png")));
//instantMessages.setStatusEventType(Event.TYPE_MAILSTATUS);
instantMessages.setStatusEventType(Event.TYPE_INSTANTMESSAGING_NEWMESSAGES);
instantMessages.setResetIndicatorOnClick(true);
mail.addChildModule(instantMessages);

ModuleMetadata mailInbox = new ModuleMetadata(java.util.ResourceBundle.getBundle("com/jdimension/jlawyer/client/Modules").getString("mod.comm.inbox"));
Expand Down
Loading

0 comments on commit 44440bd

Please sign in to comment.