app: Merge 'global_toolbox_factory' into 'global_dock_factory'
Get rid of 'global_toolbox_factory' and manage everything dock-related with 'global_dock_factory'. The whole of 'global_toolbox_factory' was a big special-case and getting rid of it makes it easier to extend the session management with e.g. single-window mode dock functionality. To get rid of 'global_toolbox_factory' we, roughly, have to * Replace 'global_toolbox_factory' with 'global_dock_factory' everywhere. We can also get rid of lots of code that did special things for the "toolbox" factory. * Make the use or interaction with the toolbox explicit in some places. For example, a function gimp_dock_window_has_toolbox() has been introduced. * Make GimpSessionInfoDock have an 'identifier' parameter so we can differentiate between the "gimp-dock" and "gimp-toolbox" dock types.
This commit is contained in:
@ -29,17 +29,21 @@
|
||||
*/
|
||||
struct _GimpSessionInfoDock
|
||||
{
|
||||
/* Identifier written to/read from sessionrc */
|
||||
gchar *identifier;
|
||||
|
||||
/* list of GimpSessionInfoBook */
|
||||
GList *books;
|
||||
};
|
||||
|
||||
GimpSessionInfoDock * gimp_session_info_dock_new (void);
|
||||
GimpSessionInfoDock * gimp_session_info_dock_new (const gchar *identifier);
|
||||
void gimp_session_info_dock_free (GimpSessionInfoDock *dock_info);
|
||||
void gimp_session_info_dock_serialize (GimpConfigWriter *writer,
|
||||
GimpSessionInfoDock *dock);
|
||||
GTokenType gimp_session_info_dock_deserialize (GScanner *scanner,
|
||||
gint scope,
|
||||
GimpSessionInfoDock **info);
|
||||
GimpSessionInfoDock **info,
|
||||
const gchar *identifier);
|
||||
GimpSessionInfoDock * gimp_session_info_dock_from_widget (GimpDock *dock);
|
||||
void gimp_session_info_dock_restore (GimpSessionInfoDock *dock_info,
|
||||
GimpDialogFactory *factory,
|
||||
|
Reference in New Issue
Block a user