reorder username and server fields in add account wizard. Fixes #4853
This commit is contained in:
		
							parent
							
								
									aff4e444f6
								
							
						
					
					
						commit
						8aa62e2658
					
				
					 1 changed files with 113 additions and 152 deletions
				
			
		| 
						 | 
				
			
			@ -129,43 +129,10 @@ to the Jabber network.</property>
 | 
			
		|||
                <child>
 | 
			
		||||
                  <widget class="GtkTable" id="table27">
 | 
			
		||||
                    <property name="visible">True</property>
 | 
			
		||||
                    <property name="n_rows">4</property>
 | 
			
		||||
                    <property name="n_columns">3</property>
 | 
			
		||||
                    <property name="n_rows">2</property>
 | 
			
		||||
                    <property name="n_columns">4</property>
 | 
			
		||||
                    <property name="column_spacing">12</property>
 | 
			
		||||
                    <property name="row_spacing">6</property>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <placeholder/>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <placeholder/>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkEntry" id="username_entry">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
                        <property name="can_focus">True</property>
 | 
			
		||||
                        <signal name="changed" handler="on_username_entry_changed"/>
 | 
			
		||||
                        <signal name="key_press_event" handler="on_username_entry_key_press_event"/>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="left_attach">1</property>
 | 
			
		||||
                        <property name="right_attach">2</property>
 | 
			
		||||
                        <property name="y_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkLabel" id="label267">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
                        <property name="xalign">0</property>
 | 
			
		||||
                        <property name="label" translatable="yes">_Server:</property>
 | 
			
		||||
                        <property name="use_underline">True</property>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="top_attach">1</property>
 | 
			
		||||
                        <property name="bottom_attach">2</property>
 | 
			
		||||
                        <property name="x_options">GTK_FILL</property>
 | 
			
		||||
                        <property name="y_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkComboBoxEntry" id="server_comboboxentry">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
| 
						 | 
				
			
			@ -176,29 +143,52 @@ to the Jabber network.</property>
 | 
			
		|||
                        </child>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="left_attach">1</property>
 | 
			
		||||
                        <property name="right_attach">2</property>
 | 
			
		||||
                        <property name="top_attach">1</property>
 | 
			
		||||
                        <property name="bottom_attach">2</property>
 | 
			
		||||
                        <property name="left_attach">3</property>
 | 
			
		||||
                        <property name="right_attach">4</property>
 | 
			
		||||
                        <property name="x_options">GTK_FILL</property>
 | 
			
		||||
                        <property name="y_options">GTK_FILL</property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkLabel" id="label263">
 | 
			
		||||
                      <widget class="GtkLabel" id="label1">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
                        <property name="xalign">0</property>
 | 
			
		||||
                        <property name="label" translatable="yes">_Password:</property>
 | 
			
		||||
                        <property name="use_underline">True</property>
 | 
			
		||||
                        <property name="mnemonic_widget">password_entry</property>
 | 
			
		||||
                        <property name="label" translatable="yes">@</property>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="left_attach">2</property>
 | 
			
		||||
                        <property name="right_attach">3</property>
 | 
			
		||||
                        <property name="x_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkLabel" id="label262">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
                        <property name="xalign">0</property>
 | 
			
		||||
                        <property name="label" translatable="yes">_Jabber ID:</property>
 | 
			
		||||
                        <property name="use_underline">True</property>
 | 
			
		||||
                        <property name="mnemonic_widget">username_entry</property>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="top_attach">2</property>
 | 
			
		||||
                        <property name="bottom_attach">3</property>
 | 
			
		||||
                        <property name="x_options">GTK_FILL</property>
 | 
			
		||||
                        <property name="y_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkEntry" id="password_entry">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
                        <property name="can_focus">True</property>
 | 
			
		||||
                        <property name="visibility">False</property>
 | 
			
		||||
                        <property name="activates_default">True</property>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="left_attach">1</property>
 | 
			
		||||
                        <property name="right_attach">2</property>
 | 
			
		||||
                        <property name="top_attach">1</property>
 | 
			
		||||
                        <property name="bottom_attach">2</property>
 | 
			
		||||
                        <property name="y_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkCheckButton" id="save_password_checkbutton">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
