Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
briar
Briar GTK
Commits
4e1b8b9f
Commit
4e1b8b9f
authored
Dec 30, 2020
by
Nico
Browse files
Rename chat_entry to chat_input
"Entry" is a widget in GTK and "input" is something more generalized.
parent
cea15bd0
Changes
2
Hide whitespace changes
Inline
Side-by-side
briar-gtk/briar_gtk/presenters/private_chat.py
View file @
4e1b8b9f
...
...
@@ -87,8 +87,8 @@ class PrivateChatPresenter:
confirmation_dialog
.
show_all
()
def
open_emoji_menu
(
self
):
chat_
entry
=
self
.
_view
.
builder
.
get_object
(
"chat_
entry
"
)
chat_
entry
.
emit
(
"insert-emoji"
)
chat_
input
=
self
.
_view
.
builder
.
get_object
(
"chat_
input
"
)
chat_
input
.
emit
(
"insert-emoji"
)
def
close_private_chat
(
self
):
# formerly `show_sidebar`
main_content_stack
=
self
.
_view
.
builder
.
get_object
(
...
...
@@ -101,7 +101,7 @@ class PrivateChatPresenter:
self
.
_set_contact_name_label
(
""
)
self
.
_view
.
contact_id
=
0
self
.
_hide_chat_menu_button
()
self
.
_disconnect_chat_
entry
_signals
()
self
.
_disconnect_chat_
input
_signals
()
def
disconnect_signals
(
self
):
for
signal
in
self
.
_signals
:
...
...
@@ -168,7 +168,7 @@ class PrivateChatPresenter:
self
.
_setup_message_listener
()
self
.
_mark_messages_read
(
messages
,
private_chat
)
self
.
_setup_history_container
()
self
.
_setup_chat_
entry
()
self
.
_setup_chat_
input
()
def
_setup_message_listener
(
self
):
# TODO: Move into briar_wrapper by adding function to PrivateChatModel
...
...
@@ -188,14 +188,14 @@ class PrivateChatPresenter:
history_container
.
add
(
self
.
_view
)
history_container
.
show_all
()
def
_setup_chat_
entry
(
self
):
chat_
entry
=
self
.
_view
.
builder
.
get_object
(
"chat_
entry
"
)
self
.
_chat_
entry
_signal_id
=
chat_
entry
.
connect
(
"key-press-event"
,
self
.
_on_chat_
entry
_activate
def
_setup_chat_
input
(
self
):
chat_
input
=
self
.
_view
.
builder
.
get_object
(
"chat_
input
"
)
self
.
_chat_
input
_signal_id
=
chat_
input
.
connect
(
"key-press-event"
,
self
.
_on_chat_
input
_activate
)
# TODO: Activate vscrollbar only if needed (to save space)
# https://github.com/dino/dino/blob/231df1/main/src/ui/chat_input/chat_text_view.vala#L51
chat_
entry
.
grab_focus
()
chat_
input
.
grab_focus
()
@
staticmethod
def
_hide_chat_view
(
main_content_stack
):
...
...
@@ -243,14 +243,14 @@ class PrivateChatPresenter:
for
child
in
children
:
child
.
destroy
()
def
_disconnect_chat_
entry
_signals
(
self
):
if
not
hasattr
(
self
,
"_chat_
entry
_signal_id"
):
def
_disconnect_chat_
input
_signals
(
self
):
if
not
hasattr
(
self
,
"_chat_
input
_signal_id"
):
return
chat_
entry
=
self
.
_view
.
builder
.
get_object
(
"chat_
entry
"
)
chat_
entry
.
disconnect
(
self
.
_chat_
entry
_signal_id
)
del
self
.
_chat_
entry
_signal_id
chat_
input
=
self
.
_view
.
builder
.
get_object
(
"chat_
input
"
)
chat_
input
.
disconnect
(
self
.
_chat_
input
_signal_id
)
del
self
.
_chat_
input
_signal_id
def
_on_chat_
entry
_activate
(
self
,
widget
,
event
):
def
_on_chat_
input
_activate
(
self
,
widget
,
event
):
# Return is pressed
if
Gdk
.
keyval_name
(
event
.
keyval
)
!=
'Return'
:
return
False
...
...
briar-gtk/data/ui/main_window.ui
View file @
4e1b8b9f
...
...
@@ -132,7 +132,7 @@
<property
name=
"propagate_natural_height"
>
True
</property>
<property
name=
"max_content_height"
>
300
</property>
<child>
<object
class=
"GtkTextView"
id=
"chat_
entry
"
>
<object
class=
"GtkTextView"
id=
"chat_
input
"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
True
</property>
<property
name=
"hexpand"
>
True
</property>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment