From 48a527872d47f8e2e5139cdc24ccf240d569bbe5 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sat, 22 Mar 2008 18:23:47 +0000 Subject: Removed Win32 keep-dialogs-on-top preference, now set permanently to true (bzr r5160) --- src/ui/dialog/inkscape-preferences.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/ui/dialog/inkscape-preferences.cpp') diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 7819faf71..5c451e005 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -484,11 +484,6 @@ void InkscapePreferences::initPageWindows() _win_ontop_normal.init ( _("Normal"), "options.transientpolicy", "value", 1, true, &_win_ontop_none); _win_ontop_agressive.init ( _("Aggressive"), "options.transientpolicy", "value", 2, false, &_win_ontop_none); -// FIXME: Temporary Win32 special code to enable transient dialogs -#ifdef WIN32 - _win_ontop_win32.init ( _("Dialogs stay on top (experimental!)"), "options.dialogsontopwin32", "value", false); -#endif - _page_windows.add_group_header( _("Saving window geometry (size and position):")); _page_windows.add_line( false, "", _win_save_geom_off, "", _("Let the window manager determine placement of all windows")); @@ -503,17 +498,15 @@ void InkscapePreferences::initPageWindows() _page_windows.add_line( true, "", _win_floating, "", _("Floating")); - _page_windows.add_group_header( _("Dialogs on top:")); -#ifndef WIN32 // FIXME: Temporary Win32 special code to enable transient dialogs +#ifndef WIN32 // non-Win32 special code to enable transient dialogs + _page_windows.add_group_header( _("Dialogs on top:")); + _page_windows.add_line( true, "", _win_ontop_none, "", _("Dialogs are treated as regular windows")); _page_windows.add_line( true, "", _win_ontop_normal, "", _("Dialogs stay on top of document windows")); _page_windows.add_line( true, "", _win_ontop_agressive, "", _("Same as Normal but may work better with some window managers")); -#else - _page_windows.add_line( false, "", _win_ontop_win32, "", - _("Whether dialogs should stay on top of document windows. Read the ReleaseNotes on this issue! (Rightclick the taskbar button and press 'Restore' to bring back a minimized document window)")); #endif _page_windows.add_group_header( _("Miscellaneous:")); -- cgit v1.2.3