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
parent d2d59e6206
commit d23818b27c
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_SOURCES
widgets/ClickableLabel.cpp widgets/ClickableLabel.cpp
widgets/FixedAspectRatioLabel.cpp widgets/FixedAspectRatioLabel.cpp
widgets/QtWaitingSpinner.cpp widgets/waitingspinnerwidget.cpp
widgets/WaitingWidget.cpp widgets/WaitingWidget.cpp
ExecutionViewStep.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> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014, Teo Mrnjavac <teo@kde.org> * 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 * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,7 +20,7 @@
#include "WaitingWidget.h" #include "WaitingWidget.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "QtWaitingSpinner.h" #include "waitingspinnerwidget.h"
#include <QBoxLayout> #include <QBoxLayout>
#include <QLabel> #include <QLabel>
@ -34,7 +35,7 @@ WaitingWidget::WaitingWidget( const QString& text, QWidget* parent )
waitingLayout->addLayout( pbLayout ); waitingLayout->addLayout( pbLayout );
pbLayout->addStretch(); pbLayout->addStretch();
QtWaitingSpinner* spnr = new QtWaitingSpinner(); WaitingSpinnerWidget* spnr = new WaitingSpinnerWidget();
pbLayout->addWidget( spnr ); pbLayout->addWidget( spnr );
pbLayout->addStretch(); pbLayout->addStretch();
@ -43,9 +44,9 @@ WaitingWidget::WaitingWidget( const QString& text, QWidget* parent )
int spnrSize = m_waitingLabel->fontMetrics().height() * 4; int spnrSize = m_waitingLabel->fontMetrics().height() * 4;
spnr->setFixedSize( spnrSize, spnrSize ); spnr->setFixedSize( spnrSize, spnrSize );
spnr->setRadius( spnrSize / 2 ); spnr->setInnerRadius( spnrSize / 2 );
spnr->setLength( spnrSize / 2 ); spnr->setLineLength( spnrSize / 2 );
spnr->setWidth( spnrSize / 8 ); spnr->setLineWidth( spnrSize / 8 );
spnr->start(); spnr->start();
m_waitingLabel->setAlignment( Qt::AlignCenter ); 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> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2015, Teo Mrnjavac <teo@kde.org> * 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 * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -18,7 +19,7 @@
#include "ScanningDialog.h" #include "ScanningDialog.h"
#include "widgets/QtWaitingSpinner.h" #include "widgets/waitingspinnerwidget.h"
#include <QBoxLayout> #include <QBoxLayout>
#include <QLabel> #include <QLabel>
@ -37,7 +38,7 @@ ScanningDialog::ScanningDialog( const QString& text,
QHBoxLayout* dialogLayout = new QHBoxLayout; QHBoxLayout* dialogLayout = new QHBoxLayout;
setLayout( dialogLayout ); setLayout( dialogLayout );
QtWaitingSpinner* spinner = new QtWaitingSpinner; WaitingSpinnerWidget* spinner = new WaitingSpinnerWidget();
dialogLayout->addWidget( spinner ); dialogLayout->addWidget( spinner );
spinner->start(); spinner->start();