diff --git a/configure.ac b/configure.ac index d775b696f..f3a023fec 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.11],[http://trac.gajim.org/],[gajim]) + [0.11.0.1],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([1.8]) AC_CONFIG_HEADER(config.h) diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade index 91780c9d7..ba600a7d1 100644 --- a/data/glade/preferences_window.glade +++ b/data/glade/preferences_window.glade @@ -728,106 +728,95 @@ Single message + + + True + False + 6 + + + + True + Time Stamp: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 30 + True + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_CHAR + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + 0 + True + True + + + + + 0 + False + True + + + True - 6 + 5 4 False 6 12 - + True - _Incoming message: - True - False - GTK_JUSTIFY_CENTER - True - False - 0 - 0.5 - 0 - 0 - incoming_msg_colorbutton - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - _Outgoing message: - True - False - GTK_JUSTIFY_CENTER - True - False - 0 - 0.5 - 0 - 0 - outgoing_msg_colorbutton - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - _Status message: - True - False - GTK_JUSTIFY_CENTER - True - False - 0 - 0.5 - 0 - 0 - status_msg_colorbutton - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - _URL: + B_efore nickname: True False GTK_JUSTIFY_LEFT @@ -837,36 +826,7 @@ Single message 0.5 0 0 - url_msg_colorbutton - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 3 - 4 - fill - - - - - - - True - _Before time: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - scrolledwindow25 + scrolledwindow27 PANGO_ELLIPSIZE_NONE -1 False @@ -882,6 +842,47 @@ Single message + + + 30 + True + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_CHAR + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + 1 + 2 + 0 + 1 + fill + + + + True @@ -901,153 +902,6 @@ Single message False 0 - - 2 - 3 - 1 - 2 - fill - - - - - - - True - False - 6 - - - - True - _Font: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - conversation_fontbutton - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - True - True - True - True - False - False - True - - - - 0 - False - True - - - - - 0 - 2 - 5 - 6 - fill - - - - - - True - True - Use system _default - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 2 - 4 - 5 - 6 - fill - - - - - - - True - True - False - True - - - - 3 - 4 - 2 - 3 - fill - - - - - - - True - True - False - True - - - - 3 - 4 - 3 - 4 - fill - - - - - - - True - _After time: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - scrolledwindow26 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 2 3 @@ -1059,19 +913,60 @@ Single message - + + 30 True - B_efore nickname: + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_CHAR + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + 3 + 4 + 0 + 1 + fill + + + + + + + True + _Incoming message: True False - GTK_JUSTIFY_LEFT - False + GTK_JUSTIFY_CENTER + True False 0 0.5 0 0 - scrolledwindow27 + incoming_msg_colorbutton PANGO_ELLIPSIZE_NONE -1 False @@ -1101,9 +996,103 @@ Single message 1 2 + 1 + 2 + + + + + + + + True + _Outgoing message: + True + False + GTK_JUSTIFY_CENTER + True + False + 0 + 0.5 + 0 + 0 + outgoing_msg_colorbutton + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 1 + 2 + fill + + + + + + + True + True + False + True + + + + 3 + 4 + 1 + 2 + fill + + + + + + + True + True + False + True + + + + 3 + 4 2 3 - + fill + + + + + + + True + _URL: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + url_msg_colorbutton + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 2 + 3 + fill @@ -1119,13 +1108,42 @@ Single message 1 2 - 3 - 4 + 2 + 3 + + + True + _Status message: + True + False + GTK_JUSTIFY_CENTER + True + False + 0 + 0.5 + 0 + 0 + status_msg_colorbutton + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + True @@ -1239,6 +1257,65 @@ Single message 0 4 + 3 + 4 + fill + + + + + + True + False + 6 + + + + True + _Font: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + conversation_fontbutton + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + + True + True + True + True + False + False + True + + + + 0 + False + True + + + + + 0 + 2 4 5 fill @@ -1246,164 +1323,23 @@ Single message - - 30 + True True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_CHAR - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - + Use system _default + True + GTK_RELIEF_NORMAL + True + False + False + True + - 3 + 2 4 - 0 - 1 - fill - - - - - - - 30 - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_CHAR - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - - 3 - 4 - 1 - 2 - fill - - - - - - - 30 - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_CHAR - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - - 1 - 2 - 1 - 2 - fill - - - - - - - 30 - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_CHAR - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - - 1 - 2 - 0 - 1 + 4 + 5 fill diff --git a/src/common/config.py b/src/common/config.py index 84f300584..2b56fa1fe 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -130,9 +130,8 @@ class Config: 'roster_height': [ opt_int, 400 ], 'latest_disco_addresses': [ opt_str, '' ], 'recently_groupchat': [ opt_str, '' ], - 'before_time': [ opt_str, '[' ], - 'after_time': [ opt_str, ']' ], 'before_nickname': [ opt_str, '' ], + 'time_stamp': [ opt_str, '[%H:%M] ' ], 'after_nickname': [ opt_str, ':' ], 'send_os_info': [ opt_bool, True ], 'set_status_msg_from_current_music_track': [ opt_bool, False ], diff --git a/src/common/defs.py b/src/common/defs.py index 06f297e03..806434949 100644 --- a/src/common/defs.py +++ b/src/common/defs.py @@ -2,7 +2,7 @@ docdir = '../' datadir = '../' -version = '0.11' +version = '0.11.0.1' import sys, os.path for base in ('.', 'common'): diff --git a/src/common/optparser.py b/src/common/optparser.py index 119d0b70f..571dc3131 100644 --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -149,6 +149,8 @@ class OptionsParser: self.update_config_to_01017() if old < [0, 10, 1, 8] and new >= [0, 10, 1, 8]: self.update_config_to_01018() + if old < [0, 11, 0, 1] and new >= [0, 11, 0, 1]: + self.update_config_to_01018() gajim.logger.init_vars() gajim.config.set('version', new_version) @@ -366,3 +368,10 @@ class OptionsParser: gajim.config.set('outgoing_chat_state_notifications', self.old_values['chat_state_notifications']) gajim.config.set('version', '0.10.1.8') + + def update_config_to_01101(self): + '''fill time_stamp from before_time and after_time''' + if self.old_values.has_key('before_time'): + gajim.config.set('time_stamp', '%s%%H:%%M%s ' % ( + self.old_values['before_time'], self.old_values['after_time'])) + gajim.config.set('version', '0.11.0.1') diff --git a/src/config.py b/src/config.py index 1bbff2541..50f60b15f 100644 --- a/src/config.py +++ b/src/config.py @@ -240,15 +240,10 @@ class PreferencesWindow: else: self.xml.get_widget('time_always_radiobutton').set_active(True) - # before time - st = gajim.config.get('before_time') + # TimeStamp + st = gajim.config.get('time_stamp') st = helpers.from_one_line(st) - self.xml.get_widget('before_time_textview').get_buffer().set_text(st) - - # after time - st = gajim.config.get('after_time') - st = helpers.from_one_line(st) - self.xml.get_widget('after_time_textview').get_buffer().set_text(st) + self.xml.get_widget('time_stamp_textview').get_buffer().set_text(st) # before nickname st = gajim.config.get('before_nickname') @@ -717,10 +712,8 @@ class PreferencesWindow: self.on_checkbutton_toggled(widget, 'ignore_incoming_xhtml') def _set_sensitivity_for_before_after_time_widgets(self, sensitive): - self.xml.get_widget('before_time_label').set_sensitive(sensitive) - self.xml.get_widget('before_time_textview').set_sensitive(sensitive) - self.xml.get_widget('after_time_label').set_sensitive(sensitive) - self.xml.get_widget('after_time_textview').set_sensitive(sensitive) + self.xml.get_widget('time_stamp_label').set_sensitive(sensitive) + self.xml.get_widget('time_stamp_textview').set_sensitive(sensitive) def on_time_never_radiobutton_toggled(self, widget): if widget.get_active(): @@ -745,16 +738,10 @@ class PreferencesWindow: begin, end = buffer.get_bounds() return buffer.get_text(begin, end).decode('utf-8') - def on_before_time_textview_focus_out_event(self, widget, event): + def on_time_stamp_textview_focus_out_event(self, widget, event): text = self._get_textview_text(widget) text = helpers.to_one_line(text) - gajim.config.set('before_time', text) - gajim.interface.save_config() - - def on_after_time_textview_focus_out_event(self, widget, event): - text = self._get_textview_text(widget) - text = helpers.to_one_line(text) - gajim.config.set('after_time', text) + gajim.config.set('time_stamp', text) gajim.interface.save_config() def on_before_nickname_textview_focus_out_event(self, widget, event): diff --git a/src/conversation_textview.py b/src/conversation_textview.py index a12349b3e..2a7e9a171 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -688,12 +688,10 @@ class ConversationTextview: tim = time.localtime() current_print_time = gajim.config.get('print_time') if current_print_time == 'always' and kind != 'info': - before_str = gajim.config.get('before_time') - before_str = helpers.from_one_line(before_str) - after_str = gajim.config.get('after_time') - after_str = helpers.from_one_line(after_str) - tim_format = before_str + self.get_time_to_show(tim) + after_str - buffer.insert_with_tags_by_name(end_iter, tim_format + ' ', + timestamp_str = gajim.config.get('time_stamp') + timestamp_str = helpers.from_one_line(timestamp_str) + timestamp = time.strftime(timestamp_str, tim) + buffer.insert_with_tags_by_name(end_iter, timestamp, *other_tags_for_time) elif current_print_time == 'sometimes' and kind != 'info': every_foo_seconds = 60 * gajim.config.get( diff --git a/src/history_window.py b/src/history_window.py index 4a9bc9cec..ae76796f4 100644 --- a/src/history_window.py +++ b/src/history_window.py @@ -209,12 +209,9 @@ class HistoryWindow: end_iter = buf.get_end_iter() if gajim.config.get('print_time') == 'always': - before_str = gajim.config.get('before_time') - before_str = helpers.from_one_line(before_str) - after_str = gajim.config.get('after_time') - after_str = helpers.from_one_line(after_str) - format = before_str + '%X' + after_str + ' ' - tim = time.strftime(format, time.localtime(float(tim))) + timestamp_str = gajim.config.get('time_stamp') + timestamp_str = helpers.from_one_line(timestamp_str) + tim = time.strftime(timestamp_str, time.localtime(float(tim))) buf.insert(end_iter, tim) # add time elif gajim.config.get('print_time') == 'sometimes': every_foo_seconds = 60 * gajim.config.get(