anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Move Fullscreen preferences from Editing>Control section into Look & Feel>User Interface section"

Browse Source 
I pushed it by mistake.

This reverts commit 4d31e20d7d.
This commit is contained in:
Jean-Marc Lasgouttes 2023-05-05 21:23:21 +02:00
parent 3ae5d6bdec
commit e454deba2c
3 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/frontends/qt/GuiPrefs.cpp
View File

@ -2619,16 +2619,6 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form)
this, SIGNAL(changed())); this, SIGNAL(changed()));
connect(tooltipCB, SIGNAL(toggled(bool)), connect(tooltipCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed())); this, SIGNAL(changed()));
connect(toggleTabbarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleMenubarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleScrollbarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleStatusbarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleToolbarsCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
lastfilesSB->setMaximum(maxlastfiles); lastfilesSB->setMaximum(maxlastfiles);
iconSetCO->addItem(qt_("Default"), QString()); iconSetCO->addItem(qt_("Default"), QString());
@ -2650,11 +2640,6 @@ void PrefUserInterface::applyRC(LyXRC & rc) const
rc.use_system_theme_icons = useSystemThemeIconsCB->isChecked(); rc.use_system_theme_icons = useSystemThemeIconsCB->isChecked();
rc.num_lastfiles = lastfilesSB->value(); rc.num_lastfiles = lastfilesSB->value();
rc.use_tooltip = tooltipCB->isChecked(); rc.use_tooltip = tooltipCB->isChecked();
rc.full_screen_toolbars = toggleToolbarsCB->isChecked();
rc.full_screen_scrollbar = toggleScrollbarCB->isChecked();
rc.full_screen_statusbar = toggleStatusbarCB->isChecked();
rc.full_screen_tabbar = toggleTabbarCB->isChecked();
rc.full_screen_menubar = toggleMenubarCB->isChecked();
} }
@ -2668,11 +2653,6 @@ void PrefUserInterface::updateRC(LyXRC const & rc)
uiFileED->setText(toqstr(external_path(rc.ui_file))); uiFileED->setText(toqstr(external_path(rc.ui_file)));
lastfilesSB->setValue(rc.num_lastfiles); lastfilesSB->setValue(rc.num_lastfiles);
tooltipCB->setChecked(rc.use_tooltip); tooltipCB->setChecked(rc.use_tooltip);
toggleScrollbarCB->setChecked(rc.full_screen_scrollbar);
toggleStatusbarCB->setChecked(rc.full_screen_statusbar);
toggleToolbarsCB->setChecked(rc.full_screen_toolbars);
toggleTabbarCB->setChecked(rc.full_screen_tabbar);
toggleMenubarCB->setChecked(rc.full_screen_menubar);
} }
@ -2839,6 +2819,16 @@ PrefEdit::PrefEdit(GuiPreferences * form)
this, SIGNAL(changed())); this, SIGNAL(changed()));
connect(screenWidthUnitCO, SIGNAL(selectionChanged(lyx::Length::UNIT)), connect(screenWidthUnitCO, SIGNAL(selectionChanged(lyx::Length::UNIT)),
this, SIGNAL(changed())); this, SIGNAL(changed()));
connect(toggleTabbarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleMenubarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleScrollbarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleStatusbarCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
connect(toggleToolbarsCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
} }
@ -2874,6 +2864,11 @@ void PrefEdit::applyRC(LyXRC & rc) const
rc.cursor_width = cursorWidthSB->value(); rc.cursor_width = cursorWidthSB->value();
rc.citation_search = citationSearchCB->isChecked(); rc.citation_search = citationSearchCB->isChecked();
rc.citation_search_pattern = fromqstr(citationSearchLE->text()); rc.citation_search_pattern = fromqstr(citationSearchLE->text());
rc.full_screen_toolbars = toggleToolbarsCB->isChecked();
rc.full_screen_scrollbar = toggleScrollbarCB->isChecked();
rc.full_screen_statusbar = toggleStatusbarCB->isChecked();
rc.full_screen_tabbar = toggleTabbarCB->isChecked();
rc.full_screen_menubar = toggleMenubarCB->isChecked();
rc.screen_width = Length(widgetsToLength(screenWidthLE, screenWidthUnitCO)); rc.screen_width = Length(widgetsToLength(screenWidthLE, screenWidthUnitCO));
rc.screen_limit = screenLimitCB->isChecked(); rc.screen_limit = screenLimitCB->isChecked();
} }
@ -2893,6 +2888,11 @@ void PrefEdit::updateRC(LyXRC const & rc)
citationSearchLE->setText(toqstr(rc.citation_search_pattern)); citationSearchLE->setText(toqstr(rc.citation_search_pattern));
citationSearchLE->setEnabled(rc.citation_search); citationSearchLE->setEnabled(rc.citation_search);
citationSearchLA->setEnabled(rc.citation_search); citationSearchLA->setEnabled(rc.citation_search);
toggleScrollbarCB->setChecked(rc.full_screen_scrollbar);
toggleStatusbarCB->setChecked(rc.full_screen_statusbar);
toggleToolbarsCB->setChecked(rc.full_screen_toolbars);
toggleTabbarCB->setChecked(rc.full_screen_tabbar);
toggleMenubarCB->setChecked(rc.full_screen_menubar);
lengthToWidgets(screenWidthLE, screenWidthUnitCO, rc.screen_width, Length::defaultUnit()); lengthToWidgets(screenWidthLE, screenWidthUnitCO, rc.screen_width, Length::defaultUnit());
screenWidthUnitCO->setEnabled(rc.screen_limit); screenWidthUnitCO->setEnabled(rc.screen_limit);
screenLimitCB->setChecked(rc.screen_limit); screenLimitCB->setChecked(rc.screen_limit);

117
src/frontends/qt/ui/PrefEditUi.ui
View File

@ -272,6 +272,123 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<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" name="gridLayout_2">
<item row="0" column="2">
<widget class="QCheckBox" name="toggleMenubarCB">
<property name="text">
<string>Hide &amp;menubar</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QCheckBox" name="toggleScrollbarCB">
<property name="text">
<string>Hide scr&amp;ollbar</string>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="toggleStatusbarCB">
<property name="text">
<string>Hide sta&amp;tusbar</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="toggleTabbarCB">
<property name="text">
<string>H&amp;ide tabbar</string>
</property>
</widget>
</item>
<item row="0" column="5" rowspan="2">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>146</width>
<height>38</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="toggleToolbarsCB">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Hide toolbars</string>
</property>
</widget>
</item>
<item row="0" column="3">
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<spacer> <spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>

121
src/frontends/qt/ui/PrefUi.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>556</width> <width>426</width>
<height>476</height> <height>340</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -187,123 +187,6 @@
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<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" name="gridLayout_5">
<item row="0" column="2">
<widget class="QCheckBox" name="toggleMenubarCB">
<property name="text">
<string>Hide &amp;menubar</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QCheckBox" name="toggleScrollbarCB">
<property name="text">
<string>Hide scr&amp;ollbar</string>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="toggleStatusbarCB">
<property name="text">
<string>Hide sta&amp;tusbar</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="toggleTabbarCB">
<property name="text">
<string>H&amp;ide tabbar</string>
</property>
</widget>
</item>
<item row="0" column="5" rowspan="2">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>146</width>
<height>38</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="toggleToolbarsCB">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Hide toolbars</string>
</property>
</widget>
</item>
<item row="0" column="3">
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<spacer> <spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>