/*
- * Geeqie
- * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: Vladimir Nadvornik
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
#include "main.h"
#include "bar.h"
#include "rcfile.h"
#include "bar_gps.h"
+#include <gdk/gdkkeysyms.h>
+
typedef struct _KnownPanes KnownPanes;
struct _KnownPanes
{
" </layout>"
"</gq>";
+static const gchar default_config_headline[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_comment id = 'headline' expanded = 'true' key = 'Xmp.photoshop.Headline' height = '40' />"
+" </bar>"
+" </layout>"
+"</gq>";
+
static const gchar default_config_keywords[] =
"<gq>"
" <layout id = '_current_'>"
" </bar>"
" </layout>"
"</gq>";
+static const gchar default_config_rating[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_rating id = 'rating' expanded = 'true' />"
+" </bar>"
+" </layout>"
+"</gq>";
static const gchar default_config_exif[] =
"<gq>"
" <pane_exif id = 'exif' expanded = 'true' >"
" <entry key = 'formatted.Camera' if_set = 'true' editable = 'false' />"
" <entry key = 'formatted.DateTime' if_set = 'true' editable = 'false' />"
+" <entry key = 'formatted.localtime' if_set = 'true' editable = 'false' />"
" <entry key = 'formatted.ShutterSpeed' if_set = 'true' editable = 'false' />"
" <entry key = 'formatted.Aperture' if_set = 'true' editable = 'false' />"
" <entry key = 'formatted.ExposureBias' if_set = 'true' editable = 'false' />"
" <entry key = 'formatted.SubjectDistance' if_set = 'true' editable = 'false' />"
" <entry key = 'formatted.Resolution' if_set = 'true' editable = 'false' />"
" <entry key = '" ORIENTATION_KEY "' if_set = 'true' editable = 'false' />"
+" <entry key = 'formatted.star_rating' if_set = 'true' editable = 'false' />"
" </pane_exif>"
" </bar>"
" </layout>"
" <entry key = 'file.mode' if_set = 'false' editable = 'false' />"
" <entry key = 'file.date' if_set = 'false' editable = 'false' />"
" <entry key = 'file.size' if_set = 'false' editable = 'false' />"
+" <entry key = 'file.owner' if_set = 'false' editable = 'false' />"
+" <entry key = 'file.group' if_set = 'false' editable = 'false' />"
+" <entry key = 'file.class' if_set = 'false' editable = 'false' />"
+" <entry key = 'file.link' if_set = 'false' editable = 'false' />"
" </pane_exif>"
" </bar>"
" </layout>"
" <pane_exif id = 'location' expanded = 'true' >"
" <entry key = 'formatted.GPSPosition' if_set = 'true' editable = 'false' />"
" <entry key = 'formatted.GPSAltitude' if_set = 'true' editable = 'false' />"
+" <entry key = 'formatted.timezone' if_set = 'true' editable = 'false' />"
" <entry key = 'Xmp.photoshop.Country' if_set = 'false' editable = 'true' />"
" <entry key = 'Xmp.iptc.CountryCode' if_set = 'false' editable = 'true' />"
" <entry key = 'Xmp.photoshop.State' if_set = 'false' editable = 'true' />"
{PANE_COMMENT, "title", N_("Title"), default_config_title},
{PANE_KEYWORDS, "keywords", N_("Keywords"), default_config_keywords},
{PANE_COMMENT, "comment", N_("Comment"), default_config_comment},
+ {PANE_RATING, "rating", N_("Star Rating"), default_config_rating},
+ {PANE_COMMENT, "headline", N_("Headline"), default_config_headline},
{PANE_EXIF, "exif", N_("Exif"), default_config_exif},
/* other pre-configured panes */
{PANE_EXIF, "file_info", N_("File info"), default_config_file_info},
GtkWidget *vbox;
FileData *fd;
GtkWidget *label_file_name;
+ GtkWidget *add_button;
LayoutWindow *lw;
gint width;
bar_expander_move(widget, data, FALSE, FALSE);
}
+static void height_spin_changed_cb(GtkSpinButton *spin, gpointer data)
+{
+
+ gtk_widget_set_size_request(GTK_WIDGET(data), -1, gtk_spin_button_get_value_as_int(spin));
+}
+
+static gboolean height_spin_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ if ((event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_Escape))
+ {
+ gtk_widget_destroy(GTK_WIDGET(data));
+ }
+
+ return TRUE;
+}
+
+static void bar_expander_height_cb(GtkWidget *widget, gpointer data)
+{
+ GtkWidget *expander = data;
+ GtkWidget *spin;
+ GtkWidget *window;
+ GtkWidget *data_box;
+ GList *list;
+ gint x, y;
+ gint w, h;
+#if GTK_CHECK_VERSION(3,0,0)
+ GdkDisplay *display;
+ GdkDeviceManager *device_manager;
+ GdkDevice *device;
+#endif
+
+#if GTK_CHECK_VERSION(3,0,0)
+ display = gdk_display_get_default();
+ device_manager = gdk_display_get_device_manager(display);
+ device = gdk_device_manager_get_client_pointer(device_manager);
+ gdk_device_get_position(device, NULL, &x, &y);
+#else
+ gdk_window_get_pointer(NULL, &x, &y, NULL);
+#endif
+
+ list = gtk_container_get_children(GTK_CONTAINER(expander));
+ data_box = list->data;
+
+ window = gtk_window_new(GTK_WINDOW_POPUP);
+
+ gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+ gtk_window_set_keep_above(GTK_WINDOW(window), TRUE);
+ gtk_window_set_default_size(GTK_WINDOW(window), 50, 30); //** @FIXME set these values in a more sensible way */
+
+ gtk_window_move(GTK_WINDOW(window), x, y);
+ gtk_widget_show(window);
+
+ gtk_widget_get_size_request(GTK_WIDGET(data_box), &w, &h);
+
+ spin = gtk_spin_button_new_with_range(1, 1000, 1);
+ g_signal_connect(G_OBJECT(spin), "value-changed", G_CALLBACK(height_spin_changed_cb), data_box);
+ g_signal_connect(G_OBJECT(spin), "key-press-event", G_CALLBACK(height_spin_key_press_cb), window);
+
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), h);
+ gtk_container_add(GTK_CONTAINER(window), spin);
+ gtk_widget_show(spin);
+ gtk_widget_grab_focus(GTK_WIDGET(spin));
+
+ g_list_free(list);
+}
+
static void bar_expander_delete_cb(GtkWidget *widget, gpointer data)
{
GtkWidget *expander = data;
GtkWidget *menu;
GtkWidget *bar;
GtkWidget *expander;
- const KnownPanes *pane = known_panes;
BarData *bd;
+ gboolean display_height_option = FALSE;
+ gchar const *label;
+
+ label = gtk_expander_get_label(GTK_EXPANDER(widget));
+ display_height_option = (g_strcmp0(label, "Comment") == 0) ||
+ (g_strcmp0(label, "Rating") == 0) ||
+ (g_strcmp0(label, "Title") == 0) ||
+ (g_strcmp0(label, "Headline") == 0) ||
+ (g_strcmp0(label, "Keywords") == 0) ||
+ (g_strcmp0(label, "GPS Map") == 0);
bd = g_object_get_data(G_OBJECT(widget), "bar_data");
if (bd)
menu_item_add_stock(menu, _("Move _down"), GTK_STOCK_GO_DOWN, G_CALLBACK(bar_expander_move_down_cb), expander);
menu_item_add_stock(menu, _("Move to _bottom"), GTK_STOCK_GOTO_BOTTOM, G_CALLBACK(bar_expander_move_bottom_cb), expander);
menu_item_add_divider(menu);
+
+ if (gtk_expander_get_expanded(GTK_EXPANDER(expander)) && display_height_option)
+ {
+ menu_item_add_stock(menu, _("Height..."), GTK_STOCK_PREFERENCES, G_CALLBACK(bar_expander_height_cb), expander);
+ menu_item_add_divider(menu);
+ }
+
menu_item_add_stock(menu, _("Remove"), GTK_STOCK_DELETE, G_CALLBACK(bar_expander_delete_cb), expander);
menu_item_add_divider(menu);
}
+ gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, bar, 0, GDK_CURRENT_TIME);
+}
+
+static void bar_menu_add_popup(GtkWidget *widget)
+{
+ GtkWidget *menu;
+ GtkWidget *bar;
+ const KnownPanes *pane = known_panes;
+
+ bar = widget;
+
+ menu = popup_menu_short_lived();
+
while (pane->id)
{
GtkWidget *item;
return FALSE;
}
+static void bar_expander_cb(GObject *object, GParamSpec *param_spec, gpointer data)
+{
+ GtkExpander *expander;
+ GtkWidget *child;
+
+ expander = GTK_EXPANDER(object);
+ child = gtk_bin_get_child(GTK_BIN(expander));
+
+ if (gtk_expander_get_expanded(expander))
+ {
+ gtk_widget_show_all(child);
+ }
+ else
+ {
+ gtk_widget_hide(child);
+ }
+}
+
+static gboolean bar_menu_add_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+{
+ bar_menu_add_popup(widget);
+ return TRUE;
+}
+
static void bar_pane_set_fd_cb(GtkWidget *expander, gpointer data)
{
pd->bar = bar;
expander = gtk_expander_new(NULL);
+ DEBUG_NAME(expander);
if (pd && pd->title)
{
gtk_expander_set_label_widget(GTK_EXPANDER(expander), pd->title);
gtk_box_pack_start(GTK_BOX(bd->vbox), expander, FALSE, TRUE, 0);
g_signal_connect(expander, "button_release_event", G_CALLBACK(bar_menu_cb), bd);
+ g_signal_connect(expander, "notify::expanded", G_CALLBACK(bar_expander_cb), pd);
gtk_container_add(GTK_CONTAINER(expander), pane);
void bar_populate_default(GtkWidget *bar)
{
- const gchar *populate_id[] = {"histogram", "title", "keywords", "comment", "exif", NULL};
+ const gchar *populate_id[] = {"histogram", "title", "keywords", "comment", "rating", "exif", NULL};
const gchar **id = populate_id;
while (*id)
{
BarData *bd = data;
- bd->width = allocation->width;
+ bd->width = gtk_paned_get_position(GTK_PANED(bd->lw->utility_paned));
}
gint bar_get_width(GtkWidget *bar)
}
#ifdef HAVE_LIBCHAMPLAIN_GTK
-/*
- FIXME: this is an ugly hack that works around this bug:
+/**
+ @FIXME this is an ugly hack that works around this bug:
https://bugzilla.gnome.org/show_bug.cgi?id=590692
http://bugzilla.openedhand.com/show_bug.cgi?id=1751
it should be removed as soon as a better solution exists
BarData *bd;
GtkWidget *box;
GtkWidget *scrolled;
+ GtkWidget *tbar;
+ GtkWidget *add_box;
bd = g_new0(BarData, 1);
bd->lw = lw;
bd->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ DEBUG_NAME(bd->widget);
g_object_set_data(G_OBJECT(bd->widget), "bar_data", bd);
g_signal_connect(G_OBJECT(bd->widget), "destroy",
G_CALLBACK(bar_destroy), bd);
g_signal_connect(G_OBJECT(bd->widget), "button_release_event", G_CALLBACK(bar_menu_cb), bd);
bd->width = SIDEBAR_DEFAULT_WIDTH;
- gtk_widget_set_size_request(bd->widget, bd->width, -1);
box = gtk_hbox_new(FALSE, 0);
+ DEBUG_NAME(box);
bd->label_file_name = gtk_label_new("");
gtk_label_set_ellipsize(GTK_LABEL(bd->label_file_name), PANGO_ELLIPSIZE_END);
gtk_label_set_selectable(GTK_LABEL(bd->label_file_name), TRUE);
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_label_set_xalign(GTK_LABEL(bd->label_file_name), 0.5);
+ gtk_label_set_yalign(GTK_LABEL(bd->label_file_name), 0.5);
+#else
gtk_misc_set_alignment(GTK_MISC(bd->label_file_name), 0.5, 0.5);
+#endif
gtk_box_pack_start(GTK_BOX(box), bd->label_file_name, TRUE, TRUE, 0);
gtk_widget_show(bd->label_file_name);
gtk_widget_show(box);
scrolled = gtk_scrolled_window_new(NULL, NULL);
+ DEBUG_NAME(scrolled);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(bd->widget), scrolled, TRUE, TRUE, 0);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), bd->vbox);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))), GTK_SHADOW_NONE);
+ add_box = gtk_vbox_new(FALSE, 0);
+ DEBUG_NAME(add_box);
+ gtk_box_pack_end(GTK_BOX(bd->widget), add_box, FALSE, FALSE, 0);
+ tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS);
+ bd->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, NULL, FALSE,
+ _("Add Pane"),
+ G_CALLBACK(bar_menu_add_cb), bd);
+ gtk_widget_show(add_box);
+
#ifdef HAVE_LIBCHAMPLAIN_GTK
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(scrolled))), "unrealize", G_CALLBACK(bar_unrealize_clutter_fix_cb), NULL);
#endif
}
-GtkWidget *bar_update_from_config(GtkWidget *bar, const gchar **attribute_names, const gchar **attribute_values)
+GtkWidget *bar_update_from_config(GtkWidget *bar, const gchar **attribute_names, const gchar **attribute_values, LayoutWindow *lw)
{
gboolean enabled = TRUE;
gint width = SIDEBAR_DEFAULT_WIDTH;
log_printf("unknown attribute %s = %s\n", option, value);
}
- gtk_widget_set_size_request(bar, width, -1);
+ gtk_paned_set_position(GTK_PANED(lw->utility_paned), width);
+
if (enabled)
{
gtk_widget_show(bar);
GtkWidget *bar_new_from_config(LayoutWindow *lw, const gchar **attribute_names, const gchar **attribute_values)
{
GtkWidget *bar = bar_new(lw);
- return bar_update_from_config(bar, attribute_names, attribute_values);
+ return bar_update_from_config(bar, attribute_names, attribute_values, lw);
}
GtkWidget *bar_pane_expander_title(const gchar *title)
GtkWidget *widget = gtk_label_new(title);
pref_label_bold(widget, TRUE, FALSE);
- //gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_END); //FIXME: do not work
+ //gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_END);
+ /** @FIXME do not work */
return widget;
}
projects / geeqie.git / blobdiff