diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c
index cec5a4b..82b9049 100644
--- a/source/ubl-settings-system.c
+++ b/source/ubl-settings-system.c
@@ -525,7 +525,7 @@ void on_status_clicked(GtkWidget *self, connection_window *window){
}
}
-void on_find_domains_clicked(GtkWidget *self, connection_window *window){
+void on_find_domains_clicked(GtkWidget *self, main_window *window){
yon_debug_output("%s\n",domains_seek_command);
domain_info_window *dialog = yon_information_window_new();
yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command);
@@ -566,7 +566,7 @@ gboolean on_main_window_domain_status_update(connection_window *window){
}
// gboolean yon_update_thread(GtkWidget *self, GdkEvent *event, connection_window *window){
- gboolean yon_update_thread(connection_window *window){
+ gboolean yon_update_thread(GtkWidget *self, connection_window *window){
if (!update_thread_buzy){
update_thread_buzy=1;
pthread_t thread_id;
@@ -574,9 +574,6 @@ gboolean on_main_window_domain_status_update(connection_window *window){
}
return 1;
}
-void remove_checking(GtkWidget *self, connection_window *window){
- g_source_remove(window->timer_id);
-}
connection_window *yon_connection_window_new(){
GtkBuilder *builder = gtk_builder_new_from_resource(glade_connection_path);
@@ -585,7 +582,6 @@ connection_window *yon_connection_window_new(){
window->AdressEntry = yon_gtk_builder_get_widget(builder,"AdressEntry");
window->HeadLabel = yon_gtk_builder_get_widget(builder,"HeadLabel");
window->StatusEntry = yon_gtk_builder_get_widget(builder,"StatusEntry");
- window->FindEntry = yon_gtk_builder_get_widget(builder,"FindEntry");
window->LoginEntry = yon_gtk_builder_get_widget(builder,"LoginEntry");
window->PasswordEntry = yon_gtk_builder_get_widget(builder,"PasswordEntry");
window->KerberosServerEntry = yon_gtk_builder_get_widget(builder,"KerberosServerEntry");
@@ -596,14 +592,11 @@ connection_window *yon_connection_window_new(){
window->SettingsTree = yon_gtk_builder_get_widget(builder,"SettingsTree");
window->SaveButton = yon_gtk_builder_get_widget(builder,"SaveButton");
window->CancelButton = yon_gtk_builder_get_widget(builder,"CancelButton");
+ window->CheckButton = yon_gtk_builder_get_widget(builder,"CheckButton");
window->list = GTK_LIST_STORE(gtk_builder_get_object(builder,"liststore1"));
g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
g_signal_connect(G_OBJECT(window->StatusEntry),"clicked",G_CALLBACK(on_status_clicked),window);
- g_signal_connect(G_OBJECT(window->FindEntry),"clicked",G_CALLBACK(on_find_domains_clicked),window);
- g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(remove_checking),window);
- // g_signal_connect(G_OBJECT(window->AdressEntry),"focus-out-event",G_CALLBACK(yon_update_thread),window);
- // yon_update_thread(NULL,NULL,window);
- window->timer_id = g_timeout_add(1000,(GSourceFunc)yon_update_thread,window);
+ g_signal_connect(G_OBJECT(window->CheckButton),"clicked",G_CALLBACK(yon_update_thread),window);
return window;
}
@@ -769,6 +762,7 @@ main_window *yon_main_window_complete(main_window *widgets){
widgets->LocaleButton = yon_gtk_builder_get_widget(builder,"getLocalesButton");
widgets->LocaleEntry = yon_gtk_builder_get_widget(builder,"localeEntry");
+ widgets->FindButton = yon_gtk_builder_get_widget(builder,"FindButton");
widgets->DomainButton = yon_gtk_builder_get_widget(builder,"DomainButton");
widgets->DomainEntry = yon_gtk_builder_get_widget(builder,"DomainEntry");
@@ -814,6 +808,8 @@ main_window *yon_main_window_complete(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->DomainEntry),"focus-out-event",G_CALLBACK(on_domain_address_save),NULL);
+ g_signal_connect(G_OBJECT(widgets->FindButton),"clicked",G_CALLBACK(on_find_domains_clicked),widgets);
+
gtk_widget_set_size_request(widgets->Window,800,440);
// g_timeout_add(1000,(GSourceFunc)on_check_domain_connected,widgets);
diff --git a/source/ubl-settings-system.h b/source/ubl-settings-system.h
index 469223f..e7649b6 100644
--- a/source/ubl-settings-system.h
+++ b/source/ubl-settings-system.h
@@ -116,6 +116,7 @@ typedef struct {
GtkWidget *DomainEntry;
GtkWidget *DomainButton;
+ GtkWidget *FindButton;
GtkListStore *fontlist;
GtkListStore *languagelist;
@@ -172,7 +173,7 @@ typedef struct {
GtkWidget *PasswordEntry;
GtkWidget *DNSEntry;
GtkWidget *StatusEntry;
- GtkWidget *FindEntry;
+ GtkWidget *CheckButton;
GtkWidget *KerberosServerEntry;
GtkWidget *ClientCombo;
GtkWidget *AdditionalCombo;
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 295e529..86fe281 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -59,4 +59,5 @@
#define DOMAIN_CONNECTED_LABEL _("Connected to domain")
#define DOMAIN_DISCONNECTED_LABEL _("Disconnected from domain")
-#define LOADING_LABEL _("Loading...")
\ No newline at end of file
+#define LOADING_LABEL _("Loading...")
+#define CHECK_CONNECTION_LABEL _("Check connection")
\ No newline at end of file
diff --git a/ubl-settings-system-connection.glade b/ubl-settings-system-connection.glade
index 98ffd07..0598e11 100644
--- a/ubl-settings-system-connection.glade
+++ b/ubl-settings-system-connection.glade
@@ -8,11 +8,6 @@
False
com.ublinux.libublsettingsui-gtk3.important-symbolic
-
diff --git a/ubl-settings-system.pot b/ubl-settings-system.pot
index 9cd9acc..02230a0 100644
--- a/ubl-settings-system.pot
+++ b/ubl-settings-system.pot
@@ -216,3 +216,7 @@ msgstr ""
#: source/ubl-strings.h:62
msgid "Loading..."
msgstr ""
+
+#: source/ubl-strings.h:63
+msgid "Check connection"
+msgstr ""
diff --git a/ubl-settings-system_ru.po b/ubl-settings-system_ru.po
index 050dbc2..367c642 100644
--- a/ubl-settings-system_ru.po
+++ b/ubl-settings-system_ru.po
@@ -94,130 +94,134 @@ msgstr "По умолчанию"
msgid "Cancel"
msgstr "Отмена"
-#: source/ubl-strings.h:23
+#: source/ubl-strings.h:24
msgid "Machine ID has been copied"
msgstr "ID рабочей станции скопирован"
-#: source/ubl-strings.h:25
+#: source/ubl-strings.h:26
msgid "ID field can't be empty!"
msgstr "Поле ID не может быть пустым!"
-#: source/ubl-strings.h:27
+#: source/ubl-strings.h:28
msgid "Insert data"
msgstr "Введите данные"
-#: source/ubl-strings.h:29
+#: source/ubl-strings.h:30
msgid "Accept"
msgstr "Принять"
-#: source/ubl-strings.h:31
+#: source/ubl-strings.h:32
msgid "Important field is empty"
msgstr "Пустое важное поле"
-#: source/ubl-strings.h:33
+#: source/ubl-strings.h:34
msgid "Connect"
msgstr "Подключиться"
-#: source/ubl-strings.h:34
+#: source/ubl-strings.h:35
msgid "Disconnect"
msgstr "Отключиться"
-#: source/ubl-strings.h:35
+#: source/ubl-strings.h:36
msgid "Domain address"
msgstr "Адрес домена"
-#: source/ubl-strings.h:36
+#: source/ubl-strings.h:37
msgid "Domain address:"
msgstr "Адрес домена:"
-#: source/ubl-strings.h:37
+#: source/ubl-strings.h:38
msgid "Domain administrator name:"
msgstr "Имя администратора домена:"
-#: source/ubl-strings.h:38
+#: source/ubl-strings.h:39
msgid "Domain administrator password:"
msgstr "Пароль администратора домена:"
-#: source/ubl-strings.h:39
+#: source/ubl-strings.h:40
msgid "Main"
msgstr "Основные"
-#: source/ubl-strings.h:40
+#: source/ubl-strings.h:41
msgid "Additional"
msgstr "Дополнительные"
-#: source/ubl-strings.h:41
+#: source/ubl-strings.h:42
msgid "Kerberos/AD domain server:"
msgstr "Сервер домена Kerberos/AD"
-#: source/ubl-strings.h:42
+#: source/ubl-strings.h:43
msgid "DNS server:"
msgstr "DNS сервер:"
-#: source/ubl-strings.h:43
+#: source/ubl-strings.h:44
msgid "Domain connection client"
msgstr "Клиент подключения к домену"
-#: source/ubl-strings.h:44
+#: source/ubl-strings.h:45
msgid "Sssd client"
msgstr "Клиент sssd"
-#: source/ubl-strings.h:45
+#: source/ubl-strings.h:46
msgid "Winbind client"
msgstr "Клиент windbind"
-#: source/ubl-strings.h:46
+#: source/ubl-strings.h:47
msgid "Samba client"
msgstr "Клиент samba"
-#: source/ubl-strings.h:47
+#: source/ubl-strings.h:48
msgid "Switch client off or automatically"
msgstr "Выключить клиент или автоматически"
-#: source/ubl-strings.h:48
+#: source/ubl-strings.h:49
msgid "Domain information"
msgstr "Информация о домене"
-#: source/ubl-strings.h:49
+#: source/ubl-strings.h:50
msgid "Domain connection"
msgstr "Соединение домена"
-#: source/ubl-strings.h:50
+#: source/ubl-strings.h:51
msgid "Check domain name"
msgstr "Проверить домен"
-#: source/ubl-strings.h:51
+#: source/ubl-strings.h:52
msgid "List all domains"
msgstr "Показать все домены"
-#: source/ubl-strings.h:53
+#: source/ubl-strings.h:54
msgid "Connecting to domain"
msgstr "Подключение к домену"
-#: source/ubl-strings.h:54
+#: source/ubl-strings.h:55
msgid "Disconnecting from domain"
msgstr "Отключение от домена"
-#: source/ubl-strings.h:55
+#: source/ubl-strings.h:56
msgid "Join"
msgstr "Присоединиться"
-#: source/ubl-strings.h:56
+#: source/ubl-strings.h:57
msgid "Leave"
msgstr "Отсоединиться"
-#: source/ubl-strings.h:58
+#: source/ubl-strings.h:59
msgid "Connected to domain"
msgstr "Подключен к домену"
-#: source/ubl-strings.h:59
+#: source/ubl-strings.h:60
msgid "Disconnected from domain"
msgstr "Не подключен к домену"
-#: source/ubl-strings.h:61
+#: source/ubl-strings.h:62
msgid "Loading..."
msgstr "Загрузка..."
+#: source/ubl-strings.h:63
+msgid "Check connection"
+msgstr "Проверка доступности"
+
msgid "Afrikaans, South Africa"
msgstr "Африканский, Южная Африка"