diff --git a/src/gtkgui.glade b/src/gtkgui.glade index 4a62a5b23..35f2f9670 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -9052,12 +9052,11 @@ Custom - 6 Conversation History GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - 560 + 600 350 True False @@ -9070,13 +9069,91 @@ Custom - + + 6 True False 6 - + + True + True + 150 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + True + False + True + False + False + False + + + + + True + False + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_ETCHED_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + False + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + True + True + + + + + 0 + True + True + + + + + True GTK_BUTTONBOX_END 6 @@ -9091,7 +9168,7 @@ Custom - + True 0.5 0.5 @@ -9103,13 +9180,13 @@ Custom 0 - + True False 2 - + True gtk-goto-first 4 @@ -9126,9 +9203,9 @@ Custom - + True - _Earliest + REMOVEME True False GTK_JUSTIFY_LEFT @@ -9166,7 +9243,7 @@ Custom - + True 0.5 0.5 @@ -9178,13 +9255,13 @@ Custom 0 - + True False 2 - + True gtk-go-back 4 @@ -9201,9 +9278,9 @@ Custom - + True - _Previous + REMOVEME True False GTK_JUSTIFY_LEFT @@ -9236,11 +9313,73 @@ Custom True True True - gtk-go-forward - True GTK_RELIEF_NORMAL True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-media-forward + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + REMOVEME + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + @@ -9254,7 +9393,7 @@ Custom - + True 0.5 0.5 @@ -9266,13 +9405,13 @@ Custom 0 - + True False 2 - + True gtk-goto-last 4 @@ -9289,9 +9428,9 @@ Custom - + True - _Latest + REMOVEME True False GTK_JUSTIFY_LEFT @@ -9332,136 +9471,6 @@ Custom - - 0 - False - False - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_ETCHED_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - False - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - Filter: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - True - 0 - - True - * - True - - - 0 - True - True - - - - - - True - True - True - True - gtk-apply - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - True - gtk-clear - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - 0 False diff --git a/src/history_window.py b/src/history_window.py index c4c51e57a..f6d1d6987 100644 --- a/src/history_window.py +++ b/src/history_window.py @@ -55,12 +55,6 @@ class HistoryWindow: self.previous_button = xml.get_widget('previous_button') self.forward_button = xml.get_widget('forward_button') self.latest_button = xml.get_widget('latest_button') - self.filter_entry = xml.get_widget('filter_entry') - - # FIXME: someday.. - filter_hbox = xml.get_widget('filter_hbox') - filter_hbox.hide() - filter_hbox.set_no_show_all(True) xml.signal_autoconnect(self) @@ -95,26 +89,6 @@ class HistoryWindow: def on_close_button_clicked(self, widget): self.window.destroy() - def on_apply_filter_button_clicked(self, widget): - filter = self.filter_entry.get_text() - if len(filter) < 3: - dialogs.ErrorDialog(_('Filter query too short'), - _('Query must be at least 3 characters long.')).get_response() - return - - # FIXME: what if jid is fake (pm)? - path_to_file = os.path.join(gajim.LOGPATH, self.jid) - # FIXME: ship grep.exe for windoz? - command = 'grep %s %s' % (filter, path_to_file) - stdout = helpers.get_output_of_command(command) - if stdout is not None: - text = ' '.join(stdout) - self.history_buffer.set_text(text) - - def on_clear_filter_button_clicked(self, widget): - pass - # FIXME: reread from scratch (if it's possible to save current page it's even better) - def on_earliest_button_clicked(self, widget): start, end = self.history_buffer.get_bounds() self.history_buffer.delete(start, end)