changeset 4640ff9054a1 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=4640ff9054a1 description: * second draft of message archiving preferences window
diffstat:
data/glade/archiving_preferences_window.glade | 367 ++++++++----------------- data/glade/item_archiving_preferences_window.glade | 176 ++++++++++++ src/common/connection.py | 5 +- src/common/message_archiving.py | 88 +++++- src/dialogs.py | 369 ++++++++++++++++++++++---- src/gajim.py | 12 + 6 files changed, 690 insertions(+), 327 deletions(-)
diffs (truncated from 1225 to 300 lines):
diff -r 149d15263aee -r 4640ff9054a1 data/glade/archiving_preferences_window.glade --- a/data/glade/archiving_preferences_window.glade Sun Jul 19 16:39:07 2009 +0200 +++ b/data/glade/archiving_preferences_window.glade Fri Jul 31 19:16:03 2009 +0200 @@ -10,43 +10,104 @@ <property name="visible">True</property> <property name="orientation">vertical</property> <child> - <widget class="GtkHBox" id="hbox2"> + <widget class="GtkTable" id="table1"> <property name="visible">True</property> + <property name="n_rows">4</property> + <property name="n_columns">2</property> <child> - <widget class="GtkLabel" id="label1"> + <widget class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="label" translatable="yes"><i>Auto Save</i></property> + <property name="label" translatable="yes"><i>Method Manual</i></property> <property name="use_markup">True</property> </widget> <packing> - <property name="position">0</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="auto_save_yes_radiobutton"> - <property name="label" translatable="yes">Yes</property> + <widget class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes"><i>Method Local</i></property> + <property name="use_markup">True</property> </widget> <packing> - <property name="position">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="auto_save_no_radiobutton"> - <property name="label" translatable="yes">No</property> + <widget class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">auto_save_yes_radiobutton</property> + <property name="label" translatable="yes"><i>Method Auto</i></property> + <property name="use_markup">True</property> </widget> <packing> - <property name="position">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="method_manual_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">Prefer +Concede +Forbid</property> + <signal name="changed" handler="on_method_foo_combobox_changed"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="method_local_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">Prefer +Concede +Forbid</property> + <signal name="changed" handler="on_method_foo_combobox_changed"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="method_auto_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">Prefer +Concede +Forbid</property> + <signal name="changed" handler="on_method_foo_combobox_changed"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="label" translatable="yes">label</property> + </widget> + </child> + <child> + <widget class="GtkComboBox" id="auto_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">No +Yes</property> + <signal name="changed" handler="on_auto_combobox_changed"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> </packing> </child> </widget> @@ -56,150 +117,21 @@ </packing> </child> <child> - <widget class="GtkTable" id="table1"> + <widget class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkLabel" id="label2"> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="label" translatable="yes"><i>Method Auto</i></property> - <property name="use_markup">True</property> - </widget> - </child> - <child> - <widget class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes"><i>Method Local</i></property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="label" translatable="yes"><i>Method Manual</i></property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - </packing> - </child> - <child> - <widget class="GtkComboBox" id="method_manual_combobox"> - <property name="visible">True</property> - <property name="items" translatable="yes">Prefer -Concede -Forbid</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - </packing> - </child> - <child> - <widget class="GtkComboBox" id="method_local_combobox"> - <property name="visible">True</property> - <property name="items" translatable="yes">Prefer -Concede -Forbid</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <widget class="GtkComboBox" id="method_auto_combobox"> - <property name="visible">True</property> - <property name="items" translatable="yes">Prefer -Concede -Forbid</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <child> - <widget class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <widget class="GtkTreeView" id="item_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <widget class="GtkTreeView" id="item_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <signal name="cursor_changed" handler="on_item_treeview_cursor_changed"/> - </widget> - </child> + <signal name="cursor_changed" handler="on_item_treeview_cursor_changed"/> </widget> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkHButtonBox" id="hbuttonbox2"> - <property name="visible">True</property> - <property name="layout_style">spread</property> - <child> - <widget class="GtkButton" id="add_item_button"> - <property name="label" translatable="yes">gtk-add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_add_item_button_clicked"/> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="remove_item_button"> - <property name="label" translatable="yes">gtk-remove</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_remove_item_button_clicked"/> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> </child> </widget> <packing> @@ -207,124 +139,63 @@ </packing> </child> <child> - <widget class="GtkNotebook" id="item_notebook"> + <widget class="GtkHButtonBox" id="hbuttonbox2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> + <property name="layout_style">spread</property> <child> - <widget class="GtkLabel" id="label11"> + <widget class="GtkButton" id="add_button">
-
Anaël Verrier