From 9c1f272035451c5e74750d15b1743b7b7df33a59 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos <kourem@gmail.com> Date: Wed, 8 Jun 2005 22:12:43 +0000 Subject: [PATCH] adding title for bookmakrs window --- src/config.py | 2 +- src/gtkgui.glade | 187 +++++++++++++++++++++++++++++------------------ 2 files changed, 117 insertions(+), 72 deletions(-) diff --git a/src/config.py b/src/config.py index 77a452f41e..e502068753 100644 --- a/src/config.py +++ b/src/config.py @@ -131,7 +131,7 @@ def __init__(self, plugin): #iconset iconsets_list = os.listdir(os.path.join(gajim.DATA_DIR, 'iconsets/')) - model = gtk.ListStore(gobject.TYPE_STRING) + model = gtk.ListStore(str) self.iconset_combobox.set_model(model) l = [] for dir in iconsets_list: diff --git a/src/gtkgui.glade b/src/gtkgui.glade index ccafe6864d..0b654366e6 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -1058,7 +1058,7 @@ <child> <widget class="GtkComboBox" id="proxies_combobox"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> + <property name="items" translatable="yes">None</property> </widget> <packing> <property name="padding">0</property> @@ -13254,40 +13254,40 @@ the Jabber network.</property> <child> <widget class="GtkTable" id="table33"> <property name="visible">True</property> - <property name="n_rows">5</property> + <property name="n_rows">6</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <widget class="GtkLabel" id="label315"> + <widget class="GtkCheckButton" id="autojoin_checkbutton"> <property name="visible">True</property> - <property name="label" translatable="yes">Nickname:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> + <property name="tooltip" translatable="yes">If checked, Gajim will join this groupchat on startup</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Auto join</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_autojoin_checkbutton_toggled" last_modification_time="Wed, 08 Jun 2005 17:20:40 GMT"/> </widget> <packing> <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label316"> + <widget class="GtkLabel" id="label318"> <property name="visible">True</property> - <property name="label" translatable="yes">Room:</property> + <property name="label" translatable="yes">Password:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -13301,13 +13301,55 @@ the Jabber network.</property> <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> + <child> + <widget class="GtkEntry" id="pass_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="server_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </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> + <property name="y_options"></property> + </packing> + </child> + <child> <widget class="GtkLabel" id="label317"> <property name="visible">True</property> @@ -13325,17 +13367,17 @@ the Jabber network.</property> <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label318"> + <widget class="GtkLabel" id="label316"> <property name="visible">True</property> - <property name="label" translatable="yes">Password:</property> + <property name="label" translatable="yes">Room:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -13349,15 +13391,15 @@ the Jabber network.</property> <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="nick_entry"> + <widget class="GtkEntry" id="room_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">True</property> @@ -13371,14 +13413,14 @@ the Jabber network.</property> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="room_entry"> + <widget class="GtkEntry" id="nick_entry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">True</property> @@ -13399,67 +13441,70 @@ the Jabber network.</property> </child> <child> - <widget class="GtkEntry" id="server_entry"> + <widget class="GtkLabel" id="label315"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> + <property name="label" translatable="yes">Nickname:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</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> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="pass_entry"> + <widget class="GtkLabel" id="label325"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> + <property name="label" translatable="yes">Title:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> </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> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="autojoin_checkbutton"> + <widget class="GtkEntry" id="title_entry"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will join this groupchat on startup</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Auto join</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_autojoin_checkbutton_toggled" last_modification_time="Wed, 08 Jun 2005 17:20:40 GMT"/> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> </widget> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="y_options"></property> </packing> </child> @@ -13520,7 +13565,7 @@ the Jabber network.</property> </child> </widget> -<widget class="GtkWindow" id="manage_proxies_window"> +<widget class="GtkWindow" id="manage_proxy_profiles_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Manage Proxy Profiles</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> -- GitLab