From d7c4a38bc8ac2cb4f462f0599db38fbf4c350f23 Mon Sep 17 00:00:00 2001 From: igor Date: Fri, 21 Apr 2023 14:25:23 +0600 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B2=D0=B8=D0=B3=D0=B0=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nbproject/private/private.xml | 3 +- src/potoxml/NewJFrame.form | 449 ++++++++++++++++------------------ src/potoxml/NewJFrame.java | 156 +++++------- 3 files changed, 270 insertions(+), 338 deletions(-) diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 79c9684..25f13b2 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,8 +3,7 @@ - file:/O:/MyDocuments/projects/Workspace_JavaWin/GettextDB/src/potoxml/AssemblyJFrame.java - file:/O:/MyDocuments/projects/Workspace_JavaWin/GettextDB/src/potoxml/NewJFrame.java + file:/O:/projects/Workspace_Java/GettextDB/src/potoxml/NewJFrame.java diff --git a/src/potoxml/NewJFrame.form b/src/potoxml/NewJFrame.form index 24ab408..c1e2af3 100644 --- a/src/potoxml/NewJFrame.form +++ b/src/potoxml/NewJFrame.form @@ -29,16 +29,15 @@ + + + + - - - - - @@ -49,135 +48,40 @@ - + - - - + - + - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - + @@ -186,87 +90,214 @@ - - - - - - - - - - - - - - - + + + + + + + + + - - - - + - - + + - - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + - - - - + - + - - - - - - - - - - - - - - - - + + + + @@ -281,78 +312,12 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/potoxml/NewJFrame.java b/src/potoxml/NewJFrame.java index 68a242d..22e163b 100644 --- a/src/potoxml/NewJFrame.java +++ b/src/potoxml/NewJFrame.java @@ -65,11 +65,9 @@ public class NewJFrame extends javax.swing.JFrame // //GEN-BEGIN:initComponents private void initComponents() { + jPanel4 = new javax.swing.JPanel(); + jPanel5 = new javax.swing.JPanel(); jTabbedPane1 = new javax.swing.JTabbedPane(); - jPanel1 = new javax.swing.JPanel(); - jTextField1 = new javax.swing.JTextField(); - jLabel3 = new javax.swing.JLabel(); - jButton4 = new javax.swing.JButton(); jPanel2 = new javax.swing.JPanel(); jScrollPane1 = new javax.swing.JScrollPane(); jTable1 = new javax.swing.JTable(); @@ -81,14 +79,13 @@ public class NewJFrame extends javax.swing.JFrame jLabel6 = new javax.swing.JLabel(); jTFDBPassword = new javax.swing.JTextField(); jButton5 = new javax.swing.JButton(); - jButton1 = new javax.swing.JButton(); - jLabel1 = new javax.swing.JLabel(); - textArea1 = new java.awt.TextArea(); - jPanel4 = new javax.swing.JPanel(); jLabel2 = new javax.swing.JLabel(); jButton3 = new javax.swing.JButton(); textArea2 = new java.awt.TextArea(); jBSaveSettings = new javax.swing.JButton(); + jButton1 = new javax.swing.JButton(); + textArea1 = new java.awt.TextArea(); + jLabel1 = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); addWindowListener(new java.awt.event.WindowAdapter() { @@ -97,43 +94,6 @@ public class NewJFrame extends javax.swing.JFrame } }); - jTextField1.setText("jTextField1"); - - jLabel3.setText("Файл:"); - - jButton4.setText("Выбрать/Создать"); - jButton4.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jButton4ActionPerformed(evt); - } - }); - - javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); - jPanel1.setLayout(jPanel1Layout); - jPanel1Layout.setHorizontalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addContainerGap() - .addComponent(jLabel3) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 573, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jButton4, javax.swing.GroupLayout.PREFERRED_SIZE, 139, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap()) - ); - jPanel1Layout.setVerticalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel3) - .addComponent(jButton4)) - .addContainerGap(304, Short.MAX_VALUE)) - ); - - jTabbedPane1.addTab("English", jPanel1); - jTable1.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { {null, null, null, null}, @@ -159,11 +119,11 @@ public class NewJFrame extends javax.swing.JFrame jPanel2.setLayout(jPanel2Layout); jPanel2Layout.setHorizontalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 772, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 746, Short.MAX_VALUE) ); jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 338, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 179, Short.MAX_VALUE) ); jTabbedPane1.addTab("Настройки путей сканирования", jPanel2); @@ -198,7 +158,7 @@ public class NewJFrame extends javax.swing.JFrame .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jTFDBPassword) .addComponent(jTFDBUser) - .addComponent(jTFDBURL, javax.swing.GroupLayout.DEFAULT_SIZE, 647, Short.MAX_VALUE))) + .addComponent(jTFDBURL, javax.swing.GroupLayout.DEFAULT_SIZE, 621, Short.MAX_VALUE))) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup() .addGap(0, 0, Short.MAX_VALUE) .addComponent(jButton5))) @@ -221,21 +181,11 @@ public class NewJFrame extends javax.swing.JFrame .addComponent(jLabel6)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jButton5) - .addContainerGap(222, Short.MAX_VALUE)) + .addContainerGap(66, Short.MAX_VALUE)) ); jTabbedPane1.addTab("Настройки соединения с базой", jPanel3); - jButton1.setText("Сканировать"); - jButton1.setName(""); // NOI18N - jButton1.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jButton1ActionPerformed(evt); - } - }); - - jLabel1.setText("Перебираем файлы и создаём единый PHP файлик с _(“слово”)."); - jLabel2.setText("Пути для сканирования"); jButton3.setText("Экспорт PO или XML файла"); @@ -252,37 +202,65 @@ public class NewJFrame extends javax.swing.JFrame } }); + javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5); + jPanel5.setLayout(jPanel5Layout); + jPanel5Layout.setHorizontalGroup( + jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel5Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel5Layout.createSequentialGroup() + .addComponent(jLabel2) + .addGap(200, 200, 200) + .addComponent(jButton3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jTabbedPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) + .addComponent(textArea2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap()) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel5Layout.createSequentialGroup() + .addGap(0, 0, Short.MAX_VALUE) + .addComponent(jBSaveSettings)) + ); + jPanel5Layout.setVerticalGroup( + jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel5Layout.createSequentialGroup() + .addContainerGap() + .addComponent(jTabbedPane1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jButton3) + .addComponent(jLabel2)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(textArea2, javax.swing.GroupLayout.PREFERRED_SIZE, 118, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jBSaveSettings) + .addContainerGap()) + ); + javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4); jPanel4.setLayout(jPanel4Layout); jPanel4Layout.setHorizontalGroup( jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel4Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(jPanel4Layout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addComponent(jBSaveSettings)) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel4Layout.createSequentialGroup() - .addComponent(jLabel2) - .addGap(202, 202, 202) - .addComponent(jButton3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addComponent(textArea2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addContainerGap()) ); jPanel4Layout.setVerticalGroup( jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel4Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel2) - .addComponent(jButton3)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(textArea2, javax.swing.GroupLayout.PREFERRED_SIZE, 118, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jBSaveSettings) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, Short.MAX_VALUE)) ); + jButton1.setText("Сканировать"); + jButton1.setName(""); // NOI18N + jButton1.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jButton1ActionPerformed(evt); + } + }); + + jLabel1.setText("Перебираем файлы и создаём единый PHP файлик с _(“слово”)."); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -290,14 +268,13 @@ public class NewJFrame extends javax.swing.JFrame .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(jLabel1) + .addGap(0, 0, Short.MAX_VALUE)) .addComponent(textArea1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGap(0, 0, Short.MAX_VALUE) .addComponent(jButton1)) - .addComponent(jTabbedPane1, javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(layout.createSequentialGroup() - .addComponent(jLabel1) - .addGap(0, 0, Short.MAX_VALUE)) .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) ); @@ -305,15 +282,13 @@ public class NewJFrame extends javax.swing.JFrame layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(jPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 71, Short.MAX_VALUE) + .addGap(18, 18, 18) .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(textArea1, javax.swing.GroupLayout.PREFERRED_SIZE, 143, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jButton1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jTabbedPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 366, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap()) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); pack(); @@ -463,10 +438,6 @@ public class NewJFrame extends javax.swing.JFrame }//GEN-LAST:event_jButton3ActionPerformed - private void jButton4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton4ActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_jButton4ActionPerformed - private void formWindowActivated(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowActivated try { @@ -544,25 +515,22 @@ public class NewJFrame extends javax.swing.JFrame private javax.swing.JButton jBSaveSettings; private javax.swing.JButton jButton1; private javax.swing.JButton jButton3; - private javax.swing.JButton jButton4; private javax.swing.JButton jButton5; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; - private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; private javax.swing.JLabel jLabel6; - private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; private javax.swing.JPanel jPanel3; private javax.swing.JPanel jPanel4; + private javax.swing.JPanel jPanel5; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTextField jTFDBPassword; private javax.swing.JTextField jTFDBURL; private javax.swing.JTextField jTFDBUser; private javax.swing.JTabbedPane jTabbedPane1; private javax.swing.JTable jTable1; - private javax.swing.JTextField jTextField1; private java.awt.TextArea textArea1; private java.awt.TextArea textArea2; // End of variables declaration//GEN-END:variables