I did send my GPL mail and i removed the unwanted comment that Pavel had
pointed out.I am attaching both the patches
Thanks and Regards
Prannoy Pilligundla
ᐧ
On Tue, Feb 25, 2014 at 4:06 PM, Prannoy Pilligundla <prannoy.b...@gmail.com
> wrote:
> ᐧ
>
> There was one whitespace error in the LyXRC.h file.I am sorry for the
> carelessness
>
> On Tue, Feb 25, 2014 at 11:05 AM, Pavel Sanda <sa...@lyx.org> wrote:
>
>> Prannoy Pilligundla wrote:
>> > index ce78d29..4ffe7d6 100644
>> > --- a/src/frontends/qt4/GuiView.cpp
>> > +++ b/src/frontends/qt4/GuiView.cpp
>> > @@ -3879,7 +3879,9 @@ void GuiView::toggleFullScreen()
>> > setContentsMargins(-2, -2, -2, -2);
>> > saveLayout();
>> > setWindowState(windowState() ^ Qt::WindowFullScreen);
>> > - statusBar()->hide();
>> > + //statusBar()->hide();
>>
>> this line can be completely kicked out
>
>
> Do i have to send an other patch with this change?
>
>
From ee2fb5b24ad03bb31c27dc09e352dbec3eb55951 Mon Sep 17 00:00:00 2001
From: Prannoy Pilligundla <prannoyp.1...@gmail.com>
Date: Tue, 25 Feb 2014 09:29:24 +0530
Subject: [PATCH 1/2] Fix Ticket #8816
---
src/LyXRC.cpp | 14 ++++++++++++++
src/LyXRC.h | 3 +++
src/frontends/qt4/GuiPrefs.cpp | 4 ++++
src/frontends/qt4/GuiView.cpp | 4 +++-
src/frontends/qt4/ui/PrefEditUi.ui | 7 +++++++
5 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index c0a6467..8b186f9 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -110,6 +110,7 @@ LexerKeyword lyxrcTags[] = {
{ "\\fullscreen_limit", LyXRC::RC_FULL_SCREEN_LIMIT },
{ "\\fullscreen_menubar", LyXRC::RC_FULL_SCREEN_MENUBAR },
{ "\\fullscreen_scrollbar", LyXRC::RC_FULL_SCREEN_SCROLLBAR },
+ { "\\fullscreen_statusbar", LyXRC::RC_FULL_SCREEN_STATUSBAR },
{ "\\fullscreen_tabbar", LyXRC::RC_FULL_SCREEN_TABBAR },
{ "\\fullscreen_toolbars", LyXRC::RC_FULL_SCREEN_TOOLBARS },
{ "\\fullscreen_width", LyXRC::RC_FULL_SCREEN_WIDTH },
@@ -1237,6 +1238,9 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
case RC_FULL_SCREEN_SCROLLBAR:
lexrc >> full_screen_scrollbar;
break;
+ case RC_FULL_SCREEN_STATUSBAR:
+ lexrc >> full_screen_statusbar;
+ break;
case RC_FULL_SCREEN_TABBAR:
lexrc >> full_screen_tabbar;
break;
@@ -1945,6 +1949,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
}
if (tag != RC_LAST)
break;
+ case RC_FULL_SCREEN_STATUSBAR:
+ if (ignore_system_lyxrc ||
+ full_screen_statusbar != system_lyxrc.full_screen_statusbar) {
+ os << "\\fullscreen_statusbar "
+ << convert<string>(full_screen_statusbar)
+ << '\n';
+ }
+ if (tag != RC_LAST)
+ break;
case RC_FULL_SCREEN_TABBAR:
if (ignore_system_lyxrc ||
full_screen_tabbar != system_lyxrc.full_screen_tabbar) {
@@ -3061,6 +3074,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
case LyXRC::RC_FULL_SCREEN_LIMIT:
case LyXRC::RC_FULL_SCREEN_SCROLLBAR:
case LyXRC::RC_FULL_SCREEN_MENUBAR:
+ case LyXRC::RC_FULL_SCREEN_STATUSBAR:
case LyXRC::RC_FULL_SCREEN_TABBAR:
case LyXRC::RC_FULL_SCREEN_TOOLBARS:
case LyXRC::RC_FULL_SCREEN_WIDTH:
diff --git a/src/LyXRC.h b/src/LyXRC.h
index 94914cc..9a45f93 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -86,6 +86,7 @@ public:
RC_FORWARD_SEARCH_PDF,
RC_FULL_SCREEN_LIMIT,
RC_FULL_SCREEN_SCROLLBAR,
+ RC_FULL_SCREEN_STATUSBAR,
RC_FULL_SCREEN_TABBAR,
RC_FULL_SCREEN_MENUBAR,
RC_FULL_SCREEN_TOOLBARS,
@@ -499,6 +500,8 @@ public:
bool full_screen_tabbar;
/// Toggle menubar in fullscreen mode?
bool full_screen_menubar;
+ ///Toggle statusbar in fullscreen mode?
+ bool full_screen_statusbar;
/// Limit the text width?
bool full_screen_limit;
/// Width of limited screen (in pixels) in fullscreen mode
diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 8686690..feebf76 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -2723,6 +2723,8 @@ PrefEdit::PrefEdit(GuiPreferences * form)
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()));
}
@@ -2743,6 +2745,7 @@ void PrefEdit::apply(LyXRC & rc) const
rc.cursor_width = cursorWidthSB->value();
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.full_screen_width = fullscreenWidthSB->value();
@@ -2760,6 +2763,7 @@ void PrefEdit::update(LyXRC const & rc)
macroEditStyleCO->setCurrentIndex(rc.macro_edit_style);
cursorWidthSB->setValue(rc.cursor_width);
toggleScrollbarCB->setChecked(rc.full_screen_scrollbar);
+ toggleScrollbarCB->setChecked(rc.full_screen_statusbar);
toggleToolbarsCB->setChecked(rc.full_screen_toolbars);
toggleTabbarCB->setChecked(rc.full_screen_tabbar);
toggleMenubarCB->setChecked(rc.full_screen_menubar);
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index ce78d29..4ffe7d6 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -3879,7 +3879,9 @@ void GuiView::toggleFullScreen()
setContentsMargins(-2, -2, -2, -2);
saveLayout();
setWindowState(windowState() ^ Qt::WindowFullScreen);
- statusBar()->hide();
+ //statusBar()->hide();
+ if (lyxrc.full_screen_statusbar)
+ statusBar()->hide();
if (lyxrc.full_screen_menubar)
menuBar()->hide();
if (lyxrc.full_screen_toolbars) {
diff --git a/src/frontends/qt4/ui/PrefEditUi.ui b/src/frontends/qt4/ui/PrefEditUi.ui
index fba2ce6..2db2dd6 100644
--- a/src/frontends/qt4/ui/PrefEditUi.ui
+++ b/src/frontends/qt4/ui/PrefEditUi.ui
@@ -197,6 +197,13 @@
</widget>
</item>
<item row="4" column="0">
+ <widget class="QCheckBox" name="toggleStatusbarCB">
+ <property name="text">
+ <string>Hide sta&tusbar</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
<widget class="QGroupBox" name="fullscreenLimitGB">
<property name="title">
<string>&Limit text width</string>
--
1.7.10.4
From d174b2c344daa6ec9d368aea98ec0fd67e5072d5 Mon Sep 17 00:00:00 2001
From: Prannoy Pilligundla <prannoyp.1...@gmail.com>
Date: Tue, 25 Feb 2014 23:05:49 +0530
Subject: [PATCH 2/2] Removed unwanted comment
---
src/frontends/qt4/GuiView.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 4ffe7d6..c175805 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -3879,7 +3879,6 @@ void GuiView::toggleFullScreen()
setContentsMargins(-2, -2, -2, -2);
saveLayout();
setWindowState(windowState() ^ Qt::WindowFullScreen);
- //statusBar()->hide();
if (lyxrc.full_screen_statusbar)
statusBar()->hide();
if (lyxrc.full_screen_menubar)
--
1.7.10.4
