diff --git a/src/frontends/qt4/Dialogs.cpp b/src/frontends/qt4/Dialogs.cpp index 217b1974af..be94ddecbb 100644 --- a/src/frontends/qt4/Dialogs.cpp +++ b/src/frontends/qt4/Dialogs.cpp @@ -172,13 +172,11 @@ Dialog * Dialogs::build(string const & name) } else if (name == "note") { dialog = new GuiNoteDialog(lyxview_); } else if (name == "paragraph") { -#ifdef Q_WS_MACX - // On Mac show as a drawer at the right - dialog = new DockView(guiview, name, - Qt::RightDockWidgetArea, Qt::Drawer); -#else - dialog = new DockView(guiview, name); -#endif + DockView * dv = + new DockView(guiview, + name, Qt::NoDockWidgetArea); + dv->setFloating(true); + dialog = dv; } else if (name == "prefs") { dialog = new GuiPrefsDialog(lyxview_); } else if (name == "print") { diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index d1bec5c72f..b9d43faf04 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -289,7 +289,7 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event) if (e.type_ == support::ErrorException) { Alert::error(e.title_, e.details_); LyX::cref().emergencyCleanup(); - ::exit(1); + QApplication::exit(1); } else if (e.type_ == support::WarningException) { Alert::warning(e.title_, e.details_); return return_value; @@ -298,12 +298,12 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event) catch (std::exception const & e) { lyxerr << "Caught \"normal\" exception: " << e.what() << endl; LyX::cref().emergencyCleanup(); - ::exit(1); + QApplication::exit(1); } catch (...) { lyxerr << "Caught some really weird exception..." << endl; LyX::cref().emergencyCleanup(); - ::exit(1); + QApplication::exit(1); } return return_value; diff --git a/src/frontends/qt4/ui/ParagraphUi.ui b/src/frontends/qt4/ui/ParagraphUi.ui index 02b3906ca0..bef20904e5 100644 --- a/src/frontends/qt4/ui/ParagraphUi.ui +++ b/src/frontends/qt4/ui/ParagraphUi.ui @@ -1,15 +1,12 @@ - - - ParagraphUi 0 0 - 222 - 488 + 496 + 176 @@ -32,279 +29,262 @@ - - - - 10 - 440 - 201 - 26 - + + + 9 - - - 0 - - - 6 - - - - - Restore - - - false - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - Apply - - - false - - - - - - - - - 11 - 11 - 201 - 51 - + + 6 - - Line spacing - - - - false - - - - 80 - 20 - 111 - 22 - - - - - - - 10 - 20 - 63 - 20 - - - - - Default + + + + 0 - - - - Single + + 6 - - - - 1.5 - - - - - Double - - - - - Custom - - - - - - - - 10 - 250 - 201 - 19 - - - - Indent Paragraph - - - - - - 10 - 70 - 201 - 155 - - - - - 3 - 5 - 0 - 0 - - - - Alignment - - - - 9 - - - 6 - - - - - Right - - - - - - - Center - - - - - - - Left - - - - - - - Justified - - - - - - - - MS Shell Dlg 2 - 8 - 50 - false - false - false - false - - - - Use the default alignment for this paragraph, whatever it is. - - - Paragraph's Default - - - - - - - - false - - - - 10 - 280 - 201 - 107 - - - - - 5 - 1 - 0 - 0 - - - - Label Width - - - - 9 - - - 6 - - - - - This text defines the width of the paragraph label - - - - - - - This text defines the width of the paragraph label - - - &Longest label - - - labelWidth - - - - - - - - - 10 - 410 - 201 - 19 - - - - Synchronized view - - + + + + + 0 + 0 + 0 + 0 + + + + &Indent Paragraph + + + + + + + + 0 + 0 + 0 + 0 + + + + Alignment + + + + 9 + + + 6 + + + + + &Right + + + + + + + &Center + + + + + + + &Left + + + + + + + &Justified + + + + + + + + MS Shell Dlg 2 + 8 + 50 + false + false + false + false + + + + Use the default alignment for this paragraph, whatever it is. + + + Paragraph's &Default + + + + + + + + + + false + + + + 0 + 0 + 0 + 0 + + + + Label Width + + + + 9 + + + 6 + + + + + This text defines the width of the paragraph label + + + &Longest label + + + labelWidth + + + + + + + This text defines the width of the paragraph label + + + + + + + + + + + 0 + 0 + 0 + 0 + + + + Line &spacing + + + + 9 + + + 6 + + + + + + Default + + + + + Single + + + + + 1.5 + + + + + Double + + + + + Custom + + + + + + + + false + + + + + + + + + + 0 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + I&mmediate Apply + + + + + + + &Apply + + + false + + + + + + + &Restore + + + false + + + + + + + + - linespacing linespacingValue