diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2019-03-23 12:45:35 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-03-23 12:56:49 -0400 |
commit | 7cab2bb9fa46e264fa74964879197556e9559ff2 (patch) | |
tree | 58fb2db9e846f27da5120f18e333907356d2deb0 | |
parent | 2166b3dee1528ca76cf8c24b13e2e8aba165b6c2 (diff) |
branding tweaksv3.2.4-parabola1
-rw-r--r-- | src/branding/parabola/Parabola_logo,_GNU_and_Bola.svg.png | bin | 23373 -> 0 bytes | |||
-rw-r--r-- | src/branding/parabola/branding.desc | 16 | ||||
-rw-r--r-- | src/branding/parabola/parabola-gnu-freedood-logo.png | bin | 0 -> 38410 bytes | |||
-rw-r--r-- | src/calamares/CalamaresWindow.cpp | 14 | ||||
-rw-r--r-- | src/calamares/progresstree/ProgressTreeModel.cpp | 2 |
5 files changed, 22 insertions, 10 deletions
diff --git a/src/branding/parabola/Parabola_logo,_GNU_and_Bola.svg.png b/src/branding/parabola/Parabola_logo,_GNU_and_Bola.svg.png Binary files differdeleted file mode 100644 index 39d489b3e..000000000 --- a/src/branding/parabola/Parabola_logo,_GNU_and_Bola.svg.png +++ /dev/null diff --git a/src/branding/parabola/branding.desc b/src/branding/parabola/branding.desc index bb8518ca7..77c4b0d23 100644 --- a/src/branding/parabola/branding.desc +++ b/src/branding/parabola/branding.desc @@ -1,6 +1,11 @@ --- componentName: parabola +welcomeStyleCalamares: false +welcomeExpandingLogo: true +windowExpanding: normal +windowSize: 1016px,580px + strings: productName: Parabola GNU/Linux-Libre shortProductName: Parabola @@ -9,11 +14,11 @@ strings: versionedName: Parabola shortVersionedName: Parabola productUrl: http://www.parabola.nu/ - supportUrl: http://webchat.freenode.net?channels=parabola + supportUrl: https://kiwiirc.com/client/irc.freenode.net?channels=#parabola knownIssuesUrl: http://labs.parabola.nu/ images: - productLogo: "Parabola_logo,_GNU_and_Bola.svg.png" + productLogo: "parabola-gnu-freedood-logo.png" productIcon: "parabolaicon.png" productWelcome: "languages.png" productBanner: "parabola-calamares-banner-dark.png" @@ -21,6 +26,7 @@ images: slideshow: "show.qml" style: - sidebarBackground: "#202020" - sidebarText: "#FFFFFF" - sidebarTextSelect: "#8888FF" + sidebarBackground: "#202020" + sidebarText: "#FFFFFF" + sidebarTextSelect: "#8888FF" + sidebarTextHighlight: "#444488" diff --git a/src/branding/parabola/parabola-gnu-freedood-logo.png b/src/branding/parabola/parabola-gnu-freedood-logo.png Binary files differnew file mode 100644 index 000000000..341e69e13 --- /dev/null +++ b/src/branding/parabola/parabola-gnu-freedood-logo.png diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp index 7e619a7be..60d2993f0 100644 --- a/src/calamares/CalamaresWindow.cpp +++ b/src/calamares/CalamaresWindow.cpp @@ -63,6 +63,10 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) using CalamaresUtils::windowMinimumWidth; using CalamaresUtils::windowPreferredHeight; using CalamaresUtils::windowPreferredWidth; + using CalamaresUtils::sidebarMinimumW; + using CalamaresUtils::sidebarPreferredW; + using CalamaresUtils::logoLabelW; + using CalamaresUtils::logoLabelH; QSize availableSize = qApp->desktop()->availableGeometry( this ).size(); QSize minimumSize( qBound( windowMinimumWidth, availableSize.width(), windowPreferredWidth ), @@ -75,6 +79,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) int w = qBound( minimumSize.width(), windowDimensionToPixels( brandingSizes.first ), availableSize.width() ); int h = qBound( minimumSize.height(), windowDimensionToPixels( brandingSizes.second ), availableSize.height() ); + int sidebarW = w < windowPreferredWidth ? sidebarMinimumW : sidebarPreferredW; cDebug() << " Proposed window size:" << w << h; resize( w, h ); @@ -87,12 +92,11 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) QBoxLayout* sideLayout = new QVBoxLayout; sideBox->setLayout( sideLayout ); - sideBox->setFixedWidth( qBound( 100, CalamaresUtils::defaultFontHeight() * 12, w < windowPreferredWidth ? 100 : 190 ) ); + sideBox->setFixedWidth( qBound( sidebarMinimumW, CalamaresUtils::defaultFontHeight() * 12, sidebarW ) ); sideBox->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); QHBoxLayout* logoLayout = new QHBoxLayout; sideLayout->addLayout( logoLayout ); - logoLayout->addStretch(); QLabel* logoLabel = new QLabel( sideBox ); { QPalette plt = sideBox->palette(); @@ -102,11 +106,11 @@ CalamaresWindow::CalamaresWindow( QWidget* parent ) sideBox->setPalette( plt ); logoLabel->setPalette( plt ); } - logoLabel->setAlignment( Qt::AlignCenter ); - logoLabel->setFixedSize( 80, 80 ); + logoLayout->setAlignment( Qt::AlignRight ); + logoLabel->setFixedSize( logoLabelW, logoLabelH ); + logoLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); logoLabel->setPixmap( branding->image( Calamares::Branding::ProductLogo, logoLabel->size() ) ); logoLayout->addWidget( logoLabel ); - logoLayout->addStretch(); ProgressTreeView* tv = new ProgressTreeView( sideBox ); sideLayout->addWidget( tv ); diff --git a/src/calamares/progresstree/ProgressTreeModel.cpp b/src/calamares/progresstree/ProgressTreeModel.cpp index cf0a0e44a..9c77e578c 100644 --- a/src/calamares/progresstree/ProgressTreeModel.cpp +++ b/src/calamares/progresstree/ProgressTreeModel.cpp @@ -141,8 +141,10 @@ ProgressTreeModel::setupModelData() const Calamares::ViewManager* vm = Calamares::ViewManager::instance(); const auto steps = vm->viewSteps(); +int step_n = 0 ; // FIXME: netinstall packages step for ( const Calamares::ViewStep* step : steps ) { +if (step_n++ == 4) continue ; // FIXME: netinstall packages step m_rootItem->appendChild( new ViewStepItem( step, m_rootItem ) ); } } |