copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

HistoryWindow: Fix some UI issues 

- Set application and menubar
- Remove deprecated settings

Fixes #8756
This commit is contained in:
Philipp Hörist 2017-10-08 19:02:38 +02:00
parent 0b1d5a3174
commit 95a984f645
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gajim/data/gui/history_window.ui
View File

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<object class="GtkWindow" id="history_window">
<requires lib="gtk+" version="3.20"/>
<object class="GtkApplicationWindow" id="history_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Conversation History</property>
<property name="role">history</property>
<property name="window_position">center</property>
<property name="default_width">650</property>
<property name="default_height">450</property>
<property name="show_menubar">False</property>
<signal name="destroy" handler="on_history_window_destroy" swapped="no"/>
<signal name="key-press-event" handler="on_history_window_key_press_event" swapped="no"/>
<child>
@ -72,13 +73,11 @@
<child>
<object class="GtkCheckButton" id="search_in_date">
<property name="label" translatable="yes">_In date search</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Only searching within selected day</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@ -196,12 +195,10 @@
<child>
<object class="GtkCheckButton" id="log_history_checkbutton">
<property name="label" translatable="yes">_Log conversation history</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@ -218,7 +215,6 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_show_status_checkbutton_toggled" swapped="no"/>
@ -245,7 +241,6 @@
<child>
<object class="GtkButton" id="close_button">
<property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>

1
gajim/history_window.py
View File

@ -69,6 +69,7 @@ class HistoryWindow:
def __init__(self, jid=None, account=None):
xml = gtkgui_helpers.get_gtk_builder('history_window.ui')
self.window = xml.get_object('history_window')
self.window.set_application(app.app)
self.calendar = xml.get_object('calendar')
scrolledwindow = xml.get_object('scrolledwindow')
self.history_textview = conversation_textview.ConversationTextview(