Changed icon to text at domain button, minor fixes

source/ubl-settings-system.c

@@ -507,7 +507,7 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition
         if (!yon_char_is_empty(target)){
             domain_info_window *window = yon_information_window_new();
             gtk_widget_show(window->Window);
-            yon_terminal_integrated_start(window->ExecuteTerminal,domain_info(target),NULL,NULL);
+            yon_terminal_integrated_start(window->ExecuteTerminal,get_domain_info_command,NULL,NULL);
         }
     }
 }
@@ -666,9 +666,11 @@ void config_init(){
 void on_check_domain_connected(main_window *widgets){
     if (!system(domain_connect_check)){
             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);
         main_config.domain_connected=1;
     } else {
             gtk_entry_set_icon_from_icon_name(GTK_ENTRY(widgets->DomainEntry),GTK_ENTRY_ICON_SECONDARY,domain_disconnected_icon);
+            gtk_button_set_label(GTK_BUTTON(widgets->DomainButton),DOMAIN_CONNECT_LABEL);
         main_config.domain_connected=0;
     }
 }

source/ubl-settings-system.h

@@ -64,7 +64,7 @@
 #define DOMAIN_get_command "ubconfig --source global get [network] DOMAIN"
 
 #define check_domain_access_command(targeet) yon_char_append("adcli info --domain ",target)
-#define get_domain_info_command(target) yon_char_append("ubdomain-client list ",target)
+#define get_domain_info_command "ubdomain-client list "
 #define domains_seek_command "ubdomain-client discover"
 #define domain_connect_command(target,user,password, addition) yon_char_unite("ubdomain-client join",!yon_char_is_empty(user)?" --user \"":"",!yon_char_is_empty(user)?user:"",!yon_char_is_empty(user)?"\"":"",!yon_char_is_empty(password)?" --password \"":"",!yon_char_is_empty(password)?password:"",!yon_char_is_empty(password)?"\"":""," --domain \"",target,"\"", addition,NULL) 
 #define domain_disconnect_command(target,user,password) yon_char_unite("ubdomain-client leave",!yon_char_is_empty(user)?" --user \"":"",!yon_char_is_empty(user)?user:"",!yon_char_is_empty(user)?"\"":"",!yon_char_is_empty(password)?" --password \"":"",!yon_char_is_empty(password)?password:"",!yon_char_is_empty(password)?"\"":""," --domain \"",target,"\"",NULL) 

source/ubl-strings.h

@@ -50,4 +50,6 @@
 #define CHECK_NAME_LABEL _("Check domain name")
 #define LIST_ALL_LABEL _("List all domains")
 
-#define DOMAIN_CONNECTING_LABEL _("Connecting to domain")
+#define DOMAIN_CONNECTING_LABEL _("Connecting to domain")
+#define DOMAIN_CONNECT_LABEL _("Connect to domain")
+#define DOMAIN_DISCONNECT_LABEL _("Disconnect from domain")

ubl-settings-system.glade

@@ -131,10 +131,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                     <property name="can-focus">False</property>
                     <property name="spacing">5</property>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Domain address:</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -156,14 +157,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                     </child>
                     <child>
                       <object class="GtkButton" id="DomainButton">
+                        <property name="label" translatable="yes">Connect to domain</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
                         <property name="tooltip-text" translatable="yes">Domain connection</property>
-                        <property name="image">image3</property>
-                        <style>
-                          <class name="thin"/>
-                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -505,6 +503,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <widget name="label6"/>
       <widget name="label3"/>
       <widget name="label6"/>
+      <widget name="label5"/>
     </widgets>
   </object>
   <object class="GtkMenu" id="menu1">

ubl-settings-system.pot

@@ -188,3 +188,11 @@ msgstr ""
 #: source/ubl-strings.h:53
 msgid "Connecting to domain"
 msgstr ""
+
+#: source/ubl-strings.h:54
+msgid "Connect to domain"
+msgstr ""
+
+#: source/ubl-strings.h:55
+msgid "Disconnect from domain"
+msgstr ""

ubl-settings-system_ru.po

@@ -190,6 +190,14 @@ msgstr "Показать все домены"
 msgid "Connecting to domain"
 msgstr "Подключение к домену"
 
+#: source/ubl-strings.h:54
+msgid "Connect to domain"
+msgstr "Войти в домен"
+
+#: source/ubl-strings.h:55
+msgid "Disconnect from domain"
+msgstr "Выйти из домена"
+
 msgid "Version:"
 msgstr "Версия:"