diff options
| author | fiaxh <git@mx.ax.lt> | 2017-06-16 14:29:02 +0200 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2017-06-17 16:13:23 +0200 |
| commit | 26973c89e391de673b6ac1db024a3098b1191393 (patch) | |
| tree | eb17d5006c1e70e7e88b71700455c40081b4af47 /main/data | |
| parent | 7bbbb738fdb233f4ad91ffdd7d9247b28849d715 (diff) | |
| download | dino-26973c89e391de673b6ac1db024a3098b1191393.tar.gz dino-26973c89e391de673b6ac1db024a3098b1191393.zip | |
Set jid handle in ContactDetails, use LabelHybrids more, remove edit from StartConversation
Diffstat (limited to 'main/data')
| -rw-r--r-- | main/data/add_conversation/select_jid_fragment.ui | 15 | ||||
| -rw-r--r-- | main/data/contact_details_dialog.ui | 15 | ||||
| -rw-r--r-- | main/data/manage_accounts/dialog.ui | 65 |
3 files changed, 24 insertions, 71 deletions
diff --git a/main/data/add_conversation/select_jid_fragment.ui b/main/data/add_conversation/select_jid_fragment.ui index 6384edb0..76744ad0 100644 --- a/main/data/add_conversation/select_jid_fragment.ui +++ b/main/data/add_conversation/select_jid_fragment.ui @@ -69,19 +69,6 @@ </object> </child> <child> - <object class="GtkButton" id="edit_button"> - <property name="sensitive">False</property> - <property name="visible">True</property> - <child> - <object class="GtkImage"> - <property name="icon-name">document-edit-symbolic</property> - <property name="icon-size">1</property> - <property name="visible">True</property> - </object> - </child> - </object> - </child> - <child> <object class="GtkButton" id="remove_button"> <property name="sensitive">False</property> <property name="visible">True</property> @@ -105,4 +92,4 @@ </object> </child> </template> -</interface>
\ No newline at end of file +</interface> diff --git a/main/data/contact_details_dialog.ui b/main/data/contact_details_dialog.ui index 5b074650..217a8b32 100644 --- a/main/data/contact_details_dialog.ui +++ b/main/data/contact_details_dialog.ui @@ -30,7 +30,7 @@ <property name="margin-bottom">12</property> <property name="margin-right">100</property> <property name="margin-left">100</property> - <property name="column-spacing">15</property> + <property name="column-spacing">10</property> <property name="visible">True</property> <child> <object class="GtkImage" id="avatar"> @@ -46,6 +46,19 @@ </packing> </child> <child> + <object class="DinoUiUtilEntryLabelHybrid" id="name_hybrid"> + <property name="xalign">0</property> + <property name="expand">True</property> + <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> <object class="GtkLabel" id="name_label"> <property name="xalign">0</property> <property name="expand">True</property> diff --git a/main/data/manage_accounts/dialog.ui b/main/data/manage_accounts/dialog.ui index 616d0503..2ad3a6bc 100644 --- a/main/data/manage_accounts/dialog.ui +++ b/main/data/manage_accounts/dialog.ui @@ -64,13 +64,13 @@ <property name="toolbar-style">icons</property> <property name="visible">True</property> <child> - <object class="GtkToolButton" id="add_button"> + <object class="GtkToolButton" id="add_account_button"> <property name="icon-name">list-add-symbolic</property> <property name="visible">True</property> </object> </child> <child> - <object class="GtkToolButton" id="remove_button"> + <object class="GtkToolButton" id="remove_account_button"> <property name="icon-name">list-remove-symbolic</property> <property name="visible">True</property> </object> @@ -178,35 +178,11 @@ </packing> </child> <child> - <object class="GtkStack" id="password_stack"> + <object class="DinoUiUtilEntryLabelHybrid" id="password_hybrid"> + <property name="xalign">0</property> + <property name="width_request">200</property> + <property name="visibility">False</property> <property name="visible">True</property> - <child> - <object class="GtkButton" id="password_button"> - <property name="relief">none</property> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="password_label"> - <property name="xalign">0</property> - <property name="visible">True</property> - </object> - </child> - </object> - <packing> - <property name="name">label</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="password_entry"> - <property name="hexpand">True</property> - <property name="input_purpose">password</property> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="visibility">False</property> - </object> - <packing> - <property name="name">entry</property> - </packing> - </child> </object> <packing> <property name="left_attach">1</property> @@ -232,33 +208,10 @@ </packing> </child> <child> - <object class="GtkStack" id="alias_stack"> + <object class="DinoUiUtilEntryLabelHybrid" id="alias_hybrid"> + <property name="xalign">0</property> + <property name="width_request">200</property> <property name="visible">True</property> - <child> - <object class="GtkButton" id="alias_button"> - <property name="relief">none</property> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="alias_label"> - <property name="xalign">0</property> - <property name="visible">True</property> - </object> - </child> - </object> - <packing> - <property name="name">label</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="alias_entry"> - <property name="hexpand">True</property> - <property name="width_request">200</property> - <property name="visible">True</property> - </object> - <packing> - <property name="name">entry</property> - </packing> - </child> </object> <packing> <property name="left_attach">1</property> |