anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the paragraph settings dialog:

Browse Source 
- now floating by default
- re-layout horizontally for minimum mouse movement.
- allow key shortcuts.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20530 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-09-27 08:56:18 +00:00
parent 15b8abe4b8
commit 097ca4b228
3 changed files with 261 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontends/qt4/Dialogs.cpp
View File

@ -172,13 +172,11 @@ Dialog * Dialogs::build(string const & name)
} else if (name == "note") { } else if (name == "note") {
dialog = new GuiNoteDialog(lyxview_); dialog = new GuiNoteDialog(lyxview_);
} else if (name == "paragraph") { } else if (name == "paragraph") {
#ifdef Q_WS_MACX DockView<ControlParagraph, GuiParagraph> * dv =
// On Mac show as a drawer at the right new DockView<ControlParagraph, GuiParagraph>(guiview,
dialog = new DockView<ControlParagraph, GuiParagraph>(guiview, name, name, Qt::NoDockWidgetArea);
Qt::RightDockWidgetArea, Qt::Drawer); dv->setFloating(true);
#else dialog = dv;
dialog = new DockView<ControlParagraph, GuiParagraph>(guiview, name);
#endif
} else if (name == "prefs") { } else if (name == "prefs") {
dialog = new GuiPrefsDialog(lyxview_); dialog = new GuiPrefsDialog(lyxview_);
} else if (name == "print") { } else if (name == "print") {

6
src/frontends/qt4/GuiApplication.cpp
View File

@ -289,7 +289,7 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
if (e.type_ == support::ErrorException) { if (e.type_ == support::ErrorException) {
Alert::error(e.title_, e.details_); Alert::error(e.title_, e.details_);
LyX::cref().emergencyCleanup(); LyX::cref().emergencyCleanup();
::exit(1); QApplication::exit(1);
} else if (e.type_ == support::WarningException) { } else if (e.type_ == support::WarningException) {
Alert::warning(e.title_, e.details_); Alert::warning(e.title_, e.details_);
return return_value; return return_value;
@ -298,12 +298,12 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
catch (std::exception const & e) { catch (std::exception const & e) {
lyxerr << "Caught \"normal\" exception: " << e.what() << endl; lyxerr << "Caught \"normal\" exception: " << e.what() << endl;
LyX::cref().emergencyCleanup(); LyX::cref().emergencyCleanup();
::exit(1); QApplication::exit(1);
} }
catch (...) { catch (...) {
lyxerr << "Caught some really weird exception..." << endl; lyxerr << "Caught some really weird exception..." << endl;
LyX::cref().emergencyCleanup(); LyX::cref().emergencyCleanup();
::exit(1); QApplication::exit(1);
} }
return return_value; return return_value;

526
src/frontends/qt4/ui/ParagraphUi.ui
View File

@ -1,15 +1,12 @@
<ui version="4.0" > <ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>ParagraphUi</class> <class>ParagraphUi</class>
<widget class="QWidget" name="ParagraphUi" > <widget class="QWidget" name="ParagraphUi" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>222</width> <width>496</width>
<height>488</height> <height>176</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@ -32,279 +29,262 @@
<property name="windowTitle" > <property name="windowTitle" >
<string/> <string/>
</property> </property>
<widget class="QWidget" name="" > <layout class="QGridLayout" >
<property name="geometry" > <property name="margin" >
<rect> <number>9</number>
<x>10</x>
<y>440</y>
<width>201</width>
<height>26</height>
</rect>
</property> </property>
<layout class="QHBoxLayout" > <property name="spacing" >
<property name="margin" > <number>6</number>
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="restorePB" >
<property name="text" >
<string>Restore</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="applyPB" >
<property name="text" >
<string>Apply</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QGroupBox" name="groupBox" >
<property name="geometry" >
<rect>
<x>11</x>
<y>11</y>
<width>201</width>
<height>51</height>
</rect>
</property> </property>
<property name="title" > <item row="0" column="0" >
<string>Line spacing</string> <layout class="QGridLayout" >
</property> <property name="margin" >
<widget class="QLineEdit" name="linespacingValue" > <number>0</number>
<property name="enabled" >
<bool>false</bool>
</property>
<property name="geometry" >
<rect>
<x>80</x>
<y>20</y>
<width>111</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QComboBox" name="linespacing" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>63</width>
<height>20</height>
</rect>
</property>
<item>
<property name="text" >
<string>Default</string>
</property> </property>
</item> <property name="spacing" >
<item> <number>6</number>
<property name="text" >
<string>Single</string>
</property> </property>
</item> <item row="0" column="0" >
<item> <widget class="QCheckBox" name="indentCB" >
<property name="text" > <property name="sizePolicy" >
<string>1.5</string> <sizepolicy>
</property> <hsizetype>0</hsizetype>
</item> <vsizetype>0</vsizetype>
<item> <horstretch>0</horstretch>
<property name="text" > <verstretch>0</verstretch>
<string>Double</string> </sizepolicy>
</property> </property>
</item> <property name="text" >
<item> <string>&amp;Indent Paragraph</string>
<property name="text" > </property>
<string>Custom</string> </widget>
</property> </item>
</item> <item rowspan="3" row="0" column="1" >
</widget> <widget class="QGroupBox" name="aligmentGB" >
</widget> <property name="sizePolicy" >
<widget class="QCheckBox" name="indentCB" > <sizepolicy>
<property name="geometry" > <hsizetype>0</hsizetype>
<rect> <vsizetype>0</vsizetype>
<x>10</x> <horstretch>0</horstretch>
<y>250</y> <verstretch>0</verstretch>
<width>201</width> </sizepolicy>
<height>19</height> </property>
</rect> <property name="title" >
</property> <string>Alignment</string>
<property name="text" > </property>
<string>Indent Paragraph</string> <layout class="QGridLayout" >
</property> <property name="margin" >
</widget> <number>9</number>
<widget class="QGroupBox" name="aligmentGB" > </property>
<property name="geometry" > <property name="spacing" >
<rect> <number>6</number>
<x>10</x> </property>
<y>70</y> <item row="4" column="0" >
<width>201</width> <widget class="QRadioButton" name="alignRightRB" >
<height>155</height> <property name="text" >
</rect> <string>&amp;Right</string>
</property> </property>
<property name="sizePolicy" > </widget>
<sizepolicy> </item>
<hsizetype>3</hsizetype> <item row="3" column="0" >
<vsizetype>5</vsizetype> <widget class="QRadioButton" name="alignCenterRB" >
<horstretch>0</horstretch> <property name="text" >
<verstretch>0</verstretch> <string>&amp;Center</string>
</sizepolicy> </property>
</property> </widget>
<property name="title" > </item>
<string>Alignment</string> <item row="2" column="0" >
</property> <widget class="QRadioButton" name="alignLeftRB" >
<layout class="QGridLayout" > <property name="text" >
<property name="margin" > <string>&amp;Left</string>
<number>9</number> </property>
</property> </widget>
<property name="spacing" > </item>
<number>6</number> <item row="1" column="0" >
</property> <widget class="QRadioButton" name="alignJustRB" >
<item row="4" column="0" > <property name="text" >
<widget class="QRadioButton" name="alignRightRB" > <string>&amp;Justified</string>
<property name="text" > </property>
<string>Right</string> </widget>
</property> </item>
</widget> <item row="0" column="0" >
</item> <widget class="QRadioButton" name="alignDefaultRB" >
<item row="3" column="0" > <property name="font" >
<widget class="QRadioButton" name="alignCenterRB" > <font>
<property name="text" > <family>MS Shell Dlg 2</family>
<string>Center</string> <pointsize>8</pointsize>
</property> <weight>50</weight>
</widget> <italic>false</italic>
</item> <bold>false</bold>
<item row="2" column="0" > <underline>false</underline>
<widget class="QRadioButton" name="alignLeftRB" > <strikeout>false</strikeout>
<property name="text" > </font>
<string>Left</string> </property>
</property> <property name="toolTip" >
</widget> <string>Use the default alignment for this paragraph, whatever it is.</string>
</item> </property>
<item row="1" column="0" > <property name="text" >
<widget class="QRadioButton" name="alignJustRB" > <string>Paragraph's &amp;Default</string>
<property name="text" > </property>
<string>Justified</string> </widget>
</property> </item>
</widget> </layout>
</item> </widget>
<item row="0" column="0" > </item>
<widget class="QRadioButton" name="alignDefaultRB" > <item row="2" column="0" >
<property name="font" > <widget class="QGroupBox" name="labelwidthGB" >
<font> <property name="enabled" >
<family>MS Shell Dlg 2</family> <bool>false</bool>
<pointsize>8</pointsize> </property>
<weight>50</weight> <property name="sizePolicy" >
<italic>false</italic> <sizepolicy>
<bold>false</bold> <hsizetype>0</hsizetype>
<underline>false</underline> <vsizetype>0</vsizetype>
<strikeout>false</strikeout> <horstretch>0</horstretch>
</font> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="toolTip" > </property>
<string>Use the default alignment for this paragraph, whatever it is.</string> <property name="title" >
</property> <string>Label Width</string>
<property name="text" > </property>
<string>Paragraph's Default</string> <layout class="QGridLayout" >
</property> <property name="margin" >
</widget> <number>9</number>
</item> </property>
</layout> <property name="spacing" >
</widget> <number>6</number>
<widget class="QGroupBox" name="labelwidthGB" > </property>
<property name="enabled" > <item row="0" column="0" >
<bool>false</bool> <widget class="QLabel" name="TextLabel2" >
</property> <property name="toolTip" >
<property name="geometry" > <string>This text defines the width of the paragraph label</string>
<rect> </property>
<x>10</x> <property name="text" >
<y>280</y> <string>&amp;Longest label</string>
<width>201</width> </property>
<height>107</height> <property name="buddy" >
</rect> <cstring>labelWidth</cstring>
</property> </property>
<property name="sizePolicy" > </widget>
<sizepolicy> </item>
<hsizetype>5</hsizetype> <item row="0" column="1" >
<vsizetype>1</vsizetype> <widget class="QLineEdit" name="labelWidth" >
<horstretch>0</horstretch> <property name="toolTip" >
<verstretch>0</verstretch> <string>This text defines the width of the paragraph label</string>
</sizepolicy> </property>
</property> </widget>
<property name="title" > </item>
<string>Label Width</string> </layout>
</property> </widget>
<layout class="QGridLayout" > </item>
<property name="margin" > <item row="1" column="0" >
<number>9</number> <widget class="QGroupBox" name="groupBox" >
</property> <property name="sizePolicy" >
<property name="spacing" > <sizepolicy>
<number>6</number> <hsizetype>0</hsizetype>
</property> <vsizetype>0</vsizetype>
<item row="0" column="1" > <horstretch>0</horstretch>
<widget class="QLineEdit" name="labelWidth" > <verstretch>0</verstretch>
<property name="toolTip" > </sizepolicy>
<string>This text defines the width of the paragraph label</string> </property>
</property> <property name="title" >
</widget> <string>Line &amp;spacing</string>
</item> </property>
<item row="0" column="0" > <layout class="QGridLayout" >
<widget class="QLabel" name="TextLabel2" > <property name="margin" >
<property name="toolTip" > <number>9</number>
<string>This text defines the width of the paragraph label</string> </property>
</property> <property name="spacing" >
<property name="text" > <number>6</number>
<string>&amp;Longest label</string> </property>
</property> <item row="0" column="0" >
<property name="buddy" > <widget class="QComboBox" name="linespacing" >
<cstring>labelWidth</cstring> <item>
</property> <property name="text" >
</widget> <string>Default</string>
</item> </property>
</layout> </item>
</widget> <item>
<widget class="QCheckBox" name="synchronizedViewCB" > <property name="text" >
<property name="geometry" > <string>Single</string>
<rect> </property>
<x>10</x> </item>
<y>410</y> <item>
<width>201</width> <property name="text" >
<height>19</height> <string>1.5</string>
</rect> </property>
</property> </item>
<property name="text" > <item>
<string>Synchronized view</string> <property name="text" >
</property> <string>Double</string>
</widget> </property>
</item>
<item>
<property name="text" >
<string>Custom</string>
</property>
</item>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLineEdit" name="linespacingValue" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item rowspan="2" row="1" column="2" >
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QCheckBox" name="synchronizedViewCB" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>I&amp;mmediate Apply</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QPushButton" name="applyPB" >
<property name="text" >
<string>&amp;Apply</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QPushButton" name="restorePB" >
<property name="text" >
<string>&amp;Restore</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget> </widget>
<pixmapfunction></pixmapfunction>
<tabstops> <tabstops>
<tabstop>linespacing</tabstop> <tabstop>linespacing</tabstop>
<tabstop>linespacingValue</tabstop> <tabstop>linespacingValue</tabstop>