Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
gajim
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
196
Issues
196
List
Boards
Labels
Service Desk
Milestones
Merge Requests
21
Merge Requests
21
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gajim
gajim
Commits
59f0403f
Commit
59f0403f
authored
May 15, 2020
by
Daniel Brötzmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ChatControl: Use account badge
parent
d03a45ce
Pipeline
#5642
passed with stages
in 2 minutes and 36 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
30 deletions
+36
-30
gajim/chat_control_base.py
gajim/chat_control_base.py
+6
-5
gajim/data/gui/chat_control.ui
gajim/data/gui/chat_control.ui
+21
-19
gajim/data/gui/groupchat_control.ui
gajim/data/gui/groupchat_control.ui
+9
-6
No files found.
gajim/chat_control_base.py
View file @
59f0403f
...
...
@@ -60,6 +60,7 @@
from
gajim.gtk.util
import
get_show_in_systray
from
gajim.gtk.util
import
get_hardware_key_codes
from
gajim.gtk.util
import
get_builder
from
gajim.gtk.util
import
generate_account_badge
from
gajim.gtk.const
import
ControlType
# pylint: disable=unused-import
from
gajim.gtk.emoji_chooser
import
emoji_chooser
...
...
@@ -140,11 +141,11 @@ def __init__(self, parent_win, widget_name, contact, acct,
self
.
_accounts
=
app
.
get_enabled_accounts_with_labels
()
if
len
(
self
.
_accounts
)
>
1
:
self
.
xml
.
account_image
.
set_tooltip_text
(
app
.
get_account_label
(
self
.
account
))
account_class
=
app
.
css_config
.
get_dynamic_class
(
self
.
account
)
self
.
xml
.
account_
image
.
get_style_context
().
add_class
(
account_class
)
self
.
xml
.
account_ima
ge
.
show
()
account_badge
=
generate_account_badge
(
self
.
account
)
account_badge
.
set_tooltip_text
(
_
(
'Account: %s'
)
%
app
.
get_account_label
(
self
.
account
)
)
self
.
xml
.
account_
badge
.
add
(
account_badge
)
account_bad
ge
.
show
()
# Init DND
self
.
TARGET_TYPE_URI_LIST
=
80
...
...
gajim/data/gui/chat_control.ui
View file @
59f0403f
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.
22.2
-->
<!-- Generated with glade 3.
36.0
-->
<interface>
<requires
lib=
"gtk+"
version=
"3.2
0
"
/>
<requires
lib=
"gtk+"
version=
"3.2
2
"
/>
<object
class=
"GtkAdjustment"
id=
"adjustment1"
>
<property
name=
"upper"
>
110
</property>
<property
name=
"step_increment"
>
1
</property>
...
...
@@ -449,6 +449,25 @@
<property
name=
"top_attach"
>
1
</property>
</packing>
</child>
<child>
<object
class=
"GtkBox"
id=
"account_badge"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"halign"
>
end
</property>
<property
name=
"valign"
>
center
</property>
<property
name=
"orientation"
>
vertical
</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property
name=
"left_attach"
>
2
</property>
<property
name=
"top_attach"
>
0
</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property
name=
"expand"
>
False
</property>
...
...
@@ -546,20 +565,6 @@
<property
name=
"position"
>
5
</property>
</packing>
</child>
<child>
<object
class=
"GtkImage"
id=
"account_image"
>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"no_show_all"
>
True
</property>
<property
name=
"margin_left"
>
6
</property>
<property
name=
"margin_right"
>
6
</property>
<property
name=
"icon_name"
>
org.gajim.Gajim-symbolic
</property>
</object>
<packing>
<property
name=
"expand"
>
False
</property>
<property
name=
"fill"
>
True
</property>
<property
name=
"position"
>
6
</property>
</packing>
</child>
</object>
<packing>
<property
name=
"expand"
>
False
</property>
...
...
@@ -567,9 +572,6 @@
<property
name=
"position"
>
2
</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<style>
...
...
gajim/data/gui/groupchat_control.ui
View file @
59f0403f
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.
22.2
-->
<!-- Generated with glade 3.
36.0
-->
<interface>
<requires
lib=
"gtk+"
version=
"3.20"
/>
<object
class=
"GtkMenu"
id=
"formattings_menu"
>
...
...
@@ -151,14 +151,17 @@
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<child>
<object
class=
"GtkImage"
id=
"account_image"
>
<object
class=
"GtkBox"
id=
"account_badge"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"no_show_all"
>
True
</property>
<property
name=
"halign"
>
end
</property>
<property
name=
"
margin_left"
>
6
</property>
<property
name=
"margin_
right
"
>
6
</property>
<property
name=
"
valign"
>
center
</property>
<property
name=
"margin_
end
"
>
6
</property>
<property
name=
"hexpand"
>
True
</property>
<property
name=
"icon_name"
>
org.gajim.Gajim-symbolic
</property>
<property
name=
"orientation"
>
vertical
</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property
name=
"position"
>
0
</property>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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