Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/c1a8e4518d986e9ea0fdb53231f1b234d6635930
...commit
http://git.netsurf-browser.org/netsurf.git/commit/c1a8e4518d986e9ea0fdb53231f1b234d6635930
...tree
http://git.netsurf-browser.org/netsurf.git/tree/c1a8e4518d986e9ea0fdb53231f1b234d6635930
The branch, vince/gtk-tab-restyle has been updated
via c1a8e4518d986e9ea0fdb53231f1b234d6635930 (commit)
from 01084912c415412a57426fa70fac88c26e4ff0ad (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=c1a8e4518d986e9ea0fdb53231f1b234d6635930
commit c1a8e4518d986e9ea0fdb53231f1b234d6635930
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove global edit mode and make customisation toolbox construction simpler
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index 007a8fe..243c0ce 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -221,8 +221,6 @@ struct nsgtk_toolbar_customisation {
};
-static bool edit_mode = false;
-
/* forward declaration */
static nserror toolbar_item_create(nsgtk_toolbar_button id,
struct nsgtk_toolbar_item *item_out);
@@ -262,7 +260,7 @@ static char *remove_underscores(const char *s, bool
replacespace)
* create a gtk entry widget with a completion attached
*/
static GtkToolItem *
-make_toolbar_item_throbber(bool sensitivity)
+make_toolbar_item_throbber(bool sensitivity, bool edit)
{
nserror res;
GtkToolItem *item;
@@ -274,7 +272,7 @@ make_toolbar_item_throbber(bool sensitivity)
return NULL;
}
- if (edit_mode) {
+ if (edit) {
const char *msg;
msg = messages_get("ToolThrob");
item = gtk_tool_button_new(
@@ -305,7 +303,7 @@ make_toolbar_item_throbber(bool sensitivity)
* create a gtk entry widget with a completion attached
*/
static GtkToolItem *
-make_toolbar_item_url_bar(bool sensitivity)
+make_toolbar_item_url_bar(bool sensitivity, bool edit)
{
GtkToolItem *item;
GtkWidget *entry;
@@ -317,7 +315,7 @@ make_toolbar_item_url_bar(bool sensitivity)
return NULL;
}
- if (edit_mode) {
+ if (edit) {
gtk_entry_set_width_chars(GTK_ENTRY(entry), 9);
item = gtk_tool_button_new(NULL, "URL");
@@ -348,7 +346,7 @@ make_toolbar_item_url_bar(bool sensitivity)
* create web search toolbar item widget
*/
static GtkToolItem *
-make_toolbar_item_websearch(bool sensitivity)
+make_toolbar_item_websearch(bool sensitivity, bool edit)
{
GtkToolItem *item;
nserror res;
@@ -378,7 +376,7 @@ make_toolbar_item_websearch(bool sensitivity)
NSGTK_STOCK_INFO);
}
- if (edit_mode) {
+ if (edit) {
gtk_entry_set_width_chars(GTK_ENTRY(entry), 9);
item = gtk_tool_button_new(NULL, "Web Search");
@@ -405,13 +403,13 @@ make_toolbar_item_websearch(bool sensitivity)
* create local history toolbar item widget
*/
static GtkToolItem *
-make_toolbar_item_history(bool sensitivity)
+make_toolbar_item_history(bool sensitivity, bool edit)
{
GtkToolItem *item;
const char *msg = "H";
char *label = NULL;
- if (edit_mode) {
+ if (edit) {
msg = messages_get("gtkLocalHistory");
}
label = remove_underscores(msg, false);
@@ -435,7 +433,8 @@ make_toolbar_item_history(bool sensitivity)
static GtkToolItem *
make_toolbar_item_button(const char *labelmsg,
const char *iconname,
- bool sensitivity)
+ bool sensitivity,
+ bool edit)
{
GtkToolItem *item;
char *label = NULL;
@@ -451,7 +450,7 @@ make_toolbar_item_button(const char *labelmsg,
gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), iconname);
gtk_widget_set_sensitive(GTK_WIDGET(item), sensitivity);
- if (edit_mode) {
+ if (edit) {
nsgtk_widget_set_margins(GTK_WIDGET(item), 0, 0);
}
}
@@ -468,42 +467,46 @@ make_toolbar_item_button(const char *labelmsg,
* \return gtk widget
*/
static GtkToolItem *
-make_toolbar_item(nsgtk_toolbar_button itemid,
- bool sensitivity)
+make_toolbar_item(nsgtk_toolbar_button itemid, bool sensitivity)
{
GtkToolItem *toolitem = NULL;
switch(itemid) {
#define TOOLBAR_ITEM_y(identifier, label, iconame)
#define TOOLBAR_ITEM_n(identifier, label, iconame)
+#define TOOLBAR_ITEM_t(identifier, label, iconame) \
+ case identifier: \
+ toolitem = make_toolbar_item_button(#label, iconame,
sensitivity, false); \
+ break;
#define TOOLBAR_ITEM_b(identifier, label, iconame) \
case identifier: \
- toolitem = make_toolbar_item_button(#label, iconame,
sensitivity);\
+ toolitem = make_toolbar_item_button(#label, iconame,
sensitivity, false); \
break;
#define TOOLBAR_ITEM(identifier, name, snstvty, clicked, activate, label,
iconame) \
TOOLBAR_ITEM_ ## clicked(identifier, label, iconame)
#include "gtk/toolbar_items.h"
+#undef TOOLBAR_ITEM_t
#undef TOOLBAR_ITEM_b
#undef TOOLBAR_ITEM_n
#undef TOOLBAR_ITEM_y
#undef TOOLBAR_ITEM
case HISTORY_BUTTON:
- toolitem = make_toolbar_item_history(sensitivity);
+ toolitem = make_toolbar_item_history(sensitivity, false);
break;
case URL_BAR_ITEM:
- toolitem = make_toolbar_item_url_bar(sensitivity);
+ toolitem = make_toolbar_item_url_bar(sensitivity, false);
break;
case THROBBER_ITEM:
- toolitem = make_toolbar_item_throbber(sensitivity);
+ toolitem = make_toolbar_item_throbber(sensitivity, false);
break;
case WEBSEARCH_ITEM:
- toolitem = make_toolbar_item_websearch(sensitivity);
+ toolitem = make_toolbar_item_websearch(sensitivity, false);
break;
default:
@@ -513,6 +516,61 @@ make_toolbar_item(nsgtk_toolbar_button itemid,
return toolitem;
}
+
+/**
+ * widget factory for creation of toolbar item widgets for the toolbox
+ *
+ * \param itemid the id of the widget
+ * \return gtk tool item widget
+ */
+static GtkToolItem *
+make_toolbox_item(nsgtk_toolbar_button itemid)
+{
+ GtkToolItem *toolitem = NULL;
+
+ switch(itemid) {
+#define TOOLBAR_ITEM_y(identifier, label, iconame)
+#define TOOLBAR_ITEM_n(identifier, label, iconame)
+#define TOOLBAR_ITEM_t(identifier, label, iconame)
+#define TOOLBAR_ITEM_b(identifier, label, iconame) \
+ case identifier: \
+ toolitem = make_toolbar_item_button(#label, iconame, true,
true); \
+ break;
+#define TOOLBAR_ITEM(identifier, name, snstvty, clicked, activate, label,
iconame) \
+ TOOLBAR_ITEM_ ## clicked(identifier, label, iconame)
+
+#include "gtk/toolbar_items.h"
+
+#undef TOOLBAR_ITEM_t
+#undef TOOLBAR_ITEM_b
+#undef TOOLBAR_ITEM_n
+#undef TOOLBAR_ITEM_y
+#undef TOOLBAR_ITEM
+
+ case HISTORY_BUTTON:
+ toolitem = make_toolbar_item_history(true, true);
+ break;
+
+ case URL_BAR_ITEM:
+ toolitem = make_toolbar_item_url_bar(false, true);
+ break;
+
+ case THROBBER_ITEM:
+ toolitem = make_toolbar_item_throbber(true, true);
+ break;
+
+ case WEBSEARCH_ITEM:
+ toolitem = make_toolbar_item_websearch(false, true);
+ break;
+
+ default:
+ break;
+
+ }
+ return toolitem;
+}
+
+
/**
* target entry for drag source
*/
@@ -753,10 +811,7 @@ customisation_toolbar_drag_drop_cb(GtkWidget *widget,
}
- edit_mode = true;
- dragitem->button = make_toolbar_item(tbc->dragitem,
- tbc->toolbar.items[tbc->dragitem].sensitivity);
- edit_mode = false;
+ dragitem->button = make_toolbox_item(tbc->dragitem);
if (dragitem->button == NULL) {
nsgtk_warning("NoMemory", 0);
@@ -887,8 +942,6 @@ nsgtk_browser_window_create(struct browser_window *bw, bool
intab)
}
-
-
/**
* Apply the user toolbar button settings from configuration
*
@@ -954,51 +1007,62 @@ apply_user_button_customisation(struct nsgtk_toolbar *tb)
/**
- * append item to gtk toolbar container
+ * callback function to remove a widget from a container
+ */
+static void container_remove_widget(GtkWidget *widget, gpointer data)
+{
+ GtkContainer *container = GTK_CONTAINER(data);
+ gtk_container_remove(container, widget);
+}
+
+
+/**
+ * populates a toolbar with widgets in correct order
*
* \param tb toolbar
- * \param theme in use
- * \param location item location being appended
* \return NSERROR_OK on success else error code.
*/
-static nserror
-add_item_to_toolbar(struct nsgtk_toolbar *tb, int location)
+static nserror populate_gtk_toolbar_widget(struct nsgtk_toolbar *tb)
{
- int bidx; /* button index */
-
- for (bidx = BACK_BUTTON; bidx < PLACEHOLDER_BUTTON; bidx++) {
-
- if (tb->items[bidx].location == location) {
+ int location; /* location index */
+ int itemid;
- tb->items[bidx].button = make_toolbar_item(
- bidx, tb->items[bidx].sensitivity);
+ /* clear the toolbar container of all widgets */
+ gtk_container_foreach(GTK_CONTAINER(tb->widget),
+ container_remove_widget,
+ tb->widget);
- gtk_toolbar_insert(tb->widget,
- tb->items[bidx].button,
- location);
+ /* add widgets to toolbar */
+ for (location = 0; location < PLACEHOLDER_BUTTON; location++) {
+ itemid = itemid_from_location(tb, location);
+ if (itemid == PLACEHOLDER_BUTTON) {
break;
}
+ tb->items[location].button =
+ make_toolbar_item(location,
+ tb->items[location].sensitivity);
+
+ gtk_toolbar_insert(tb->widget,
+ tb->items[location].button,
+ location);
}
- return NSERROR_OK;
-}
+ gtk_widget_show_all(GTK_WIDGET(tb->widget));
-/**
- * callback function to remove a widget from a container
- */
-static void container_remove_widget(GtkWidget *widget, gpointer data)
-{
- GtkContainer *container = GTK_CONTAINER(data);
- gtk_container_remove(container, widget);
+ return NSERROR_OK;
}
/**
- * populates the gtk toolbar container with widgets in correct order
+ * populates the customization toolbar with widgets in correct order
+ *
+ * \param tb toolbar
+ * \return NSERROR_OK on success else error code.
*/
-static nserror populate_gtk_toolbar_widget(struct nsgtk_toolbar *tb)
+static nserror customisation_toolbar_populate(struct nsgtk_toolbar *tb)
{
- int lidx; /* location index */
+ int location; /* location index */
+ int itemid;
/* clear the toolbar container of all widgets */
gtk_container_foreach(GTK_CONTAINER(tb->widget),
@@ -1006,8 +1070,16 @@ static nserror populate_gtk_toolbar_widget(struct
nsgtk_toolbar *tb)
tb->widget);
/* add widgets to toolbar */
- for (lidx = 0; lidx < PLACEHOLDER_BUTTON; lidx++) {
- add_item_to_toolbar(tb, lidx);
+ for (location = 0; location < PLACEHOLDER_BUTTON; location++) {
+ itemid = itemid_from_location(tb, location);
+ if (itemid == PLACEHOLDER_BUTTON) {
+ break;
+ }
+ tb->items[location].button = make_toolbox_item(location);
+
+ gtk_toolbar_insert(tb->widget,
+ tb->items[location].button,
+ location);
}
gtk_widget_show_all(GTK_WIDGET(tb->widget));
@@ -1344,7 +1416,6 @@ toolbar_customisation_create_toolbox(struct
nsgtk_toolbar_customisation *tbc,
columns = NSGTK_MIN_STORE_COLUMNS;
}
- edit_mode = true;
curcol = 0;
for (iidx = startidx = BACK_BUTTON; iidx < PLACEHOLDER_BUTTON; iidx++) {
if (curcol >= columns) {
@@ -1352,8 +1423,7 @@ toolbar_customisation_create_toolbox(struct
nsgtk_toolbar_customisation *tbc,
curcol = 0;
startidx = iidx;
}
- tbc->items[iidx] = make_toolbar_item(iidx,
- tbc->toolbar.items[iidx].sensitivity);
+ tbc->items[iidx] = make_toolbox_item(iidx);
if (tbc->items[iidx] != NULL) {
curcol++;
}
@@ -1361,7 +1431,6 @@ toolbar_customisation_create_toolbox(struct
nsgtk_toolbar_customisation *tbc,
if (curcol > 0) {
add_toolbox_row(tbc, startidx, iidx);
}
- edit_mode = false;
return NSERROR_OK;
}
@@ -1381,12 +1450,10 @@ customisation_toolbar_update(struct
nsgtk_toolbar_customisation *tbc)
}
/* populate toolbar widget */
- edit_mode = true;
- res = populate_gtk_toolbar_widget(&tbc->toolbar);
+ res = customisation_toolbar_populate(&tbc->toolbar);
if (res != NSERROR_OK) {
return res;
}
- edit_mode = false;
/* ensure icon sizes and text labels on toolbar are set */
res = nsgtk_toolbar_restyle(&tbc->toolbar);
@@ -1524,11 +1591,6 @@ static gboolean cutomize_button_clicked_cb(GtkWidget
*widget, gpointer data)
if (res != NSERROR_OK) {
goto cutomize_button_clicked_cb_error;
}
- if ((iidx == URL_BAR_ITEM) || (iidx == WEBSEARCH_ITEM)) {
- tbc->toolbar.items[iidx].sensitivity = false;
- } else {
- tbc->toolbar.items[iidx].sensitivity = true;
- }
}
res = customisation_toolbar_update(tbc);
@@ -3084,6 +3146,8 @@ toolbar_item_create(nsgtk_toolbar_button id, struct
nsgtk_toolbar_item *item)
/* set item defaults from macro */
switch (id) {
+#define TOOLBAR_ITEM_t(name) \
+ item->clicked = name##_button_clicked_cb;
#define TOOLBAR_ITEM_b(name) \
item->clicked = name##_button_clicked_cb;
#define TOOLBAR_ITEM_y(name) \
@@ -3098,7 +3162,10 @@ toolbar_item_create(nsgtk_toolbar_button id, struct
nsgtk_toolbar_item *item)
item->dataminus = nsgtk_toolbar_##iname##_data_minus; \
TOOLBAR_ITEM_ ## clicked(iname) \
break;
+
#include "gtk/toolbar_items.h"
+
+#undef TOOLBAR_ITEM_t
#undef TOOLBAR_ITEM_y
#undef TOOLBAR_ITEM_n
#undef TOOLBAR_ITEM
diff --git a/frontends/gtk/toolbar_items.h b/frontends/gtk/toolbar_items.h
index df7347a..b4bed37 100644
--- a/frontends/gtk/toolbar_items.h
+++ b/frontends/gtk/toolbar_items.h
@@ -23,11 +23,13 @@ typedef enum {
BACK_BUTTON = 0,
HISTORY_BUTTON,
FORWARD_BUTTON,
+ RELOADSTOP_BUTTON,
+ URL_BAR_ITEM,
+ WEBSEARCH_ITEM,
+ OPENMENU_BUTTON,
STOP_BUTTON,
RELOAD_BUTTON,
HOME_BUTTON,
- URL_BAR_ITEM,
- WEBSEARCH_ITEM,
THROBBER_ITEM,
NEWWINDOW_BUTTON,
NEWTAB_BUTTON,
@@ -71,9 +73,7 @@ typedef enum {
GUIDE_BUTTON,
INFO_BUTTON,
ABOUT_BUTTON,
- OPENMENU_BUTTON,
CUSTOMIZE_BUTTON,
- RELOADSTOP_BUTTON,
PLACEHOLDER_BUTTON /* size indicator; array maximum indices */
} nsgtk_toolbar_button; /* PLACEHOLDER_BUTTON - 1 */
@@ -85,9 +85,10 @@ typedef enum {
* - name (identifier)
* - initial sensitivity (true/false)
* - if there is a toolbar click signal handler (y/n) and it is available in
- * the toolbar as a button (b, implies y)
+ * the toolbar and toolbox as a button (b, implies y) if the item is
+ * available as a button but not placed in the toolbox (t, implies y)
* - if there is a menu activate signal handler (y/n) and it calls the
- toolbar click handler directly. (p, implies y)
+ * toolbar click handler directly. (p, implies y)
* - item label as a netsurf message (identifier)
* - icon image name ("string")
*/
@@ -100,8 +101,8 @@ typedef enum {
TOOLBAR_ITEM(BACK_BUTTON, back, false, b, p, gtkBack, "go-previous")
TOOLBAR_ITEM(HISTORY_BUTTON, history, true, y, n, , "local-history")
TOOLBAR_ITEM(FORWARD_BUTTON, forward, false, b, p, gtkForward, "go-next")
-TOOLBAR_ITEM(STOP_BUTTON, stop, false, b, p, gtkStop, NSGTK_STOCK_STOP)
-TOOLBAR_ITEM(RELOAD_BUTTON, reload, true, b, p, Reload, NSGTK_STOCK_REFRESH)
+TOOLBAR_ITEM(STOP_BUTTON, stop, false, t, p, gtkStop, NSGTK_STOCK_STOP)
+TOOLBAR_ITEM(RELOAD_BUTTON, reload, true, t, p, Reload, NSGTK_STOCK_REFRESH)
TOOLBAR_ITEM(HOME_BUTTON, home, true, b, p, gtkHome, NSGTK_STOCK_HOME)
TOOLBAR_ITEM(URL_BAR_ITEM, url_bar, true, n, n, , NULL)
TOOLBAR_ITEM(WEBSEARCH_ITEM, websearch, true, n, n, , NULL)
-----------------------------------------------------------------------
Summary of changes:
frontends/gtk/toolbar.c | 199 +++++++++++++++++++++++++++--------------
frontends/gtk/toolbar_items.h | 17 ++--
2 files changed, 142 insertions(+), 74 deletions(-)
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index 007a8fe..243c0ce 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -221,8 +221,6 @@ struct nsgtk_toolbar_customisation {
};
-static bool edit_mode = false;
-
/* forward declaration */
static nserror toolbar_item_create(nsgtk_toolbar_button id,
struct nsgtk_toolbar_item *item_out);
@@ -262,7 +260,7 @@ static char *remove_underscores(const char *s, bool
replacespace)
* create a gtk entry widget with a completion attached
*/
static GtkToolItem *
-make_toolbar_item_throbber(bool sensitivity)
+make_toolbar_item_throbber(bool sensitivity, bool edit)
{
nserror res;
GtkToolItem *item;
@@ -274,7 +272,7 @@ make_toolbar_item_throbber(bool sensitivity)
return NULL;
}
- if (edit_mode) {
+ if (edit) {
const char *msg;
msg = messages_get("ToolThrob");
item = gtk_tool_button_new(
@@ -305,7 +303,7 @@ make_toolbar_item_throbber(bool sensitivity)
* create a gtk entry widget with a completion attached
*/
static GtkToolItem *
-make_toolbar_item_url_bar(bool sensitivity)
+make_toolbar_item_url_bar(bool sensitivity, bool edit)
{
GtkToolItem *item;
GtkWidget *entry;
@@ -317,7 +315,7 @@ make_toolbar_item_url_bar(bool sensitivity)
return NULL;
}
- if (edit_mode) {
+ if (edit) {
gtk_entry_set_width_chars(GTK_ENTRY(entry), 9);
item = gtk_tool_button_new(NULL, "URL");
@@ -348,7 +346,7 @@ make_toolbar_item_url_bar(bool sensitivity)
* create web search toolbar item widget
*/
static GtkToolItem *
-make_toolbar_item_websearch(bool sensitivity)
+make_toolbar_item_websearch(bool sensitivity, bool edit)
{
GtkToolItem *item;
nserror res;
@@ -378,7 +376,7 @@ make_toolbar_item_websearch(bool sensitivity)
NSGTK_STOCK_INFO);
}
- if (edit_mode) {
+ if (edit) {
gtk_entry_set_width_chars(GTK_ENTRY(entry), 9);
item = gtk_tool_button_new(NULL, "Web Search");
@@ -405,13 +403,13 @@ make_toolbar_item_websearch(bool sensitivity)
* create local history toolbar item widget
*/
static GtkToolItem *
-make_toolbar_item_history(bool sensitivity)
+make_toolbar_item_history(bool sensitivity, bool edit)
{
GtkToolItem *item;
const char *msg = "H";
char *label = NULL;
- if (edit_mode) {
+ if (edit) {
msg = messages_get("gtkLocalHistory");
}
label = remove_underscores(msg, false);
@@ -435,7 +433,8 @@ make_toolbar_item_history(bool sensitivity)
static GtkToolItem *
make_toolbar_item_button(const char *labelmsg,
const char *iconname,
- bool sensitivity)
+ bool sensitivity,
+ bool edit)
{
GtkToolItem *item;
char *label = NULL;
@@ -451,7 +450,7 @@ make_toolbar_item_button(const char *labelmsg,
gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), iconname);
gtk_widget_set_sensitive(GTK_WIDGET(item), sensitivity);
- if (edit_mode) {
+ if (edit) {
nsgtk_widget_set_margins(GTK_WIDGET(item), 0, 0);
}
}
@@ -468,42 +467,46 @@ make_toolbar_item_button(const char *labelmsg,
* \return gtk widget
*/
static GtkToolItem *
-make_toolbar_item(nsgtk_toolbar_button itemid,
- bool sensitivity)
+make_toolbar_item(nsgtk_toolbar_button itemid, bool sensitivity)
{
GtkToolItem *toolitem = NULL;
switch(itemid) {
#define TOOLBAR_ITEM_y(identifier, label, iconame)
#define TOOLBAR_ITEM_n(identifier, label, iconame)
+#define TOOLBAR_ITEM_t(identifier, label, iconame) \
+ case identifier: \
+ toolitem = make_toolbar_item_button(#label, iconame,
sensitivity, false); \
+ break;
#define TOOLBAR_ITEM_b(identifier, label, iconame) \
case identifier: \
- toolitem = make_toolbar_item_button(#label, iconame,
sensitivity);\
+ toolitem = make_toolbar_item_button(#label, iconame,
sensitivity, false); \
break;
#define TOOLBAR_ITEM(identifier, name, snstvty, clicked, activate, label,
iconame) \
TOOLBAR_ITEM_ ## clicked(identifier, label, iconame)
#include "gtk/toolbar_items.h"
+#undef TOOLBAR_ITEM_t
#undef TOOLBAR_ITEM_b
#undef TOOLBAR_ITEM_n
#undef TOOLBAR_ITEM_y
#undef TOOLBAR_ITEM
case HISTORY_BUTTON:
- toolitem = make_toolbar_item_history(sensitivity);
+ toolitem = make_toolbar_item_history(sensitivity, false);
break;
case URL_BAR_ITEM:
- toolitem = make_toolbar_item_url_bar(sensitivity);
+ toolitem = make_toolbar_item_url_bar(sensitivity, false);
break;
case THROBBER_ITEM:
- toolitem = make_toolbar_item_throbber(sensitivity);
+ toolitem = make_toolbar_item_throbber(sensitivity, false);
break;
case WEBSEARCH_ITEM:
- toolitem = make_toolbar_item_websearch(sensitivity);
+ toolitem = make_toolbar_item_websearch(sensitivity, false);
break;
default:
@@ -513,6 +516,61 @@ make_toolbar_item(nsgtk_toolbar_button itemid,
return toolitem;
}
+
+/**
+ * widget factory for creation of toolbar item widgets for the toolbox
+ *
+ * \param itemid the id of the widget
+ * \return gtk tool item widget
+ */
+static GtkToolItem *
+make_toolbox_item(nsgtk_toolbar_button itemid)
+{
+ GtkToolItem *toolitem = NULL;
+
+ switch(itemid) {
+#define TOOLBAR_ITEM_y(identifier, label, iconame)
+#define TOOLBAR_ITEM_n(identifier, label, iconame)
+#define TOOLBAR_ITEM_t(identifier, label, iconame)
+#define TOOLBAR_ITEM_b(identifier, label, iconame) \
+ case identifier: \
+ toolitem = make_toolbar_item_button(#label, iconame, true,
true); \
+ break;
+#define TOOLBAR_ITEM(identifier, name, snstvty, clicked, activate, label,
iconame) \
+ TOOLBAR_ITEM_ ## clicked(identifier, label, iconame)
+
+#include "gtk/toolbar_items.h"
+
+#undef TOOLBAR_ITEM_t
+#undef TOOLBAR_ITEM_b
+#undef TOOLBAR_ITEM_n
+#undef TOOLBAR_ITEM_y
+#undef TOOLBAR_ITEM
+
+ case HISTORY_BUTTON:
+ toolitem = make_toolbar_item_history(true, true);
+ break;
+
+ case URL_BAR_ITEM:
+ toolitem = make_toolbar_item_url_bar(false, true);
+ break;
+
+ case THROBBER_ITEM:
+ toolitem = make_toolbar_item_throbber(true, true);
+ break;
+
+ case WEBSEARCH_ITEM:
+ toolitem = make_toolbar_item_websearch(false, true);
+ break;
+
+ default:
+ break;
+
+ }
+ return toolitem;
+}
+
+
/**
* target entry for drag source
*/
@@ -753,10 +811,7 @@ customisation_toolbar_drag_drop_cb(GtkWidget *widget,
}
- edit_mode = true;
- dragitem->button = make_toolbar_item(tbc->dragitem,
- tbc->toolbar.items[tbc->dragitem].sensitivity);
- edit_mode = false;
+ dragitem->button = make_toolbox_item(tbc->dragitem);
if (dragitem->button == NULL) {
nsgtk_warning("NoMemory", 0);
@@ -887,8 +942,6 @@ nsgtk_browser_window_create(struct browser_window *bw, bool
intab)
}
-
-
/**
* Apply the user toolbar button settings from configuration
*
@@ -954,51 +1007,62 @@ apply_user_button_customisation(struct nsgtk_toolbar *tb)
/**
- * append item to gtk toolbar container
+ * callback function to remove a widget from a container
+ */
+static void container_remove_widget(GtkWidget *widget, gpointer data)
+{
+ GtkContainer *container = GTK_CONTAINER(data);
+ gtk_container_remove(container, widget);
+}
+
+
+/**
+ * populates a toolbar with widgets in correct order
*
* \param tb toolbar
- * \param theme in use
- * \param location item location being appended
* \return NSERROR_OK on success else error code.
*/
-static nserror
-add_item_to_toolbar(struct nsgtk_toolbar *tb, int location)
+static nserror populate_gtk_toolbar_widget(struct nsgtk_toolbar *tb)
{
- int bidx; /* button index */
-
- for (bidx = BACK_BUTTON; bidx < PLACEHOLDER_BUTTON; bidx++) {
-
- if (tb->items[bidx].location == location) {
+ int location; /* location index */
+ int itemid;
- tb->items[bidx].button = make_toolbar_item(
- bidx, tb->items[bidx].sensitivity);
+ /* clear the toolbar container of all widgets */
+ gtk_container_foreach(GTK_CONTAINER(tb->widget),
+ container_remove_widget,
+ tb->widget);
- gtk_toolbar_insert(tb->widget,
- tb->items[bidx].button,
- location);
+ /* add widgets to toolbar */
+ for (location = 0; location < PLACEHOLDER_BUTTON; location++) {
+ itemid = itemid_from_location(tb, location);
+ if (itemid == PLACEHOLDER_BUTTON) {
break;
}
+ tb->items[location].button =
+ make_toolbar_item(location,
+ tb->items[location].sensitivity);
+
+ gtk_toolbar_insert(tb->widget,
+ tb->items[location].button,
+ location);
}
- return NSERROR_OK;
-}
+ gtk_widget_show_all(GTK_WIDGET(tb->widget));
-/**
- * callback function to remove a widget from a container
- */
-static void container_remove_widget(GtkWidget *widget, gpointer data)
-{
- GtkContainer *container = GTK_CONTAINER(data);
- gtk_container_remove(container, widget);
+ return NSERROR_OK;
}
/**
- * populates the gtk toolbar container with widgets in correct order
+ * populates the customization toolbar with widgets in correct order
+ *
+ * \param tb toolbar
+ * \return NSERROR_OK on success else error code.
*/
-static nserror populate_gtk_toolbar_widget(struct nsgtk_toolbar *tb)
+static nserror customisation_toolbar_populate(struct nsgtk_toolbar *tb)
{
- int lidx; /* location index */
+ int location; /* location index */
+ int itemid;
/* clear the toolbar container of all widgets */
gtk_container_foreach(GTK_CONTAINER(tb->widget),
@@ -1006,8 +1070,16 @@ static nserror populate_gtk_toolbar_widget(struct
nsgtk_toolbar *tb)
tb->widget);
/* add widgets to toolbar */
- for (lidx = 0; lidx < PLACEHOLDER_BUTTON; lidx++) {
- add_item_to_toolbar(tb, lidx);
+ for (location = 0; location < PLACEHOLDER_BUTTON; location++) {
+ itemid = itemid_from_location(tb, location);
+ if (itemid == PLACEHOLDER_BUTTON) {
+ break;
+ }
+ tb->items[location].button = make_toolbox_item(location);
+
+ gtk_toolbar_insert(tb->widget,
+ tb->items[location].button,
+ location);
}
gtk_widget_show_all(GTK_WIDGET(tb->widget));
@@ -1344,7 +1416,6 @@ toolbar_customisation_create_toolbox(struct
nsgtk_toolbar_customisation *tbc,
columns = NSGTK_MIN_STORE_COLUMNS;
}
- edit_mode = true;
curcol = 0;
for (iidx = startidx = BACK_BUTTON; iidx < PLACEHOLDER_BUTTON; iidx++) {
if (curcol >= columns) {
@@ -1352,8 +1423,7 @@ toolbar_customisation_create_toolbox(struct
nsgtk_toolbar_customisation *tbc,
curcol = 0;
startidx = iidx;
}
- tbc->items[iidx] = make_toolbar_item(iidx,
- tbc->toolbar.items[iidx].sensitivity);
+ tbc->items[iidx] = make_toolbox_item(iidx);
if (tbc->items[iidx] != NULL) {
curcol++;
}
@@ -1361,7 +1431,6 @@ toolbar_customisation_create_toolbox(struct
nsgtk_toolbar_customisation *tbc,
if (curcol > 0) {
add_toolbox_row(tbc, startidx, iidx);
}
- edit_mode = false;
return NSERROR_OK;
}
@@ -1381,12 +1450,10 @@ customisation_toolbar_update(struct
nsgtk_toolbar_customisation *tbc)
}
/* populate toolbar widget */
- edit_mode = true;
- res = populate_gtk_toolbar_widget(&tbc->toolbar);
+ res = customisation_toolbar_populate(&tbc->toolbar);
if (res != NSERROR_OK) {
return res;
}
- edit_mode = false;
/* ensure icon sizes and text labels on toolbar are set */
res = nsgtk_toolbar_restyle(&tbc->toolbar);
@@ -1524,11 +1591,6 @@ static gboolean cutomize_button_clicked_cb(GtkWidget
*widget, gpointer data)
if (res != NSERROR_OK) {
goto cutomize_button_clicked_cb_error;
}
- if ((iidx == URL_BAR_ITEM) || (iidx == WEBSEARCH_ITEM)) {
- tbc->toolbar.items[iidx].sensitivity = false;
- } else {
- tbc->toolbar.items[iidx].sensitivity = true;
- }
}
res = customisation_toolbar_update(tbc);
@@ -3084,6 +3146,8 @@ toolbar_item_create(nsgtk_toolbar_button id, struct
nsgtk_toolbar_item *item)
/* set item defaults from macro */
switch (id) {
+#define TOOLBAR_ITEM_t(name) \
+ item->clicked = name##_button_clicked_cb;
#define TOOLBAR_ITEM_b(name) \
item->clicked = name##_button_clicked_cb;
#define TOOLBAR_ITEM_y(name) \
@@ -3098,7 +3162,10 @@ toolbar_item_create(nsgtk_toolbar_button id, struct
nsgtk_toolbar_item *item)
item->dataminus = nsgtk_toolbar_##iname##_data_minus; \
TOOLBAR_ITEM_ ## clicked(iname) \
break;
+
#include "gtk/toolbar_items.h"
+
+#undef TOOLBAR_ITEM_t
#undef TOOLBAR_ITEM_y
#undef TOOLBAR_ITEM_n
#undef TOOLBAR_ITEM
diff --git a/frontends/gtk/toolbar_items.h b/frontends/gtk/toolbar_items.h
index df7347a..b4bed37 100644
--- a/frontends/gtk/toolbar_items.h
+++ b/frontends/gtk/toolbar_items.h
@@ -23,11 +23,13 @@ typedef enum {
BACK_BUTTON = 0,
HISTORY_BUTTON,
FORWARD_BUTTON,
+ RELOADSTOP_BUTTON,
+ URL_BAR_ITEM,
+ WEBSEARCH_ITEM,
+ OPENMENU_BUTTON,
STOP_BUTTON,
RELOAD_BUTTON,
HOME_BUTTON,
- URL_BAR_ITEM,
- WEBSEARCH_ITEM,
THROBBER_ITEM,
NEWWINDOW_BUTTON,
NEWTAB_BUTTON,
@@ -71,9 +73,7 @@ typedef enum {
GUIDE_BUTTON,
INFO_BUTTON,
ABOUT_BUTTON,
- OPENMENU_BUTTON,
CUSTOMIZE_BUTTON,
- RELOADSTOP_BUTTON,
PLACEHOLDER_BUTTON /* size indicator; array maximum indices */
} nsgtk_toolbar_button; /* PLACEHOLDER_BUTTON - 1 */
@@ -85,9 +85,10 @@ typedef enum {
* - name (identifier)
* - initial sensitivity (true/false)
* - if there is a toolbar click signal handler (y/n) and it is available in
- * the toolbar as a button (b, implies y)
+ * the toolbar and toolbox as a button (b, implies y) if the item is
+ * available as a button but not placed in the toolbox (t, implies y)
* - if there is a menu activate signal handler (y/n) and it calls the
- toolbar click handler directly. (p, implies y)
+ * toolbar click handler directly. (p, implies y)
* - item label as a netsurf message (identifier)
* - icon image name ("string")
*/
@@ -100,8 +101,8 @@ typedef enum {
TOOLBAR_ITEM(BACK_BUTTON, back, false, b, p, gtkBack, "go-previous")
TOOLBAR_ITEM(HISTORY_BUTTON, history, true, y, n, , "local-history")
TOOLBAR_ITEM(FORWARD_BUTTON, forward, false, b, p, gtkForward, "go-next")
-TOOLBAR_ITEM(STOP_BUTTON, stop, false, b, p, gtkStop, NSGTK_STOCK_STOP)
-TOOLBAR_ITEM(RELOAD_BUTTON, reload, true, b, p, Reload, NSGTK_STOCK_REFRESH)
+TOOLBAR_ITEM(STOP_BUTTON, stop, false, t, p, gtkStop, NSGTK_STOCK_STOP)
+TOOLBAR_ITEM(RELOAD_BUTTON, reload, true, t, p, Reload, NSGTK_STOCK_REFRESH)
TOOLBAR_ITEM(HOME_BUTTON, home, true, b, p, gtkHome, NSGTK_STOCK_HOME)
TOOLBAR_ITEM(URL_BAR_ITEM, url_bar, true, n, n, , NULL)
TOOLBAR_ITEM(WEBSEARCH_ITEM, websearch, true, n, n, , NULL)
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
