napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix code using re-imported spinner

Browse Source
This commit is contained in:
Adriaan de Groot 2017-09-19 15:56:29 +02:00 committed by Philip
parent 92fa40b922
commit a2b70ee1d4
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcalamaresui/CMakeLists.txt
View File

@ -20,7 +20,7 @@ list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES
widgets/ClickableLabel.cpp
widgets/FixedAspectRatioLabel.cpp
widgets/QtWaitingSpinner.cpp
widgets/waitingspinnerwidget.cpp
widgets/WaitingWidget.cpp
ExecutionViewStep.cpp

11
src/libcalamaresui/widgets/WaitingWidget.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -19,7 +20,7 @@
#include "WaitingWidget.h"
#include "utils/CalamaresUtilsGui.h"
#include "QtWaitingSpinner.h"
#include "waitingspinnerwidget.h"
#include <QBoxLayout>
#include <QLabel>
@ -34,7 +35,7 @@ WaitingWidget::WaitingWidget( const QString& text, QWidget* parent )
waitingLayout->addLayout( pbLayout );
pbLayout->addStretch();
QtWaitingSpinner* spnr = new QtWaitingSpinner();
WaitingSpinnerWidget* spnr = new WaitingSpinnerWidget();
pbLayout->addWidget( spnr );
pbLayout->addStretch();
@ -43,9 +44,9 @@ WaitingWidget::WaitingWidget( const QString& text, QWidget* parent )
int spnrSize = m_waitingLabel->fontMetrics().height() * 4;
spnr->setFixedSize( spnrSize, spnrSize );
spnr->setRadius( spnrSize / 2 );
spnr->setLength( spnrSize / 2 );
spnr->setWidth( spnrSize / 8 );
spnr->setInnerRadius( spnrSize / 2 );
spnr->setLineLength( spnrSize / 2 );
spnr->setLineWidth( spnrSize / 8 );
spnr->start();
m_waitingLabel->setAlignment( Qt::AlignCenter );

5
src/modules/partition/gui/ScanningDialog.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -18,7 +19,7 @@
#include "ScanningDialog.h"
#include "widgets/QtWaitingSpinner.h"
#include "widgets/waitingspinnerwidget.h"
#include <QBoxLayout>
#include <QLabel>
@ -37,7 +38,7 @@ ScanningDialog::ScanningDialog( const QString& text,
QHBoxLayout* dialogLayout = new QHBoxLayout;
setLayout( dialogLayout );
QtWaitingSpinner* spinner = new QtWaitingSpinner;
WaitingSpinnerWidget* spinner = new WaitingSpinnerWidget();
dialogLayout->addWidget( spinner );
spinner->start();