From: Yuriy Skalko <yuriy.skalko@gmail.com>
Date: Fri, 5 May 2023 17:21:37 +0000 (+0200)
Subject: Move Fullscreen preferences from Editing>Control section into Look & Feel>User Interf... 
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4d31e20d7d790554aab655ae11c9cd0dd4a6d6f1;p=features.git

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

diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp
index 4fb3452177..a2ac0c83eb 100644
--- a/src/frontends/qt/GuiPrefs.cpp
+++ b/src/frontends/qt/GuiPrefs.cpp
@@ -2619,6 +2619,16 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form)
 		this, SIGNAL(changed()));
 	connect(tooltipCB, SIGNAL(toggled(bool)),
 		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);
 
 	iconSetCO->addItem(qt_("Default"), QString());
@@ -2640,6 +2650,11 @@ void PrefUserInterface::applyRC(LyXRC & rc) const
 	rc.use_system_theme_icons = useSystemThemeIconsCB->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_statusbar = toggleStatusbarCB->isChecked();
+	rc.full_screen_tabbar = toggleTabbarCB->isChecked();
+	rc.full_screen_menubar = toggleMenubarCB->isChecked();
 }
 
 
@@ -2653,6 +2668,11 @@ void PrefUserInterface::updateRC(LyXRC const & rc)
 	uiFileED->setText(toqstr(external_path(rc.ui_file)));
 	lastfilesSB->setValue(rc.num_lastfiles);
 	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);
 }
 
 
@@ -2819,16 +2839,6 @@ PrefEdit::PrefEdit(GuiPreferences * form)
 		this, SIGNAL(changed()));
 	connect(screenWidthUnitCO, SIGNAL(selectionChanged(lyx::Length::UNIT)), 
 		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()));
 }
 
 
@@ -2864,11 +2874,6 @@ void PrefEdit::applyRC(LyXRC & rc) const
 	rc.cursor_width = cursorWidthSB->value();
 	rc.citation_search = citationSearchCB->isChecked();
 	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_limit = screenLimitCB->isChecked(); 
 }
@@ -2888,11 +2893,6 @@ void PrefEdit::updateRC(LyXRC const & rc)
 	citationSearchLE->setText(toqstr(rc.citation_search_pattern));
 	citationSearchLE->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());
 	screenWidthUnitCO->setEnabled(rc.screen_limit);
 	screenLimitCB->setChecked(rc.screen_limit);
diff --git a/src/frontends/qt/ui/PrefEditUi.ui b/src/frontends/qt/ui/PrefEditUi.ui
index a8cff2f83f..79820b7c7d 100644
--- a/src/frontends/qt/ui/PrefEditUi.ui
+++ b/src/frontends/qt/ui/PrefEditUi.ui
@@ -272,123 +272,6 @@
     </widget>
    </item>
    <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>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
diff --git a/src/frontends/qt/ui/PrefUi.ui b/src/frontends/qt/ui/PrefUi.ui
index fcc1d3745c..d7551cbb3d 100644
--- a/src/frontends/qt/ui/PrefUi.ui
+++ b/src/frontends/qt/ui/PrefUi.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>426</width>
-    <height>340</height>
+    <width>556</width>
+    <height>476</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -187,6 +187,123 @@
     </widget>
    </item>
    <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>
      <property name="orientation">
       <enum>Qt::Vertical</enum>