Skip to content

Bookmark color solves #685 #1317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karlkleinpaste merged 1 commit into from
Jun 28, 2026
Merged

Bookmark color solves #685 #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
203 changes: 145 additions & 58 deletions src/gtk/bookmark_dialog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "gui/bookmarks_treeview.h"
#include "gui/dialog.h"
#include "gui/utilities.h"
#include "gui/widgets.h"

#include "main/display.hh"
#include "main/sword.h"
Expand All @@ -54,7 +55,7 @@ static GtkWidget *entry_module;
static GtkWidget *textview;
static GtkTextBuffer *textbuffer;
static gchar *note;

static gchar *global_module_name = NULL;
GtkWidget *bookmark_dialog;
GtkWidget *mark_verse_dialog;

Expand All @@ -71,6 +72,13 @@ void on_buffer_changed(GtkTextBuffer *textbuffer, gpointer user_data)
XI_message(("note: %s", note));
}

static void toggle_color_clicked(GtkButton *btn, GtkWidget *colorbtn)
{
gboolean active = gtk_widget_is_sensitive(colorbtn);
gtk_widget_set_sensitive(colorbtn, !active);
gtk_button_set_label(btn, active ? _("Add color") : _("No color"));
}

/******************************************************************************
* Name
* add_bookmark_button
Expand All @@ -93,36 +101,48 @@ static void add_bookmark_button(void)
GtkTreeIter iter;
BOOKMARK_DATA *data;
GtkTreeSelection *selection;
const gchar *module_from_entry;
const gchar *module_to_use;

selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
if (!gtk_tree_selection_get_selected(selection, NULL, &selected))
return;

data = g_new(BOOKMARK_DATA, 1);
data = g_new0(BOOKMARK_DATA, 1);
data->caption = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_label)));
data->key = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_key)));
data->module = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_module)));

if (!strcmp(data->module, "studypad"))
data->module_desc = "studypad";
else
data->module_desc =
g_strdup(main_get_module_description(data->module));

data->description = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_label)));
module_from_entry = gtk_entry_get_text(GTK_ENTRY(entry_module));
if (module_from_entry && strlen(module_from_entry) > 0) {
module_to_use = module_from_entry;
} else if (global_module_name && strlen(global_module_name) > 0) {
module_to_use = global_module_name;
} else {
module_to_use = "";
}

data->module = g_strdup(module_to_use);

if (data->module && strlen(data->module) > 0) {
if (!strcmp(data->module, "studypad"))
data->module_desc = g_strdup("studypad");
else
data->module_desc = g_strdup(main_get_module_description(data->module));
} else {
data->module_desc = g_strdup("");
}

data->description = g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entry_label)));
data->is_leaf = TRUE;
data->color = NULL;
data->opened = bm_pixbufs->pixbuf_helpdoc;
data->closed = NULL;

gui_add_item_to_tree(&iter, &selected, data);
bookmarks_changed = TRUE;
gui_save_bookmarks(NULL, NULL);

g_free(data->caption);
g_free(data->key);
g_free(data->module);
g_free(data->description);
g_free(data);
}

/******************************************************************************
Expand All @@ -147,56 +167,100 @@ static void add_folder_button(void)
GtkTreeIter iter;
BOOKMARK_DATA *data;
GtkTreeSelection *selection;
char *t;
gint test;
GS_DIALOG *info;
GString *str;

selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
if (!gtk_tree_selection_get_selected(selection, NULL, &selected))
return;

t = "|";
str = g_string_new("");
info = gui_new_dialog();
//info->stock_icon = GTK_STOCK_OPEN;
info->title = _("Bookmark");
g_string_printf(str, "<span weight=\"bold\">%s</span>",
_("Enter Folder Name"));
info->label_top = str->str;
info->text1 = g_strdup(_("Folder Name"));
info->label1 = _("Folder: ");
info->ok = TRUE;
info->cancel = TRUE;

data = g_new(BOOKMARK_DATA, 1);
/*** open dialog to get name for new folder ***/
test = gui_gs_dialog(info);
if (test == GS_OK) {
char *buf = g_strdelimit(info->text1, t, ' ');
data->caption = g_strdup(buf);
data->key = NULL;
data->module = NULL;
data->module_desc = NULL;
data->description = NULL;
gchar *glade_file = gui_general_user_file("folder" UI_SUFFIX, TRUE);
if (!glade_file) return;

#ifdef USE_GTKBUILDER
GtkBuilder *gxml = gtk_builder_new();
gtk_builder_add_from_file(gxml, glade_file, NULL);
#else
GladeXML *gxml = glade_xml_new(glade_file, NULL, NULL);
#endif
g_free(glade_file);

GtkWidget *entry = GTK_WIDGET(UI_GET_ITEM(gxml, "folder_entry_name"));
GtkWidget *dialog = GTK_WIDGET(UI_GET_ITEM(gxml, "dialog_folder"));
GtkWidget *colorbtn = GTK_WIDGET(UI_GET_ITEM(gxml, "folder_color_button"));
GtkWidget *clearbtn = GTK_WIDGET(UI_GET_ITEM(gxml, "folder_clear_color"));

#ifdef USE_GTKBUILDER
if (!dialog || !entry || !colorbtn || !clearbtn) {
g_object_unref(gxml);
return;
}
#else
if (!dialog || !entry || !colorbtn || !clearbtn) return;

/* Détruire les boutons inactifs de Glade et ajouter les vrais boutons GTK2 */
GtkWidget *btn_ok = GTK_WIDGET(UI_GET_ITEM(gxml, "folder_ok"));
GtkWidget *btn_cancel = GTK_WIDGET(UI_GET_ITEM(gxml, "folder_cancel"));
if (btn_ok) gtk_widget_destroy(btn_ok);
if (btn_cancel) gtk_widget_destroy(btn_cancel);

gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
#endif

gtk_window_set_title(GTK_WINDOW(dialog), _("New Tag"));
gtk_entry_set_text(GTK_ENTRY(entry), "");

/* Cette ligne est commune, on la sort du #ifdef */
gtk_button_set_label(GTK_BUTTON(clearbtn), _("Add color"));
g_signal_connect(clearbtn, "clicked",
G_CALLBACK(toggle_color_clicked), colorbtn);
g_signal_connect(colorbtn, "color-set",
G_CALLBACK(toggle_color_clicked), clearbtn);

if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
const gchar *name = gtk_entry_get_text(GTK_ENTRY(entry));
gchar *color = NULL;

if (g_strcmp0(gtk_button_get_label(GTK_BUTTON(clearbtn)), _("No color")) == 0) {
#if defined(USE_GTKBUILDER) && GTK_CHECK_VERSION(3, 4, 0)
GdkRGBA rgba;
gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(colorbtn), &rgba);
if (rgba.red < 0.99 || rgba.green < 0.99 || rgba.blue < 0.99)
color = g_strdup_printf("#%02X%02X%02X",
(guint)(rgba.red * 255),
(guint)(rgba.green * 255),
(guint)(rgba.blue * 255));
#else
/* API de récupération de couleur pour GTK2 */
GdkColor gdk_color;
gtk_color_button_get_color(GTK_COLOR_BUTTON(colorbtn), &gdk_color);
if (gdk_color.red < 65000 || gdk_color.green < 65000 || gdk_color.blue < 65000)
color = g_strdup_printf("#%02X%02X%02X",
gdk_color.red >> 8,
gdk_color.green >> 8,
gdk_color.blue >> 8);
#endif
}

