Fixed russian localisation, added check for domain connection to domain info opening icon

pull/39/head
parent 3658b261bf
commit ef35e9ecbb

@ -510,7 +510,7 @@ void on_find_domains_clicked(GtkWidget *self, connection_window *window){
void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition icon_pos,GdkEvent* event,main_window *widgets){ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition icon_pos,GdkEvent* event,main_window *widgets){
if (icon_pos==GTK_ENTRY_ICON_SECONDARY){ if (icon_pos==GTK_ENTRY_ICON_SECONDARY&&main_config.domain_connected){
char *target = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry)); char *target = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry));
if (!yon_char_is_empty(target)){ if (!yon_char_is_empty(target)){
yon_debug_output(get_domain_info_command); yon_debug_output(get_domain_info_command);
@ -670,7 +670,6 @@ void config_init(){
void on_check_domain_connected(GtkWidget *self, main_window *widgets){ void on_check_domain_connected(GtkWidget *self, main_window *widgets){
int ansv = system(domain_connect_check); int ansv = system(domain_connect_check);
printf("%d\n",ansv);
if (!ansv){ if (!ansv){
gtk_entry_set_icon_from_icon_name(GTK_ENTRY(widgets->DomainEntry),GTK_ENTRY_ICON_SECONDARY,domain_connected_icon); gtk_entry_set_icon_from_icon_name(GTK_ENTRY(widgets->DomainEntry),GTK_ENTRY_ICON_SECONDARY,domain_connected_icon);
gtk_button_set_label(GTK_BUTTON(widgets->DomainButton),DOMAIN_DISCONNECT_LABEL); gtk_button_set_label(GTK_BUTTON(widgets->DomainButton),DOMAIN_DISCONNECT_LABEL);

@ -5,6 +5,7 @@
<!-- interface-css-provider-path ubl-settings-system.css --> <!-- interface-css-provider-path ubl-settings-system.css -->
<object class="GtkApplicationWindow" id="MainWindow"> <object class="GtkApplicationWindow" id="MainWindow">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="modal">True</property>
<property name="icon-name">com.ublinux.ubl-settings-repomanager</property> <property name="icon-name">com.ublinux.ubl-settings-repomanager</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
@ -51,7 +52,7 @@
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Domain adress:</property> <property name="label" translatable="yes">Domain address:</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
<packing> <packing>

@ -148,7 +148,7 @@ msgstr "Сервер домена Kerberos/AD"
#: source/ubl-strings.h:42 #: source/ubl-strings.h:42
msgid "DNS server:" msgid "DNS server:"
msgstr "DNS сервер" msgstr "DNS сервер:"
#: source/ubl-strings.h:43 #: source/ubl-strings.h:43
msgid "Domain connection client" msgid "Domain connection client"

Loading…
Cancel
Save