diff --git a/data/glade/input_text_dialog.glade b/data/glade/input_text_dialog.glade new file mode 100644 index 000000000..77a44fba0 --- /dev/null +++ b/data/glade/input_text_dialog.glade @@ -0,0 +1,107 @@ + + + + + + 6 + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + + True + 6 + + + True + 6 + 6 + + + True + 12 + + + True + gtk-dialog-question + 6 + + + False + + + + + True + True + + + 1 + + + + + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + + + + + 1 + + + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + + diff --git a/src/dialogs.py b/src/dialogs.py index 9f9bed0dc..8ebfc0c44 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -1434,22 +1434,16 @@ class FTOverwriteConfirmationDialog(ConfirmationDialog): label.set_use_underline(True) self.add_action_widget(b, 200) -class InputDialog: +class CommonInputDialog: '''Class for Input dialog''' - def __init__(self, title, label_str, input_str = None, is_modal = True, - ok_handler = None, cancel_handler = None): + def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler): # if modal is True you also need to call get_response() # and ok_handler won't be used - self.xml = gtkgui_helpers.get_glade('input_dialog.glade') self.dialog = self.xml.get_widget('input_dialog') label = self.xml.get_widget('label') - self.input_entry = self.xml.get_widget('input_entry') self.dialog.set_title(title) label.set_markup(label_str) self.cancel_handler = cancel_handler - if input_str: - self.input_entry.set_text(input_str) - self.input_entry.select_region(0, -1) # select all self.is_modal = is_modal if not is_modal and ok_handler is not None: @@ -1466,7 +1460,7 @@ class InputDialog: self.cancel_handler() def on_okbutton_clicked(self, widget): - user_input = self.input_entry.get_text().decode('utf-8') + user_input = self.get_text() self.cancel_handler = None self.dialog.destroy() if isinstance(self.ok_handler, tuple): @@ -1483,6 +1477,38 @@ class InputDialog: self.dialog.destroy() return response +class InputDialog(CommonInputDialog): + '''Class for Input dialog''' + def __init__(self, title, label_str, input_str = None, is_modal = True, + ok_handler = None, cancel_handler = None): + self.xml = gtkgui_helpers.get_glade('input_dialog.glade') + CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, + cancel_handler) + self.input_entry = self.xml.get_widget('input_entry') + if input_str: + self.input_entry.set_text(input_str) + self.input_entry.select_region(0, -1) # select all + + def get_text(self): + return self.input_entry.get_text().decode('utf-8') + +class InputTextDialog(CommonInputDialog): + '''Class for Input dialog''' + def __init__(self, title, label_str, input_str = None, is_modal = True, + ok_handler = None, cancel_handler = None): + self.xml = gtkgui_helpers.get_glade('input_text_dialog.glade') + CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, + cancel_handler) + self.input_buffer = self.xml.get_widget('input_textview').get_buffer() + if input_str: + self.input_buffer.set_text(input_str) + start_iter, end_iter = self.input_buffer.get_bounds() + self.input_buffer.select_range(start_iter, end_iter) # select all + + def get_text(self): + start_iter, end_iter = self.input_buffer.get_bounds() + return self.input_buffer.get_text(start_iter, end_iter).decode('utf-8') + class DubbleInputDialog: '''Class for Dubble Input dialog''' def __init__(self, title, label_str1, label_str2, input_str1 = None, diff --git a/src/groupchat_control.py b/src/groupchat_control.py index 6e06579b5..740f9f444 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1675,13 +1675,15 @@ class GroupchatControl(ChatControlBase): return nb def _on_change_subject_menuitem_activate(self, widget): - instance = dialogs.InputDialog(_('Changing Subject'), + instance = dialogs.InputTextDialog(_('Changing Subject'), _('Please specify the new subject:'), self.subject) response = instance.get_response() if response == gtk.RESPONSE_OK: # Note, we don't update self.subject since we don't know whether it # will work yet - subject = instance.input_entry.get_text().decode('utf-8') + start_iter, end_iter = instance.input_buffer.get_bounds() + subject = instance.input_buffer.get_text(start_iter, end_iter).decode( + 'utf-8') gajim.connections[self.account].send_gc_subject(self.room_jid, subject) def _on_change_nick_menuitem_activate(self, widget):