Patch from Ale.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36582 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-11-29 11:26:08 +00:00
parent 3753804463
commit 182100d376
2 changed files with 18 additions and 6 deletions

View File

@ -2480,6 +2480,8 @@ PrefEdit::PrefEdit(GuiPreferences * form)
this, SIGNAL(changed())); this, SIGNAL(changed()));
connect(scrollBelowCB, SIGNAL(clicked()), connect(scrollBelowCB, SIGNAL(clicked()),
this, SIGNAL(changed())); this, SIGNAL(changed()));
connect(macLikeWordMovementCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(sortEnvironmentsCB, SIGNAL(clicked()), connect(sortEnvironmentsCB, SIGNAL(clicked()),
this, SIGNAL(changed())); this, SIGNAL(changed()));
connect(groupEnvironmentsCB, SIGNAL(clicked()), connect(groupEnvironmentsCB, SIGNAL(clicked()),
@ -2505,6 +2507,7 @@ void PrefEdit::apply(LyXRC & rc) const
{ {
rc.cursor_follows_scrollbar = cursorFollowsCB->isChecked(); rc.cursor_follows_scrollbar = cursorFollowsCB->isChecked();
rc.scroll_below_document = scrollBelowCB->isChecked(); rc.scroll_below_document = scrollBelowCB->isChecked();
rc.mac_like_word_movement = macLikeWordMovementCB->isChecked();
rc.sort_layouts = sortEnvironmentsCB->isChecked(); rc.sort_layouts = sortEnvironmentsCB->isChecked();
rc.group_layouts = groupEnvironmentsCB->isChecked(); rc.group_layouts = groupEnvironmentsCB->isChecked();
switch (macroEditStyleCO->currentIndex()) { switch (macroEditStyleCO->currentIndex()) {
@ -2525,6 +2528,7 @@ void PrefEdit::update(LyXRC const & rc)
{ {
cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar); cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
scrollBelowCB->setChecked(rc.scroll_below_document); scrollBelowCB->setChecked(rc.scroll_below_document);
macLikeWordMovementCB->setChecked(rc.mac_like_word_movement);
sortEnvironmentsCB->setChecked(rc.sort_layouts); sortEnvironmentsCB->setChecked(rc.sort_layouts);
groupEnvironmentsCB->setChecked(rc.group_layouts); groupEnvironmentsCB->setChecked(rc.group_layouts);
macroEditStyleCO->setCurrentIndex(rc.macro_edit_style); macroEditStyleCO->setCurrentIndex(rc.macro_edit_style);

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>PrefEditUi</class> <class>PrefEditUi</class>
<widget class="QWidget" name="PrefEditUi"> <widget class="QWidget" name="PrefEditUi">
@ -5,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>382</width> <width>384</width>
<height>361</height> <height>361</height>
</rect> </rect>
</property> </property>
@ -38,28 +39,28 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QCheckBox" name="scrollBelowCB"> <widget class="QCheckBox" name="scrollBelowCB">
<property name="text"> <property name="text">
<string>Scroll &amp;below end of document</string> <string>Scroll &amp;below end of document</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="4" column="0">
<widget class="QCheckBox" name="sortEnvironmentsCB"> <widget class="QCheckBox" name="sortEnvironmentsCB">
<property name="text"> <property name="text">
<string>Sort &amp;environments alphabetically</string> <string>Sort &amp;environments alphabetically</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="5" column="0">
<widget class="QCheckBox" name="groupEnvironmentsCB"> <widget class="QCheckBox" name="groupEnvironmentsCB">
<property name="text"> <property name="text">
<string>&amp;Group environments by their category</string> <string>&amp;Group environments by their category</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="6" column="0">
<widget class="QComboBox" name="macroEditStyleCO"> <widget class="QComboBox" name="macroEditStyleCO">
<item> <item>
<property name="text"> <property name="text">
@ -78,7 +79,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="6" column="1">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -91,6 +92,13 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="0">
<widget class="QCheckBox" name="macLikeWordMovementCB">
<property name="text">
<string>Use Mac-style for moving between &amp;words</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>