| 
						 | 
				
			
			@ -214,73 +204,44 @@ to the Jabber network.</property>
 | 
			
		|||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="left_attach">2</property>
 | 
			
		||||
                        <property name="right_attach">3</property>
 | 
			
		||||
                        <property name="top_attach">2</property>
 | 
			
		||||
                        <property name="bottom_attach">3</property>
 | 
			
		||||
                        <property name="right_attach">4</property>
 | 
			
		||||
                        <property name="top_attach">1</property>
 | 
			
		||||
                        <property name="bottom_attach">2</property>
 | 
			
		||||
                        <property name="x_options">GTK_FILL</property>
 | 
			
		||||
                        <property name="y_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkEntry" id="password_entry">
 | 
			
		||||
                      <widget class="GtkLabel" id="label263">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
                        <property name="xalign">0</property>
 | 
			
		||||
                        <property name="label" translatable="yes">_Password:</property>
 | 
			
		||||
                        <property name="use_underline">True</property>
 | 
			
		||||
                        <property name="mnemonic_widget">password_entry</property>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="top_attach">1</property>
 | 
			
		||||
                        <property name="bottom_attach">2</property>
 | 
			
		||||
                        <property name="x_options">GTK_FILL</property>
 | 
			
		||||
                        <property name="y_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkEntry" id="username_entry">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
                        <property name="can_focus">True</property>
 | 
			
		||||
                        <property name="visibility">False</property>
 | 
			
		||||
                        <property name="activates_default">True</property>
 | 
			
		||||
                        <signal name="changed" handler="on_username_entry_changed"/>
 | 
			
		||||
                        <signal name="key_press_event" handler="on_username_entry_key_press_event"/>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="left_attach">1</property>
 | 
			
		||||
                        <property name="right_attach">2</property>
 | 
			
		||||
                        <property name="top_attach">2</property>
 | 
			
		||||
                        <property name="bottom_attach">3</property>
 | 
			
		||||
                        <property name="y_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkLabel" id="label262">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
                        <property name="xalign">0</property>
 | 
			
		||||
                        <property name="label" translatable="yes">_Username:</property>
 | 
			
		||||
                        <property name="use_underline">True</property>
 | 
			
		||||
                        <property name="mnemonic_widget">username_entry</property>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="x_options">GTK_FILL</property>
 | 
			
		||||
                        <property name="y_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkLabel" id="label258">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
                        <property name="xalign">0</property>
 | 
			
		||||
                        <property name="label" translatable="yes">Your JID:</property>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="top_attach">3</property>
 | 
			
		||||
                        <property name="bottom_attach">4</property>
 | 
			
		||||
                        <property name="x_options">GTK_FILL</property>
 | 
			
		||||
                        <property name="y_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
                      <widget class="GtkLabel" id="jid_label">
 | 
			
		||||
                        <property name="visible">True</property>
 | 
			
		||||
                        <property name="can_focus">True</property>
 | 
			
		||||
                        <property name="xalign">0</property>
 | 
			
		||||
                        <property name="use_markup">True</property>
 | 
			
		||||
                        <property name="selectable">True</property>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                      <packing>
 | 
			
		||||
                        <property name="left_attach">1</property>
 | 
			
		||||
                        <property name="right_attach">3</property>
 | 
			
		||||
                        <property name="top_attach">3</property>
 | 
			
		||||
                        <property name="bottom_attach">4</property>
 | 
			
		||||
                        <property name="x_options">GTK_FILL</property>
 | 
			
		||||
                        <property name="y_options"></property>
 | 
			
		||||
                      </packing>
 | 
			
		||||
                    </child>
 | 
			
		||||
                  </widget>
 | 
			
		||||
                  <packing>
 | 
			
		||||
                    <property name="expand">False</property>
 | 
			
		||||
                    <property name="position">1</property>
 | 
			
		||||
                  </packing>
 | 
			
		||||
                </child>
 | 
			
		||||
