diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index 6807a2b..3d6bfc8 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -2,6 +2,9 @@
-
+
+ file:/O:/MyDocuments/projects/Workspace_JavaWin/GettextDB/src/potoxml/FileFinder.java
+ file:/O:/MyDocuments/projects/Workspace_JavaWin/GettextDB/src/potoxml/NewJFrame.java
+
diff --git a/settings.ini b/settings.ini
index d7b2951..bb7c8c0 100644
--- a/settings.ini
+++ b/settings.ini
@@ -1,7 +1,7 @@
[main]
-db_url = jdbc\:postgresql\://10.101.1.6\:5432/transit
-db_user = translate
-db_password = translate
+db_url = jdbc\:postgresql\://ccalm.org\:5432/CCALM
+db_user = app_translation_2
+db_password = ZsiVuv7l4iTpVJgtP0tg
[path0]
path = O\:\\projects\\Workspace_PHP\\transit.istt.kz
@@ -11,7 +11,7 @@ pattern = [0-9|a-z|A-Z|_]+
type = 5
[path1]
-path = O:\\projects\\Workspace_PHP\\jwt.local
+path = O\:\\projects\\Workspace_PHP\\jwt.local
check = trt(
extensions = (.*\\.php$)||(.*\\.xml$)||(.*\\.js$)
pattern = [0-9|a-z|A-Z|_]+
diff --git a/src/potoxml/NewJFrame.form b/src/potoxml/NewJFrame.form
index efd9cf6..18b8cb4 100644
--- a/src/potoxml/NewJFrame.form
+++ b/src/potoxml/NewJFrame.form
@@ -290,7 +290,7 @@
-
+
diff --git a/src/potoxml/NewJFrame.java b/src/potoxml/NewJFrame.java
index 602265e..216b024 100644
--- a/src/potoxml/NewJFrame.java
+++ b/src/potoxml/NewJFrame.java
@@ -60,7 +60,7 @@ public class NewJFrame extends javax.swing.JFrame
}
textArea1.append("JAR file path: " + jarDir + "\n");
- File file = new File(jarDir + "settings.ini");
+ File file = new File(jarDir + "..\\settings.ini");
if(file.exists()){
Ini ini = new Ini(file);
jTFDBURL.setText(ini.get("main", "db_url"));
@@ -266,7 +266,7 @@ public class NewJFrame extends javax.swing.JFrame
.addComponent(jPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
);
- jButton1.setText("Сканировать");
+ jButton1.setLabel("Сканировать_");
jButton1.setName(""); // NOI18N
jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -496,7 +496,7 @@ public class NewJFrame extends javax.swing.JFrame
//Подключаюсь к базе данных
String url = jTFDBURL.getText(); //"jdbc:postgresql://10.1.7.74:5432/pilot";
String user = jTFDBUser.getText(); //"translate";
- String password = jTFDBUser.getText(); //"translate";
+ String password = jTFDBPassword.getText(); //"translate";
Connection conn = null;
try {
Class.forName("org.postgresql.Driver");