*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "account.h"
#include "prefs_gtk.h"
#include "prefs_account.h"
+#include "prefs_common.h"
#include "folder_item_prefs.h"
#include "compose.h"
#include "manage_window.h"
static gint account_delete_event (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
+static void account_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation);
static gboolean account_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
debug_print("Reading all config for each account...\n");
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACCOUNT_RC, NULL);
- if ((fp = fopen(rcpath, "rb")) == NULL) {
+ if ((fp = g_fopen(rcpath, "rb")) == NULL) {
if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
g_free(rcpath);
return;
main_window_set_account_menu(account_list);
}
+void account_set_menu_only_toolbar(void)
+{
+ main_window_set_account_menu_only_toolbar(account_list);
+}
+
void account_foreach(AccountFunc func, gpointer user_data)
{
GList *cur;
folder = folder_new(folder_get_class_from_string("news"), ac_prefs->account_name,
ac_prefs->nntp_server);
}
-
+ if (folder == NULL) {
+ alertpanel_error(_("Can't create folder."));
+ return;
+ }
folder->account = ac_prefs;
ac_prefs->folder = folder;
folder_add(folder);
folder = folder_new(folder_get_class_from_string("news"), ap->account_name,
ap->nntp_server);
}
-
+ if (folder == NULL)
+ return;
folder->account = ap;
ap->folder = folder;
folder_add(folder);
}
}
+/*!
+ *\brief Save Gtk object size to prefs dataset
+ */
+static void account_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ g_return_if_fail(allocation != NULL);
+
+ prefs_common.accountswin_width = allocation->width;
+ prefs_common.accountswin_height = allocation->height;
+}
static void account_edit_create(void)
{
GtkWidget *hbox;
GtkWidget *scrolledwin;
GtkWidget *list_view;
- gchar *titles[N_EDIT_ACCOUNT_COLS];
- gint i;
GtkWidget *vbox2;
GtkWidget *add_btn;
GtkWidget *hbbox;
GtkWidget *close_btn;
+ static GdkGeometry geometry;
+
debug_print("Creating account edit window...\n");
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_usize (window, 500, 350);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_window_set_title (GTK_WINDOW (window), _("Edit accounts"));
gtk_window_set_modal (GTK_WINDOW (window), TRUE);
label = gtk_label_new
(_("New messages will be checked in this order. Check the boxes\n"
- "on the `G' column to enable message retrieval by `Get all'."));
+ "on the 'G' column to enable message retrieval by 'Get all'."));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
- add_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ add_btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
gtk_widget_show (add_btn);
gtk_box_pack_start (GTK_BOX (vbox2), add_btn, FALSE, FALSE, 4);
g_signal_connect (G_OBJECT(add_btn), "clicked",
G_CALLBACK (account_add), NULL);
+#if GTK_CHECK_VERSION(2, 6, 0)
+ edit_btn = gtk_button_new_from_stock (GTK_STOCK_EDIT);
+#else
edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
+#endif
gtk_widget_show (edit_btn);
gtk_box_pack_start (GTK_BOX (vbox2), edit_btn, FALSE, FALSE, 4);
g_signal_connect (G_OBJECT(edit_btn), "clicked",
G_CALLBACK (account_edit_prefs), NULL);
- del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+ del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (vbox2), del_btn, FALSE, FALSE, 4);
g_signal_connect (G_OBJECT(del_btn), "clicked",
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
- default_btn = gtk_button_new_with_label (_(" Set as default account "));
+ default_btn = gtk_button_new_with_mnemonic
+ (_(" _Set as default account "));
gtk_widget_show (default_btn);
gtk_box_pack_start (GTK_BOX (vbox2), default_btn, TRUE, FALSE, 0);
g_signal_connect (G_OBJECT(default_btn), "clicked",
account_create_list_view_images(list_view);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(account_size_allocate_cb), NULL);
+
+ if (!geometry.min_height) {
+ geometry.min_width = 500;
+ geometry.min_height = 350;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.accountswin_width,
+ prefs_common.accountswin_height);
+
edit_account.window = window;
edit_account.list_view = list_view;
edit_account.close_btn = close_btn;
return;
if (ac_prefs->protocol == A_IMAP4 || ac_prefs->protocol == A_NNTP) {
- alertpanel_error(_("Accounts with remote folders cannot be cloned"));
+ alertpanel_error(_("Accounts with remote folders cannot be copied."));
return;
}
ac_clon = prefs_account_new();
/* copy fields */
- ac_clon->account_name = g_strdup_printf(_("Cloned %s"),
+ ac_clon->account_name = g_strdup_printf(_("Copy of %s"),
ac_prefs->account_name);
/* personal */
ACP_FDUP(name);
static void account_delete(GtkWidget *widget, gpointer data)
{
PrefsAccount *ac_prefs;
- gint account_id;
+ gchar buf[BUFFSIZE];
GList *list;
Folder *folder;
if (ac_prefs == NULL)
return;
- if (alertpanel(_("Delete account"),
- _("Do you really want to delete this account?"),
- _("Yes"), _("+No"), NULL) != G_ALERTDEFAULT)
+ g_snprintf(buf, sizeof(buf),
+ _("Do you really want to delete the account '%s'?"),
+ ac_prefs->account_name ? ac_prefs->account_name :
+ _("(Untitled)"));
+ if (alertpanel_full(_("Delete account"), buf,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
+ NULL, ALERT_WARNING, G_ALERTALTERNATE) != G_ALERTDEFAULT)
return;
if (ac_prefs->folder) {
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
g_object_unref(G_OBJECT(store));
- gtk_tree_view_set_rules_hint(list_view, TRUE);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_reorderable(list_view, TRUE);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
GtkTreeSelection *selector;
GtkTreeModel *model;
GtkTreeIter iter;
- GtkTreePath *res;
selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
projects / claws.git / blobdiff