diff options
| -rw-r--r-- | TODO | 52 | ||||
| -rw-r--r-- | data/ui/epiphany-bookmark-editor-ui.xml.in | 56 | ||||
| -rw-r--r-- | data/ui/epiphany-history-window-ui.xml.in | 40 | ||||
| -rw-r--r-- | data/ui/epiphany-toolbar.xml.in | 46 | ||||
| -rw-r--r-- | data/ui/epiphany-ui.xml.in | 159 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmark-properties.c | 2 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 2 |
7 files changed, 4 insertions, 353 deletions
@@ -1,50 +1,2 @@ -1.0 FIXES - -1. download-view.c: (download_dialog_delete_cb) -This is the canel all pending downloads dialog. It should be document -modal (or in this case technically window modal) but not app modal. - -2. ephy-embed-utils.c: (ephy_embed_utils_nohandler_dialog_run): -A dialog to warn the user that no application capable to open the -specified file are found. Should probably be tab modal or window -modal, not app modal (it uses both gtk_dialog_run and sets the modal -window hint, both are bad). - -3. ephy-gui.c (ephy_gui_confirm_overwrite_file): -This dialog should be modal to its parent file selector dialog but not -to the epiphany application. It uses both gtk_dialog_run and sets the -modal window hint. also it should be an ok cancel, not yes no dialog. - -4. ephy-nautilus-view.c (gnv_cmd_file_print): -Creates a modal print dialog, although it doesn't really matter -because of the embedding inside of nautiuls. - -5. pdm-dialog.c (show_cookies_properties): -Uses gtk_dialog_run. Should instead keep a hash table creating a -one-to-one relationship between a property window and its cookies and -these dialogs should be destroyed with their parent pdm and not be modal. - -6. prefs-dialog.c (prefs_language_more_button_clicked_cb): -More languages dialog, I'm not sure why its modal. given the new ephy -prefs layout this could be directly integrated into the prefs window. -At the very least there is no reason for it to be modal. - -1. when you hit tab while viewing a page, mozilla goes through all the -links in the page (which is good), but when it gets to the end it doesn't -tab back up to the first toolbar. - -2. right/down arrow while keyboard focus is on the button of a -smartbookmark should probably give focus to the text entry to be consistent -with the arrow behavior of other actions. - -3. tabbing out of the text entry of a smart bookmark should give focus to -the next bookmarks bar toolbar item. - -4. Using the default toolbar layout, it is impossible to give focus to the -address entry by tabbing from the toolbar 1 to toolbar 2 because the -favicon can't be focused. - -5. tabing out of the address entry should give focus to the next toolbar -item (go button in default layout). - -6. in arrow buttons, arrow keys should move in between the icon and the arrow. +- Make location address an action property so that it's not lost +when recreating the proxy (exiting fullscreen and toolbar editing) diff --git a/data/ui/epiphany-bookmark-editor-ui.xml.in b/data/ui/epiphany-bookmark-editor-ui.xml.in deleted file mode 100644 index 449229660..000000000 --- a/data/ui/epiphany-bookmark-editor-ui.xml.in +++ /dev/null @@ -1,56 +0,0 @@ -<ui> -<menubar> - -<menu name="FileMenu" action="File"> - <menuitem name="FileNewTopic" action="NewTopic"/> - <separator name="FileSep1"/> - <menuitem name="FileOpenInWindow" action="OpenInWindow"/> - <menuitem name="FileOpenInTab" action="OpenInTab"/> - <separator name="FileSep2"/> - <menuitem name="FileRename" action="Rename"/> - <menuitem name="FileDelete" action="Delete"/> - <separator name="FileSep3"/> - <menuitem name="FileShowInBookmarksBar" action="ShowInBookmarksBar"/> - <menuitem name="FileProperties" action="Properties"/> - <separator name="FileSep4"/> - <menuitem name="FileImport" action="Import"/> - <separator name="FileSep5"/> - <menuitem name="FileClose" action="Close"/> -</menu> - -<menu name="EditMenu" action="Edit"> - <menuitem name="EditCut" action="Cut"/> - <menuitem name="EditCopy" action="Copy"/> - <menuitem name="EditPaste" action="Paste"/> - <menuitem name="EditSelectAll" action="SelectAll"/> -</menu> - -<menu name="HelpMenu" action="Help"> - <menuitem name="HelpContents" action="HelpContents"/> - <menuitem name="HelpAbout" action="HelpAbout"/> -</menu> - -</menubar> - -<popup name="EphyBookmarkEditorPopup" action="PopupAction"> - <menuitem name="OpenInWindowBMK" action="OpenInWindow"/> - <menuitem name="OpenInTabBMK" action="OpenInTab"/> - <separator name="BookmarksPopupSep1"/> - <menuitem name="CopyBMK" action="Copy"/> - <separator name="BookmarksPopupSep2"/> - <menuitem name="RenameBMK" action="Rename"/> - <menuitem name="DeleteBMK" action="Delete"/> - <separator name="BookmarksPopupSep3"/> - <menuitem name="ShowInBookmarksBarBMK" action="ShowInBookmarksBar"/> - <separator name="BookmarksPopupSep4"/> - <menuitem name="BMKProperties" action="Properties"/> -</popup> - -<popup name="EphyBookmarkKeywordPopup" action="PopupAction"> - <menuitem name="RenameTPC" action="Rename"/> - <menuitem name="DeleteTPC" action="Delete"/> - <separator name="TopicPopupSep3"/> - <menuitem name="ShowInBookmarksBarTPC" action="ShowInBookmarksBar"/> -</popup> - -</ui> diff --git a/data/ui/epiphany-history-window-ui.xml.in b/data/ui/epiphany-history-window-ui.xml.in deleted file mode 100644 index 1d977b092..000000000 --- a/data/ui/epiphany-history-window-ui.xml.in +++ /dev/null @@ -1,40 +0,0 @@ -<ui> -<menubar> - -<menu name="FileMenu" action="File"> - <menuitem name="FileOpenInWindow" action="OpenInWindow"/> - <menuitem name="FileOpenInTab" action="OpenInTab"/> - <separator name="FileSep1"/> - <menuitem name="FileBookmarkLink" action="BookmarkLink"/> - <menuitem name="FileDelete" action="Delete"/> - <separator name="FileSep2"/> - <menuitem name="FileClose" action="Close"/> -</menu> - -<menu name="EditMenu" action="Edit"> - <menuitem name="EditCut" action="Cut"/> - <menuitem name="EditCopy" action="Copy"/> - <menuitem name="EditPaste" action="Paste"/> - <menuitem name="EditSelectAll" action="SelectAll"/> - <separator name="EditSep1"/> - <menuitem name="EditClear" action="Clear"/> -</menu> - -<menu name="HelpMenu" action="Help"> - <menuitem name="HelpContents" action="HelpContents"/> - <menuitem name="HelpAbout" action="HelpAbout"/> -</menu> - -</menubar> - -<popup name="EphyHistoryWindowPopup" action="PopupAction"> - <menuitem name="OpenInWindowHST" action="OpenInWindow"/> - <menuitem name="OpenInTabHST" action="OpenInTab"/> - <separator name="HistoryPopupSep1"/> - <menuitem name="CopyHST" action="Copy"/> - <separator name="HistoryPopupSep2"/> - <menuitem name="BookmarkLinkHST" action="BookmarkLink"/> - <menuitem name="DeleteHST" action="Delete"/> -</popup> - -</ui> diff --git a/data/ui/epiphany-toolbar.xml.in b/data/ui/epiphany-toolbar.xml.in deleted file mode 100644 index 6accae2fb..000000000 --- a/data/ui/epiphany-toolbar.xml.in +++ /dev/null @@ -1,46 +0,0 @@ -<editabletoolbar> -<available> - <toolitem name="NavigationBack"/> - <toolitem name="NavigationForward"/> - <toolitem name="NavigationUp"/> - <toolitem name="ViewStop"/> - <toolitem name="ViewReload"/> - <toolitem name="GoHome"/> - <toolitem name="GoHistory"/> - <toolitem name="GoBookmarks"/> - <toolitem name="FileNewTab"/> - <toolitem name="FileNewWindow"/> - <toolitem name="FileOpen"/> - <toolitem name="FileSaveAs"/> - <toolitem name="FilePrint"/> - <toolitem name="FileBookmarkPage"/> - <toolitem name="ViewFullscreen"/> - <toolitem name="EditFind"/> - <toolitem name="Favicon"/> - <toolitem name="Location"/> - <toolitem name="Spinner"/> - <toolitem name="ToolbarGo"/> - <toolitem name="Zoom"/> -</available> -<toolbar name="DefaultToolbar"> - <toolitem name="NavigationBack"/> - <toolitem name="NavigationForward"/> - <toolitem name="ViewStop"/> - <toolitem name="ViewReload"/> - <separator/> - <toolitem name="GoHome"/> - <toolitem name="GoHistory"/> - <toolitem name="GoBookmarks"/> - <separator/> - <toolitem name="EditFind"/> - <toolitem name="Spinner"/> -</toolbar> -<toolbar name="EntryToolbar"> - <toolitem name="Favicon"/> - <toolitem name="Location"/> - <toolitem name="ToolbarGo"/> -</toolbar> -<toolbar name="BookmarksBar"> -</toolbar> -</editabletoolbar> - diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in deleted file mode 100644 index d4fbb636a..000000000 --- a/data/ui/epiphany-ui.xml.in +++ /dev/null @@ -1,159 +0,0 @@ -<ui> -<menubar> -<menu name="FileMenu" action="File"> - <menuitem name="FileNewWindowMenu" action="FileNewWindow"/> - <menuitem name="FileNewTabMenu" action="FileNewTab"/> - <menuitem name="FileOpenMenu" action="FileOpen"/> - <separator name="FileSep1"/> - <menuitem name="FileSaveAsMenu" action="FileSaveAs"/> - <separator name="FileSep2"/> - <menuitem name="FilePrintMenu" action="FilePrint"/> - <menuitem name="FileSendToMenu" action="FileSendTo"/> - <separator name="FileSep3"/> - <menuitem name="FileCloseWindowMenu" action="FileCloseWindow"/> -</menu> - -<menu name="EditMenu" action="Edit"> - <menuitem name="EditCutMenu" action="EditCut"/> - <menuitem name="EditCopyMenu" action="EditCopy"/> - <menuitem name="EditPasteMenu" action="EditPaste"/> - <separator name="EditSep1"/> - <menuitem name="EditSelectAllMenu" action="EditSelectAll"/> - <separator name="EditSep2"/> - <menuitem name="EditFindMenu" action="EditFind"/> - <menuitem name="EditFindNextMenu" action="EditFindNext"/> - <menuitem name="EditFindPrevMenu" action="EditFindPrev"/> - <separator name="EditSep3"/> - <menuitem name="EditPersonalDataMenu" action="EditPersonalData"/> - <menuitem name="EditToolbarMenu" action="EditToolbar"/> - <menuitem name="EditPrefsMenu" action="EditPrefs"/> -</menu> - -<menu name="ViewMenu" action="View"> - <menuitem name="ViewToolbarMenu" action="ViewToolbar"/> - <menuitem name="ViewBookmarksBarMenu" action="ViewBookmarksBar"/> - <menuitem name="ViewStatusbarMenu" action="ViewStatusbar"/> - <menuitem name="ViewFullscreenMenu" action="ViewFullscreen"/> - <separator name="ViewSep1"/> - <menuitem name="ViewZoomInMenu" action="ViewZoomIn"/> - <menuitem name="ViewZoomOutMenu" action="ViewZoomOut"/> - <menuitem name="ViewZoomNormalMenu" action="ViewZoomNormal"/> - <separator name="ViewSep2"/> - <placeholder name="ViewEncodingsPlaceholder"/> - <menuitem name="ViewPageSourceMenu" action="ViewPageSource"/> - <separator name="ViewSep3"/> - <menuitem name="ViewStopMenu" action="ViewStop"/> - <menuitem name="ViewReloadMenu" action="ViewReload"/> -</menu> - -<menu name="GoMenu" action="Go"> - <menuitem name="GoBackMenu" action="GoBack"/> - <menuitem name="GoForwardMenu" action="GoForward"/> - <menuitem name="GoUpMenu" action="GoUp"/> - <separator name="GoSep1"/> - <menuitem name="GoHomeMenu" action="GoHome"/> - <menuitem name="GoHistoryMenu" action="GoHistory"/> - <separator name="GoSep2"/> - <menuitem name="GoLocationMenu" action="GoLocation"/> - <separator name="GoSep3"/> -</menu> - -<menu name="BookmarksMenu" action="Bookmarks"> - <menuitem name="BookmarksAddBookmarkMenu" action="FileBookmarkPage"/> - <menuitem name="BookmarksEditMenu" action="GoBookmarks"/> - <separator name="BookmarksSep1"/> -</menu> - -<menu name="TabsMenu" action="Tabs"> - <menuitem name="TabsPreviousMenu" action="TabsPrevious"/> - <menuitem name="TabsNextMenu" action="TabsNext"/> - <separator name="TabsSep1"/> - <menuitem name="TabsMoveLeftMenu" action="TabsMoveLeft"/> - <menuitem name="TabsMoveRightMenu" action="TabsMoveRight"/> - <menuitem name="TabsDetachMenu" action="TabsDetach"/> - <placeholder name="TabsOpen"> - <separator name="TabsSep2"/> - </placeholder> -</menu> - -<menu name="HelpMenu" action="Help"> - <menuitem name="HelpContentsMenu" action="HelpContents"/> - <menuitem name="HelpAboutMenu" action="HelpAbout"/> -</menu> -</menubar> - -<popup name="EphyInputPopup" action="PopupAction"> - <menuitem name="EditCutIP" action="EditCut"/> - <menuitem name="EditCopyIP" action="EditCopy"/> - <menuitem name="EditPasteIP" action="EditPaste"/> -</popup> -<popup name="EphyTextPopup" action="PopupAction"> - <menuitem name="EditCopyTP" action="EditCopy"/> -</popup> -<popup name="EphyDocumentPopup" action="PopupAction"> - <menuitem name="GoBackDP" action="GoBack"/> - <menuitem name="GoForwardDP" action="GoForward"/> - <menuitem name="GoReloadDP" action="ViewReload"/> - <separator name="DPSep1"/> - <menuitem name="EditCopyDP" action="EditCopy"/> - <separator name="DPSep2"/> - <menuitem name="SavePageAsDP" action="FileSaveAs"/> - <menuitem name="SaveBackgroundAsDP" action="SaveBackgroundAs"/> - <menuitem name="BookmarkPageDP" action="ContextBookmarkPage"/> -</popup> - -<popup name="EphyFramedDocumentPopup" action="PopupAction"> - <menuitem name="GoBackFDP" action="GoBack"/> - <menuitem name="GoForwardFDP" action="GoForward"/> - <menuitem name="GoReloadFDP" action="ViewReload"/> - <separator name="FDPSep1"/> - <menuitem name="EditCopyFDP" action="EditCopy"/> - <separator name="FDPSep2"/> - <menuitem name="SavePageAsFDP" action="FileSaveAs"/> - <menuitem name="SaveBackgroundAsFDP" action="SaveBackgroundAs"/> - <menuitem name="BookmarkPageFDP" action="ContextBookmarkPage"/> - <separator name="FDBSep3"/> - <menuitem name="OpenFrameFDP" action="OpenFrame"/> - <menuitem name="OpenFrameInNewWindowFDP" action="OpenFrameInNewWindow"/> - <menuitem name="OpenFrameInNewTabFDP" action="OpenFrameInNewTab"/> -</popup> - -<popup name="EphyLinkPopup" action="PopupAction"> - <menuitem name="OpenLinkLP" action="OpenLink"/> - <menuitem name="OpenLinkInNewWindowLP" action="OpenLinkInNewWindow"/> - <menuitem name="OpenLinkInNewTabLP" action="OpenLinkInNewTab"/> - <separator name="LPSep1"/> - <menuitem name="DownloadLinkLP" action="DownloadLink"/> - <menuitem name="BookmarkLinkLP" action="BookmarkLink"/> - <menuitem name="CopyLinkAddressLP" action="CopyLinkAddress"/> -</popup> - -<popup name="EphyImagePopup" action="PopupAction"> - <menuitem name="OpenImageIP" action="OpenImage"/> - <menuitem name="OpenImageInNewWindowIP" action="OpenImageInNewWindow"/> - <menuitem name="OpenImageInNewTabIP" action="OpenImageInNewTab"/> - <separator name="IPSep1"/> - <menuitem name="SaveImageAsIP" action="SaveImageAs"/> - <menuitem name="SetImageAsBackgroundIP" action="SetImageAsBackground"/> - <menuitem name="CopyImageLocationIP" action="CopyImageLocation"/> -</popup> - -<popup name="EphyImageLinkPopup" action="PopupAction"> - <menuitem name="OpenLinkILP" action="OpenLink"/> - <menuitem name="OpenLinkInNewWindowILP" action="OpenLinkInNewWindow"/> - <menuitem name="OpenLinkInNewTabILP" action="OpenLinkInNewTab"/> - <separator name="ILPSep1"/> - <menuitem name="DownloadLinkILP" action="DownloadLink"/> - <menuitem name="BookmarkLinkILP" action="BookmarkLink"/> - <menuitem name="CopyLinkAddressILP" action="CopyLinkAddress"/> - <separator name="ILPSep2"/> - <menuitem name="OpenImageILP" action="OpenImage"/> - <menuitem name="OpenImageInNewWindowILP" action="OpenImageInNewWindow"/> - <menuitem name="OpenImageInNewTabILP" action="OpenImageInNewTab"/> - <separator name="ILPSep3"/> - <menuitem name="SaveImageAsILP" action="SaveImageAs"/> - <menuitem name="SetImageAsBackgroundILP" action="SetImageAsBackground"/> - <menuitem name="CopyImageLocationILP" action="CopyImageLocation"/> -</popup> - -</ui> diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c index 8006bdf71..745a3f5e5 100644 --- a/src/bookmarks/ephy-bookmark-properties.c +++ b/src/bookmarks/ephy-bookmark-properties.c @@ -428,7 +428,7 @@ ephy_bookmark_properties_init (EphyBookmarkProperties *editor) editor->priv->bookmark = NULL; editor->priv->tb_model = EPHY_TOOLBARS_MODEL - (ephy_shell_get_toolbars_model (ephy_shell)); + (ephy_shell_get_toolbars_model (ephy_shell, FALSE)); } GtkWidget * diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 55a0bcf03..0258d9aaa 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -1479,7 +1479,7 @@ ephy_bookmarks_editor_init (EphyBookmarksEditor *editor) editor->priv->props_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal); editor->priv->tb_model = EPHY_TOOLBARS_MODEL - (ephy_shell_get_toolbars_model (ephy_shell)); + (ephy_shell_get_toolbars_model (ephy_shell, FALSE)); g_signal_connect (editor->priv->tb_model, "item_added", G_CALLBACK (toolbar_items_changed_cb), editor); |