diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml | 2 | ||||
| -rwxr-xr-x | lib/egg/egg-editable-toolbar.c | 3 | ||||
| -rw-r--r-- | lib/ephy-stock-icons.c | 2 | ||||
| -rw-r--r-- | lib/ephy-stock-icons.h | 2 |
5 files changed, 16 insertions, 7 deletions
@@ -1,5 +1,19 @@ 2006-12-19 Luca Ferretti <elle.uca@libero.it> + * data/ui/epiphany-ui.xml: + + Invert MoveToolItem and RemoveToolItem order, matchingh + same feature for panel applets. + + * lib/egg/egg-editable-toolbar.c: + (egg_editable_toolbar_set_ui_manager): + * lib/ephy-stock-icons.c: (ephy_stock_icons_init): + * lib/ephy-stock-icons.h: + + Remove STOCK_DRAG_MODE and STOCK_VIEW_SOURCE. + +2006-12-19 Luca Ferretti <elle.uca@libero.it> + * data/icons/16x16/actions/Makefile.am: * data/icons/16x16/actions/location-entry.png: * data/icons/22x22/actions/Makefile.am: diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml index 001c034ae..2508a3371 100644 --- a/data/ui/epiphany-ui.xml +++ b/data/ui/epiphany-ui.xml @@ -178,8 +178,8 @@ <placeholder name="SpecificItemsGroup"> </placeholder> <separator/> - <menuitem action="MoveToolItem"/> <menuitem action="RemoveToolItem"/> + <menuitem action="MoveToolItem"/> <separator/> <menuitem action="RemoveToolbar"/> <separator/> diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index 4e74c4d25..19ca1d8c7 100755 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -52,7 +52,6 @@ static void egg_editable_toolbar_init (EggEditableToolbar *etoolbar); #define MIN_TOOLBAR_HEIGHT 20 #define EGG_ITEM_NAME "egg-item-name" -#define STOCK_DRAG_MODE "stock_drag-mode" static const GtkTargetEntry dest_drag_types[] = { {EGG_TOOLBAR_ITEM_TYPE, GTK_TARGET_SAME_APP, 0}, @@ -1362,7 +1361,7 @@ egg_editable_toolbar_set_ui_manager (EggEditableToolbar *etoolbar, GtkUIManager *manager) { static const GtkActionEntry actions[] = { - { "MoveToolItem", STOCK_DRAG_MODE, N_("_Move on Toolbar"), NULL, + { "MoveToolItem", NULL, N_("_Move on Toolbar"), NULL, N_("Move the selected item on the toolbar"), G_CALLBACK (move_item_cb) }, { "RemoveToolItem", GTK_STOCK_REMOVE, N_("_Remove from Toolbar"), NULL, N_("Remove the selected item from the toolbar"), G_CALLBACK (remove_item_cb) }, diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c index 4ff277153..57faf72f1 100644 --- a/lib/ephy-stock-icons.c +++ b/lib/ephy-stock-icons.c @@ -41,7 +41,6 @@ ephy_stock_icons_init (void) { STOCK_NEW_TAB, STOCK_NEW_WINDOW, - STOCK_VIEW_SOURCE, STOCK_SEND_MAIL, STOCK_ADD_BOOKMARK, STOCK_BOOKMARK, @@ -49,7 +48,6 @@ ephy_stock_icons_init (void) STOCK_LOCK_INSECURE, STOCK_LOCK_SECURE, STOCK_LOCK_BROKEN, - STOCK_DRAG_MODE, }; static const GtkStockItem items[] = diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h index 220048ca8..030ad1dc9 100644 --- a/lib/ephy-stock-icons.h +++ b/lib/ephy-stock-icons.h @@ -33,7 +33,6 @@ G_BEGIN_DECLS #define STOCK_NEW_TAB "tab-new" #define STOCK_NEW_WINDOW "window-new" -#define STOCK_VIEW_SOURCE "text-html" #define STOCK_SEND_MAIL "mail-forward" #define STOCK_ADD_BOOKMARK "bookmark-new" #define STOCK_BOOKMARK "stock_bookmark" @@ -41,7 +40,6 @@ G_BEGIN_DECLS #define STOCK_LOCK_INSECURE "stock_lock-open" #define STOCK_LOCK_SECURE "stock_lock" #define STOCK_LOCK_BROKEN "stock_lock-broken" -#define STOCK_DRAG_MODE "stock_drag-mode" void ephy_stock_icons_init (void); |