Fix #323: Rating system

[geeqie.git] / src / bar_comment.c

diff --git a/src/bar_comment.c b/src/bar_comment.c
index 36bc50d..b5eb290 100644 (file)
--- a/src/bar_comment.c
+++ b/src/bar_comment.c
@@ -1,16 +1,24 @@
 /*
- * 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: John Ellis
  *
- * 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_comment.h"
 
@@ -67,7 +75,7 @@ static void bar_pane_comment_update(PaneCommentData *pcd)
        orig_comment = text_widget_text_pull(pcd->comment_view);
        comment = metadata_read_string(pcd->fd, pcd->key, METADATA_PLAIN);
        comment_not_null = (comment) ? comment : "";
-       
+
        if (strcmp(orig_comment, comment_not_null) != 0)
                {
                g_signal_handlers_block_by_func(comment_buffer, bar_pane_comment_changed, pcd);
@@ -90,7 +98,7 @@ static void bar_pane_comment_set_selection(PaneCommentData *pcd, gboolean append
 
        list = layout_selection_list(pcd->pane.lw);
        list = file_data_process_groups_in_selection(list, FALSE, NULL);
-       
+
        work = list;
        while (work)
                {
@@ -159,6 +167,19 @@ static void bar_pane_comment_write_config(GtkWidget *pane, GString *outstr, gint
        pcd = g_object_get_data(G_OBJECT(pane), "pane_data");
        if (!pcd) return;
 
+       if (!g_strcmp0(pcd->pane.id, "title"))
+               {
+               pcd->height = options->info_title.height;
+               }
+       if (!g_strcmp0(pcd->pane.id, "comment"))
+               {
+               pcd->height = options->info_comment.height;
+               }
+       if (!g_strcmp0(pcd->pane.id, "rating"))
+               {
+               pcd->height = options->info_rating.height;
+               }
+
        WRITE_NL(); WRITE_STRING("<pane_comment ");
        write_char_option(outstr, indent, "id", pcd->pane.id);
        write_char_option(outstr, indent, "title", gtk_label_get_text(GTK_LABEL(pcd->pane.title)));
@@ -218,7 +239,7 @@ static GtkWidget *bar_pane_comment_new(const gchar *id, const gchar *title, cons
        GtkTextBuffer *buffer;
 
        pcd = g_new0(PaneCommentData, 1);
-       
+
        pcd->pane.pane_set_fd = bar_pane_comment_set_fd;
        pcd->pane.pane_event = bar_pane_comment_event;
        pcd->pane.pane_write_config = bar_pane_comment_write_config;
@@ -227,17 +248,17 @@ static GtkWidget *bar_pane_comment_new(const gchar *id, const gchar *title, cons
        pcd->pane.type = PANE_COMMENT;
 
        pcd->pane.expanded = expanded;
-       
+
        pcd->key = g_strdup(key);
        pcd->height = height;
 
        scrolled = gtk_scrolled_window_new(NULL, NULL);
-       
+
        pcd->widget = scrolled;
        g_object_set_data(G_OBJECT(pcd->widget), "pane_data", pcd);
        g_signal_connect(G_OBJECT(pcd->widget), "destroy",
                         G_CALLBACK(bar_pane_comment_destroy), pcd);
-       
+
        gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -281,11 +302,24 @@ GtkWidget *bar_pane_comment_new_from_config(const gchar **attribute_names, const
                if (READ_BOOL_FULL("expanded", expanded)) continue;
                if (READ_INT_FULL("height", height)) continue;
                if (READ_CHAR_FULL("id", id)) continue;
-               
+
 
                log_printf("unknown attribute %s = %s\n", option, value);
                }
-       
+
+       if (!g_strcmp0(id, "title"))
+               {
+               options->info_title.height = height;
+               }
+       if (!g_strcmp0(id, "comment"))
+               {
+               options->info_comment.height = height;
+               }
+       if (!g_strcmp0(id, "rating"))
+               {
+               options->info_rating.height = height;
+               }
+
        bar_pane_translate_title(PANE_COMMENT, id, &title);
        ret = bar_pane_comment_new(id, title, key, expanded, height);
        g_free(title);
@@ -313,7 +347,7 @@ void bar_pane_comment_update_from_config(GtkWidget *pane, const gchar **attribut
                if (READ_BOOL_FULL("expanded", pcd->pane.expanded)) continue;
                if (READ_INT_FULL("height", pcd->height)) continue;
                if (READ_CHAR_FULL("id", pcd->pane.id)) continue;
-               
+
 
                log_printf("unknown attribute %s = %s\n", option, value);
                }