enum {
PREFS_FILTERING_ENABLED,
PREFS_FILTERING_NAME,
- PREFS_FILTERING_ACCOUNT,
+ PREFS_FILTERING_ACCOUNT_ID,
+ PREFS_FILTERING_ACCOUNT_NAME,
PREFS_FILTERING_RULE,
PREFS_FILTERING_PROP,
N_PREFS_FILTERING_COLUMNS
GtkWidget *action_entry;
GtkWidget *cond_list_view;
+
+ GtkTreeViewColumn *account_name_column;
};
typedef struct _Filtering Filtering;
prefs_filtering_account_option_menu_populate();
}
+ gtk_tree_view_column_set_visible(filtering.account_name_column,
+ per_account_filtering);
+
manage_window_set_transient(GTK_WINDOW(filtering.window));
gtk_widget_grab_focus(filtering.ok_btn);
G_TYPE_STRING,
G_TYPE_INT,
G_TYPE_STRING,
+ G_TYPE_STRING,
G_TYPE_BOOLEAN,
-1);
}
gboolean prop)
{
GtkTreeIter iter;
+ gchar *account_name;
/* check if valid row at all */
if (row >= 0) {
row = -1;
}
+ if (account_id > 0) {
+ account_name = account_find_from_id(account_id)->account_name;
+ } else {
+ account_name = (gchar *)Q_("Filtering Account Menu|All");
+ }
+
if (row < 0) {
/* append new */
gtk_list_store_append(list_store, &iter);
gtk_list_store_set(list_store, &iter,
PREFS_FILTERING_ENABLED, enabled,
PREFS_FILTERING_NAME, name,
- PREFS_FILTERING_ACCOUNT, account_id,
+ PREFS_FILTERING_ACCOUNT_ID, account_id,
+ PREFS_FILTERING_ACCOUNT_NAME, account_name,
PREFS_FILTERING_RULE, rule,
PREFS_FILTERING_PROP, prop,
-1);
gtk_list_store_set(list_store, &iter,
PREFS_FILTERING_ENABLED, enabled,
PREFS_FILTERING_NAME, name,
- PREFS_FILTERING_ACCOUNT, account_id,
+ PREFS_FILTERING_ACCOUNT_ID, account_id,
+ PREFS_FILTERING_ACCOUNT_NAME, account_name,
PREFS_FILTERING_RULE, rule,
-1);
return row;
gtk_tree_model_get(model, &iter,
PREFS_FILTERING_ENABLED, enabled,
PREFS_FILTERING_NAME, name,
- PREFS_FILTERING_ACCOUNT, account_id,
+ PREFS_FILTERING_ACCOUNT_ID, account_id,
-1);
}
}
NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
gtk_tree_view_column_set_resizable(column, TRUE);
+
+ renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Account"),
+ renderer,
+ "text", PREFS_FILTERING_ACCOUNT_NAME,
+ NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_column_set_resizable(column, TRUE);
+
+ filtering.account_name_column = column;
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
PREFS_FILTERING_NAME, &name,
-1);
gtk_tree_model_get(model, &iter,
- PREFS_FILTERING_ACCOUNT, &account_id,
- -1);
- gtk_tree_model_get(model, &iter,
- PREFS_FILTERING_ACCOUNT, &account_id,
+ PREFS_FILTERING_ACCOUNT_ID, &account_id,
-1);
prop = matcher_parser_get_filtering(filtering_str);