| 
						 | 
				
			
			@ -363,62 +324,6 @@ to the Jabber network.</property>
 | 
			
		|||
                        <property name="n_columns">3</property>
 | 
			
		||||
                        <property name="column_spacing">5</property>
 | 
			
		||||
                        <property name="row_spacing">5</property>
 | 
			
		||||
                        <child>
 | 
			
		||||
                          <widget class="GtkLabel" id="label381">
 | 
			
		||||
                            <property name="visible">True</property>
 | 
			
		||||
                            <property name="xalign">0</property>
 | 
			
		||||
                            <property name="label" translatable="yes">Prox_y:</property>
 | 
			
		||||
                            <property name="use_underline">True</property>
 | 
			
		||||
                          </widget>
 | 
			
		||||
                          <packing>
 | 
			
		||||
                            <property name="x_options">GTK_FILL</property>
 | 
			
		||||
                            <property name="y_options"></property>
 | 
			
		||||
                          </packing>
 | 
			
		||||
                        </child>
 | 
			
		||||
                        <child>
 | 
			
		||||
                          <widget class="GtkComboBox" id="proxies_combobox">
 | 
			
		||||
                            <property name="visible">True</property>
 | 
			
		||||
                            <property name="items">None</property>
 | 
			
		||||
                          </widget>
 | 
			
		||||
                          <packing>
 | 
			
		||||
                            <property name="left_attach">1</property>
 | 
			
		||||
                            <property name="right_attach">2</property>
 | 
			
		||||
                            <property name="y_options">GTK_FILL</property>
 | 
			
		||||
                          </packing>
 | 
			
		||||
                        </child>
 | 
			
		||||
                        <child>
 | 
			
		||||
                          <widget class="GtkButton" id="manage_proxies_button">
 | 
			
		||||
                            <property name="visible">True</property>
 | 
			
		||||
                            <property name="can_focus">True</property>
 | 
			
		||||
                            <property name="label" translatable="yes">Manage...</property>
 | 
			
		||||
                            <property name="use_underline">True</property>
 | 
			
		||||
                            <property name="response_id">0</property>
 | 
			
		||||
                            <signal name="clicked" handler="on_manage_proxies_button_clicked"/>
 | 
			
		||||
                          </widget>
 | 
			
		||||
                          <packing>
 | 
			
		||||
                            <property name="left_attach">2</property>
 | 
			
		||||
                            <property name="right_attach">3</property>
 | 
			
		||||
                            <property name="x_options"></property>
 | 
			
		||||
                            <property name="y_options"></property>
 | 
			
		||||
                          </packing>
 | 
			
		||||
                        </child>
 | 
			
		||||
                        <child>
 | 
			
		||||
                          <widget class="GtkCheckButton" id="custom_host_port_checkbutton">
 | 
			
		||||
                            <property name="visible">True</property>
 | 
			
		||||
                            <property name="can_focus">True</property>
 | 
			
		||||
                            <property name="label" translatable="yes">Use custom hostname/port</property>
 | 
			
		||||
                            <property name="use_underline">True</property>
 | 
			
		||||
                            <property name="response_id">0</property>
 | 
			
		||||
                            <property name="draw_indicator">True</property>
 | 
			
		||||
                            <signal name="toggled" handler="on_custom_host_port_checkbutton_toggled"/>
 | 
			
		||||
                          </widget>
 | 
			
		||||
                          <packing>
 | 
			
		||||
                            <property name="right_attach">3</property>
 | 
			
		||||
                            <property name="top_attach">1</property>
 | 
			
		||||
                            <property name="bottom_attach">2</property>
 | 
			
		||||
                            <property name="y_options"></property>
 | 
			
		||||
                          </packing>
 | 
			
		||||
                        </child>
 | 
			
		||||
                        <child>
 | 
			
		||||
                          <widget class="GtkHBox" id="custom_host_hbox">
 | 
			
		||||
                            <property name="visible">True</property>
 | 
			
		||||
