gossip r2753 - in trunk: . data/glade src
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: gossip r2753 - in trunk: . data/glade src
- Date: Mon, 3 Mar 2008 20:07:11 +0000 (GMT)
Author: mr
Date: Mon Mar 3 20:07:10 2008
New Revision: 2753
URL: http://svn.gnome.org/viewvc/gossip?rev=2753&view=rev
Log:
Improved the way we show locked chatrooms
Modified:
trunk/ChangeLog
trunk/data/glade/group-chat.glade
trunk/src/gossip-chatrooms-window.c
trunk/src/gossip-new-chatroom-dialog.c
Modified: trunk/data/glade/group-chat.glade
==============================================================================
--- trunk/data/glade/group-chat.glade (original)
+++ trunk/data/glade/group-chat.glade Mon Mar 3 20:07:10 2008
@@ -923,8 +923,8 @@
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="width_request">400</property>
- <property name="height_request">150</property>
+ <property name="width_request">450</property>
+ <property name="height_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
Modified: trunk/src/gossip-chatrooms-window.c
==============================================================================
--- trunk/src/gossip-chatrooms-window.c (original)
+++ trunk/src/gossip-chatrooms-window.c Mon Mar 3 20:07:10 2008
@@ -116,7 +116,6 @@
GtkTreeModel *model;
GtkTreeViewColumn *column;
GtkCellRenderer *cell;
- GtkWidget *image;
gint count;
view = GTK_TREE_VIEW (window->treeview);
@@ -166,20 +165,18 @@
gtk_tree_view_column_set_sort_column_id (column, COL_SERVER);
/* Password Protected */
- cell = gtk_cell_renderer_toggle_new ();
+ cell = gtk_cell_renderer_pixbuf_new ();
g_object_set (cell,
+ "xalign", 0.5,
"xpad", (guint) 4,
"ypad", (guint) 1,
+ "stock-size", GTK_ICON_SIZE_SMALL_TOOLBAR,
NULL);
- column = gtk_tree_view_column_new_with_attributes ("*", cell,
- "active", COL_PASSWORD_PROTECTED,
+ column = gtk_tree_view_column_new_with_attributes (_("Locked"), cell,
+ "stock-id", COL_PASSWORD_PROTECTED,
NULL);
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_MENU);
- gtk_widget_show (image);
-
- gtk_tree_view_column_set_widget (column, image);
gtk_tree_view_column_set_alignment (column, 0.5);
gtk_tree_view_column_set_expand (column, FALSE);
gtk_tree_view_column_set_resizable (column, FALSE);
@@ -386,7 +383,7 @@
GtkTreeSelection *selection;
GtkListStore *store;
GtkTreeIter iter;
- gboolean password_protected = FALSE;
+ const gchar *password_protected = NULL;
gboolean auto_connect = FALSE;
view = GTK_TREE_VIEW (window->treeview);
@@ -395,7 +392,7 @@
store = GTK_LIST_STORE (model);
if (!G_STR_EMPTY (gossip_chatroom_get_password (chatroom))) {
- password_protected = TRUE;
+ password_protected = GTK_STOCK_DIALOG_AUTHENTICATION;
}
if (gossip_chatroom_get_auto_connect (chatroom)) {
@@ -454,7 +451,7 @@
G_TYPE_STRING, /* Name */
G_TYPE_STRING, /* Room */
G_TYPE_STRING, /* Server */
- G_TYPE_BOOLEAN, /* Password protected */
+ G_TYPE_STRING, /* Password protected */
G_TYPE_BOOLEAN, /* Auto start */
GOSSIP_TYPE_CHATROOM); /* Chatroom */
@@ -565,11 +562,11 @@
* information because we don't use cell data
* functions to work it out on update.
*/
- gboolean password_protected = FALSE;
- gboolean auto_connect = FALSE;
+ const gchar *password_protected = NULL;
+ gboolean auto_connect = FALSE;
if (!G_STR_EMPTY (gossip_chatroom_get_password (chatroom))) {
- password_protected = TRUE;
+ password_protected = GTK_STOCK_DIALOG_AUTHENTICATION;
}
if (gossip_chatroom_get_auto_connect (chatroom)) {
Modified: trunk/src/gossip-new-chatroom-dialog.c
==============================================================================
--- trunk/src/gossip-new-chatroom-dialog.c (original)
+++ trunk/src/gossip-new-chatroom-dialog.c Mon Mar 3 20:07:10 2008
@@ -616,7 +616,7 @@
"stock-size", GTK_ICON_SIZE_SMALL_TOOLBAR,
NULL);
- column = gtk_tree_view_column_new_with_attributes ("*", cell,
+ column = gtk_tree_view_column_new_with_attributes (_("Locked"), cell,
"stock-id", COL_PASSWORD_PROTECTED,
NULL);
gtk_tree_view_column_set_alignment (column, 0.5);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]