Skip to content

Commit

Permalink
option to mark other users messages as done. issue #2484
Browse files Browse the repository at this point in the history
  • Loading branch information
j-dimension committed Jul 24, 2024
1 parent 006c221 commit a168ce1
Show file tree
Hide file tree
Showing 8 changed files with 1,167 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="lblPanelTitle" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="lblOtherUsersMessages" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="lblPopoutMessenger" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmbDownloadInstantMessages" min="-2" max="-2" attributes="0"/>
Expand Down Expand Up @@ -54,7 +56,10 @@
<Component id="cmbDownloadInstantMessages" alignment="0" min="-2" pref="46" max="-2" attributes="0"/>
<Component id="cmdRefresh" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
<Component id="lblPopoutMessenger" alignment="0" max="32767" attributes="0"/>
<Group type="103" alignment="0" groupAlignment="3" attributes="0">
<Component id="lblPopoutMessenger" alignment="3" max="32767" attributes="0"/>
<Component id="lblOtherUsersMessages" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="lblPanelTitle" alignment="0" max="32767" attributes="0"/>
<Component id="jLabel18" alignment="0" pref="42" max="32767" attributes="0"/>
</Group>
Expand Down Expand Up @@ -333,6 +338,7 @@
<Image iconType="3" name="/icons32/material/baseline_open_in_new_white_48dp.png"/>
</Property>
<Property name="text" type="java.lang.String" value=" "/>
<Property name="toolTipText" type="java.lang.String" value="Nachrichten in separatem Fenster &#xf6;ffnen"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Handcursor"/>
</Property>
Expand All @@ -341,5 +347,20 @@
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="lblPopoutMessengerMouseClicked"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="lblOtherUsersMessages">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons32/material/3p_48dp_FFFFFF.png"/>
</Property>
<Property name="text" type="java.lang.String" value=" "/>
<Property name="toolTipText" type="java.lang.String" value="&#xf6;ffentliche Nachrichten anderer Nutzer einsehen (bspw. Vertretungsfall)"/>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Handcursor"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="lblOtherUsersMessagesMouseClicked"/>
</Events>
</Component>
</SubComponents>
</Form>
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,7 @@ private void initComponents() {
messageSendPanel1 = new com.jdimension.jlawyer.client.messenger.MessageSendPanel();
lblClearHashtagSelection = new javax.swing.JLabel();
lblPopoutMessenger = new javax.swing.JLabel();
lblOtherUsersMessages = new javax.swing.JLabel();

jLabel18.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/baseline_chat_white_48dp.png"))); // NOI18N

Expand Down Expand Up @@ -995,13 +996,24 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {

lblPopoutMessenger.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons32/material/baseline_open_in_new_white_48dp.png"))); // NOI18N
lblPopoutMessenger.setText(" ");
lblPopoutMessenger.setToolTipText("Nachrichten in separatem Fenster öffnen");
lblPopoutMessenger.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR));
lblPopoutMessenger.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
lblPopoutMessengerMouseClicked(evt);
}
});

lblOtherUsersMessages.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons32/material/3p_48dp_FFFFFF.png"))); // NOI18N
lblOtherUsersMessages.setText(" ");
lblOtherUsersMessages.setToolTipText("öffentliche Nachrichten anderer Nutzer einsehen (bspw. Vertretungsfall)");
lblOtherUsersMessages.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR));
lblOtherUsersMessages.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
lblOtherUsersMessagesMouseClicked(evt);
}
});