| 
						 | 
				
			
			@ -481,6 +386,62 @@ to the Jabber network.</property>
 | 
			
		|||
                            <property name="y_options">GTK_FILL</property>
 | 
			
		||||
                          </packing>
 | 
			
		||||
                        </child>
 | 
			
		||||
                        <child>
 | 
			
		||||
                          <widget class="GtkCheckButton" id="custom_host_port_checkbutton">
 | 
			
		||||
                            <property name="visible">True</property>
 | 
			
		||||
                            <property name="can_focus">True</property>
 | 
			
		||||
                            <property name="label" translatable="yes">Use custom hostname/port</property>
 | 
			
		||||
                            <property name="use_underline">True</property>
 | 
			
		||||
                            <property name="response_id">0</property>
 | 
			
		||||
                            <property name="draw_indicator">True</property>
 | 
			
		||||
                            <signal name="toggled" handler="on_custom_host_port_checkbutton_toggled"/>
 | 
			
		||||
                          </widget>
 | 
			
		||||
                          <packing>
 | 
			
		||||
                            <property name="right_attach">3</property>
 | 
			
		||||
                            <property name="top_attach">1</property>
 | 
			
		||||
                            <property name="bottom_attach">2</property>
 | 
			
		||||
                            <property name="y_options"></property>
 | 
			
		||||
                          </packing>
 | 
			
		||||
                        </child>
 | 
			
		||||
                        <child>
 | 
			
		||||
                          <widget class="GtkButton" id="manage_proxies_button">
 | 
			
		||||
                            <property name="visible">True</property>
 | 
			
		||||
                            <property name="can_focus">True</property>
 | 
			
		||||
                            <property name="label" translatable="yes">Manage...</property>
 | 
			
		||||
                            <property name="use_underline">True</property>
 | 
			
		||||
                            <property name="response_id">0</property>
 | 
			
		||||
                            <signal name="clicked" handler="on_manage_proxies_button_clicked"/>
 | 
			
		||||
                          </widget>
 | 
			
		||||
                          <packing>
 | 
			
		||||
                            <property name="left_attach">2</property>
 | 
			
		||||
                            <property name="right_attach">3</property>
 | 
			
		||||
                            <property name="x_options"></property>
 | 
			
		||||
                            <property name="y_options"></property>
 | 
			
		||||
                          </packing>
 | 
			
		||||
                        </child>
 | 
			
		||||
                        <child>
 | 
			
		||||
                          <widget class="GtkComboBox" id="proxies_combobox">
 | 
			
		||||
                            <property name="visible">True</property>
 | 
			
		||||
                            <property name="items">None</property>
 | 
			
		||||
                          </widget>
 | 
			
		||||
                          <packing>
 | 
			
		||||
                            <property name="left_attach">1</property>
 | 
			
		||||
                            <property name="right_attach">2</property>
 | 
			
		||||
                            <property name="y_options">GTK_FILL</property>
 | 
			
		||||
                          </packing>
 | 
			
		||||
                        </child>
 | 
			
		||||
                        <child>
 | 
			
		||||
                          <widget class="GtkLabel" id="label381">
 | 
			
		||||
                            <property name="visible">True</property>
 | 
			
		||||
                            <property name="xalign">0</property>
 | 
			
		||||
                            <property name="label" translatable="yes">Prox_y:</property>
 | 
			
		||||
                            <property name="use_underline">True</property>
 | 
			
		||||
                          </widget>
 | 
			
		||||
                          <packing>
 | 
			
		||||
                            <property name="x_options">GTK_FILL</property>
 | 
			
		||||
                            <property name="y_options"></property>
 | 
			
		||||
                          </packing>
 | 
			
		||||
                        </child>
 | 
			
		||||
                      </widget>
 | 
			
		||||
                    </child>
 | 
			
		||||
                    <child>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue