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

[libcalamaresui] Rip out untyped data about upload server

Browse Source 
This doesn't compile, but indicates the **type** information
desired about the (a) upload server.
This commit is contained in:
Adriaan de Groot 2021-03-09 14:51:59 +01:00
parent f72436aa0a
commit 3c6683bd98
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libcalamaresui/Branding.h
View File

@ -83,13 +83,16 @@ public:
}; };
Q_ENUM( StyleEntry ) Q_ENUM( StyleEntry )
enum UploadServerEntry : short /** @brief Supported log-upload servers.
*
* 'None' is here as a fallback.
*/
enum UploadServerType : short
{ {
Type, None,
URL, Fiche
Port
}; };
Q_ENUM( UploadServerEntry ) Q_ENUM( UploadServerType )
/** @brief Setting for how much the main window may expand. */ /** @brief Setting for how much the main window may expand. */
enum class WindowExpansion enum class WindowExpansion
@ -218,6 +221,13 @@ public:
///@brief Which navigation flavor is configured ///@brief Which navigation flavor is configured
PanelFlavor navigationFlavor() const { return m_navigationFlavor; } PanelFlavor navigationFlavor() const { return m_navigationFlavor; }
/** @brief Upload server configuration
*
* This is both the type (which may be none, in which case the URL
* is irrelevant and usually empty) and the URL for the upload.
*/
QPair< UploadServerType, QUrl > uploadServer() const { return m_uploadServer; }
/** /**
* Creates a map called "branding" in the global storage, and inserts an * Creates a map called "branding" in the global storage, and inserts an
* entry for each of the branding strings. This makes the branding * entry for each of the branding strings. This makes the branding
@ -234,7 +244,6 @@ public slots:
QString styleString( StyleEntry styleEntry ) const; QString styleString( StyleEntry styleEntry ) const;
QString imagePath( ImageEntry imageEntry ) const; QString imagePath( ImageEntry imageEntry ) const;
QString uploadServer( UploadServerEntry uploadServerEntry ) const;
PanelSide sidebarSide() const { return m_sidebarSide; } PanelSide sidebarSide() const { return m_sidebarSide; }
PanelSide navigationSide() const { return m_navigationSide; } PanelSide navigationSide() const { return m_navigationSide; }
@ -252,7 +261,7 @@ private:
QMap< QString, QString > m_strings; QMap< QString, QString > m_strings;
QMap< QString, QString > m_images; QMap< QString, QString > m_images;
QMap< QString, QString > m_style; QMap< QString, QString > m_style;
QMap< QString, QString > m_uploadServer; QPair< UploadServerType, QUrl > m_uploadServer;
/* The slideshow can be done in one of two ways: /* The slideshow can be done in one of two ways:
* - as a sequence of images * - as a sequence of images

5
src/libcalamaresui/utils/Paste.h
View File

@ -10,10 +10,9 @@
#ifndef UTILS_PASTE_H #ifndef UTILS_PASTE_H
#define UTILS_PASTE_H #define UTILS_PASTE_H
#include <QStringList> #include <QString>
class QObject; class QObject;
class QString;
namespace CalamaresUtils namespace CalamaresUtils
{ {
@ -24,8 +23,6 @@ namespace CalamaresUtils
*/ */
QString ficheLogUpload( QObject* parent ); QString ficheLogUpload( QObject* parent );
extern QStringList UploadServersList;
} // namespace CalamaresUtils } // namespace CalamaresUtils
#endif #endif