Include a Other Software section in Help file

[geeqie.git] / src / bar.c

diff --git a/src/bar.c b/src/bar.c
index 2e43042..6fd0ee6 100644 (file)
--- a/src/bar.c
+++ b/src/bar.c
@@ -589,6 +589,7 @@ void bar_add(GtkWidget *bar, GtkWidget *pane)
        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);
@@ -659,8 +660,8 @@ static void bar_destroy(GtkWidget *widget, gpointer data)
 }
 
 #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
@@ -686,6 +687,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
        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);
@@ -699,11 +701,17 @@ GtkWidget *bar_new(LayoutWindow *lw)
        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);
 
@@ -711,6 +719,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
        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);
@@ -722,6 +731,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
        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,
@@ -757,7 +767,7 @@ GtkWidget *bar_update_from_config(GtkWidget *bar, const gchar **attribute_names,
                }
 
 #if !GTK_CHECK_VERSION(3,0,0)
-/* FIXME: In bar_size_allocate() the width obained is the allocated width. In GTK2 this
+/** @FIXME In bar_size_allocate() the width obtained is the allocated width. In GTK2 this
  * is the actual width. In GTK3 it is the *minimum* width.
  * This results in the info sidebar being able to increase, but not
  * decrease. There does not seem to be a way in GTK3 to get the actual width of
@@ -788,7 +798,8 @@ 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;
 }