org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
Expand All @@ -1016,6 +1028,8 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(lblPanelTitle)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(lblOtherUsersMessages)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(lblPopoutMessenger)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(cmbDownloadInstantMessages, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
Expand All @@ -1037,7 +1051,9 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
.add(cmbDownloadInstantMessages, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 46, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(cmdRefresh)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
.add(org.jdesktop.layout.GroupLayout.LEADING, lblPopoutMessenger, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(org.jdesktop.layout.GroupLayout.LEADING, layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(lblPopoutMessenger, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(lblOtherUsersMessages))
.add(org.jdesktop.layout.GroupLayout.LEADING, lblPanelTitle, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(org.jdesktop.layout.GroupLayout.LEADING, jLabel18, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 42, Short.MAX_VALUE)))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
Expand Down Expand Up @@ -1166,6 +1182,12 @@ private void lblPopoutMessengerMouseClicked(java.awt.event.MouseEvent evt) {//GE
dlgMessenger.setVisible(true);
}//GEN-LAST:event_lblPopoutMessengerMouseClicked

private void lblOtherUsersMessagesMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_lblOtherUsersMessagesMouseClicked
PopoutMessengerOtherUsers dlgMessenger = new PopoutMessengerOtherUsers(EditorsRegistry.getInstance().getMainWindow(), false);
FrameUtils.centerDialog(dlgMessenger, EditorsRegistry.getInstance().getMainWindow());
dlgMessenger.setVisible(true);
}//GEN-LAST:event_lblOtherUsersMessagesMouseClicked

@Override
public void notifyStatusBarReady() {
if (this.statusBarNotified) {
Expand All @@ -1189,6 +1211,7 @@ public Image getBackgroundImage() {
private javax.swing.JScrollPane jScrollPane3;
private javax.swing.JScrollPane jScrollPane4;
private javax.swing.JLabel lblClearHashtagSelection;
private javax.swing.JLabel lblOtherUsersMessages;
protected javax.swing.JLabel lblPanelTitle;
private javax.swing.JLabel lblPopoutMessenger;
private javax.swing.JList<String> lstHashtags;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,6 @@ You should also get your employer (if you work as a programmer) or school,
import com.jdimension.jlawyer.persistence.InstantMessage;
import com.jdimension.jlawyer.services.JLawyerServiceLocator;
import java.awt.Adjustable;
import java.awt.Graphics;
import java.awt.event.AdjustmentEvent;
import java.awt.event.AdjustmentListener;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
<Property name="defaultCloseOperation" type="int" value="2"/>
<Property name="title" type="java.lang.String" value="j-lawyer.org Messages"/>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="1e" green="15" red="c" type="rgb"/>
</Property>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<Events>
<EventHandler event="componentResized" listener="java.awt.event.ComponentListener" parameters="java.awt.event.ComponentEvent" handler="formComponentResized"/>
</Events>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
</AuxValues>

<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jPanel1" alignment="1" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jPanel1" alignment="1" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Container class="javax.swing.JPanel" name="jPanel1">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="1e" green="15" red="c" type="rgb"/>
</Property>
</Properties>

<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jScrollPane1" alignment="0" pref="863" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="cmbUsers" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="cmbUsers" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="404" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="null"/>
</Property>
<Property name="opaque" type="boolean" value="false"/>
</Properties>

<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="pnlMessages">
<Properties>
<Property name="opaque" type="boolean" value="false"/>
</Properties>

<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="850" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="447" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
</Container>
</SubComponents>
</Container>
<Component class="javax.swing.JComboBox" name="cmbUsers">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="4">
<StringItem index="0" value="Item 1"/>
<StringItem index="1" value="Item 2"/>
<StringItem index="2" value="Item 3"/>
<StringItem index="3" value="Item 4"/>
</StringArray>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
</AuxValues>
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
<FontInfo relative="true">
<Font component="jLabel1" property="font" relativeSize="true" size="0"/>
</FontInfo>
</Property>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="ff" green="ff" red="ff" type="rgb"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons16/lassists.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Erw&#xe4;hnungen f&#xfc;r den ausgew&#xe4;hlten Nutzer"/>
<Property name="toolTipText" type="java.lang.String" value="Erw&#xe4;hnungen werden bei Klick im Namen des ausgew&#xe4;hlten Nutzers als erledigt markiert."/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Form>
Loading

0 comments on commit a168ce1

Please sign in to comment.