anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-05 13:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tools->Preference: move editing and fullscreen from user interface to a new panel editing

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23767 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2008-03-15 22:12:19 +00:00
parent 3882a0c759
commit 47c5be88e3
6 changed files with 306 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
development/scons/scons_manifest.py
View File

@ -926,6 +926,7 @@ src_frontends_qt4_ui_files = Split('''
PrefConvertersUi.ui
PrefDateUi.ui
PrefDisplayUi.ui
PrefEditUi.ui
PrefFileformatsUi.ui
PrefIdentityUi.ui
PrefInputUi.ui

104
src/frontends/qt4/GuiPrefs.cpp
View File

@ -1795,14 +1795,6 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form, QWidget * parent)
this, SIGNAL(changed()));
connect(allowGeometrySessionCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(cursorFollowsCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(sortEnvironmentsCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(groupEnvironmentsCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(macroEditStyleCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
connect(autoSaveSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
connect(autoSaveCB, SIGNAL(clicked()),
@ -1811,16 +1803,6 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form, QWidget * parent)
this, SIGNAL(changed()));
connect(tooltipCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(fullscreenLimitGB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(fullscreenWidthSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
connect(toggleTabbarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleScrollbarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleToolbarsCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
lastfilesSB->setMaximum(maxlastfiles);
}
@ -1831,23 +1813,10 @@ void PrefUserInterface::apply(LyXRC & rc) const
rc.use_lastfilepos = restoreCursorCB->isChecked();
rc.load_session = loadSessionCB->isChecked();
rc.allow_geometry_session = allowGeometrySessionCB->isChecked();
rc.cursor_follows_scrollbar = cursorFollowsCB->isChecked();
rc.sort_layouts = sortEnvironmentsCB->isChecked();
rc.group_layouts = groupEnvironmentsCB->isChecked();
switch (macroEditStyleCO->currentIndex()) {
case 0: rc.macro_edit_style = LyXRC::MACRO_EDIT_INLINE_BOX; break;
case 1: rc.macro_edit_style = LyXRC::MACRO_EDIT_INLINE; break;
case 2: rc.macro_edit_style = LyXRC::MACRO_EDIT_LIST; break;
}
rc.autosave = autoSaveSB->value() * 60;
rc.make_backup = autoSaveCB->isChecked();
rc.num_lastfiles = lastfilesSB->value();
rc.use_tooltip = tooltipCB->isChecked();
rc.full_screen_toolbars = toggleToolbarsCB->isChecked();
rc.full_screen_scrollbar = toggleScrollbarCB->isChecked();
rc.full_screen_tabbar = toggleTabbarCB->isChecked();
rc.full_screen_width = fullscreenWidthSB->value();
rc.full_screen_limit = fullscreenLimitGB->isChecked();
rc.open_buffers_in_tabs = openDocumentsInTabsCB->isChecked();
}
@ -1858,10 +1827,6 @@ void PrefUserInterface::update(LyXRC const & rc)
restoreCursorCB->setChecked(rc.use_lastfilepos);
loadSessionCB->setChecked(rc.load_session);
allowGeometrySessionCB->setChecked(rc.allow_geometry_session);
cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
sortEnvironmentsCB->setChecked(rc.sort_layouts);
groupEnvironmentsCB->setChecked(rc.group_layouts);
macroEditStyleCO->setCurrentIndex(rc.macro_edit_style);
// convert to minutes
int mins(rc.autosave / 60);
if (rc.autosave && !mins)
@ -1870,11 +1835,6 @@ void PrefUserInterface::update(LyXRC const & rc)
autoSaveCB->setChecked(rc.make_backup);
lastfilesSB->setValue(rc.num_lastfiles);
tooltipCB->setChecked(rc.use_tooltip);
toggleScrollbarCB->setChecked(rc.full_screen_scrollbar);
toggleToolbarsCB->setChecked(rc.full_screen_toolbars);
toggleTabbarCB->setChecked(rc.full_screen_tabbar);
fullscreenWidthSB->setValue(rc.full_screen_width);
fullscreenLimitGB->setChecked(rc.full_screen_limit);
openDocumentsInTabsCB->setChecked(rc.open_buffers_in_tabs);
}
@ -1886,6 +1846,69 @@ void PrefUserInterface::select_ui()
uiFileED->setText(file);
}
/////////////////////////////////////////////////////////////////////
//
// PrefEdit
//
/////////////////////////////////////////////////////////////////////
PrefEdit::PrefEdit(GuiPreferences * form, QWidget * parent)
: PrefModule(qt_("Editing"), form, parent)
{
setupUi(this);
connect(cursorFollowsCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(sortEnvironmentsCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(groupEnvironmentsCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(macroEditStyleCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
connect(fullscreenLimitGB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(fullscreenWidthSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
connect(toggleTabbarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleScrollbarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleToolbarsCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
}
void PrefEdit::apply(LyXRC & rc) const
{
rc.cursor_follows_scrollbar = cursorFollowsCB->isChecked();
rc.sort_layouts = sortEnvironmentsCB->isChecked();
rc.group_layouts = groupEnvironmentsCB->isChecked();
switch (macroEditStyleCO->currentIndex()) {
case 0: rc.macro_edit_style = LyXRC::MACRO_EDIT_INLINE_BOX; break;
case 1: rc.macro_edit_style = LyXRC::MACRO_EDIT_INLINE; break;
case 2: rc.macro_edit_style = LyXRC::MACRO_EDIT_LIST; break;
}
rc.full_screen_toolbars = toggleToolbarsCB->isChecked();
rc.full_screen_scrollbar = toggleScrollbarCB->isChecked();
rc.full_screen_tabbar = toggleTabbarCB->isChecked();
rc.full_screen_width = fullscreenWidthSB->value();
rc.full_screen_limit = fullscreenLimitGB->isChecked();
}
void PrefEdit::update(LyXRC const & rc)
{
cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
sortEnvironmentsCB->setChecked(rc.sort_layouts);
groupEnvironmentsCB->setChecked(rc.group_layouts);
macroEditStyleCO->setCurrentIndex(rc.macro_edit_style);
toggleScrollbarCB->setChecked(rc.full_screen_scrollbar);
toggleToolbarsCB->setChecked(rc.full_screen_toolbars);
toggleTabbarCB->setChecked(rc.full_screen_tabbar);
fullscreenWidthSB->setValue(rc.full_screen_width);
fullscreenLimitGB->setChecked(rc.full_screen_limit);
}
/////////////////////////////////////////////////////////////////////
//
@ -2340,6 +2363,7 @@ GuiPreferences::GuiPreferences(GuiView & lv)
connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
add(new PrefUserInterface(this));
add(new PrefEdit(this));
add(new PrefShortcuts(this));
add(new PrefScreenFonts(this));
add(new PrefColors(this));

13
src/frontends/qt4/GuiPrefs.h
View File

@ -33,6 +33,7 @@
#include "ui_PrefScreenFontsUi.h"
#include "ui_PrefColorsUi.h"
#include "ui_PrefDisplayUi.h"
#include "ui_PrefEditUi.h"
#include "ui_PrefPathsUi.h"
#include "ui_PrefShortcutsUi.h"
#include "ui_PrefSpellcheckerUi.h"
@ -347,6 +348,18 @@ public Q_SLOTS:
};
class PrefEdit : public PrefModule, public Ui::PrefEditUi
{
Q_OBJECT
public:
PrefEdit(GuiPreferences * form, QWidget * parent = 0);
void apply(LyXRC & rc) const;
void update(LyXRC const & rc);
};
class GuiShortcutDialog : public QDialog, public Ui::shortcutUi
{
public:

1
src/frontends/qt4/Makefile.am
View File

@ -265,6 +265,7 @@ UIFILES = \
PrefConvertersUi.ui \
PrefDateUi.ui \
PrefDisplayUi.ui \
PrefEditUi.ui \
PrefFileformatsUi.ui \
PrefIdentityUi.ui \
PrefInputUi.ui \

225
src/frontends/qt4/ui/PrefEditUi.ui Normal file
View File

@ -0,0 +1,225 @@
<ui version="4.0" >
<class>PrefEditUi</class>
<widget class="QWidget" name="PrefEditUi" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>459</width>
<height>406</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle" >
<string/>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QGroupBox" name="scrollGB" >
<property name="title" >
<string>Editing</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="flat" >
<bool>true</bool>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QCheckBox" name="cursorFollowsCB" >
<property name="text" >
<string>Cursor follows &amp;scrollbar</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="sortEnvironmentsCB" >
<property name="text" >
<string>Sort &amp;environments alphabetically</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="groupEnvironmentsCB" >
<property name="text" >
<string>&amp;Group environments by their category</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="macroEditStyleCO" >
<item>
<property name="text" >
<string>Edit Math Macros inline with a box around</string>
</property>
</item>
<item>
<property name="text" >
<string>Edit Math Macros inline with the name in the status bar</string>
</property>
</item>
<item>
<property name="text" >
<string>Edit Math Macros with a parameter list (like in LyX &lt; 1.6)</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="fullscreenGB" >
<property name="title" >
<string>Fullscreen</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="flat" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item rowspan="3" row="0" column="2" >
<widget class="QGroupBox" name="fullscreenLimitGB" >
<property name="title" >
<string>&amp;Limit text width</string>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QSpinBox" name="fullscreenWidthSB" >
<property name="maximum" >
<number>10000</number>
</property>
<property name="minimum" >
<number>0</number>
</property>
<property name="singleStep" >
<number>10</number>
</property>
<property name="value" >
<number>700</number>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Screen us&amp;ed (pixels):</string>
</property>
<property name="buddy" >
<cstring>fullscreenWidthSB</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QCheckBox" name="toggleTabbarCB" >
<property name="text" >
<string>Toggle tabba&amp;r</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QCheckBox" name="toggleScrollbarCB" >
<property name="text" >
<string>To&amp;ggle scrollbar</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QCheckBox" name="toggleToolbarsCB" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>T&amp;oggle toolbars</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>395</width>
<height>16</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<layoutdefault spacing="4" margin="9" />
<tabstops>
<tabstop>cursorFollowsCB</tabstop>
<tabstop>sortEnvironmentsCB</tabstop>
<tabstop>groupEnvironmentsCB</tabstop>
<tabstop>macroEditStyleCO</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
</includes>
<resources/>
<connections/>
</ui>

176
src/frontends/qt4/ui/PrefUi.ui
View File

@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>459</width>
<height>596</height>
<height>459</height>
</rect>
</property>
<property name="sizePolicy" >
@ -72,174 +72,6 @@
</layout>
</widget>
</item>
<item row="5" column="0" colspan="3" >
<widget class="QGroupBox" name="fullscreenGB" >
<property name="title" >
<string>Fullscreen</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="flat" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item rowspan="3" row="0" column="2" >
<widget class="QGroupBox" name="fullscreenLimitGB" >
<property name="title" >
<string>&amp;Limit text width</string>
</property>
<property name="checkable" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QSpinBox" name="fullscreenWidthSB" >
<property name="maximum" >
<number>10000</number>
</property>
<property name="minimum" >
<number>0</number>
</property>
<property name="singleStep" >
<number>10</number>
</property>
<property name="value" >
<number>700</number>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Screen us&amp;ed (pixels):</string>
</property>
<property name="buddy" >
<cstring>fullscreenWidthSB</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QCheckBox" name="toggleTabbarCB" >
<property name="text" >
<string>Toggle tabba&amp;r</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QCheckBox" name="toggleScrollbarCB" >
<property name="text" >
<string>To&amp;ggle scrollbar</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QCheckBox" name="toggleToolbarsCB" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>T&amp;oggle toolbars</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0" colspan="3" >
<widget class="QGroupBox" name="scrollGB" >
<property name="title" >
<string>Editing</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="flat" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>4</number>
</property>
<item row="0" column="0" >
<widget class="QCheckBox" name="cursorFollowsCB" >
<property name="text" >
<string>Cursor follows &amp;scrollbar</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QCheckBox" name="sortEnvironmentsCB" >
<property name="text" >
<string>Sort &amp;environments alphabetically</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QComboBox" name="macroEditStyleCO" >
<item>
<property name="text" >
<string>Edit Math Macros inline with a box around</string>
</property>
</item>
<item>
<property name="text" >
<string>Edit Math Macros inline with the name in the status bar</string>
</property>
</item>
<item>
<property name="text" >
<string>Edit Math Macros with a parameter list (like in LyX &lt; 1.6)</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0" >
<widget class="QCheckBox" name="groupEnvironmentsCB" >
<property name="text" >
<string>&amp;Group environments by their category</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0" colspan="3" >
<widget class="QGroupBox" name="documentsGB" >
<property name="title" >
@ -332,7 +164,7 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="4">
<item row="2" column="0" colspan="4" >
<widget class="QCheckBox" name="openDocumentsInTabsCB" >
<property name="text" >
<string>Open documents in &amp;tabs</string>
@ -420,10 +252,6 @@
<tabstop>autoSaveSB</tabstop>
<tabstop>lastfilesSB</tabstop>
<tabstop>openDocumentsInTabsCB</tabstop>
<tabstop>cursorFollowsCB</tabstop>
<tabstop>sortEnvironmentsCB</tabstop>
<tabstop>groupEnvironmentsCB</tabstop>
<tabstop>macroEditStyleCO</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>