Skip to content

Commit

Permalink
Merge origin/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-dimension
j-dimension committed Oct 23, 2024
2 parents 8f43cd3 + e197323 commit e01e1d2
Show file tree
Hide file tree
Showing 20 changed files with 1,043 additions and 75 deletions.
Binary file modified j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar
View file
Binary file not shown.
11 changes: 11 additions & 0 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 @@ -666,6 +666,17 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="mnuInvoicePositionTemplatesActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="mnuGiroCodes">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons16/material/baseline_qr_code_2_black_48dp.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Girocodes"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="mnuGiroCodesActionPerformed"/>
</Events>
</MenuItem>
</SubComponents>
</Menu>
<Menu class="javax.swing.JMenu" name="mnuTimesheet">
Expand Down
19 changes: 19 additions & 0 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 @@ -1197,6 +1197,7 @@ private void initComponents() {
mnuInvoiceCurrencies = new javax.swing.JMenuItem();
mnuInvoiceTaxRates = new javax.swing.JMenuItem();
mnuInvoicePositionTemplates = new javax.swing.JMenuItem();
mnuGiroCodes = new javax.swing.JMenuItem();
mnuTimesheet = new javax.swing.JMenu();
mnuTimesheetIntervals = new javax.swing.JMenuItem();
mnuTimesheetPositions = new javax.swing.JMenuItem();
Expand Down Expand Up @@ -1830,6 +1831,15 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
});
mnuFinance.add(mnuInvoicePositionTemplates);

mnuGiroCodes.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/material/baseline_qr_code_2_black_48dp.png"))); // NOI18N
mnuGiroCodes.setText("Girocodes");
mnuGiroCodes.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
mnuGiroCodesActionPerformed(evt);
}
});
mnuFinance.add(mnuGiroCodes);

mnuOptions.add(mnuFinance);

mnuTimesheet.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/material/baseline_timer_black_48dp.png"))); // NOI18N
Expand Down Expand Up @@ -2890,6 +2900,14 @@ private void mnuImportFromSheetActionPerformed(java.awt.event.ActionEvent evt) {
}
}//GEN-LAST:event_mnuImportFromSheetActionPerformed

private void mnuGiroCodesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_mnuGiroCodesActionPerformed
if (checkAdmin()) {
GirocodeConfigurationDialog dlg = new GirocodeConfigurationDialog(this, true);
FrameUtils.centerDialog(dlg, this);
dlg.setVisible(true);
}
}//GEN-LAST:event_mnuGiroCodesActionPerformed

/**
* @param args the command line arguments
*/
Expand Down Expand Up @@ -2968,6 +2986,7 @@ public static void main(String args[]) {
private javax.swing.JMenuItem mnuFontSize;
private javax.swing.JMenuItem mnuFormsManager;
private javax.swing.JMenuItem mnuForum;
private javax.swing.JMenuItem mnuGiroCodes;
private javax.swing.JMenuItem mnuGroups;
private javax.swing.JMenu mnuHelp;
private javax.swing.JMenuItem mnuImportFromSheet;
Expand Down
116 changes: 116 additions & 0 deletions ...r-client/src/com/jdimension/jlawyer/client/configuration/GirocodeConfigurationDialog.form
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<?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="Girocode-Einstellungen"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<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="2"/>
<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">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="spnGirocodes" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Component id="lblCaption" alignment="1" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="107" max="32767" attributes="0"/>
<Component id="cmdSave" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdClose" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<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"/>
<Component id="lblCaption" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="spnGirocodes" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="48" max="32767" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="cmdClose" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cmdSave" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JButton" name="cmdClose">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons/cancel.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jdimension/jlawyer/client/configuration/CustomFieldConfigurationDialog.properties" key="button.close" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdCloseActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="lblCaption">
<Properties>
<Property name="text" type="java.lang.String" value="H&#xf6;he / Breite von Girocodes in Belegen"/>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
</AuxValues>
</Component>
<Component class="javax.swing.JButton" name="cmdSave">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons/agt_action_success.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jdimension/jlawyer/client/configuration/CustomFieldConfigurationDialog.properties" key="button.save" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdSaveActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JSpinner" name="spnGirocodes">
<Properties>
<Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
<SpinnerModel initial="150" maximum="300" minimum="50" numberType="java.lang.Integer" stepSize="1" type="number"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="text" type="java.lang.String" value="Pixel"/>
</Properties>
</Component>
</SubComponents>
</Form>
Loading

0 comments on commit e01e1d2

Please sign in to comment.