From 9767898eef563c69eec034cdeb7a43d9e424482f Mon Sep 17 00:00:00 2001 From: qewer33 Date: Sun, 3 Sep 2023 19:30:57 +0300 Subject: [PATCH] StartPage remove hide scrollbars option --- src/Mod/Start/Gui/DlgStartPreferences.ui | 366 +++++++++---------- src/Mod/Start/Gui/DlgStartPreferencesImp.cpp | 2 - src/Mod/Start/StartPage/StartPage.css | 1 - src/Mod/Start/StartPage/StartPage.py | 2 - 4 files changed, 170 insertions(+), 201 deletions(-) diff --git a/src/Mod/Start/Gui/DlgStartPreferences.ui b/src/Mod/Start/Gui/DlgStartPreferences.ui index d41d2b90ec..fbec5bc186 100644 --- a/src/Mod/Start/Gui/DlgStartPreferences.ui +++ b/src/Mod/Start/Gui/DlgStartPreferences.ui @@ -95,202 +95,6 @@ Contents - - - - Show tips - - - - - - - Show additional folder - - - - - - - If you want the examples to show on the first page - - - Qt::RightToLeft - - - - - - true - - - ShowExamples - - - Mod/Start - - - - - - - If this is checked, the latest posts from the FreeCAD forum will be displayed on the Activity tab - - - Qt::RightToLeft - - - - - - ShowForum - - - Mod/Start - - - - - - - Qt::RightToLeft - - - - - - true - - - ShowFileThumbnailIcons - - - Mod/Start - - - - - - - Shows a notepad next to the file thumbnails, where you can keep notes across sessions - - - Qt::RightToLeft - - - - - - ShowNotes - - - Mod/Start - - - - - - - Show scrollbars - - - - - - - Show notepad - - - - - - - Show forum - - - - - - - An optional custom folder to be displayed at the bottom of the first page. -By using ";;" to separate paths, you can add several folders here - - - ShowCustomFolder - - - Mod/Start - - - - - - - Qt::RightToLeft - - - - - - true - - - ShowScrollBars - - - Mod/Start - - - - - - - Show file thumbnails - - - - - - - Show examples folder contents - - - - - - - Displays help tips in the Start workbench Documents tab - - - Qt::RightToLeft - - - - - - true - - - ShowTips - - - Mod/Start - - - - - - - - 0 - 0 - - - - File thumbnail size - - - @@ -345,6 +149,176 @@ By using ";;" to separate paths, you can add several folders here + + + + Qt::RightToLeft + + + + + + true + + + ShowFileThumbnailIcons + + + Mod/Start + + + + + + + If you want the examples to show on the first page + + + Qt::RightToLeft + + + + + + true + + + ShowExamples + + + Mod/Start + + + + + + + Displays help tips in the Start workbench Documents tab + + + Qt::RightToLeft + + + + + + true + + + ShowTips + + + Mod/Start + + + + + + + Show tips + + + + + + + Show forum + + + + + + + Show notepad + + + + + + + If this is checked, the latest posts from the FreeCAD forum will be displayed on the Activity tab + + + Qt::RightToLeft + + + + + + ShowForum + + + Mod/Start + + + + + + + + 0 + 0 + + + + File thumbnail size + + + + + + + Show examples folder contents + + + + + + + Shows a notepad next to the file thumbnails, where you can keep notes across sessions + + + Qt::RightToLeft + + + + + + ShowNotes + + + Mod/Start + + + + + + + Show file thumbnails + + + + + + + An optional custom folder to be displayed at the bottom of the first page. +By using ";;" to separate paths, you can add several folders here + + + ShowCustomFolder + + + Mod/Start + + + + + + + Show additional folder + + + diff --git a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp index ac01f1c6d2..ce400e0297 100644 --- a/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp +++ b/src/Mod/Start/Gui/DlgStartPreferencesImp.cpp @@ -112,7 +112,6 @@ void DlgStartPreferencesImp::saveSettings() ui->showForumCheckBox->onSave(); ui->useStyleSheetCheckBox->onSave(); ui->showTipsCheckBox->onSave(); - ui->showScrollbarsCheckBox->onSave(); ui->fontLineEdit->onSave(); ui->fontSizeSpinBox->onSave(); ui->showFileThumbnailIconsCheckBox->onSave(); @@ -145,7 +144,6 @@ void DlgStartPreferencesImp::loadSettings() ui->showForumCheckBox->onRestore(); ui->useStyleSheetCheckBox->onRestore(); ui->showTipsCheckBox->onRestore(); - ui->showScrollbarsCheckBox->onRestore(); ui->fontLineEdit->onRestore(); ui->fontSizeSpinBox->onRestore(); ui->showFileThumbnailIconsCheckBox->onRestore(); diff --git a/src/Mod/Start/StartPage/StartPage.css b/src/Mod/Start/StartPage/StartPage.css index c16a912273..4c4d4d9dfe 100644 --- a/src/Mod/Start/StartPage/StartPage.css +++ b/src/Mod/Start/StartPage/StartPage.css @@ -24,7 +24,6 @@ body { overflow: hidden; } -OVERFLOW a, a:link, a:visited { diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py index 11ba83e8d0..d2d6c6a839 100644 --- a/src/Mod/Start/StartPage/StartPage.py +++ b/src/Mod/Start/StartPage/StartPage.py @@ -614,7 +614,6 @@ def handle(): BOXCOLOR = gethexcolor(p.GetUnsigned("BoxColor",3722305023)) TEXTCOLOR = gethexcolor(p.GetUnsigned("PageTextColor",255)) BGTCOLOR = gethexcolor(p.GetUnsigned("BackgroundTextColor",1600086015)) - OVERFLOW = "" if p.GetBool("ShowScrollBars",True) else "body::-webkit-scrollbar {display: none;}" SHADOW = "#888888" if QtGui.QColor(BASECOLOR).valueF() < 0.5: # dark page - we need to make darker shadows SHADOW = "#000000" @@ -631,7 +630,6 @@ def handle(): HTML = HTML.replace("SHADOW",SHADOW) HTML = HTML.replace("FONTFAMILY",FONTFAMILY) HTML = HTML.replace("FONTSIZE",str(FONTSIZE)+"px") - HTML = HTML.replace("OVERFLOW",OVERFLOW) # enable web access if permitted