/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
*
* Copyright (c) 2007-2008 Juha Kautto (juha at xfce.org)
- * Copyright (c) 2008 Colin Leroy (colin@colino.net)
+ * Copyright (c) 2008-2021 the Claws Mail team and Colin Leroy
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <string.h>
#include <time.h>
-#include <glib.h>
#include <glib/gprintf.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h>
month_view_new_meeting_cb);
g_object_set_data(G_OBJECT(mw->Vbox), "go_today_cb",
month_view_today_cb);
- gtk_menu_popup(GTK_MENU(mw->view_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(mw->view_menu), NULL);
}
}
, GdkEventButton *event, gpointer *user_data)
{
month_win *mw = (month_win *)user_data;
- gchar *uid = g_object_get_data(G_OBJECT(widget), "UID");;
+ gchar *uid = g_object_get_data(G_OBJECT(widget), "UID");
gpointer offset = g_object_get_data(G_OBJECT(widget), "offset");
if (event->button == 1) {
month_view_cancel_meeting_cb);
g_object_set_data(G_OBJECT(mw->Vbox), "go_today_cb",
month_view_today_cb);
- gtk_menu_popup(GTK_MENU(mw->event_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(mw->event_menu), NULL);
}
}
text = g_strdup(event->summary?event->summary : _("Unknown"));
if (mw->element[row][col] == NULL) {
- hb = gtk_vbox_new(TRUE, 1);
+ hb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
mw->element[row][col] = hb;
}
else {
if (pack || !update_tip) {
ev = gtk_event_box_new();
lab = gtk_label_new(text);
- gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0);
+ gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(lab), 0.0);
gtk_label_set_ellipsize(GTK_LABEL(lab), PANGO_ELLIPSIZE_END);
if ((row % 2) == 1)
gtk_widget_modify_bg(ev, GTK_STATE_NORMAL, &mw->bg1);
} else {
row = row - weekoffset;
}
- vb = gtk_vbox_new(FALSE, 0);
+ vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_size_request(vb, width, height);
+ gtk_widget_set_hexpand(vb, TRUE);
+ gtk_widget_set_vexpand(vb, TRUE);
if (g_date_get_day(date) == 1)
label = g_strdup_printf("%d %s", g_date_get_day(date),
_(monthname[g_date_get_month(date)-1]));
g_signal_connect((gpointer)ev, "button-press-event"
, G_CALLBACK(header_button_clicked_cb), mw);
name = gtk_label_new(label);
- gtk_misc_set_alignment(GTK_MISC(name), 0.0, 0.0);
+ gtk_label_set_xalign(GTK_LABEL(name), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(name), 0.0);
CLAWS_SET_TIP(ev, tmp);
gtk_container_add(GTK_CONTAINER(ev), name);
if (day == tm_today.tm_mday && t.tm_mon == tm_today.tm_mon && t.tm_year == tm_today.tm_year)
gtk_widget_modify_bg(ev, GTK_STATE_NORMAL, &mw->bg_today);
- hb = gtk_hbox_new(FALSE, 0);
+ hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(hb), ev, TRUE, TRUE, 1);
gtk_box_pack_start(GTK_BOX(vb), hb, TRUE, TRUE, 0);
if (mw->element[row][col]) {
gtk_box_pack_start(GTK_BOX(vb), mw->line[row][col]
, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(mw->dtable), vb, col, col+1, row, row+1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable), vb, col, row, 1, 1);
g_date_free(date);
}
}
{
GtkWidget *hbox, *label, *space_label;
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
label = gtk_label_new(_("Start"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10);
/* sizes */
gtk_button_set_label(GTK_BUTTON(mw->StartDate_button)
, (const gchar *)start_date);
- gtk_widget_size_request(mw->StartDate_button, &mw->StartDate_button_req);
+ gtk_widget_get_preferred_size(mw->StartDate_button, NULL, &mw->StartDate_button_req);
mw->StartDate_button_req.width += mw->StartDate_button_req.width/10;
label = gtk_label_new("00");
- gtk_widget_size_request(label, &mw->hour_req);
+ gtk_widget_get_preferred_size(label, NULL, &mw->hour_req);
}
static void build_month_view_colours(month_win *mw)
{
- GtkStyle *def_style;
- GdkColormap *pic1_cmap;
+ GtkStyle *def_style, *cur_style;
GtkWidget *ctree = NULL;
def_style = gtk_widget_get_default_style();
- pic1_cmap = gdk_colormap_get_system();
if (mainwindow_get_mainwindow()) {
ctree = mainwindow_get_mainwindow()->summaryview->ctree;
}
if (ctree) {
- mw->bg1 = ctree->style->bg[GTK_STATE_NORMAL];
- mw->bg2 = ctree->style->bg[GTK_STATE_NORMAL];
+ cur_style = gtk_widget_get_style(ctree);
+ mw->bg1 = cur_style->bg[GTK_STATE_NORMAL];
+ mw->bg2 = cur_style->bg[GTK_STATE_NORMAL];
} else {
mw->bg1 = def_style->bg[GTK_STATE_NORMAL];
mw->bg2 = def_style->bg[GTK_STATE_NORMAL];
mw->bg1.red += (mw->bg1.red < 63000 ? 2000 : -2000);
mw->bg1.green += (mw->bg1.green < 63000 ? 2000 : -2000);
mw->bg1.blue += (mw->bg1.blue < 63000 ? 2000 : -2000);
- gdk_colormap_alloc_color(pic1_cmap, &mw->bg1, FALSE, TRUE);
mw->bg2.red += (mw->bg2.red > 1000 ? -1000 : 1000);
mw->bg2.green += (mw->bg2.green > 1000 ? -1000 : 1000);
mw->bg2.blue += (mw->bg2.blue > 1000 ? -1000 : 1000);
- gdk_colormap_alloc_color(pic1_cmap, &mw->bg2, FALSE, TRUE);
if (!gdk_color_parse("white", &mw->line_color)) {
+ g_warning("color parse failed: white");
mw->line_color.red = 239 * (65535/255);
mw->line_color.green = 235 * (65535/255);
mw->line_color.blue = 230 * (65535/255);
}
if (!gdk_color_parse("blue", &mw->fg_sunday)) {
- g_warning("color parse failed: red\n");
+ g_warning("color parse failed: blue");
mw->fg_sunday.red = 10 * (65535/255);
mw->fg_sunday.green = 10 * (65535/255);
mw->fg_sunday.blue = 255 * (65535/255);
}
if (!gdk_color_parse("gold", &mw->bg_today)) {
- g_warning("color parse failed: gold\n");
+ g_warning("color parse failed: gold");
mw->bg_today.red = 255 * (65535/255);
mw->bg_today.green = 215 * (65535/255);
mw->bg_today.blue = 115 * (65535/255);
}
if (ctree) {
- mw->fg_sunday.red = (mw->fg_sunday.red + ctree->style->fg[GTK_STATE_SELECTED].red)/2;
- mw->fg_sunday.green = (mw->fg_sunday.green + ctree->style->fg[GTK_STATE_SELECTED].red)/2;
- mw->fg_sunday.blue = (3*mw->fg_sunday.blue + ctree->style->fg[GTK_STATE_SELECTED].red)/4;
- mw->bg_today.red = (3*mw->bg_today.red + ctree->style->bg[GTK_STATE_NORMAL].red)/4;
- mw->bg_today.green = (3*mw->bg_today.green + ctree->style->bg[GTK_STATE_NORMAL].red)/4;
- mw->bg_today.blue = (3*mw->bg_today.blue + ctree->style->bg[GTK_STATE_NORMAL].red)/4;
+ cur_style = gtk_widget_get_style(ctree);
+ mw->fg_sunday.red = (mw->fg_sunday.red + cur_style->fg[GTK_STATE_SELECTED].red)/2;
+ mw->fg_sunday.green = (mw->fg_sunday.green + cur_style->fg[GTK_STATE_SELECTED].red)/2;
+ mw->fg_sunday.blue = (3*mw->fg_sunday.blue + cur_style->fg[GTK_STATE_SELECTED].red)/4;
+ mw->bg_today.red = (3*mw->bg_today.red + cur_style->bg[GTK_STATE_NORMAL].red)/4;
+ mw->bg_today.green = (3*mw->bg_today.green + cur_style->bg[GTK_STATE_NORMAL].red)/4;
+ mw->bg_today.blue = (3*mw->bg_today.blue + cur_style->bg[GTK_STATE_NORMAL].red)/4;
}
- gdk_colormap_alloc_color(pic1_cmap, &mw->line_color, FALSE, TRUE);
- gdk_colormap_alloc_color(pic1_cmap, &mw->fg_sunday, FALSE, TRUE);
- gdk_colormap_alloc_color(pic1_cmap, &mw->bg_today, FALSE, TRUE);
}
static void fill_hour(month_win *mw, gint col, gint row, char *text)
ev = gtk_event_box_new();
name = gtk_label_new(text);
- gtk_misc_set_alignment(GTK_MISC(name), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(name), 0.0);
CLAWS_SET_TIP(ev, _("Week number"));
gtk_container_add(GTK_CONTAINER(ev), name);
gtk_widget_set_size_request(ev, mw->hour_req.width
, mw->StartDate_button_req.height);
if (text)
- gtk_table_attach(GTK_TABLE(mw->dtable), ev, col, col+1, row, row+1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable), ev, col, row, 1, 1);
else /* special, needed for header table full day events */
- gtk_table_attach(GTK_TABLE(mw->dtable_h), ev, col, col+1, row, row+1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable_h), ev, col, row, 1, 1);
}
static void build_month_view_table(month_win *mw)
GtkWidget *vp;
time_t t = time(NULL);
GtkWidget *arrow;
- int avail_w = 0, avail_d = 0;
+ int avail_w = 0, avail_d = 7;
int avail_h = 0;
int weekoffset = -1;
GDate *date;
- int first_week=0;
+ int first_week = 0;
if (mainwindow_get_mainwindow()) {
- GtkAllocation allocation;
- SummaryView *summaryview = mainwindow_get_mainwindow()->summaryview;
- GTK_EVENTS_FLUSH();
- allocation = summaryview->mainwidget_book->allocation;
-
- avail_w = allocation.width - 25 - 2*(mw->hour_req.width);
- avail_h = allocation.height - 20;
- if (avail_h < 250)
- avail_h = 250;
- avail_d = avail_w / mw->StartDate_button_req.width;
- }
- avail_d = 7;
+ GtkAllocation allocation;
+ SummaryView *summaryview = mainwindow_get_mainwindow()->summaryview;
+ GTK_EVENTS_FLUSH();
+ gtk_widget_get_allocation(summaryview->mainwidget_book,
+ &allocation);
+
+ avail_w = allocation.width - 25 - 2*(mw->hour_req.width);
+ avail_h = allocation.height - 20;
+ if (avail_h < 250)
+ avail_h = 250;
+ /* avail_d = avail_w / mw->StartDate_button_req.width; */
+ }
+
gtk_widget_set_size_request(mw->StartDate_button, avail_w / avail_d,
(avail_h)/6);
- gtk_widget_size_request(mw->StartDate_button, &mw->StartDate_button_req);
+ gtk_widget_get_preferred_size(mw->StartDate_button, &mw->StartDate_button_req,
+ NULL);
/* initial values */
- if (avail_d)
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(mw->day_spin), avail_d);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(mw->day_spin), avail_d);
#ifdef G_OS_WIN32
if (t < 0)
, GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
gtk_box_pack_start(GTK_BOX(mw->Vbox), mw->scroll_win_h
, TRUE, TRUE, 0);
- mw->month_view_vbox = gtk_vbox_new(FALSE, 0);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(mw->scroll_win_h)
- , mw->month_view_vbox);
- /*
+ mw->month_view_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(mw->scroll_win_h), mw->month_view_vbox);
- */
/* row 1= day header buttons
* row 2= full day events after the buttons */
- mw->dtable_h = gtk_table_new(2 , days+2, FALSE);
+ mw->dtable_h = gtk_grid_new();
gtk_box_pack_start(GTK_BOX(mw->month_view_vbox), mw->dtable_h
, FALSE, FALSE, 0);
mw->Previous_toolbutton = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(mw->Previous_toolbutton), FALSE);
gtk_container_set_border_width(GTK_CONTAINER(mw->Previous_toolbutton), 0);
- arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
+ arrow = gtk_image_new_from_icon_name("pan-start-symbolic", GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(mw->Previous_toolbutton), arrow);
- gtk_table_attach(GTK_TABLE(mw->dtable_h), mw->Previous_toolbutton, i, i+1, 0, 1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable_h), mw->Previous_toolbutton, i, 0, 1, 1);
gtk_widget_show_all(mw->Previous_toolbutton);
g_signal_connect((gpointer)mw->Previous_toolbutton, "button_release_event"
, G_CALLBACK(on_Previous_clicked), mw);
gtk_widget_set_size_request(button, mw->StartDate_button_req.width, -1);
g_object_set_data(G_OBJECT(button), "offset", GINT_TO_POINTER(i-1));
- gtk_table_attach(GTK_TABLE(mw->dtable_h), button, i, i+1, 0, 1
- , (GTK_FILL), (0), 0, 0);
+ gtk_widget_set_hexpand(button, TRUE);
+ gtk_grid_attach(GTK_GRID(mw->dtable_h), button, i, 0, 1, 1);
}
mw->Next_toolbutton = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(mw->Next_toolbutton), FALSE);
gtk_container_set_border_width(GTK_CONTAINER(mw->Next_toolbutton), 0);
- arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ arrow = gtk_image_new_from_icon_name("pan-end-symbolic", GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(mw->Next_toolbutton), arrow);
- gtk_table_attach(GTK_TABLE(mw->dtable_h), mw->Next_toolbutton, i, i+1, 0, 1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable_h), mw->Next_toolbutton, i, 0, 1, 1);
gtk_widget_show_all(mw->Next_toolbutton);
g_signal_connect((gpointer)mw->Next_toolbutton, "button_release_event"
, G_CALLBACK(on_Next_clicked), mw);
vp = gtk_viewport_new(NULL, NULL);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(vp), GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(mw->scroll_win), vp);
- mw->dtable = gtk_table_new(6, days+2, FALSE);
+ mw->dtable = gtk_grid_new();
gtk_container_add(GTK_CONTAINER(vp), mw->dtable);
gtk_widget_show_all(mw->dtable_h);
mw->startdate = tmdate;
- mw->Vbox = gtk_vbox_new(FALSE, 0);
+ mw->Vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_name(GTK_WIDGET(mw->Vbox), "vcal_month_win");
mw->item = item;
build_month_view_colours(mw);
projects / claws.git / blobdiff