data = g_new0(BOOKMARK_DATA, 1);
data->caption = g_strdelimit(g_strdup(name), "/|><.'`\"", ' ');
data->color = color;
data->is_leaf = FALSE;
data->opened = bm_pixbufs->pixbuf_opened;
data->closed = bm_pixbufs->pixbuf_closed;
gui_add_item_to_tree(&iter, &selected, data);
bookmarks_changed = TRUE;
gui_save_bookmarks(NULL, NULL);
g_free(data->caption);
GtkTreePath *path =
gtk_tree_model_get_path(GTK_TREE_MODEL(model), &iter);
gtk_tree_view_expand_to_path(GTK_TREE_VIEW(treeview),
path);

GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), &iter);
gtk_tree_view_expand_to_path(GTK_TREE_VIEW(treeview), path);
gtk_tree_selection_select_path(selection, path);
gtk_tree_path_free(path);
}
g_free(data);
g_free(info->text1);
g_free(info);
g_string_free(str, TRUE);
gtk_widget_destroy(dialog);
#ifdef USE_GTKBUILDER
g_object_unref(gxml);
#endif
}

/******************************************************************************
Expand Down Expand Up @@ -232,7 +296,6 @@ void on_dialog_response(GtkDialog *dialog,
break;
}
}

/******************************************************************************
* Name
* on_dialog_enter
Expand All @@ -249,8 +312,8 @@ void on_dialog_response(GtkDialog *dialog,

void on_dialog_enter(void)
{
on_dialog_response(GTK_DIALOG(bookmark_dialog),
GTK_RESPONSE_OK, NULL);
if (bookmark_dialog)
gtk_dialog_response(GTK_DIALOG(bookmark_dialog), GTK_RESPONSE_OK);
}

/******************************************************************************
Expand Down Expand Up @@ -441,8 +504,6 @@ static GtkWidget *_create_bookmark_dialog(gchar *label,

/* lookup the root widget */
bookmark_dialog = UI_GET_ITEM(gxml, "dialog");
g_signal_connect(bookmark_dialog, "response",
G_CALLBACK(on_dialog_response), NULL);

/* treeview */
treeview = UI_GET_ITEM(gxml, "treeview");
Expand Down Expand Up @@ -577,11 +638,37 @@ static GtkWidget *_create_mark_verse_dialog(gchar *module, gchar *key)

void gui_bookmark_dialog(gchar *label, gchar *module_name, gchar *key)
{
GtkWidget *dialog =
_create_bookmark_dialog(label, module_name, key);
GtkWidget *dialog;
gint response;

if (global_module_name != NULL) {
g_free(global_module_name);
global_module_name = NULL;
}

if (module_name != NULL) {
global_module_name = g_strdup(module_name);
}

dialog = _create_bookmark_dialog(label, module_name, key);
if (!dialog)
return;
gtk_dialog_run(GTK_DIALOG(dialog));

while (TRUE) {
response = gtk_dialog_run(GTK_DIALOG(dialog));
if (response == GTK_RESPONSE_ACCEPT) {
/* New folder — keep dialog open */
add_folder_button();
} else if (response == GTK_RESPONSE_OK) {
/* Add bookmark — close dialog */
add_bookmark_button();
break;
} else {
/* Cancel or destroy */
break;
}
}
gtk_widget_destroy(dialog);
}

/******************************************************************************
Expand Down
Loading