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

Merge branch 'development' into 3.2.x-stable

Browse Source
This commit is contained in:
Philip Müller 2019-09-05 07:00:56 -04:00
commit fae488b998
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/geoip/GeoIPTests.cpp
View File

@ -197,7 +197,8 @@ GeoIPTests::testSplitTZ()
#define CHECK_GET( t, selector, url ) \ #define CHECK_GET( t, selector, url ) \
{ \ { \
auto tz = GeoIP##t( selector ).processReply( CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( url ) ) ); \ auto tz = GeoIP##t( selector ) \
.processReply( CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( url ) ) ); \
qDebug() << tz; \ qDebug() << tz; \
QCOMPARE( default_tz, tz ); \ QCOMPARE( default_tz, tz ); \
auto tz2 = CalamaresUtils::GeoIP::Handler( "" #t, url, selector ).get(); \ auto tz2 = CalamaresUtils::GeoIP::Handler( "" #t, url, selector ).get(); \
@ -216,7 +217,8 @@ GeoIPTests::testGet()
GeoIPJSON default_handler; GeoIPJSON default_handler;
// Call the KDE service the definitive source. // Call the KDE service the definitive source.
auto default_tz = default_handler.processReply( CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( "https://geoip.kde.org/v1/calamares" ) ) ); auto default_tz = default_handler.processReply(
CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( "https://geoip.kde.org/v1/calamares" ) ) );
// This is bogus, because the test isn't always run by me // This is bogus, because the test isn't always run by me
// QCOMPARE( default_tz.first, QStringLiteral("Europe") ); // QCOMPARE( default_tz.first, QStringLiteral("Europe") );

2
src/libcalamares/geoip/GeoIPXML.cpp
View File

@ -73,10 +73,12 @@ QString
GeoIPXML::rawReply( const QByteArray& data ) GeoIPXML::rawReply( const QByteArray& data )
{ {
for ( const auto& e : getElementTexts( data, m_element ) ) for ( const auto& e : getElementTexts( data, m_element ) )
{
if ( !e.isEmpty() ) if ( !e.isEmpty() )
{ {
return e; return e;
} }
}
return QString(); return QString();
} }

5
src/modules/packagechooser/PackageChooserPage.cpp
View File

@ -20,6 +20,7 @@
#include "ui_page_package.h" #include "ui_page_package.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
@ -50,6 +51,9 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
case PackageChooserMode::RequiredMultiple: case PackageChooserMode::RequiredMultiple:
ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection ); ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection );
} }
ui->products->setMinimumWidth( 10 * CalamaresUtils::defaultFontHeight() );
} }
/** @brief size the given @p pixmap to @p size /** @brief size the given @p pixmap to @p size
@ -168,4 +172,5 @@ PackageChooserPage::setIntroduction( const PackageItem& item )
{ {
m_introduction.name = item.name; m_introduction.name = item.name;
m_introduction.description = item.description; m_introduction.description = item.description;
m_introduction.screenshot = item.screenshot;
} }

4
src/modules/packagechooser/page_package.ui
View File

@ -21,11 +21,11 @@
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,4">
<item> <item>
<widget class="QListView" name="products"> <widget class="QListView" name="products">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>1</verstretch> <verstretch>1</verstretch>
</sizepolicy> </sizepolicy>

3
src/modules/welcome/WelcomeViewStep.cpp
View File

@ -148,7 +148,8 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
jobOrBrandingSetting( Branding::KnownIssuesUrl, configurationMap, "showKnownIssuesUrl" ) ); jobOrBrandingSetting( Branding::KnownIssuesUrl, configurationMap, "showKnownIssuesUrl" ) );
m_widget->setupButton( WelcomePage::Button::ReleaseNotes, m_widget->setupButton( WelcomePage::Button::ReleaseNotes,
jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) ); jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) );
m_widget->setupButton( WelcomePage::Button::Donate, CalamaresUtils::getString( configurationMap, "showDonateUrl" ) ); m_widget->setupButton( WelcomePage::Button::Donate,
CalamaresUtils::getString( configurationMap, "showDonateUrl" ) );
if ( configurationMap.contains( "requirements" ) if ( configurationMap.contains( "requirements" )
&& configurationMap.value( "requirements" ).type() == QVariant::Map ) && configurationMap.value( "requirements" ).type() == QVariant::Map )

12
src/modules/welcome/WelcomeViewStep.h
View File

@ -34,11 +34,11 @@ class GeneralRequirements;
namespace CalamaresUtils namespace CalamaresUtils
{ {
namespace GeoIP namespace GeoIP
{ {
class Handler; class Handler;
} }
} // namespace } // namespace CalamaresUtils
class PLUGINDLLEXPORT WelcomeViewStep : public Calamares::ViewStep class PLUGINDLLEXPORT WelcomeViewStep : public Calamares::ViewStep
{ {
@ -79,4 +79,4 @@ private:
CALAMARES_PLUGIN_FACTORY_DECLARATION( WelcomeViewStepFactory ) CALAMARES_PLUGIN_FACTORY_DECLARATION( WelcomeViewStepFactory )
#endif // WELCOMEPAGEPLUGIN_H #endif // WELCOMEPAGEPLUGIN_H