diff options
| author | gustav_b <gustav_b@users.sourceforge.net> | 2007-09-06 19:41:20 +0000 |
|---|---|---|
| committer | gustav_b <gustav_b@users.sourceforge.net> | 2007-09-06 19:41:20 +0000 |
| commit | eb9c881636b979a7c811aa413f9a1c0c3ab08f4e (patch) | |
| tree | db4a21faf4e77afd1d0eb33b17236c4950664a3e /src | |
| parent | various updates (diff) | |
| download | inkscape-eb9c881636b979a7c811aa413f9a1c0c3ab08f4e.tar.gz inkscape-eb9c881636b979a7c811aa413f9a1c0c3ab08f4e.zip | |
Group dock related prefs, add hidden prefs for dock bar and switcher appearance.
(bzr r3699)
Diffstat (limited to 'src')
| -rw-r--r-- | src/preferences-skeleton.h | 5 | ||||
| -rw-r--r-- | src/ui/widget/dock-item.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/dock.cpp | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h index 97d399f28..dad2738cd 100644 --- a/src/preferences-skeleton.h +++ b/src/preferences-skeleton.h @@ -196,7 +196,10 @@ static char const preferences_skeleton[] = " <group id=\"autoscrolldistance\" value=\"-10\"/>\n" " <group id=\"simplifythreshold\" value=\"0.002\"/>\n" " <group id=\"dialogtype\" value=\"1\"/>\n" -" <group id=\"dialogscancenterdock\" value=\"1\"/>\n" +" <group id=\"dock\" " +" cancenterdock=\"1\"" +" dockbarstyle=\"2\"" // GDL_DOCK_BAR_BOTH +" switcherstyle=\"2\"/>\n" // GDL_SWITCHER_STYLE_BOTH " <group id=\"dialogsskiptaskbar\" value=\"1\"/>\n" #ifdef WIN32 // FIXME: Temporary Win32 special code to enable transient dialogs " <group id=\"dialogsontopwin32\" value=\"0\"/>\n" diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp index 46a2667c7..58a0e87f4 100644 --- a/src/ui/widget/dock-item.cpp +++ b/src/ui/widget/dock-item.cpp @@ -49,7 +49,7 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l GdlDockItemBehavior gdl_dock_behavior = - (prefs_get_int_attribute_limited ("options.dialogscancenterdock", "value", 1, 0, 1) == 0 ? + (prefs_get_int_attribute_limited ("options.dock", "cancenterdock", 1, 0, 1) == 0 ? GDL_DOCK_ITEM_BEH_CANT_DOCK_CENTER : GDL_DOCK_ITEM_BEH_NORMAL); diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp index 828b70451..0f92f7217 100644 --- a/src/ui/widget/dock.cpp +++ b/src/ui/widget/dock.cpp @@ -10,6 +10,7 @@ */ #include "inkscape.h" +#include "prefs-utils.h" #include "desktop.h" #include "dock.h" @@ -71,10 +72,20 @@ Dock::Dock(Gtk::Orientation orientation) _scrolled_window->set_size_request(0); + GdlSwitcherStyle gdl_switcher_style = + static_cast<GdlSwitcherStyle>(prefs_get_int_attribute_limited("options.dock", "switcherstyle", + GDL_SWITCHER_STYLE_BOTH, 0, 4)); + g_object_set (GDL_DOCK_OBJECT(_gdl_dock)->master, - "switcher-style", GDL_SWITCHER_STYLE_BOTH, + "switcher-style", gdl_switcher_style, NULL); + GdlDockBarStyle gdl_dock_bar_style = + static_cast<GdlDockBarStyle>(prefs_get_int_attribute_limited("options.dock", "dockbarstyle", + GDL_DOCK_BAR_BOTH, 0, 3)); + + gdl_dock_bar_set_style(_gdl_dock_bar, gdl_dock_bar_style); + g_signal_connect(G_OBJECT(INKSCAPE), "dialogs_hide", G_CALLBACK(hideCallback), (void *)this); g_signal_connect(G_OBJECT(INKSCAPE), "dialogs_unhide", G_CALLBACK(unhideCallback), (void *)this); |