debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
midori/midori/midori-browser.c

7584 lines
268 KiB
C
Raw Normal View History

Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
/*
Always render icon only tabs at their natural size
2011-04-03 21:59:29 +00:00
Copyright (C) 2007-2011 Christian Dywan <christian@twotoasts.de>
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
Copyright (C) 2008 Dale Whittaker <dayul@users.sf.net>
Implement middle click on Back, Forward, Homepage menu items
2009-05-07 20:41:39 +00:00
Copyright (C) 2009 Jérôme Geulfucci <jeromeg@xfce.org>
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
See the file COPYING for the full license text.
*/
#include "midori-browser.h"
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
#include "midori-array.h"
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
#include "midori-view.h"
Turn prefs into MidoriPreferences
2008-04-20 01:30:24 +00:00
#include "midori-preferences.h"
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
#include "midori-panel.h"
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
#include "midori-locationaction.h"
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
#include "midori-searchaction.h"
Split location and search entry Fixes: https://bugs.launchpad.net/midori/+bug/738422
2011-11-15 22:43:14 +00:00
#include "midori-panedaction.h"
Refactor findbar into MidoriFindbar The findbar still depends on the browser for knowing when to search and to propagate focus. Behaviour did not change.
2010-06-20 18:13:39 +00:00
#include "midori-findbar.h"
Refactor transferbar into MidoriTransferbar The transferbar is separated from the browser, albeit it is still created and filled from within the browser so it is not completely independent. The new class now keeps a list of TransferInfo items to keep track of transfers and queries the status from the download object. Destroying a button belonging to a transfer is connected to removing it from the list and cleaning up the info structure. Also the Clear button is updated from the destroy handler.
2010-06-17 18:03:11 +00:00
#include "midori-transferbar.h"
Introduce MIDORI_EVENT_CONTEXT_MENU in midori-platform.h The new header contains all state and event handling.
2011-09-21 21:03:00 +00:00
#include "midori-platform.h"
Introduce Midori.URI to unitfy all URI logic sokoke_hostname_from_uri, sokoke_search_uri, sokoke_hostname_to_ascii and sokoke_unescape_uri_string are merged into Midori.URI. midori-core.h is the official API header for Vala now.
2011-10-19 07:53:18 +00:00
#include "midori-core.h"
Rename main.h to midori-stock.h
2008-09-03 00:39:25 +00:00
Add midori_app_send_notification() to easily send notifications Sending such messages is either done by using libnotify if available. Otherwise the program "notify-send" is used.
2009-05-09 13:55:10 +00:00
#include "marshal.h"
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
#include <glib/gi18n.h>
Use g_access instead of g_file_test consistently
2009-12-19 09:39:24 +00:00
#include <glib/gstdio.h>
Show a dialog before clearing the history Plus you can now remove history items with Del.
2008-10-10 21:19:37 +00:00
#include <gdk/gdkkeysyms.h>
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
#include <string.h>
sokoke, gtk3-compat, gtkiconentry, stock join midori-platform.h Also introduce #define MIDORI_MODULE_PREFIX. Fixes: https://bugs.launchpad.net/midori/+bug/884395
2011-10-31 21:10:39 +00:00
#include <config.h>
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
Reuse source of webview when saving a page to disk Fixes: https://bugs.launchpad.net/midori/+bug/782133
2011-05-30 15:55:02 +00:00
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
Implement and optimize for portrait mode support for Fremantle Listen to accelerometer movement. Hide tool items in portrait mode. Omit Homepage and View Source from app menu. Include Compact Add, View Source and Fullscreen in context menu. Hide buttons in portrait mode in preferences.
2009-11-27 22:42:07 +00:00
#ifdef HAVE_HILDON_2_2
#include <dbus/dbus.h>
#include <mce/mode-names.h>
#include <mce/dbus-names.h>
#define MCE_SIGNAL_MATCH "type='signal'," \
"sender='" MCE_SERVICE "'," \
"path='" MCE_SIGNAL_PATH "'," \
"interface='" MCE_SIGNAL_IF "'"
Enable Zoom and Fullscreen with hardware keys on Hildon
2009-11-29 14:09:00 +00:00
#include <gdk/gdkx.h>
#include <X11/Xatom.h>
Implement and optimize for portrait mode support for Fremantle Listen to accelerometer movement. Hide tool items in portrait mode. Omit Homepage and View Source from app menu. Include Compact Add, View Source and Fullscreen in context menu. Hide buttons in portrait mode in preferences.
2009-11-27 22:42:07 +00:00
#endif
Remove conditional guards for sqlite
2010-07-17 19:31:29 +00:00
#include <sqlite3.h>
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
struct _MidoriBrowser
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
#if HAVE_HILDON
HildonWindow parent_instance;
#else
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
GtkWindow parent_instance;
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
#endif
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
GtkActionGroup* action_group;
GtkWidget* menubar;
GtkWidget* menu_tools;
GtkWidget* throbber;
GtkWidget* navigationbar;
GtkWidget* bookmarkbar;
GtkWidget* panel;
GtkWidget* notebook;
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
GtkWidget* inspector;
GtkWidget* inspector_view;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
GtkWidget* find;
GtkWidget* statusbar;
Rearrange statusbar packing to keep themes happy
2009-10-27 22:55:17 +00:00
GtkWidget* statusbar_contents;
Initial support for WebKitDownload At this point all downloads run automatically and appear in the statusbar. The destination folder can be chosen in the preferences. Download can be cancelled. The context menu works as well.
2009-03-19 17:28:50 +00:00
GtkWidget* transferbar;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gchar* statusbar_text;
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
gint last_window_width, last_window_height;
Save size and panel position with a delay of 5 seconds
2009-01-25 23:54:12 +00:00
guint alloc_timeout;
No timeout for notebook sizing, but a size cache The timeout was a bad idea because it means the user can see what's happening for a short period of time. Caching the last size is less efficent but there's no visible delay and it's still a big win.
2011-12-16 00:15:50 +00:00
gint last_tab_size;
Save size and panel position with a delay of 5 seconds
2009-01-25 23:54:12 +00:00
guint panel_timeout;
Remember options in Clear private data dialogue
2009-05-22 21:53:54 +00:00
gint clear_private_data;
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
MidoriWebSettings* settings;
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
KatzeArray* proxy_array;
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
KatzeArray* bookmarks;
Rework MidoriWebList into KatzeList and KatzeArray
2008-08-25 23:19:38 +00:00
KatzeArray* trash;
KatzeArray* search_engines;
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
KatzeArray* history;
Use speeddial property to store GKeyFile with speeddial entries
2011-03-14 19:07:18 +00:00
GKeyFile* speeddial;
Implement show-tabs property in MidoriBrowser
2009-06-22 21:48:41 +00:00
gboolean show_tabs;
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
gboolean show_navigationbar;
gboolean show_statusbar;
Reduce the maximum days history is saved for to a number No need for a boolean flag, 0 days are just as good.
2009-11-14 17:29:29 +00:00
guint maximum_history_age;
Allow marking a search engine as Default engine The default engine is used when search terms are typed in the address entry without tokens and for the 'Search the Web' item in the selection context menu. The 'Location entry search' is removed from the preferences. The setting 'location-entry-search' remains functional however.
2009-04-18 20:41:37 +00:00
gchar* location_entry_search;
Track selected search engine per window
2011-05-15 19:40:39 +00:00
guint last_web_search;
Add News Aggregator preference The program set here is called if the user clicks on the news feed icon, with the address of the current website as argument. For example liferea-add-feed works like that.
2009-04-14 17:44:48 +00:00
gchar* news_aggregator;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
};
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
#if HAVE_HILDON
G_DEFINE_TYPE (MidoriBrowser, midori_browser, HILDON_TYPE_WINDOW)
#else
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW)
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
#endif
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
enum
{
PROP_0,
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
PROP_MENUBAR,
PROP_NAVIGATIONBAR,
Expose browser notebook and panel as properties
2008-11-18 01:02:59 +00:00
PROP_NOTEBOOK,
PROP_PANEL,
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
PROP_URI,
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
PROP_TAB,
Replace window-object-cleared with context-ready Introduce MidoriBrowser::load-status and also midori_view_execute_script while we are at it.
2008-11-23 04:19:43 +00:00
PROP_LOAD_STATUS,
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
PROP_STATUSBAR,
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
PROP_STATUSBAR_TEXT,
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
PROP_SETTINGS,
PROP_BOOKMARKS,
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
PROP_TRASH,
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
PROP_SEARCH_ENGINES,
Implement show-tabs property in MidoriBrowser
2009-06-22 21:48:41 +00:00
PROP_HISTORY,
Use speeddial property to store GKeyFile with speeddial entries
2011-03-14 19:07:18 +00:00
PROP_SPEED_DIAL,
Implement show-tabs property in MidoriBrowser
2009-06-22 21:48:41 +00:00
PROP_SHOW_TABS,
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
};
Integrate panel toolbars properly outside scrolled areas.
2008-04-26 00:43:32 +00:00
enum
{
Initial addon panel feature, only userscripts for now.
2008-04-28 20:38:57 +00:00
NEW_WINDOW,
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
ADD_TAB,
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
REMOVE_TAB,
Add MidoriBrowser::move-tab and use it in Tab Panel
2011-03-07 21:56:20 +00:00
MOVE_TAB,
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
ACTIVATE_ACTION,
Add add-download signal to MidoriBrowser
2009-03-22 14:24:40 +00:00
ADD_DOWNLOAD,
Add midori_app_send_notification() to easily send notifications Sending such messages is either done by using libnotify if available. Otherwise the program "notify-send" is used.
2009-05-09 13:55:10 +00:00
SEND_NOTIFICATION,
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
POPULATE_TOOL_MENU,
Implement 'Customize...' on toolbar right-click The new MidoriBrowser::populate-toolbar-menu allows extensions to add menu items. Fixes: https://bugs.launchpad.net/midori/+bug/699933
2011-04-17 20:43:54 +00:00
POPULATE_TOOLBAR_MENU,
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
QUIT,
Embed extensions into preferences dialogue MidoriBrowser gains the show-preferences signal which gives API users a chance to add preferences. katze_preferences_add_category now returns a box to allow freely packing a widget into the page. The extension panel is packed into the preferences now rather than being appended as a proper panel. Motivation is consistency here, such as with Gedit or Emerillon and also the aspect that extensions often really do tweak behaviour like preferences do. Spacing and icons are added for visual consistency.
2011-04-14 01:29:50 +00:00
SHOW_PREFERENCES,
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
LAST_SIGNAL
};
static guint signals[LAST_SIGNAL];
Ensure REMOVE_TAB emission, don't alter session when destroying
2008-07-25 10:45:50 +00:00
static void
midori_browser_dispose (GObject* object);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
midori_browser_finalize (GObject* object);
static void
Implement the Console panel for script messages.
2008-03-27 00:21:29 +00:00
midori_browser_set_property (GObject* object,
guint prop_id,
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
const GValue* value,
Implement the Console panel for script messages.
2008-03-27 00:21:29 +00:00
GParamSpec* pspec);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
Implement the Console panel for script messages.
2008-03-27 00:21:29 +00:00
midori_browser_get_property (GObject* object,
guint prop_id,
GValue* value,
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
GParamSpec* pspec);
Revamp bookmark import with sqlite
2010-07-02 03:55:41 +00:00
void
midori_bookmarks_import_array_db (sqlite3* db,
KatzeArray* array,
gchar* folder);
Use midori_browser_open_bookmark for the bookmarkbar
2010-08-14 18:58:38 +00:00
void
midori_browser_open_bookmark (MidoriBrowser* browser,
KatzeItem* item);
Clear the bookmarkbar before populating and populate after editing
2010-07-19 18:55:59 +00:00
static void
midori_bookmarkbar_populate (MidoriBrowser* browser);
static void
midori_bookmarkbar_clear (GtkWidget* toolbar);
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
static void
midori_browser_new_history_item (MidoriBrowser* browser,
Properly create proxy item and cleanup history agregation
2010-07-21 19:28:45 +00:00
KatzeItem* item);
Introduce MidoriLocationEntry and GtkIconEntry
2008-07-17 19:02:14 +00:00
Default to Icons in the toolbar on Win32
2009-07-20 04:54:46 +00:00
static void
_midori_browser_set_toolbar_style (MidoriBrowser* browser,
MidoriToolbarStyle toolbar_style);
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
GtkWidget*
midori_panel_construct_menu_item (MidoriPanel* panel,
MidoriViewable* viewable);
Implement Options menu via a button on the side panel The new button is visible on all panels and pops up a menu, which allows toggling the panel titles and the operating controls. A new signal "populate-option-menu" makes it extendible.
2009-07-26 20:00:10 +00:00
static void
midori_browser_settings_notify (MidoriWebSettings* web_settings,
GParamSpec* pspec,
MidoriBrowser* browser);
Synchronize browser and panel toolbar style
2010-07-29 13:18:27 +00:00
void
midori_panel_set_toolbar_style (MidoriPanel* panel,
GtkToolbarStyle style);
Disconnect bookmark folder signals, for bookmarkbar and panel This would lead to crashes when opening and closing windows and attempting to add bookmarks afterwards.
2009-08-19 21:51:59 +00:00
static void
midori_browser_set_bookmarks (MidoriBrowser* browser,
KatzeArray* bookmarks);
Add 'Add to Speed Dial' button to 'Add bookmark'
2010-05-18 21:16:14 +00:00
static void
midori_browser_add_speed_dial (MidoriBrowser* browser);
Refactor transferbar into MidoriTransferbar The transferbar is separated from the browser, albeit it is still created and filled from within the browser so it is not completely independent. The new class now keeps a list of TransferInfo items to keep track of transfers and queries the status from the download object. Destroying a button belonging to a transfer is connected to removing it from the list and cleaning up the info structure. Also the Clear button is updated from the destroy handler.
2010-06-17 18:03:11 +00:00
gboolean
midori_transferbar_confirm_delete (MidoriTransferbar* transferbar);
Always render icon only tabs at their natural size
2011-04-03 21:59:29 +00:00
static void
Set a timeout on notebook size updates
2011-12-09 19:59:32 +00:00
midori_browser_notebook_size_allocate_cb (GtkWidget* notebook,
GdkRectangle* allocation,
MidoriBrowser* browser);
Always render icon only tabs at their natural size
2011-04-03 21:59:29 +00:00
Refactor transferbar into MidoriTransferbar The transferbar is separated from the browser, albeit it is still created and filled from within the browser so it is not completely independent. The new class now keeps a list of TransferInfo items to keep track of transfers and queries the status from the download object. Destroying a button belonging to a transfer is connected to removing it from the list and cleaning up the info structure. Also the Clear button is updated from the destroy handler.
2010-06-17 18:03:11 +00:00
void
midori_transferbar_add_download_item (MidoriTransferbar* transferbar,
WebKitDownload* download);
Clear downloads when the transferbar is full Fixes: https://bugs.launchpad.net/midori/+bug/851452
2011-10-15 17:00:21 +00:00
void
midori_transferbar_check_size (GtkWidget* statusbar,
MidoriTransferbar* transferbar);
Refactor transferbar into MidoriTransferbar The transferbar is separated from the browser, albeit it is still created and filled from within the browser so it is not completely independent. The new class now keeps a list of TransferInfo items to keep track of transfers and queries the status from the download object. Destroying a button belonging to a transfer is connected to removing it from the list and cleaning up the info structure. Also the Clear button is updated from the destroy handler.
2010-06-17 18:03:11 +00:00
Turn browser action helpers into macros
2010-01-28 22:50:44 +00:00
#define _action_by_name(brwsr, nme) \
gtk_action_group_get_action (brwsr->action_group, nme)
#define _action_set_sensitive(brwsr, nme, snstv) \
gtk_action_set_sensitive (_action_by_name (brwsr, nme), snstv);
#define _action_set_visible(brwsr, nme, vsbl) \
gtk_action_set_visible (_action_by_name (brwsr, nme), vsbl);
#define _action_set_active(brwsr, nme, actv) \
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION ( \
_action_by_name (brwsr, nme)), actv);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
static gboolean
midori_browser_is_fullscreen (MidoriBrowser* browser)
Add Always Show Tabbar preference
2008-10-03 23:45:17 +00:00
{
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
GdkWindow* window = gtk_widget_get_window (GTK_WIDGET (browser));
GdkWindowState state = window ? gdk_window_get_state (window) : 0;
return state & GDK_WINDOW_STATE_FULLSCREEN;
}
Add Always Show Tabbar preference
2008-10-03 23:45:17 +00:00
Avoid counting total pages when not necessary
2011-12-07 21:42:06 +00:00
static gboolean
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
_toggle_tabbar_smartly (MidoriBrowser* browser,
gboolean ignore_fullscreen)
{
Avoid counting total pages when not necessary
2011-12-07 21:42:06 +00:00
gboolean has_tabs =
gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), 1) != NULL;
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
gboolean show_tabs =
browser->show_tabs
&& (!midori_browser_is_fullscreen (browser) || ignore_fullscreen)
Avoid counting total pages when not necessary
2011-12-07 21:42:06 +00:00
&& (has_tabs
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
|| katze_object_get_boolean (browser->settings, "always-show-tabbar"));
Implement show-tabs property in MidoriBrowser
2009-06-22 21:48:41 +00:00
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), show_tabs);
gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), show_tabs);
Avoid counting total pages when not necessary
2011-12-07 21:42:06 +00:00
return has_tabs;
Add Always Show Tabbar preference
2008-10-03 23:45:17 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_midori_browser_update_actions (MidoriBrowser* browser)
{
Avoid counting total pages when not necessary
2011-12-07 21:42:06 +00:00
gboolean has_tabs = _toggle_tabbar_smartly (browser, FALSE);
_action_set_sensitive (browser, "TabPrevious", has_tabs);
_action_set_sensitive (browser, "TabNext", has_tabs);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
if (browser->trash)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Avoid counting total pages when not necessary
2011-12-07 21:42:06 +00:00
gboolean trash_empty = katze_array_is_empty (browser->trash);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
_action_set_sensitive (browser, "UndoTabClose", !trash_empty);
_action_set_sensitive (browser, "Trash", !trash_empty);
}
}
static void
_midori_browser_update_interface (MidoriBrowser* browser)
{
Simplify update_interface and avoid extra updates
2010-08-16 19:01:02 +00:00
GtkWidget* widget = midori_browser_get_current_tab (browser);
MidoriView* view = MIDORI_VIEW (widget);
gboolean loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED;
gboolean can_reload = midori_view_can_reload (view);
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
GtkAction* action;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
Allow reloading regardless of whether a load is already in progress
2009-11-18 18:36:37 +00:00
_action_set_sensitive (browser, "Reload", can_reload);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
_action_set_sensitive (browser, "Stop", can_reload && loading);
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
_action_set_sensitive (browser, "Back", midori_view_can_go_back (view));
_action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view));
Implement Next and Previous buttons and add to the default toolbar
2009-12-26 22:12:36 +00:00
_action_set_sensitive (browser, "Previous",
midori_view_get_previous_page (view) != NULL);
_action_set_sensitive (browser, "Next",
midori_view_get_next_page (view) != NULL);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
Consistently use internal action toggling
2012-01-24 22:40:45 +00:00
_action_set_visible (browser, "AddSpeedDial", !midori_view_is_blank (view));
Distinguish a view that can be saved, view source Looking at the data source determines if there's a way to save the data. The prime use case is having images in tabs. Fixes: https://bugs.launchpad.net/midori/+bug/903499
2011-12-14 00:37:14 +00:00
_action_set_sensitive (browser, "SaveAs", midori_view_can_save (view));
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
_action_set_sensitive (browser, "Print", midori_view_can_print (view));
_action_set_sensitive (browser, "ZoomIn", midori_view_can_zoom_in (view));
_action_set_sensitive (browser, "ZoomOut", midori_view_can_zoom_out (view));
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
_action_set_sensitive (browser, "ZoomNormal",
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
midori_view_get_zoom_level (view) != 1.0f);
Implement Encoding menu
2009-02-27 22:09:36 +00:00
_action_set_sensitive (browser, "Encoding",
Enable encoding action at compilation time
2010-06-07 19:27:03 +00:00
midori_view_can_view_source (view));
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
_action_set_sensitive (browser, "SourceView",
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
midori_view_can_view_source (view));
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
_action_set_sensitive (browser, "Find",
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
midori_view_can_find (view));
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
_action_set_sensitive (browser, "FindNext",
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
midori_view_can_find (view));
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
_action_set_sensitive (browser, "FindPrevious",
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
midori_view_can_find (view));
Refactor findbar into MidoriFindbar The findbar still depends on the browser for knowing when to search and to propagate focus. Behaviour did not change.
2010-06-20 18:13:39 +00:00
midori_findbar_set_can_find (MIDORI_FINDBAR (browser->find),
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
midori_view_can_find (view));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Simplify update_interface and avoid extra updates
2010-08-16 19:01:02 +00:00
action = _action_by_name (browser, "ReloadStop");
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
if (!loading)
{
g_object_set (action,
"stock-id", GTK_STOCK_REFRESH,
Show progress in location entry if statusbar is hidden
2008-08-31 00:45:13 +00:00
"tooltip", _("Reload the current page"),
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
"sensitive", can_reload, NULL);
Unset dont-write-history and append, instead of 0 So the values don't stay in the saved session.
2011-12-13 22:27:26 +00:00
katze_item_set_meta_integer (midori_view_get_proxy_item (view),
"dont-write-history", -1);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
else
{
g_object_set (action,
"stock-id", GTK_STOCK_STOP,
Implement localization via Gettext. Based on the implementation of localization via Gettext contributed by Enrico Tröger, a few adjustments were made to allow Midori to be properly localized. Initially German is fully supported.
2008-03-22 02:38:23 +00:00
"tooltip", _("Stop loading the current page"), NULL);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
#if HAVE_HILDON
#if HILDON_CHECK_VERSION (2, 2, 0)
hildon_gtk_window_set_progress_indicator (GTK_WINDOW (browser), loading);
#endif
#else
gtk_widget_set_sensitive (browser->throbber, loading);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading);
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
#endif
Show news feeds in a menu if the icon is clicked
2008-08-02 02:25:05 +00:00
Display the news feed icon again The code for looking up news feeds on websites was disabled and is now back in simplified form. 'liferea-add-feed' is hardcoded for the moment.
2009-04-13 20:40:57 +00:00
action = _action_by_name (browser, "Location");
Replace Go button with a Go icon inside the address entry The icon is displayed by default, takes a little less space, but replaced with the news feed icon as appropriate. If the address entry is focussed, the Go icon takes precedence. We also introduce the focus-in signal on MidoriLocationAction.
2009-06-13 01:45:11 +00:00
if (g_object_get_data (G_OBJECT (view), "news-feeds"))
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
{
Display the news feed icon again The code for looking up news feeds on websites was disabled and is now back in simplified form. 'liferea-add-feed' is hardcoded for the moment.
2009-04-13 20:40:57 +00:00
midori_location_action_set_secondary_icon (
MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED);
Consistently use internal action toggling
2012-01-24 22:40:45 +00:00
_action_set_sensitive (browser, "AddNewsFeed", TRUE);
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
}
Show news feeds in a menu if the icon is clicked
2008-08-02 02:25:05 +00:00
else
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
{
Display the news feed icon again The code for looking up news feeds on websites was disabled and is now back in simplified form. 'liferea-add-feed' is hardcoded for the moment.
2009-04-13 20:40:57 +00:00
midori_location_action_set_secondary_icon (
Replace Go button with a Go icon inside the address entry The icon is displayed by default, takes a little less space, but replaced with the news feed icon as appropriate. If the address entry is focussed, the Go icon takes precedence. We also introduce the focus-in signal on MidoriLocationAction.
2009-06-13 01:45:11 +00:00
MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO);
Consistently use internal action toggling
2012-01-24 22:40:45 +00:00
_action_set_sensitive (browser, "AddNewsFeed", FALSE);
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
}
Security with background color and secondary icon
2010-04-20 21:32:28 +00:00
midori_location_action_set_security_hint (
MIDORI_LOCATION_ACTION (action), midori_view_get_security (view));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
_midori_browser_set_statusbar_text (MidoriBrowser* browser,
const gchar* text)
{
Do not put statusbar text in the location entry if it's focussed This prevents overwriting what the user may be typing while accidentally moving the mouse.
2009-09-19 19:06:33 +00:00
GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
Adapt focus widget check for status text in location The location no longer a GtkComboBox.
2011-04-30 23:18:53 +00:00
gboolean is_location = widget && GTK_IS_ENTRY (widget)
&& GTK_IS_ALIGNMENT (gtk_widget_get_parent (widget));
Do not put statusbar text in the location entry if it's focussed This prevents overwriting what the user may be typing while accidentally moving the mouse.
2009-09-19 19:06:33 +00:00
Introduce Midori.URI to unitfy all URI logic sokoke_hostname_from_uri, sokoke_search_uri, sokoke_hostname_to_ascii and sokoke_unescape_uri_string are merged into Midori.URI. midori-core.h is the official API header for Vala now.
2011-10-19 07:53:18 +00:00
katze_assign (browser->statusbar_text, midori_uri_format_for_display (text));
Display statusbar text in the location if the statusbar is hidden
2009-07-17 02:06:44 +00:00
Show statusbar on new transfars if transferbar is visible
2010-09-12 18:14:48 +00:00
if (!browser->show_statusbar && !is_location)
Display statusbar text in the location if the statusbar is hidden
2009-07-17 02:06:44 +00:00
{
GtkAction* action = _action_by_name (browser, "Location");
MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
if (text && *text)
{
Remove freeze, thaw and set_uri from MidoriLocationAction
2010-07-31 11:59:48 +00:00
midori_location_action_set_text (location_action, browser->statusbar_text);
Use a Go icon when showing the target URI in the location
2009-07-24 15:01:02 +00:00
midori_location_action_set_icon (location_action, NULL);
Handle window icon inside MidoriBrowser Fixes: https://bugs.launchpad.net/midori/+bug/918567
2012-01-24 22:26:09 +00:00
if (sokoke_is_app_or_private ())
gtk_window_set_icon (GTK_WINDOW (browser), NULL);
Display statusbar text in the location if the statusbar is hidden
2009-07-17 02:06:44 +00:00
midori_location_action_set_secondary_icon (location_action, NULL);
}
else
{
GtkWidget* view = midori_browser_get_current_tab (browser);
if (G_LIKELY (view))
{
if (g_object_get_data (G_OBJECT (view), "news-feeds"))
midori_location_action_set_secondary_icon (
location_action, STOCK_NEWS_FEED);
else
midori_location_action_set_secondary_icon (
location_action, GTK_STOCK_JUMP_TO);
Remove freeze, thaw and set_uri from MidoriLocationAction
2010-07-31 11:59:48 +00:00
midori_location_action_set_text (location_action,
Display statusbar text in the location if the statusbar is hidden
2009-07-17 02:06:44 +00:00
midori_view_get_display_uri (MIDORI_VIEW (view)));
Update location icon for the correct view, and update it properly
2009-12-26 13:03:29 +00:00
midori_location_action_set_icon (location_action,
midori_view_get_icon (MIDORI_VIEW (view)));
Handle window icon inside MidoriBrowser Fixes: https://bugs.launchpad.net/midori/+bug/918567
2012-01-24 22:26:09 +00:00
if (sokoke_is_app_or_private ())
gtk_window_set_icon (GTK_WINDOW (browser),
midori_view_get_icon (MIDORI_VIEW (view)));
Display statusbar text in the location if the statusbar is hidden
2009-07-17 02:06:44 +00:00
}
}
}
else
{
gtk_statusbar_pop (GTK_STATUSBAR (browser->statusbar), 1);
gtk_statusbar_push (GTK_STATUSBAR (browser->statusbar), 1,
browser->statusbar_text ? browser->statusbar_text : "");
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Introduce midori_browser_set_current_page_smartly() as public API
2010-07-03 07:28:03 +00:00
void
midori_browser_set_current_page_smartly (MidoriBrowser* browser,
gint n)
Attempt to fix handling of background and foreground tabs.
2008-04-24 22:20:43 +00:00
{
Use katze_object_get_foo instead of sokoke_object_get_foo
2008-11-18 22:10:21 +00:00
if (!katze_object_get_boolean (browser->settings,
Reverse Open tabs in the background with Ctrl
2008-07-16 16:08:47 +00:00
"open-tabs-in-the-background"))
Attempt to fix handling of background and foreground tabs.
2008-04-24 22:20:43 +00:00
midori_browser_set_current_page (browser, n);
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_midori_browser_update_progress (MidoriBrowser* browser,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
MidoriView* view)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Show progress in location entry if statusbar is hidden
2008-08-31 00:45:13 +00:00
MidoriLocationAction* action;
Revamp the loading signals of MidoriWebView
2008-07-23 15:54:24 +00:00
gdouble progress;
Show progress in location entry if statusbar is hidden
2008-08-31 00:45:13 +00:00
action = MIDORI_LOCATION_ACTION (_action_by_name (browser, "Location"));
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
progress = midori_view_get_progress (view);
Show progress in location entry if statusbar is hidden
2008-08-31 00:45:13 +00:00
/* When we are finished, we don't want to *see* progress anymore */
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
if (midori_view_get_load_status (view) == MIDORI_LOAD_FINISHED)
Show progress in location entry if statusbar is hidden
2008-08-31 00:45:13 +00:00
progress = 0.0;
Show at minimum 10% progress when loading
2011-02-20 19:09:57 +00:00
/* When loading we want to see at minimum 10% progress */
else
progress = CLAMP (progress, 0.1, 1.0);
Simplify update_interface and avoid extra updates
2010-08-16 19:01:02 +00:00
midori_location_action_set_progress (action, progress);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
static void
midori_browser_update_history_title (MidoriBrowser* browser,
KatzeItem* item)
{
sqlite3* db;
Switch to prepared statements when adding/ updating history
2010-02-04 18:13:16 +00:00
static sqlite3_stmt* stmt = NULL;
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
Uri property is mandatory for history operations
2010-07-22 13:28:18 +00:00
g_return_if_fail (katze_item_get_uri (item) != NULL);
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
db = g_object_get_data (G_OBJECT (browser->history), "db");
Issue warning if adding to history fails
2010-12-24 15:44:49 +00:00
g_return_if_fail (db != NULL);
Switch to prepared statements when adding/ updating history
2010-02-04 18:13:16 +00:00
if (!stmt)
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
{
Switch to prepared statements when adding/ updating history
2010-02-04 18:13:16 +00:00
const gchar* sqlcmd;
sqlcmd = "UPDATE history SET title=? WHERE uri = ? and date=?";
sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL);
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
}
Switch to prepared statements when adding/ updating history
2010-02-04 18:13:16 +00:00
sqlite3_bind_text (stmt, 1, katze_item_get_name (item), -1, 0);
sqlite3_bind_text (stmt, 2, katze_item_get_uri (item), -1, 0);
sqlite3_bind_int64 (stmt, 3, katze_item_get_added (item));
if (sqlite3_step (stmt) != SQLITE_DONE)
g_printerr (_("Failed to update title: %s\n"), sqlite3_errmsg (db));
sqlite3_reset (stmt);
sqlite3_clear_bindings (stmt);
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
}
Initial addon panel feature, only userscripts for now.
2008-04-28 20:38:57 +00:00
static void
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
_midori_browser_activate_action (MidoriBrowser* browser,
const gchar* name)
{
GtkAction* action = _action_by_name (browser, name);
if (action)
gtk_action_activate (action);
else
g_warning (_("Unexpected action '%s'."), name);
}
static void
midori_view_notify_icon_cb (MidoriView* view,
GParamSpec* pspec,
MidoriBrowser* browser)
Initial addon panel feature, only userscripts for now.
2008-04-28 20:38:57 +00:00
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkAction* action;
Update location icon for the correct view, and update it properly
2009-12-26 13:03:29 +00:00
if (midori_browser_get_current_tab (browser) != (GtkWidget*)view)
return;
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
action = _action_by_name (browser, "Location");
Update location icon for the correct view, and update it properly
2009-12-26 13:03:29 +00:00
midori_location_action_set_icon (MIDORI_LOCATION_ACTION (action),
midori_view_get_icon (view));
Handle window icon inside MidoriBrowser Fixes: https://bugs.launchpad.net/midori/+bug/918567
2012-01-24 22:26:09 +00:00
if (sokoke_is_app_or_private ())
gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (view));
Initial addon panel feature, only userscripts for now.
2008-04-28 20:38:57 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
midori_view_notify_load_status_cb (GtkWidget* widget,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GParamSpec* pspec,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
MidoriView* view = MIDORI_VIEW (widget);
Simplify update_interface and avoid extra updates
2010-08-16 19:01:02 +00:00
MidoriLoadStatus load_status = midori_view_get_load_status (view);
Revamp the loading signals of MidoriWebView
2008-07-23 15:54:24 +00:00
const gchar* uri;
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
GtkAction* action;
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
uri = midori_view_get_display_uri (view);
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
action = _action_by_name (browser, "Location");
Simplify update_interface and avoid extra updates
2010-08-16 19:01:02 +00:00
if (load_status == MIDORI_LOAD_COMMITTED)
Hide the combobox arrow if the history unset or is empty
2010-01-28 22:56:54 +00:00
midori_location_action_add_uri (MIDORI_LOCATION_ACTION (action), uri);
Revamp the loading signals of MidoriWebView
2008-07-23 15:54:24 +00:00
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
if (widget == midori_browser_get_current_tab (browser))
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Simplify update_interface and avoid extra updates
2010-08-16 19:01:02 +00:00
if (load_status == MIDORI_LOAD_COMMITTED)
Revamp the loading signals of MidoriWebView
2008-07-23 15:54:24 +00:00
{
Remove freeze, thaw and set_uri from MidoriLocationAction
2010-07-31 11:59:48 +00:00
midori_location_action_set_text (
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
MIDORI_LOCATION_ACTION (action), uri);
midori_location_action_set_secondary_icon (
Replace Go button with a Go icon inside the address entry The icon is displayed by default, takes a little less space, but replaced with the news feed icon as appropriate. If the address entry is focussed, the Go icon takes precedence. We also introduce the focus-in signal on MidoriLocationAction.
2009-06-13 01:45:11 +00:00
MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO);
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
g_object_notify (G_OBJECT (browser), "uri");
Revamp the loading signals of MidoriWebView
2008-07-23 15:54:24 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
_midori_browser_update_interface (browser);
_midori_browser_set_statusbar_text (browser, NULL);
Ensure that the address entry is focussed with speed dial
2009-05-16 21:52:59 +00:00
/* This is a hack to ensure that the address entry is focussed
with speed dial open. */
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
if (midori_view_is_blank (view))
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
midori_browser_activate_action (browser, "Location");
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Replace window-object-cleared with context-ready Introduce MidoriBrowser::load-status and also midori_view_execute_script while we are at it.
2008-11-23 04:19:43 +00:00
g_object_notify (G_OBJECT (browser), "load-status");
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
midori_view_notify_progress_cb (GtkWidget* view,
GParamSpec* pspec,
MidoriBrowser* browser)
{
if (view == midori_browser_get_current_tab (browser))
_midori_browser_update_progress (browser, MIDORI_VIEW (view));
}
Update address and actions properly when navigating in-page
2009-05-14 23:18:14 +00:00
static void
Propagate URI changes and update Back, Forward actions Fixes: https://bugs.launchpad.net/midori/+bug/725826
2011-02-27 00:48:06 +00:00
midori_view_notify_uri_cb (GtkWidget* widget,
Update address and actions properly when navigating in-page
2009-05-14 23:18:14 +00:00
GParamSpec* pspec,
MidoriBrowser* browser)
{
Propagate URI changes and update Back, Forward actions Fixes: https://bugs.launchpad.net/midori/+bug/725826
2011-02-27 00:48:06 +00:00
if (widget == midori_browser_get_current_tab (browser))
Make sure to only update the address entry with the current view
2009-05-15 15:30:54 +00:00
{
Propagate URI changes and update Back, Forward actions Fixes: https://bugs.launchpad.net/midori/+bug/725826
2011-02-27 00:48:06 +00:00
MidoriView* view = MIDORI_VIEW (widget);
const gchar* uri = midori_view_get_display_uri (view);
Make sure to only update the address entry with the current view
2009-05-15 15:30:54 +00:00
GtkAction* action = _action_by_name (browser, "Location");
Remove freeze, thaw and set_uri from MidoriLocationAction
2010-07-31 11:59:48 +00:00
midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
Propagate URI changes and update Back, Forward actions Fixes: https://bugs.launchpad.net/midori/+bug/725826
2011-02-27 00:48:06 +00:00
_action_set_sensitive (browser, "Back", midori_view_can_go_back (view));
_action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view));
Make sure to only update the address entry with the current view
2009-05-15 15:30:54 +00:00
}
Update address and actions properly when navigating in-page
2009-05-14 23:18:14 +00:00
}
Don't include application name in window title Except in private browsing mode.
2011-04-25 15:53:33 +00:00
static void
midori_browser_set_title (MidoriBrowser* browser,
const gchar* title)
{
if (katze_object_get_boolean (browser->settings, "enable-private-browsing"))
{
Don't mixup window title and app name Fixes: https://bugs.launchpad.net/midori/+bug/778402
2011-05-17 20:15:11 +00:00
gchar* window_title = g_strdup_printf (_("%s (Private Browsing)"), title);
Don't include application name in window title Except in private browsing mode.
2011-04-25 15:53:33 +00:00
gtk_window_set_title (GTK_WINDOW (browser), window_title);
g_free (window_title);
}
else
gtk_window_set_title (GTK_WINDOW (browser), title);
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
midori_view_notify_title_cb (GtkWidget* widget,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GParamSpec* pspec,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
MidoriView* view = MIDORI_VIEW (widget);
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
const gchar* title;
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
title = midori_view_get_display_title (view);
Decode URIs before updating the locationbar
2010-07-21 14:35:47 +00:00
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED)
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
{
Instead of adding multiple same history items, update the original item
2009-01-26 02:43:59 +00:00
KatzeItem* proxy;
Reduce the maximum days history is saved for to a number No need for a boolean flag, 0 days are just as good.
2009-11-14 17:29:29 +00:00
if (browser->history && browser->maximum_history_age)
Instead of adding multiple same history items, update the original item
2009-01-26 02:43:59 +00:00
{
Dont add items with empty uris into history
2010-07-23 15:19:38 +00:00
const gchar* proxy_uri;
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
proxy = midori_view_get_proxy_item (view);
Dont add items with empty uris into history
2010-07-23 15:19:38 +00:00
proxy_uri = katze_item_get_uri (proxy);
Set a timeout on notebook size updates
2011-12-09 19:59:32 +00:00
if (!midori_uri_is_blank (proxy_uri) &&
Dont store about:* pages in history, Reset history step counter
2010-07-23 21:11:38 +00:00
(katze_item_get_meta_integer (proxy, "history-step") == -1))
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
{
Don't add session tabs to the history on startup Otherwise the startup as a whole causes a lot of disk activity that isn't really needed.
2011-02-23 21:36:03 +00:00
if (!katze_item_get_meta_boolean (proxy, "dont-write-history"))
{
midori_browser_new_history_item (browser, proxy);
katze_item_set_meta_integer (proxy, "history-step", 1);
}
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
}
Properly create proxy item and cleanup history agregation
2010-07-21 19:28:45 +00:00
else if (katze_item_get_name (proxy) &&
Introduce Midori.URI to unitfy all URI logic sokoke_hostname_from_uri, sokoke_search_uri, sokoke_hostname_to_ascii and sokoke_unescape_uri_string are merged into Midori.URI. midori-core.h is the official API header for Vala now.
2011-10-19 07:53:18 +00:00
!midori_uri_is_blank (proxy_uri) &&
Dont store about:* pages in history, Reset history step counter
2010-07-23 21:11:38 +00:00
(katze_item_get_meta_integer (proxy, "history-step") == 1))
Refactor History panel into a separate class This brings back the problem of address and title of items showing up in the history unfortunately. Now the history items are appended rather than prepended, we probably want to fix that in the future.
2009-02-21 22:59:02 +00:00
{
Properly create proxy item and cleanup history agregation
2010-07-21 19:28:45 +00:00
midori_browser_update_history_title (browser, proxy);
Dont store about:* pages in history, Reset history step counter
2010-07-23 21:11:38 +00:00
katze_item_set_meta_integer (proxy, "history-step", 2);
Refactor History panel into a separate class This brings back the problem of address and title of items showing up in the history unfortunately. Now the history items are appended rather than prepended, we probably want to fix that in the future.
2009-02-21 22:59:02 +00:00
}
Instead of adding multiple same history items, update the original item
2009-01-26 02:43:59 +00:00
}
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
}
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
if (widget == midori_browser_get_current_tab (browser))
Don't include application name in window title Except in private browsing mode.
2011-04-25 15:53:33 +00:00
midori_browser_set_title (browser, title);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Always render icon only tabs at their natural size
2011-04-03 21:59:29 +00:00
static void
midori_view_notify_minimized_cb (GtkWidget* widget,
GParamSpec* pspec,
MidoriBrowser* browser)
{
if (katze_object_get_boolean (widget, "minimized"))
{
GtkNotebook* notebook = GTK_NOTEBOOK (browser->notebook);
GtkWidget* label = gtk_notebook_get_tab_label (notebook, widget);
gtk_widget_set_size_request (label, -1, -1);
}
else
Set a timeout on notebook size updates
2011-12-09 19:59:32 +00:00
midori_browser_notebook_size_allocate_cb (NULL, NULL, browser);
Always render icon only tabs at their natural size
2011-04-03 21:59:29 +00:00
}
Toggle ZoomReset as the zoom level changes
2008-07-21 23:51:08 +00:00
static void
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
midori_view_notify_zoom_level_cb (GtkWidget* view,
GParamSpec* pspec,
MidoriBrowser* browser)
Toggle ZoomReset as the zoom level changes
2008-07-21 23:51:08 +00:00
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
if (view == midori_browser_get_current_tab (browser))
Toggle ZoomReset as the zoom level changes
2008-07-21 23:51:08 +00:00
_action_set_sensitive (browser, "ZoomNormal",
Fix zooming, and make Zoom Normal work again
2009-03-05 21:45:34 +00:00
midori_view_get_zoom_level (MIDORI_VIEW (view)) != 1.0f);
Load favicons asynchronously
2008-07-19 02:06:10 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
midori_view_notify_statusbar_text_cb (GtkWidget* view,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GParamSpec* pspec,
MidoriBrowser* browser)
Reverse Open tabs in the background with Ctrl
2008-07-16 16:08:47 +00:00
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
gchar* text;
Reverse Open tabs in the background with Ctrl
2008-07-16 16:08:47 +00:00
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
if (view == midori_browser_get_current_tab (browser))
Only update statusbar text if the view is the current tab
2009-08-28 21:54:06 +00:00
{
g_object_get (view, "statusbar-text", &text, NULL);
_midori_browser_set_statusbar_text (browser, text);
g_free (text);
}
Reverse Open tabs in the background with Ctrl
2008-07-16 16:08:47 +00:00
}
Merge bookmark folder combo into helper functions Fixes: https://bugs.launchpad.net/midori/+bug/874592
2011-10-20 20:19:41 +00:00
static GtkWidget*
midori_bookmark_folder_button_new (KatzeArray* array,
gboolean new_bookmark,
const gchar* selected)
{
GtkListStore* model;
GtkWidget* combo;
GtkCellRenderer* renderer;
guint n;
sqlite3* db;
sqlite3_stmt* statement;
gint result;
const gchar* sqlcmd = "SELECT title from bookmarks where uri=''";
model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "ellipsize", 1);
gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
0, _("Toplevel folder"), 1, PANGO_ELLIPSIZE_END, -1);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
db = g_object_get_data (G_OBJECT (array), "db");
g_return_val_if_fail (db != NULL, NULL);
n = 1;
result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL);
while ((result = sqlite3_step (statement)) == SQLITE_ROW)
{
const unsigned char* name = sqlite3_column_text (statement, 0);
gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
0, name, 1, PANGO_ELLIPSIZE_END, -1);
if (!new_bookmark && !g_strcmp0 (selected, (gchar*)name))
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), n);
n++;
}
if (n < 2)
gtk_widget_set_sensitive (combo, FALSE);
return combo;
}
static gchar*
midori_bookmark_folder_button_get_active (GtkWidget* combo)
{
gchar* selected = NULL;
GtkTreeIter iter;
g_return_val_if_fail (GTK_IS_COMBO_BOX (combo), NULL);
if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
{
GtkTreeModel* model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &selected, -1);
if (g_str_equal (selected, _("Toplevel folder")))
katze_assign (selected, g_strdup (""));
}
return selected;
}
Require bookmarks and folders to have a title
2010-07-19 18:47:33 +00:00
static void
midori_browser_edit_bookmark_title_changed_cb (GtkEntry* entry,
GtkDialog* dialog)
{
const gchar* title = gtk_entry_get_text (entry);
gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_ACCEPT,
title != NULL && title[0] != '\0');
}
Add 'Add to Speed Dial' button to 'Add bookmark'
2010-05-18 21:16:14 +00:00
static void
midori_browser_edit_bookmark_add_speed_dial_cb (GtkWidget* button,
KatzeItem* bookmark)
{
MidoriBrowser* browser = midori_browser_get_for_widget (button);
gtk_widget_set_sensitive (button, FALSE);
midori_browser_add_speed_dial (browser);
}
Add a "New folder" button to the bookmark panel
2009-02-22 02:11:40 +00:00
/* Private function, used by MidoriBookmarks and MidoriHistory */
Remove ghosts after bookmark edit. Merge edit/ delete callbacks
2010-07-02 04:50:14 +00:00
/* static */ gboolean
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
Allow adding bookmarks from history items
2008-10-29 02:43:08 +00:00
KatzeItem* bookmark,
Add a "New folder" button to the bookmark panel
2009-02-22 02:11:40 +00:00
gboolean new_bookmark,
gboolean is_folder)
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
{
Add a "New folder" button to the bookmark panel
2009-02-22 02:11:40 +00:00
const gchar* title;
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
GtkWidget* dialog;
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
GtkWidget* content_area;
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
GtkSizeGroup* sizegroup;
GtkWidget* view;
GtkWidget* hbox;
GtkWidget* label;
const gchar* value;
GtkWidget* entry_title;
GtkWidget* entry_uri;
GtkWidget* combo_folder;
Only show bookmarks in the toolbar which are marked as such
2009-11-23 19:46:00 +00:00
GtkWidget* check_toolbar;
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
GtkWidget* check_app;
Remove ghosts after bookmark edit. Merge edit/ delete callbacks
2010-07-02 04:50:14 +00:00
gboolean return_status = FALSE;
Fix selecting a directory while adding a new bookmark Allow folders to be removed
2010-06-14 07:00:05 +00:00
sqlite3* db;
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser)))
Remove ghosts after bookmark edit. Merge edit/ delete callbacks
2010-07-02 04:50:14 +00:00
return FALSE;
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
Fix selecting a directory while adding a new bookmark Allow folders to be removed
2010-06-14 07:00:05 +00:00
db = g_object_get_data (G_OBJECT (browser->bookmarks), "db");
Always NULL-check database before using it If the database is broken in whatever way the pointer is unset. A good next step would be to give more user-friendly feedback than the current rough dialog.
2011-07-30 18:11:45 +00:00
if (!db)
return FALSE;
Add a "New folder" button to the bookmark panel
2009-02-22 02:11:40 +00:00
if (is_folder)
title = new_bookmark ? _("New folder") : _("Edit folder");
else
title = new_bookmark ? _("New bookmark") : _("Edit bookmark");
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
dialog = gtk_dialog_new_with_buttons (
Add a "New folder" button to the bookmark panel
2009-02-22 02:11:40 +00:00
title, GTK_WINDOW (browser),
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_window_set_icon_name (GTK_WINDOW (dialog),
new_bookmark ? GTK_STOCK_ADD : GTK_STOCK_REMOVE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
Allow adding bookmarks from history items
2008-10-29 02:43:08 +00:00
if (!bookmark)
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
{
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
view = midori_browser_get_current_tab (browser);
Add a "New folder" button to the bookmark panel
2009-02-22 02:11:40 +00:00
if (is_folder)
{
Fix browser properties along with enabling the property test
2009-02-22 12:52:04 +00:00
bookmark = (KatzeItem*)katze_array_new (KATZE_TYPE_ARRAY);
Add a "New folder" button to the bookmark panel
2009-02-22 02:11:40 +00:00
katze_item_set_name (bookmark,
midori_view_get_display_title (MIDORI_VIEW (view)));
}
else
bookmark = g_object_new (KATZE_TYPE_ITEM,
"uri", midori_view_get_display_uri (MIDORI_VIEW (view)),
"name", midori_view_get_display_title (MIDORI_VIEW (view)), NULL);
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
}
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
hbox = gtk_hbox_new (FALSE, 8);
Only show bookmarks in the toolbar which are marked as such
2009-11-23 19:46:00 +00:00
gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
label = gtk_label_new_with_mnemonic (_("_Title:"));
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
entry_title = gtk_entry_new ();
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE);
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
value = katze_item_get_name (bookmark);
gtk_entry_set_text (GTK_ENTRY (entry_title), value ? value : "");
Require bookmarks and folders to have a title
2010-07-19 18:47:33 +00:00
midori_browser_edit_bookmark_title_changed_cb (GTK_ENTRY (entry_title),
GTK_DIALOG (dialog));
g_signal_connect (entry_title, "changed",
G_CALLBACK (midori_browser_edit_bookmark_title_changed_cb), dialog);
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_box_pack_start (GTK_BOX (hbox), entry_title, TRUE, TRUE, 0);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_container_add (GTK_CONTAINER (content_area), hbox);
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_widget_show_all (hbox);
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
entry_uri = NULL;
Fix bookmark folder properties dialog
2010-07-01 01:19:15 +00:00
if (!is_folder)
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
{
hbox = gtk_hbox_new (FALSE, 8);
Only show bookmarks in the toolbar which are marked as such
2009-11-23 19:46:00 +00:00
gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
Various string changes and additions
2009-01-04 18:21:25 +00:00
label = gtk_label_new_with_mnemonic (_("_Address:"));
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
Validate URIs and render entry red if invalid Fixes: https://bugs.launchpad.net/midori/+bug/710855
2011-05-15 14:45:14 +00:00
entry_uri = katze_uri_entry_new (
#if GTK_CHECK_VERSION (2, 20, 0)
gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT));
#else
NULL);
#endif
Don't capitalize bookmark addresses automatically on Hildon
2009-11-28 18:39:47 +00:00
#if HAVE_HILDON
HildonGtkInputMode mode = hildon_gtk_entry_get_input_mode (GTK_ENTRY (entry_uri));
mode &= ~HILDON_GTK_INPUT_MODE_AUTOCAP;
hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_uri), mode);
#endif
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE);
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
gtk_entry_set_text (GTK_ENTRY (entry_uri), katze_item_get_uri (bookmark));
Show progress in location entry if statusbar is hidden
2008-08-31 00:45:13 +00:00
gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_container_add (GTK_CONTAINER (content_area), hbox);
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_widget_show_all (hbox);
}
Merge bookmark folder combo into helper functions Fixes: https://bugs.launchpad.net/midori/+bug/874592
2011-10-20 20:19:41 +00:00
hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
label = gtk_label_new_with_mnemonic (_("_Folder:"));
gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
combo_folder = midori_bookmark_folder_button_new (browser->bookmarks,
new_bookmark, katze_item_get_meta_string (bookmark, "folder"));
gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
gtk_widget_show_all (hbox);
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
Add 'Add to Speed Dial' button to 'Add bookmark'
2010-05-18 21:16:14 +00:00
if (new_bookmark && !is_folder)
{
hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 1);
label = gtk_label_new (NULL);
gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
label = gtk_button_new_with_mnemonic (_("Add to _Speed Dial"));
g_signal_connect (label, "clicked",
G_CALLBACK (midori_browser_edit_bookmark_add_speed_dial_cb), bookmark);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
gtk_widget_show_all (hbox);
}
Only show bookmarks in the toolbar which are marked as such
2009-11-23 19:46:00 +00:00
hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 1);
label = gtk_label_new (NULL);
gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in the tool_bar"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_toolbar),
Fix display of the bookmark properties in the add dialog
2010-07-01 05:24:17 +00:00
katze_item_get_meta_boolean (bookmark, "toolbar"));
Only show bookmarks in the toolbar which are marked as such
2009-11-23 19:46:00 +00:00
gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, TRUE, TRUE, 0);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_container_add (GTK_CONTAINER (content_area), hbox);
Only show bookmarks in the toolbar which are marked as such
2009-11-23 19:46:00 +00:00
gtk_widget_show_all (hbox);
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
check_app = NULL;
Fix bookmark folder properties dialog
2010-07-01 01:19:15 +00:00
if (!is_folder)
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
{
hbox = gtk_hbox_new (FALSE, 8);
Only show bookmarks in the toolbar which are marked as such
2009-11-23 19:46:00 +00:00
gtk_container_set_border_width (GTK_CONTAINER (hbox), 1);
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
label = gtk_label_new (NULL);
gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
check_app = gtk_check_button_new_with_mnemonic (_("Run as _web application"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_app),
Fix display of the bookmark properties in the add dialog
2010-07-01 05:24:17 +00:00
katze_item_get_meta_boolean (bookmark, "app"));
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
gtk_box_pack_start (GTK_BOX (hbox), check_app, TRUE, TRUE, 0);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_container_add (GTK_CONTAINER (content_area), hbox);
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
gtk_widget_show_all (hbox);
}
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
{
Allow choosing a folder when adding a bookmark
2009-01-01 02:52:43 +00:00
gchar* selected;
Fix edit bookmark behavior
2010-07-19 20:58:18 +00:00
if (!new_bookmark)
Use KatzeArray* to remove and monitor deleted bookmarks The panel and the bookmarkbar need to monitor the removal of bookmarks, and there can be multiple windows, so the database should only be used to remove in one central place.
2010-08-10 21:46:49 +00:00
katze_array_remove_item (browser->bookmarks, bookmark);
Allow choosing a folder when adding a bookmark
2009-01-01 02:52:43 +00:00
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
katze_item_set_name (bookmark,
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_entry_get_text (GTK_ENTRY (entry_title)));
Only show bookmarks in the toolbar which are marked as such
2009-11-23 19:46:00 +00:00
katze_item_set_meta_integer (bookmark, "toolbar",
Fixed handling of bookmark meta data sqlite doesn't store negative value but rather 0 and 1, so we work with these values now. As a side effect it makes the code easier to read.
2010-06-19 13:56:50 +00:00
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)));
Fix bookmark folder properties dialog
2010-07-01 01:19:15 +00:00
if (!is_folder)
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
{
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
katze_item_set_uri (bookmark,
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_entry_get_text (GTK_ENTRY (entry_uri)));
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
katze_item_set_meta_integer (bookmark, "app",
Fixed handling of bookmark meta data sqlite doesn't store negative value but rather 0 and 1, so we work with these values now. As a side effect it makes the code easier to read.
2010-06-19 13:56:50 +00:00
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_app)));
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
}
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
Merge bookmark folder combo into helper functions Fixes: https://bugs.launchpad.net/midori/+bug/874592
2011-10-20 20:19:41 +00:00
selected = midori_bookmark_folder_button_get_active (combo_folder);
Add bookmarks through array and update the panel
2010-11-21 15:49:20 +00:00
katze_item_set_meta_string (bookmark, "folder", selected);
katze_array_add_item (browser->bookmarks, bookmark);
Show bookmarksbar after item was added to db and not before
2010-06-25 04:24:53 +00:00
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)))
Add bookmarks through array and update the panel
2010-11-21 15:49:20 +00:00
if (!gtk_widget_get_visible (browser->bookmarkbar))
Show bookmarksbar after item was added to db and not before
2010-06-25 04:24:53 +00:00
_action_set_active (browser, "Bookmarkbar", TRUE);
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
g_free (selected);
Remove ghosts after bookmark edit. Merge edit/ delete callbacks
2010-07-02 04:50:14 +00:00
return_status = TRUE;
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
}
Clear the bookmarkbar before populating and populate after editing
2010-07-19 18:55:59 +00:00
if (gtk_widget_get_visible (browser->bookmarkbar))
midori_bookmarkbar_populate (browser);
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
gtk_widget_destroy (dialog);
Remove ghosts after bookmark edit. Merge edit/ delete callbacks
2010-07-02 04:50:14 +00:00
return return_status;
Add a Bookmark Add item to the link context menu.
2008-06-15 11:29:30 +00:00
}
Check free space before trying to download
2010-04-30 19:36:33 +00:00
static gboolean
midori_browser_prepare_download (MidoriBrowser* browser,
WebKitDownload* download,
const gchar* uri)
{
guint64 total_size = webkit_download_get_total_size (download);
GFile* file = g_file_new_for_uri (uri);
GFile* folder = g_file_get_parent (file);
GError* error = NULL;
GFileInfo* info = g_file_query_filesystem_info (folder,
G_FILE_ATTRIBUTE_FILESYSTEM_FREE, NULL, &error);
guint64 free_space = g_file_info_get_attribute_uint64 (info,
G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
Verify that the download location is writable
2010-09-30 23:12:12 +00:00
gchar* path = g_file_get_path (folder);
gboolean can_write = g_access (path, W_OK) == 0;
g_free (path);
Check free space before trying to download
2010-04-30 19:36:33 +00:00
g_object_unref (file);
g_object_unref (folder);
Verify that the download location is writable
2010-09-30 23:12:12 +00:00
if (free_space < total_size || !can_write)
Check free space before trying to download
2010-04-30 19:36:33 +00:00
{
Verify that the download location is writable
2010-09-30 23:12:12 +00:00
gchar* message;
gchar* detailed_message;
if (!can_write)
{
message = g_strdup_printf (
_("The file \"%s\" can't be saved in this folder."), &uri[7]);
detailed_message = g_strdup_printf (
_("You don't have permission to write in this location."));
}
else if (free_space < total_size)
{
Use g_format_size with GLib 2.30.0
2011-10-10 19:53:00 +00:00
gchar* total_size_string = g_format_size (total_size);
gchar* free_space_string = g_format_size (free_space);
Verify that the download location is writable
2010-09-30 23:12:12 +00:00
message = g_strdup_printf (
_("There is not enough free space to download \"%s\"."),
&uri[7]);
detailed_message = g_strdup_printf (
_("The file needs %s but only %s are left."),
total_size_string, free_space_string);
g_free (total_size_string);
g_free (free_space_string);
}
else
g_assert_not_reached ();
Show error dialogue for invalid bookmark export filename
2011-02-02 00:10:02 +00:00
sokoke_message_dialog (GTK_MESSAGE_ERROR, message, detailed_message, FALSE);
Check free space before trying to download
2010-04-30 19:36:33 +00:00
g_free (message);
g_free (detailed_message);
g_object_unref (download);
return FALSE;
}
webkit_download_set_destination_uri (download, uri);
Don't emit add-download before all preparations Notably verifying that there's space available and a file shouldn't be overriden has to come first. This already was the case for the transferbar which isn't using the signal.
2011-03-06 16:20:18 +00:00
g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download);
Refactor transferbar into MidoriTransferbar The transferbar is separated from the browser, albeit it is still created and filled from within the browser so it is not completely independent. The new class now keeps a list of TransferInfo items to keep track of transfers and queries the status from the download object. Destroying a button belonging to a transfer is connected to removing it from the list and cleaning up the info structure. Also the Clear button is updated from the destroy handler.
2010-06-17 18:03:11 +00:00
midori_transferbar_add_download_item (MIDORI_TRANSFERBAR (browser->transferbar), download);
Clear downloads when the transferbar is full Fixes: https://bugs.launchpad.net/midori/+bug/851452
2011-10-15 17:00:21 +00:00
midori_transferbar_check_size (browser->statusbar,
MIDORI_TRANSFERBAR (browser->transferbar));
Check free space before trying to download
2010-04-30 19:36:33 +00:00
return TRUE;
}
Implement Save As for arbitrary links
2008-11-09 21:07:42 +00:00
Reuse source of webview when saving a page to disk Fixes: https://bugs.launchpad.net/midori/+bug/782133
2011-05-30 15:55:02 +00:00
static gchar*
midori_browser_save_source (const gchar* uri,
const gchar* data,
const size_t len,
const gchar* outfile);
Implement Save As for arbitrary links
2008-11-09 21:07:42 +00:00
static void
midori_browser_save_uri (MidoriBrowser* browser,
const gchar* uri)
{
static gchar* last_dir = NULL;
gboolean folder_set = FALSE;
GtkWidget* dialog;
gchar* filename;
gchar* dirname;
gchar* last_slash;
gchar* folder;
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
return;
Wrap file chooser into the function sokoke_file_chooser_dialog_new
2009-11-14 16:38:16 +00:00
dialog = sokoke_file_chooser_dialog_new (_("Save file as"),
GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE);
Confirm before overwriting in Save As dialogue
2010-06-11 20:52:51 +00:00
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
Implement Save As for arbitrary links
2008-11-09 21:07:42 +00:00
if (uri)
{
/* Base the start folder on the current view's uri if it is local */
filename = g_filename_from_uri (uri, NULL, NULL);
if (filename)
{
dirname = g_path_get_dirname (filename);
if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR))
{
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname);
folder_set = TRUE;
}
g_free (dirname);
g_free (filename);
}
Don't confuse filename and input in midori_browser_save_uri The file chooser expects UTF-8 as if typed by the user, not a filename in the local encoding.
2011-11-07 22:11:08 +00:00
/* Try to provide a good default filename, UTF-8 encoded */
filename = soup_uri_decode (uri);
last_slash = g_strrstr (filename, "/") + 1;
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), last_slash);
Implement Save As for arbitrary links
2008-11-09 21:07:42 +00:00
g_free (filename);
}
if (!folder_set && last_dir && *last_dir)
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir);
Wrap file chooser into the function sokoke_file_chooser_dialog_new
2009-11-14 16:38:16 +00:00
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
Implement Save As for arbitrary links
2008-11-09 21:07:42 +00:00
{
Reuse source of webview when saving a page to disk Fixes: https://bugs.launchpad.net/midori/+bug/782133
2011-05-30 15:55:02 +00:00
GtkWidget* view;
GtkWidget* web_view;
WebKitWebDataSource *data_source;
WebKitWebFrame *frame;
const GString *data;
Use WebKitDownload to save web pages with Save As
2009-08-30 13:52:30 +00:00
Implement Save As for arbitrary links
2008-11-09 21:07:42 +00:00
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
Reuse source of webview when saving a page to disk Fixes: https://bugs.launchpad.net/midori/+bug/782133
2011-05-30 15:55:02 +00:00
view = midori_browser_get_current_tab (browser);
web_view = midori_view_get_web_view (MIDORI_VIEW (view));
frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view));
data_source = webkit_web_frame_get_data_source (frame);
data = webkit_web_data_source_get_data (data_source);
Handle unique_filename and null-check data source
2011-06-08 22:37:25 +00:00
if (data)
midori_browser_save_source (uri, data->str, data->len, filename);
Implement Save As for arbitrary links
2008-11-09 21:07:42 +00:00
g_free (last_dir);
last_dir = folder;
}
gtk_widget_destroy (dialog);
}
static void
midori_view_save_as_cb (GtkWidget* menuitem,
const gchar* uri,
GtkWidget* view)
{
MidoriBrowser* browser;
Add midori_browser_get_for_widget_utility function This function will look for a MidoriBrowser according to a particular widget - even if it's inside a detached panel window or any other window transient for the browser.
2009-04-23 02:10:38 +00:00
browser = midori_browser_get_for_widget (menuitem);
Implement Save As for arbitrary links
2008-11-09 21:07:42 +00:00
midori_browser_save_uri (browser, uri);
}
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
static gchar*
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
midori_browser_speed_dial_get_next_free_slot (MidoriView* view)
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
{
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
GKeyFile* key_file;
No need to check for rows and columns in speed dial now
2011-10-12 12:39:18 +00:00
guint slot_count = 0, slot = 1, i;
gchar** groups;
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
g_object_get (browser, "speed-dial", &key_file, NULL);
No need to check for rows and columns in speed dial now
2011-10-12 12:39:18 +00:00
groups = g_key_file_get_groups (key_file, NULL);
for (i = 0; groups[i]; i++)
{
if (g_key_file_has_key (key_file, groups[i], "uri", NULL))
slot_count++;
}
while (slot <= slot_count)
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
{
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
gchar* dial_id = g_strdup_printf ("Dial %d", slot);
if (!g_key_file_has_group (key_file, dial_id))
Store speed dial as JSON instead of actual HTML source This will make it possible to change the layout of the page without losing shortcuts.
2009-05-13 21:56:55 +00:00
{
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
g_free (dial_id);
return g_strdup_printf ("s%d", slot);
Store speed dial as JSON instead of actual HTML source This will make it possible to change the layout of the page without losing shortcuts.
2009-05-13 21:56:55 +00:00
}
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
g_free (dial_id);
slot++;
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
}
No need to check for rows and columns in speed dial now
2011-10-12 12:39:18 +00:00
return g_strdup_printf ("s%d", slot_count + 1);
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
}
static void
midori_browser_add_speed_dial (MidoriBrowser* browser)
{
Generate thumbnails as needed without saving to disk
2009-05-21 17:14:46 +00:00
GdkPixbuf* img;
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
GtkWidget* view = midori_browser_get_current_tab (browser);
gchar* uri = g_strdup (midori_view_get_display_uri (MIDORI_VIEW (view)));
gchar* title = g_strdup (midori_view_get_display_title (MIDORI_VIEW (view)));
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
gchar* slot_id = midori_browser_speed_dial_get_next_free_slot (MIDORI_VIEW (view));
Protect speed dial against quoting in titles
2009-05-15 21:49:01 +00:00
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
if (slot_id == NULL)
{
g_free (uri);
g_free (title);
return;
}
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
if ((img = midori_view_get_snapshot (MIDORI_VIEW (view), 240, 160)))
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
{
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
GKeyFile* key_file;
gchar* dial_id = g_strdup_printf ("Dial %s", slot_id + 1);
Save speed dial thumbnails by uri rather than by dial id
2011-04-08 19:18:41 +00:00
gchar* file_path = sokoke_build_thumbnail_path (uri);
Check for thumbnail directory when saving thumbnail files
2011-04-05 17:52:59 +00:00
gchar* thumb_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_user_cache_dir (),
PACKAGE_NAME, "thumbnails", NULL);
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
g_object_get (browser, "speed-dial", &key_file, NULL);
Protect speed dial against quoting in titles
2009-05-15 21:49:01 +00:00
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
g_key_file_set_string (key_file, dial_id, "uri", uri);
g_key_file_set_string (key_file, dial_id, "title", title);
Protect speed dial against quoting in titles
2009-05-15 21:49:01 +00:00
Check for thumbnail directory when saving thumbnail files
2011-04-05 17:52:59 +00:00
if (!g_file_test (thumb_dir, G_FILE_TEST_EXISTS))
katze_mkdir_with_parents (thumb_dir, 0700);
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
gdk_pixbuf_save (img, file_path, "png", NULL, "compression", "7", NULL);
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
Introduce and use midori_view_save_speed_dial_config
2011-10-07 19:07:21 +00:00
midori_view_save_speed_dial_config (MIDORI_VIEW (view), key_file);
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
g_object_unref (img);
g_free (file_path);
Check for thumbnail directory when saving thumbnail files
2011-04-05 17:52:59 +00:00
g_free (thumb_dir);
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
g_free (dial_id);
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
}
Don't leak strings when adding speed dial shortcut
2010-10-14 18:26:23 +00:00
g_free (uri);
Generate speed dial from key file without JSON A timer for speed dial is shown if MIDORI_STARTTIME is defined.
2011-03-22 21:59:56 +00:00
g_free (title);
Don't leak strings when adding speed dial shortcut
2010-10-14 18:26:23 +00:00
g_free (slot_id);
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
}
static void
midori_view_add_speed_dial_cb (GtkWidget* menuitem,
const gchar* uri,
GtkWidget* view)
{
MidoriBrowser* browser;
browser = midori_browser_get_for_widget (menuitem);
midori_browser_add_speed_dial (browser);
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static gboolean
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
midori_browser_tab_leave_notify_event_cb (GtkWidget* widget,
GdkEventCrossing* event,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
_midori_browser_set_statusbar_text (browser, NULL);
return TRUE;
}
static void
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
midori_view_activate_action_cb (GtkWidget* view,
const gchar* action,
MidoriBrowser* browser)
{
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
midori_browser_activate_action (browser, action);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
}
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
static void
midori_view_attach_inspector_cb (GtkWidget* view,
GtkWidget* inspector_view,
MidoriBrowser* browser)
{
Implement web inspector attaching/ detaching properly
2009-12-23 15:46:14 +00:00
GtkWidget* toplevel;
GtkWidget* scrolled;
toplevel = gtk_widget_get_toplevel (inspector_view);
gtk_widget_hide (toplevel);
scrolled = gtk_widget_get_parent (browser->inspector_view);
gtk_widget_destroy (browser->inspector_view);
gtk_widget_reparent (inspector_view, scrolled);
gtk_widget_show_all (browser->inspector);
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
browser->inspector_view = inspector_view;
Implement web inspector attaching/ detaching properly
2009-12-23 15:46:14 +00:00
gtk_widget_destroy (toplevel);
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
}
Fix detaching and reattaching the inspector to browser Probably related to https://bugs.launchpad.net/midori/+bug/746540 Special thanks to Andy Kittner, who helped me with debugging.
2011-04-04 19:56:21 +00:00
static void
midori_view_detach_inspector_cb (GtkWidget* view,
GtkWidget* inspector_view,
MidoriBrowser* browser)
{
GtkWidget* scrolled = gtk_widget_get_parent (GTK_WIDGET (inspector_view));
Don't destroy inspector window that will be re-used
2011-04-19 21:21:31 +00:00
GtkWidget* paned = gtk_widget_get_parent (scrolled);
Fix detaching and reattaching the inspector to browser Probably related to https://bugs.launchpad.net/midori/+bug/746540 Special thanks to Andy Kittner, who helped me with debugging.
2011-04-04 19:56:21 +00:00
browser->inspector_view = gtk_viewport_new (NULL, NULL);
gtk_container_remove (GTK_CONTAINER (scrolled), GTK_WIDGET (inspector_view));
gtk_container_add (GTK_CONTAINER (scrolled), browser->inspector_view);
Don't destroy inspector window that will be re-used
2011-04-19 21:21:31 +00:00
gtk_widget_hide (paned);
Fix detaching and reattaching the inspector to browser Probably related to https://bugs.launchpad.net/midori/+bug/746540 Special thanks to Andy Kittner, who helped me with debugging.
2011-04-04 19:56:21 +00:00
}
Copy the back forward history when opening a new tab
2009-07-30 21:38:14 +00:00
static void
midori_browser_view_copy_history (GtkWidget* view_to,
Copy history in MidoriBrowser::new-view, eg. when duplicating a tab
2009-07-31 10:41:10 +00:00
GtkWidget* view_from,
gboolean omit_last)
Copy the back forward history when opening a new tab
2009-07-30 21:38:14 +00:00
{
WebKitWebView* copy_from;
WebKitWebBackForwardList* list_from;
WebKitWebView* copy_to;
WebKitWebBackForwardList* list_to;
guint length_from;
Use a signed counter variable when copying history
2009-07-31 10:31:41 +00:00
gint i;
Copy the back forward history when opening a new tab
2009-07-30 21:38:14 +00:00
Change MidoriView into a subclass of GtkVBox This change makes it possible to pack widgets, notably info bars, into a MidoriView.
2010-03-30 20:45:49 +00:00
copy_from = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view_from)));
Copy the back forward history when opening a new tab
2009-07-30 21:38:14 +00:00
list_from = webkit_web_view_get_back_forward_list (copy_from);
Change MidoriView into a subclass of GtkVBox This change makes it possible to pack widgets, notably info bars, into a MidoriView.
2010-03-30 20:45:49 +00:00
copy_to = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view_to)));
Copy the back forward history when opening a new tab
2009-07-30 21:38:14 +00:00
list_to = webkit_web_view_get_back_forward_list (copy_to);
length_from = webkit_web_back_forward_list_get_back_length (list_from);
g_return_if_fail (!webkit_web_back_forward_list_get_back_length (list_to));
Copy history in MidoriBrowser::new-view, eg. when duplicating a tab
2009-07-31 10:41:10 +00:00
for (i = -length_from; i <= (omit_last ? -1 : 0); i++)
Copy the back forward history when opening a new tab
2009-07-30 21:38:14 +00:00
{
webkit_web_back_forward_list_add_item (list_to,
webkit_web_back_forward_list_get_nth_item (list_from, i));
}
}
Flash browser window if new tab opened in background
2011-08-09 17:41:20 +00:00
static gint
midori_browser_notify_new_tab_timeout_cb (MidoriBrowser *browser)
{
gtk_window_set_opacity (GTK_WINDOW (browser), 1);
return 0;
}
static void
midori_browser_notify_new_tab (MidoriBrowser *browser)
{
if (katze_object_get_boolean (browser->settings, "flash-window-on-new-bg-tabs"))
{
gtk_window_set_opacity (GTK_WINDOW (browser), 0.8);
Use GLib timeout rather than the dusty GTK+ API
2011-08-18 16:05:57 +00:00
g_timeout_add (100, (GSourceFunc) midori_browser_notify_new_tab_timeout_cb, browser);
Flash browser window if new tab opened in background
2011-08-09 17:41:20 +00:00
}
}
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
static void
midori_view_new_tab_cb (GtkWidget* view,
const gchar* uri,
Reimplement missing preferences Implement font properties, web features, Middle click opens selection, Open tabs in the background and proxy. While we are at it, remove Tab label size.
2008-10-02 22:49:16 +00:00
gboolean background,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
gint n = midori_browser_add_uri (browser, uri);
Copy the back forward history when opening a new tab
2009-07-30 21:38:14 +00:00
midori_browser_view_copy_history (midori_browser_get_nth_tab (browser, n),
Copy history in MidoriBrowser::new-view, eg. when duplicating a tab
2009-07-31 10:41:10 +00:00
view, FALSE);
Copy the back forward history when opening a new tab
2009-07-30 21:38:14 +00:00
Respect the view's idea of back- or foreground when opening new tabs
2009-07-22 21:55:05 +00:00
if (!background)
midori_browser_set_current_page (browser, n);
Flash browser window if new tab opened in background
2011-08-09 17:41:20 +00:00
else
midori_browser_notify_new_tab (browser);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
midori_view_new_window_cb (GtkWidget* view,
const gchar* uri,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Leave setting up windows to the app, which is a lot faster With a mature history setting up a browser window can be slow, but if it's setup at creation time it is extremely fast. The signal prototype of MidoriBrowser::new-window had to change, all call sites were adjusted.
2009-10-30 22:43:28 +00:00
MidoriBrowser* new_browser;
g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
Fallback for opening new windows in app mode This is not quite enough, inheriting config won't work, but better than nothing at all.
2010-10-24 18:33:38 +00:00
if (new_browser)
midori_browser_add_uri (new_browser, uri);
else /* No MidoriApp, so this is app or private mode */
sokoke_spawn_app (uri, TRUE);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Support opening of new windows The preference determining where to open those windows is not currently honored, so everything goes in a new tab. Incidentally compile time checks guarding the web inspector are replaced with runtime checks here, and the same approach is used for the create-web-view signal. The features are used if available.
2008-12-03 03:16:19 +00:00
static void
midori_view_new_view_cb (GtkWidget* view,
GtkWidget* new_view,
MidoriNewView where,
Show a notification upon opening a tab or window The notification is shown when in fullscreen mode or the window is maximised, and a window is opened or a tab is opened while the tab bar is not visible.
2011-04-19 21:16:34 +00:00
gboolean user_initiated,
Support opening of new windows The preference determining where to open those windows is not currently honored, so everything goes in a new tab. Incidentally compile time checks guarding the web inspector are replaced with runtime checks here, and the same approach is used for the create-web-view signal. The features are used if available.
2008-12-03 03:16:19 +00:00
MidoriBrowser* browser)
{
Copy history in MidoriBrowser::new-view, eg. when duplicating a tab
2009-07-31 10:41:10 +00:00
midori_browser_view_copy_history (new_view, view, TRUE);
Support opening of new windows The preference determining where to open those windows is not currently honored, so everything goes in a new tab. Incidentally compile time checks guarding the web inspector are replaced with runtime checks here, and the same approach is used for the create-web-view signal. The features are used if available.
2008-12-03 03:16:19 +00:00
if (where == MIDORI_NEW_VIEW_WINDOW)
{
Leave setting up windows to the app, which is a lot faster With a mature history setting up a browser window can be slow, but if it's setup at creation time it is extremely fast. The signal prototype of MidoriBrowser::new-window had to change, all call sites were adjusted.
2009-10-30 22:43:28 +00:00
MidoriBrowser* new_browser;
g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
Implement Open new pages in: New window preference
2009-05-17 18:29:31 +00:00
midori_browser_add_tab (new_browser, new_view);
midori_browser_set_current_tab (new_browser, new_view);
Support opening of new windows The preference determining where to open those windows is not currently honored, so everything goes in a new tab. Incidentally compile time checks guarding the web inspector are replaced with runtime checks here, and the same approach is used for the create-web-view signal. The features are used if available.
2008-12-03 03:16:19 +00:00
}
Open all links in the current tab if Open new pages in: Current Tab is set There is a small flaw in that we also open all windows opened by scripts in the current tab and we don't treat popup windows specially.
2009-11-10 19:04:48 +00:00
else if (gtk_widget_get_parent (new_view) != browser->notebook)
Support opening of new windows The preference determining where to open those windows is not currently honored, so everything goes in a new tab. Incidentally compile time checks guarding the web inspector are replaced with runtime checks here, and the same approach is used for the create-web-view signal. The features are used if available.
2008-12-03 03:16:19 +00:00
{
gint n = midori_browser_add_tab (browser, new_view);
if (where != MIDORI_NEW_VIEW_BACKGROUND)
midori_browser_set_current_page (browser, n);
Flash browser window if new tab opened in background
2011-08-09 17:41:20 +00:00
else
midori_browser_notify_new_tab (browser);
Support opening of new windows The preference determining where to open those windows is not currently honored, so everything goes in a new tab. Incidentally compile time checks guarding the web inspector are replaced with runtime checks here, and the same approach is used for the create-web-view signal. The features are used if available.
2008-12-03 03:16:19 +00:00
}
Show a notification upon opening a tab or window The notification is shown when in fullscreen mode or the window is maximised, and a window is opened or a tab is opened while the tab bar is not visible.
2011-04-19 21:16:34 +00:00
if (!user_initiated)
{
GdkWindow* window = gtk_widget_get_window (GTK_WIDGET (browser));
GdkWindowState state = gdk_window_get_state (window);
if ((state | GDK_WINDOW_STATE_MAXIMIZED)
|| (state | GDK_WINDOW_STATE_FULLSCREEN))
{
if (where == MIDORI_NEW_VIEW_WINDOW)
g_signal_emit (browser, signals[SEND_NOTIFICATION], 0,
_("New Window"), _("A new window has been opened"));
else if (!browser->show_tabs)
g_signal_emit (browser, signals[SEND_NOTIFICATION], 0,
_("New Tab"), _("A new tab has been opened"));
}
}
Support opening of new windows The preference determining where to open those windows is not currently honored, so everything goes in a new tab. Incidentally compile time checks guarding the web inspector are replaced with runtime checks here, and the same approach is used for the create-web-view signal. The features are used if available.
2008-12-03 03:16:19 +00:00
}
Implement a Save As button in the download dialogue
2009-06-01 17:33:44 +00:00
static void
midori_view_download_save_as_response_cb (GtkWidget* dialog,
gint response,
Remember last folder of the Save As dialog when downloading files This is done by creating the dialog only once and holding a reference to it in memory. When the dialog is closed, it is only hidden instead of destroyed. So, the next time we just re-show the dialog with the previously used directory. It is destroyed when the parent MidoriBrowser instance is destroyed.
2009-06-02 23:15:36 +00:00
MidoriBrowser* browser)
Implement a Save As button in the download dialogue
2009-06-01 17:33:44 +00:00
{
Remember last folder of the Save As dialog when downloading files This is done by creating the dialog only once and holding a reference to it in memory. When the dialog is closed, it is only hidden instead of destroyed. So, the next time we just re-show the dialog with the previously used directory. It is destroyed when the parent MidoriBrowser instance is destroyed.
2009-06-02 23:15:36 +00:00
WebKitDownload* download = g_object_get_data (G_OBJECT (dialog), "download");
Check for the correct dialogue response for Save As This fixes choosing Save As in file download fialogues.
2009-12-09 19:56:47 +00:00
if (response == GTK_RESPONSE_OK)
Implement a Save As button in the download dialogue
2009-06-01 17:33:44 +00:00
{
gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
Check free space before trying to download
2010-04-30 19:36:33 +00:00
if (midori_browser_prepare_download (browser, download, uri))
webkit_download_start (download);
Implement a Save As button in the download dialogue
2009-06-01 17:33:44 +00:00
g_free (uri);
}
Only show the download if it's actually accepted
2009-06-01 17:57:43 +00:00
else
g_object_unref (download);
Remember last folder of the Save As dialog when downloading files This is done by creating the dialog only once and holding a reference to it in memory. When the dialog is closed, it is only hidden instead of destroyed. So, the next time we just re-show the dialog with the previously used directory. It is destroyed when the parent MidoriBrowser instance is destroyed.
2009-06-02 23:15:36 +00:00
gtk_widget_hide (dialog);
Implement a Save As button in the download dialogue
2009-06-01 17:33:44 +00:00
}
Implement Open in Image Viewer menu item Add helper functions to handle filenames: midori_browser_download_prepare_destination_uri midori_browser_download_prepare_filename Fixes: https://bugs.launchpad.net/midori/+bug/699992
2012-01-13 22:53:09 +00:00
static void
midori_browser_download_status_cb (WebKitDownload* download,
GParamSpec* pspec,
gpointer user_data)
{
const gchar* uri = webkit_download_get_destination_uri (download);
switch (webkit_download_get_status (download))
{
case WEBKIT_DOWNLOAD_STATUS_FINISHED:
if (!g_app_info_launch_default_for_uri (uri, NULL, NULL))
{
sokoke_message_dialog (GTK_MESSAGE_ERROR,
_("Error opening the image!"),
_("Can not open selected image in a default viewer."), FALSE);
}
break;
case WEBKIT_DOWNLOAD_STATUS_ERROR:
webkit_download_cancel (download);
sokoke_message_dialog (GTK_MESSAGE_ERROR,
_("Error downloading the image!"),
_("Can not downlaod selected image."), FALSE);
break;
case WEBKIT_DOWNLOAD_STATUS_CREATED:
case WEBKIT_DOWNLOAD_STATUS_STARTED:
case WEBKIT_DOWNLOAD_STATUS_CANCELLED:
break;
}
}
static gchar*
midori_browser_download_prepare_filename (gchar* filename)
{
if (g_file_test (filename, G_FILE_TEST_EXISTS))
{
int i = 1;
const gchar* dot_pos;
const gchar* last_separator;
gchar* serial;
GString* tmp_filename;
gssize position;
last_separator = strrchr (filename, G_DIR_SEPARATOR);
dot_pos = strrchr ((last_separator) ? last_separator : filename, '.');
position = dot_pos ? (dot_pos - filename) : (gssize) strlen (filename);
tmp_filename = g_string_new (NULL);
do
{
serial = g_strdup_printf ("-%d", i++);
g_string_assign (tmp_filename, filename);
g_string_insert (tmp_filename, position, serial);
g_free (serial);
} while (g_file_test (tmp_filename->str, G_FILE_TEST_EXISTS));
g_free (filename);
filename = g_string_free (tmp_filename, FALSE);
}
return filename;
}
static gchar*
New download filename generation for all downloads
2012-01-13 23:13:52 +00:00
midori_browser_download_prepare_destination_uri (WebKitDownload* download,
const gchar* folder)
Implement Open in Image Viewer menu item Add helper functions to handle filenames: midori_browser_download_prepare_destination_uri midori_browser_download_prepare_filename Fixes: https://bugs.launchpad.net/midori/+bug/699992
2012-01-13 22:53:09 +00:00
{
New download filename generation for all downloads
2012-01-13 23:13:52 +00:00
const gchar* suggested_filename;
Implement Open in Image Viewer menu item Add helper functions to handle filenames: midori_browser_download_prepare_destination_uri midori_browser_download_prepare_filename Fixes: https://bugs.launchpad.net/midori/+bug/699992
2012-01-13 22:53:09 +00:00
GFile* file_source;
gchar* file_basename;
New download filename generation for all downloads
2012-01-13 23:13:52 +00:00
gchar* download_dir = NULL;
Implement Open in Image Viewer menu item Add helper functions to handle filenames: midori_browser_download_prepare_destination_uri midori_browser_download_prepare_filename Fixes: https://bugs.launchpad.net/midori/+bug/699992
2012-01-13 22:53:09 +00:00
gchar* destination_uri;
gchar* destination_filename;
gchar* midori_tmp_dir;
New download filename generation for all downloads
2012-01-13 23:13:52 +00:00
suggested_filename = webkit_download_get_suggested_filename (download);
file_source = g_file_new_for_uri (suggested_filename);
Implement Open in Image Viewer menu item Add helper functions to handle filenames: midori_browser_download_prepare_destination_uri midori_browser_download_prepare_filename Fixes: https://bugs.launchpad.net/midori/+bug/699992
2012-01-13 22:53:09 +00:00
file_basename = g_file_get_basename (file_source);
New download filename generation for all downloads
2012-01-13 23:13:52 +00:00
if (folder == NULL)
{
midori_tmp_dir = g_strconcat ("midori-", g_get_user_name (), NULL);
download_dir = g_build_filename (g_get_tmp_dir (), midori_tmp_dir, NULL);
g_free (midori_tmp_dir);
}
else
download_dir = (gchar*)folder;
Implement Open in Image Viewer menu item Add helper functions to handle filenames: midori_browser_download_prepare_destination_uri midori_browser_download_prepare_filename Fixes: https://bugs.launchpad.net/midori/+bug/699992
2012-01-13 22:53:09 +00:00
destination_filename = g_build_filename (download_dir, file_basename, NULL);
destination_filename = midori_browser_download_prepare_filename (destination_filename);
destination_uri = g_filename_to_uri (destination_filename, NULL, NULL);
if (!g_file_test (download_dir, G_FILE_TEST_EXISTS))
katze_mkdir_with_parents (download_dir, 0700);
g_free (file_basename);
New download filename generation for all downloads
2012-01-13 23:13:52 +00:00
if (folder == NULL)
g_free (download_dir);
Implement Open in Image Viewer menu item Add helper functions to handle filenames: midori_browser_download_prepare_destination_uri midori_browser_download_prepare_filename Fixes: https://bugs.launchpad.net/midori/+bug/699992
2012-01-13 22:53:09 +00:00
g_free (destination_filename);
g_object_unref (file_source);
return destination_uri;
}
Initial support for WebKitDownload At this point all downloads run automatically and appear in the statusbar. The destination folder can be chosen in the preferences. Download can be cancelled. The context menu works as well.
2009-03-19 17:28:50 +00:00
static gboolean
midori_view_download_requested_cb (GtkWidget* view,
WebKitDownload* download,
MidoriBrowser* browser)
{
Implement Open in Image Viewer menu item Add helper functions to handle filenames: midori_browser_download_prepare_destination_uri midori_browser_download_prepare_filename Fixes: https://bugs.launchpad.net/midori/+bug/699992
2012-01-13 22:53:09 +00:00
if (g_object_get_data (G_OBJECT (download), "open-in-viewer"))
{
New download filename generation for all downloads
2012-01-13 23:13:52 +00:00
gchar* destination_uri =
midori_browser_download_prepare_destination_uri (download, NULL);
Implement Open in Image Viewer menu item Add helper functions to handle filenames: midori_browser_download_prepare_destination_uri midori_browser_download_prepare_filename Fixes: https://bugs.launchpad.net/midori/+bug/699992
2012-01-13 22:53:09 +00:00
midori_browser_prepare_download (browser, download, destination_uri);
g_signal_connect (download, "notify::status",
G_CALLBACK (midori_browser_download_status_cb), (gpointer) browser);
webkit_download_start (download);
g_free (destination_uri);
}
else if (!webkit_download_get_destination_uri (download))
Show a dialog before downloading asking what to do
2009-03-20 23:40:03 +00:00
{
Implement a Save As button in the download dialogue
2009-06-01 17:33:44 +00:00
if (g_object_get_data (G_OBJECT (download), "save-as-download"))
{
Remember last folder of the Save As dialog when downloading files This is done by creating the dialog only once and holding a reference to it in memory. When the dialog is closed, it is only hidden instead of destroyed. So, the next time we just re-show the dialog with the previously used directory. It is destroyed when the parent MidoriBrowser instance is destroyed.
2009-06-02 23:15:36 +00:00
static GtkWidget* dialog = NULL;
if (!dialog)
{
New download filename generation for all downloads
2012-01-13 23:13:52 +00:00
gchar* folder;
Wrap file chooser into the function sokoke_file_chooser_dialog_new
2009-11-14 16:38:16 +00:00
dialog = sokoke_file_chooser_dialog_new (_("Save file"),
GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE);
Take care to avoid overwriting files accidentally When a file needs to be saved in a specific location, ask whether to overwrite or not. And if a file is saved implicitly, append a number if the filename exists.
2010-05-07 21:34:53 +00:00
gtk_file_chooser_set_do_overwrite_confirmation (
GTK_FILE_CHOOSER (dialog), TRUE);
Remember last folder of the Save As dialog when downloading files This is done by creating the dialog only once and holding a reference to it in memory. When the dialog is closed, it is only hidden instead of destroyed. So, the next time we just re-show the dialog with the previously used directory. It is destroyed when the parent MidoriBrowser instance is destroyed.
2009-06-02 23:15:36 +00:00
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
folder = katze_object_get_string (browser->settings, "download-folder");
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), folder);
g_free (folder);
Unset save file dialog when it is destroyed If the window manager closes the dialogue rather than one of the buttons, it is destroyed implicitly.
2010-04-24 22:57:21 +00:00
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed), &dialog);
Remember last folder of the Save As dialog when downloading files This is done by creating the dialog only once and holding a reference to it in memory. When the dialog is closed, it is only hidden instead of destroyed. So, the next time we just re-show the dialog with the previously used directory. It is destroyed when the parent MidoriBrowser instance is destroyed.
2009-06-02 23:15:36 +00:00
g_signal_connect (dialog, "response",
G_CALLBACK (midori_view_download_save_as_response_cb), browser);
}
g_object_set_data (G_OBJECT (dialog), "download", download);
Show the suggested filename in the Save As dialog for downloads
2009-06-02 22:59:41 +00:00
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog),
webkit_download_get_suggested_filename (download));
Implement a Save As button in the download dialogue
2009-06-01 17:33:44 +00:00
gtk_widget_show (dialog);
}
Save files which are opened immediately to the temporary folder
2009-03-31 19:19:48 +00:00
else
Implement a Save As button in the download dialogue
2009-06-01 17:33:44 +00:00
{
New download filename generation for all downloads
2012-01-13 23:13:52 +00:00
gchar* folder = g_object_get_data (G_OBJECT (download), "open-download")
? NULL : katze_object_get_string (browser->settings, "download-folder");
gchar* destination_uri =
midori_browser_download_prepare_destination_uri (download, folder);
midori_browser_prepare_download (browser, download, destination_uri);
g_free (destination_uri);
Implement a Save As button in the download dialogue
2009-06-01 17:33:44 +00:00
}
Show a dialog before downloading asking what to do
2009-03-20 23:40:03 +00:00
}
Move download dialog to the view and don't show an error page We have to handle the dialog when the MIME type is requested, otherwise we don't know the type. Plus we stop the loading now to avoid seeing an error page.
2009-03-21 14:06:57 +00:00
return TRUE;
Initial support for WebKitDownload At this point all downloads run automatically and appear in the statusbar. The destination folder can be chosen in the preferences. Download can be cancelled. The context menu works as well.
2009-03-19 17:28:50 +00:00
}
Make Find work again, and disable it for source tabs
2008-09-28 14:29:41 +00:00
static void
midori_view_search_text_cb (GtkWidget* view,
gboolean found,
Implement a primitive find-as-you-type
2009-02-22 00:45:22 +00:00
gchar* typing,
Make Find work again, and disable it for source tabs
2008-09-28 14:29:41 +00:00
MidoriBrowser* browser)
{
Refactor findbar into MidoriFindbar The findbar still depends on the browser for knowing when to search and to propagate focus. Behaviour did not change.
2010-06-20 18:13:39 +00:00
midori_findbar_search_text (MIDORI_FINDBAR (browser->find), view, found, typing);
Make Find work again, and disable it for source tabs
2008-09-28 14:29:41 +00:00
}
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
static gboolean
midori_browser_tab_destroy_cb (GtkWidget* widget,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
KatzeItem* item;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
if (browser->proxy_array && MIDORI_IS_VIEW (widget))
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
item = midori_view_get_proxy_item (MIDORI_VIEW (widget));
Prevent blank pages from landing in the trash This actually used to work but meanwhile the definition of a blank view changed.
2008-10-10 20:50:56 +00:00
if (browser->trash && !midori_view_is_blank (MIDORI_VIEW (widget)))
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
katze_array_add_item (browser->trash, item);
katze_array_remove_item (browser->proxy_array, item);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
_midori_browser_update_actions (browser);
Ensure REMOVE_TAB emission, don't alter session when destroying
2008-07-25 10:45:50 +00:00
/* This callback must only be called once, but we need to ensure
that "remove-tab" is emitted in any case */
g_signal_handlers_disconnect_by_func (widget,
midori_browser_tab_destroy_cb, browser);
g_signal_emit (browser, signals[REMOVE_TAB], 0, widget);
Add Always Show Tabbar preference
2008-10-03 23:45:17 +00:00
/* We don't ever want to be in a situation with no tabs,
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
so just create an empty one if the last one is closed.
The only exception is when we are closing the window,
which is indicated by the proxy array having been unset. */
if (browser->proxy_array && !midori_browser_get_current_tab (browser))
Add Always Show Tabbar preference
2008-10-03 23:45:17 +00:00
midori_browser_add_uri (browser, "");
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
return FALSE;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
No timeout for notebook sizing, but a size cache The timeout was a bad idea because it means the user can see what's happening for a short period of time. Caching the last size is less efficent but there's no visible delay and it's still a big win.
2011-12-16 00:15:50 +00:00
static void
midori_browser_notebook_resize (MidoriBrowser* browser,
GdkRectangle* allocation)
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
{
gint new_size = 0;
gint n = gtk_notebook_get_n_pages (GTK_NOTEBOOK(browser->notebook));
const gint max_size = 150;
Respect close button visibility for tab size And use the themed icon size.
2011-10-26 17:40:14 +00:00
gint min_size;
gint icon_size = 16;
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
GtkAllocation notebook_size;
Iterate children in notebook_alloc_timeout
2011-12-10 18:30:48 +00:00
GList* children;
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
No timeout for notebook sizing, but a size cache The timeout was a bad idea because it means the user can see what's happening for a short period of time. Caching the last size is less efficent but there's no visible delay and it's still a big win.
2011-12-16 00:15:50 +00:00
g_return_if_fail (n > 0);
if (allocation != NULL)
notebook_size.width = allocation->width;
else
gtk_widget_get_allocation (browser->notebook, &notebook_size);
new_size = notebook_size.width / n - 7;
Respect close button visibility for tab size And use the themed icon size.
2011-10-26 17:40:14 +00:00
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (browser->notebook),
GTK_ICON_SIZE_MENU, &icon_size, NULL);
min_size = icon_size;
if (katze_object_get_boolean (browser->settings, "close-buttons-on-tabs"))
min_size += icon_size;
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
if (new_size < min_size) new_size = min_size;
if (new_size > max_size) new_size = max_size;
No timeout for notebook sizing, but a size cache The timeout was a bad idea because it means the user can see what's happening for a short period of time. Caching the last size is less efficent but there's no visible delay and it's still a big win.
2011-12-16 00:15:50 +00:00
if (new_size > browser->last_tab_size - 3
&& new_size < browser->last_tab_size + 3)
return;
browser->last_tab_size = new_size;
Iterate children in notebook_alloc_timeout
2011-12-10 18:30:48 +00:00
children = gtk_container_get_children (GTK_CONTAINER (browser->notebook));
for (; children; children = g_list_next (children))
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
{
Iterate children in notebook_alloc_timeout
2011-12-10 18:30:48 +00:00
GtkWidget* view = children->data;
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
GtkWidget* label;
label = gtk_notebook_get_tab_label (GTK_NOTEBOOK(browser->notebook), view);
Don't resize empty thumbnail tab labels
2011-03-23 21:48:53 +00:00
/* Don't resize empty bin, which is used for thumbnail tabs */
Always render icon only tabs at their natural size
2011-04-03 21:59:29 +00:00
if (GTK_IS_BIN (label) && gtk_bin_get_child (GTK_BIN (label))
&& !katze_object_get_boolean (view, "minimized"))
Don't resize empty thumbnail tab labels
2011-03-23 21:48:53 +00:00
gtk_widget_set_size_request (label, new_size, -1);
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
}
Set a timeout on notebook size updates
2011-12-09 19:59:32 +00:00
}
static void
midori_browser_notebook_size_allocate_cb (GtkWidget* widget,
GdkRectangle* allocation,
MidoriBrowser* browser)
{
Reduce notebook alloc timeout and update each time
2011-12-10 18:27:05 +00:00
if (!gtk_notebook_get_show_tabs (GTK_NOTEBOOK (browser->notebook)))
Set a timeout on notebook size updates
2011-12-09 19:59:32 +00:00
return;
No timeout for notebook sizing, but a size cache The timeout was a bad idea because it means the user can see what's happening for a short period of time. Caching the last size is less efficent but there's no visible delay and it's still a big win.
2011-12-16 00:15:50 +00:00
midori_browser_notebook_resize (browser, allocation);
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
}
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
static void
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
_midori_browser_add_tab (MidoriBrowser* browser,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view)
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
{
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
GtkNotebook* notebook = GTK_NOTEBOOK (browser->notebook);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* tab_label;
KatzeItem* item;
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
guint n;
Don't use GTK_WIDGET_SET_FLAGS in browser and panel
2010-10-04 19:36:26 +00:00
gtk_widget_set_can_focus (view, TRUE);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
tab_label = midori_view_get_proxy_tab_label (MIDORI_VIEW (view));
No timeout for notebook sizing, but a size cache The timeout was a bad idea because it means the user can see what's happening for a short period of time. Caching the last size is less efficent but there's no visible delay and it's still a big win.
2011-12-16 00:15:50 +00:00
/* Don't resize empty bin, which is used for thumbnail tabs */
if (GTK_IS_BIN (tab_label) && gtk_bin_get_child (GTK_BIN (tab_label))
&& !katze_object_get_boolean (view, "minimized"))
gtk_widget_set_size_request (tab_label, browser->last_tab_size, -1);
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
item = midori_view_get_proxy_item (MIDORI_VIEW (view));
katze_array_add_item (browser->proxy_array, item);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
g_object_connect (view,
"signal::notify::icon",
midori_view_notify_icon_cb, browser,
"signal::notify::load-status",
midori_view_notify_load_status_cb, browser,
"signal::notify::progress",
midori_view_notify_progress_cb, browser,
Update address and actions properly when navigating in-page
2009-05-14 23:18:14 +00:00
"signal::notify::uri",
midori_view_notify_uri_cb, browser,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
"signal::notify::title",
midori_view_notify_title_cb, browser,
Always render icon only tabs at their natural size
2011-04-03 21:59:29 +00:00
"signal::notify::minimized",
midori_view_notify_minimized_cb, browser,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
"signal::notify::zoom-level",
midori_view_notify_zoom_level_cb, browser,
"signal::notify::statusbar-text",
midori_view_notify_statusbar_text_cb, browser,
"signal::activate-action",
midori_view_activate_action_cb, browser,
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
"signal::attach-inspector",
midori_view_attach_inspector_cb, browser,
Fix detaching and reattaching the inspector to browser Probably related to https://bugs.launchpad.net/midori/+bug/746540 Special thanks to Andy Kittner, who helped me with debugging.
2011-04-04 19:56:21 +00:00
"signal::detach-inspector",
midori_view_detach_inspector_cb, browser,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
"signal::new-tab",
midori_view_new_tab_cb, browser,
"signal::new-window",
midori_view_new_window_cb, browser,
Support opening of new windows The preference determining where to open those windows is not currently honored, so everything goes in a new tab. Incidentally compile time checks guarding the web inspector are replaced with runtime checks here, and the same approach is used for the create-web-view signal. The features are used if available.
2008-12-03 03:16:19 +00:00
"signal::new-view",
midori_view_new_view_cb, browser,
Initial support for WebKitDownload At this point all downloads run automatically and appear in the statusbar. The destination folder can be chosen in the preferences. Download can be cancelled. The context menu works as well.
2009-03-19 17:28:50 +00:00
"signal::download-requested",
midori_view_download_requested_cb, browser,
Make Find work again, and disable it for source tabs
2008-09-28 14:29:41 +00:00
"signal::search-text",
midori_view_search_text_cb, browser,
Implement Save As for arbitrary links
2008-11-09 21:07:42 +00:00
"signal::save-as",
midori_view_save_as_cb, browser,
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
"signal::add-speed-dial",
midori_view_add_speed_dial_cb, browser,
Support opening of new windows The preference determining where to open those windows is not currently honored, so everything goes in a new tab. Incidentally compile time checks guarding the web inspector are replaced with runtime checks here, and the same approach is used for the create-web-view signal. The features are used if available.
2008-12-03 03:16:19 +00:00
"signal::leave-notify-event",
midori_browser_tab_leave_notify_event_cb, browser,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
NULL);
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
Handle 'append' as meta, neither object data nor argument This is more in line with 'dont-write-history' and 'delay'.
2011-12-07 22:15:04 +00:00
if (!katze_item_get_meta_boolean (item, "append") &&
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
katze_object_get_boolean (browser->settings, "open-tabs-next-to-current"))
Introduce Open Tabs next to Current At the same time make Open popups in tabs readonly and hide it in the Preferences, as well as Open new pages in and the whole Privacy page.
2008-08-15 18:38:27 +00:00
{
Reflect tab order in saved session Discussed, tested and tweaked by amphi, ml| and MonkeyofDoom in IRC.
2011-02-19 21:22:52 +00:00
n = gtk_notebook_get_current_page (notebook) + 1;
No need to move proxy item if it is appended
2011-12-09 20:00:13 +00:00
katze_array_move_item (browser->proxy_array, item, n);
Introduce Open Tabs next to Current At the same time make Open popups in tabs readonly and hide it in the Preferences, as well as Open new pages in and the whole Privacy page.
2008-08-15 18:38:27 +00:00
}
else
Avoid counting total pages when not necessary
2011-12-07 21:42:06 +00:00
n = -1;
gtk_notebook_insert_page (notebook, view, tab_label, n);
Unset dont-write-history and append, instead of 0 So the values don't stay in the saved session.
2011-12-13 22:27:26 +00:00
katze_item_set_meta_integer (item, "append", -1);
Introduce Open Tabs next to Current At the same time make Open popups in tabs readonly and hide it in the Preferences, as well as Open new pages in and the whole Privacy page.
2008-08-15 18:38:27 +00:00
Reduce the mount of casts in the browser
2009-09-29 20:25:09 +00:00
gtk_notebook_set_tab_reorderable (notebook, view, TRUE);
gtk_notebook_set_tab_detachable (notebook, view, TRUE);
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
/* We want the tab to be removed if the widget is destroyed */
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
g_signal_connect (view, "destroy",
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
G_CALLBACK (midori_browser_tab_destroy_cb), browser);
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
_midori_browser_update_actions (browser);
Set a timeout on notebook size updates
2011-12-09 19:59:32 +00:00
midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser);
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
}
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
static void
_midori_browser_remove_tab (MidoriBrowser* browser,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view)
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
gtk_widget_destroy (view);
Set a timeout on notebook size updates
2011-12-09 19:59:32 +00:00
midori_browser_notebook_size_allocate_cb (browser->notebook, NULL, browser);
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
}
Add midori_browser_foreach to iterate over all present browsers
2009-04-22 19:53:14 +00:00
/**
* midori_browser_foreach:
* @browser: a #MidoriBrowser
* @callback: a #GtkCallback
* @callback_data: custom data
*
* Calls the specified callback for each view contained
* in the browser.
*
* Since: 0.1.7
**/
void
midori_browser_foreach (MidoriBrowser* browser,
GtkCallback callback,
gpointer callback_data)
{
g_return_if_fail (MIDORI_IS_BROWSER (browser));
gtk_container_foreach (GTK_CONTAINER (browser->notebook),
callback, callback_data);
}
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
static void
_midori_browser_quit (MidoriBrowser* browser)
Fix segfault on quit, improve app and browser interface
2008-06-07 23:25:57 +00:00
{
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Nothing to do */
Fix segfault on quit, improve app and browser interface
2008-06-07 23:25:57 +00:00
}
Support keyboard hotkeys that GTK+ considers invalid We re-implement the usual key handling by overriding the key press handler, emulating the according steps but leaving out the validation that normally rejects certain combinations. Single key hotkeys work unless an entry is focussed, in which case the entry receives the input, and Control+Tab works as well. The shortcuts extension is adjusted to accept any hotkeys.
2009-11-03 22:47:33 +00:00
static gboolean
midori_browser_key_press_event (GtkWidget* widget,
GdkEventKey* event)
{
GtkWindow* window = GTK_WINDOW (widget);
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
MidoriBrowser* browser = MIDORI_BROWSER (widget);
Support keyboard hotkeys that GTK+ considers invalid We re-implement the usual key handling by overriding the key press handler, emulating the according steps but leaving out the validation that normally rejects certain combinations. Single key hotkeys work unless an entry is focussed, in which case the entry receives the input, and Control+Tab works as well. The shortcuts extension is adjusted to accept any hotkeys.
2009-11-03 22:47:33 +00:00
GtkWidgetClass* widget_class;
Filter keyboard state against modfifier default mask The modifier state does in fact incorporate modal keys such as NumLock. So code assuming that state be 0 if no modifier is pressed is wrong, if NumLock, CapsLock and the like are active. The solution is to filter out these modal keys with gtk_accelerator_get_default_mod_mask(), and compare the result. This fixes the problem of being unable to type keys used as single-letter shortcuts.
2010-03-29 22:39:31 +00:00
guint clean_state;
Space at the bottom of the page: Go to next page
2011-07-28 19:59:29 +00:00
GtkWidget* focus;
Support keyboard hotkeys that GTK+ considers invalid We re-implement the usual key handling by overriding the key press handler, emulating the according steps but leaving out the validation that normally rejects certain combinations. Single key hotkeys work unless an entry is focussed, in which case the entry receives the input, and Control+Tab works as well. The shortcuts extension is adjusted to accept any hotkeys.
2009-11-03 22:47:33 +00:00
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
/* Interpret Ctrl(+Shift)+Tab as tab switching for compatibility */
if (midori_browser_get_nth_tab (browser, 1) != NULL
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
&& event->keyval == GDK_KEY_Tab
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
&& (event->state & GDK_CONTROL_MASK))
{
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
midori_browser_activate_action (browser, "TabNext");
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
return TRUE;
}
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
else if (event->keyval == GDK_KEY_ISO_Left_Tab
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
&& (event->state & GDK_CONTROL_MASK)
&& (event->state & GDK_SHIFT_MASK))
{
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
midori_browser_activate_action (browser, "TabPrevious");
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
return TRUE;
}
Interpret Ctrl+= as Zoom In for compatibility
2011-07-09 20:48:26 +00:00
/* Interpret Ctrl+= as Zoom In for compatibility */
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
else if ((event->keyval == GDK_KEY_KP_Equal || event->keyval == GDK_KEY_equal)
Interpret Ctrl+= as Zoom In for compatibility
2011-07-09 20:48:26 +00:00
&& (event->state & GDK_CONTROL_MASK))
{
midori_browser_activate_action (browser, "ZoomIn");
return TRUE;
}
Interpret F5 as reloading for compatibility Fixes: https://bugs.launchpad.net/midori/+bug/772068
2011-05-15 23:05:27 +00:00
/* Interpret F5 as reloading for compatibility */
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
else if (event->keyval == GDK_KEY_F5)
Interpret F5 as reloading for compatibility Fixes: https://bugs.launchpad.net/midori/+bug/772068
2011-05-15 23:05:27 +00:00
{
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
midori_browser_activate_action (browser, "Reload");
Interpret F5 as reloading for compatibility Fixes: https://bugs.launchpad.net/midori/+bug/772068
2011-05-15 23:05:27 +00:00
return TRUE;
}
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
Space at the bottom of the page: Go to next page
2011-07-28 19:59:29 +00:00
focus = gtk_window_get_focus (GTK_WINDOW (widget));
if (focus == NULL)
Focus the view on key press if nothing's focussed
2011-03-06 16:25:32 +00:00
gtk_widget_grab_focus (midori_browser_get_current_tab (MIDORI_BROWSER (widget)));
Space at the bottom of the page: Go to next page
2011-07-28 19:59:29 +00:00
else if (G_OBJECT_TYPE (focus) == WEBKIT_TYPE_WEB_VIEW
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
&& event->keyval == GDK_KEY_space
Space at the bottom of the page: Go to next page
2011-07-28 19:59:29 +00:00
&& !webkit_web_view_can_cut_clipboard (WEBKIT_WEB_VIEW (focus))
&& !webkit_web_view_can_paste_clipboard (WEBKIT_WEB_VIEW (focus)))
{
/* Space at the bottom of the page: Go to next page */
GtkScrolledWindow* scrolled = GTK_SCROLLED_WINDOW (gtk_widget_get_parent (focus));
MidoriView* view = MIDORI_VIEW (gtk_widget_get_parent (GTK_WIDGET (scrolled)));
GtkAdjustment* vadjust = gtk_scrolled_window_get_vadjustment (scrolled);
if (gtk_adjustment_get_value (vadjust)
== (gtk_adjustment_get_upper (vadjust) - gtk_adjustment_get_page_size (vadjust)))
{
/* Duplicate here because the URI pointer might change */
gchar* uri = g_strdup (midori_view_get_next_page (view));
if (uri != NULL)
{
midori_view_set_uri (view, uri);
g_free (uri);
return TRUE;
}
}
}
Focus the view on key press if nothing's focussed
2011-03-06 16:25:32 +00:00
Support keyboard hotkeys that GTK+ considers invalid We re-implement the usual key handling by overriding the key press handler, emulating the according steps but leaving out the validation that normally rejects certain combinations. Single key hotkeys work unless an entry is focussed, in which case the entry receives the input, and Control+Tab works as well. The shortcuts extension is adjusted to accept any hotkeys.
2009-11-03 22:47:33 +00:00
if (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))
if (sokoke_window_activate_key (window, event))
return TRUE;
Filter keyboard state against modfifier default mask The modifier state does in fact incorporate modal keys such as NumLock. So code assuming that state be 0 if no modifier is pressed is wrong, if NumLock, CapsLock and the like are active. The solution is to filter out these modal keys with gtk_accelerator_get_default_mod_mask(), and compare the result. This fixes the problem of being unable to type keys used as single-letter shortcuts.
2010-03-29 22:39:31 +00:00
clean_state = event->state & gtk_accelerator_get_default_mod_mask();
if (!clean_state && gtk_window_propagate_key_event (window, event))
Support keyboard hotkeys that GTK+ considers invalid We re-implement the usual key handling by overriding the key press handler, emulating the according steps but leaving out the validation that normally rejects certain combinations. Single key hotkeys work unless an entry is focussed, in which case the entry receives the input, and Control+Tab works as well. The shortcuts extension is adjusted to accept any hotkeys.
2009-11-03 22:47:33 +00:00
return TRUE;
if (!(event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
if (sokoke_window_activate_key (window, event))
return TRUE;
Don't prioritize key presses because that breaks inline find This 'breaks' using single character shortcuts in conjunction with inline find, but we can live with that.
2009-11-29 13:31:23 +00:00
if (event->state && gtk_window_propagate_key_event (window, event))
Support keyboard hotkeys that GTK+ considers invalid We re-implement the usual key handling by overriding the key press handler, emulating the according steps but leaving out the validation that normally rejects certain combinations. Single key hotkeys work unless an entry is focussed, in which case the entry receives the input, and Control+Tab works as well. The shortcuts extension is adjusted to accept any hotkeys.
2009-11-03 22:47:33 +00:00
return TRUE;
Interpret Shift+Backspace as going forward Analogous to Backspace for back.
2011-07-19 20:14:07 +00:00
/* Interpret (Shift+)Backspace as going back (forward) for compatibility */
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
if ((event->keyval == GDK_KEY_BackSpace)
Interpret Shift+Backspace as going forward Analogous to Backspace for back.
2011-07-19 20:14:07 +00:00
&& (event->state & GDK_SHIFT_MASK))
{
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
midori_browser_activate_action (browser, "Forward");
Interpret Shift+Backspace as going forward Analogous to Backspace for back.
2011-07-19 20:14:07 +00:00
return TRUE;
}
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
else if (event->keyval == GDK_KEY_BackSpace)
Interpret Backspace as going back A user continually hitting the Backspace key and then mousing for the Back button, someone who rarely uses shortcuts at all.
2011-05-14 23:43:26 +00:00
{
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
midori_browser_activate_action (browser, "Back");
Interpret Backspace as going back A user continually hitting the Backspace key and then mousing for the Back button, someone who rarely uses shortcuts at all.
2011-05-14 23:43:26 +00:00
return TRUE;
}
Support keyboard hotkeys that GTK+ considers invalid We re-implement the usual key handling by overriding the key press handler, emulating the according steps but leaving out the validation that normally rejects certain combinations. Single key hotkeys work unless an entry is focussed, in which case the entry receives the input, and Control+Tab works as well. The shortcuts extension is adjusted to accept any hotkeys.
2009-11-03 22:47:33 +00:00
widget_class = g_type_class_peek_static (g_type_parent (GTK_TYPE_WINDOW));
return widget_class->key_press_event (widget, event);
}
Show dialog if quitting while files are being downloaded
2010-05-22 21:48:03 +00:00
static gboolean
midori_browser_delete_event (GtkWidget* widget,
GdkEventAny* event)
{
MidoriBrowser* browser = MIDORI_BROWSER (widget);
Refactor transferbar into MidoriTransferbar The transferbar is separated from the browser, albeit it is still created and filled from within the browser so it is not completely independent. The new class now keeps a list of TransferInfo items to keep track of transfers and queries the status from the download object. Destroying a button belonging to a transfer is connected to removing it from the list and cleaning up the info structure. Also the Clear button is updated from the destroy handler.
2010-06-17 18:03:11 +00:00
return midori_transferbar_confirm_delete (MIDORI_TRANSFERBAR (browser->transferbar));
Show dialog if quitting while files are being downloaded
2010-05-22 21:48:03 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
midori_browser_class_init (MidoriBrowserClass* class)
{
Support keyboard hotkeys that GTK+ considers invalid We re-implement the usual key handling by overriding the key press handler, emulating the according steps but leaving out the validation that normally rejects certain combinations. Single key hotkeys work unless an entry is focussed, in which case the entry receives the input, and Control+Tab works as well. The shortcuts extension is adjusted to accept any hotkeys.
2009-11-03 22:47:33 +00:00
GtkWidgetClass* gtkwidget_class;
Improve OSX adjustments in various places
2008-10-25 22:54:57 +00:00
GObjectClass* gobject_class;
GParamFlags flags;
Implement Open new pages in: New window preference
2009-05-17 18:29:31 +00:00
/**
* MidoriBrowser::new-window:
* @browser: the object on which the signal is emitted
Leave setting up windows to the app, which is a lot faster With a mature history setting up a browser window can be slow, but if it's setup at creation time it is extremely fast. The signal prototype of MidoriBrowser::new-window had to change, all call sites were adjusted.
2009-10-30 22:43:28 +00:00
* @window: a new browser window, or %NULL
Implement Open new pages in: New window preference
2009-05-17 18:29:31 +00:00
*
* Emitted when a new browser window was created.
*
* Note: Before 0.1.7 the second argument was an URI string.
Leave setting up windows to the app, which is a lot faster With a mature history setting up a browser window can be slow, but if it's setup at creation time it is extremely fast. The signal prototype of MidoriBrowser::new-window had to change, all call sites were adjusted.
2009-10-30 22:43:28 +00:00
*
* Note: Since 0.2.1 the return value is a #MidoriBrowser
*
* Return value: a new #MidoriBrowser
Implement Open new pages in: New window preference
2009-05-17 18:29:31 +00:00
*/
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
signals[NEW_WINDOW] = g_signal_new (
"new-window",
G_TYPE_FROM_CLASS (class),
(GSignalFlags)(G_SIGNAL_RUN_LAST),
G_STRUCT_OFFSET (MidoriBrowserClass, new_window),
0,
NULL,
Leave setting up windows to the app, which is a lot faster With a mature history setting up a browser window can be slow, but if it's setup at creation time it is extremely fast. The signal prototype of MidoriBrowser::new-window had to change, all call sites were adjusted.
2009-10-30 22:43:28 +00:00
midori_cclosure_marshal_OBJECT__OBJECT,
MIDORI_TYPE_BROWSER, 1,
Implement Open new pages in: New window preference
2009-05-17 18:29:31 +00:00
MIDORI_TYPE_BROWSER);
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
signals[ADD_TAB] = g_signal_new (
"add-tab",
Fix panel close button.
2008-03-24 13:15:23 +00:00
G_TYPE_FROM_CLASS (class),
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
G_STRUCT_OFFSET (MidoriBrowserClass, add_tab),
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
0,
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
NULL,
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
GTK_TYPE_WIDGET);
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
signals[REMOVE_TAB] = g_signal_new (
"remove-tab",
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
G_TYPE_FROM_CLASS (class),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
G_STRUCT_OFFSET (MidoriBrowserClass, remove_tab),
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
0,
NULL,
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Add MidoriBrowser::move-tab and use it in Tab Panel
2011-03-07 21:56:20 +00:00
/**
* MidoriBrowser::move-tab:
* @browser: the object on which the signal is emitted
* @notebook: the notebook containing the tabs
* @cur_pos: the current position of the tab
* @new_pos: the new position of the tab
*
* Emitted when a tab is moved.
*
* Since: 0.3.3
*/
signals[MOVE_TAB] = g_signal_new (
"move-tab",
G_TYPE_FROM_CLASS (class),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
0,
0,
NULL,
midori_cclosure_marshal_VOID__OBJECT_INT_INT,
G_TYPE_NONE, 3,
GTK_TYPE_NOTEBOOK, G_TYPE_INT, G_TYPE_INT);
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
signals[ACTIVATE_ACTION] = g_signal_new (
"activate-action",
Fix panel close button.
2008-03-24 13:15:23 +00:00
G_TYPE_FROM_CLASS (class),
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
G_STRUCT_OFFSET (MidoriBrowserClass, activate_action),
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
0,
NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1,
G_TYPE_STRING);
Add add-download signal to MidoriBrowser
2009-03-22 14:24:40 +00:00
/**
Add midori_browser_foreach to iterate over all present browsers
2009-04-22 19:53:14 +00:00
* MidoriBrowser::add-download:
* @browser: the object on which the signal is emitted
Add add-download signal to MidoriBrowser
2009-03-22 14:24:40 +00:00
* @download: a new download
*
* Emitted when a new download was accepted and is
* about to start, before the browser adds items
* to the transferbar.
*
* Emitting this signal manually is equal to a
* user initiating and confirming a download
*
Add midori_browser_foreach to iterate over all present browsers
2009-04-22 19:53:14 +00:00
* Note: This requires WebKitGTK+ 1.1.3.
Add add-download signal to MidoriBrowser
2009-03-22 14:24:40 +00:00
*
* Since: 0.1.5
*/
signals[ADD_DOWNLOAD] = g_signal_new (
"add-download",
G_TYPE_FROM_CLASS (class),
(GSignalFlags)(G_SIGNAL_RUN_LAST),
0,
0,
NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
G_TYPE_OBJECT);
Add midori_app_send_notification() to easily send notifications Sending such messages is either done by using libnotify if available. Otherwise the program "notify-send" is used.
2009-05-09 13:55:10 +00:00
/**
* MidoriBrowser::send-notification:
* @browser: the object on which the signal is emitted
* @title: the title for the notification
* @message: the message for the notification
*
* Emitted when a browser wants to display a notification message,
Show a notification upon opening a tab or window The notification is shown when in fullscreen mode or the window is maximised, and a window is opened or a tab is opened while the tab bar is not visible.
2011-04-19 21:16:34 +00:00
* e.g. when a download has been completed or a new tab was opened.
Add midori_app_send_notification() to easily send notifications Sending such messages is either done by using libnotify if available. Otherwise the program "notify-send" is used.
2009-05-09 13:55:10 +00:00
*
* Since: 0.1.7
*/
signals[SEND_NOTIFICATION] = g_signal_new (
"send-notification",
G_TYPE_FROM_CLASS (class),
(GSignalFlags)(G_SIGNAL_RUN_LAST),
0,
0,
NULL,
midori_cclosure_marshal_VOID__STRING_STRING,
G_TYPE_NONE, 2,
G_TYPE_STRING,
G_TYPE_STRING);
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
/**
* MidoriBrowser::populate-tool-menu:
* @browser: the object on which the signal is emitted
* @menu: the #GtkMenu to populate
*
* Emitted when a Tool menu is displayed, such as the
* toplevel Tools in the menubar or the compact menu.
*
* Since: 0.1.9
*/
signals[POPULATE_TOOL_MENU] = g_signal_new (
"populate-tool-menu",
G_TYPE_FROM_CLASS (class),
(GSignalFlags)(G_SIGNAL_RUN_LAST),
0,
0,
NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GTK_TYPE_MENU);
Implement 'Customize...' on toolbar right-click The new MidoriBrowser::populate-toolbar-menu allows extensions to add menu items. Fixes: https://bugs.launchpad.net/midori/+bug/699933
2011-04-17 20:43:54 +00:00
/**
* MidoriBrowser::populate-toolbar-menu:
* @browser: the object on which the signal is emitted
* @menu: the #GtkMenu to populate
*
* Emitted when a toolbar menu is displayed on right-click.
*
* Since: 0.3.4
*/
signals[POPULATE_TOOLBAR_MENU] = g_signal_new (
"populate-toolbar-menu",
G_TYPE_FROM_CLASS (class),
(GSignalFlags)(G_SIGNAL_RUN_LAST),
0,
0,
NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GTK_TYPE_MENU);
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
signals[QUIT] = g_signal_new (
"quit",
G_TYPE_FROM_CLASS (class),
(GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
G_STRUCT_OFFSET (MidoriBrowserClass, quit),
0,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
Embed extensions into preferences dialogue MidoriBrowser gains the show-preferences signal which gives API users a chance to add preferences. katze_preferences_add_category now returns a box to allow freely packing a widget into the page. The extension panel is packed into the preferences now rather than being appended as a proper panel. Motivation is consistency here, such as with Gedit or Emerillon and also the aspect that extensions often really do tweak behaviour like preferences do. Spacing and icons are added for visual consistency.
2011-04-14 01:29:50 +00:00
/**
* MidoriBrowser::show-preferences:
* @browser: the object on which the signal is emitted
* @preferences: the #KatzePreferences to populate
*
* Emitted when a preference dialogue displayed, to allow
* adding of a new page, to be used sparingly.
*
* Since: 0.3.4
*/
signals[SHOW_PREFERENCES] = g_signal_new (
"show-preferences",
G_TYPE_FROM_CLASS (class),
(GSignalFlags)(G_SIGNAL_RUN_LAST),
0,
0,
NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
KATZE_TYPE_PREFERENCES);
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
class->add_tab = _midori_browser_add_tab;
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
class->remove_tab = _midori_browser_remove_tab;
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
class->activate_action = _midori_browser_activate_action;
class->quit = _midori_browser_quit;
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
Support keyboard hotkeys that GTK+ considers invalid We re-implement the usual key handling by overriding the key press handler, emulating the according steps but leaving out the validation that normally rejects certain combinations. Single key hotkeys work unless an entry is focussed, in which case the entry receives the input, and Control+Tab works as well. The shortcuts extension is adjusted to accept any hotkeys.
2009-11-03 22:47:33 +00:00
gtkwidget_class = GTK_WIDGET_CLASS (class);
gtkwidget_class->key_press_event = midori_browser_key_press_event;
Show dialog if quitting while files are being downloaded
2010-05-22 21:48:03 +00:00
gtkwidget_class->delete_event = midori_browser_delete_event;
Support keyboard hotkeys that GTK+ considers invalid We re-implement the usual key handling by overriding the key press handler, emulating the according steps but leaving out the validation that normally rejects certain combinations. Single key hotkeys work unless an entry is focussed, in which case the entry receives the input, and Control+Tab works as well. The shortcuts extension is adjusted to accept any hotkeys.
2009-11-03 22:47:33 +00:00
Improve OSX adjustments in various places
2008-10-25 22:54:57 +00:00
gobject_class = G_OBJECT_CLASS (class);
Ensure REMOVE_TAB emission, don't alter session when destroying
2008-07-25 10:45:50 +00:00
gobject_class->dispose = midori_browser_dispose;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gobject_class->finalize = midori_browser_finalize;
gobject_class->set_property = midori_browser_set_property;
gobject_class->get_property = midori_browser_get_property;
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
g_object_class_install_property (gobject_class,
PROP_MENUBAR,
g_param_spec_object (
"menubar",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"Menubar",
"The menubar",
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
GTK_TYPE_MENU_BAR,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
g_object_class_install_property (gobject_class,
PROP_NAVIGATIONBAR,
g_param_spec_object (
"navigationbar",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"Navigationbar",
"The navigationbar",
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
GTK_TYPE_TOOLBAR,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
Expose browser notebook and panel as properties
2008-11-18 01:02:59 +00:00
g_object_class_install_property (gobject_class,
PROP_NOTEBOOK,
g_param_spec_object (
"notebook",
"Notebook",
"The notebook containing the views",
GTK_TYPE_NOTEBOOK,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
Expose browser notebook and panel as properties
2008-11-18 01:02:59 +00:00
g_object_class_install_property (gobject_class,
PROP_PANEL,
g_param_spec_object (
"panel",
"Panel",
"The side panel embedded in the browser",
MIDORI_TYPE_PANEL,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
Expose browser notebook and panel as properties
2008-11-18 01:02:59 +00:00
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
g_object_class_install_property (gobject_class,
PROP_URI,
g_param_spec_string (
"uri",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"URI",
"The current URI",
Fix browser properties along with enabling the property test
2009-02-22 12:52:04 +00:00
"",
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
g_object_class_install_property (gobject_class,
PROP_TAB,
g_param_spec_object (
"tab",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"Tab",
"The current tab",
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
GTK_TYPE_WIDGET,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
Replace window-object-cleared with context-ready Introduce MidoriBrowser::load-status and also midori_view_execute_script while we are at it.
2008-11-23 04:19:43 +00:00
g_object_class_install_property (gobject_class,
PROP_LOAD_STATUS,
g_param_spec_enum (
"load-status",
"Load Status",
"The current load status",
MIDORI_TYPE_LOAD_STATUS,
MIDORI_LOAD_FINISHED,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
Replace window-object-cleared with context-ready Introduce MidoriBrowser::load-status and also midori_view_execute_script while we are at it.
2008-11-23 04:19:43 +00:00
Rearrange statusbar packing to keep themes happy
2009-10-27 22:55:17 +00:00
/**
* MidoriBrowser:statusbar:
*
* The widget representing the statusbar contents. This is
* not an actual #GtkStatusbar but rather a #GtkBox.
*/
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
g_object_class_install_property (gobject_class,
PROP_STATUSBAR,
g_param_spec_object (
"statusbar",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"Statusbar",
"The statusbar",
Rearrange statusbar packing to keep themes happy
2009-10-27 22:55:17 +00:00
GTK_TYPE_BOX,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
/**
* MidoriBrowser:statusbar-text:
*
* The text that is displayed in the statusbar.
*
* This value reflects changes to the text visible in the statusbar, such
* as the uri of a hyperlink the mouse hovers over or the description of
* a menuitem.
*
* Setting this value changes the displayed text until the next change.
*/
g_object_class_install_property (gobject_class,
PROP_STATUSBAR_TEXT,
g_param_spec_string (
"statusbar-text",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"Statusbar Text",
"The text that is displayed in the statusbar",
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
"",
flags));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
/**
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
* MidoriBrowser:settings:
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
* An associated settings instance that is shared among all web views.
*
* Setting this value is propagated to every present web view. Also
* every newly created web view will use this instance automatically.
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
*
* If no settings are specified a default will be used.
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*/
g_object_class_install_property (gobject_class,
PROP_SETTINGS,
g_param_spec_object (
"settings",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"Settings",
"The associated settings",
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
MIDORI_TYPE_WEB_SETTINGS,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
/**
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
* MidoriBrowser:bookmarks:
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
* The bookmarks folder, containing all bookmarks.
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
* This is actually a reference to a bookmarks instance,
* so if bookmarks should be used it must be initially set.
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*/
g_object_class_install_property (gobject_class,
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
PROP_BOOKMARKS,
g_param_spec_object (
"bookmarks",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"Bookmarks",
"The bookmarks folder, containing all bookmarks",
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
KATZE_TYPE_ARRAY,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
/**
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
* MidoriBrowser:trash:
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
* The trash, that collects all closed tabs and windows.
*
* This is actually a reference to a trash instance, so if a trash should
* be used it must be initially set.
*
* Note: In the future the trash might collect other types of items.
*/
g_object_class_install_property (gobject_class,
PROP_TRASH,
g_param_spec_object (
"trash",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"Trash",
"The trash, collecting recently closed tabs and windows",
Rework MidoriWebList into KatzeList and KatzeArray
2008-08-25 23:19:38 +00:00
KATZE_TYPE_ARRAY,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
/**
* MidoriBrowser:search-engines:
*
* The list of search engines to be used for web search.
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
*
* This is actually a reference to a search engines instance,
* so if search engines should be used it must be initially set.
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
*/
g_object_class_install_property (gobject_class,
PROP_SEARCH_ENGINES,
g_param_spec_object (
"search-engines",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"Search Engines",
"The list of search engines to be used for web search",
Rework MidoriWebList into KatzeList and KatzeArray
2008-08-25 23:19:38 +00:00
KATZE_TYPE_ARRAY,
Make property strings static to save some memory
2009-01-16 04:19:43 +00:00
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
/**
* MidoriBrowser:history:
*
* The list of history items.
*
* This is actually a reference to a history instance,
* so if history should be used it must be initially set.
*/
g_object_class_install_property (gobject_class,
PROP_HISTORY,
g_param_spec_object (
"history",
Do not localize object properties, except WebSettings Property name localization is only useful if the strings are meant to be used in a user interface, such as is the case with WebSettings, or for graphical interface builders, which are not of our concern, since we don't use Glade and friends and nobody else is going to use our widgets. In short, make translation work much easier.
2008-10-15 01:32:11 +00:00
"History",
"The list of history items",
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
KATZE_TYPE_ARRAY,
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
flags));
Add 2px space between tool buttons
2009-01-12 20:52:33 +00:00
Use speeddial property to store GKeyFile with speeddial entries
2011-03-14 19:07:18 +00:00
/**
* MidoriBrowser:speed-dial:
*
* The speed dial configuration file.
*
* Since: 0.3.4
*/
g_object_class_install_property (gobject_class,
PROP_SPEED_DIAL,
g_param_spec_pointer (
"speed-dial",
"Speeddial",
"Pointer to key-value object with speed dial items",
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
Implement show-tabs property in MidoriBrowser
2009-06-22 21:48:41 +00:00
/**
* MidoriBrowser:show-tabs:
*
* Whether or not to show tabs.
*
* If disabled, no tab labels are shown. This is intended for
* extensions that want to provide alternative tab labels.
*
* Since 0.1.8
*/
g_object_class_install_property (gobject_class,
PROP_SHOW_TABS,
g_param_spec_boolean (
"show-tabs",
"Show Tabs",
"Whether or not to show tabs",
TRUE,
flags));
Define H and V widget functions for GTK+3 The horizontal variants are gone from the API. gtk_rc_get_theme_dir has been deprecated, there is no replacement so we do the equivalent lookup. Right-aligned menu items are deprecated. For now defining gtk_widget_render_icon and gtk_widget_set_size_request gets rid of warnings.
2011-11-28 22:37:34 +00:00
#if !GTK_CHECK_VERSION (3, 0, 0)
Add 2px space between tool buttons
2009-01-12 20:52:33 +00:00
/* Add 2px space between tool buttons */
gtk_rc_parse_string (
"style \"tool-button-style\"\n {\n"
"GtkToolButton::icon-spacing = 2\n }\n"
"widget \"MidoriBrowser.*.MidoriBookmarkbar.Gtk*ToolButton\" "
"style \"tool-button-style\"\n"
"widget \"MidoriBrowser.*.MidoriFindbar.Gtk*ToolButton\" "
"style \"tool-button-style\"\n");
Define H and V widget functions for GTK+3 The horizontal variants are gone from the API. gtk_rc_get_theme_dir has been deprecated, there is no replacement so we do the equivalent lookup. Right-aligned menu items are deprecated. For now defining gtk_widget_render_icon and gtk_widget_set_size_request gets rid of warnings.
2011-11-28 22:37:34 +00:00
#endif
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
_action_window_new_activate (GtkAction* action,
MidoriBrowser* browser)
{
Leave setting up windows to the app, which is a lot faster With a mature history setting up a browser window can be slow, but if it's setup at creation time it is extremely fast. The signal prototype of MidoriBrowser::new-window had to change, all call sites were adjusted.
2009-10-30 22:43:28 +00:00
MidoriBrowser* new_browser;
g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
Check that new-window did return a browser before adding a tab
2009-11-21 05:45:01 +00:00
if (new_browser)
{
midori_browser_add_uri (new_browser, "");
midori_browser_activate_action (new_browser, "Location");
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
_action_tab_new_activate (GtkAction* action,
MidoriBrowser* browser)
{
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
gint n = midori_browser_add_uri (browser, "");
Attempt to fix handling of background and foreground tabs.
2008-04-24 22:20:43 +00:00
midori_browser_set_current_page (browser, n);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Add primitive Private Browsing based on Midori web app mode Essentially it's just an instance of Midori that doesn't load or write any preferences or personal data. The main drawback is that it doesn't load any extensions either.
2009-12-12 20:56:11 +00:00
static void
_action_private_browsing_activate (GtkAction* action,
MidoriBrowser* browser)
{
Pass URI in _action_private_browsing_activate We need to, to avoid using GIO-based launching which would mixup the arguments.
2012-02-13 23:23:22 +00:00
sokoke_spawn_app ("about:private", TRUE);
Add primitive Private Browsing based on Midori web app mode Essentially it's just an instance of Midori that doesn't load or write any preferences or personal data. The main drawback is that it doesn't load any extensions either.
2009-12-12 20:56:11 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_open_activate (GtkAction* action,
MidoriBrowser* browser)
{
Don't save file dialog folder with GTK+ 3.1.10 The last used folder is restored by default.
2011-10-10 19:49:27 +00:00
#if !GTK_CHECK_VERSION (3, 1, 10)
Remember the last opened folder for File Open The File Open dialog should remember the last opened folder or try to obtain it from the currently opened web view. Besides the dialog ought to be transient.
2008-05-20 01:01:54 +00:00
static gchar* last_dir = NULL;
Tweak last_folder handling to avoid warnings
2011-11-20 21:19:08 +00:00
gboolean folder_set = FALSE;
Don't save file dialog folder with GTK+ 3.1.10 The last used folder is restored by default.
2011-10-10 19:49:27 +00:00
#endif
Remember the last opened folder for File Open The File Open dialog should remember the last opened folder or try to obtain it from the currently opened web view. Besides the dialog ought to be transient.
2008-05-20 01:01:54 +00:00
gchar* uri = NULL;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
GtkWidget* dialog;
Wrap file chooser into the function sokoke_file_chooser_dialog_new
2009-11-14 16:38:16 +00:00
GtkWidget* view;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
return;
Wrap file chooser into the function sokoke_file_chooser_dialog_new
2009-11-14 16:38:16 +00:00
dialog = sokoke_file_chooser_dialog_new (_("Open file"),
GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN);
Remember the last opened folder for File Open The File Open dialog should remember the last opened folder or try to obtain it from the currently opened web view. Besides the dialog ought to be transient.
2008-05-20 01:01:54 +00:00
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
/* base the start folder on the current view's uri if it is local */
Wrap file chooser into the function sokoke_file_chooser_dialog_new
2009-11-14 16:38:16 +00:00
view = midori_browser_get_current_tab (browser);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
if ((uri = (gchar*)midori_view_get_display_uri (MIDORI_VIEW (view))))
Remember the last opened folder for File Open The File Open dialog should remember the last opened folder or try to obtain it from the currently opened web view. Besides the dialog ought to be transient.
2008-05-20 01:01:54 +00:00
{
gchar* filename = g_filename_from_uri (uri, NULL, NULL);
if (filename)
{
gchar* dirname = g_path_get_dirname (filename);
if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR))
{
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname);
Tweak last_folder handling to avoid warnings
2011-11-20 21:19:08 +00:00
#if !GTK_CHECK_VERSION (3, 1, 10)
Remember the last opened folder for File Open The File Open dialog should remember the last opened folder or try to obtain it from the currently opened web view. Besides the dialog ought to be transient.
2008-05-20 01:01:54 +00:00
folder_set = TRUE;
Tweak last_folder handling to avoid warnings
2011-11-20 21:19:08 +00:00
#endif
Remember the last opened folder for File Open The File Open dialog should remember the last opened folder or try to obtain it from the currently opened web view. Besides the dialog ought to be transient.
2008-05-20 01:01:54 +00:00
}
g_free (dirname);
g_free (filename);
}
}
Don't save file dialog folder with GTK+ 3.1.10 The last used folder is restored by default.
2011-10-10 19:49:27 +00:00
#if !GTK_CHECK_VERSION (3, 1, 10)
Remember the last opened folder for File Open The File Open dialog should remember the last opened folder or try to obtain it from the currently opened web view. Besides the dialog ought to be transient.
2008-05-20 01:01:54 +00:00
if (!folder_set && last_dir && *last_dir)
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir);
Don't save file dialog folder with GTK+ 3.1.10 The last used folder is restored by default.
2011-10-10 19:49:27 +00:00
#endif
Remember the last opened folder for File Open The File Open dialog should remember the last opened folder or try to obtain it from the currently opened web view. Besides the dialog ought to be transient.
2008-05-20 01:01:54 +00:00
Wrap file chooser into the function sokoke_file_chooser_dialog_new
2009-11-14 16:38:16 +00:00
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Tweak last_folder handling to avoid warnings
2011-11-20 21:19:08 +00:00
#if !GTK_CHECK_VERSION (3, 1, 10)
Move variable declarations to the beginnings of blocks
2008-11-16 01:00:17 +00:00
gchar* folder;
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
Tweak last_folder handling to avoid warnings
2011-11-20 21:19:08 +00:00
katze_assign (last_dir, folder);
#endif
Remember the last opened folder for File Open The File Open dialog should remember the last opened folder or try to obtain it from the currently opened web view. Besides the dialog ought to be transient.
2008-05-20 01:01:54 +00:00
uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
Add an Open external pages in Preference
2008-10-20 06:50:16 +00:00
midori_browser_set_current_uri (browser, uri);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_free (uri);
Don't save file dialog folder with GTK+ 3.1.10 The last used folder is restored by default.
2011-10-10 19:49:27 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
gtk_widget_destroy (dialog);
}
Implement Save As functionality
2008-10-26 16:07:59 +00:00
static void
_action_save_as_activate (GtkAction* action,
MidoriBrowser* browser)
{
Implement Save As for arbitrary links
2008-11-09 21:07:42 +00:00
midori_browser_save_uri (browser, midori_browser_get_current_uri (browser));
Implement Save As functionality
2008-10-26 16:07:59 +00:00
}
Move speed dial to browser and add an AddSpeedDial action
2009-05-10 12:39:20 +00:00
static void
_action_add_speed_dial_activate (GtkAction* action,
MidoriBrowser* browser)
{
midori_browser_add_speed_dial (browser);
}
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
static void
_action_add_desktop_shortcut_activate (GtkAction* action,
MidoriBrowser* browser)
{
Implement 'Add Shortcut to desktop' for X11
2010-12-12 00:26:08 +00:00
#if HAVE_HILDON
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
/* TODO: Implement */
Implement 'Add Shortcut to desktop' for X11
2010-12-12 00:26:08 +00:00
#elif defined (GDK_WINDOWING_X11)
GtkWidget* tab = midori_browser_get_current_tab (browser);
KatzeItem* item = midori_view_get_proxy_item (MIDORI_VIEW (tab));
const gchar* app_name = katze_item_get_name (item);
gchar* app_exec = g_strconcat ("midori -a ", katze_item_get_uri (item), NULL);
const gchar* icon_uri = midori_view_get_icon_uri (MIDORI_VIEW (tab));
gchar* app_icon;
GKeyFile* keyfile = g_key_file_new ();
gchar* filename = g_strconcat (app_name, ".desktop", NULL);
gchar* app_dir;
int i = 0;
while (filename[i] != '\0')
{
if (filename[i] == '/')
filename[i] = '_';
i++;
}
Use actual data dir to store desktop shortcut
2011-01-19 20:31:23 +00:00
app_dir = g_build_filename (g_get_user_data_dir (),
Implement 'Add Shortcut to desktop' for X11
2010-12-12 00:26:08 +00:00
"applications", filename, NULL);
app_icon = katze_net_get_cached_path (NULL, icon_uri, "icons");
if (!g_file_test (app_icon, G_FILE_TEST_EXISTS))
katze_assign (app_icon, g_strdup (STOCK_WEB_BROWSER));
g_key_file_set_string (keyfile, "Desktop Entry", "Version", "1.0");
g_key_file_set_string (keyfile, "Desktop Entry", "Type", "Application");
g_key_file_set_string (keyfile, "Desktop Entry", "Name", app_name);
g_key_file_set_string (keyfile, "Desktop Entry", "Exec", app_exec);
g_key_file_set_string (keyfile, "Desktop Entry", "TryExec", "midori");
g_key_file_set_string (keyfile, "Desktop Entry", "Icon", app_icon);
g_key_file_set_string (keyfile, "Desktop Entry", "Categories", "Network;");
sokoke_key_file_save_to_file (keyfile, app_dir, NULL);
g_free (app_dir);
g_free (filename);
g_free (app_exec);
g_key_file_free (keyfile);
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
#elif defined(GDK_WINDOWING_QUARTZ)
/* TODO: Implement */
#elif defined (GDK_WINDOWING_WIN32)
/* TODO: Implement */
#endif
}
static void
Show a popup menu to choose from multiple available news feeds
2009-11-22 14:33:13 +00:00
midori_browser_subscribe_to_news_feed (MidoriBrowser* browser,
const gchar* uri)
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
{
if (browser->news_aggregator && *browser->news_aggregator)
Special-case Liferea because a helper script may be required The script is usually installed but not used unless the user manually picks it, which is far from user-friendly.
2011-05-01 04:57:41 +00:00
{
Thunderbird only accepts feed://, Liferea doesn't mind https://bugs.launchpad.net/midori/+bug/826444
2011-08-14 23:13:09 +00:00
/* Thunderbird only accepts feed://, Liferea doesn't mind */
gchar* feed = g_strdup (uri);
if (g_str_has_prefix (feed, "http://"))
{
feed[0] = 'f';
feed[1] = 'e';
feed[2] = 'e';
feed[3] = 'd';
}
Special-case Liferea because a helper script may be required The script is usually installed but not used unless the user manually picks it, which is far from user-friendly.
2011-05-01 04:57:41 +00:00
/* Special-case Liferea because a helper script may be required */
if (g_str_equal (browser->news_aggregator, "liferea")
&& g_find_program_in_path ("liferea-add-feed"))
Thunderbird only accepts feed://, Liferea doesn't mind https://bugs.launchpad.net/midori/+bug/826444
2011-08-14 23:13:09 +00:00
sokoke_spawn_program ("liferea-add-feed", feed);
Special-case Liferea because a helper script may be required The script is usually installed but not used unless the user manually picks it, which is far from user-friendly.
2011-05-01 04:57:41 +00:00
else
Thunderbird only accepts feed://, Liferea doesn't mind https://bugs.launchpad.net/midori/+bug/826444
2011-08-14 23:13:09 +00:00
sokoke_spawn_program (browser->news_aggregator, feed);
g_free (feed);
Special-case Liferea because a helper script may be required The script is usually installed but not used unless the user manually picks it, which is far from user-friendly.
2011-05-01 04:57:41 +00:00
}
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
else
Verbosely explain how to use news feed URI
2010-05-25 16:26:47 +00:00
{
gchar* description = g_strdup_printf ("%s\n\n%s", uri,
_("To use the above URI open a news aggregator. "
"There is usually a menu or button \"New Subscription\", "
"\"New News Feed\" or similar.\n"
"Alternatively go to Preferences, Applications in Midori, "
"and select a News Aggregator. Next time you click the "
"news feed icon, it will be added automatically."));
Show error dialogue for invalid bookmark export filename
2011-02-02 00:10:02 +00:00
sokoke_message_dialog (GTK_MESSAGE_INFO, _("New feed"), description, FALSE);
Verbosely explain how to use news feed URI
2010-05-25 16:26:47 +00:00
g_free (description);
}
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
}
Show a popup menu to choose from multiple available news feeds
2009-11-22 14:33:13 +00:00
static void
_action_add_news_feed_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* view;
const gchar* uri;
if (!(view = midori_browser_get_current_tab (browser)))
return;
if (!(uri = g_object_get_data (G_OBJECT (view), "news-feeds")))
return;
midori_browser_subscribe_to_news_feed (browser, uri);
}
Connect callbacks for gtk_widget_destroy where signature differs Apparently dependent on architecture and compiler, mismatching callback signatures can cause segmentation faults.
2009-12-29 22:49:10 +00:00
static void
_action_compact_add_response_cb (GtkWidget* dialog,
gint response,
gpointer data)
{
gtk_widget_destroy (dialog);
}
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
static void
_action_compact_add_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* dialog;
GtkBox* box;
Refactor compact add and error message dialogues
2009-11-29 13:08:52 +00:00
const gchar* actions[] = { "BookmarkAdd", "AddSpeedDial",
"AddDesktopShortcut", "AddNewsFeed" };
guint i;
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
return;
dialog = g_object_new (GTK_TYPE_DIALOG,
Fix underscores in labels in app menu and compact add
2009-10-22 21:27:03 +00:00
"transient-for", browser,
"title", _("Add a new bookmark"), NULL);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
box = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
Refactor compact add and error message dialogues
2009-11-29 13:08:52 +00:00
for (i = 0; i < G_N_ELEMENTS (actions); i++)
{
gchar* label;
GtkWidget* button;
action = _action_by_name (browser, actions[i]);
label = katze_object_get_string (action, "label");
button = gtk_button_new_with_mnemonic (label);
g_free (label);
gtk_widget_set_name (button, "GtkButton-thumb");
gtk_box_pack_start (box, button, TRUE, TRUE, 4);
Use new GtkActivatable API in MidoriBrowser
2010-01-31 19:38:56 +00:00
#if GTK_CHECK_VERSION (2, 16, 0)
gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action);
#else
Refactor compact add and error message dialogues
2009-11-29 13:08:52 +00:00
gtk_action_connect_proxy (action, button);
Use new GtkActivatable API in MidoriBrowser
2010-01-31 19:38:56 +00:00
#endif
Refactor compact add and error message dialogues
2009-11-29 13:08:52 +00:00
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy), dialog);
}
gtk_widget_show (dialog);
Connect callbacks for gtk_widget_destroy where signature differs Apparently dependent on architecture and compiler, mismatching callback signatures can cause segmentation faults.
2009-12-29 22:49:10 +00:00
g_signal_connect (dialog, "response",
G_CALLBACK (_action_compact_add_response_cb), NULL);
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_tab_close_activate (GtkAction* action,
MidoriBrowser* browser)
{
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
GtkWidget* widget = midori_browser_get_current_tab (browser);
Allow last tab to close private and app mode
2011-10-11 00:53:14 +00:00
gboolean last_tab =
gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), 1) == NULL;
if (last_tab && sokoke_is_app_or_private ())
Don't destroy the current tab if it is last and blank If you hit the shortcut for closing tabs over a long time (to close all tabs), Midori hangs for some seconds.
2011-07-19 19:57:27 +00:00
{
Allow last tab to close private and app mode
2011-10-11 00:53:14 +00:00
gtk_widget_destroy (GTK_WIDGET (browser));
Don't destroy the current tab if it is last and blank If you hit the shortcut for closing tabs over a long time (to close all tabs), Midori hangs for some seconds.
2011-07-19 19:57:27 +00:00
return;
}
Allow last tab to close private and app mode
2011-10-11 00:53:14 +00:00
if (last_tab && midori_view_is_blank (MIDORI_VIEW (widget)))
return;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
gtk_widget_destroy (widget);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
_action_window_close_activate (GtkAction* action,
MidoriBrowser* browser)
{
gtk_widget_destroy (GTK_WIDGET (browser));
}
Add print support via javascript
2008-06-01 09:43:55 +00:00
static void
_action_print_activate (GtkAction* action,
MidoriBrowser* browser)
{
Only print if the browser is visible
2009-04-05 09:28:42 +00:00
GtkWidget* view;
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
Only print if the browser is visible
2009-04-05 09:28:42 +00:00
return;
if ((view = midori_browser_get_current_tab (browser)))
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
midori_view_print (MIDORI_VIEW (view));
Add print support via javascript
2008-06-01 09:43:55 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_quit_activate (GtkAction* action,
MidoriBrowser* browser)
{
Implement MidoriApp singleton and improve multiple window support The new singleton holds the shared settings and trash. It is further more used to keep track of all open windows and quits when the last window was closed. It also watches the focus in case you need something like a "current" browser.
2008-05-22 22:17:10 +00:00
g_signal_emit (browser, signals[QUIT], 0);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
Implement the Console panel for script messages.
2008-03-27 00:21:29 +00:00
_action_edit_activate (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
Add Undo and Redo menu items to the menubar and context menu
2009-09-10 00:17:18 +00:00
gboolean can_undo = FALSE, can_redo = FALSE;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gboolean can_cut = FALSE, can_copy = FALSE, can_paste = FALSE;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
gboolean has_selection, can_select_all = FALSE;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
if (WEBKIT_IS_WEB_VIEW (widget))
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
WebKitWebView* view = WEBKIT_WEB_VIEW (widget);
Add Undo and Redo menu items to the menubar and context menu
2009-09-10 00:17:18 +00:00
can_undo = webkit_web_view_can_undo (view);
can_redo = webkit_web_view_can_redo (view);
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
can_cut = webkit_web_view_can_cut_clipboard (view);
can_copy = webkit_web_view_can_copy_clipboard (view);
can_paste = webkit_web_view_can_paste_clipboard (view);
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
can_select_all = TRUE;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
else if (GTK_IS_EDITABLE (widget))
{
GtkEditable* editable = GTK_EDITABLE (widget);
has_selection = gtk_editable_get_selection_bounds (editable, NULL, NULL);
can_cut = has_selection && gtk_editable_get_editable (editable);
can_copy = has_selection;
can_paste = gtk_editable_get_editable (editable);
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
can_select_all = TRUE;
}
else if (GTK_IS_TEXT_VIEW (widget))
{
GtkTextView* text_view = GTK_TEXT_VIEW (widget);
GtkTextBuffer* buffer = gtk_text_view_get_buffer (text_view);
has_selection = gtk_text_buffer_get_has_selection (buffer);
can_cut = gtk_text_view_get_editable (text_view);
can_copy = has_selection;
can_paste = gtk_text_view_get_editable (text_view) && has_selection;
can_select_all = TRUE;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Add Undo and Redo menu items to the menubar and context menu
2009-09-10 00:17:18 +00:00
_action_set_sensitive (browser, "Undo", can_undo);
_action_set_sensitive (browser, "Redo", can_redo);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
_action_set_sensitive (browser, "Cut", can_cut);
_action_set_sensitive (browser, "Copy", can_copy);
_action_set_sensitive (browser, "Paste", can_paste);
_action_set_sensitive (browser, "Delete", can_cut);
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
_action_set_sensitive (browser, "SelectAll", can_select_all);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Add Undo and Redo menu items to the menubar and context menu
2009-09-10 00:17:18 +00:00
static void
_action_undo_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
if (WEBKIT_IS_WEB_VIEW (widget))
webkit_web_view_undo (WEBKIT_WEB_VIEW (widget));
}
static void
_action_redo_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
if (WEBKIT_IS_WEB_VIEW (widget))
webkit_web_view_redo (WEBKIT_WEB_VIEW (widget));
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
Implement the Console panel for script messages.
2008-03-27 00:21:29 +00:00
_action_cut_activate (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
if (G_LIKELY (widget) && g_signal_lookup ("cut-clipboard", G_OBJECT_TYPE (widget)))
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_signal_emit_by_name (widget, "cut-clipboard");
}
static void
Implement the Console panel for script messages.
2008-03-27 00:21:29 +00:00
_action_copy_activate (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
Only use _action_copy_activate work-around < 1.4.3
2012-02-10 20:29:49 +00:00
#if !WEBKIT_CHECK_VERSION (1, 4, 3)
Work around copying bug in WebKitGTK+ Fixes: https://bugs.launchpad.net/midori/+bug/707888
2011-03-06 17:13:54 +00:00
/* Work around broken clipboard handling for the sake of the user */
if (WEBKIT_IS_WEB_VIEW (widget))
{
GtkWidget* scrolled = gtk_widget_get_parent (widget);
GtkWidget* view = gtk_widget_get_parent (scrolled);
const gchar* selected = midori_view_get_selected_text (MIDORI_VIEW (view));
sokoke_widget_copy_clipboard (widget, selected);
return;
}
Only use _action_copy_activate work-around < 1.4.3
2012-02-10 20:29:49 +00:00
#endif
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
if (G_LIKELY (widget) && g_signal_lookup ("copy-clipboard", G_OBJECT_TYPE (widget)))
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_signal_emit_by_name (widget, "copy-clipboard");
}
static void
Implement the Console panel for script messages.
2008-03-27 00:21:29 +00:00
_action_paste_activate (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
if (G_LIKELY (widget) && g_signal_lookup ("paste-clipboard", G_OBJECT_TYPE (widget)))
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_signal_emit_by_name (widget, "paste-clipboard");
}
static void
Implement the Console panel for script messages.
2008-03-27 00:21:29 +00:00
_action_delete_activate (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
if (G_LIKELY (widget))
{
if (WEBKIT_IS_WEB_VIEW (widget))
webkit_web_view_delete_selection (WEBKIT_WEB_VIEW (widget));
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
else if (GTK_IS_EDITABLE (widget))
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_editable_delete_selection (GTK_EDITABLE (widget));
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
else if (GTK_IS_TEXT_VIEW (widget))
gtk_text_buffer_delete_selection (
gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)), TRUE, FALSE);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
}
static void
Implement the Console panel for script messages.
2008-03-27 00:21:29 +00:00
_action_select_all_activate (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
if (G_LIKELY (widget))
{
Implement the Console panel for script messages.
2008-03-27 00:21:29 +00:00
if (GTK_IS_EDITABLE (widget))
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1);
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
else if (g_signal_lookup ("select-all", G_OBJECT_TYPE (widget)))
Treat select-all specially with text views and tree views Unfortunately select-all signals within Gtk have different semantics against intuition, so we have to treat text views and tree views specially to avoid crashing.
2009-05-28 21:01:56 +00:00
{
if (GTK_IS_TEXT_VIEW (widget))
g_signal_emit_by_name (widget, "select-all", TRUE);
else if (GTK_IS_TREE_VIEW (widget))
{
gboolean dummy;
g_signal_emit_by_name (widget, "select-all", &dummy);
}
else
g_signal_emit_by_name (widget, "select-all");
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
}
static void
Show progress in location entry if statusbar is hidden
2008-08-31 00:45:13 +00:00
_action_find_activate (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Refactor findbar into MidoriFindbar The findbar still depends on the browser for knowing when to search and to propagate focus. Behaviour did not change.
2010-06-20 18:13:39 +00:00
midori_findbar_invoke (MIDORI_FINDBAR (browser->find));
Cancel 'typing' search when the entry loses its focus
2009-02-22 14:36:41 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_find_next_activate (GtkAction* action,
MidoriBrowser* browser)
{
Refactor findbar into MidoriFindbar The findbar still depends on the browser for knowing when to search and to propagate focus. Behaviour did not change.
2010-06-20 18:13:39 +00:00
midori_findbar_find (MIDORI_FINDBAR (browser->find), TRUE);
Cancel 'typing' search when the entry loses its focus
2009-02-22 14:36:41 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_find_previous_activate (GtkAction* action,
MidoriBrowser* browser)
{
Refactor findbar into MidoriFindbar The findbar still depends on the browser for knowing when to search and to propagate focus. Behaviour did not change.
2010-06-20 18:13:39 +00:00
midori_findbar_find (MIDORI_FINDBAR (browser->find), FALSE);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
midori_browser_navigationbar_notify_style_cb (GObject* object,
GParamSpec* arg1,
MidoriBrowser* browser)
{
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
MidoriToolbarStyle toolbar_style;
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
g_object_get (browser->settings, "toolbar-style", &toolbar_style, NULL);
Default to Icons in the toolbar on Win32
2009-07-20 04:54:46 +00:00
_midori_browser_set_toolbar_style (browser, toolbar_style);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Items can be added via the new toolbar menu now
2009-01-18 02:58:05 +00:00
static gboolean
midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem,
GdkEventButton* event,
MidoriBrowser* browser);
Add a public function to retrieve the recommended toolbar actions
2009-07-10 15:37:44 +00:00
/**
* midori_browser_get_toolbar_actions:
*
* Retrieves a list of actions which are suitable for use in a toolbar.
*
* Return value: a NULL-terminated array of strings with actions
*
* Since: 0.1.8
**/
const gchar**
midori_browser_get_toolbar_actions (MidoriBrowser* browser)
{
static const gchar* actions[] = {
"WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find",
Re-implement 'Bookmarks' menubar and toolbar button
2010-09-14 20:12:55 +00:00
"Fullscreen", "Preferences", "Window", "Bookmarks",
Remove "RecentlyVisited" action from the menubar
2010-07-04 20:54:27 +00:00
"ReloadStop", "ZoomIn", "TabClose",
Add a public function to retrieve the recommended toolbar actions
2009-07-10 15:37:44 +00:00
"ZoomOut", "Separator", "Back", "Forward", "Homepage",
Implement Next and Previous buttons and add to the default toolbar
2009-12-26 22:12:36 +00:00
"Panel", "Trash", "Search", "BookmarkAdd", "Previous", "Next", NULL };
Add a public function to retrieve the recommended toolbar actions
2009-07-10 15:37:44 +00:00
return actions;
}
Implement midori_browser_get_settings in MidoriBrowser
2010-04-27 21:36:14 +00:00
/**
* midori_browser_get_settings:
*
* Retrieves the settings instance of the browser.
*
* Return value: a #MidoriWebSettings instance
*
* Since: 0.2.5
**/
MidoriWebSettings*
midori_browser_get_settings (MidoriBrowser* browser)
{
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
return browser->settings;
}
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
static gboolean
Implement a not yet functional menu for adding and removing tool items
2009-01-17 22:56:23 +00:00
midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget,
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
gint x,
gint y,
gint button,
MidoriBrowser* browser)
{
GtkWidget* menu;
GtkWidget* menuitem;
menu = gtk_menu_new ();
Allow hiding the menubar and showing it again
2008-10-12 20:09:49 +00:00
menuitem = sokoke_action_create_popup_menu_item (
_action_by_name (browser, "Menubar"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
menuitem = sokoke_action_create_popup_menu_item (
_action_by_name (browser, "Navigationbar"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
menuitem = sokoke_action_create_popup_menu_item (
_action_by_name (browser, "Bookmarkbar"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
Show all of Toolsbars in the toolbar context menu
2008-10-21 22:28:49 +00:00
menuitem = sokoke_action_create_popup_menu_item (
_action_by_name (browser, "Statusbar"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
Implement 'Customize...' on toolbar right-click The new MidoriBrowser::populate-toolbar-menu allows extensions to add menu items. Fixes: https://bugs.launchpad.net/midori/+bug/699933
2011-04-17 20:43:54 +00:00
g_signal_emit (browser, signals[POPULATE_TOOLBAR_MENU], 0, menu);
Implement a not yet functional menu for adding and removing tool items
2009-01-17 22:56:23 +00:00
katze_widget_popup (widget, GTK_MENU (menu), NULL,
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
button == -1 ? KATZE_MENU_POSITION_LEFT : KATZE_MENU_POSITION_CURSOR);
return TRUE;
}
Implement activate-item(-alt) for bookmarkbar mouse buttons
2010-07-19 19:39:57 +00:00
static gboolean
midori_bookmarkbar_activate_item_alt (GtkAction* action,
KatzeItem* item,
guint button,
MidoriBrowser* browser)
{
Introduce MIDORI_EVENT_NEW_TAB and use it Fixes: https://bugs.launchpad.net/midori/+bug/797224 Fixes: https://bugs.launchpad.net/midori/+bug/797229
2011-09-28 15:45:37 +00:00
if (MIDORI_EVENT_NEW_TAB (gtk_get_current_event ()))
Implement activate-item(-alt) for bookmarkbar mouse buttons
2010-07-19 19:39:57 +00:00
{
gint n = midori_browser_add_uri (browser, katze_item_get_uri (item));
midori_browser_set_current_page_smartly (browser, n);
}
Introduce MIDORI_EVENT_NEW_TAB and use it Fixes: https://bugs.launchpad.net/midori/+bug/797224 Fixes: https://bugs.launchpad.net/midori/+bug/797229
2011-09-28 15:45:37 +00:00
else if (button == 1)
{
midori_browser_open_bookmark (browser, item);
}
Implement activate-item(-alt) for bookmarkbar mouse buttons
2010-07-19 19:39:57 +00:00
Make KatzeArrayAction::activate-item-alt fully autonomous Implementing the signal and returning TRUE makes it unneeded to implement activate-item as well now.
2010-09-16 19:18:14 +00:00
return TRUE;
Implement activate-item(-alt) for bookmarkbar mouse buttons
2010-07-19 19:39:57 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
_action_trash_populate_popup (GtkAction* action,
GtkMenu* menu,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
GtkWidget* menuitem;
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
Keep otherwise unused actions in a Dummy This is needed for accelerators to work even if the according actions are not part of the permanent UI description.
2008-10-12 19:44:00 +00:00
menuitem = gtk_action_create_menu_item (
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
_action_by_name (browser, "TrashEmpty"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
}
Introduce helper for correctly restoring tabs We need to ensure a reference on the item.
2011-12-07 21:31:13 +00:00
static gint
midori_browser_restore_tab (MidoriBrowser* browser,
KatzeItem* item)
{
gint n;
g_object_ref (item);
katze_array_remove_item (browser->trash, item);
n = midori_browser_add_item (browser, item);
g_object_unref (item);
return n;
}
Extend menu item middle click to support trash and history
2009-05-05 21:22:39 +00:00
static gboolean
_action_trash_activate_item_alt (GtkAction* action,
KatzeItem* item,
guint button,
MidoriBrowser* browser)
{
Introduce MIDORI_EVENT_NEW_TAB and use it Fixes: https://bugs.launchpad.net/midori/+bug/797224 Fixes: https://bugs.launchpad.net/midori/+bug/797229
2011-09-28 15:45:37 +00:00
if (MIDORI_EVENT_NEW_TAB (gtk_get_current_event ()))
Extend menu item middle click to support trash and history
2009-05-05 21:22:39 +00:00
{
Introduce helper for correctly restoring tabs We need to ensure a reference on the item.
2011-12-07 21:31:13 +00:00
midori_browser_set_current_page_smartly (browser,
midori_browser_restore_tab (browser, item));
Make KatzeArrayAction::activate-item-alt fully autonomous Implementing the signal and returning TRUE makes it unneeded to implement activate-item as well now.
2010-09-16 19:18:14 +00:00
}
Introduce MIDORI_EVENT_NEW_TAB and use it Fixes: https://bugs.launchpad.net/midori/+bug/797224 Fixes: https://bugs.launchpad.net/midori/+bug/797229
2011-09-28 15:45:37 +00:00
else if (button == 1)
Make KatzeArrayAction::activate-item-alt fully autonomous Implementing the signal and returning TRUE makes it unneeded to implement activate-item as well now.
2010-09-16 19:18:14 +00:00
{
Introduce helper for correctly restoring tabs We need to ensure a reference on the item.
2011-12-07 21:31:13 +00:00
midori_browser_set_current_page (browser,
midori_browser_restore_tab (browser, item));
Extend menu item middle click to support trash and history
2009-05-05 21:22:39 +00:00
}
Make KatzeArrayAction::activate-item-alt fully autonomous Implementing the signal and returning TRUE makes it unneeded to implement activate-item as well now.
2010-09-16 19:18:14 +00:00
return TRUE;
Extend menu item middle click to support trash and history
2009-05-05 21:22:39 +00:00
}
Open bookmarks from the panel as apps or internal consistently
2009-11-25 22:55:12 +00:00
/* static */ void
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
midori_browser_open_bookmark (MidoriBrowser* browser,
KatzeItem* item)
{
Open bookmarks from the panel as apps or internal consistently
2009-11-25 22:55:12 +00:00
const gchar* uri = katze_item_get_uri (item);
Try hard to open bookmarks if they have an incomplete address
2009-11-30 18:25:39 +00:00
gchar* uri_fixed;
Open bookmarks from the panel as apps or internal consistently
2009-11-25 22:55:12 +00:00
if (!(uri && *uri))
return;
Try hard to open bookmarks if they have an incomplete address
2009-11-30 18:25:39 +00:00
/* Imported bookmarks may lack a protocol */
Handle search engines in MidoriBrowser and simplify sokoke_magic_uri
2010-02-09 17:13:47 +00:00
uri_fixed = sokoke_magic_uri (uri);
if (!uri_fixed)
uri_fixed = g_strdup (uri);
Try hard to open bookmarks if they have an incomplete address
2009-11-30 18:25:39 +00:00
Fix handling of 'app' property on bookmark open
2010-07-02 05:05:11 +00:00
if (katze_item_get_meta_boolean (item, "app"))
Let private mode inherit preferences Private mode should retain most preferences, while menus for Bookmarks, Tools and Panel are hidden. App mode now hides the navigationbar by default.
2010-10-13 21:41:11 +00:00
sokoke_spawn_app (uri_fixed, FALSE);
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
else
{
Try hard to open bookmarks if they have an incomplete address
2009-11-30 18:25:39 +00:00
midori_browser_set_current_uri (browser, uri_fixed);
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
gtk_widget_grab_focus (midori_browser_get_current_tab (browser));
}
Try hard to open bookmarks if they have an incomplete address
2009-11-30 18:25:39 +00:00
g_free (uri_fixed);
Implement 'Run as web application' option on bookmarks If enabled, the bookmark will run as a standalone process by default.
2009-11-18 22:10:47 +00:00
}
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
static void
_action_tools_populate_popup (GtkAction* action,
GtkMenu* menu,
MidoriBrowser* browser)
{
Reindent actions in Tools menu in MidoriBrowser
2010-04-04 19:19:59 +00:00
static const GtkActionEntry actions[] =
{
{ "ManageSearchEngines" },
{ "ClearPrivateData" },
{ "InspectPage" },
{ "-" },
{ NULL },
{ "p" },
#ifdef G_OS_WIN32
{ NULL },
{ "Preferences" },
#endif
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
};
guint i;
for (i = 0; i < G_N_ELEMENTS (actions); i++)
{
GtkWidget* menuitem;
if (actions[i].name != NULL)
{
if (actions[i].name[0] == '-')
{
g_signal_emit (browser, signals[POPULATE_TOOL_MENU], 0, menu);
continue;
}
else if (actions[i].name[0] == 'p')
{
MidoriPanel* panel;
gsize j;
GtkWidget* widget;
panel = MIDORI_PANEL (browser->panel);
j = 0;
while ((widget = midori_panel_get_nth_page (panel, j++)))
{
menuitem = midori_panel_construct_menu_item (panel, MIDORI_VIEWABLE (widget));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
}
continue;
}
menuitem = sokoke_action_create_popup_menu_item (
_action_by_name (browser, actions[i].name));
}
else
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
}
}
Implement context menu in menu items, forward buttons from the menubar
2009-12-13 14:44:02 +00:00
static void
midori_browser_bookmark_popup (GtkWidget* widget,
GdkEventButton* event,
KatzeItem* item,
MidoriBrowser* browser);
Re-implement 'Bookmarks' menubar and toolbar button
2010-09-14 20:12:55 +00:00
static gboolean
_action_bookmarks_populate_folder (GtkAction* action,
GtkMenuShell* menu,
KatzeArray* folder,
MidoriBrowser* browser)
{
const gchar* folder_name;
KatzeArray* bookmarks;
GtkWidget* menuitem;
Introduce midori_array_query to unify bookmark queries This ensures querying is consistently quoted and ordered.
2011-11-22 23:23:41 +00:00
folder_name = katze_item_get_name (KATZE_ITEM (folder));
if (!(bookmarks = midori_array_query (browser->bookmarks,
"uri, title, app, folder", "folder = '%q'", folder_name)))
Return FALSE in _action_bookmarks_populate_folder if db is NULL
2010-09-16 19:39:42 +00:00
return FALSE;
Re-implement 'Bookmarks' menubar and toolbar button
2010-09-14 20:12:55 +00:00
/* Clear items from dummy array here */
gtk_container_foreach (GTK_CONTAINER (menu),
(GtkCallback)(gtk_widget_destroy), NULL);
Introduce midori_array_query to unify bookmark queries This ensures querying is consistently quoted and ordered.
2011-11-22 23:23:41 +00:00
if (katze_array_is_empty (bookmarks))
Re-implement 'Bookmarks' menubar and toolbar button
2010-09-14 20:12:55 +00:00
{
menuitem = gtk_image_menu_item_new_with_label (_("Empty"));
gtk_widget_set_sensitive (menuitem, FALSE);
gtk_menu_shell_append (menu, menuitem);
gtk_widget_show (menuitem);
return TRUE;
}
katze_array_action_generate_menu (KATZE_ARRAY_ACTION (action), bookmarks,
menu, GTK_WIDGET (browser));
return TRUE;
}
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
static void
_action_window_populate_popup (GtkAction* action,
GtkMenu* menu,
MidoriBrowser* browser)
{
When hovering menu items, show descriptions in the statusbar
2009-09-30 21:57:36 +00:00
GtkWidget* menuitem;
menuitem = gtk_separator_menu_item_new ();
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
Implement 'Open last session' menu item
2009-09-30 21:02:10 +00:00
menuitem = gtk_action_create_menu_item (
_action_by_name (browser, "LastSession"));
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
Add Window > Focus Current Tab
2009-09-30 20:18:17 +00:00
menuitem = gtk_action_create_menu_item (
_action_by_name (browser, "TabCurrent"));
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
Cycle between location and paned widgets with F6
2011-04-26 20:57:13 +00:00
menuitem = gtk_action_create_menu_item (
_action_by_name (browser, "NextView"));
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
Keep otherwise unused actions in a Dummy This is needed for accelerators to work even if the according actions are not part of the permanent UI description.
2008-10-12 19:44:00 +00:00
menuitem = gtk_action_create_menu_item (
Swap Next Tab and Previous Tab menu items
2009-11-10 19:07:10 +00:00
_action_by_name (browser, "TabNext"));
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
Keep otherwise unused actions in a Dummy This is needed for accelerators to work even if the according actions are not part of the permanent UI description.
2008-10-12 19:44:00 +00:00
menuitem = gtk_action_create_menu_item (
Swap Next Tab and Previous Tab menu items
2009-11-10 19:07:10 +00:00
_action_by_name (browser, "TabPrevious"));
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
}
static void
Make KatzeArrayAction::activate-item-alt fully autonomous Implementing the signal and returning TRUE makes it unneeded to implement activate-item as well now.
2010-09-16 19:18:14 +00:00
_action_window_activate_item_alt (GtkAction* action,
KatzeItem* item,
gint button,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Make KatzeArrayAction::activate-item-alt fully autonomous Implementing the signal and returning TRUE makes it unneeded to implement activate-item as well now.
2010-09-16 19:18:14 +00:00
guint i;
guint n = katze_array_get_length (browser->proxy_array);
Ellipsize menu items referring to websites or bookmarks. Originally menu items could in some cases become as wide as the whole screen, making working with menus rather hard. Now we ellipsize at 50 characters in the middle of the string.
2008-09-07 01:39:25 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
for (i = 0; i < n; i++)
{
Make KatzeArrayAction::activate-item-alt fully autonomous Implementing the signal and returning TRUE makes it unneeded to implement activate-item as well now.
2010-09-16 19:18:14 +00:00
GtkWidget* view;
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), i);
if (midori_view_get_proxy_item (MIDORI_VIEW (view)) == item)
gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), i);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
}
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
static void
_action_compact_menu_populate_popup (GtkAction* action,
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
GtkWidget* menu,
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
MidoriBrowser* browser)
{
static const GtkActionEntry actions[] = {
{ "TabNew" },
{ "WindowNew" },
Organize appmenu items into more logical groups Fixes: https://bugs.launchpad.net/midori/+bug/736072
2011-04-07 19:17:18 +00:00
{ NULL },
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
{ "Open" },
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
{ "Find" },
Put 'Find' into the compact popup menu
2010-12-05 22:01:01 +00:00
#if !HAVE_HILDON
No Print or Reset Zoom in context menu, but Print in compact menu
2009-07-17 17:37:49 +00:00
{ "Print" },
Implement 'Inspect page' menuitem with WebKitGTK+ >= 1.1.17
2010-01-21 17:31:17 +00:00
{ "InspectPage" },
#endif
Organize appmenu items into more logical groups Fixes: https://bugs.launchpad.net/midori/+bug/736072
2011-04-07 19:17:18 +00:00
{ NULL },
{ "PrivateBrowsing" },
#if !HAVE_HILDON
{ "ClearPrivateData" },
Add 'Create desktop shortcut' to app menu
2011-10-15 16:55:11 +00:00
#if defined (GDK_WINDOWING_X11)
{ "AddDesktopShortcut" },
#endif
Organize appmenu items into more logical groups Fixes: https://bugs.launchpad.net/midori/+bug/736072
2011-04-07 19:17:18 +00:00
{ NULL },
Add Bookmark Import and Export to app menu
2011-02-11 20:55:49 +00:00
{ "BookmarksImport"},
{ "BookmarksExport"},
Organize appmenu items into more logical groups Fixes: https://bugs.launchpad.net/midori/+bug/736072
2011-04-07 19:17:18 +00:00
{ NULL },
{ "Fullscreen" },
{ "Panel" },
Add Bookmarkbar menu item to app menu below Panel
2012-01-12 01:23:15 +00:00
{ "Bookmarkbar" },
Organize appmenu items into more logical groups Fixes: https://bugs.launchpad.net/midori/+bug/736072
2011-04-07 19:17:18 +00:00
{ "-" },
Implement Compact Add button, and readjust the Hildon toolbar Actions AddNewsFeed and AddDesktopShortcut are introduced and the toolbar layout for Hildon is changed. Desktop shortcuts are not implemented yet.
2009-10-12 20:57:35 +00:00
#endif
Organize appmenu items into more logical groups Fixes: https://bugs.launchpad.net/midori/+bug/736072
2011-04-07 19:17:18 +00:00
{ NULL },
#if !HAVE_HILDON
Add FAQ menu item to the app menu
2011-02-21 18:32:30 +00:00
{ "HelpFAQ" },
Add 'Report a Problem' to the app menu
2011-04-07 19:25:27 +00:00
{ "HelpBugs"},
Organize appmenu items into more logical groups Fixes: https://bugs.launchpad.net/midori/+bug/736072
2011-04-07 19:17:18 +00:00
#endif
Remove toolbar menu items from the compact menu
2010-06-10 15:53:08 +00:00
{ "About" },
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
{ "Preferences" },
Show script, image and plugin options and views source in app menu
2009-10-26 17:07:10 +00:00
#if HAVE_HILDON
Organize appmenu items into more logical groups Fixes: https://bugs.launchpad.net/midori/+bug/736072
2011-04-07 19:17:18 +00:00
{ NULL },
Show script, image and plugin options and views source in app menu
2009-10-26 17:07:10 +00:00
{ "auto-load-images" },
{ "enable-scripts" },
{ "enable-plugins" },
#endif
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
};
Organize appmenu items into more logical groups Fixes: https://bugs.launchpad.net/midori/+bug/736072
2011-04-07 19:17:18 +00:00
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
guint i;
for (i = 0; i < G_N_ELEMENTS (actions); i++)
{
Implement and optimize for portrait mode support for Fremantle Listen to accelerometer movement. Hide tool items in portrait mode. Omit Homepage and View Source from app menu. Include Compact Add, View Source and Fullscreen in context menu. Hide buttons in portrait mode in preferences.
2009-11-27 22:42:07 +00:00
#ifdef HAVE_HILDON_2_2
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
GtkAction* _action;
gchar* label;
GtkWidget* button;
if (!actions[i].name)
continue;
_action = _action_by_name (browser, actions[i].name);
Show script, image and plugin options and views source in app menu
2009-10-26 17:07:10 +00:00
if (_action)
{
label = katze_object_get_string (_action, "label");
button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
gtk_button_set_label (GTK_BUTTON (button), label);
gtk_button_set_use_underline (GTK_BUTTON (button), TRUE);
g_free (label);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_action_activate), _action);
}
else
button = katze_property_proxy (browser->settings, actions[i].name, NULL);
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
gtk_widget_show (button);
hildon_app_menu_append (HILDON_APP_MENU (menu), GTK_BUTTON (button));
#else
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
GtkWidget* menuitem;
if (actions[i].name != NULL)
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
{
if (actions[i].name[0] == '-')
{
g_signal_emit (browser, signals[POPULATE_TOOL_MENU], 0, menu);
continue;
}
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
menuitem = sokoke_action_create_popup_menu_item (
_action_by_name (browser, actions[i].name));
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
}
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
else
Preserve action visibility when adding menu items to the compact menu
2009-10-31 22:07:15 +00:00
{
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
menuitem = gtk_separator_menu_item_new ();
Preserve action visibility when adding menu items to the compact menu
2009-10-31 22:07:15 +00:00
gtk_widget_show (menuitem);
}
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
#endif
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
}
}
Connect Help in Preferences to HelpContents
2008-10-03 22:46:54 +00:00
static void
midori_preferences_response_help_cb (GtkWidget* preferences,
gint response,
MidoriBrowser* browser)
{
if (response == GTK_RESPONSE_HELP)
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
midori_browser_activate_action (browser, "HelpFAQ");
Connect Help in Preferences to HelpContents
2008-10-03 22:46:54 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_preferences_activate (GtkAction* action,
MidoriBrowser* browser)
{
static GtkWidget* dialog = NULL;
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
return;
if (!dialog)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Remove remaining cases checking if browser->settings is set
2009-11-13 17:27:49 +00:00
dialog = midori_preferences_new (GTK_WINDOW (browser), browser->settings);
Embed extensions into preferences dialogue MidoriBrowser gains the show-preferences signal which gives API users a chance to add preferences. katze_preferences_add_category now returns a box to allow freely packing a widget into the page. The extension panel is packed into the preferences now rather than being appended as a proper panel. Motivation is consistency here, such as with Gedit or Emerillon and also the aspect that extensions often really do tweak behaviour like preferences do. Spacing and icons are added for visual consistency.
2011-04-14 01:29:50 +00:00
g_signal_emit (browser, signals[SHOW_PREFERENCES], 0, dialog);
Connect Help in Preferences to HelpContents
2008-10-03 22:46:54 +00:00
g_signal_connect (dialog, "response",
G_CALLBACK (midori_preferences_response_help_cb), browser);
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed), &dialog);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_widget_show (dialog);
}
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
else
gtk_window_present (GTK_WINDOW (dialog));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Allow hiding the menubar and showing it again
2008-10-12 20:09:49 +00:00
static void
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
_action_menubar_activate (GtkToggleAction* menubar_action,
Allow hiding the menubar and showing it again
2008-10-12 20:09:49 +00:00
MidoriBrowser* browser)
{
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
gboolean active = gtk_toggle_action_get_active (menubar_action);
GtkAction* menu_action = _action_by_name (browser, "CompactMenu");
GString* toolbar_items;
GList* children;
gchar* items;
toolbar_items = g_string_new (NULL);
children = gtk_container_get_children (GTK_CONTAINER (browser->navigationbar));
for (; children != NULL; children = g_list_next (children))
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
{
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
GtkAction* action = gtk_activatable_get_related_action (
GTK_ACTIVATABLE (children->data));
if (!action)
continue;
if (action == ((GtkAction*)menu_action))
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
{
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
if (active)
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
{
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
gtk_container_remove (GTK_CONTAINER (browser->navigationbar),
GTK_WIDGET (children->data));
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
}
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
continue;
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
}
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
else if (MIDORI_IS_PANED_ACTION (action))
{
MidoriPanedAction* paned_action = MIDORI_PANED_ACTION (action);
g_string_append_printf (toolbar_items, "%s,%s",
midori_paned_action_get_child1_name (paned_action),
midori_paned_action_get_child2_name (paned_action));
}
else
g_string_append (toolbar_items, gtk_action_get_name (action));
g_string_append_c (toolbar_items, ',');
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
}
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
g_list_free (children);
Omit Hildon customizations in MidoriBrower that can be configured
2009-12-09 19:37:26 +00:00
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
if (katze_object_get_boolean (browser->settings, "show-menubar") != active)
g_object_set (browser->settings, "show-menubar", active, NULL);
items = g_string_free (toolbar_items, FALSE);
g_object_set (browser->settings, "toolbar-items", items, NULL);
g_free (items);
Show "Menubar" menu in context menu if menubar and navibar are hidden It happens that users hide all toolbars and don't find a way to make them visible again. A menu item will be there for this case.
2009-09-26 20:08:16 +00:00
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
sokoke_widget_set_visible (browser->menubar, active);
Show "Menubar" menu in context menu if menubar and navibar are hidden It happens that users hide all toolbars and don't find a way to make them visible again. A menu item will be there for this case.
2009-09-26 20:08:16 +00:00
g_object_set_data (G_OBJECT (browser), "midori-toolbars-visible",
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
gtk_widget_get_visible (browser->menubar)
|| gtk_widget_get_visible (browser->navigationbar)
Show "Menubar" menu in context menu if menubar and navibar are hidden It happens that users hide all toolbars and don't find a way to make them visible again. A menu item will be there for this case.
2009-09-26 20:08:16 +00:00
? (void*)0xdeadbeef : NULL);
Allow hiding the menubar and showing it again
2008-10-12 20:09:49 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_navigationbar_activate (GtkToggleAction* action,
MidoriBrowser* browser)
{
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
gboolean active = gtk_toggle_action_get_active (action);
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
g_object_set (browser->settings, "show-navigationbar", active, NULL);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
sokoke_widget_set_visible (browser->navigationbar, active);
Show "Menubar" menu in context menu if menubar and navibar are hidden It happens that users hide all toolbars and don't find a way to make them visible again. A menu item will be there for this case.
2009-09-26 20:08:16 +00:00
g_object_set_data (G_OBJECT (browser), "midori-toolbars-visible",
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
gtk_widget_get_visible (browser->menubar)
|| gtk_widget_get_visible (browser->navigationbar)
Show "Menubar" menu in context menu if menubar and navibar are hidden It happens that users hide all toolbars and don't find a way to make them visible again. A menu item will be there for this case.
2009-09-26 20:08:16 +00:00
? (void*)0xdeadbeef : NULL);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
_action_bookmarkbar_activate (GtkToggleAction* action,
MidoriBrowser* browser)
{
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
gboolean active = gtk_toggle_action_get_active (action);
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
g_object_set (browser->settings, "show-bookmarkbar", active, NULL);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
sokoke_widget_set_visible (browser->bookmarkbar, active);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
_action_statusbar_activate (GtkToggleAction* action,
MidoriBrowser* browser)
{
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
gboolean active = gtk_toggle_action_get_active (action);
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
g_object_set (browser->settings, "show-statusbar", active, NULL);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
sokoke_widget_set_visible (browser->statusbar, active);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
_action_reload_stop_activate (GtkAction* action,
MidoriBrowser* browser)
{
gchar* stock_id;
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view;
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
if (!(view = midori_browser_get_current_tab (browser)))
return;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_object_get (action, "stock-id", &stock_id, NULL);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Refresh or stop, depending on the stock id */
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
if (!strcmp (stock_id, GTK_STOCK_REFRESH))
{
Uncached reload action, default Ctrl+Shift+R
2011-02-02 00:55:32 +00:00
GdkModifierType state = (GdkModifierType)0;
gint x, y;
gboolean from_cache = TRUE;
if (!strcmp (gtk_action_get_name (action), "ReloadUncached"))
from_cache = FALSE;
else
{
gdk_window_get_pointer (NULL, &x, &y, &state);
if (state & GDK_SHIFT_MASK)
from_cache = FALSE;
}
midori_view_reload (MIDORI_VIEW (view), from_cache);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
else
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
midori_view_stop_loading (MIDORI_VIEW (view));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_free (stock_id);
}
Add zoom functionality, if webkit supports it
2008-06-01 09:26:10 +00:00
static void
Merge _action_zoom_*_activate into _action_zoom_activate ()
2010-06-25 13:50:19 +00:00
_action_zoom_activate (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view = midori_browser_get_current_tab (browser);
Merge _action_zoom_*_activate into _action_zoom_activate ()
2010-06-25 13:50:19 +00:00
if (!view)
return;
if (g_str_equal (gtk_action_get_name (action), "ZoomIn"))
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
midori_view_set_zoom_level (MIDORI_VIEW (view),
Zoom in steps of 10% instead of 25% by default Related to: https://bugs.launchpad.net/midori/+bug/707026
2011-07-09 19:43:02 +00:00
midori_view_get_zoom_level (MIDORI_VIEW (view)) + 0.10f);
Merge _action_zoom_*_activate into _action_zoom_activate ()
2010-06-25 13:50:19 +00:00
else if (g_str_equal (gtk_action_get_name (action), "ZoomOut"))
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
midori_view_set_zoom_level (MIDORI_VIEW (view),
Zoom in steps of 10% instead of 25% by default Related to: https://bugs.launchpad.net/midori/+bug/707026
2011-07-09 19:43:02 +00:00
midori_view_get_zoom_level (MIDORI_VIEW (view)) - 0.10f);
Merge _action_zoom_*_activate into _action_zoom_activate ()
2010-06-25 13:50:19 +00:00
else
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0f);
Add zoom functionality, if webkit supports it
2008-06-01 09:26:10 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Implement Encoding menu
2009-02-27 22:09:36 +00:00
static void
_action_view_encoding_activate (GtkAction* action,
Use radio actions for the encodings menu
2009-06-22 20:55:23 +00:00
GtkAction* current,
Implement Encoding menu
2009-02-27 22:09:36 +00:00
MidoriBrowser* browser)
{
GtkWidget* view = midori_browser_get_current_tab (browser);
Enable encoding action at compilation time
2010-06-07 19:27:03 +00:00
if (view)
Implement Encoding menu
2009-02-27 22:09:36 +00:00
{
const gchar* name;
GtkWidget* web_view;
Use radio actions for the encodings menu
2009-06-22 20:55:23 +00:00
name = gtk_action_get_name (current);
Change MidoriView into a subclass of GtkVBox This change makes it possible to pack widgets, notably info bars, into a MidoriView.
2010-03-30 20:45:49 +00:00
web_view = midori_view_get_web_view (MIDORI_VIEW (view));
Implement Encoding menu
2009-02-27 22:09:36 +00:00
if (!strcmp (name, "EncodingAutomatic"))
g_object_set (web_view, "custom-encoding", NULL, NULL);
else
{
const gchar* encoding;
if (!strcmp (name, "EncodingChinese"))
encoding = "BIG5";
else if (!strcmp (name, "EncodingJapanese"))
encoding = "SHIFT_JIS";
Add Korean encoding to the available of character encodings
2009-10-31 21:51:35 +00:00
else if (!strcmp (name, "EncodingKorean"))
encoding = "EUC-KR";
Implement Encoding menu
2009-02-27 22:09:36 +00:00
else if (!strcmp (name, "EncodingRussian"))
encoding = "KOI8-R";
else if (!strcmp (name, "EncodingUnicode"))
encoding = "UTF-8";
else if (!strcmp (name, "EncodingWestern"))
encoding = "ISO-8859-1";
else
g_assert_not_reached ();
g_object_set (web_view, "custom-encoding", encoding, NULL);
}
}
}
Preserve extensions for viewing source files
2008-10-23 23:15:43 +00:00
static gchar*
midori_browser_get_uri_extension (const gchar* uri)
{
gchar* slash;
gchar* period;
gchar* ext_end;
/* Find the last slash in the URI and search for the last period
*after* the last slash. This is not completely accurate
but should cover most (simple) URIs */
Don't leak URI in midori_browser_get_uri_extension
2010-10-14 18:27:31 +00:00
slash = strrchr (uri, '/');
Preserve extensions for viewing source files
2008-10-23 23:15:43 +00:00
/* Huh, URI without slashes? */
if (!slash)
Avoid copying of strings and making tiny allocations
2011-12-11 01:57:04 +00:00
return NULL;
Preserve extensions for viewing source files
2008-10-23 23:15:43 +00:00
ext_end = period = strrchr (slash, '.');
if (!period)
Avoid copying of strings and making tiny allocations
2011-12-11 01:57:04 +00:00
return NULL;
Preserve extensions for viewing source files
2008-10-23 23:15:43 +00:00
/* Skip the period */
ext_end++;
/* If *ext_end is 0 here, the URI ended with a period, so skip */
if (!*ext_end)
Avoid copying of strings and making tiny allocations
2011-12-11 01:57:04 +00:00
return NULL;
Preserve extensions for viewing source files
2008-10-23 23:15:43 +00:00
/* Find the end of the extension */
while (*ext_end && g_ascii_isalnum (*ext_end))
ext_end++;
*ext_end = 0;
Don't leak URI in midori_browser_get_uri_extension
2010-10-14 18:27:31 +00:00
return g_strdup (period);
Preserve extensions for viewing source files
2008-10-23 23:15:43 +00:00
}
Reuse source of webview instead of redownloading on view source
2011-05-28 15:40:20 +00:00
static gchar*
midori_browser_save_source (const gchar* uri,
const gchar* data,
Reuse source of webview when saving a page to disk Fixes: https://bugs.launchpad.net/midori/+bug/782133
2011-05-30 15:55:02 +00:00
const size_t len,
const gchar* outfile)
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
{
gchar* unique_filename;
gint fd;
FILE* fp;
Arrange file saving for error handling to fix warnings
2008-11-15 23:10:39 +00:00
size_t ret;
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
Reuse source of webview when saving a page to disk Fixes: https://bugs.launchpad.net/midori/+bug/782133
2011-05-30 15:55:02 +00:00
if (!outfile)
{
Handle unique_filename and null-check data source
2011-06-08 22:37:25 +00:00
gchar* filename;
gchar* extension;
Reuse source of webview when saving a page to disk Fixes: https://bugs.launchpad.net/midori/+bug/782133
2011-05-30 15:55:02 +00:00
extension = midori_browser_get_uri_extension (uri);
filename = g_strdup_printf ("%uXXXXXX%s",
Add .htm when viewing source if there's no extension
2011-11-17 23:00:41 +00:00
g_str_hash (uri), extension && *extension ? extension : ".htm");
Reuse source of webview when saving a page to disk Fixes: https://bugs.launchpad.net/midori/+bug/782133
2011-05-30 15:55:02 +00:00
g_free (extension);
fd = g_file_open_tmp (filename, &unique_filename, NULL);
Handle unique_filename and null-check data source
2011-06-08 22:37:25 +00:00
g_free (filename);
Reuse source of webview when saving a page to disk Fixes: https://bugs.launchpad.net/midori/+bug/782133
2011-05-30 15:55:02 +00:00
}
else
{
Handle unique_filename and null-check data source
2011-06-08 22:37:25 +00:00
unique_filename = g_strdup (outfile);
fd = g_open (unique_filename, O_WRONLY|O_CREAT, 0644);
Reuse source of webview when saving a page to disk Fixes: https://bugs.launchpad.net/midori/+bug/782133
2011-05-30 15:55:02 +00:00
}
if (fd != -1)
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
{
Reuse source of webview instead of redownloading on view source
2011-05-28 15:40:20 +00:00
if ((fp = fdopen (fd, "w")))
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
{
Reuse source of webview instead of redownloading on view source
2011-05-28 15:40:20 +00:00
ret = fwrite (data, 1, len, fp);
fclose (fp);
if ((ret - len) != 0)
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
{
Reuse source of webview instead of redownloading on view source
2011-05-28 15:40:20 +00:00
g_warning ("Error writing to file %s "
"in midori_browser_source_transfer_cb()", unique_filename);
Handle unique_filename and null-check data source
2011-06-08 22:37:25 +00:00
katze_assign (unique_filename, NULL);
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
}
}
Reuse source of webview instead of redownloading on view source
2011-05-28 15:40:20 +00:00
close (fd);
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
}
Reuse source of webview instead of redownloading on view source
2011-05-28 15:40:20 +00:00
return unique_filename;
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
}
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
static void
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
_action_source_view_activate (GtkAction* action,
MidoriBrowser* browser)
{
Handle unique_filename and null-check data source
2011-06-08 22:37:25 +00:00
WebKitWebDataSource *data_source;
WebKitWebFrame *frame;
const GString *data;
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view;
Reuse source of webview instead of redownloading on view source
2011-05-28 15:40:20 +00:00
GtkWidget* web_view;
Implement source view with GIO and drop internal source view We use GIO to choose a text editor unless a text editor was specified in the Preferences. We drop our internal source view now which used to serve as a fallback.
2009-03-17 20:35:05 +00:00
gchar* text_editor;
Reuse source of webview instead of redownloading on view source
2011-05-28 15:40:20 +00:00
gchar* filename = NULL;
Implement source view with GIO and drop internal source view We use GIO to choose a text editor unless a text editor was specified in the Preferences. We drop our internal source view now which used to serve as a fallback.
2009-03-17 20:35:05 +00:00
const gchar* uri;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
if (!(view = midori_browser_get_current_tab (browser)))
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
return;
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
g_object_get (browser->settings, "text-editor", &text_editor, NULL);
Implement source view with GIO and drop internal source view We use GIO to choose a text editor unless a text editor was specified in the Preferences. We drop our internal source view now which used to serve as a fallback.
2009-03-17 20:35:05 +00:00
uri = midori_view_get_display_uri (MIDORI_VIEW (view));
Handle unique_filename and null-check data source
2011-06-08 22:37:25 +00:00
web_view = midori_view_get_web_view (MIDORI_VIEW (view));
frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view));
data_source = webkit_web_frame_get_data_source (frame);
data = webkit_web_data_source_get_data (data_source);
Add .htm when viewing source if there's no extension
2011-11-17 23:00:41 +00:00
if (!data)
Handle unique_filename and null-check data source
2011-06-08 22:37:25 +00:00
return;
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
Fix arguments given to midori_browser_save_source
2011-11-19 20:07:43 +00:00
filename = midori_browser_save_source (uri, data->str, data->len, NULL);
Display source code in a tab if no editor is specified This uses view source mode available since WebKitGTK+ 1.1.14.
2009-09-14 21:57:57 +00:00
if (!(text_editor && *text_editor))
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
{
Display source code in a tab if no editor is specified This uses view source mode available since WebKitGTK+ 1.1.14.
2009-09-14 21:57:57 +00:00
GtkWidget* source;
Don't shadow web_view in _action_source_view_activate
2011-07-27 21:06:44 +00:00
GtkWidget* source_view;
Handle unique_filename and null-check data source
2011-06-08 22:37:25 +00:00
gchar* source_uri;
source_uri = g_filename_to_uri (filename, NULL, NULL);
g_free (filename);
Implement source view with GIO and drop internal source view We use GIO to choose a text editor unless a text editor was specified in the Preferences. We drop our internal source view now which used to serve as a fallback.
2009-03-17 20:35:05 +00:00
Use new _with_item constructor everywhere
2011-12-08 20:14:06 +00:00
source = midori_view_new_with_item (NULL, browser->settings);
Don't shadow web_view in _action_source_view_activate
2011-07-27 21:06:44 +00:00
source_view = midori_view_get_web_view (MIDORI_VIEW (source));
webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (source_view), TRUE);
webkit_web_view_load_uri (WEBKIT_WEB_VIEW (source_view), source_uri);
Display source code in a tab if no editor is specified This uses view source mode available since WebKitGTK+ 1.1.14.
2009-09-14 21:57:57 +00:00
midori_browser_add_tab (browser, source);
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
}
Reuse source of webview instead of redownloading on view source
2011-05-28 15:40:20 +00:00
else
Open source of local files directly with no temporary copy
2009-09-26 21:56:29 +00:00
{
Remove 'filename' argument from sokoke_spawn_program
2010-10-10 11:27:06 +00:00
sokoke_spawn_program (text_editor, filename);
Open source of local files directly with no temporary copy
2009-09-26 21:56:29 +00:00
g_free (filename);
}
Implement View source with external Text editor
2008-10-20 19:32:25 +00:00
g_free (text_editor);
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Support caret browsing toggle with F7 Users who need the feature can't be expected to change a hidden preference. The same hotkey is supported by Firefox and Epiphany.
2011-04-30 10:07:12 +00:00
static void
_action_caret_browsing_activate (GtkAction* action,
MidoriBrowser* browser)
{
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
_("Toggle text cursor navigation");
Support caret browsing toggle with F7 Users who need the feature can't be expected to change a hidden preference. The same hotkey is supported by Firefox and Epiphany.
2011-04-30 10:07:12 +00:00
g_object_set (browser->settings, "enable-caret-browsing",
!katze_object_get_boolean (browser->settings, "enable-caret-browsing"), NULL);
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_fullscreen_activate (GtkAction* action,
MidoriBrowser* browser)
{
Lookup icon size in relation to the according screen or widget
2010-01-29 21:30:23 +00:00
GdkWindowState state;
Use accessors for window and allocation of a widget
2010-10-18 20:42:10 +00:00
if (!gtk_widget_get_window (GTK_WIDGET (browser)))
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
return;
Use accessors for window and allocation of a widget
2010-10-18 20:42:10 +00:00
state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (browser)));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
if (state & GDK_WINDOW_STATE_FULLSCREEN)
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
{
Handle menubar in fullscreen like other bars Related to: https://bugs.launchpad.net/midori/+bug/783675
2012-01-13 22:42:16 +00:00
if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-menubar"))
gtk_widget_show (browser->menubar);
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-panel"))
gtk_widget_show (browser->panel);
if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-bookmarkbar"))
gtk_widget_show (browser->bookmarkbar);
if (browser->show_navigationbar)
gtk_widget_show (browser->navigationbar);
if (browser->show_statusbar)
gtk_widget_show (browser->statusbar);
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
_toggle_tabbar_smartly (browser, TRUE);
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_window_unfullscreen (GTK_WINDOW (browser));
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
else
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
{
Handle menubar in fullscreen like other bars Related to: https://bugs.launchpad.net/midori/+bug/783675
2012-01-13 22:42:16 +00:00
gtk_widget_hide (browser->menubar);
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
gtk_widget_hide (browser->panel);
gtk_widget_hide (browser->bookmarkbar);
gtk_widget_hide (browser->navigationbar);
gtk_widget_hide (browser->statusbar);
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), FALSE);
Always hide the border when going fullscreen Fixes: https://bugs.launchpad.net/bugs/783675
2011-12-17 10:36:09 +00:00
gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), FALSE);
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_window_fullscreen (GTK_WINDOW (browser));
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Implement Scroll actions, defaulting to Vim direction keys
2010-02-28 22:41:54 +00:00
static void
_action_scroll_somewhere_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* view;
WebKitWebView* web_view;
const gchar* name;
view = midori_browser_get_current_tab (browser);
if (!view)
return;
Change MidoriView into a subclass of GtkVBox This change makes it possible to pack widgets, notably info bars, into a MidoriView.
2010-03-30 20:45:49 +00:00
web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
Implement Scroll actions, defaulting to Vim direction keys
2010-02-28 22:41:54 +00:00
name = gtk_action_get_name (action);
if (g_str_equal (name, "ScrollLeft"))
webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_VISUAL_POSITIONS, -1);
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
else if (g_str_equal (name, "ScrollDown"))
Implement Scroll actions, defaulting to Vim direction keys
2010-02-28 22:41:54 +00:00
webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_DISPLAY_LINES, 1);
else if (g_str_equal (name, "ScrollUp"))
webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_DISPLAY_LINES, -1);
else if (g_str_equal (name, "ScrollRight"))
webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_VISUAL_POSITIONS, 1);
}
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
static gboolean
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
_action_navigation_activate (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
MidoriView* view;
GtkWidget* tab;
gchar* uri;
const gchar* name;
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
gboolean middle_click;
Lookup icon size in relation to the according screen or widget
2010-01-29 21:30:23 +00:00
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
g_assert (GTK_IS_ACTION (action));
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (action),
"midori-middle-click")))
Use a trick to prevent default activation when middle clicking
2009-05-17 11:38:42 +00:00
{
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
middle_click = TRUE;
g_object_set_data (G_OBJECT (action),
"midori-middle-click",
GINT_TO_POINTER(0));
Use a trick to prevent default activation when middle clicking
2009-05-17 11:38:42 +00:00
}
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
else
middle_click = FALSE;
Use a trick to prevent default activation when middle clicking
2009-05-17 11:38:42 +00:00
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
tab = midori_browser_get_current_tab (browser);
if (!tab)
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
return FALSE;
Use a trick to prevent default activation when middle clicking
2009-05-17 11:38:42 +00:00
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
view = MIDORI_VIEW (tab);
Lookup icon size in relation to the according screen or widget
2010-01-29 21:30:23 +00:00
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
name = gtk_action_get_name (action);
Implement Next and Previous buttons and add to the default toolbar
2009-12-26 22:12:36 +00:00
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
if (g_str_equal (name, "Back"))
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
{
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
if (middle_click)
{
GtkWidget* web_view;
WebKitWebBackForwardList* back_forward_list;
WebKitWebHistoryItem* back_item;
const gchar* back_uri;
gint n;
web_view = midori_view_get_web_view (view);
back_forward_list =
webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (web_view));
back_item = webkit_web_back_forward_list_get_back_item (back_forward_list);
back_uri = webkit_web_history_item_get_uri (back_item);
n = midori_browser_add_uri (browser, back_uri);
midori_browser_set_current_page_smartly (browser, n);
}
else
midori_view_go_back (view);
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
return TRUE;
}
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
else if (g_str_equal (name, "Forward"))
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
{
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
if (middle_click)
{
GtkWidget* web_view;
WebKitWebBackForwardList* back_forward_list;
WebKitWebHistoryItem* forward_item;
const gchar* forward_uri;
gint n;
web_view = midori_view_get_web_view (view);
back_forward_list =
webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (web_view));
forward_item = webkit_web_back_forward_list_get_forward_item (back_forward_list);
forward_uri = webkit_web_history_item_get_uri (forward_item);
n = midori_browser_add_uri (browser, forward_uri);
midori_browser_set_current_page_smartly (browser, n);
}
else
midori_view_go_forward (view);
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
return TRUE;
}
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
else if (g_str_equal (name, "Previous"))
Implement Next and Previous buttons and add to the default toolbar
2009-12-26 22:12:36 +00:00
{
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
/* Duplicate here because the URI pointer might change */
uri = g_strdup (midori_view_get_previous_page (view));
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
if (middle_click)
{
gint n;
n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page_smartly (browser, n);
}
else
midori_view_set_uri (view, uri);
Implement Next and Previous buttons and add to the default toolbar
2009-12-26 22:12:36 +00:00
g_free (uri);
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
return TRUE;
Implement Next and Previous buttons and add to the default toolbar
2009-12-26 22:12:36 +00:00
}
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
else if (g_str_equal (name, "Next"))
Implement Next and Previous buttons and add to the default toolbar
2009-12-26 22:12:36 +00:00
{
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
/* Duplicate here because the URI pointer might change */
uri = g_strdup (midori_view_get_next_page (view));
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
if (middle_click)
{
gint n;
n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page_smartly (browser, n);
}
else
midori_view_set_uri (view, uri);
Implement Next and Previous buttons and add to the default toolbar
2009-12-26 22:12:36 +00:00
g_free (uri);
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
return TRUE;
Implement Next and Previous buttons and add to the default toolbar
2009-12-26 22:12:36 +00:00
}
Add homepage handling in _action_navigation_activate ()
2010-06-25 15:18:22 +00:00
else if (g_str_equal (name, "Homepage"))
Use a trick to prevent default activation when middle clicking
2009-05-17 11:38:42 +00:00
{
Add homepage handling in _action_navigation_activate ()
2010-06-25 15:18:22 +00:00
g_object_get (browser->settings, "homepage", &uri, NULL);
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
if (middle_click)
{
gint n;
n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page_smartly (browser, n);
}
else
midori_view_set_uri (view, uri);
Add homepage handling in _action_navigation_activate ()
2010-06-25 15:18:22 +00:00
g_free (uri);
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
return TRUE;
Use a trick to prevent default activation when middle clicking
2009-05-17 11:38:42 +00:00
}
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
return FALSE;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Introduce MidoriLocationEntry and GtkIconEntry
2008-07-17 19:02:14 +00:00
static void
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
_action_location_activate (GtkAction* action,
MidoriBrowser* browser)
{
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!gtk_widget_get_visible (browser->navigationbar))
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
gtk_widget_show (browser->navigationbar);
}
Replace Go button with a Go icon inside the address entry The icon is displayed by default, takes a little less space, but replaced with the news feed icon as appropriate. If the address entry is focussed, the Go icon takes precedence. We also introduce the focus-in signal on MidoriLocationAction.
2009-06-13 01:45:11 +00:00
static void
_action_location_focus_in (GtkAction* action,
MidoriBrowser* browser)
{
midori_location_action_set_secondary_icon (
MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO);
}
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
static void
_action_location_focus_out (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Replace Go button with a Go icon inside the address entry The icon is displayed by default, takes a little less space, but replaced with the news feed icon as appropriate. If the address entry is focussed, the Go icon takes precedence. We also introduce the focus-in signal on MidoriLocationAction.
2009-06-13 01:45:11 +00:00
GtkWidget* view = midori_browser_get_current_tab (browser);
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
if (!browser->show_navigationbar || midori_browser_is_fullscreen (browser))
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
gtk_widget_hide (browser->navigationbar);
Replace Go button with a Go icon inside the address entry The icon is displayed by default, takes a little less space, but replaced with the news feed icon as appropriate. If the address entry is focussed, the Go icon takes precedence. We also introduce the focus-in signal on MidoriLocationAction.
2009-06-13 01:45:11 +00:00
if (g_object_get_data (G_OBJECT (view), "news-feeds"))
midori_location_action_set_secondary_icon (
MIDORI_LOCATION_ACTION (action), STOCK_NEWS_FEED);
else
midori_location_action_set_secondary_icon (
MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO);
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
}
Resolve helpers and globals into sokoke.
2008-04-20 19:44:56 +00:00
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
static void
_action_location_reset_uri (GtkAction* action,
MidoriBrowser* browser)
{
Also reset icon when resetting location
2012-01-27 20:13:45 +00:00
GtkWidget* view;
if ((view = midori_browser_get_current_tab (browser)))
{
midori_location_action_set_text (MIDORI_LOCATION_ACTION (action),
midori_view_get_display_uri (MIDORI_VIEW (view)));
midori_location_action_set_icon (MIDORI_LOCATION_ACTION (action),
midori_view_get_icon (MIDORI_VIEW (view)));
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Store searches with tokens in the completion as a distinct item Currently searches won't be stored persistently in the database.
2010-01-01 21:47:24 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
_action_location_submit_uri (GtkAction* action,
const gchar* uri,
Alt + Enter in the location should issue a new tab
2008-08-31 01:21:29 +00:00
gboolean new_tab,
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
gchar* new_uri;
Alt + Enter in the location should issue a new tab
2008-08-31 01:21:29 +00:00
gint n;
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
Avoid allocations in _action_location_submit_uri Skip whitespace without changing the string. And take advantage of the fact that _find_token now can deal with a complete URI.
2012-02-10 22:01:50 +00:00
uri = katze_skip_whitespace (uri);
new_uri = sokoke_magic_uri (uri);
Percent encode search terms, so '+' actually ends up as a '+'
2009-04-18 22:47:02 +00:00
if (!new_uri)
Store searches with tokens in the completion as a distinct item Currently searches won't be stored persistently in the database.
2010-01-01 21:47:24 +00:00
{
Avoid allocations in _action_location_submit_uri Skip whitespace without changing the string. And take advantage of the fact that _find_token now can deal with a complete URI.
2012-02-10 22:01:50 +00:00
const gchar* keywords = NULL;
Handle search engines in MidoriBrowser and simplify sokoke_magic_uri
2010-02-09 17:13:47 +00:00
const gchar* search_uri = NULL;
Avoid allocations in _action_location_submit_uri Skip whitespace without changing the string. And take advantage of the fact that _find_token now can deal with a complete URI.
2012-02-10 22:01:50 +00:00
KatzeItem* item;
Store searches with tokens in the completion as a distinct item Currently searches won't be stored persistently in the database.
2010-01-01 21:47:24 +00:00
Handle search engines in MidoriBrowser and simplify sokoke_magic_uri
2010-02-09 17:13:47 +00:00
/* Do we have a keyword and a string? */
Avoid allocations in _action_location_submit_uri Skip whitespace without changing the string. And take advantage of the fact that _find_token now can deal with a complete URI.
2012-02-10 22:01:50 +00:00
if (browser->search_engines
&& (item = katze_array_find_token (browser->search_engines, uri)))
Store searches with tokens in the completion as a distinct item Currently searches won't be stored persistently in the database.
2010-01-01 21:47:24 +00:00
{
Avoid allocations in _action_location_submit_uri Skip whitespace without changing the string. And take advantage of the fact that _find_token now can deal with a complete URI.
2012-02-10 22:01:50 +00:00
keywords = strchr (uri, ' ') + 1;
search_uri = katze_item_get_uri (item);
Store searches with tokens in the completion as a distinct item Currently searches won't be stored persistently in the database.
2010-01-01 21:47:24 +00:00
}
Handle search engines in MidoriBrowser and simplify sokoke_magic_uri
2010-02-09 17:13:47 +00:00
Avoid allocations in _action_location_submit_uri Skip whitespace without changing the string. And take advantage of the fact that _find_token now can deal with a complete URI.
2012-02-10 22:01:50 +00:00
if (keywords == NULL)
Handle search engines in MidoriBrowser and simplify sokoke_magic_uri
2010-02-09 17:13:47 +00:00
{
Avoid allocations in _action_location_submit_uri Skip whitespace without changing the string. And take advantage of the fact that _find_token now can deal with a complete URI.
2012-02-10 22:01:50 +00:00
keywords = uri;
Handle search engines in MidoriBrowser and simplify sokoke_magic_uri
2010-02-09 17:13:47 +00:00
search_uri = browser->location_entry_search;
}
Introduce Midori.URI to unitfy all URI logic sokoke_hostname_from_uri, sokoke_search_uri, sokoke_hostname_to_ascii and sokoke_unescape_uri_string are merged into Midori.URI. midori-core.h is the official API header for Vala now.
2011-10-19 07:53:18 +00:00
new_uri = midori_uri_for_search (search_uri, keywords);
Handle search engines in MidoriBrowser and simplify sokoke_magic_uri
2010-02-09 17:13:47 +00:00
Gracefully handle unset history and search engines So app mode actually fails to search reliably and not by accident.
2011-03-05 01:36:45 +00:00
if (browser->history != NULL)
Store searches and completion search in the location
2010-02-22 22:49:27 +00:00
{
Gracefully handle unset history and search engines So app mode actually fails to search reliably and not by accident.
2011-03-05 01:36:45 +00:00
time_t now = time (NULL);
gint64 day = sokoke_time_t_to_julian (&now);
sqlite3* db = g_object_get_data (G_OBJECT (browser->history), "db");
static sqlite3_stmt* statement = NULL;
if (!statement)
{
const gchar* sqlcmd;
sqlcmd = "INSERT INTO search (keywords, uri, day) VALUES (?,?,?)";
sqlite3_prepare_v2 (db, sqlcmd, strlen (sqlcmd) + 1, &statement, NULL);
}
sqlite3_bind_text (statement, 1, keywords, -1, 0);
sqlite3_bind_text (statement, 2, search_uri, -1, 0);
sqlite3_bind_int64 (statement, 3, day);
Store searches and completion search in the location
2010-02-22 22:49:27 +00:00
Gracefully handle unset history and search engines So app mode actually fails to search reliably and not by accident.
2011-03-05 01:36:45 +00:00
if (sqlite3_step (statement) != SQLITE_DONE)
g_printerr (_("Failed to insert new history item: %s\n"),
Store searches and completion search in the location
2010-02-22 22:49:27 +00:00
sqlite3_errmsg (db));
Gracefully handle unset history and search engines So app mode actually fails to search reliably and not by accident.
2011-03-05 01:36:45 +00:00
sqlite3_reset (statement);
if (sqlite3_step (statement) == SQLITE_DONE)
sqlite3_clear_bindings (statement);
}
Store searches with tokens in the completion as a distinct item Currently searches won't be stored persistently in the database.
2010-01-01 21:47:24 +00:00
}
Alt + Enter in the location should issue a new tab
2008-08-31 01:21:29 +00:00
if (new_tab)
{
n = midori_browser_add_uri (browser, new_uri);
midori_browser_set_current_page (browser, n);
}
else
Add an Open external pages in Preference
2008-10-20 06:50:16 +00:00
midori_browser_set_current_uri (browser, new_uri);
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
g_free (new_uri);
gtk_widget_grab_focus (midori_browser_get_current_tab (browser));
Show hidden location/ web search temporarily when needed. If the location or web search was hidden, and one attempted to use the menus or shortcuts for Location or Web search, an appropriate dialog with an entry was shown. Now we show the according widget temporarily and hide it again once it loses focus.
2008-04-22 21:36:37 +00:00
}
Show a popup menu to choose from multiple available news feeds
2009-11-22 14:33:13 +00:00
static void
midori_browser_news_feed_clicked_cb (GtkWidget* menuitem,
MidoriBrowser* browser)
{
gchar* uri = g_object_get_data (G_OBJECT (menuitem), "uri");
midori_browser_subscribe_to_news_feed (browser, uri);
}
Pass news feed icon clicks to the feed panel The secondary-icon-released signal of the location action returns a boolean now so a callback can indicate that it handled it. So if the feed panel is active, it adds feeds to the panel and suppresses the default action. A possible crash when disabling the panel and clicking the icon afterwards is fixed by adding a missing signal disconnection.
2009-08-16 21:35:29 +00:00
static gboolean
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
_action_location_secondary_icon_released (GtkAction* action,
GtkWidget* widget,
MidoriBrowser* browser)
{
Display the news feed icon again The code for looking up news feeds on websites was disabled and is now back in simplified form. 'liferea-add-feed' is hardcoded for the moment.
2009-04-13 20:40:57 +00:00
GtkWidget* view;
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
Display the news feed icon again The code for looking up news feeds on websites was disabled and is now back in simplified form. 'liferea-add-feed' is hardcoded for the moment.
2009-04-13 20:40:57 +00:00
if ((view = midori_browser_get_current_tab (browser)))
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
{
Display the news feed icon again The code for looking up news feeds on websites was disabled and is now back in simplified form. 'liferea-add-feed' is hardcoded for the moment.
2009-04-13 20:40:57 +00:00
const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view));
Don't overwrite uri in _action_location_secondary_icon_released
2010-03-13 18:58:06 +00:00
const gchar* feed;
Click Go icon in blank or speed dial to Paste and Proceed
2010-10-22 21:52:08 +00:00
/* Clicking icon on blank is equal to Paste and Proceed */
if (midori_view_is_blank (MIDORI_VIEW (view)))
{
GtkClipboard* clipboard = gtk_clipboard_get_for_display (
Avoid build_config_filename in main() and simplify it
2010-10-22 22:31:11 +00:00
gtk_widget_get_display (view), GDK_SELECTION_CLIPBOARD);
Click Go icon in blank or speed dial to Paste and Proceed
2010-10-22 21:52:08 +00:00
gchar* text = gtk_clipboard_wait_for_text (clipboard);
if (text != NULL)
{
_action_location_submit_uri (action, text, FALSE, browser);
g_free (text);
}
}
else if (gtk_window_get_focus (GTK_WINDOW (browser)) == widget)
Take text for Go button in location from the entry
2011-02-19 22:38:34 +00:00
{
const gchar* text = gtk_entry_get_text (GTK_ENTRY (widget));
_action_location_submit_uri (action, text, FALSE, browser);
}
Don't overwrite uri in _action_location_secondary_icon_released
2010-03-13 18:58:06 +00:00
else if ((feed = g_object_get_data (G_OBJECT (view), "news-feeds")))
Show a popup menu to choose from multiple available news feeds
2009-11-22 14:33:13 +00:00
{
KatzeArray* news_feeds;
KatzeItem* item;
KatzeItem* itemm;
news_feeds = katze_object_get_object (G_OBJECT (view), "news-feeds");
item = katze_array_get_nth_item (news_feeds, 0);
if ((itemm = katze_array_get_nth_item (news_feeds, 1)))
{
guint i;
GtkWidget* menu;
GtkWidget* menuitem;
menu = gtk_menu_new ();
menuitem = gtk_menu_item_new_with_label (katze_item_get_name (item));
g_object_set_data_full (G_OBJECT (menuitem), "uri",
g_strdup (katze_item_get_uri (item)), (GDestroyNotify)g_free);
g_signal_connect (menuitem, "activate",
G_CALLBACK (midori_browser_news_feed_clicked_cb), browser);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
menuitem = gtk_menu_item_new_with_label (katze_item_get_name (itemm));
g_object_set_data_full (G_OBJECT (menuitem), "uri",
g_strdup (katze_item_get_uri (itemm)), (GDestroyNotify)g_free);
g_signal_connect (menuitem, "activate",
G_CALLBACK (midori_browser_news_feed_clicked_cb), browser);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
i = 2;
while ((itemm = katze_array_get_nth_item (news_feeds, i++)))
{
menuitem = gtk_menu_item_new_with_label (
katze_item_get_name (itemm));
g_object_set_data_full (G_OBJECT (menuitem), "uri",
g_strdup (katze_item_get_uri (itemm)), (GDestroyNotify)g_free);
g_signal_connect (menuitem, "activate",
G_CALLBACK (midori_browser_news_feed_clicked_cb), browser);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
}
Avoid the rarely used sokoke_container_show_children
2011-10-28 20:24:04 +00:00
gtk_container_foreach (GTK_CONTAINER (menu),
(GtkCallback)(gtk_widget_show_all), NULL);
Show a popup menu to choose from multiple available news feeds
2009-11-22 14:33:13 +00:00
katze_widget_popup (widget, GTK_MENU (menu), NULL,
KATZE_MENU_POSITION_RIGHT);
}
else
Don't overwrite uri in _action_location_secondary_icon_released
2010-03-13 18:58:06 +00:00
midori_browser_subscribe_to_news_feed (browser, feed);
Show a popup menu to choose from multiple available news feeds
2009-11-22 14:33:13 +00:00
g_object_unref (news_feeds);
}
Replace Go button with a Go icon inside the address entry The icon is displayed by default, takes a little less space, but replaced with the news feed icon as appropriate. If the address entry is focussed, the Go icon takes precedence. We also introduce the focus-in signal on MidoriLocationAction.
2009-06-13 01:45:11 +00:00
else
_action_location_submit_uri (action, uri, FALSE, browser);
Pass news feed icon clicks to the feed panel The secondary-icon-released signal of the location action returns a boolean now so a callback can indicate that it handled it. So if the feed panel is active, it adds feeds to the panel and suppresses the default action. A possible crash when disabling the panel and clicking the icon afterwards is fixed by adding a missing signal disconnection.
2009-08-16 21:35:29 +00:00
return TRUE;
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
}
Pass news feed icon clicks to the feed panel The secondary-icon-released signal of the location action returns a boolean now so a callback can indicate that it handled it. So if the feed panel is active, it adds feeds to the panel and suppresses the default action. A possible crash when disabling the panel and clicking the icon afterwards is fixed by adding a missing signal disconnection.
2009-08-16 21:35:29 +00:00
return FALSE;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
static void
_action_search_submit (GtkAction* action,
const gchar* keywords,
gboolean new_tab,
MidoriBrowser* browser)
Show hidden location/ web search temporarily when needed. If the location or web search was hidden, and one attempted to use the menus or shortcuts for Location or Web search, an appropriate dialog with an entry was shown. Now we show the according widget temporarily and hide it again once it loses focus.
2008-04-22 21:36:37 +00:00
{
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
KatzeItem* item;
const gchar* url;
gchar* search;
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
Track selected search engine per window
2011-05-15 19:40:39 +00:00
item = katze_array_get_nth_item (browser->search_engines, browser->last_web_search);
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
if (item)
url = katze_item_get_uri (item);
else /* The location entry search is our fallback */
Allow marking a search engine as Default engine The default engine is used when search terms are typed in the address entry without tokens and for the 'Search the Web' item in the selection context menu. The 'Location entry search' is removed from the preferences. The setting 'location-entry-search' remains functional however.
2009-04-18 20:41:37 +00:00
url = browser->location_entry_search;
Introduce Midori.URI to unitfy all URI logic sokoke_hostname_from_uri, sokoke_search_uri, sokoke_hostname_to_ascii and sokoke_unescape_uri_string are merged into Midori.URI. midori-core.h is the official API header for Vala now.
2011-10-19 07:53:18 +00:00
search = midori_uri_for_search (url, keywords);
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
if (new_tab)
midori_browser_add_uri (browser, search);
else
Add an Open external pages in Preference
2008-10-20 06:50:16 +00:00
midori_browser_set_current_uri (browser, search);
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
g_free (search);
}
Activating Search if hidden should spawn the search page
2009-04-29 22:43:47 +00:00
static void
_action_search_activate (GtkAction* action,
MidoriBrowser* browser)
{
GSList* proxies = gtk_action_get_proxies (action);
guint i = 0;
GtkWidget* proxy;
Let Ctrl+K load default search website if no Search in the toolbar
2009-05-06 00:41:17 +00:00
const gchar* uri;
gchar* search;
Activating Search if hidden should spawn the search page
2009-04-29 22:43:47 +00:00
while (((proxy = g_slist_nth_data (proxies, i++))))
if (GTK_IS_TOOL_ITEM (proxy))
{
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!gtk_widget_get_visible (browser->navigationbar))
Activating Search if hidden should spawn the search page
2009-04-29 22:43:47 +00:00
gtk_widget_show (browser->navigationbar);
return;
}
Let Ctrl+K load default search website if no Search in the toolbar
2009-05-06 00:41:17 +00:00
/* Load default search engine in current tab */
uri = browser->location_entry_search;
Introduce Midori.URI to unitfy all URI logic sokoke_hostname_from_uri, sokoke_search_uri, sokoke_hostname_to_ascii and sokoke_unescape_uri_string are merged into Midori.URI. midori-core.h is the official API header for Vala now.
2011-10-19 07:53:18 +00:00
search = midori_uri_for_search (uri ? uri : "", "");
Let Ctrl+K load default search website if no Search in the toolbar
2009-05-06 00:41:17 +00:00
midori_browser_set_current_uri (browser, search);
Activating Search if hidden should spawn the search page
2009-04-29 22:43:47 +00:00
gtk_widget_grab_focus (midori_browser_get_current_tab (browser));
Let Ctrl+K load default search website if no Search in the toolbar
2009-05-06 00:41:17 +00:00
g_free (search);
Activating Search if hidden should spawn the search page
2009-04-29 22:43:47 +00:00
}
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
static void
_action_search_notify_current_item (GtkAction* action,
GParamSpec* pspec,
MidoriBrowser* browser)
{
MidoriSearchAction* search_action;
KatzeItem* item;
Implement 'full' debug-level and fix according warnings
2009-01-09 21:54:40 +00:00
guint idx;
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
search_action = MIDORI_SEARCH_ACTION (action);
item = midori_search_action_get_current_item (search_action);
if (item)
Implement 'full' debug-level and fix according warnings
2009-01-09 21:54:40 +00:00
idx = katze_array_get_item_index (browser->search_engines, item);
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
else
Implement 'full' debug-level and fix according warnings
2009-01-09 21:54:40 +00:00
idx = 0;
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
Implement 'full' debug-level and fix according warnings
2009-01-09 21:54:40 +00:00
g_object_set (browser->settings, "last-web-search", idx, NULL);
Track selected search engine per window
2011-05-15 19:40:39 +00:00
browser->last_web_search = idx;
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
}
Allow marking a search engine as Default engine The default engine is used when search terms are typed in the address entry without tokens and for the 'Search the Web' item in the selection context menu. The 'Location entry search' is removed from the preferences. The setting 'location-entry-search' remains functional however.
2009-04-18 20:41:37 +00:00
static void
_action_search_notify_default_item (GtkAction* action,
GParamSpec* pspec,
MidoriBrowser* browser)
{
MidoriSearchAction* search_action;
KatzeItem* item;
search_action = MIDORI_SEARCH_ACTION (action);
item = midori_search_action_get_default_item (search_action);
if (item)
g_object_set (browser->settings, "location-entry-search",
katze_item_get_uri (item), NULL);
}
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
static void
_action_search_focus_out (GtkAction* action,
MidoriBrowser* browser)
{
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
if ((gtk_widget_get_visible (browser->statusbar)
&& !browser->show_navigationbar)
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
|| midori_browser_is_fullscreen (browser))
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
{
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_widget_hide (browser->navigationbar);
Hide all bars in fullscreen and a menu to Unfullscreen Fixes: https://bugs.launchpad.net/midori/+bug/783675
2011-11-11 00:22:15 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
midori_browser_bookmark_popup_item (GtkWidget* menu,
const gchar* stock_id,
Improve strings for the sake of better localization
2008-11-02 23:17:43 +00:00
const gchar* label,
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
KatzeItem* item,
gpointer callback,
MidoriBrowser* browser)
{
const gchar* uri;
GtkWidget* menuitem;
uri = katze_item_get_uri (item);
menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
Improve strings for the sake of better localization
2008-11-02 23:17:43 +00:00
if (label)
gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child (
GTK_BIN (menuitem))), label);
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
if (!strcmp (stock_id, GTK_STOCK_EDIT))
gtk_widget_set_sensitive (menuitem,
KATZE_IS_ARRAY (item) || uri != NULL);
Implement 'Open all in Tabs' for bookmark folders and history
2009-02-27 20:52:51 +00:00
else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE))
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
gtk_widget_set_sensitive (menuitem, uri != NULL);
g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
g_signal_connect (menuitem, "activate", G_CALLBACK (callback), browser);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
}
static void
midori_browser_bookmark_open_activate_cb (GtkWidget* menuitem,
MidoriBrowser* browser)
{
Use midori_browser_open_bookmark for the bookmarkbar
2010-08-14 18:58:38 +00:00
KatzeItem* item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
midori_browser_open_bookmark (browser, item);
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
}
static void
midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget* menuitem,
MidoriBrowser* browser)
{
KatzeItem* item;
const gchar* uri;
guint n;
item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
Implement 'Open all in Tabs' for bookmark folders and history
2009-02-27 20:52:51 +00:00
if (KATZE_IS_ARRAY (item))
{
KatzeItem* child;
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
Implement and use KATZE_ARRAY_FOREACH_ITEM Iterating an array by a GList is considerably faster than continuously retrieving items, however it is also a lot more complicated. So the new macro takes care of that and uses a new semi-private function to avoid copying the list. Note that the macro can't be nested, which basically isn't useful in practise anyway.
2010-09-11 21:39:51 +00:00
KATZE_ARRAY_FOREACH_ITEM (child, KATZE_ARRAY (item))
Implement 'Open all in Tabs' for bookmark folders and history
2009-02-27 20:52:51 +00:00
{
if ((uri = katze_item_get_uri (child)) && *uri)
{
n = midori_browser_add_item (browser, child);
Introduce midori_browser_set_current_page_smartly() as public API
2010-07-03 07:28:03 +00:00
midori_browser_set_current_page_smartly (browser, n);
Implement 'Open all in Tabs' for bookmark folders and history
2009-02-27 20:52:51 +00:00
}
}
}
else
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
{
Implement 'Open all in Tabs' for bookmark folders and history
2009-02-27 20:52:51 +00:00
if ((uri = katze_item_get_uri (item)) && *uri)
{
n = midori_browser_add_item (browser, item);
Introduce midori_browser_set_current_page_smartly() as public API
2010-07-03 07:28:03 +00:00
midori_browser_set_current_page_smartly (browser, n);
Implement 'Open all in Tabs' for bookmark folders and history
2009-02-27 20:52:51 +00:00
}
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
}
}
static void
midori_browser_bookmark_open_in_window_activate_cb (GtkWidget* menuitem,
MidoriBrowser* browser)
{
KatzeItem* item;
const gchar* uri;
item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
uri = katze_item_get_uri (item);
if (uri && *uri)
Implement Open new pages in: New window preference
2009-05-17 18:29:31 +00:00
{
Leave setting up windows to the app, which is a lot faster With a mature history setting up a browser window can be slow, but if it's setup at creation time it is extremely fast. The signal prototype of MidoriBrowser::new-window had to change, all call sites were adjusted.
2009-10-30 22:43:28 +00:00
MidoriBrowser* new_browser;
g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
Add tabs to new browser windows *after* emitting NEW_WINDOW The app takes care of settings as well as other state when the NEW_WINDOW signal of a browser is emitted. So we need to add tabs after emitting the signal, otherwise the new tab has default settings for a limited period of time.
2009-05-22 21:15:53 +00:00
midori_browser_add_uri (new_browser, uri);
Implement Open new pages in: New window preference
2009-05-17 18:29:31 +00:00
}
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
}
static void
midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
KatzeItem* item;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
Finally obsolete KatzeXbelItem
2008-10-01 02:00:16 +00:00
Do removal from bookmarkbar via the database
2010-07-02 14:39:53 +00:00
if (KATZE_ITEM_IS_BOOKMARK (item))
Add a "New folder" button to the bookmark panel
2009-02-22 02:11:40 +00:00
midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE);
Do removal from bookmarkbar via the database
2010-07-02 14:39:53 +00:00
else
midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE);
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
}
static void
midori_browser_bookmark_delete_activate_cb (GtkWidget* menuitem,
MidoriBrowser* browser)
{
KatzeItem* item;
item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
Use KatzeArray* to remove and monitor deleted bookmarks The panel and the bookmarkbar need to monitor the removal of bookmarks, and there can be multiple windows, so the database should only be used to remove in one central place.
2010-08-10 21:46:49 +00:00
katze_array_remove_item (browser->bookmarks, item);
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
}
static void
midori_browser_bookmark_popup (GtkWidget* widget,
GdkEventButton* event,
KatzeItem* item,
MidoriBrowser* browser)
{
GtkWidget* menu;
GtkWidget* menuitem;
menu = gtk_menu_new ();
Fix display of the bookmark properties in the add dialog
2010-07-01 05:24:17 +00:00
if (!katze_item_get_uri (item))
Implement 'Open all in Tabs' for bookmark folders and history
2009-02-27 20:52:51 +00:00
midori_browser_bookmark_popup_item (menu,
STOCK_TAB_NEW, _("Open all in _Tabs"),
item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
else
{
midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, NULL,
item, midori_browser_bookmark_open_activate_cb, browser);
midori_browser_bookmark_popup_item (menu,
STOCK_TAB_NEW, _("Open in New _Tab"),
item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
midori_browser_bookmark_popup_item (menu,
STOCK_WINDOW_NEW, _("Open in New _Window"),
item, midori_browser_bookmark_open_in_window_activate_cb, browser);
}
Refactor bookmark context menu, apply it on the bookmarkbar
2008-10-30 01:19:52 +00:00
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
Refactor History panel into a separate class This brings back the problem of address and title of items showing up in the history unfortunately. Now the history items are appended rather than prepended, we probably want to fix that in the future.
2009-02-21 22:59:02 +00:00
midori_browser_bookmark_popup_item (menu, GTK_STOCK_EDIT, NULL,
item, midori_browser_bookmark_edit_activate_cb, browser);
midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL,
item, midori_browser_bookmark_delete_activate_cb, browser);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Remove sokoke_widget_popup and replace all call sites
2009-11-15 17:00:33 +00:00
katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Implement middle click on Back, Forward, Homepage menu items
2009-05-07 20:41:39 +00:00
static gboolean
midori_browser_menu_button_press_event_cb (GtkWidget* toolitem,
GdkEventButton* event,
MidoriBrowser* browser)
{
Right-click on statusbar border should show context menu
2010-10-25 21:40:34 +00:00
if (event->button != 3)
return FALSE;
Implement context menu in menu items, forward buttons from the menubar
2009-12-13 14:44:02 +00:00
/* GtkMenuBar catches button events on children with submenus,
so we need to see if the actual widget is the menubar, and if
it is an item, we forward it to the actual widget. */
Right-click on statusbar border should show context menu
2010-10-25 21:40:34 +00:00
if ((GTK_IS_BOX (toolitem) || GTK_IS_MENU_BAR (toolitem)))
Implement middle click on Back, Forward, Homepage menu items
2009-05-07 20:41:39 +00:00
{
midori_browser_toolbar_popup_context_menu_cb (
GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ?
gtk_widget_get_parent (toolitem) : toolitem,
event->x, event->y, event->button, browser);
return TRUE;
}
Right-click on statusbar border should show context menu
2010-10-25 21:40:34 +00:00
else if (GTK_IS_MENU_ITEM (toolitem))
Implement context menu in menu items, forward buttons from the menubar
2009-12-13 14:44:02 +00:00
{
gboolean handled;
g_signal_emit_by_name (toolitem, "button-press-event", event, &handled);
return handled;
}
Implement middle click on Back, Forward, Homepage menu items
2009-05-07 20:41:39 +00:00
return FALSE;
}
Refactor middle clicks on navigation actions
2009-05-09 11:57:52 +00:00
static gboolean
midori_browser_menu_item_middle_click_event_cb (GtkWidget* toolitem,
GdkEventButton* event,
MidoriBrowser* browser)
{
Introduce MIDORI_EVENT_NEW_TAB and use it Fixes: https://bugs.launchpad.net/midori/+bug/797224 Fixes: https://bugs.launchpad.net/midori/+bug/797229
2011-09-28 15:45:37 +00:00
if (MIDORI_EVENT_NEW_TAB (event))
Refactor middle clicks on navigation actions
2009-05-09 11:57:52 +00:00
{
Use new GtkActivatable API in MidoriBrowser
2010-01-31 19:38:56 +00:00
GtkAction* action;
action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (toolitem));
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
g_object_set_data (G_OBJECT (action), "midori-middle-click", GINT_TO_POINTER (1));
Refactor middle clicks on navigation actions
2009-05-09 11:57:52 +00:00
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
return _action_navigation_activate (action, browser);
Implement middle click on Back, Forward, Homepage menu items
2009-05-07 20:41:39 +00:00
}
return FALSE;
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
Change a few strings, particularly New Bookmark => Add Bookmark
2008-06-01 14:40:44 +00:00
_action_bookmark_add_activate (GtkAction* action,
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
MidoriBrowser* browser)
{
Refactoring of bookmarks add functions
2010-06-25 04:11:36 +00:00
if (g_str_equal (gtk_action_get_name (action), "BookmarkFolderAdd"))
midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, TRUE);
else
midori_browser_edit_bookmark_dialog_new (browser, NULL, TRUE, FALSE);
Add an 'Add new folder' menu item to Bookmarks menu
2009-04-10 20:28:36 +00:00
}
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
static void
_action_bookmarks_import_activate (GtkAction* action,
MidoriBrowser* browser)
{
typedef struct
{
const gchar* path;
const gchar* name;
Display application icons in the Import bookmarks dialogue
2009-11-21 19:48:09 +00:00
const gchar* icon;
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
} BookmarkClient;
static const BookmarkClient bookmark_clients[] = {
Display application icons in the Import bookmarks dialogue
2009-11-21 19:48:09 +00:00
{ ".local/share/data/Arora/bookmarks.xbel", N_("Arora"), "arora" },
{ ".kazehakase/bookmarks.xml", N_("Kazehakase"), "kazehakase-icon" },
{ ".opera/bookmarks.adr", N_("Opera"), "opera" },
Add Konqueror to the Import bookmarks dialogue
2009-12-05 19:14:41 +00:00
{ ".kde/share/apps/konqueror/bookmarks.xml", N_("Konqueror"), "konqueror" },
Support RDF bookmarks, and add Epiphany to Import bookmarks
2009-12-05 22:43:12 +00:00
{ ".gnome2/epiphany/bookmarks.rdf", N_("Epiphany"), "epiphany" },
Find Firefox profiles for import
2011-10-20 16:19:43 +00:00
{ ".mozilla/firefox/*/bookmarks.html", N_("Firefox (%s)"), "firefox" },
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
};
GtkWidget* dialog;
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
GtkWidget* content_area;
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
GtkSizeGroup* sizegroup;
GtkWidget* hbox;
GtkWidget* label;
GtkWidget* combo;
GtkComboBox* combobox;
Display application icons in the Import bookmarks dialogue
2009-11-21 19:48:09 +00:00
GtkListStore* model;
GtkCellRenderer* renderer;
Merge bookmark folder combo into helper functions Fixes: https://bugs.launchpad.net/midori/+bug/874592
2011-10-20 20:19:41 +00:00
GtkWidget* combobox_folder;
Display application icons in the Import bookmarks dialogue
2009-11-21 19:48:09 +00:00
gint icon_width = 16;
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
guint i;
Import to a new, empty bookmark array
2011-01-22 20:24:10 +00:00
KatzeArray* bookmarks;
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser)))
Bail out of BookmarksImport action if no bookmarks or hidden browser
2009-11-21 05:39:18 +00:00
return;
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
dialog = gtk_dialog_new_with_buttons (
_("Import bookmarks..."), GTK_WINDOW (browser),
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("_Import bookmarks"), GTK_RESPONSE_ACCEPT,
NULL);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
gtk_window_set_icon_name (GTK_WINDOW (dialog), STOCK_BOOKMARKS);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
label = gtk_label_new_with_mnemonic (_("_Application:"));
gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
Revise handling of application paths when importing bookmarks
2009-12-01 21:43:16 +00:00
model = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_INT);
Display application icons in the Import bookmarks dialogue
2009-11-21 19:48:09 +00:00
combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "icon-name", 1);
Revise handling of application paths when importing bookmarks
2009-12-01 21:43:16 +00:00
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "width", 3);
Display application icons in the Import bookmarks dialogue
2009-11-21 19:48:09 +00:00
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
combobox = GTK_COMBO_BOX (combo);
Lookup icon size in relation to the according screen or widget
2010-01-29 21:30:23 +00:00
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (browser)),
GTK_ICON_SIZE_MENU, &icon_width, NULL);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
for (i = 0; i < G_N_ELEMENTS (bookmark_clients); i++)
{
Find Firefox profiles for import
2011-10-20 16:19:43 +00:00
const gchar* location = bookmark_clients[i].path;
const gchar* client = bookmark_clients[i].name;
Merge bookmark folder combo into helper functions Fixes: https://bugs.launchpad.net/midori/+bug/874592
2011-10-20 20:19:41 +00:00
gchar* path = NULL;
Find Firefox profiles for import
2011-10-20 16:19:43 +00:00
/* Interpret * as 'any folder' */
if (strchr (location, '*') != NULL)
{
gchar** parts = g_strsplit (location, "*", 2);
GDir* dir;
path = g_build_filename (g_get_home_dir (), parts[0], NULL);
if ((dir = g_dir_open (path, 0, NULL)))
{
const gchar* name;
while ((name = g_dir_read_name (dir)))
{
gchar* file = g_build_filename (path, name, parts[1], NULL);
if (g_access (file, F_OK) == 0)
{
/* If name is XYZ.Name, we use Name only */
gchar* real_name = strchr (name, '.');
gchar* display = strstr (_(client), "%s")
? g_strdup_printf (_(client),
real_name ? real_name + 1 : name)
: g_strdup (_(client));
gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
0, display, 1, bookmark_clients[i].icon,
Use right paths in _action_bookmarks_import_activate
2011-10-23 22:16:44 +00:00
2, file, 3, icon_width, -1);
Find Firefox profiles for import
2011-10-20 16:19:43 +00:00
g_free (display);
}
g_free (file);
}
g_dir_close (dir);
}
g_free (path);
g_strfreev (parts);
continue;
}
Use right paths in _action_bookmarks_import_activate
2011-10-23 22:16:44 +00:00
path = g_build_filename (g_get_home_dir (), location, NULL);
Use g_access instead of g_file_test consistently
2009-12-19 09:39:24 +00:00
if (g_access (path, F_OK) == 0)
Display application icons in the Import bookmarks dialogue
2009-11-21 19:48:09 +00:00
gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
Find Firefox profiles for import
2011-10-20 16:19:43 +00:00
0, _(client), 1, bookmark_clients[i].icon,
Revise handling of application paths when importing bookmarks
2009-12-01 21:43:16 +00:00
2, path, 3, icon_width, -1);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
g_free (path);
}
Find Firefox profiles for import
2011-10-20 16:19:43 +00:00
Add Custom option to Import bookmarks dialogue
2009-12-03 22:53:47 +00:00
gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
Make bookmark import button label show supported formats when importing from a file.
2011-01-30 10:35:54 +00:00
0, _("Import from XBEL or HTML file"), 1, NULL, 2, NULL, 3, icon_width, -1);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
gtk_combo_box_set_active (combobox, 0);
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_container_add (GTK_CONTAINER (content_area), hbox);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
gtk_widget_show_all (hbox);
hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
label = gtk_label_new_with_mnemonic (_("_Folder:"));
gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
Merge bookmark folder combo into helper functions Fixes: https://bugs.launchpad.net/midori/+bug/874592
2011-10-20 20:19:41 +00:00
combobox_folder = midori_bookmark_folder_button_new (browser->bookmarks,
FALSE, NULL);
gtk_box_pack_start (GTK_BOX (hbox), combobox_folder, TRUE, TRUE, 0);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_container_add (GTK_CONTAINER (content_area), hbox);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
gtk_widget_show_all (hbox);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
{
Revise handling of application paths when importing bookmarks
2009-12-01 21:43:16 +00:00
GtkTreeIter iter;
Merge bookmark folder combo into helper functions Fixes: https://bugs.launchpad.net/midori/+bug/874592
2011-10-20 20:19:41 +00:00
gchar* path = NULL;
gchar* selected = NULL;
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
GError* error;
Merge bookmark folder combo into helper functions Fixes: https://bugs.launchpad.net/midori/+bug/874592
2011-10-20 20:19:41 +00:00
sqlite3* db = g_object_get_data (G_OBJECT (browser->bookmarks), "db");
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
Merge bookmark folder combo into helper functions Fixes: https://bugs.launchpad.net/midori/+bug/874592
2011-10-20 20:19:41 +00:00
if (gtk_combo_box_get_active_iter (combobox, &iter))
gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 2, &path, -1);
selected = midori_bookmark_folder_button_get_active (combobox_folder);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
Add Custom option to Import bookmarks dialogue
2009-12-03 22:53:47 +00:00
gtk_widget_destroy (dialog);
if (!path)
{
Add Konqueror to the Import bookmarks dialogue
2009-12-05 19:14:41 +00:00
GtkWidget* file_dialog;
Label 'Custom' and file chooser 'Import from a file'
2010-10-24 21:48:03 +00:00
file_dialog = sokoke_file_chooser_dialog_new (_("Import from a file"),
Add Custom option to Import bookmarks dialogue
2009-12-03 22:53:47 +00:00
GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_OPEN);
if (gtk_dialog_run (GTK_DIALOG (file_dialog)) == GTK_RESPONSE_OK)
path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_dialog));
gtk_widget_destroy (file_dialog);
}
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
error = NULL;
Import to a new, empty bookmark array
2011-01-22 20:24:10 +00:00
bookmarks = katze_array_new (KATZE_TYPE_ARRAY);
if (path && !midori_array_from_file (bookmarks, path, NULL, &error))
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
{
Add Custom option to Import bookmarks dialogue
2009-12-03 22:53:47 +00:00
sokoke_message_dialog (GTK_MESSAGE_ERROR,
Show error dialogue for invalid bookmark export filename
2011-02-02 00:10:02 +00:00
_("Failed to import bookmarks"),
error ? error->message : "", FALSE);
Add Custom option to Import bookmarks dialogue
2009-12-03 22:53:47 +00:00
if (error)
g_error_free (error);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
}
Import to a new, empty bookmark array
2011-01-22 20:24:10 +00:00
midori_bookmarks_import_array_db (db, bookmarks, selected);
Add KatzeArray::update and call it after import This new function and according signal allow one update of the treeview after importing directly into the database.
2011-01-19 20:58:26 +00:00
katze_array_update (browser->bookmarks);
Import to a new, empty bookmark array
2011-01-22 20:24:10 +00:00
g_object_unref (bookmarks);
Revamp bookmark import with sqlite
2010-07-02 03:55:41 +00:00
g_free (selected);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
g_free (path);
}
Add Custom option to Import bookmarks dialogue
2009-12-03 22:53:47 +00:00
else
gtk_widget_destroy (dialog);
Implement importing bookmarks, from Arora XBEL only for now
2009-11-15 16:49:09 +00:00
}
Implement "Export bookmarks" menu item to export to XBEL
2010-03-01 21:10:42 +00:00
static void
_action_bookmarks_export_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* file_dialog;
Add file filters for XBEL and Netscape to export
2011-02-01 00:24:33 +00:00
GtkFileFilter* filter;
const gchar* format;
Implement "Export bookmarks" menu item to export to XBEL
2010-03-01 21:10:42 +00:00
gchar* path = NULL;
GError* error;
Export to a new, empty bookmark array
2011-01-22 20:17:37 +00:00
KatzeArray* bookmarks;
Implement "Export bookmarks" menu item to export to XBEL
2010-03-01 21:10:42 +00:00
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!browser->bookmarks || !gtk_widget_get_visible (GTK_WIDGET (browser)))
Bail out of Export if no bookmarks or hidden
2010-03-06 18:16:52 +00:00
return;
Show error dialogue for invalid bookmark export filename
2011-02-02 00:10:02 +00:00
wrong_format:
Implement "Export bookmarks" menu item to export to XBEL
2010-03-01 21:10:42 +00:00
file_dialog = sokoke_file_chooser_dialog_new (_("Save file as"),
GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE);
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (file_dialog),
"bookmarks.xbel");
Add file filters for XBEL and Netscape to export
2011-02-01 00:24:33 +00:00
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("XBEL Bookmarks"));
gtk_file_filter_add_mime_type (filter, "application/xml");
gtk_file_filter_add_pattern (filter, "*.xbel");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_dialog), filter);
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("Netscape Bookmarks"));
gtk_file_filter_add_mime_type (filter, "text/html");
gtk_file_filter_add_pattern (filter, "*.html");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_dialog), filter);
Implement "Export bookmarks" menu item to export to XBEL
2010-03-01 21:10:42 +00:00
if (gtk_dialog_run (GTK_DIALOG (file_dialog)) == GTK_RESPONSE_OK)
path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_dialog));
gtk_widget_destroy (file_dialog);
Show error dialogue for invalid bookmark export filename
2011-02-02 00:10:02 +00:00
if (g_str_has_suffix (path, ".xbel"))
format = "xbel";
else if (g_str_has_suffix (path, ".html"))
format = "netscape";
else if (path != NULL)
{
sokoke_message_dialog (GTK_MESSAGE_ERROR,
_("Midori can only export to XBEL (*.xbel) and Netscape (*.html)"),
"", TRUE);
katze_assign (path, NULL);
goto wrong_format;
}
Implement "Export bookmarks" menu item to export to XBEL
2010-03-01 21:10:42 +00:00
if (path == NULL)
return;
error = NULL;
Introduce midori_array_query_recursive This effectively fixes bookmark export. Fixes: https://bugs.launchpad.net/bugs/906837
2012-01-03 20:15:19 +00:00
bookmarks = midori_array_query_recursive (browser->bookmarks,
"*", "folder='%q'", "", TRUE);
Add file filters for XBEL and Netscape to export
2011-02-01 00:24:33 +00:00
if (!midori_array_to_file (bookmarks, path, format, &error))
Implement "Export bookmarks" menu item to export to XBEL
2010-03-01 21:10:42 +00:00
{
sokoke_message_dialog (GTK_MESSAGE_ERROR,
Show error dialogue for invalid bookmark export filename
2011-02-02 00:10:02 +00:00
_("Failed to export bookmarks"), error ? error->message : "", FALSE);
Implement "Export bookmarks" menu item to export to XBEL
2010-03-01 21:10:42 +00:00
if (error)
g_error_free (error);
}
Export to a new, empty bookmark array
2011-01-22 20:17:37 +00:00
g_object_unref (bookmarks);
Implement "Export bookmarks" menu item to export to XBEL
2010-03-01 21:10:42 +00:00
g_free (path);
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_manage_search_engines_activate (GtkAction* action,
MidoriBrowser* browser)
{
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
static GtkWidget* dialog = NULL;
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
return;
if (!dialog)
{
dialog = midori_search_action_get_dialog (
MIDORI_SEARCH_ACTION (_action_by_name (browser, "Search")));
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed), &dialog);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_widget_show (dialog);
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
}
else
gtk_window_present (GTK_WINDOW (dialog));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
static void
midori_browser_clear_private_data_response_cb (GtkWidget* dialog,
gint response_id,
MidoriBrowser* browser)
{
if (response_id == GTK_RESPONSE_ACCEPT)
{
GtkToggleButton* button;
Remember options in Clear private data dialogue
2009-05-22 21:53:54 +00:00
gint clear_prefs = MIDORI_CLEAR_NONE;
gint saved_prefs = MIDORI_CLEAR_NONE;
Implement sokoke_register_privacy_item facility The new function allows registering callbacks which clear data, with a name and label so they show up in the Clear Private Data dialogue and the chosen items are saved. The old enumeration still keeps history, trash and the flag whether to clear when Midori quits.
2010-10-17 20:48:32 +00:00
GList* data_items = sokoke_register_privacy_item (NULL, NULL, NULL);
GString* clear_data = g_string_new (NULL);
Remember options in Clear private data dialogue
2009-05-22 21:53:54 +00:00
g_object_get (browser->settings, "clear-private-data", &saved_prefs, NULL);
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
Add 'Last open tabs' option to Clear Private Data Fixes: https://bugs.launchpad.net/midori/+bug/814739
2011-07-24 19:41:47 +00:00
button = g_object_get_data (G_OBJECT (dialog), "session");
if (gtk_toggle_button_get_active (button))
{
GList* tabs = gtk_container_get_children (GTK_CONTAINER (browser->notebook));
for (; tabs != NULL; tabs = g_list_next (tabs))
gtk_widget_destroy (tabs->data);
g_list_free (tabs);
clear_prefs |= MIDORI_CLEAR_SESSION;
}
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
button = g_object_get_data (G_OBJECT (dialog), "history");
if (gtk_toggle_button_get_active (button))
Remember options in Clear private data dialogue
2009-05-22 21:53:54 +00:00
{
Clear history through array and update the panel
2010-11-21 15:14:30 +00:00
katze_array_clear (browser->history);
Implement sokoke_register_privacy_item facility The new function allows registering callbacks which clear data, with a name and label so they show up in the Clear Private Data dialogue and the chosen items are saved. The old enumeration still keeps history, trash and the flag whether to clear when Midori quits.
2010-10-17 20:48:32 +00:00
katze_array_clear (browser->trash);
_midori_browser_update_actions (browser);
Clear Private Data: Merge Closed Tabs with History It would be misleading to delete one but not the other and assume the pages are actually gone.
2011-10-26 17:39:04 +00:00
clear_prefs |= MIDORI_CLEAR_HISTORY;
clear_prefs |= MIDORI_CLEAR_TRASH; /* For backward-compatibility */
Add 'Closed tabs and windows' to Clear private data dialogue
2009-05-22 00:16:58 +00:00
}
Remember options in Clear private data dialogue
2009-05-22 21:53:54 +00:00
if (clear_prefs != saved_prefs)
Remember whether 'Clear private data when quitting' is enabled
2010-01-30 21:50:00 +00:00
{
clear_prefs |= (saved_prefs & MIDORI_CLEAR_ON_QUIT);
Remember options in Clear private data dialogue
2009-05-22 21:53:54 +00:00
g_object_set (browser->settings, "clear-private-data", clear_prefs, NULL);
Remember whether 'Clear private data when quitting' is enabled
2010-01-30 21:50:00 +00:00
}
Implement sokoke_register_privacy_item facility The new function allows registering callbacks which clear data, with a name and label so they show up in the Clear Private Data dialogue and the chosen items are saved. The old enumeration still keeps history, trash and the flag whether to clear when Midori quits.
2010-10-17 20:48:32 +00:00
for (; data_items != NULL; data_items = g_list_next (data_items))
{
SokokePrivacyItem* privacy = data_items->data;
button = g_object_get_data (G_OBJECT (dialog), privacy->name);
g_return_if_fail (button != NULL && GTK_IS_TOGGLE_BUTTON (button));
if (gtk_toggle_button_get_active (button))
{
privacy->clear ();
g_string_append (clear_data, privacy->name);
g_string_append_c (clear_data, ',');
}
}
g_object_set (browser->settings, "clear-data", clear_data->str, NULL);
g_string_free (clear_data, TRUE);
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
}
if (response_id != GTK_RESPONSE_DELETE_EVENT)
gtk_widget_destroy (dialog);
}
Implement "Clear private data when quitting Midori" check button
2009-07-28 21:12:35 +00:00
static void
midori_browser_clear_on_quit_toggled_cb (GtkToggleButton* button,
MidoriWebSettings* settings)
{
gint clear_prefs = MIDORI_CLEAR_NONE;
g_object_get (settings, "clear-private-data", &clear_prefs, NULL);
clear_prefs ^= MIDORI_CLEAR_ON_QUIT;
g_object_set (settings, "clear-private-data", clear_prefs, NULL);
}
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
static void
_action_clear_private_data_activate (GtkAction* action,
MidoriBrowser* browser)
{
static GtkWidget* dialog = NULL;
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
return;
if (!dialog)
{
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
GtkWidget* content_area;
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
GdkScreen* screen;
GtkSizeGroup* sizegroup;
GtkWidget* hbox;
Tweak padding and alignment of the Clear private data dialogue
2009-05-25 16:41:54 +00:00
GtkWidget* alignment;
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
GtkWidget* vbox;
GtkWidget* icon;
GtkWidget* label;
GtkWidget* button;
Implement sokoke_register_privacy_item facility The new function allows registering callbacks which clear data, with a name and label so they show up in the Clear Private Data dialogue and the chosen items are saved. The old enumeration still keeps history, trash and the flag whether to clear when Midori quits.
2010-10-17 20:48:32 +00:00
GList* data_items;
gchar* clear_data = katze_object_get_string (browser->settings, "clear-data");
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
Remember options in Clear private data dialogue
2009-05-22 21:53:54 +00:00
gint clear_prefs = MIDORI_CLEAR_NONE;
g_object_get (browser->settings, "clear-private-data", &clear_prefs, NULL);
Add an i18n comment for Clear Private Data dialog Since there is a button with the same wording, it is good to point out the difference.
2010-04-08 21:54:25 +00:00
/* i18n: Dialog: Clear Private Data, in the Tools menu */
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
dialog = gtk_dialog_new_with_buttons (_("Clear Private Data"),
Tweak padding and alignment of the Clear private data dialogue
2009-05-25 16:41:54 +00:00
GTK_WINDOW (browser),
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
Use mnemonic in "Clear private data" button
2009-04-13 21:35:31 +00:00
_("_Clear private data"), GTK_RESPONSE_ACCEPT, NULL);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
screen = gtk_widget_get_screen (GTK_WIDGET (browser));
if (screen)
{
gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_CLEAR);
}
sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
hbox = gtk_hbox_new (FALSE, 4);
icon = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_DIALOG);
gtk_size_group_add_widget (sizegroup, icon);
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
label = gtk_label_new (_("Clear the following data:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
hbox = gtk_hbox_new (FALSE, 4);
icon = gtk_image_new ();
gtk_size_group_add_widget (sizegroup, icon);
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
vbox = gtk_vbox_new (TRUE, 4);
Tweak padding and alignment of the Clear private data dialogue
2009-05-25 16:41:54 +00:00
alignment = gtk_alignment_new (0, 0, 1, 1);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 6, 12, 0);
Add 'Last open tabs' option to Clear Private Data Fixes: https://bugs.launchpad.net/midori/+bug/814739
2011-07-24 19:41:47 +00:00
button = gtk_check_button_new_with_mnemonic (_("Last open _tabs"));
if ((clear_prefs & MIDORI_CLEAR_SESSION) == MIDORI_CLEAR_SESSION)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
g_object_set_data (G_OBJECT (dialog), "session", button);
gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
Clear Private Data: Merge Closed Tabs with History It would be misleading to delete one but not the other and assume the pages are actually gone.
2011-10-26 17:39:04 +00:00
/* i18n: Browsing history, visited web pages, closed tabs */
Use mnemonic for "History" in Clear Private Data This doesn't introduce a new string.
2010-10-30 19:44:19 +00:00
button = gtk_check_button_new_with_mnemonic (_("_History"));
Remember options in Clear private data dialogue
2009-05-22 21:53:54 +00:00
if ((clear_prefs & MIDORI_CLEAR_HISTORY) == MIDORI_CLEAR_HISTORY)
Tweak padding and alignment of the Clear private data dialogue
2009-05-25 16:41:54 +00:00
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
g_object_set_data (G_OBJECT (dialog), "history", button);
gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
Implement sokoke_register_privacy_item facility The new function allows registering callbacks which clear data, with a name and label so they show up in the Clear Private Data dialogue and the chosen items are saved. The old enumeration still keeps history, trash and the flag whether to clear when Midori quits.
2010-10-17 20:48:32 +00:00
data_items = sokoke_register_privacy_item (NULL, NULL, NULL);
for (; data_items != NULL; data_items = g_list_next (data_items))
{
SokokePrivacyItem* privacy = data_items->data;
button = gtk_check_button_new_with_mnemonic (privacy->label);
gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
g_object_set_data (G_OBJECT (dialog), privacy->name, button);
if (clear_data && strstr (clear_data, privacy->name))
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
}
g_free (clear_data);
Tweak padding and alignment of the Clear private data dialogue
2009-05-25 16:41:54 +00:00
gtk_container_add (GTK_CONTAINER (alignment), vbox);
gtk_box_pack_start (GTK_BOX (hbox), alignment, TRUE, TRUE, 0);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
Implement "Clear private data when quitting Midori" check button
2009-07-28 21:12:35 +00:00
button = gtk_check_button_new_with_mnemonic (_("Clear private data when _quitting Midori"));
if ((clear_prefs & MIDORI_CLEAR_ON_QUIT) == MIDORI_CLEAR_ON_QUIT)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
g_signal_connect (button, "toggled",
G_CALLBACK (midori_browser_clear_on_quit_toggled_cb), browser->settings);
alignment = gtk_alignment_new (0, 0, 1, 1);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 2, 0);
gtk_container_add (GTK_CONTAINER (alignment), button);
Use content_area instead of GtkDialog->vbox in browser
2010-02-19 18:05:29 +00:00
gtk_box_pack_start (GTK_BOX (content_area), alignment, FALSE, FALSE, 0);
gtk_widget_show_all (content_area);
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
g_signal_connect (dialog, "response",
G_CALLBACK (midori_browser_clear_private_data_response_cb), browser);
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed), &dialog);
gtk_widget_show (dialog);
Make 'Clear' the default button for Clear Private Data
2010-10-17 21:13:54 +00:00
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
Implement Clear Private Data dialogue
2009-04-11 03:14:53 +00:00
}
else
gtk_window_present (GTK_WINDOW (dialog));
}
Implement 'Inspect page' menuitem with WebKitGTK+ >= 1.1.17
2010-01-21 17:31:17 +00:00
static void
_action_inspect_page_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* view = midori_browser_get_current_tab (browser);
Change MidoriView into a subclass of GtkVBox This change makes it possible to pack widgets, notably info bars, into a MidoriView.
2010-03-30 20:45:49 +00:00
WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
Implement 'Inspect page' menuitem with WebKitGTK+ >= 1.1.17
2010-01-21 17:31:17 +00:00
WebKitWebInspector* inspector = webkit_web_view_get_inspector (web_view);
webkit_web_inspector_show (inspector);
}
Allow re-ordering tabs with Ctrl+Shift+PageUp/PageDown
2011-03-02 17:03:55 +00:00
static void
_action_tab_move_backward_activate (GtkAction* action,
MidoriBrowser* browser)
{
Add MidoriBrowser::move-tab and use it in Tab Panel
2011-03-07 21:56:20 +00:00
gint new_pos;
gint cur_pos = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook));
GtkWidget* widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), cur_pos);
if (cur_pos > 0)
new_pos = cur_pos - 1;
else
new_pos = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)) - 1;
gtk_notebook_reorder_child (GTK_NOTEBOOK (browser->notebook), widget, new_pos);
g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos);
Allow re-ordering tabs with Ctrl+Shift+PageUp/PageDown
2011-03-02 17:03:55 +00:00
}
static void
_action_tab_move_forward_activate (GtkAction* action,
MidoriBrowser* browser)
{
Add MidoriBrowser::move-tab and use it in Tab Panel
2011-03-07 21:56:20 +00:00
gint new_pos;
gint cur_pos = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook));
GtkWidget* widget = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), cur_pos);
if (cur_pos == (gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)) - 1))
new_pos = 0;
Move forward should move the last tab to the front
2011-03-05 01:08:19 +00:00
else
Add MidoriBrowser::move-tab and use it in Tab Panel
2011-03-07 21:56:20 +00:00
new_pos = cur_pos + 1;
gtk_notebook_reorder_child (GTK_NOTEBOOK (browser->notebook), widget, new_pos);
g_signal_emit (browser, signals[MOVE_TAB], 0, browser->notebook, cur_pos, new_pos);
Allow re-ordering tabs with Ctrl+Shift+PageUp/PageDown
2011-03-02 17:03:55 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_tab_previous_activate (GtkAction* action,
MidoriBrowser* browser)
{
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook));
gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n - 1);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
_action_tab_next_activate (GtkAction* action,
MidoriBrowser* browser)
{
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Advance one tab or jump to the first one if we are at the last one */
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gint n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook));
if (n == gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook)) - 1)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
n = -1;
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n + 1);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Add Window > Focus Current Tab
2009-09-30 20:18:17 +00:00
static void
_action_tab_current_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* view = midori_browser_get_current_tab (browser);
Consistently focus the view, which propagates Rather than trying to determine and focus the web view from different places, the parent view should simply propagate focus by default. The child needs to be constructed implicitly if focus comes in early.
2010-05-06 20:27:29 +00:00
gtk_widget_grab_focus (view);
Add Window > Focus Current Tab
2009-09-30 20:18:17 +00:00
}
Cycle between location and paned widgets with F6
2011-04-26 20:57:13 +00:00
static void
_action_next_view_activate (GtkAction* action,
MidoriBrowser* browser)
{
gtk_widget_grab_focus (midori_browser_get_current_tab (browser));
}
Implement minimize, duplicate and close other as actions This allows keyboard shortcuts to be assigned to these operations.
2010-07-08 21:08:18 +00:00
static void
_action_tab_minimize_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* view = midori_browser_get_current_tab (browser);
g_object_set (view, "minimized",
!katze_object_get_boolean (view, "minimized"), NULL);
}
static void
_action_tab_duplicate_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* view = midori_browser_get_current_tab (browser);
MidoriNewView where = MIDORI_NEW_VIEW_TAB;
Use new _with_item constructor everywhere
2011-12-08 20:14:06 +00:00
GtkWidget* new_view = midori_view_new_with_item (
midori_view_get_proxy_item (MIDORI_VIEW (view)), browser->settings);
Replace midori_view_new_with_uri with _new_with_title The old function is actually being removed because it breaks monitoring of page loading. It was only used internally so far. Moreover a warning is now emitted when loading an URI before adding a view to a browser.
2011-01-01 19:05:34 +00:00
const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view));
Show a notification upon opening a tab or window The notification is shown when in fullscreen mode or the window is maximised, and a window is opened or a tab is opened while the tab bar is not visible.
2011-04-19 21:16:34 +00:00
g_signal_emit_by_name (view, "new-view", new_view, where, TRUE);
Replace midori_view_new_with_uri with _new_with_title The old function is actually being removed because it breaks monitoring of page loading. It was only used internally so far. Moreover a warning is now emitted when loading an URI before adding a view to a browser.
2011-01-01 19:05:34 +00:00
midori_view_set_uri (MIDORI_VIEW (new_view), uri);
Implement minimize, duplicate and close other as actions This allows keyboard shortcuts to be assigned to these operations.
2010-07-08 21:08:18 +00:00
}
static void
midori_browser_close_other_tabs_cb (GtkWidget* view,
gpointer data)
{
GtkWidget* remaining_view = data;
if (view != remaining_view)
gtk_widget_destroy (view);
}
static void
_action_tab_close_other_activate (GtkAction* action,
MidoriBrowser* browser)
{
GtkWidget* view = midori_browser_get_current_tab (browser);
midori_browser_foreach (browser, midori_browser_close_other_tabs_cb, view);
}
Reindent author and license definitions
2010-04-04 19:32:57 +00:00
static const gchar* credits_authors[] =
{ "Christian Dywan <christian@twotoasts.de>", NULL };
static const gchar* credits_documenters[] =
{ "Christian Dywan <christian@twotoasts.de>", NULL };
static const gchar* credits_artists[] =
{ "Nancy Runge <nancy@twotoasts.de>", NULL };
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
No about dialog hooks since GTK+ 2.24, not 3.0
2011-11-13 19:16:55 +00:00
#if !GTK_CHECK_VERSION (2, 24, 0)
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
static void
_action_about_activate_link (GtkAboutDialog* about,
Implement 'full' debug-level and fix according warnings
2009-01-09 21:54:40 +00:00
const gchar* uri,
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
gpointer user_data)
{
MidoriBrowser* browser;
gint n;
browser = MIDORI_BROWSER (user_data);
Implement 'full' debug-level and fix according warnings
2009-01-09 21:54:40 +00:00
n = midori_browser_add_uri (browser, uri);
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
midori_browser_set_current_page (browser, n);
}
static void
_action_about_activate_email (GtkAboutDialog* about,
Implement 'full' debug-level and fix according warnings
2009-01-09 21:54:40 +00:00
const gchar* uri,
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
gpointer user_data)
{
Prepend 'mailto' to email links in the About dialogue Some email clients require this to open email links.
2009-09-08 21:58:58 +00:00
/* Some email clients need the 'mailto' to function properly */
gchar* newuri = NULL;
if (!g_str_has_prefix (uri, "mailto:"))
newuri = g_strconcat ("mailto:", uri, NULL);
sokoke_show_uri (NULL, newuri ? newuri : uri, GDK_CURRENT_TIME, NULL);
g_free (newuri);
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
}
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
#endif
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_about_activate (GtkAction* action,
MidoriBrowser* browser)
{
Refer to about:version instead of numbers in About
2011-02-02 00:45:38 +00:00
gchar* comments = g_strdup_printf ("%s\n%s",
_("A lightweight web browser."),
_("See about:version for version info."));
Make the license in the about dialogue localizable
2010-04-09 20:56:21 +00:00
const gchar* license =
_("This library is free software; you can redistribute it and/or "
"modify it under the terms of the GNU Lesser General Public "
"License as published by the Free Software Foundation; either "
"version 2.1 of the License, or (at your option) any later version.");
Add GTK+ and WebKitGTK+ versions to About dialog
2009-08-17 17:22:33 +00:00
No about dialog hooks since GTK+ 2.24, not 3.0
2011-11-13 19:16:55 +00:00
#if !GTK_CHECK_VERSION (2, 24, 0)
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
gtk_about_dialog_set_email_hook (_action_about_activate_email, NULL, NULL);
gtk_about_dialog_set_url_hook (_action_about_activate_link, browser, NULL);
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
#endif
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_show_about_dialog (GTK_WINDOW (browser),
"logo-icon-name", gtk_window_get_icon_name (GTK_WINDOW (browser)),
"name", PACKAGE_NAME,
"version", PACKAGE_VERSION,
Add GTK+ and WebKitGTK+ versions to About dialog
2009-08-17 17:22:33 +00:00
"comments", comments,
Update copyright year for '--version' and About dialogue
2011-02-12 16:09:35 +00:00
"copyright", "Copyright © 2007-2011 Christian Dywan",
Show news feeds in a menu if the icon is clicked
2008-08-02 02:25:05 +00:00
"website", "http://www.twotoasts.de",
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
"authors", credits_authors,
"documenters", credits_documenters,
"artists", credits_artists,
"license", license,
"wrap-license", TRUE,
Implement localization via Gettext. Based on the implementation of localization via Gettext contributed by Enrico Tröger, a few adjustments were made to allow Midori to be properly localized. Initially German is fully supported.
2008-03-22 02:38:23 +00:00
"translator-credits", _("translator-credits"),
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
NULL);
Make the license in the about dialogue localizable
2010-04-09 20:56:21 +00:00
g_free (comments);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Enable Help > Contents to open the FAQ on the web.
2008-09-07 20:41:03 +00:00
static void
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
_action_help_link_activate (GtkAction* action,
MidoriBrowser* browser)
Enable Help > Contents to open the FAQ on the web.
2008-09-07 20:41:03 +00:00
{
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
const gchar* action_name;
const gchar* uri;
Enable Help > Contents to open the FAQ on the web.
2008-09-07 20:41:03 +00:00
gint n;
Look for user documentation dynamically on win32
2010-02-15 23:47:11 +00:00
#if defined (G_OS_WIN32) && defined (DOCDIR)
gchar* free_uri = NULL;
#endif
Enable Help > Contents to open the FAQ on the web.
2008-09-07 20:41:03 +00:00
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
action_name = gtk_action_get_name (action);
Replace unmaintained docs with FAQ from the wiki Realistically nobody maintains offline documentation and none of the people claiming to look into it ever did, whereas the FAQ is being updated by or with input from individuals. faq.html was copied from http://wiki.xfce.org/_export/xhtml/midori/faq and all <link rel="stylesheet"> tags were replaced with <link rel="stylesheet" type="text/css" href="faq.css" />.
2011-03-08 22:25:37 +00:00
if (!strncmp ("HelpFAQ", action_name, 7))
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
{
Look for user documentation dynamically on win32
2010-02-15 23:47:11 +00:00
#ifdef G_OS_WIN32
{
#ifdef DOCDIR
Support res directly in sokoke_find_data_filename One allocation less each time, less fragmentation.
2011-10-28 23:16:08 +00:00
gchar* path = sokoke_find_data_filename ("doc/midori/faq.html", FALSE);
Look for user documentation dynamically on win32
2010-02-15 23:47:11 +00:00
uri = free_uri = g_filename_to_uri (path, NULL, NULL);
if (g_access (path, F_OK) != 0)
{
Replace unmaintained docs with FAQ from the wiki Realistically nobody maintains offline documentation and none of the people claiming to look into it ever did, whereas the FAQ is being updated by or with input from individuals. faq.html was copied from http://wiki.xfce.org/_export/xhtml/midori/faq and all <link rel="stylesheet"> tags were replaced with <link rel="stylesheet" type="text/css" href="faq.css" />.
2011-03-08 22:25:37 +00:00
if (g_access (DOCDIR "/faq.html", F_OK) == 0)
uri = "file://" DOCDIR "/faq.html";
Look for user documentation dynamically on win32
2010-02-15 23:47:11 +00:00
else
#endif
Replace unmaintained docs with FAQ from the wiki Realistically nobody maintains offline documentation and none of the people claiming to look into it ever did, whereas the FAQ is being updated by or with input from individuals. faq.html was copied from http://wiki.xfce.org/_export/xhtml/midori/faq and all <link rel="stylesheet"> tags were replaced with <link rel="stylesheet" type="text/css" href="faq.css" />.
2011-03-08 22:25:37 +00:00
uri = "error:nodocs share/doc/midori/faq.html";
Look for user documentation dynamically on win32
2010-02-15 23:47:11 +00:00
#ifdef DOCDIR
}
g_free (path);
#endif
}
#else
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
#ifdef DOCDIR
Replace unmaintained docs with FAQ from the wiki Realistically nobody maintains offline documentation and none of the people claiming to look into it ever did, whereas the FAQ is being updated by or with input from individuals. faq.html was copied from http://wiki.xfce.org/_export/xhtml/midori/faq and all <link rel="stylesheet"> tags were replaced with <link rel="stylesheet" type="text/css" href="faq.css" />.
2011-03-08 22:25:37 +00:00
uri = "file://" DOCDIR "/faq.html";
if (g_access (DOCDIR "/faq.html", F_OK) != 0)
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
#endif
Replace unmaintained docs with FAQ from the wiki Realistically nobody maintains offline documentation and none of the people claiming to look into it ever did, whereas the FAQ is being updated by or with input from individuals. faq.html was copied from http://wiki.xfce.org/_export/xhtml/midori/faq and all <link rel="stylesheet"> tags were replaced with <link rel="stylesheet" type="text/css" href="faq.css" />.
2011-03-08 22:25:37 +00:00
uri = "error:nodocs " DOCDIR "/faq.html";
Look for user documentation dynamically on win32
2010-02-15 23:47:11 +00:00
#endif
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
}
else if (!strncmp ("HelpBugs", action_name, 8))
Refer to Launchpad rather than Flyspray for bug tracking Fixes: https://bugs.launchpad.net/midori/+bug/706241
2011-01-30 17:47:17 +00:00
uri = PACKAGE_BUGREPORT;
Integrate documentation, bug tracker and website
2008-10-03 20:23:00 +00:00
else
uri = NULL;
if (uri)
{
n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page (browser, n);
Look for user documentation dynamically on win32
2010-02-15 23:47:11 +00:00
#if defined (G_OS_WIN32) && defined (DOCDIR)
g_free (free_uri);
#endif
}
Enable Help > Contents to open the FAQ on the web.
2008-09-07 20:41:03 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
_action_panel_activate (GtkToggleAction* action,
MidoriBrowser* browser)
{
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
gboolean active = gtk_toggle_action_get_active (action);
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
g_object_set (browser->settings, "show-panel", active, NULL);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
sokoke_widget_set_visible (browser->panel, active);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Save size and panel position with a delay of 5 seconds
2009-01-25 23:54:12 +00:00
static gboolean
midori_browser_panel_timeout (GtkWidget* hpaned)
{
It should be 'gint position', not gboolean
2010-01-09 22:12:14 +00:00
gint position = gtk_paned_get_position (GTK_PANED (hpaned));
Add midori_browser_get_for_widget_utility function This function will look for a MidoriBrowser according to a particular widget - even if it's inside a detached panel window or any other window transient for the browser.
2009-04-23 02:10:38 +00:00
MidoriBrowser* browser = midori_browser_get_for_widget (hpaned);
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
g_object_set (browser->settings, "last-panel-position", position, NULL);
Save size and panel position with a delay of 5 seconds
2009-01-25 23:54:12 +00:00
browser->panel_timeout = 0;
return FALSE;
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
Save size and panel position with a delay of 5 seconds
2009-01-25 23:54:12 +00:00
midori_panel_notify_position_cb (GObject* hpaned,
GParamSpec* pspec,
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
MidoriBrowser* browser)
{
Save size and panel position with a delay of 5 seconds
2009-01-25 23:54:12 +00:00
if (!browser->panel_timeout)
browser->panel_timeout = g_timeout_add_full (G_PRIORITY_LOW, 5000,
(GSourceFunc)midori_browser_panel_timeout, hpaned, NULL);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Cycle between location and paned widgets with F6
2011-04-26 20:57:13 +00:00
static gboolean
midori_panel_cycle_child_focus_cb (GtkWidget* hpaned,
gboolean reversed,
MidoriBrowser* browser)
{
/* Default cycle goes between all GtkPaned widgets.
If focus is in the panel, focus the location as if it's a paned.
If nothing is focussed, simply go to the location.
Be sure to suppress the default because the signal can recurse. */
GtkWidget* focus = gtk_window_get_focus (GTK_WINDOW (browser));
if (gtk_widget_get_ancestor (focus, MIDORI_TYPE_PANEL)
|| !gtk_widget_get_ancestor (focus, GTK_TYPE_PANED))
{
g_signal_stop_emission_by_name (hpaned, "cycle-child-focus");
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
midori_browser_activate_action (browser, "Location");
Cycle between location and paned widgets with F6
2011-04-26 20:57:13 +00:00
return TRUE;
}
return FALSE;
}
Fix panel "page" notifications and save the last open panel
2009-06-22 22:25:09 +00:00
static void
midori_panel_notify_page_cb (MidoriPanel* panel,
GParamSpec* pspec,
MidoriBrowser* browser)
{
Use function to access browser settings an panel
2010-11-01 15:47:32 +00:00
gint page = midori_panel_get_current_page (panel);
Remove remaining cases checking if browser->settings is set
2009-11-13 17:27:49 +00:00
if (page > -1)
Fix panel "page" notifications and save the last open panel
2009-06-22 22:25:09 +00:00
g_object_set (browser->settings, "last-panel-page", page, NULL);
}
Implement Options menu via a button on the side panel The new button is visible on all panels and pops up a menu, which allows toggling the panel titles and the operating controls. A new signal "populate-option-menu" makes it extendible.
2009-07-26 20:00:10 +00:00
static void
midori_panel_notify_show_titles_cb (MidoriPanel* panel,
GParamSpec* pspec,
MidoriBrowser* browser)
{
gboolean show_titles = katze_object_get_boolean (panel, "show-titles");
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
g_signal_handlers_block_by_func (browser->settings,
midori_browser_settings_notify, browser);
g_object_set (browser->settings, "compact-sidepanel", !show_titles, NULL);
g_signal_handlers_unblock_by_func (browser->settings,
midori_browser_settings_notify, browser);
Implement Options menu via a button on the side panel The new button is visible on all panels and pops up a menu, which allows toggling the panel titles and the operating controls. A new signal "populate-option-menu" makes it extendible.
2009-07-26 20:00:10 +00:00
}
Add a button to change the alignment to the panel
2009-02-22 18:23:45 +00:00
static void
midori_panel_notify_right_aligned_cb (MidoriPanel* panel,
GParamSpec* pspec,
MidoriBrowser* browser)
{
gboolean right_aligned = katze_object_get_boolean (panel, "right-aligned");
GtkWidget* hpaned = gtk_widget_get_parent (browser->panel);
GtkWidget* vpaned = gtk_widget_get_parent (browser->notebook);
Actually flip the position of the panel knob when changing alignment
2009-05-30 22:22:23 +00:00
gint paned_position = gtk_paned_get_position (GTK_PANED (hpaned));
Use accessors for window and allocation of a widget
2010-10-18 20:42:10 +00:00
GtkAllocation allocation;
gint paned_size;
gtk_widget_get_allocation (hpaned, &allocation);
paned_size = allocation.width;
Add a button to change the alignment to the panel
2009-02-22 18:23:45 +00:00
Remove remaining cases checking if browser->settings is set
2009-11-13 17:27:49 +00:00
g_object_set (browser->settings, "right-align-sidepanel", right_aligned, NULL);
Add a button to change the alignment to the panel
2009-02-22 18:23:45 +00:00
g_object_ref (browser->panel);
g_object_ref (vpaned);
gtk_container_remove (GTK_CONTAINER (hpaned), browser->panel);
gtk_container_remove (GTK_CONTAINER (hpaned), vpaned);
if (right_aligned)
{
Allow the panel to expand, to stop it from ever-growing in fullscreen
2010-01-11 20:47:37 +00:00
gtk_paned_pack1 (GTK_PANED (hpaned), vpaned, TRUE, FALSE);
Add a button to change the alignment to the panel
2009-02-22 18:23:45 +00:00
gtk_paned_pack2 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE);
}
else
{
gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE);
Allow the panel to expand, to stop it from ever-growing in fullscreen
2010-01-11 20:47:37 +00:00
gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, FALSE);
Add a button to change the alignment to the panel
2009-02-22 18:23:45 +00:00
}
Actually flip the position of the panel knob when changing alignment
2009-05-30 22:22:23 +00:00
gtk_paned_set_position (GTK_PANED (hpaned), paned_size - paned_position);
Add a button to change the alignment to the panel
2009-02-22 18:23:45 +00:00
g_object_unref (browser->panel);
g_object_unref (vpaned);
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static gboolean
midori_panel_close_cb (MidoriPanel* panel,
MidoriBrowser* browser)
{
Append the closed tabs items as a proper submenu.
2008-04-06 23:15:09 +00:00
_action_set_active (browser, "Panel", FALSE);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
return FALSE;
}
static void
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
gtk_notebook_switch_page_cb (GtkWidget* notebook,
Don't use GtkNotebookPage* in callback signature
2010-10-04 20:07:41 +00:00
gpointer page,
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
guint page_num,
MidoriBrowser* browser)
{
Remember text typed in the location when switching tabs The API of the location action is adjusted so that any typed text can be retrieved, distinguished from a confirmed URI.
2009-10-04 00:32:50 +00:00
GtkWidget* widget;
GtkAction* action;
const gchar* text;
if (!(widget = midori_browser_get_current_tab (browser)))
return;
action = _action_by_name (browser, "Location");
text = midori_location_action_get_text (MIDORI_LOCATION_ACTION (action));
g_object_set_data_full (G_OBJECT (widget), "midori-browser-typed-text",
g_strdup (text), g_free);
}
static void
gtk_notebook_switch_page_after_cb (GtkWidget* notebook,
Don't use GtkNotebookPage* in callback signature
2010-10-04 20:07:41 +00:00
gpointer page,
Remember text typed in the location when switching tabs The API of the location action is adjusted so that any typed text can be retrieved, distinguished from a confirmed URI.
2009-10-04 00:32:50 +00:00
guint page_num,
MidoriBrowser* browser)
{
GtkWidget* widget;
MidoriView* view;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
const gchar* uri;
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
GtkAction* action;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
Remember text typed in the location when switching tabs The API of the location action is adjusted so that any typed text can be retrieved, distinguished from a confirmed URI.
2009-10-04 00:32:50 +00:00
if (!(widget = midori_browser_get_current_tab (browser)))
Check if we really have a view, it might be invisible
2009-04-01 21:53:45 +00:00
return;
Remember text typed in the location when switching tabs The API of the location action is adjusted so that any typed text can be retrieved, distinguished from a confirmed URI.
2009-10-04 00:32:50 +00:00
view = MIDORI_VIEW (widget);
uri = g_object_get_data (G_OBJECT (widget), "midori-browser-typed-text");
if (!uri)
uri = midori_view_get_display_uri (view);
Don't include application name in window title Except in private browsing mode.
2011-04-25 15:53:33 +00:00
midori_browser_set_title (browser, midori_view_get_display_title (view));
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
action = _action_by_name (browser, "Location");
Remember text typed in the location when switching tabs The API of the location action is adjusted so that any typed text can be retrieved, distinguished from a confirmed URI.
2009-10-04 00:32:50 +00:00
midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
Update location icon even if it's not in the history
2008-11-10 23:51:28 +00:00
midori_location_action_set_icon (MIDORI_LOCATION_ACTION (action),
Remember text typed in the location when switching tabs The API of the location action is adjusted so that any typed text can be retrieved, distinguished from a confirmed URI.
2009-10-04 00:32:50 +00:00
midori_view_get_icon (view));
Handle window icon inside MidoriBrowser Fixes: https://bugs.launchpad.net/midori/+bug/918567
2012-01-24 22:26:09 +00:00
if (sokoke_is_app_or_private ())
gtk_window_set_icon (GTK_WINDOW (browser), midori_view_get_icon (view));
Introduce MidoriLocationEntry and GtkIconEntry
2008-07-17 19:02:14 +00:00
Make sure to only update the proxy array if it's still there The proxy array of the browser is unset during disposal, so we may end up trying to work with a NULL value.
2009-07-18 13:30:03 +00:00
if (browser->proxy_array)
katze_item_set_meta_integer (KATZE_ITEM (browser->proxy_array), "current",
midori_browser_get_current_page (browser));
Notify MidoriBrowser::tab property properly
2009-09-29 18:49:30 +00:00
g_object_notify (G_OBJECT (browser), "tab");
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
_midori_browser_set_statusbar_text (browser, NULL);
_midori_browser_update_interface (browser);
Remember text typed in the location when switching tabs The API of the location action is adjusted so that any typed text can be retrieved, distinguished from a confirmed URI.
2009-10-04 00:32:50 +00:00
_midori_browser_update_progress (browser, view);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Save tab reordering to the session
2009-03-24 22:54:37 +00:00
static void
midori_browser_notebook_page_reordered_cb (GtkNotebook* notebook,
MidoriView* view,
guint page_num,
MidoriBrowser* browser)
{
KatzeItem* item = midori_view_get_proxy_item (view);
katze_array_move_item (browser->proxy_array, item, page_num);
Notify MidoriBrowser::tab property properly
2009-09-29 18:49:30 +00:00
g_object_notify (G_OBJECT (browser), "tab");
Save tab reordering to the session
2009-03-24 22:54:37 +00:00
}
Disarm built-in notebook reorder key bindings The keys are confusing if triggered accidentally.
2011-03-07 02:38:17 +00:00
static gboolean
midori_browser_notebook_reorder_tab_cb (GtkNotebook* notebook,
GtkDirectionType arg1,
gboolean arg2,
gpointer user_data)
{
g_signal_stop_emission_by_name (notebook, "reorder-tab");
return TRUE;
}
Support creating new windows by dragging tabs outside
2011-08-18 16:06:34 +00:00
static GtkWidget*
midori_browser_notebook_create_window_cb (GtkNotebook* notebook,
MidoriView* view,
gint x,
gint y,
MidoriBrowser* browser)
{
MidoriBrowser* new_browser;
g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
if (new_browser)
{
GtkWidget* new_notebook = katze_object_get_object (new_browser, "notebook");
g_object_unref (new_notebook);
gtk_window_move (GTK_WINDOW (browser), x, y);
return new_notebook;
}
else /* No MidoriApp, so this is app or private mode */
return NULL;
}
Provide tab overview menu on right-click of empty space
2011-03-02 17:03:13 +00:00
static void
midori_browser_switch_tab_cb (GtkWidget* menuitem,
MidoriBrowser* browser)
{
Fix shadow and missing initialisation warnings
2011-03-08 18:56:48 +00:00
gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menuitem), "index"));
midori_browser_set_current_page (browser, page);
Provide tab overview menu on right-click of empty space
2011-03-02 17:03:13 +00:00
}
Open new tabs by double or middle clicking on the tabbar
2009-01-13 19:50:17 +00:00
static gboolean
Don't open tabs when double- or middle-clicking notebook arrows We need to connect after the button-press-event to make sure that GtkNotebook blocks the signal appropriately. Double click is disabled for now since we can't figure out if it was a click on a button or not.
2009-06-25 21:49:41 +00:00
midori_browser_notebook_button_press_event_after_cb (GtkNotebook* notebook,
GdkEventButton* event,
MidoriBrowser* browser)
Open new tabs by double or middle clicking on the tabbar
2009-01-13 19:50:17 +00:00
{
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
#if !GTK_CHECK_VERSION(3,0,0) /* TODO */
Don't open tabs when double- or middle-clicking notebook arrows We need to connect after the button-press-event to make sure that GtkNotebook blocks the signal appropriately. Double click is disabled for now since we can't figure out if it was a click on a button or not.
2009-06-25 21:49:41 +00:00
if (event->window != notebook->event_window)
return FALSE;
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
#endif
Don't open tabs when double- or middle-clicking notebook arrows We need to connect after the button-press-event to make sure that GtkNotebook blocks the signal appropriately. Double click is disabled for now since we can't figure out if it was a click on a button or not.
2009-06-25 21:49:41 +00:00
/* FIXME: Handle double click only when it wasn't handled by GtkNotebook */
Open new tabs by double or middle clicking on the tabbar
2009-01-13 19:50:17 +00:00
/* Open a new tab on double click or middle mouse click */
Don't open tabs when double- or middle-clicking notebook arrows We need to connect after the button-press-event to make sure that GtkNotebook blocks the signal appropriately. Double click is disabled for now since we can't figure out if it was a click on a button or not.
2009-06-25 21:49:41 +00:00
if (/*(event->type == GDK_2BUTTON_PRESS && event->button == 1)
Introduce MIDORI_EVENT_NEW_TAB and use it Fixes: https://bugs.launchpad.net/midori/+bug/797224 Fixes: https://bugs.launchpad.net/midori/+bug/797229
2011-09-28 15:45:37 +00:00
|| */(event->type == GDK_BUTTON_PRESS && MIDORI_EVENT_NEW_TAB (event)))
Open new tabs by double or middle clicking on the tabbar
2009-01-13 19:50:17 +00:00
{
Use midori_browser_add_tab for tab on tab bar click So we get speed dial if it is enabled like on new tab button.
2011-01-30 18:11:38 +00:00
gint n = midori_browser_add_uri (browser, "");
Always append tabs opened via middle/ double click on the tab bar
2009-05-17 14:49:46 +00:00
midori_browser_set_current_page (browser, n);
Open new tabs by double or middle clicking on the tabbar
2009-01-13 19:50:17 +00:00
Always append tabs opened via middle/ double click on the tab bar
2009-05-17 14:49:46 +00:00
return TRUE;
Open new tabs by double or middle clicking on the tabbar
2009-01-13 19:50:17 +00:00
}
Introduce MIDORI_EVENT_CONTEXT_MENU in midori-platform.h The new header contains all state and event handling.
2011-09-21 21:03:00 +00:00
else if (event->type == GDK_BUTTON_PRESS && MIDORI_EVENT_CONTEXT_MENU (event))
Provide tab overview menu on right-click of empty space
2011-03-02 17:03:13 +00:00
{
GtkWidget* menu = gtk_menu_new ();
GList* tabs = gtk_container_get_children (GTK_CONTAINER (notebook));
GtkWidget* menuitem = sokoke_action_create_popup_menu_item (
gtk_action_group_get_action (browser->action_group, "TabNew"));
Fix shadow and missing initialisation warnings
2011-03-08 18:56:48 +00:00
gint i = 0;
Provide tab overview menu on right-click of empty space
2011-03-02 17:03:13 +00:00
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
menuitem = sokoke_action_create_popup_menu_item (
gtk_action_group_get_action (browser->action_group, "UndoTabClose"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
for (; tabs != NULL; tabs = g_list_next (tabs))
{
const gchar* title = midori_view_get_display_title (tabs->data);
menuitem = katze_image_menu_item_new_ellipsized (title);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem),
gtk_image_new_from_pixbuf (midori_view_get_icon (tabs->data)));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
g_object_set_data (G_OBJECT (menuitem), "index", GINT_TO_POINTER (i));
g_signal_connect (menuitem, "activate",
G_CALLBACK (midori_browser_switch_tab_cb), browser);
i++;
}
g_list_free (tabs);
gtk_widget_show_all (menu);
katze_widget_popup (GTK_WIDGET (notebook), GTK_MENU (menu), NULL,
Don't check for impossible mouse button value
2011-03-13 14:02:57 +00:00
KATZE_MENU_POSITION_CURSOR);
Provide tab overview menu on right-click of empty space
2011-03-02 17:03:13 +00:00
}
Open new tabs by double or middle clicking on the tabbar
2009-01-13 19:50:17 +00:00
return FALSE;
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
Build fix: Accidentally removed the wrong action.
2008-03-10 21:48:12 +00:00
_action_undo_tab_close_activate (GtkAction* action,
MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Use the right index for Undo Close Tab.
2008-08-24 01:05:00 +00:00
guint last;
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
KatzeItem* item;
Use the right index for Undo Close Tab.
2008-08-24 01:05:00 +00:00
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
if (!browser->trash)
return;
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Reopen the most recent trash item */
Rework MidoriWebList into KatzeList and KatzeArray
2008-08-25 23:19:38 +00:00
last = katze_array_get_length (browser->trash) - 1;
item = katze_array_get_nth_item (browser->trash, last);
Introduce helper for correctly restoring tabs We need to ensure a reference on the item.
2011-12-07 21:31:13 +00:00
midori_browser_set_current_page (browser,
midori_browser_restore_tab (browser, item));
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
static void
_action_trash_empty_activate (GtkAction* action,
MidoriBrowser* browser)
{
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
if (browser->trash)
{
katze_array_clear (browser->trash);
_midori_browser_update_actions (browser);
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
static const GtkActionEntry entries[] =
{
{ "File", NULL, N_("_File") },
{ "WindowNew", STOCK_WINDOW_NEW,
N_("New _Window"), "<Ctrl>n",
N_("Open a new window"), G_CALLBACK (_action_window_new_activate) },
{ "TabNew", STOCK_TAB_NEW,
NULL, "<Ctrl>t",
N_("Open a new tab"), G_CALLBACK (_action_tab_new_activate) },
{ "PrivateBrowsing", NULL,
Clarify menu item labels Related to: https://bugs.launchpad.net/midori/+bug/743159 Fixes: https://bugs.launchpad.net/midori/+bug/699934
2011-05-16 01:30:55 +00:00
N_("New P_rivate Browsing Window"), "<Ctrl><Shift>n",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_private_browsing_activate), },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Open", GTK_STOCK_OPEN,
NULL, "<Ctrl>o",
N_("Open a file"), G_CALLBACK (_action_open_activate) },
{ "SaveAs", GTK_STOCK_SAVE_AS,
Clarify menu item labels Related to: https://bugs.launchpad.net/midori/+bug/743159 Fixes: https://bugs.launchpad.net/midori/+bug/699934
2011-05-16 01:30:55 +00:00
N_("_Save Page As..."), "<Ctrl>s",
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
N_("Save to a file"), G_CALLBACK (_action_save_as_activate) },
{ "AddSpeedDial", NULL,
N_("Add to Speed _dial"), "<Ctrl>h",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_add_speed_dial_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "AddDesktopShortcut", NULL,
Rename 'Add Desktop Shortcut' to 'Create launcher' Fixes: https://bugs.launchpad.net/midori/+bug/710281
2011-02-12 17:12:55 +00:00
#if HAVE_HILDON
Implement 'Add Shortcut to desktop' for X11
2010-12-12 00:26:08 +00:00
N_("Add Shortcut to the _desktop"), "<Ctrl>j",
Rename 'Add Desktop Shortcut' to 'Create launcher' Fixes: https://bugs.launchpad.net/midori/+bug/710281
2011-02-12 17:12:55 +00:00
#else
N_("Create _Launcher"), "<Ctrl>j",
#endif
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_add_desktop_shortcut_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "AddNewsFeed", NULL,
N_("Subscribe to News _feed"), NULL,
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_add_news_feed_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "CompactAdd", GTK_STOCK_ADD,
NULL, NULL,
NULL, G_CALLBACK (_action_compact_add_activate) },
{ "TabClose", GTK_STOCK_CLOSE,
N_("_Close Tab"), "<Ctrl>w",
N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) },
{ "WindowClose", NULL,
N_("C_lose Window"), "<Ctrl><Shift>w",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_window_close_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Print", GTK_STOCK_PRINT,
NULL, "<Ctrl>p",
N_("Print the current page"), G_CALLBACK (_action_print_activate) },
{ "Quit", GTK_STOCK_QUIT,
Rename 'Quit' to 'Close all Windows' That's what it does effectively.
2011-04-07 20:41:27 +00:00
N_("Close a_ll Windows"), "<Ctrl><Shift>q",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_quit_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Edit", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK (_action_edit_activate) },
{ "Undo", GTK_STOCK_UNDO,
NULL, "<Ctrl>z",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_undo_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Redo", GTK_STOCK_REDO,
NULL, "<Ctrl><Shift>z",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_redo_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Cut", GTK_STOCK_CUT,
NULL, "<Ctrl>x",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_cut_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Copy", GTK_STOCK_COPY,
NULL, "<Ctrl>c",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_copy_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Paste", GTK_STOCK_PASTE,
NULL, "<Ctrl>v",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_paste_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Delete", GTK_STOCK_DELETE,
NULL, NULL,
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_delete_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "SelectAll", GTK_STOCK_SELECT_ALL,
NULL, "<Ctrl>a",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_select_all_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Find", GTK_STOCK_FIND,
Clarify menu item labels Related to: https://bugs.launchpad.net/midori/+bug/743159 Fixes: https://bugs.launchpad.net/midori/+bug/699934
2011-05-16 01:30:55 +00:00
N_("_Find..."), "<Ctrl>f",
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) },
{ "FindNext", GTK_STOCK_GO_FORWARD,
N_("Find _Next"), "<Ctrl>g",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_find_next_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "FindPrevious", GTK_STOCK_GO_BACK,
N_("Find _Previous"), "<Ctrl><Shift>g",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_find_previous_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Preferences", GTK_STOCK_PREFERENCES,
NULL, "<Ctrl><Alt>p",
N_("Configure the application preferences"), G_CALLBACK (_action_preferences_activate) },
{ "View", NULL, N_("_View") },
{ "Toolbars", NULL, N_("_Toolbars") },
{ "Reload", GTK_STOCK_REFRESH,
NULL, "<Ctrl>r",
N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
Uncached reload action, default Ctrl+Shift+R
2011-02-02 00:55:32 +00:00
{ "ReloadUncached", GTK_STOCK_REFRESH,
Use distinct labels for Refresh actions in shortcut editor
2011-02-20 03:13:30 +00:00
N_("Reload page without caching"), "<Ctrl><Shift>r",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_reload_stop_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Stop", GTK_STOCK_STOP,
NULL, "Escape",
N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) },
{ "ReloadStop", GTK_STOCK_STOP,
NULL, "<Ctrl>r",
N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
{ "ZoomIn", GTK_STOCK_ZOOM_IN,
NULL, "<Ctrl>plus",
Merge _action_zoom_*_activate into _action_zoom_activate ()
2010-06-25 13:50:19 +00:00
N_("Increase the zoom level"), G_CALLBACK (_action_zoom_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "ZoomOut", GTK_STOCK_ZOOM_OUT,
NULL, "<Ctrl>minus",
Merge _action_zoom_*_activate into _action_zoom_activate ()
2010-06-25 13:50:19 +00:00
N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "ZoomNormal", GTK_STOCK_ZOOM_100,
NULL, "<Ctrl>0",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_zoom_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Encoding", NULL, N_("_Encoding") },
{ "SourceView", NULL,
N_("View So_urce"), "<Ctrl><Alt>U",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_source_view_activate) },
Support caret browsing toggle with F7 Users who need the feature can't be expected to change a hidden preference. The same hotkey is supported by Firefox and Epiphany.
2011-04-30 10:07:12 +00:00
{ "CaretBrowsing", NULL,
N_("Ca_ret Browsing"), "F7",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_caret_browsing_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Fullscreen", GTK_STOCK_FULLSCREEN,
NULL, "F11",
N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) },
{ "ScrollLeft", NULL,
N_("Scroll _Left"), "h",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_scroll_somewhere_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "ScrollDown", NULL,
N_("Scroll _Down"), "j",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_scroll_somewhere_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "ScrollUp", NULL,
N_("Scroll _Up"), "k",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_scroll_somewhere_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "ScrollRight", NULL,
N_("Scroll _Right"), "l",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_scroll_somewhere_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Go", NULL, N_("_Go") },
{ "Back", GTK_STOCK_GO_BACK,
NULL, "<Alt>Left",
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
N_("Go back to the previous page"), G_CALLBACK (_action_navigation_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Forward", GTK_STOCK_GO_FORWARD,
NULL, "<Alt>Right",
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
N_("Go forward to the next page"), G_CALLBACK (_action_navigation_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Previous", GTK_STOCK_MEDIA_PREVIOUS,
Use Alt+Shift+Left/ Right for Previous and Next actions Control+Left/ Right conflicts with text cursor movement.
2010-09-02 22:21:03 +00:00
NULL, "<Alt><Shift>Left",
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
/* i18n: Visit the previous logical page, ie. in a forum or blog */
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
N_("Go to the previous sub-page"), G_CALLBACK (_action_navigation_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Next", GTK_STOCK_MEDIA_NEXT,
Use Alt+Shift+Left/ Right for Previous and Next actions Control+Left/ Right conflicts with text cursor movement.
2010-09-02 22:21:03 +00:00
NULL, "<Alt><Shift>Right",
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
/* i18n: Visit the following logical page, ie. in a forum or blog */
Merge _action_(back|forward|Previous|Next)into _action_navigation_activate ()
2010-06-25 14:11:40 +00:00
N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Homepage", STOCK_HOMEPAGE,
NULL, "<Alt>Home",
Add homepage handling in _action_navigation_activate ()
2010-06-25 15:18:22 +00:00
N_("Go to your homepage"), G_CALLBACK (_action_navigation_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "TrashEmpty", GTK_STOCK_CLEAR,
N_("Empty Trash"), "",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_trash_empty_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "UndoTabClose", GTK_STOCK_UNDELETE,
N_("Undo _Close Tab"), "<Ctrl><Shift>t",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_undo_tab_close_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "BookmarkAdd", STOCK_BOOKMARK_ADD,
NULL, "<Ctrl>d",
N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) },
{ "BookmarkFolderAdd", NULL,
N_("Add a new _folder"), "",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_bookmark_add_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "BookmarksImport", NULL,
N_("_Import bookmarks"), "",
NULL, G_CALLBACK (_action_bookmarks_import_activate) },
{ "BookmarksExport", NULL,
N_("_Export bookmarks"), "",
NULL, G_CALLBACK (_action_bookmarks_export_activate) },
{ "ManageSearchEngines", GTK_STOCK_PROPERTIES,
N_("_Manage Search Engines"), "<Ctrl><Alt>s",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_manage_search_engines_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "ClearPrivateData", NULL,
N_("_Clear Private Data"), "<Ctrl><Shift>Delete",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_clear_private_data_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "InspectPage", NULL,
N_("_Inspect Page"), "<Ctrl><Shift>i",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_inspect_page_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "TabPrevious", GTK_STOCK_GO_BACK,
N_("_Previous Tab"), "<Ctrl>Page_Up",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_tab_previous_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "TabNext", GTK_STOCK_GO_FORWARD,
N_("_Next Tab"), "<Ctrl>Page_Down",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_tab_next_activate) },
Resolve mnemonic conflict in Tab Move Forward/ Backward
2011-03-13 14:24:40 +00:00
{ "TabMoveBackward", NULL, N_("Move Tab _Backward"), "<Ctrl><Shift>Page_Up",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_tab_move_backward_activate) },
Allow re-ordering tabs with Ctrl+Shift+PageUp/PageDown
2011-03-02 17:03:55 +00:00
{ "TabMoveForward", NULL, N_("_Move Tab Forward"), "<Ctrl><Shift>Page_Down",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_tab_move_forward_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "TabCurrent", NULL,
N_("Focus _Current Tab"), "<Ctrl>Home",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_tab_current_activate) },
Cycle between location and paned widgets with F6
2011-04-26 20:57:13 +00:00
{ "NextView", NULL,
N_("Focus _Next view"), "F6",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_next_view_activate) },
Implement minimize, duplicate and close other as actions This allows keyboard shortcuts to be assigned to these operations.
2010-07-08 21:08:18 +00:00
{ "TabMinimize", NULL,
Correct description of TabMinimize While internally still called 'minimize', the description needs to say that only the icon of the tab is shown.
2010-10-24 18:52:30 +00:00
N_("Only show the Icon of the _Current Tab"), "",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_tab_minimize_activate) },
Implement minimize, duplicate and close other as actions This allows keyboard shortcuts to be assigned to these operations.
2010-07-08 21:08:18 +00:00
{ "TabDuplicate", NULL,
N_("_Duplicate Current Tab"), "",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_tab_duplicate_activate) },
Implement minimize, duplicate and close other as actions This allows keyboard shortcuts to be assigned to these operations.
2010-07-08 21:08:18 +00:00
{ "TabCloseOther", NULL,
N_("Close Ot_her Tabs"), "",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_tab_close_other_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "LastSession", NULL,
N_("Open last _session"), NULL,
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, NULL },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Help", NULL, N_("_Help") },
Replace unmaintained docs with FAQ from the wiki Realistically nobody maintains offline documentation and none of the people claiming to look into it ever did, whereas the FAQ is being updated by or with input from individuals. faq.html was copied from http://wiki.xfce.org/_export/xhtml/midori/faq and all <link rel="stylesheet"> tags were replaced with <link rel="stylesheet" type="text/css" href="faq.css" />.
2011-03-08 22:25:37 +00:00
{ "HelpFAQ", GTK_STOCK_HELP,
N_("_Frequent Questions"), "F1",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_help_link_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "HelpBugs", NULL,
Rename 'Report a Bug' to 'Report a Problem' Users with no technical background don't talk about beetles.
2011-04-07 19:18:23 +00:00
N_("_Report a Problem..."), NULL,
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_help_link_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "About", GTK_STOCK_ABOUT,
NULL, "",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_about_activate) },
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
{ "Dummy", NULL, "Dummy" },
};
static const guint entries_n = G_N_ELEMENTS (entries);
static const GtkToggleActionEntry toggle_entries[] =
{
{ "Menubar", NULL,
N_("_Menubar"), "",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_menubar_activate),
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
FALSE },
{ "Navigationbar", NULL,
N_("_Navigationbar"), "",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_navigationbar_activate),
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
FALSE },
{ "Panel", GTK_STOCK_INDENT,
N_("Side_panel"), "F9",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
N_("Sidepanel"), G_CALLBACK (_action_panel_activate),
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
FALSE },
{ "Bookmarkbar", NULL,
N_("_Bookmarkbar"), "",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_bookmarkbar_activate),
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
FALSE },
{ "Statusbar", NULL,
N_("_Statusbar"), "",
Remove unneeded action tooltips and add unit test The tooltips used to be shown in the statusbar when hovering the menubar.
2011-11-08 20:54:46 +00:00
NULL, G_CALLBACK (_action_statusbar_activate),
Reindent entries, toggle_entries, encoding_entries
2010-04-04 19:27:24 +00:00
FALSE },
};
static const guint toggle_entries_n = G_N_ELEMENTS (toggle_entries);
static const GtkRadioActionEntry encoding_entries[] =
{
{ "EncodingAutomatic", NULL,
N_("_Automatic"), "",
NULL, 1 },
{ "EncodingChinese", NULL,
N_("Chinese (BIG5)"), "",
NULL, 1 },
{ "EncodingJapanese", NULL,
/* i18n: A double underscore "__" is used to prevent the mnemonic */
N_("Japanese (SHIFT__JIS)"), "",
NULL, 1 },
{ "EncodingKorean", NULL,
N_("Korean (EUC-KR)"), "",
NULL, 1 },
{ "EncodingRussian", NULL,
N_("Russian (KOI8-R)"), "",
NULL, 1 },
{ "EncodingUnicode", NULL,
N_("Unicode (UTF-8)"), "",
NULL, 1 },
{ "EncodingWestern", NULL,
N_("Western (ISO-8859-1)"), "",
NULL, 1 },
{ "EncodingCustom", NULL,
N_("Custom..."), "",
NULL, 1 },
};
static const guint encoding_entries_n = G_N_ELEMENTS (encoding_entries);
Use radio actions for the encodings menu
2009-06-22 20:55:23 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
midori_browser_window_state_event_cb (MidoriBrowser* browser,
GdkEventWindowState* event)
{
Remember the last window state, ie. whether Midori was maximized or minimized
2009-01-20 22:27:19 +00:00
MidoriWindowState window_state = MIDORI_WINDOW_NORMAL;
if (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED)
window_state = MIDORI_WINDOW_MINIMIZED;
else if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
window_state = MIDORI_WINDOW_MAXIMIZED;
else if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
window_state = MIDORI_WINDOW_FULLSCREEN;
g_object_set (browser->settings, "last-window-state", window_state, NULL);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Save size and panel position with a delay of 5 seconds
2009-01-25 23:54:12 +00:00
static gboolean
midori_browser_alloc_timeout (MidoriBrowser* browser)
{
Save the normal window size, not the maximized size
2009-02-22 13:42:27 +00:00
GtkWidget* widget = GTK_WIDGET (browser);
Use accessors for window and allocation of a widget
2010-10-18 20:42:10 +00:00
GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (widget));
Save the normal window size, not the maximized size
2009-02-22 13:42:27 +00:00
if (!(state &
(GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)))
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
{
Use accessors for window and allocation of a widget
2010-10-18 20:42:10 +00:00
GtkAllocation allocation;
gtk_widget_get_allocation (widget, &allocation);
if (allocation.width != browser->last_window_width)
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
{
Use accessors for window and allocation of a widget
2010-10-18 20:42:10 +00:00
browser->last_window_width = allocation.width;
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
g_object_set (browser->settings,
"last-window-width", browser->last_window_width, NULL);
}
Use accessors for window and allocation of a widget
2010-10-18 20:42:10 +00:00
if (allocation.height != browser->last_window_height)
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
{
Use accessors for window and allocation of a widget
2010-10-18 20:42:10 +00:00
browser->last_window_height = allocation.height;
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
g_object_set (browser->settings,
Use accessors for window and allocation of a widget
2010-10-18 20:42:10 +00:00
"last-window-height", allocation.height, NULL);
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
}
}
Save the normal window size, not the maximized size
2009-02-22 13:42:27 +00:00
Save size and panel position with a delay of 5 seconds
2009-01-25 23:54:12 +00:00
browser->alloc_timeout = 0;
return FALSE;
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
midori_browser_size_allocate_cb (MidoriBrowser* browser,
GtkAllocation* allocation)
{
GtkWidget* widget = GTK_WIDGET (browser);
Avoid copying of strings and making tiny allocations
2011-12-11 01:57:04 +00:00
if (!browser->alloc_timeout && gtk_widget_get_realized (widget))
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Fix panel "page" notifications and save the last open panel
2009-06-22 22:25:09 +00:00
gpointer last_page;
if ((last_page = g_object_get_data (G_OBJECT (browser), "last-page")))
{
midori_panel_set_current_page (MIDORI_PANEL (browser->panel),
GPOINTER_TO_INT (last_page));
g_object_set_data (G_OBJECT (browser), "last-page", NULL);
}
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
browser->alloc_timeout = g_timeout_add_full (G_PRIORITY_LOW, 5000,
(GSourceFunc)midori_browser_alloc_timeout, browser, NULL);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
}
Implement MidoriApp singleton and improve multiple window support The new singleton holds the shared settings and trash. It is further more used to keep track of all open windows and quits when the last window was closed. It also watches the focus in case you need something like a "current" browser.
2008-05-22 22:17:10 +00:00
static void
midori_browser_destroy_cb (MidoriBrowser* browser)
{
Don't use the deprecated GTK_IN_DESTRUCTION flag As a workaround, the browser now sets its own flag.
2010-10-04 21:05:21 +00:00
g_object_set_data (G_OBJECT (browser), "midori-browser-destroyed", (void*)1);
Remove any left timeouts if the browser is destroyed
2009-02-24 21:59:18 +00:00
if (G_UNLIKELY (browser->panel_timeout))
g_source_remove (browser->panel_timeout);
if (G_UNLIKELY (browser->alloc_timeout))
g_source_remove (browser->alloc_timeout);
Remove panel pages implicitly as viewables are destroyed For this to work smoothly, from now on the browser destroys the panel eary, as it does with the tabs, and the panel in turn destroys its pages early.
2009-01-20 21:17:04 +00:00
/* Destroy panel first, so panels don't need special care */
gtk_widget_destroy (browser->panel);
/* Destroy tabs second, so child widgets don't need special care */
Disarm built-in notebook reorder key bindings The keys are confusing if triggered accidentally.
2011-03-07 02:38:17 +00:00
g_signal_handlers_disconnect_by_func (browser->notebook,
midori_browser_notebook_reorder_tab_cb,
NULL);
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
g_signal_handlers_disconnect_by_func (browser->notebook,
Set a timeout on notebook size updates
2011-12-09 19:59:32 +00:00
midori_browser_notebook_size_allocate_cb,
browser);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_container_foreach (GTK_CONTAINER (browser->notebook),
Use 'midori' icon and update icon cache in waf
2008-05-31 12:20:36 +00:00
(GtkCallback) gtk_widget_destroy, NULL);
Implement MidoriApp singleton and improve multiple window support The new singleton holds the shared settings and trash. It is further more used to keep track of all open windows and quits when the last window was closed. It also watches the focus in case you need something like a "current" browser.
2008-05-22 22:17:10 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static const gchar* ui_markup =
Reindent ui_markup definition in MidoriBrowser
2010-04-04 18:59:58 +00:00
"<ui>"
"<menubar>"
"<menu action='File'>"
"<menuitem action='WindowNew'/>"
"<menuitem action='TabNew'/>"
"<menuitem action='PrivateBrowsing'/>"
"<separator/>"
"<menuitem action='Open'/>"
"<separator/>"
"<menuitem action='SaveAs'/>"
"<menuitem action='AddSpeedDial'/>"
"<menuitem action='AddDesktopShortcut'/>"
"<separator/>"
"<menuitem action='TabClose'/>"
"<menuitem action='WindowClose'/>"
"<separator/>"
"<menuitem action='Print'/>"
Remove "Bookmarks" action from the menubar
2010-07-04 09:14:30 +00:00
"<menuitem action='BookmarksImport'/>"
"<menuitem action='BookmarksExport'/>"
Reindent ui_markup definition in MidoriBrowser
2010-04-04 18:59:58 +00:00
"<separator/>"
"<menuitem action='Quit'/>"
"</menu>"
"<menu action='Edit'>"
"<menuitem action='Undo'/>"
"<menuitem action='Redo'/>"
"<separator/>"
"<menuitem action='Cut'/>"
"<menuitem action='Copy'/>"
"<menuitem action='Paste'/>"
"<menuitem action='Delete'/>"
"<separator/>"
"<menuitem action='SelectAll'/>"
"<separator/>"
"<menuitem action='Find'/>"
"<menuitem action='FindNext'/>"
#ifndef G_OS_WIN32
"<separator/>"
"<menuitem action='Preferences'/>"
#endif
"</menu>"
"<menu action='View'>"
"<menu action='Toolbars'>"
"<menuitem action='Menubar'/>"
"<menuitem action='Navigationbar'/>"
"<menuitem action='Bookmarkbar'/>"
"<menuitem action='Statusbar'/>"
"</menu>"
"<menuitem action='Panel'/>"
"<separator/>"
"<menuitem action='Stop'/>"
"<menuitem action='Reload'/>"
"<separator/>"
"<menuitem action='ZoomIn'/>"
"<menuitem action='ZoomOut'/>"
"<menuitem action='ZoomNormal'/>"
"<separator/>"
"<menu action='Encoding'>"
"<menuitem action='EncodingAutomatic'/>"
"<menuitem action='EncodingChinese'/>"
"<menuitem action='EncodingJapanese'/>"
"<menuitem action='EncodingKorean'/>"
"<menuitem action='EncodingRussian'/>"
"<menuitem action='EncodingUnicode'/>"
"<menuitem action='EncodingWestern'/>"
"<menuitem action='EncodingCustom'/>"
"</menu>"
"<menuitem action='SourceView'/>"
"<menuitem action='Fullscreen'/>"
"</menu>"
"<menu action='Go'>"
"<menuitem action='Back'/>"
"<menuitem action='Forward'/>"
"<menuitem action='Previous'/>"
"<menuitem action='Next'/>"
"<menuitem action='Homepage'/>"
"<menuitem action='Location'/>"
"<menuitem action='Search'/>"
"<menuitem action='Trash'/>"
"</menu>"
Re-implement 'Bookmarks' menubar and toolbar button
2010-09-14 20:12:55 +00:00
"<menuitem action='Bookmarks'/>"
Reindent ui_markup definition in MidoriBrowser
2010-04-04 18:59:58 +00:00
"<menuitem action='Tools'/>"
"<menuitem action='Window'/>"
"<menu action='Help'>"
"<menuitem action='HelpFAQ'/>"
"<menuitem action='HelpBugs'/>"
"<separator/>"
"<menuitem action='About'/>"
"</menu>"
/* For accelerators to work all actions need to be used
*somewhere* in the UI definition */
"<menu action='Dummy'>"
Allow re-ordering tabs with Ctrl+Shift+PageUp/PageDown
2011-03-02 17:03:55 +00:00
"<menuitem action='TabMoveBackward'/>"
"<menuitem action='TabMoveForward'/>"
Reindent ui_markup definition in MidoriBrowser
2010-04-04 18:59:58 +00:00
"<menuitem action='ScrollLeft'/>"
"<menuitem action='ScrollDown'/>"
"<menuitem action='ScrollUp'/>"
"<menuitem action='ScrollRight'/>"
"<menuitem action='FindPrevious'/>"
"<menuitem action='BookmarkAdd'/>"
"<menuitem action='BookmarkFolderAdd'/>"
"<menuitem action='ManageSearchEngines'/>"
"<menuitem action='ClearPrivateData'/>"
"<menuitem action='TabPrevious'/>"
"<menuitem action='TabNext'/>"
"<menuitem action='TabCurrent'/>"
Cycle between location and paned widgets with F6
2011-04-26 20:57:13 +00:00
"<menuitem action='NextView'/>"
Implement minimize, duplicate and close other as actions This allows keyboard shortcuts to be assigned to these operations.
2010-07-08 21:08:18 +00:00
"<menuitem action='TabMinimize'/>"
"<menuitem action='TabDuplicate'/>"
"<menuitem action='TabCloseOther'/>"
Reindent ui_markup definition in MidoriBrowser
2010-04-04 18:59:58 +00:00
"<menuitem action='LastSession'/>"
"<menuitem action='UndoTabClose'/>"
"<menuitem action='TrashEmpty'/>"
"<menuitem action='Preferences'/>"
Add InspectPage action to dummies to make hotkey work
2010-10-05 19:12:08 +00:00
"<menuitem action='InspectPage'/>"
Uncached reload action, default Ctrl+Shift+R
2011-02-02 00:55:32 +00:00
"<menuitem action='ReloadUncached'/>"
Support caret browsing toggle with F7 Users who need the feature can't be expected to change a hidden preference. The same hotkey is supported by Firefox and Epiphany.
2011-04-30 10:07:12 +00:00
"<menuitem action='CaretBrowsing'/>"
Reindent ui_markup definition in MidoriBrowser
2010-04-04 18:59:58 +00:00
"</menu>"
"</menubar>"
"<toolbar name='toolbar_navigation'>"
"</toolbar>"
"</ui>";
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Use 'midori' icon and update icon cache in waf
2008-05-31 12:20:36 +00:00
static void
Add Midori and news-feed icons, improve waf scripts Add small, optimized application icons and an all new news-feed icon including optimized versions. The build scripts are updated, and the data folder renamed to icons. Plus the wscript_build is improved. Of course, Midori now tests the icon theme for news-feed and uses it.
2008-07-27 05:39:39 +00:00
midori_browser_realize_cb (GtkStyle* style,
MidoriBrowser* browser)
Use 'midori' icon and update icon cache in waf
2008-05-31 12:20:36 +00:00
{
Add Midori and news-feed icons, improve waf scripts Add small, optimized application icons and an all new news-feed icon including optimized versions. The build scripts are updated, and the data folder renamed to icons. Plus the wscript_build is improved. Of course, Midori now tests the icon theme for news-feed and uses it.
2008-07-27 05:39:39 +00:00
GdkScreen* screen;
GtkIconTheme* icon_theme;
Enable Zoom and Fullscreen with hardware keys on Hildon
2009-11-29 14:09:00 +00:00
#ifdef HAVE_HILDON_2_2
/* hildon_gtk_window_enable_zoom_keys */
guint32 set = 1;
Use accessors for window and allocation of a widget
2010-10-18 20:42:10 +00:00
gdk_property_change (gtk_widget_get_window (GTK_WIDGET (browser)),
Enable Zoom and Fullscreen with hardware keys on Hildon
2009-11-29 14:09:00 +00:00
gdk_atom_intern ("_HILDON_ZOOM_KEY_ATOM", FALSE),
gdk_x11_xatom_to_atom (XA_INTEGER),
32, GDK_PROP_MODE_REPLACE,
(const guchar *) &set, 1);
#endif
Add Midori and news-feed icons, improve waf scripts Add small, optimized application icons and an all new news-feed icon including optimized versions. The build scripts are updated, and the data folder renamed to icons. Plus the wscript_build is improved. Of course, Midori now tests the icon theme for news-feed and uses it.
2008-07-27 05:39:39 +00:00
screen = gtk_widget_get_screen (GTK_WIDGET (browser));
Use 'midori' icon and update icon cache in waf
2008-05-31 12:20:36 +00:00
if (screen)
{
Add Midori and news-feed icons, improve waf scripts Add small, optimized application icons and an all new news-feed icon including optimized versions. The build scripts are updated, and the data folder renamed to icons. Plus the wscript_build is improved. Of course, Midori now tests the icon theme for news-feed and uses it.
2008-07-27 05:39:39 +00:00
icon_theme = gtk_icon_theme_get_for_screen (screen);
Use 'midori' icon and update icon cache in waf
2008-05-31 12:20:36 +00:00
if (gtk_icon_theme_has_icon (icon_theme, "midori"))
gtk_window_set_icon_name (GTK_WINDOW (browser), "midori");
else
gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser");
}
}
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
static void
midori_browser_new_history_item (MidoriBrowser* browser,
Properly create proxy item and cleanup history agregation
2010-07-21 19:28:45 +00:00
KatzeItem* item)
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
{
time_t now;
Store the 'day' of history items to reduce even more calls to localtime By storing the timestamp of the day in the database we can significantly reduce the calls to localtime, which should result in a noticible speedup. We are changing the database format. For the convenience of the user the code automatically converts from the old format.
2009-01-23 21:38:39 +00:00
gint64 day;
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
sqlite3* db;
Switch to prepared statements when adding/ updating history
2010-02-04 18:13:16 +00:00
static sqlite3_stmt* stmt = NULL;
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
Uri property is mandatory for history operations
2010-07-22 13:28:18 +00:00
g_return_if_fail (katze_item_get_uri (item) != NULL);
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
now = time (NULL);
Properly create proxy item and cleanup history agregation
2010-07-21 19:28:45 +00:00
katze_item_set_added (item, now);
Store the 'day' of history items to reduce even more calls to localtime By storing the timestamp of the day in the database we can significantly reduce the calls to localtime, which should result in a noticible speedup. We are changing the database format. For the convenience of the user the code automatically converts from the old format.
2009-01-23 21:38:39 +00:00
day = sokoke_time_t_to_julian (&now);
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
Store visited pages in the history again
2010-02-03 21:12:19 +00:00
db = g_object_get_data (G_OBJECT (browser->history), "db");
Issue warning if adding to history fails
2010-12-24 15:44:49 +00:00
g_return_if_fail (db != NULL);
Switch to prepared statements when adding/ updating history
2010-02-04 18:13:16 +00:00
if (!stmt)
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
{
Switch to prepared statements when adding/ updating history
2010-02-04 18:13:16 +00:00
const gchar* sqlcmd;
sqlcmd = "INSERT INTO history (uri, title, date, day) VALUES (?,?,?,?)";
sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL);
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
}
Properly create proxy item and cleanup history agregation
2010-07-21 19:28:45 +00:00
sqlite3_bind_text (stmt, 1, katze_item_get_uri (item), -1, 0);
sqlite3_bind_text (stmt, 2, katze_item_get_name (item), -1, 0);
sqlite3_bind_int64 (stmt, 3, katze_item_get_added (item));
Switch to prepared statements when adding/ updating history
2010-02-04 18:13:16 +00:00
sqlite3_bind_int64 (stmt, 4, day);
if (sqlite3_step (stmt) != SQLITE_DONE)
g_printerr (_("Failed to insert new history item: %s\n"),
sqlite3_errmsg (db));
sqlite3_reset (stmt);
sqlite3_clear_bindings (stmt);
Use KatzeArray* to signal new items to MidoriHistory
2010-07-30 23:42:14 +00:00
/* FIXME: Workaround for the lack of a database interface */
katze_array_add_item (browser->history, item);
katze_array_remove_item (browser->history, item);
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
}
Revamp clearing of the history
2008-12-21 18:21:04 +00:00
static void
midori_browser_set_history (MidoriBrowser* browser,
KatzeArray* history)
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
{
Revamp clearing of the history
2008-12-21 18:21:04 +00:00
if (browser->history == history)
return;
if (history)
g_object_ref (history);
katze_object_assign (browser->history, history);
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
Implement Last Visited Pages menu and toolbar item We use the name of history folders now to store dates instead of the token. This makes it possible to show history in an action.
2009-03-07 13:00:14 +00:00
if (!history)
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
return;
Let the browser assign 'history' to the location action We implement a 'history' property which makes it possible to actually insert our history array into the location action and move the insertion code into the action.
2009-06-01 03:14:36 +00:00
g_object_set (_action_by_name (browser, "Location"), "history",
browser->history, NULL);
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
}
Bind Alt + Number to switching to the according tab from 1 to 0
2009-06-12 00:02:55 +00:00
static void
midori_browser_accel_switch_tab_activate_cb (GtkAccelGroup* accel_group,
GObject* acceleratable,
guint keyval,
GdkModifierType modifiers)
{
GtkAccelGroupEntry* entry;
if ((entry = gtk_accel_group_query (accel_group, keyval, modifiers, NULL)))
{
gint n;
MidoriBrowser* browser;
GtkWidget* view;
Alt+9 and Alt+0 should always go to the last tab
2011-02-26 15:23:56 +00:00
/* Switch to n-th tab. 9 and 0 go to the last tab. */
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
n = keyval - GDK_KEY_0;
Bind Alt + Number to switching to the according tab from 1 to 0
2009-06-12 00:02:55 +00:00
browser = g_object_get_data (G_OBJECT (accel_group), "midori-browser");
if ((view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook),
Alt+9 and Alt+0 should always go to the last tab
2011-02-26 15:23:56 +00:00
n < 9 ? n - 1 : -1)))
Bind Alt + Number to switching to the according tab from 1 to 0
2009-06-12 00:02:55 +00:00
midori_browser_set_current_tab (browser, view);
}
}
Implement and optimize for portrait mode support for Fremantle Listen to accelerometer movement. Hide tool items in portrait mode. Omit Homepage and View Source from app menu. Include Compact Add, View Source and Fullscreen in context menu. Hide buttons in portrait mode in preferences.
2009-11-27 22:42:07 +00:00
#ifdef HAVE_HILDON_2_2
static void
midori_browser_set_portrait_mode (MidoriBrowser* browser,
gboolean portrait)
{
if (portrait)
hildon_gtk_window_set_portrait_flags (GTK_WINDOW (browser),
HILDON_PORTRAIT_MODE_REQUEST);
else
hildon_gtk_window_set_portrait_flags (GTK_WINDOW (browser),
~HILDON_PORTRAIT_MODE_REQUEST);
Replace Bookmarks with Tools in the Hildon toolbar layout
2009-11-28 18:50:56 +00:00
_action_set_visible (browser, "Tools", !portrait);
Implement and optimize for portrait mode support for Fremantle Listen to accelerometer movement. Hide tool items in portrait mode. Omit Homepage and View Source from app menu. Include Compact Add, View Source and Fullscreen in context menu. Hide buttons in portrait mode in preferences.
2009-11-27 22:42:07 +00:00
_action_set_visible (browser, "CompactAdd", !portrait);
_action_set_visible (browser, "Back", !portrait);
_action_set_visible (browser, "SourceView", !portrait);
_action_set_visible (browser, "Fullscreen", !portrait);
}
static DBusHandlerResult
midori_browser_mce_filter_cb (DBusConnection* connection,
DBusMessage* message,
gpointer data)
{
if (dbus_message_is_signal (message, MCE_SIGNAL_IF, MCE_DEVICE_ORIENTATION_SIG))
{
DBusError error;
char *rotation, *stand, *face;
int x, y, z;
dbus_error_init (&error);
if (dbus_message_get_args (message,
&error,
DBUS_TYPE_STRING, &rotation,
DBUS_TYPE_STRING, &stand,
DBUS_TYPE_STRING, &face,
DBUS_TYPE_INT32, &x,
DBUS_TYPE_INT32, &y,
DBUS_TYPE_INT32, &z, DBUS_TYPE_INVALID))
{
gboolean portrait = !strcmp (rotation, MCE_ORIENTATION_PORTRAIT);
midori_browser_set_portrait_mode (MIDORI_BROWSER (data), portrait);
}
else
{
g_warning ("%s: %s\n", error.name, error.message);
dbus_error_free (&error);
}
}
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
#endif
Manually building actions is a huge speedup
2011-12-08 01:55:25 +00:00
static void
midori_browser_add_actions (MidoriBrowser* browser)
{
/* 0,053 versus 0,002 compared to gtk_action_group_add_ API */
guint i;
GSList* group = NULL;
for (i = 0; i < G_N_ELEMENTS (entries); i++)
{
GtkActionEntry entry = entries[i];
GtkAction* action = gtk_action_new (entry.name,
_(entry.label), _(entry.tooltip), entry.stock_id);
if (entry.callback)
g_signal_connect (action, "activate", entry.callback, browser);
gtk_action_group_add_action_with_accel (browser->action_group,
GTK_ACTION (action), entry.accelerator);
}
for (i = 0; i < G_N_ELEMENTS (toggle_entries); i++)
{
GtkToggleActionEntry entry = toggle_entries[i];
GtkToggleAction* action = gtk_toggle_action_new (entry.name,
_(entry.label), _(entry.tooltip), entry.stock_id);
if (entry.is_active)
gtk_toggle_action_set_active (action, TRUE);
if (entry.callback)
g_signal_connect (action, "activate", entry.callback, browser);
gtk_action_group_add_action_with_accel (browser->action_group,
GTK_ACTION (action), entry.accelerator);
}
for (i = 0; i < G_N_ELEMENTS (encoding_entries); i++)
{
GtkRadioActionEntry entry = encoding_entries[i];
GtkRadioAction* action = gtk_radio_action_new (entry.name,
_(entry.label), _(entry.tooltip), entry.stock_id, entry.value);
if (i == 0)
{
group = gtk_radio_action_get_group (action);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
g_signal_connect (action, "changed",
G_CALLBACK (_action_view_encoding_activate), browser);
}
else
{
gtk_radio_action_set_group (action, group);
group = gtk_radio_action_get_group (action);
}
gtk_action_group_add_action_with_accel (browser->action_group,
GTK_ACTION (action), entry.accelerator);
}
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
midori_browser_init (MidoriBrowser* browser)
{
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
GtkWidget* vbox;
GtkUIManager* ui_manager;
Bind Alt + Number to switching to the according tab from 1 to 0
2009-06-12 00:02:55 +00:00
GtkAccelGroup* accel_group;
guint i;
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
GClosure* accel_closure;
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
GError* error;
GtkAction* action;
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
#if !HAVE_HILDON
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
GtkWidget* menuitem;
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
#endif
Implement middle click on Back, Forward, Homepage menu items
2009-05-07 20:41:39 +00:00
GtkWidget* homepage;
GtkWidget* back;
GtkWidget* forward;
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
GtkSettings* gtk_settings;
GtkWidget* hpaned;
GtkWidget* vpaned;
Remove inner border between scrollbars and window border
2008-07-23 12:42:27 +00:00
GtkRcStyle* rcstyle;
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
GtkWidget* scrolled;
Remove inner border between scrollbars and window border
2008-07-23 12:42:27 +00:00
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
browser->settings = midori_web_settings_new ();
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
browser->proxy_array = katze_array_new (KATZE_TYPE_ARRAY);
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
browser->bookmarks = NULL;
browser->trash = NULL;
browser->search_engines = NULL;
Use speeddial property to store GKeyFile with speeddial entries
2011-03-14 19:07:18 +00:00
browser->speeddial = NULL;
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Setup the window metrics */
Use 'midori' icon and update icon cache in waf
2008-05-31 12:20:36 +00:00
g_signal_connect (browser, "realize",
G_CALLBACK (midori_browser_realize_cb), browser);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_signal_connect (browser, "window-state-event",
G_CALLBACK (midori_browser_window_state_event_cb), NULL);
g_signal_connect (browser, "size-allocate",
G_CALLBACK (midori_browser_size_allocate_cb), NULL);
Implement MidoriApp singleton and improve multiple window support The new singleton holds the shared settings and trash. It is further more used to keep track of all open windows and quits when the last window was closed. It also watches the focus in case you need something like a "current" browser.
2008-05-22 22:17:10 +00:00
g_signal_connect (browser, "destroy",
G_CALLBACK (midori_browser_destroy_cb), NULL);
Set "browser" role on browser windows
2009-07-16 12:00:47 +00:00
gtk_window_set_role (GTK_WINDOW (browser), "browser");
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_window_set_icon_name (GTK_WINDOW (browser), "web-browser");
Allow hiding of titlebar when window is maximized
2012-01-03 19:05:27 +00:00
#if GTK_CHECK_VERSION (3, 4, 0)
gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (browser), TRUE);
#endif
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
vbox = gtk_vbox_new (FALSE, 0);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_container_add (GTK_CONTAINER (browser), vbox);
gtk_widget_show (vbox);
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Let us see some ui manager magic */
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
browser->action_group = gtk_action_group_new ("Browser");
gtk_action_group_set_translation_domain (browser->action_group, GETTEXT_PACKAGE);
Manually building actions is a huge speedup
2011-12-08 01:55:25 +00:00
midori_browser_add_actions (browser);
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
ui_manager = gtk_ui_manager_new ();
Bind Alt + Number to switching to the according tab from 1 to 0
2009-06-12 00:02:55 +00:00
accel_group = gtk_ui_manager_get_accel_group (ui_manager);
gtk_window_add_accel_group (GTK_WINDOW (browser), accel_group);
Create actions that can have hotkeys for all panel items Bookmarks have Ctrl+B by default.
2009-10-31 22:47:44 +00:00
gtk_ui_manager_insert_action_group (ui_manager, browser->action_group, 0);
Bind Alt + Number to switching to the according tab from 1 to 0
2009-06-12 00:02:55 +00:00
g_object_set_data (G_OBJECT (accel_group), "midori-browser", browser);
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
accel_closure = g_cclosure_new (G_CALLBACK (
midori_browser_accel_switch_tab_activate_cb), browser, NULL);
Bind Alt + Number to switching to the according tab from 1 to 0
2009-06-12 00:02:55 +00:00
for (i = 0; i < 10; i++)
{
gchar* accel_path = g_strdup_printf ("<Manual>/Browser/SwitchTab%d", i);
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
gtk_accel_map_add_entry (accel_path, GDK_KEY_0 + i, GDK_MOD1_MASK);
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
gtk_accel_group_connect_by_path (accel_group, accel_path, accel_closure);
Bind Alt + Number to switching to the according tab from 1 to 0
2009-06-12 00:02:55 +00:00
g_free (accel_path);
}
Interpret Ctrl(+Shift)+Tab as tab switching It's not advertised as a shortcut but provided for users on laptops lacking PageUp and PageDown, or using multiple browsers. Fixes: https://bugs.launchpad.net/bugs/766421
2011-04-26 21:05:53 +00:00
g_closure_unref (accel_closure);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
error = NULL;
Show news feeds in a menu if the icon is clicked
2008-08-02 02:25:05 +00:00
if (!gtk_ui_manager_add_ui_from_string (ui_manager, ui_markup, -1, &error))
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
g_message ("User interface couldn't be created: %s", error->message);
g_error_free (error);
}
Keep otherwise unused actions in a Dummy This is needed for accelerators to work even if the according actions are not part of the permanent UI description.
2008-10-12 19:44:00 +00:00
/* Hide the 'Dummy' which only holds otherwise unused actions */
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
_action_set_visible (browser, "Dummy", FALSE);
Keep otherwise unused actions in a Dummy This is needed for accelerators to work even if the according actions are not part of the permanent UI description.
2008-10-12 19:44:00 +00:00
Support separators in navigationbar and bookmarkbar
2009-01-28 23:56:07 +00:00
action = g_object_new (KATZE_TYPE_SEPARATOR_ACTION,
"name", "Separator",
"label", _("_Separator"),
NULL);
gtk_action_group_add_action (browser->action_group, action);
g_object_unref (action);
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
action = g_object_new (MIDORI_TYPE_LOCATION_ACTION,
"name", "Location",
"label", _("_Location..."),
Bring back New Window and Location icons and adjust the menu items The previous attempt to reduce the amount of icons in menues had the side effect of removing them from toolbar items. So the icons are back and we adjust the menu items manually.
2009-07-25 20:53:09 +00:00
"stock-id", GTK_STOCK_JUMP_TO,
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
"tooltip", _("Open a particular location"),
NULL);
g_object_connect (action,
"signal::activate",
_action_location_activate, browser,
Replace Go button with a Go icon inside the address entry The icon is displayed by default, takes a little less space, but replaced with the news feed icon as appropriate. If the address entry is focussed, the Go icon takes precedence. We also introduce the focus-in signal on MidoriLocationAction.
2009-06-13 01:45:11 +00:00
"signal::focus-in",
_action_location_focus_in, browser,
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
"signal::focus-out",
_action_location_focus_out, browser,
"signal::reset-uri",
_action_location_reset_uri, browser,
"signal::submit-uri",
_action_location_submit_uri, browser,
Pass news feed icon clicks to the feed panel The secondary-icon-released signal of the location action returns a boolean now so a callback can indicate that it handled it. So if the feed panel is active, it adds feeds to the panel and suppresses the default action. A possible crash when disabling the panel and clicking the icon afterwards is fixed by adding a missing signal disconnection.
2009-08-16 21:35:29 +00:00
"signal-after::secondary-icon-released",
Implement MidoriLocationAction This is a step towards customziable toolbars. The new action actually provides a nicer API than MidoriLocationEntry does right now. Later we should improve the widget itself as well. There are still to resolve regressions: - The location icon tends to be initially empty - The news feed icon doesn't show up - Tab icons sometimes load and reset again afterwards
2008-08-14 23:57:48 +00:00
_action_location_secondary_icon_released, browser,
NULL);
gtk_action_group_add_action_with_accel (browser->action_group,
action, "<Ctrl>L");
g_object_unref (action);
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
action = g_object_new (MIDORI_TYPE_SEARCH_ACTION,
"name", "Search",
"label", _("_Web Search..."),
"stock-id", GTK_STOCK_FIND,
"tooltip", _("Run a web search"),
NULL);
g_object_connect (action,
"signal::activate",
_action_search_activate, browser,
"signal::submit",
_action_search_submit, browser,
"signal::focus-out",
_action_search_focus_out, browser,
"signal::notify::current-item",
_action_search_notify_current_item, browser,
Allow marking a search engine as Default engine The default engine is used when search terms are typed in the address entry without tokens and for the 'Search the Web' item in the selection context menu. The 'Location entry search' is removed from the preferences. The setting 'location-entry-search' remains functional however.
2009-04-18 20:41:37 +00:00
"signal::notify::default-item",
_action_search_notify_default_item, browser,
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
NULL);
gtk_action_group_add_action_with_accel (browser->action_group,
action, "<Ctrl>K");
g_object_unref (action);
Split location and search entry Fixes: https://bugs.launchpad.net/midori/+bug/738422
2011-11-15 22:43:14 +00:00
action = g_object_new (MIDORI_TYPE_PANED_ACTION,
"name", "LocationSearch",
NULL);
gtk_action_group_add_action (browser->action_group, action);
g_object_unref (action);
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
"name", "Trash",
"stock-id", STOCK_USER_TRASH,
"tooltip", _("Reopen a previously closed tab or window"),
NULL);
g_object_connect (action,
"signal::populate-popup",
_action_trash_populate_popup, browser,
Extend menu item middle click to support trash and history
2009-05-05 21:22:39 +00:00
"signal::activate-item-alt",
_action_trash_activate_item_alt, browser,
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
NULL);
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
gtk_action_group_add_action_with_accel (browser->action_group, action, "");
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
g_object_unref (action);
Re-implement 'Bookmarks' menubar and toolbar button
2010-09-14 20:12:55 +00:00
action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
"name", "Bookmarks",
"label", _("_Bookmarks"),
"stock-id", STOCK_BOOKMARKS,
"tooltip", _("Show the saved bookmarks"),
"array", browser->proxy_array, /* Use a non-empty array here */
NULL);
g_object_connect (action,
"signal::populate-folder",
_action_bookmarks_populate_folder, browser,
"signal::activate-item-alt",
midori_bookmarkbar_activate_item_alt, browser,
NULL);
gtk_action_group_add_action_with_accel (browser->action_group, action, "");
g_object_unref (action);
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
"name", "Tools",
"label", _("_Tools"),
Use Preferences icon for Tools if used in the toolbar
2009-12-02 23:06:53 +00:00
"stock-id", GTK_STOCK_PREFERENCES,
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
"array", katze_array_new (KATZE_TYPE_ITEM),
NULL);
g_object_connect (action,
"signal::populate-popup",
_action_tools_populate_popup, browser,
Implement activate-item(-alt) for bookmarkbar mouse buttons
2010-07-19 19:39:57 +00:00
"signal::activate-item-alt",
midori_bookmarkbar_activate_item_alt, browser,
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
NULL);
gtk_action_group_add_action (browser->action_group, action);
g_object_unref (action);
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
"name", "Window",
Improve strings for the sake of better localization
2008-11-02 23:17:43 +00:00
"label", _("_Window"),
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
"stock-id", GTK_STOCK_INDEX,
"tooltip", _("Show a list of all open tabs"),
"array", browser->proxy_array,
NULL);
g_object_connect (action,
"signal::populate-popup",
_action_window_populate_popup, browser,
Make KatzeArrayAction::activate-item-alt fully autonomous Implementing the signal and returning TRUE makes it unneeded to implement activate-item as well now.
2010-09-16 19:18:14 +00:00
"signal::activate-item-alt",
_action_window_activate_item_alt, browser,
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
NULL);
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
gtk_action_group_add_action_with_accel (browser->action_group, action, "");
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
g_object_unref (action);
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
"name", "CompactMenu",
"label", _("_Menu"),
Use Properties stock icon for the compact menu
2010-11-21 15:52:10 +00:00
"stock-id", GTK_STOCK_PROPERTIES,
Use "Menu" without underscore as compact Menu tooltip
2009-06-27 21:56:01 +00:00
"tooltip", _("Menu"),
Add a compact menu to the navigationbar if the menubar is hidden The compact menu item provides functionality that is not accessible via the context menu. The item is added when the menubar is hidden and removed when the menubar is shown. It can be removed via right-click > Remove.
2009-06-22 19:47:42 +00:00
"array", katze_array_new (KATZE_TYPE_ITEM),
NULL);
g_object_connect (action,
"signal::populate-popup",
_action_compact_menu_populate_popup, browser,
NULL);
gtk_action_group_add_action (browser->action_group, action);
g_object_unref (action);
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Create the menubar */
Build an invisible menubar in Hildon to retain hotkey functionality GtkUIManager requires existing proxies for hotkeys to work at all.
2009-11-29 14:00:15 +00:00
browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar");
gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0);
gtk_widget_hide (browser->menubar);
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
#if HAVE_HILDON
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
_action_set_visible (browser, "Menubar", FALSE);
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
#if HILDON_CHECK_VERSION (2, 2, 0)
browser->menubar = hildon_app_menu_new ();
_action_compact_menu_populate_popup (NULL, browser->menubar, browser);
hildon_window_set_app_menu (HILDON_WINDOW (browser), HILDON_APP_MENU (browser->menubar));
#else
Use compact menu as the main menu when building for Maemo
2009-10-12 11:02:39 +00:00
browser->menubar = gtk_menu_new ();
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
_action_compact_menu_populate_popup (NULL, browser->menubar, browser);
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
hildon_window_set_menu (HILDON_WINDOW (browser), GTK_MENU (browser->menubar));
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
#endif
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
hildon_program_add_window (hildon_program_get_instance (),
HILDON_WINDOW (browser));
#else
g_signal_connect (browser->menubar, "button-press-event",
Implement middle click on Back, Forward, Homepage menu items
2009-05-07 20:41:39 +00:00
G_CALLBACK (midori_browser_menu_button_press_event_cb), browser);
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
menuitem = gtk_menu_item_new ();
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_widget_show (menuitem);
Show progress in location entry if statusbar is hidden
2008-08-31 00:45:13 +00:00
browser->throbber = katze_throbber_new ();
gtk_widget_show (browser->throbber);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_container_add (GTK_CONTAINER (menuitem), browser->throbber);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_widget_set_sensitive (menuitem, FALSE);
Define H and V widget functions for GTK+3 The horizontal variants are gone from the API. gtk_rc_get_theme_dir has been deprecated, there is no replacement so we do the equivalent lookup. Right-aligned menu items are deprecated. For now defining gtk_widget_render_icon and gtk_widget_set_size_request gets rid of warnings.
2011-11-28 22:37:34 +00:00
#if GTK_CHECK_VERSION (3, 2, 0)
/* FIXME: Doesn't work */
gtk_widget_set_hexpand (menuitem, TRUE);
gtk_widget_set_halign (menuitem, GTK_ALIGN_END);
#else
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE);
Define H and V widget functions for GTK+3 The horizontal variants are gone from the API. gtk_rc_get_theme_dir has been deprecated, there is no replacement so we do the equivalent lookup. Right-aligned menu items are deprecated. For now defining gtk_widget_render_icon and gtk_widget_set_size_request gets rid of warnings.
2011-11-28 22:37:34 +00:00
#endif
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_menu_shell_append (GTK_MENU_SHELL (browser->menubar), menuitem);
Implement app menu and progress indicator on Hildon 2.2
2009-10-13 21:56:02 +00:00
#endif
Implement MidoriBrowser::populate-tool-menu and adjust extensions Extensions used to look for the menu and append items manually. In order to show Tools in the Compact menu a proper signal is needed. Adblock, Shortcuts and Toolbar Editor are ported to the new API.
2009-07-24 21:55:57 +00:00
browser->menu_tools = gtk_menu_new ();
Allow hiding the menubar and showing it again
2008-10-12 20:09:49 +00:00
Bring back New Window and Location icons and adjust the menu items The previous attempt to reduce the amount of icons in menues had the side effect of removing them from toolbar items. So the icons are back and we adjust the menu items manually.
2009-07-25 20:53:09 +00:00
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (
gtk_ui_manager_get_widget (ui_manager, "/menubar/File/WindowNew")), NULL);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (
gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Location")), NULL);
Implement middle click on Back, Forward, Homepage menu items
2009-05-07 20:41:39 +00:00
homepage = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Homepage");
g_signal_connect (homepage, "button-press-event",
G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser);
back = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Back");
g_signal_connect (back, "button-press-event",
G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser);
forward = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Forward");
Implement Next and Previous buttons and add to the default toolbar
2009-12-26 22:12:36 +00:00
g_signal_connect (forward, "button-press-event",
G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser);
forward = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Previous");
g_signal_connect (forward, "button-press-event",
G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser);
forward = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Next");
Implement middle click on Back, Forward, Homepage menu items
2009-05-07 20:41:39 +00:00
g_signal_connect (forward, "button-press-event",
G_CALLBACK (midori_browser_menu_item_middle_click_event_cb), browser);
Implement Encoding menu
2009-02-27 22:09:36 +00:00
_action_set_sensitive (browser, "EncodingCustom", FALSE);
Hide permanently unavailable actions instead of disabling them
2009-10-31 21:43:58 +00:00
_action_set_visible (browser, "LastSession", FALSE);
Implement 'Add Shortcut to desktop' for X11
2010-12-12 00:26:08 +00:00
#if !HAVE_HILDON && !defined (GDK_WINDOWING_X11)
Hide permanently unavailable actions instead of disabling them
2009-10-31 21:43:58 +00:00
_action_set_visible (browser, "AddDesktopShortcut", FALSE);
Implement 'Add Shortcut to desktop' for X11
2010-12-12 00:26:08 +00:00
#endif
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Toggle bookmark actions depending on if we have any So app mode without bookmarks won't show menu items for adding or managing bookmarks.
2010-10-24 17:23:16 +00:00
_action_set_visible (browser, "Bookmarks", browser->bookmarks != NULL);
_action_set_visible (browser, "BookmarkAdd", browser->bookmarks != NULL);
_action_set_visible (browser, "BookmarksImport", browser->bookmarks != NULL);
_action_set_visible (browser, "BookmarksExport", browser->bookmarks != NULL);
_action_set_visible (browser, "Bookmarkbar", browser->bookmarks != NULL);
Only show Trash and UndoTabClose if there is a trash
2010-10-31 20:27:47 +00:00
_action_set_visible (browser, "Trash", browser->trash != NULL);
_action_set_visible (browser, "UndoTabClose", browser->trash != NULL);
Toggle bookmark actions depending on if we have any So app mode without bookmarks won't show menu items for adding or managing bookmarks.
2010-10-24 17:23:16 +00:00
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Create the navigationbar */
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
browser->navigationbar = gtk_ui_manager_get_widget (
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
ui_manager, "/toolbar_navigation");
Allow building with GTK+3 Fixes: https://bugs.launchpad.net/midori/+bug/861351
2011-10-01 13:12:04 +00:00
#if GTK_CHECK_VERSION(3,0,0)
gtk_style_context_add_class(gtk_widget_get_style_context(browser->navigationbar), "primary-toolbar");
#endif
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
/* FIXME: Settings should be connected with screen changes */
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser));
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
if (gtk_settings)
g_signal_connect (gtk_settings, "notify::gtk-toolbar-style",
G_CALLBACK (midori_browser_navigationbar_notify_style_cb), browser);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->navigationbar), TRUE);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_object_set (_action_by_name (browser, "Back"), "is-important", TRUE, NULL);
Hide the navigationbar initially We need to make sure that the navigationbar is initially invisible, so we hide it expressly. Otherwise it shows up regardless of the show-navigationbar setting.
2008-08-10 16:28:08 +00:00
gtk_widget_hide (browser->navigationbar);
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
g_signal_connect (browser->navigationbar, "popup-context-menu",
G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser);
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
#if HAVE_HILDON
hildon_window_add_toolbar (HILDON_WINDOW (browser),
GTK_TOOLBAR (browser->navigationbar));
#else
gtk_box_pack_start (GTK_BOX (vbox), browser->navigationbar, FALSE, FALSE, 0);
#endif
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Implement and optimize for portrait mode support for Fremantle Listen to accelerometer movement. Hide tool items in portrait mode. Omit Homepage and View Source from app menu. Include Compact Add, View Source and Fullscreen in context menu. Hide buttons in portrait mode in preferences.
2009-11-27 22:42:07 +00:00
#ifdef HAVE_HILDON_2_2
DBusConnection* system_bus = dbus_bus_get (DBUS_BUS_SYSTEM, NULL);
if (system_bus)
{
dbus_bus_add_match (system_bus, MCE_SIGNAL_MATCH, NULL);
dbus_connection_add_filter (system_bus,
midori_browser_mce_filter_cb, browser, NULL);
hildon_gtk_window_set_portrait_flags (GTK_WINDOW (browser),
HILDON_PORTRAIT_MODE_SUPPORT);
}
#endif
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Bookmarkbar */
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
browser->bookmarkbar = gtk_toolbar_new ();
Use secondary toolbar style for bookmarks bar Fixes: https://bugs.launchpad.net/midori/+bug/870854
2011-10-09 12:48:12 +00:00
#if GTK_CHECK_VERSION (3, 0, 0)
gtk_style_context_add_class (
gtk_widget_get_style_context (browser->bookmarkbar), "secondary-toolbar");
#endif
Add 2px space between tool buttons
2009-01-12 20:52:33 +00:00
gtk_widget_set_name (browser->bookmarkbar, "MidoriBookmarkbar");
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->bookmarkbar),
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
GTK_ICON_SIZE_MENU);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar),
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
GTK_TOOLBAR_BOTH_HORIZ);
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
#if HAVE_HILDON
hildon_window_add_toolbar (HILDON_WINDOW (browser),
GTK_TOOLBAR (browser->bookmarkbar));
#else
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_box_pack_start (GTK_BOX (vbox), browser->bookmarkbar, FALSE, FALSE, 0);
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
#endif
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
g_signal_connect (browser->bookmarkbar, "popup-context-menu",
G_CALLBACK (midori_browser_toolbar_popup_context_menu_cb), browser);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Create the panel */
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
hpaned = gtk_hpaned_new ();
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_signal_connect (hpaned, "notify::position",
G_CALLBACK (midori_panel_notify_position_cb),
browser);
Cycle between location and paned widgets with F6
2011-04-26 20:57:13 +00:00
g_signal_connect (hpaned, "cycle-child-focus",
G_CALLBACK (midori_panel_cycle_child_focus_cb),
browser);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0);
gtk_widget_show (hpaned);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
browser->panel = g_object_new (MIDORI_TYPE_PANEL,
Create actions that can have hotkeys for all panel items Bookmarks have Ctrl+B by default.
2009-10-31 22:47:44 +00:00
"action-group", browser->action_group,
Add a button to change the alignment to the panel
2009-02-22 18:23:45 +00:00
NULL);
Implement Options menu via a button on the side panel The new button is visible on all panels and pops up a menu, which allows toggling the panel titles and the operating controls. A new signal "populate-option-menu" makes it extendible.
2009-07-26 20:00:10 +00:00
g_object_connect (browser->panel,
"signal::notify::page",
midori_panel_notify_page_cb, browser,
"signal::notify::show-titles",
midori_panel_notify_show_titles_cb, browser,
"signal::notify::right-aligned",
midori_panel_notify_right_aligned_cb, browser,
"signal::close",
midori_panel_close_cb, browser,
NULL);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
/* Notebook, containing all views */
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
vpaned = gtk_vpaned_new ();
Allow the panel to expand, to stop it from ever-growing in fullscreen
2010-01-11 20:47:37 +00:00
gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, FALSE);
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
gtk_widget_show (vpaned);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
browser->notebook = gtk_notebook_new ();
Remove inner border between scrollbars and window border
2008-07-23 12:42:27 +00:00
/* Remove the inner border between scrollbars and the window border */
rcstyle = gtk_rc_style_new ();
Don't touch the ythickness of the notebook This allows the active tab to visually move above other tabs. The drawback is that it makes all tabs somewhat larger.
2009-04-12 19:57:20 +00:00
rcstyle->xthickness = 0;
Remove inner border between scrollbars and window border
2008-07-23 12:42:27 +00:00
gtk_widget_modify_style (browser->notebook, rcstyle);
g_object_unref (rcstyle);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_notebook_set_scrollable (GTK_NOTEBOOK (browser->notebook), TRUE);
Implement web inspector attaching/ detaching properly
2009-12-23 15:46:14 +00:00
gtk_paned_pack1 (GTK_PANED (vpaned), browser->notebook, FALSE, FALSE);
Remember text typed in the location when switching tabs The API of the location action is adjusted so that any typed text can be retrieved, distinguished from a confirmed URI.
2009-10-04 00:32:50 +00:00
g_signal_connect (browser->notebook, "switch-page",
G_CALLBACK (gtk_notebook_switch_page_cb),
browser);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
g_signal_connect_after (browser->notebook, "switch-page",
Remember text typed in the location when switching tabs The API of the location action is adjusted so that any typed text can be retrieved, distinguished from a confirmed URI.
2009-10-04 00:32:50 +00:00
G_CALLBACK (gtk_notebook_switch_page_after_cb),
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
browser);
Save tab reordering to the session
2009-03-24 22:54:37 +00:00
g_signal_connect (browser->notebook, "page-reordered",
G_CALLBACK (midori_browser_notebook_page_reordered_cb),
browser);
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
g_signal_connect (browser->notebook, "size-allocate",
Set a timeout on notebook size updates
2011-12-09 19:59:32 +00:00
G_CALLBACK (midori_browser_notebook_size_allocate_cb),
Grow and shrink tabs dynamically to available space Fixes: https://bugs.launchpad.net/midori/+bug/735993
2011-03-23 19:41:40 +00:00
browser);
Don't open tabs when double- or middle-clicking notebook arrows We need to connect after the button-press-event to make sure that GtkNotebook blocks the signal appropriately. Double click is disabled for now since we can't figure out if it was a click on a button or not.
2009-06-25 21:49:41 +00:00
g_signal_connect_after (browser->notebook, "button-press-event",
G_CALLBACK (midori_browser_notebook_button_press_event_after_cb),
Open new tabs by double or middle clicking on the tabbar
2009-01-13 19:50:17 +00:00
browser);
Disarm built-in notebook reorder key bindings The keys are confusing if triggered accidentally.
2011-03-07 02:38:17 +00:00
g_signal_connect (browser->notebook, "reorder-tab",
G_CALLBACK (midori_browser_notebook_reorder_tab_cb), NULL);
Support creating new windows by dragging tabs outside
2011-08-18 16:06:34 +00:00
g_signal_connect (browser->notebook, "create-window",
G_CALLBACK (midori_browser_notebook_create_window_cb), browser);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_widget_show (browser->notebook);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
/* Inspector container */
browser->inspector = gtk_vbox_new (FALSE, 0);
Implement web inspector attaching/ detaching properly
2009-12-23 15:46:14 +00:00
gtk_paned_pack2 (GTK_PANED (vpaned), browser->inspector, FALSE, FALSE);
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
Implement web inspector attaching/ detaching properly
2009-12-23 15:46:14 +00:00
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
Don't use GTK_WIDGET_SET_FLAGS in browser and panel
2010-10-04 19:36:26 +00:00
gtk_widget_set_can_focus (scrolled, TRUE);
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
GTK_SHADOW_ETCHED_IN);
Implement web inspector attaching/ detaching properly
2009-12-23 15:46:14 +00:00
gtk_box_pack_start (GTK_BOX (browser->inspector), scrolled, TRUE, TRUE, 0);
browser->inspector_view = gtk_viewport_new (NULL, NULL);
Initial support for the Web Inspector
2008-11-01 18:15:58 +00:00
gtk_container_add (GTK_CONTAINER (scrolled), browser->inspector_view);
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Incremental findbar */
Refactor findbar into MidoriFindbar The findbar still depends on the browser for knowing when to search and to propagate focus. Behaviour did not change.
2010-06-20 18:13:39 +00:00
browser->find = g_object_new (MIDORI_TYPE_FINDBAR, NULL);
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
#if HAVE_HILDON
hildon_window_add_toolbar (HILDON_WINDOW (browser),
GTK_TOOLBAR (browser->find));
#else
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_box_pack_start (GTK_BOX (vbox), browser->find, FALSE, FALSE, 0);
Integrate Midori with Maemo, use a Hildon window and adjust the interface To make Midori play nicely with Maemo the menubar is now integrated, we have a service file, a specific toolbar layout, no statusbar and icon styles. The changes are applied if hildon is available, and can of course be manually enabled or disabled.
2009-01-27 01:57:40 +00:00
#endif
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* Statusbar */
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
browser->statusbar = gtk_statusbar_new ();
Use accessors for statusbar message area
2010-10-18 20:44:56 +00:00
#if GTK_CHECK_VERSION (2, 20, 0)
browser->statusbar_contents =
gtk_statusbar_get_message_area (GTK_STATUSBAR (browser->statusbar));
#else
Rearrange statusbar packing to keep themes happy
2009-10-27 22:55:17 +00:00
/* Rearrange the statusbar packing. This is necessariy to keep
themes happy while there is no support from GtkStatusbar. */
Use accessors for statusbar message area
2010-10-18 20:44:56 +00:00
forward = GTK_STATUSBAR (browser->statusbar)->label;
if (GTK_IS_BOX (gtk_widget_get_parent (forward)))
browser->statusbar_contents = gtk_widget_get_parent (forward);
Support new GtkStatusbar layout and the old layout
2009-11-17 17:51:38 +00:00
else
{
browser->statusbar_contents = gtk_hbox_new (FALSE, 4);
gtk_widget_show (browser->statusbar_contents);
g_object_ref (GTK_STATUSBAR (browser->statusbar)->label);
gtk_container_remove (
Use accessors for statusbar message area
2010-10-18 20:44:56 +00:00
GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame), forward);
Support new GtkStatusbar layout and the old layout
2009-11-17 17:51:38 +00:00
gtk_box_pack_start (GTK_BOX (browser->statusbar_contents),
Use accessors for statusbar message area
2010-10-18 20:44:56 +00:00
forward, TRUE, TRUE, 0);
g_object_unref (forward);
Support new GtkStatusbar layout and the old layout
2009-11-17 17:51:38 +00:00
gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame),
browser->statusbar_contents);
}
Use accessors for statusbar message area
2010-10-18 20:44:56 +00:00
#endif
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0);
Initial support for WebKitDownload At this point all downloads run automatically and appear in the statusbar. The destination folder can be chosen in the preferences. Download can be cancelled. The context menu works as well.
2009-03-19 17:28:50 +00:00
Refactor transferbar into MidoriTransferbar The transferbar is separated from the browser, albeit it is still created and filled from within the browser so it is not completely independent. The new class now keeps a list of TransferInfo items to keep track of transfers and queries the status from the download object. Destroying a button belonging to a transfer is connected to removing it from the list and cleaning up the info structure. Also the Clear button is updated from the destroy handler.
2010-06-17 18:03:11 +00:00
browser->transferbar = g_object_new (MIDORI_TYPE_TRANSFERBAR, NULL);
gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), browser->transferbar, FALSE, FALSE, 3);
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->transferbar), FALSE);
Initial support for WebKitDownload At this point all downloads run automatically and appear in the statusbar. The destination folder can be chosen in the preferences. Download can be cancelled. The context menu works as well.
2009-03-19 17:28:50 +00:00
gtk_widget_show (browser->transferbar);
Refactor transferbar into MidoriTransferbar The transferbar is separated from the browser, albeit it is still created and filled from within the browser so it is not completely independent. The new class now keeps a list of TransferInfo items to keep track of transfers and queries the status from the download object. Destroying a button belonging to a transfer is connected to removing it from the list and cleaning up the info structure. Also the Clear button is updated from the destroy handler.
2010-06-17 18:03:11 +00:00
Allow showing/ hiding the transferbar
2009-03-20 22:55:38 +00:00
g_signal_connect (browser->statusbar, "button-press-event",
Implement middle click on Back, Forward, Homepage menu items
2009-05-07 20:41:39 +00:00
G_CALLBACK (midori_browser_menu_button_press_event_cb), browser);
Initial support for WebKitDownload At this point all downloads run automatically and appear in the statusbar. The destination folder can be chosen in the preferences. Download can be cancelled. The context menu works as well.
2009-03-19 17:28:50 +00:00
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_object_unref (ui_manager);
}
Ensure REMOVE_TAB emission, don't alter session when destroying
2008-07-25 10:45:50 +00:00
static void
midori_browser_dispose (GObject* object)
{
MidoriBrowser* browser = MIDORI_BROWSER (object);
/* We are done, the session mustn't change anymore */
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
katze_object_assign (browser->proxy_array, NULL);
Disconnect settings and bookmarkbar when disposing
2010-07-29 13:03:18 +00:00
g_signal_handlers_disconnect_by_func (browser->settings,
midori_browser_settings_notify,
browser);
midori_browser_set_bookmarks (browser, NULL);
Ensure REMOVE_TAB emission, don't alter session when destroying
2008-07-25 10:45:50 +00:00
G_OBJECT_CLASS (midori_browser_parent_class)->dispose (object);
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
midori_browser_finalize (GObject* object)
{
MidoriBrowser* browser = MIDORI_BROWSER (object);
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
katze_assign (browser->statusbar_text, NULL);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Implement KatzeNet as a generic URI loader KatzeNet can from now on be used where URIs are handled and one would have used libSoup and/ or local file handling as appropriate, whereas KatzeNet does both. Since we are displaying icons in several places KatzeNet also provides an icon loader that saves us from doublicating even more code. All bookmarks and also history items have icons now, since KatzeNet makes that incredibly easy. Search engines are also using favicons now, and right now custom icons don't work, we still need to fix that. Note that only icons are cached, nothing else and the code is known to have a hidden, hard to reproduce crasher which may appear when an icon is newly loaded.
2008-10-23 22:09:12 +00:00
katze_object_assign (browser->settings, NULL);
katze_object_assign (browser->trash, NULL);
katze_object_assign (browser->search_engines, NULL);
katze_object_assign (browser->history, NULL);
Use speeddial property to store GKeyFile with speeddial entries
2011-03-14 19:07:18 +00:00
browser->speeddial = NULL;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Add News Aggregator preference The program set here is called if the user clicks on the news feed icon, with the address of the current website as argument. For example liferea-add-feed works like that.
2009-04-14 17:44:48 +00:00
katze_assign (browser->news_aggregator, NULL);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object);
}
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
static void
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
_midori_browser_set_toolbar_style (MidoriBrowser* browser,
MidoriToolbarStyle toolbar_style)
{
GtkToolbarStyle gtk_toolbar_style;
Implement "Small icons" toolbar style and preference
2009-11-17 17:49:14 +00:00
GtkIconSize icon_size;
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser));
Implement "Small icons" toolbar style and preference
2009-11-17 17:49:14 +00:00
g_object_get (gtk_settings, "gtk-toolbar-icon-size", &icon_size, NULL);
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings)
g_object_get (gtk_settings, "gtk-toolbar-style", &gtk_toolbar_style, NULL);
else
{
switch (toolbar_style)
{
Implement "Small icons" toolbar style and preference
2009-11-17 17:49:14 +00:00
case MIDORI_TOOLBAR_SMALL_ICONS:
icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR;
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
case MIDORI_TOOLBAR_ICONS:
gtk_toolbar_style = GTK_TOOLBAR_ICONS;
break;
case MIDORI_TOOLBAR_TEXT:
gtk_toolbar_style = GTK_TOOLBAR_TEXT;
break;
case MIDORI_TOOLBAR_BOTH:
gtk_toolbar_style = GTK_TOOLBAR_BOTH;
break;
case MIDORI_TOOLBAR_BOTH_HORIZ:
case MIDORI_TOOLBAR_DEFAULT:
gtk_toolbar_style = GTK_TOOLBAR_BOTH_HORIZ;
}
}
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_toolbar_set_style (GTK_TOOLBAR (browser->navigationbar),
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
gtk_toolbar_style);
Implement "Small icons" toolbar style and preference
2009-11-17 17:49:14 +00:00
gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar), icon_size);
Synchronize browser and panel toolbar style
2010-07-29 13:18:27 +00:00
midori_panel_set_toolbar_style (MIDORI_PANEL (browser->panel),
gtk_toolbar_style);
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
}
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
static gboolean
midori_browser_toolbar_item_button_press_event_cb (GtkWidget* toolitem,
GdkEventButton* event,
MidoriBrowser* browser)
{
Introduce MIDORI_EVENT_NEW_TAB and use it Fixes: https://bugs.launchpad.net/midori/+bug/797224 Fixes: https://bugs.launchpad.net/midori/+bug/797229
2011-09-28 15:45:37 +00:00
if (MIDORI_EVENT_NEW_TAB (event))
Implement middle-clicks on Back, Forward and Homepage tool buttons
2009-05-03 19:35:05 +00:00
{
GtkWidget* parent = gtk_widget_get_parent (toolitem);
Update uses of deprecated GTK+ macros and API
2010-04-02 16:54:29 +00:00
GtkAction* action = gtk_activatable_get_related_action (
GTK_ACTIVATABLE (parent));
Implement middle-clicks on Back, Forward and Homepage tool buttons
2009-05-03 19:35:05 +00:00
Fix middle click toolbar and menu actions. This fixes a regression where a middle click would no longer open 'Homepage', 'Next', 'Previous', 'Back' and 'Forward' in a new tab.
2011-08-02 18:30:09 +00:00
g_object_set_data (G_OBJECT (action),
"midori-middle-click",
GINT_TO_POINTER (1));
Merge _menu_middle_click_on_navigation_action with _action_navigation_activate
2010-06-25 15:30:59 +00:00
return _action_navigation_activate (action, browser);
Implement middle-clicks on Back, Forward and Homepage tool buttons
2009-05-03 19:35:05 +00:00
}
Introduce MIDORI_EVENT_CONTEXT_MENU in midori-platform.h The new header contains all state and event handling.
2011-09-21 21:03:00 +00:00
else if (MIDORI_EVENT_CONTEXT_MENU (event))
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
{
Implement a not yet functional menu for adding and removing tool items
2009-01-17 22:56:23 +00:00
midori_browser_toolbar_popup_context_menu_cb (
Refactor bookmarks panel into a separate panel widget
2009-01-31 03:09:35 +00:00
GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ?
Support separators in navigationbar and bookmarkbar
2009-01-28 23:56:07 +00:00
gtk_widget_get_parent (toolitem) : toolitem,
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
event->x, event->y, event->button, browser);
return TRUE;
}
return FALSE;
}
Save paned actions as separate toolbar items
2011-11-16 22:54:27 +00:00
static void
_midori_browser_search_item_allocate_cb (GtkWidget* widget,
GdkRectangle* allocation,
gpointer user_data)
{
MidoriBrowser* browser = MIDORI_BROWSER (user_data);
MidoriWebSettings* settings = browser->settings;
g_object_set (settings, "search-width", allocation->width, NULL);
}
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
static void
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
_midori_browser_set_toolbar_items (MidoriBrowser* browser,
const gchar* items)
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
{
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
gchar** names;
gchar** name;
GtkAction* action;
GtkWidget* toolitem;
Split location and search entry Fixes: https://bugs.launchpad.net/midori/+bug/738422
2011-11-15 22:43:14 +00:00
const char* token_location = g_intern_static_string ("Location");
const char* token_search = g_intern_static_string ("Search");
const char* token_dontcare = g_intern_static_string ("Dontcare");
const char* token_current = token_dontcare;
const char* token_last = token_dontcare;
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
gtk_container_foreach (GTK_CONTAINER (browser->navigationbar),
(GtkCallback)gtk_widget_destroy, NULL);
names = g_strsplit (items ? items : "", ",", 0);
name = names;
Split location and search entry Fixes: https://bugs.launchpad.net/midori/+bug/738422
2011-11-15 22:43:14 +00:00
for (; *name; ++name)
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
{
action = _action_by_name (browser, *name);
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
if (action && strstr (*name, "CompactMenu") == NULL)
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
{
Split location and search entry Fixes: https://bugs.launchpad.net/midori/+bug/738422
2011-11-15 22:43:14 +00:00
token_last = token_current;
/* Decide, what kind of token (item) we got now */
if (name && !g_strcmp0 (*name, "Location"))
token_current = token_location;
else if (name && !g_strcmp0 (*name, "Search"))
token_current = token_search;
else
token_current = token_dontcare;
if ((token_current == token_location || token_current == token_search) &&
(token_last == token_location || token_last == token_search))
{
GtkWidget* toolitem_first = gtk_action_create_tool_item (
_action_by_name (browser, token_last));
GtkWidget* toolitem_second = gtk_action_create_tool_item (
_action_by_name (browser, token_current));
MidoriPanedAction* paned_action = MIDORI_PANED_ACTION (
_action_by_name (browser, "LocationSearch"));
MidoriWebSettings* midori_settings = browser->settings;
midori_paned_action_set_child1 (paned_action, toolitem_first, token_last,
token_last == token_search ? FALSE : TRUE, TRUE);
midori_paned_action_set_child2 (paned_action, toolitem_second, token_current,
token_current == token_search ? FALSE : TRUE, TRUE);
Save paned actions as separate toolbar items
2011-11-16 22:54:27 +00:00
g_signal_connect (G_OBJECT (token_current == token_search ? toolitem_second : toolitem_first),
"size-allocate", G_CALLBACK (_midori_browser_search_item_allocate_cb), (gpointer) browser);
Split location and search entry Fixes: https://bugs.launchpad.net/midori/+bug/738422
2011-11-15 22:43:14 +00:00
gtk_widget_set_size_request (
token_last == token_search ? toolitem_first : toolitem_second,
katze_object_get_int ((gpointer) midori_settings,
"search-width"),
-1);
toolitem = gtk_action_create_tool_item (GTK_ACTION (paned_action));
token_current = token_dontcare;
token_last = token_dontcare;
}
else if (token_current == token_dontcare && token_last != token_dontcare)
{
/* There was a location or search item, but was not followed by
the other one, that form a couple */
gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar),
GTK_TOOL_ITEM (gtk_action_create_tool_item (
_action_by_name (browser, token_last))),
-1);
toolitem = gtk_action_create_tool_item (action);
}
else if (token_current != token_dontcare && token_last == token_dontcare)
continue;
else
toolitem = gtk_action_create_tool_item (action);
Support separators in navigationbar and bookmarkbar
2009-01-28 23:56:07 +00:00
if (gtk_bin_get_child (GTK_BIN (toolitem)))
g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)),
"button-press-event",
G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb),
browser);
else
{
gtk_tool_item_set_use_drag_window (GTK_TOOL_ITEM (toolitem), TRUE);
g_signal_connect (toolitem,
"button-press-event",
G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb),
browser);
}
Allow adding separators to the navigationbar
2008-12-17 21:17:36 +00:00
gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar),
GTK_TOOL_ITEM (toolitem), -1);
}
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
}
g_strfreev (names);
Split location and search entry Fixes: https://bugs.launchpad.net/midori/+bug/738422
2011-11-15 22:43:14 +00:00
/* There was a last item, which could have formed a couple, but
there is no item left, we add that last item to toolbar as is */
if (token_current != token_dontcare)
{
gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar),
GTK_TOOL_ITEM (gtk_action_create_tool_item (
_action_by_name (browser, token_current))), -1);
}
Unify toolbar rebuilding in _action_menubar_activate And merge _midori_browser_save_toolbar_items into it, which was already not used anywhere else. CompactMenu is now always skipped and automatically added if the menubar is hidden. So it can no longer be duplicated or appear in the toolbar editor. Fixes: https://bugs.launchpad.net/midori/+bug/903003
2011-12-13 22:58:23 +00:00
if (!katze_object_get_boolean (browser->settings, "show-menubar"))
{
toolitem = gtk_action_create_tool_item (
GTK_ACTION (_action_by_name (browser, "CompactMenu")));
gtk_toolbar_insert (GTK_TOOLBAR (browser->navigationbar),
GTK_TOOL_ITEM (toolitem), -1);
g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)),
"button-press-event",
G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb),
browser);
}
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
}
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
static void
_midori_browser_update_settings (MidoriBrowser* browser)
{
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
gboolean remember_last_window_size;
Remember the last window state, ie. whether Midori was maximized or minimized
2009-01-20 22:27:19 +00:00
MidoriWindowState last_window_state;
Remove all currently deprecated settings
2011-05-16 00:51:03 +00:00
gboolean compact_sidepanel;
Optionally open panels in standalone windows by default
2009-11-28 22:53:49 +00:00
gboolean right_align_sidepanel, open_panels_in_windows;
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
gint last_panel_position, last_panel_page;
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
gboolean show_menubar, show_bookmarkbar;
Mandatory transferbar and no implicit statusbar
2011-02-13 18:07:48 +00:00
gboolean show_panel;
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
MidoriToolbarStyle toolbar_style;
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
gchar* toolbar_items;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
gboolean close_buttons_on_tabs;
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
KatzeItem* item;
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
Address leaked strings and item references
2011-04-25 23:29:26 +00:00
g_free (browser->location_entry_search);
Add News Aggregator preference The program set here is called if the user clicks on the news feed icon, with the address of the current website as argument. For example liferea-add-feed works like that.
2009-04-14 17:44:48 +00:00
g_free (browser->news_aggregator);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
g_object_get (browser->settings,
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
"remember-last-window-size", &remember_last_window_size,
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
"last-window-width", &browser->last_window_width,
"last-window-height", &browser->last_window_height,
Remember the last window state, ie. whether Midori was maximized or minimized
2009-01-20 22:27:19 +00:00
"last-window-state", &last_window_state,
Add Compact sidepanel Preference
2008-10-21 22:01:01 +00:00
"compact-sidepanel", &compact_sidepanel,
Implement "right-align-sidepanel" to align the panel on the right
2009-02-22 02:51:10 +00:00
"right-align-sidepanel", &right_align_sidepanel,
Optionally open panels in standalone windows by default
2009-11-28 22:53:49 +00:00
"open-panels-in-windows", &open_panels_in_windows,
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
"last-panel-position", &last_panel_position,
"last-panel-page", &last_panel_page,
Allow hiding the menubar and showing it again
2008-10-12 20:09:49 +00:00
"show-menubar", &show_menubar,
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
"show-navigationbar", &browser->show_navigationbar,
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
"show-bookmarkbar", &show_bookmarkbar,
"show-panel", &show_panel,
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
"show-statusbar", &browser->show_statusbar,
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
"toolbar-style", &toolbar_style,
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
"toolbar-items", &toolbar_items,
Allow marking a search engine as Default engine The default engine is used when search terms are typed in the address entry without tokens and for the 'Search the Web' item in the selection context menu. The 'Location entry search' is removed from the preferences. The setting 'location-entry-search' remains functional however.
2009-04-18 20:41:37 +00:00
"location-entry-search", &browser->location_entry_search,
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
"close-buttons-on-tabs", &close_buttons_on_tabs,
Reduce the maximum days history is saved for to a number No need for a boolean flag, 0 days are just as good.
2009-11-14 17:29:29 +00:00
"maximum-history-age", &browser->maximum_history_age,
Add News Aggregator preference The program set here is called if the user clicks on the news feed icon, with the address of the current website as argument. For example liferea-add-feed works like that.
2009-04-14 17:44:48 +00:00
"news-aggregator", &browser->news_aggregator,
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
NULL);
Findbar should honor close-buttons-left value
2011-10-12 23:51:14 +00:00
midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find),
katze_object_get_boolean (browser->settings, "close-buttons-left"));
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
if (remember_last_window_size)
{
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
if (browser->last_window_width && browser->last_window_height)
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
gtk_window_set_default_size (GTK_WINDOW (browser),
Don't update the saved window size if it didn't actually change
2010-02-07 22:42:39 +00:00
browser->last_window_width, browser->last_window_height);
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
else
Determine default window size relative to monitor
2010-06-26 21:39:49 +00:00
{
GdkScreen* screen;
GdkRectangle monitor;
gint default_width, default_height;
screen = gtk_window_get_screen (GTK_WINDOW (browser));
gdk_screen_get_monitor_geometry (screen, 0, &monitor);
default_width = monitor.width / 1.7;
default_height = monitor.height / 1.7;
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
gtk_window_set_default_size (GTK_WINDOW (browser),
default_width, default_height);
Determine default window size relative to monitor
2010-06-26 21:39:49 +00:00
}
Remember the last window state, ie. whether Midori was maximized or minimized
2009-01-20 22:27:19 +00:00
switch (last_window_state)
{
case MIDORI_WINDOW_MINIMIZED:
gtk_window_iconify (GTK_WINDOW (browser));
break;
case MIDORI_WINDOW_MAXIMIZED:
gtk_window_maximize (GTK_WINDOW (browser));
break;
case MIDORI_WINDOW_FULLSCREEN:
gtk_window_fullscreen (GTK_WINDOW (browser));
break;
default:
;/* Do nothing. */
}
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
}
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
_midori_browser_set_toolbar_style (browser, toolbar_style);
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
_toggle_tabbar_smartly (browser, FALSE);
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
_midori_browser_set_toolbar_items (browser, toolbar_items);
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
if (browser->search_engines)
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
{
Rework MidoriWebList into KatzeList and KatzeArray
2008-08-25 23:19:38 +00:00
item = katze_array_get_nth_item (browser->search_engines,
Track selected search engine per window
2011-05-15 19:40:39 +00:00
browser->last_web_search);
Rename MidoriWebItem to KatzeItem
2008-08-23 16:32:53 +00:00
if (item)
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
midori_search_action_set_current_item (MIDORI_SEARCH_ACTION (
_action_by_name (browser, "Search")), item);
Allow marking a search engine as Default engine The default engine is used when search terms are typed in the address entry without tokens and for the 'Search the Web' item in the selection context menu. The 'Location entry search' is removed from the preferences. The setting 'location-entry-search' remains functional however.
2009-04-18 20:41:37 +00:00
Implement and use KATZE_ARRAY_FOREACH_ITEM Iterating an array by a GList is considerably faster than continuously retrieving items, however it is also a lot more complicated. So the new macro takes care of that and uses a new semi-private function to avoid copying the list. Note that the macro can't be nested, which basically isn't useful in practise anyway.
2010-09-11 21:39:51 +00:00
KATZE_ARRAY_FOREACH_ITEM (item, browser->search_engines)
Allow marking a search engine as Default engine The default engine is used when search terms are typed in the address entry without tokens and for the 'Search the Web' item in the selection context menu. The 'Location entry search' is removed from the preferences. The setting 'location-entry-search' remains functional however.
2009-04-18 20:41:37 +00:00
if (!g_strcmp0 (katze_item_get_uri (item), browser->location_entry_search))
{
midori_search_action_set_default_item (MIDORI_SEARCH_ACTION (
_action_by_name (browser, "Search")), item);
break;
}
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
}
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
Implement Options menu via a button on the side panel The new button is visible on all panels and pops up a menu, which allows toggling the panel titles and the operating controls. A new signal "populate-option-menu" makes it extendible.
2009-07-26 20:00:10 +00:00
g_object_set (browser->panel, "show-titles", !compact_sidepanel,
Optionally open panels in standalone windows by default
2009-11-28 22:53:49 +00:00
"right-aligned", right_align_sidepanel,
"open-panels-in-windows", open_panels_in_windows, NULL);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)),
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
last_panel_position);
Fix panel "page" notifications and save the last open panel
2009-06-22 22:25:09 +00:00
/* The browser may not yet be visible, which means that we can't set the
page. So we set it in midori_browser_size_allocate_cb */
Use gtk_widget_get_visible rather than GTK_WIDGET_VISIBLE
2010-04-02 16:38:56 +00:00
if (gtk_widget_get_visible (GTK_WIDGET (browser)))
Fix panel "page" notifications and save the last open panel
2009-06-22 22:25:09 +00:00
midori_panel_set_current_page (MIDORI_PANEL (browser->panel), last_panel_page);
else
g_object_set_data (G_OBJECT (browser), "last-page",
GINT_TO_POINTER (last_panel_page));
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
Allow hiding the menubar and showing it again
2008-10-12 20:09:49 +00:00
_action_set_active (browser, "Menubar", show_menubar);
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
_action_set_active (browser, "Navigationbar", browser->show_navigationbar);
Only show bookmarkbar if we have bookmarks at all
2010-10-31 20:27:22 +00:00
_action_set_active (browser, "Bookmarkbar", show_bookmarkbar
&& browser->bookmarks != NULL);
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
_action_set_active (browser, "Panel", show_panel);
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
_action_set_active (browser, "Statusbar", browser->show_statusbar);
Show fixed Homepage button in the bookmarkbar The homepage is essentially a special bookmark, and so it makes sense to have it in the bookmarkbar. It's hidden if the homepage is unset.
2009-07-17 02:28:53 +00:00
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
g_free (toolbar_items);
Remove old configuration logic entirely Almost all uses of the old system were superseded by the use of MidoriWebSettings now, the migration is almost finished.
2008-04-16 23:38:22 +00:00
}
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
static void
midori_browser_settings_notify (MidoriWebSettings* web_settings,
GParamSpec* pspec,
MidoriBrowser* browser)
{
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
const gchar* name;
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
GValue value = {0, };
Actually handle non web view tabs, and a View Source tab
2008-07-13 19:49:57 +00:00
name = g_intern_string (pspec->name);
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
g_value_init (&value, pspec->value_type);
Open all bookmarks in the current tab
2008-10-17 21:15:37 +00:00
g_object_get_property (G_OBJECT (web_settings), name, &value);
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
if (name == g_intern_string ("toolbar-style"))
_midori_browser_set_toolbar_style (browser, g_value_get_enum (&value));
Create navigationbar from a string of actions
2008-10-12 16:14:57 +00:00
else if (name == g_intern_string ("toolbar-items"))
_midori_browser_set_toolbar_items (browser, g_value_get_string (&value));
Add Compact sidepanel Preference
2008-10-21 22:01:01 +00:00
else if (name == g_intern_string ("compact-sidepanel"))
Protect panel property notifications and disconnect the callback Failure to do this could cause new windows to freeze and invalid pointer access after closing windows.
2009-08-09 13:07:09 +00:00
{
g_signal_handlers_block_by_func (browser->panel,
midori_panel_notify_show_titles_cb, browser);
Implement Options menu via a button on the side panel The new button is visible on all panels and pops up a menu, which allows toggling the panel titles and the operating controls. A new signal "populate-option-menu" makes it extendible.
2009-07-26 20:00:10 +00:00
g_object_set (browser->panel, "show-titles",
!g_value_get_boolean (&value), NULL);
Protect panel property notifications and disconnect the callback Failure to do this could cause new windows to freeze and invalid pointer access after closing windows.
2009-08-09 13:07:09 +00:00
g_signal_handlers_unblock_by_func (browser->panel,
midori_panel_notify_show_titles_cb, browser);
}
Optionally open panels in standalone windows by default
2009-11-28 22:53:49 +00:00
else if (name == g_intern_string ("open-panels-in-windows"))
g_object_set (browser->panel, "open-panels-in-windows",
g_value_get_boolean (&value), NULL);
Add Always Show Tabbar preference
2008-10-03 23:45:17 +00:00
else if (name == g_intern_string ("always-show-tabbar"))
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
_toggle_tabbar_smartly (browser, FALSE);
Ensure that the menubar/ compact button visibility follows settings When toggling the menubar it wouldn't always update all windows to the same state.
2009-11-12 22:56:04 +00:00
else if (name == g_intern_string ("show-menubar"))
Update toolbar menu items (actions) after changes Fixes: https://bugs.launchpad.net/midori/+bug/853023
2011-12-10 18:31:00 +00:00
{
Consistently use internal action toggling
2012-01-24 22:40:45 +00:00
_action_set_active (browser, "Menubar", g_value_get_boolean (&value));
Update toolbar menu items (actions) after changes Fixes: https://bugs.launchpad.net/midori/+bug/853023
2011-12-10 18:31:00 +00:00
}
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
else if (name == g_intern_string ("show-navigationbar"))
Update toolbar menu items (actions) after changes Fixes: https://bugs.launchpad.net/midori/+bug/853023
2011-12-10 18:31:00 +00:00
{
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
browser->show_navigationbar = g_value_get_boolean (&value);
Consistently use internal action toggling
2012-01-24 22:40:45 +00:00
_action_set_active (browser, "Navigationbar", g_value_get_boolean (&value));
Update toolbar menu items (actions) after changes Fixes: https://bugs.launchpad.net/midori/+bug/853023
2011-12-10 18:31:00 +00:00
}
else if (name == g_intern_string ("show-bookmarkbar"))
{
Consistently use internal action toggling
2012-01-24 22:40:45 +00:00
_action_set_active (browser, "Bookmarkbar", g_value_get_boolean (&value));
Update toolbar menu items (actions) after changes Fixes: https://bugs.launchpad.net/midori/+bug/853023
2011-12-10 18:31:00 +00:00
}
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
else if (name == g_intern_string ("show-statusbar"))
Update toolbar menu items (actions) after changes Fixes: https://bugs.launchpad.net/midori/+bug/853023
2011-12-10 18:31:00 +00:00
{
Check for settings and views more properly These improvements were assisted by a test case that is going to follow soon.
2009-02-28 13:05:01 +00:00
browser->show_statusbar = g_value_get_boolean (&value);
Consistently use internal action toggling
2012-01-24 22:40:45 +00:00
_action_set_active (browser, "Statusbar", g_value_get_boolean (&value));
Update toolbar menu items (actions) after changes Fixes: https://bugs.launchpad.net/midori/+bug/853023
2011-12-10 18:31:00 +00:00
}
Allow marking a search engine as Default engine The default engine is used when search terms are typed in the address entry without tokens and for the 'Search the Web' item in the selection context menu. The 'Location entry search' is removed from the preferences. The setting 'location-entry-search' remains functional however.
2009-04-18 20:41:37 +00:00
else if (name == g_intern_string ("location-entry-search"))
{
katze_assign (browser->location_entry_search, g_value_dup_string (&value));
}
Reduce the maximum days history is saved for to a number No need for a boolean flag, 0 days are just as good.
2009-11-14 17:29:29 +00:00
else if (name == g_intern_string ("maximum-history-age"))
maximum-history-age is integer, not boolean
2011-05-16 01:20:59 +00:00
browser->maximum_history_age = g_value_get_int (&value);
Add News Aggregator preference The program set here is called if the user clicks on the news feed icon, with the address of the current website as argument. For example liferea-add-feed works like that.
2009-04-14 17:44:48 +00:00
else if (name == g_intern_string ("news-aggregator"))
{
katze_assign (browser->news_aggregator, g_value_dup_string (&value));
}
Findbar should honor close-buttons-left value
2011-10-12 23:51:14 +00:00
else if (name == g_intern_string ("close-buttons-left"))
{
midori_findbar_set_close_button_left (MIDORI_FINDBAR (browser->find),
g_value_get_boolean (&value));
}
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
else if (!g_object_class_find_property (G_OBJECT_GET_CLASS (web_settings),
name))
Fix focus in location if starting up with a Blank page At the point of loading the first page the web view hasn't loaded anything, so we need to manually focus the Location if the page is blank. Incidentally midori_browser_activate_action can activate any action, so it will probably be much more useful in the future.
2008-04-25 19:31:57 +00:00
g_warning (_("Unexpected setting '%s'"), name);
Update interface and web featureswith preference changes. The toolbar style, small toolbar, New Tab, Web Search and Trash buttons are shown or hidden respectively as the preference values change. This is also an attempt at updating the web view's settings immediately. Although it seems to work, an ugly warning is emitted to the console on every change.
2008-04-22 20:19:24 +00:00
g_value_unset (&value);
}
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
static gboolean
midori_bookmarkbar_item_button_press_event_cb (GtkWidget* toolitem,
GdkEventButton* event,
MidoriBrowser* browser)
{
KatzeItem* item;
gint n;
item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem");
Introduce MIDORI_EVENT_NEW_TAB and use it Fixes: https://bugs.launchpad.net/midori/+bug/797224 Fixes: https://bugs.launchpad.net/midori/+bug/797229
2011-09-28 15:45:37 +00:00
if (MIDORI_EVENT_NEW_TAB (event))
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
{
Implement activate-item(-alt) for bookmarkbar mouse buttons
2010-07-19 19:39:57 +00:00
if (KATZE_ITEM_IS_BOOKMARK (item))
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
{
n = midori_browser_add_uri (browser, katze_item_get_uri (item));
Introduce midori_browser_set_current_page_smartly() as public API
2010-07-03 07:28:03 +00:00
midori_browser_set_current_page_smartly (browser, n);
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
return TRUE;
}
}
Introduce MIDORI_EVENT_CONTEXT_MENU in midori-platform.h The new header contains all state and event handling.
2011-09-21 21:03:00 +00:00
else if (MIDORI_EVENT_CONTEXT_MENU (event))
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
{
midori_browser_bookmark_popup (toolitem, NULL, item, browser);
return TRUE;
}
return FALSE;
}
static void
midori_bookmarkbar_insert_item (GtkWidget* toolbar,
KatzeItem* item)
{
MidoriBrowser* browser = midori_browser_get_for_widget (toolbar);
Implement activate-item(-alt) for bookmarkbar mouse buttons
2010-07-19 19:39:57 +00:00
GtkAction* action = _action_by_name (browser, "Tools");
GtkToolItem* toolitem = katze_array_action_create_tool_item_for (
KATZE_ARRAY_ACTION (action), item);
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
if (KATZE_IS_ITEM (item))
{
GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem));
g_object_set_data (G_OBJECT (child), "KatzeItem", item);
Connect right-click correctly on bookmarkbar items
2010-06-25 15:55:04 +00:00
g_signal_connect (child, "button-press-event",
G_CALLBACK (midori_bookmarkbar_item_button_press_event_cb),
browser);
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
}
else /* Separator */
gtk_tool_item_set_use_drag_window (toolitem, TRUE);
gtk_widget_show (GTK_WIDGET (toolitem));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
}
Use KatzeArray* to remove and monitor deleted bookmarks The panel and the bookmarkbar need to monitor the removal of bookmarks, and there can be multiple windows, so the database should only be used to remove in one central place.
2010-08-10 21:46:49 +00:00
static void
midori_bookmarkbar_remove_item_cb (KatzeArray* bookmarks,
KatzeItem* item,
MidoriBrowser* browser)
{
if (gtk_widget_get_visible (browser->bookmarkbar))
midori_bookmarkbar_populate (browser);
}
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
static void
midori_bookmarkbar_populate (MidoriBrowser* browser)
{
Start using new sqlite helper functions
2010-07-01 19:21:01 +00:00
KatzeArray* array;
KatzeItem* item;
Clear the bookmarkbar before populating and populate after editing
2010-07-19 18:55:59 +00:00
midori_bookmarkbar_clear (browser->bookmarkbar);
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
Don't hide homepage smartly, don't show it in bookmarkbar
2010-08-22 01:39:11 +00:00
/* Use a dummy to ensure height of the toolbar */
Dynamically create homepage button from action
2010-06-29 06:15:52 +00:00
gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar),
Don't hide homepage smartly, don't show it in bookmarkbar
2010-08-22 01:39:11 +00:00
gtk_separator_tool_item_new (), -1);
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
Introduce midori_array_query to unify bookmark queries This ensures querying is consistently quoted and ordered.
2011-11-22 23:23:41 +00:00
array = midori_array_query (browser->bookmarks,
"uri, title, desc, app, folder, toolbar", "toolbar = 1", NULL);
Start using new sqlite helper functions
2010-07-01 19:21:01 +00:00
if (!array)
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
{
_action_set_sensitive (browser, "BookmarkAdd", FALSE);
_action_set_sensitive (browser, "BookmarkFolderAdd", FALSE);
return;
}
Implement and use KATZE_ARRAY_FOREACH_ITEM Iterating an array by a GList is considerably faster than continuously retrieving items, however it is also a lot more complicated. So the new macro takes care of that and uses a new semi-private function to avoid copying the list. Note that the macro can't be nested, which basically isn't useful in practise anyway.
2010-09-11 21:39:51 +00:00
KATZE_ARRAY_FOREACH_ITEM (item, array)
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
{
Fix for folders in bookmarksbar
2010-07-01 19:42:54 +00:00
if (KATZE_ITEM_IS_BOOKMARK (item))
midori_bookmarkbar_insert_item (browser->bookmarkbar, item);
else
{
Introduce midori_array_query to unify bookmark queries This ensures querying is consistently quoted and ordered.
2011-11-22 23:23:41 +00:00
KatzeArray* subfolder = midori_array_query (browser->bookmarks,
"uri, title, desc, app", "folder = '%q' AND uri != ''", katze_item_get_name (item));
Fix for folders in bookmarksbar
2010-07-01 19:42:54 +00:00
katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item));
midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder));
}
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
}
_action_set_sensitive (browser, "BookmarkAdd", TRUE);
_action_set_sensitive (browser, "BookmarkFolderAdd", TRUE);
}
static void
midori_bookmarkbar_clear (GtkWidget* toolbar)
{
GList* children = gtk_container_get_children (GTK_CONTAINER (toolbar));
while (children != NULL)
{
gtk_widget_destroy (children->data);
children = g_list_next (children);
}
}
static void
midori_browser_show_bookmarkbar_notify_value_cb (MidoriWebSettings* settings,
GParamSpec* pspec,
MidoriBrowser* browser)
{
Address leaked strings and item references
2011-04-25 23:29:26 +00:00
if (!katze_object_get_boolean (browser->settings, "show-bookmarkbar"))
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
midori_bookmarkbar_clear (browser->bookmarkbar);
else
midori_bookmarkbar_populate (browser);
}
Clean up handling of bookmarks like the history before
2008-12-21 19:44:31 +00:00
static void
midori_browser_set_bookmarks (MidoriBrowser* browser,
KatzeArray* bookmarks)
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
{
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
MidoriWebSettings* settings;
Use KatzeArray* to remove and monitor deleted bookmarks The panel and the bookmarkbar need to monitor the removal of bookmarks, and there can be multiple windows, so the database should only be used to remove in one central place.
2010-08-10 21:46:49 +00:00
if (browser->bookmarks != NULL)
g_signal_handlers_disconnect_by_func (browser->bookmarks,
midori_bookmarkbar_remove_item_cb, browser);
Disconnect settings and bookmarkbar when disposing
2010-07-29 13:03:18 +00:00
settings = midori_browser_get_settings (browser);
g_signal_handlers_disconnect_by_func (settings,
midori_browser_show_bookmarkbar_notify_value_cb, browser);
katze_object_assign (browser->bookmarks, bookmarks);
Toggle bookmark actions depending on if we have any So app mode without bookmarks won't show menu items for adding or managing bookmarks.
2010-10-24 17:23:16 +00:00
_action_set_visible (browser, "Bookmarks", bookmarks != NULL);
if (bookmarks != NULL)
{
/* FIXME: Proxies aren't shown propely. Why? */
GSList* proxies = gtk_action_get_proxies (
_action_by_name (browser, "Bookmarks"));
for (; proxies; proxies = g_slist_next (proxies))
gtk_widget_show (proxies->data);
}
_action_set_visible (browser, "BookmarkAdd", bookmarks != NULL);
_action_set_visible (browser, "BookmarksImport", bookmarks != NULL);
_action_set_visible (browser, "BookmarksExport", bookmarks != NULL);
_action_set_visible (browser, "Bookmarkbar", bookmarks != NULL);
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
if (!bookmarks)
return;
Be sure to show bookmarkbar if enabled
2010-11-01 15:54:11 +00:00
if (katze_object_get_boolean (browser->settings, "show-bookmarkbar"))
_action_set_active (browser, "Bookmarkbar", TRUE);
Disconnect settings and bookmarkbar when disposing
2010-07-29 13:03:18 +00:00
g_object_ref (bookmarks);
Reimplement bookmarkbar with sqlite
2010-06-25 02:05:26 +00:00
g_signal_connect (settings, "notify::show-bookmarkbar",
G_CALLBACK (midori_browser_show_bookmarkbar_notify_value_cb), browser);
g_object_notify (G_OBJECT (settings), "show-bookmarkbar");
Use KatzeArray* to remove and monitor deleted bookmarks The panel and the bookmarkbar need to monitor the removal of bookmarks, and there can be multiple windows, so the database should only be used to remove in one central place.
2010-08-10 21:46:49 +00:00
g_signal_connect_after (bookmarks, "remove-item",
G_CALLBACK (midori_bookmarkbar_remove_item_cb), browser);
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
static void
midori_browser_set_property (GObject* object,
guint prop_id,
const GValue* value,
GParamSpec* pspec)
{
MidoriBrowser* browser = MIDORI_BROWSER (object);
Rename MidoriWebItem to KatzeItem
2008-08-23 16:32:53 +00:00
KatzeItem* item;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
switch (prop_id)
{
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
case PROP_URI:
Add an Open external pages in Preference
2008-10-20 06:50:16 +00:00
midori_browser_set_current_uri (browser, g_value_get_string (value));
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
break;
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
case PROP_TAB:
midori_browser_set_current_tab (browser, g_value_get_object (value));
break;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
case PROP_STATUSBAR_TEXT:
_midori_browser_set_statusbar_text (browser, g_value_get_string (value));
break;
case PROP_SETTINGS:
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
g_signal_handlers_disconnect_by_func (browser->settings,
midori_browser_settings_notify,
browser);
Share net between browser and views
2008-10-27 03:23:41 +00:00
katze_object_assign (browser->settings, g_value_dup_object (value));
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
if (!browser->settings)
browser->settings = midori_web_settings_new ();
_midori_browser_update_settings (browser);
g_signal_connect (browser->settings, "notify",
G_CALLBACK (midori_browser_settings_notify), browser);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_container_foreach (GTK_CONTAINER (browser->notebook),
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
(GtkCallback) midori_view_set_settings, browser->settings);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
break;
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
case PROP_BOOKMARKS:
Clean up handling of bookmarks like the history before
2008-12-21 19:44:31 +00:00
midori_browser_set_bookmarks (browser, g_value_get_object (value));
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
break;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
case PROP_TRASH:
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
/* FIXME: Disconnect handlers */
Share net between browser and views
2008-10-27 03:23:41 +00:00
katze_object_assign (browser->trash, g_value_dup_object (value));
Implement reverse ordering for use in Trash and RecentlyVisited actions
2009-12-05 20:33:19 +00:00
g_object_set (_action_by_name (browser, "Trash"),
"array", browser->trash, "reversed", TRUE,
NULL);
Only show Trash and UndoTabClose if there is a trash
2010-10-31 20:27:47 +00:00
_action_set_visible (browser, "Trash", browser->trash != NULL);
_action_set_visible (browser, "UndoTabClose", browser->trash != NULL);
Introduce MidoriWebList, second step of refactoring web search
2008-06-14 00:23:33 +00:00
/* FIXME: Connect to updates */
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
_midori_browser_update_actions (browser);
break;
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
case PROP_SEARCH_ENGINES:
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
{
Move around history loading in MidoriBrowser
2008-11-09 18:26:48 +00:00
/* FIXME: Disconnect handlers */
Share net between browser and views
2008-10-27 03:23:41 +00:00
katze_object_assign (browser->search_engines, g_value_dup_object (value));
Remove all currently deprecated settings
2011-05-16 00:51:03 +00:00
midori_location_action_set_search_engines (MIDORI_LOCATION_ACTION (
_action_by_name (browser, "Location")), browser->search_engines);
Implement the search widget as an action The most part of the search entry code is merely moved to the new action. We remove the original entry now, the action is all we need.
2008-10-05 21:25:02 +00:00
midori_search_action_set_search_engines (MIDORI_SEARCH_ACTION (
_action_by_name (browser, "Search")), browser->search_engines);
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
/* FIXME: Connect to updates */
Allow marking a search engine as Default engine The default engine is used when search terms are typed in the address entry without tokens and for the 'Search the Web' item in the selection context menu. The 'Location entry search' is removed from the preferences. The setting 'location-entry-search' remains functional however.
2009-04-18 20:41:37 +00:00
Only set search in the browser if we have any search engines This fixes the test case which broke when we made settings obligatory.
2009-11-21 05:36:35 +00:00
if (browser->search_engines)
{
Track selected search engine per window
2011-05-15 19:40:39 +00:00
g_object_get (browser->settings, "last-web-search", &browser->last_web_search, NULL);
item = katze_array_get_nth_item (browser->search_engines, browser->last_web_search);
Only set search in the browser if we have any search engines This fixes the test case which broke when we made settings obligatory.
2009-11-21 05:36:35 +00:00
midori_search_action_set_current_item (MIDORI_SEARCH_ACTION (
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
_action_by_name (browser, "Search")), item);
Only set search in the browser if we have any search engines This fixes the test case which broke when we made settings obligatory.
2009-11-21 05:36:35 +00:00
Implement and use KATZE_ARRAY_FOREACH_ITEM Iterating an array by a GList is considerably faster than continuously retrieving items, however it is also a lot more complicated. So the new macro takes care of that and uses a new semi-private function to avoid copying the list. Note that the macro can't be nested, which basically isn't useful in practise anyway.
2010-09-11 21:39:51 +00:00
KATZE_ARRAY_FOREACH_ITEM (item, browser->search_engines)
Only set search in the browser if we have any search engines This fixes the test case which broke when we made settings obligatory.
2009-11-21 05:36:35 +00:00
if (!g_strcmp0 (katze_item_get_uri (item), browser->location_entry_search))
{
midori_search_action_set_default_item (MIDORI_SEARCH_ACTION (
_action_by_name (browser, "Search")), item);
break;
}
}
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
break;
Omit instances of if (browser->settings)
2009-11-13 17:24:16 +00:00
}
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
case PROP_HISTORY:
Revamp clearing of the history
2008-12-21 18:21:04 +00:00
midori_browser_set_history (browser, g_value_get_object (value));
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
break;
Use speeddial property to store GKeyFile with speeddial entries
2011-03-14 19:07:18 +00:00
case PROP_SPEED_DIAL:
browser->speeddial = g_value_get_pointer (value);
break;
Implement show-tabs property in MidoriBrowser
2009-06-22 21:48:41 +00:00
case PROP_SHOW_TABS:
browser->show_tabs = g_value_get_boolean (value);
Teach _toggle_tabbar_smartly what fullscreen means And introduce midori_browser_is_fullscreen Related to: https://bugs.launchpad.net/midori/+bug/783675
2011-12-01 19:54:27 +00:00
_toggle_tabbar_smartly (browser, FALSE);
Implement show-tabs property in MidoriBrowser
2009-06-22 21:48:41 +00:00
break;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
midori_browser_get_property (GObject* object,
guint prop_id,
GValue* value,
GParamSpec* pspec)
{
MidoriBrowser* browser = MIDORI_BROWSER (object);
switch (prop_id)
{
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
case PROP_MENUBAR:
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
g_value_set_object (value, browser->menubar);
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
break;
case PROP_NAVIGATIONBAR:
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
g_value_set_object (value, browser->navigationbar);
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
break;
Expose browser notebook and panel as properties
2008-11-18 01:02:59 +00:00
case PROP_NOTEBOOK:
g_value_set_object (value, browser->notebook);
break;
case PROP_PANEL:
g_value_set_object (value, browser->panel);
break;
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
case PROP_URI:
g_value_set_string (value, midori_browser_get_current_uri (browser));
break;
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
case PROP_TAB:
g_value_set_object (value, midori_browser_get_current_tab (browser));
break;
Fix browser properties along with enabling the property test
2009-02-22 12:52:04 +00:00
case PROP_LOAD_STATUS:
{
GtkWidget* view = midori_browser_get_current_tab (browser);
if (view)
g_value_set_enum (value,
midori_view_get_load_status (MIDORI_VIEW (view)));
else
g_value_set_enum (value, MIDORI_LOAD_FINISHED);
break;
}
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
case PROP_STATUSBAR:
Rearrange statusbar packing to keep themes happy
2009-10-27 22:55:17 +00:00
g_value_set_object (value, browser->statusbar_contents);
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
break;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
case PROP_STATUSBAR_TEXT:
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
g_value_set_string (value, browser->statusbar_text);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
break;
case PROP_SETTINGS:
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
g_value_set_object (value, browser->settings);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
break;
Make bookmarks a property of browser and app This means we have removed the last remaining global variable.
2008-09-03 00:28:54 +00:00
case PROP_BOOKMARKS:
g_value_set_object (value, browser->bookmarks);
break;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
case PROP_TRASH:
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
g_value_set_object (value, browser->trash);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
break;
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
case PROP_SEARCH_ENGINES:
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
g_value_set_object (value, browser->search_engines);
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
break;
Implement navigation history backed by sqlite The implementation relies on KatzeArray for the most part and only does the storage with sqlite behind the scenes. The change includes a working History panel. Changes to the database are committed in realtime.
2008-10-07 00:19:33 +00:00
case PROP_HISTORY:
g_value_set_object (value, browser->history);
break;
Use speeddial property to store GKeyFile with speeddial entries
2011-03-14 19:07:18 +00:00
case PROP_SPEED_DIAL:
g_value_set_pointer (value, browser->speeddial);
break;
Implement show-tabs property in MidoriBrowser
2009-06-22 21:48:41 +00:00
case PROP_SHOW_TABS:
g_value_set_boolean (value, browser->show_tabs);
break;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
/**
* midori_browser_new:
*
* Creates a new browser widget.
*
Implement MidoriApp singleton and improve multiple window support The new singleton holds the shared settings and trash. It is further more used to keep track of all open windows and quits when the last window was closed. It also watches the focus in case you need something like a "current" browser.
2008-05-22 22:17:10 +00:00
* A browser is a window with a menubar, toolbars, a notebook, panels
* and a statusbar. You should mostly treat it as an opaque widget.
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
* Return value: a new #MidoriBrowser
**/
Implement MidoriApp singleton and improve multiple window support The new singleton holds the shared settings and trash. It is further more used to keep track of all open windows and quits when the last window was closed. It also watches the focus in case you need something like a "current" browser.
2008-05-22 22:17:10 +00:00
MidoriBrowser*
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
midori_browser_new (void)
{
MidoriBrowser* browser = g_object_new (MIDORI_TYPE_BROWSER,
NULL);
Implement MidoriApp singleton and improve multiple window support The new singleton holds the shared settings and trash. It is further more used to keep track of all open windows and quits when the last window was closed. It also watches the focus in case you need something like a "current" browser.
2008-05-22 22:17:10 +00:00
return browser;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
/**
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
* midori_browser_add_tab:
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
* @browser: a #MidoriBrowser
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* @widget: a view
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* Appends a view in the form of a new tab and creates an
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
* according item in the Window menu.
*
* Return value: the index of the new tab, or -1 in case of an error
**/
gint
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
midori_browser_add_tab (MidoriBrowser* browser,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1);
g_return_val_if_fail (GTK_IS_WIDGET (view), -1);
Initialize session in app/ private before adding URIs If the session is not prepared properly URIs loading of the first page(s) breaks. Also it is a good idea to sort out all settings before loading anything to begin with. You will now see "midori_load_soup_session was not called!" if any pages try to load before the session is prepared. Fixes: https://bugs.launchpad.net/midori/+bug/814268
2011-07-26 23:19:48 +00:00
if (!g_object_get_data (G_OBJECT (webkit_get_default_session ()),
"midori-session-initialized"))
g_critical ("midori_load_soup_session was not called!");
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
g_signal_emit (browser, signals[ADD_TAB], 0, view);
return gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
/**
* midori_browser_remove_tab:
* @browser: a #MidoriBrowser
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* @widget: a view
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* Removes an existing view from the browser,
* including an associated menu item.
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
**/
void
midori_browser_remove_tab (MidoriBrowser* browser,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
g_return_if_fail (MIDORI_IS_BROWSER (browser));
g_return_if_fail (GTK_IS_WIDGET (view));
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
g_signal_emit (browser, signals[REMOVE_TAB], 0, view);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
/**
* midori_browser_add_item:
* @browser: a #MidoriBrowser
* @item: an item
*
* Appends a new view as described by @item.
*
* Return value: the index of the new tab, or -1 in case of an error
**/
gint
midori_browser_add_item (MidoriBrowser* browser,
KatzeItem* item)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Always add blank pages without delay
2010-06-06 21:46:10 +00:00
const gchar* uri;
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view;
Preserve metadata from the saved session when loading At this point, metadata can be set and read from the proxy item of any view and expected to be found after a restart.
2009-07-18 14:41:13 +00:00
gint page;
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
g_return_val_if_fail (KATZE_IS_ITEM (item), -1);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Always add blank pages without delay
2010-06-06 21:46:10 +00:00
uri = katze_item_get_uri (item);
Handle 'append' as meta, neither object data nor argument This is more in line with 'dont-write-history' and 'delay'.
2011-12-07 22:15:04 +00:00
view = midori_view_new_with_item (item, browser->settings);
Replace midori_view_new_with_uri with _new_with_title The old function is actually being removed because it breaks monitoring of page loading. It was only used internally so far. Moreover a warning is now emitted when loading an URI before adding a view to a browser.
2011-01-01 19:05:34 +00:00
page = midori_browser_add_tab (browser, view);
Handle 'delay' without the pseudo pause: scheme Behavior change: Tabs won't remain delayed beyond the session. If some users rely on this, it will need discussion.
2011-12-07 22:08:11 +00:00
midori_view_set_uri (MIDORI_VIEW (view), uri);
Preserve metadata from the saved session when loading At this point, metadata can be set and read from the proxy item of any view and expected to be found after a restart.
2009-07-18 14:41:13 +00:00
return page;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
/**
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
* midori_browser_add_uri:
Fix background tabs, strings and new tab focus.
2008-04-18 00:40:53 +00:00
* @browser: a #MidoriBrowser
* @uri: an URI
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* Appends an uri in the form of a new view.
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* Return value: the index of the new view, or -1
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
**/
gint
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
midori_browser_add_uri (MidoriBrowser* browser,
const gchar* uri)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Avoid setting the same URI on the item given
2011-12-07 22:19:32 +00:00
KatzeItem* item;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1);
g_return_val_if_fail (uri != NULL, -1);
Avoid setting the same URI on the item given
2011-12-07 22:19:32 +00:00
item = katze_item_new ();
item->uri = g_strdup (uri);
return midori_browser_add_item (browser, item);
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Fix focus in location if starting up with a Blank page At the point of loading the first page the web view hasn't loaded anything, so we need to manually focus the Location if the page is blank. Incidentally midori_browser_activate_action can activate any action, so it will probably be much more useful in the future.
2008-04-25 19:31:57 +00:00
/**
* midori_browser_activate_action:
* @browser: a #MidoriBrowser
* @name: name of the action
*
* Activates the specified action.
**/
void
midori_browser_activate_action (MidoriBrowser* browser,
const gchar* name)
{
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
g_return_if_fail (MIDORI_IS_BROWSER (browser));
g_return_if_fail (name != NULL);
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
g_signal_emit (browser, signals[ACTIVATE_ACTION], 0, name);
Fix focus in location if starting up with a Blank page At the point of loading the first page the web view hasn't loaded anything, so we need to manually focus the Location if the page is blank. Incidentally midori_browser_activate_action can activate any action, so it will probably be much more useful in the future.
2008-04-25 19:31:57 +00:00
}
Add midori_browser_set_action_visible method
2010-10-13 21:22:54 +00:00
void
midori_browser_set_action_visible (MidoriBrowser* browser,
const gchar* name,
gboolean visible)
{
g_return_if_fail (MIDORI_IS_BROWSER (browser));
g_return_if_fail (name != NULL);
_action_set_visible (browser, name, visible);
midori_browser_set_action_visible should change sensitivity So in particular the panel is not only hidden from the menu but also inaccessible with the keyboard.
2011-03-13 21:15:14 +00:00
_action_set_sensitive (browser, name, visible);
Add midori_browser_set_action_visible method
2010-10-13 21:22:54 +00:00
}
Provide midori_browser_(un)block_action for extensions So extensions can override individual actions without hacks.
2011-04-30 10:17:55 +00:00
/**
* midori_browser_block_action:
* @browser: a #MidoriBrowser
* @name: the action to be blocked
*
* Blocks built-in behavior of the specified action without
* disabling it, which gives you a chance to connect your
* own signal handling.
* Call midori_browser_unblock_action() to undo the effect.
*
* Since: 0.3.4
**/
void
midori_browser_block_action (MidoriBrowser* browser,
GtkAction* action)
{
const gchar* name;
guint i;
g_return_if_fail (MIDORI_IS_BROWSER (browser));
g_return_if_fail (GTK_IS_ACTION (action));
name = gtk_action_get_name (action);
for (i = 0; i < entries_n; i++)
if (g_str_equal (entries[i].name, name))
{
g_signal_handlers_block_by_func (action, entries[i].callback, browser);
return;
}
g_critical ("%s: Action \"%s\" can't be blocked.", G_STRFUNC, name);
}
/**
* midori_browser_unblock_action:
* @browser: a #MidoriBrowser
* @name: the action to be unblocked
*
* Restores built-in behavior of the specified action after
* previously blocking it with midori_browser_block_action().
*
* Since: 0.3.4
**/
void
midori_browser_unblock_action (MidoriBrowser* browser,
GtkAction* action)
{
const gchar* name;
guint i;
g_return_if_fail (MIDORI_IS_BROWSER (browser));
g_return_if_fail (GTK_IS_ACTION (action));
name = gtk_action_get_name (action);
for (i = 0; i < entries_n; i++)
if (g_str_equal (entries[i].name, name))
{
g_signal_handlers_unblock_by_func (action, entries[i].callback, browser);
return;
}
g_critical ("%s: Action \"%s\" can't be unblocked.", G_STRFUNC, name);
}
Add function to obtain the action group of the browser
2009-02-28 03:15:16 +00:00
/**
* midori_browser_get_action_group:
* @browser: a #MidoriBrowser
*
* Retrieves the action group holding all actions used
* by the browser. It allows obtaining individual
* actions and adding new actions.
*
* Return value: the action group of the browser
*
* Since: 0.1.4
**/
GtkActionGroup*
midori_browser_get_action_group (MidoriBrowser* browser)
{
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
return browser->action_group;
}
Add an Open external pages in Preference
2008-10-20 06:50:16 +00:00
/**
* midori_browser_set_current_uri:
* @browser: a #MidoriBrowser
* @uri: an URI
*
* Loads the specified URI in the current view.
*
* If the current view is opaque, and cannot load
* new pages, it will automatically open a new tab.
**/
void
midori_browser_set_current_uri (MidoriBrowser* browser,
const gchar* uri)
{
GtkWidget* view;
g_return_if_fail (MIDORI_IS_BROWSER (browser));
Fix clipboard menu items and do some tidying
2008-11-23 00:44:40 +00:00
g_return_if_fail (uri != NULL);
Add an Open external pages in Preference
2008-10-20 06:50:16 +00:00
Fix browser properties along with enabling the property test
2009-02-22 12:52:04 +00:00
if ((view = midori_browser_get_current_tab (browser)))
midori_view_set_uri (MIDORI_VIEW (view), uri);
else
midori_browser_add_uri (browser, uri);
Add an Open external pages in Preference
2008-10-20 06:50:16 +00:00
}
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
/**
* midori_browser_get_current_uri:
* @browser: a #MidoriBrowser
*
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* Determines the URI loaded in the current view.
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
*
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* If there is no view present at all, %NULL is returned.
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
*
* Return value: the current URI, or %NULL
**/
const gchar*
midori_browser_get_current_uri (MidoriBrowser* browser)
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view;
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
Fix browser properties along with enabling the property test
2009-02-22 12:52:04 +00:00
if ((view = midori_browser_get_current_tab (browser)))
return midori_view_get_display_uri (MIDORI_VIEW (view));
return NULL;
Save the session whenever it changes, instead of on quit.
2008-07-23 18:17:13 +00:00
}
Attempt to fix handling of background and foreground tabs.
2008-04-24 22:20:43 +00:00
/**
* midori_browser_set_current_page:
* @browser: a #MidoriBrowser
* @n: the index of a page
*
* Switches to the page with the index @n.
*
* The widget will also grab the focus automatically.
**/
void
midori_browser_set_current_page (MidoriBrowser* browser,
gint n)
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view;
Don't try to set a non-existing page at startup And print a proper warning should this occur somewhere else later on.
2010-12-25 01:07:45 +00:00
g_return_if_fail (MIDORI_IS_BROWSER (browser));
Rebase browser_set_current_tab on _set_current_page The behavior should really match.
2011-12-09 20:11:01 +00:00
view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n);
g_return_if_fail (view != NULL);
Don't try to set a non-existing page at startup And print a proper warning should this occur somewhere else later on.
2010-12-25 01:07:45 +00:00
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
gtk_notebook_set_current_page (GTK_NOTEBOOK (browser->notebook), n);
Consistently focus the view, which propagates Rather than trying to determine and focus the web view from different places, the parent view should simply propagate focus by default. The child needs to be constructed implicitly if focus comes in early.
2010-05-06 20:27:29 +00:00
if (midori_view_is_blank (MIDORI_VIEW (view)))
Consistently use public API to activate actions
2012-01-24 22:32:16 +00:00
midori_browser_activate_action (browser, "Location");
Be sure to focus the web view rather than the scrolled widget
2009-10-12 11:05:43 +00:00
else
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
gtk_widget_grab_focus (view);
Rebase browser_set_current_tab on _set_current_page The behavior should really match.
2011-12-09 20:11:01 +00:00
g_object_freeze_notify (G_OBJECT (browser));
g_object_notify (G_OBJECT (browser), "uri");
g_object_notify (G_OBJECT (browser), "tab");
g_object_thaw_notify (G_OBJECT (browser));
Attempt to fix handling of background and foreground tabs.
2008-04-24 22:20:43 +00:00
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
/**
* midori_browser_get_current_page:
* @browser: a #MidoriBrowser
*
* Determines the currently selected page.
*
* If there is no page present at all, %NULL is returned.
*
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
* Return value: the selected page, or -1
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
**/
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
gint
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
midori_browser_get_current_page (MidoriBrowser* browser)
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
{
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1);
Simplify MidoriBrowser, remove Private
2008-06-19 18:39:00 +00:00
return gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook));
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
}
Add midori_browser_get_nth_tab to obtain a particular tab by index
2009-07-28 20:55:34 +00:00
/**
* midori_browser_get_nth_tab:
* @browser: a #MidoriBrowser
* @page: the index of a tab
*
* Retrieves the tab at the position @page.
*
* If there is no page present at all, %NULL is returned.
*
* Return value: the selected page, or -1
*
* Since: 0.1.9
**/
GtkWidget*
midori_browser_get_nth_tab (MidoriBrowser* browser,
gint page)
{
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
return gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), page);
}
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
/**
Rename midori_browser_get/set_current_tab to get/set_tab
2010-05-18 21:55:30 +00:00
* midori_browser_set_tab:
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
* @browser: a #MidoriBrowser
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* @view: a #GtkWidget
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
*
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* Switches to the page containing @view.
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
*
* The widget will also grab the focus automatically.
Rename midori_browser_get/set_current_tab to get/set_tab
2010-05-18 21:55:30 +00:00
*
* Since: 0.2.6
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
**/
void
midori_browser_set_current_tab (MidoriBrowser* browser,
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
GtkWidget* view)
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
gint n;
g_return_if_fail (MIDORI_IS_BROWSER (browser));
g_return_if_fail (GTK_IS_WIDGET (view));
n = gtk_notebook_page_num (GTK_NOTEBOOK (browser->notebook), view);
Rebase browser_set_current_tab on _set_current_page The behavior should really match.
2011-12-09 20:11:01 +00:00
midori_browser_set_current_page (browser, n);
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
}
/**
Rename midori_browser_get/set_current_tab to get/set_tab
2010-05-18 21:55:30 +00:00
* midori_browser_get_tab:
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
* @browser: a #MidoriBrowser
*
* Retrieves the currently selected tab.
*
* If there is no tab present at all, %NULL is returned.
*
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* See also midori_browser_get_current_page().
*
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
* Return value: the selected tab, or %NULL
Rename midori_browser_get/set_current_tab to get/set_tab
2010-05-18 21:55:30 +00:00
*
* Since: 0.2.6
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
**/
GtkWidget*
midori_browser_get_current_tab (MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
gint n;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
n = gtk_notebook_get_current_page (GTK_NOTEBOOK (browser->notebook));
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
if (n >= 0)
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
return gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), n);
First attempt at an extension interface.
2008-05-02 20:30:26 +00:00
else
return NULL;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Expose tabs in MidoriBrowser as GList
2010-04-25 16:58:28 +00:00
/**
* midori_browser_get_tabs:
* @browser: a #MidoriBrowser
*
* Retrieves the tabs as a list.
*
* Return value: a newly allocated #GList of #MidoriView
*
* Since: 0.2.5
**/
GList*
midori_browser_get_tabs (MidoriBrowser* browser)
{
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
return gtk_container_get_children (GTK_CONTAINER (browser->notebook));
}
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
/**
Implement midori_browser_get_proxy_items This supersedes midori_browser_get_proxy_array as a means to access the KatzeItem* items. The new name is clearer.
2010-04-25 16:20:19 +00:00
* midori_browser_get_proxy_items:
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
* @browser: a #MidoriBrowser
*
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
* Retrieves a proxy array representing the respective proxy items
* of the present views that can be used for session management.
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
Finish refactoring the toolbar to use only actions Finally the trash, which was the last item that needed to be implemented as an action, is an action, a KatzeArrayAction to be exact. This simplifies more code and also makes Window and RecentlyVisited generically implementable. Incidentally this change also fixes a bug where the browser tried to add a new tab when the last one was closed, even while destroying itself. Furthermore sokoke_image_menu_item_ellipsized and sokoke_widget_popup were promoted to Katze. We're still keeping the old functions for now.
2008-10-10 20:31:37 +00:00
* The array is updated automatically.
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
*
Ensure REMOVE_TAB emission, don't alter session when destroying
2008-07-25 10:45:50 +00:00
* Note: Calling this function doesn't add a reference and the browser
* may release its reference at some point.
*
Factor out katze_xbel_folder_from_data_dirs and _to_data
2008-09-03 22:35:15 +00:00
* Return value: the proxy #KatzeArray
Implement midori_browser_get_proxy_items This supersedes midori_browser_get_proxy_array as a means to access the KatzeItem* items. The new name is clearer.
2010-04-25 16:20:19 +00:00
*
* Since: 0.2.5
**/
KatzeArray*
midori_browser_get_proxy_items (MidoriBrowser* browser)
{
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
return browser->proxy_array;
}
/**
* midori_browser_get_proxy_array:
* @browser: a #MidoriBrowser
*
* Retrieves a proxy array representing the respective proxy items.
*
* Return value: the proxy #KatzeArray
*
* Deprecated: 0.2.5: Use midori_browser_get_proxy_item instead.
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
**/
Factor out katze_xbel_folder_from_data_dirs and _to_data
2008-09-03 22:35:15 +00:00
KatzeArray*
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
midori_browser_get_proxy_array (MidoriBrowser* browser)
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
{
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), NULL);
Implement tabs in individual processes The approach is rather plump, Midori can be run in a plug mode that creates a GtkPlug, while the normal instance knows how to embed it. Communication between browser and tabs is done via named pipes which are portable. The feature is not complete right now, there are expected regressions, but it works. As a bonus, we implement Not found pages.
2008-09-26 21:13:46 +00:00
return browser->proxy_array;
Initial refactoring work, regressions expected The 'browser' struct is superseded by MidoriBrowser, which actually represents a window that holds pages, i.e. tabs. The tabs are currently of the type MidoriWebView, which is a slightly enhanced WebView. Also MidoriWebSettings is introduced to hold additional settings that Midori needs. The other two new classes are MidoriTrash, representing closed tabs and windows and MidoriPanel, representing the side panel. The refactoring allows for several features to be much more easily implemented, such as full support for multiple windows and instant saving of modified files, such as bookmarks or the session. Regressions are expected and not everything is done yet.
2008-03-10 21:26:09 +00:00
}
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
Add midori_browser_get_for_widget_utility function This function will look for a MidoriBrowser according to a particular widget - even if it's inside a detached panel window or any other window transient for the browser.
2009-04-23 02:10:38 +00:00
/**
* midori_browser_get_for_widget:
* @widget: a #GtkWidget
*
* Determines the browser appropriate for the specified widget.
*
* Return value: a #MidoriBrowser
*
* Since 0.1.7
**/
MidoriBrowser*
midori_browser_get_for_widget (GtkWidget* widget)
{
gpointer browser;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
browser = gtk_widget_get_toplevel (GTK_WIDGET (widget));
if (!MIDORI_IS_BROWSER (browser))
{
if (!GTK_IS_WINDOW (browser))
return NULL;
browser = gtk_window_get_transient_for (GTK_WINDOW (browser));
if (!MIDORI_IS_BROWSER (browser))
return NULL;
}
return MIDORI_BROWSER (browser);
}
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
/**
* midori_browser_quit:
* @browser: a #MidoriBrowser
*
* Quits the browser, including any other browser windows.
Complete move of webSearch, third step of refactoring web search
2008-06-15 02:02:56 +00:00
*
* This function relys on the application implementing
* the MidoriBrowser::quit signal. If the browser was added
* to the MidoriApp, this is handled automatically.
Provide action signals as javascript functions From javscript C functions cannot be called, but signals are available through the GObject type system. So we allow javascript to call action signals like functions. At the same time we modify a few browser functions, so that they are functions that are available as signals.
2008-05-31 22:21:08 +00:00
**/
void
midori_browser_quit (MidoriBrowser* browser)
{
g_return_if_fail (MIDORI_IS_BROWSER (browser));
g_signal_emit (browser, signals[QUIT], 0);
}
Reference in a new issue Copy permalink