Martchus
/
tageditor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make definitions for gui support project specific

This commit is contained in:
Martchus 2017-04-27 22:10:55 +02:00
parent 900eb45ef8
commit 041b53101a
7 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -209,7 +209,7 @@ include(BasicConfig)
# find qtutilities
if(WIDGETS_GUI OR QUICK_GUI)
find_package(qtutilities 5.6.0 REQUIRED)
find_package(qtutilities 5.7.0 REQUIRED)
use_qt_utilities()
endif()

4
application/knownfieldmodel.cpp
View File

@ -4,7 +4,7 @@
using namespace Media;
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
using namespace Models;
#else
# define QT_TR_NOOP(x) x
@ -52,7 +52,7 @@ const char *KnownFieldModel::fieldName(KnownField field)
}
}
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
QString KnownFieldModel::translatedFieldName(KnownField field)
{
return tr(fieldName(field));

8
application/knownfieldmodel.h
View File

@ -1,7 +1,7 @@
#ifndef KNOWNFIELDMODEL_H
#define KNOWNFIELDMODEL_H
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
# include <qtutilities/models/checklistmodel.h>
# include <QAbstractListModel>
# include <QList>
@ -17,7 +17,7 @@ DECLARE_ENUM_CLASS(KnownField, unsigned int);
namespace Settings {
class KnownFieldModel
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
: public Models::ChecklistModel
#endif
{
@ -31,7 +31,7 @@ public:
static const char *fieldName(Media::KnownField field);
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
static QString translatedFieldName(Media::KnownField field);
static Models::ChecklistItem mkItem(Media::KnownField field, Qt::CheckState checkState = Qt::Checked);
@ -43,7 +43,7 @@ public:
#endif
};
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
inline Models::ChecklistItem KnownFieldModel::mkItem(Media::KnownField field, Qt::CheckState checkState)
{
return Models::ChecklistItem(static_cast<int>(field), translatedFieldName(field), checkState);

7
application/main.cpp
View File

@ -1,13 +1,12 @@
#include "../cli/mainfeatures.h"
#if defined(GUI_QTWIDGETS)
#if defined(TAGEDITOR_GUI_QTWIDGETS)
# include "../gui/initiate.h"
# include "./knownfieldmodel.h"
#elif defined(GUI_QTQUICK)
#endif
#include "resources/config.h"
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
# include <qtutilities/resources/qtconfigarguments.h>
# include <qtutilities/misc/conversion.h>
#else
@ -227,7 +226,7 @@ int main(int argc, char *argv[])
try {
parser.parseArgs(argc, argv);
if(qtConfigArgs.areQtGuiArgsPresent()) {
#ifdef GUI_QTWIDGETS
#if defined(TAGEDITOR_GUI_QTWIDGETS)
return QtGui::runWidgetsGui(argc, argv, qtConfigArgs, defaultFileArg.isPresent() && !defaultFileArg.values().empty() ? ConversionUtilities::fromNativeFileName(defaultFileArg.values().front()) : QString(), renamingUtilityArg.isPresent());
#else
CMD_UTILS_START_CONSOLE;

8
cli/mainfeatures.cpp
View File

@ -3,7 +3,7 @@
#include "./attachmentinfo.h"
#include "../application/knownfieldmodel.h"
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
# include "../misc/utility.h"
# include "../misc/htmlinfo.h"
#endif
@ -24,7 +24,7 @@
#include <c++utilities/io/catchiofailure.h>
#include <c++utilities/io/nativefilestream.h>
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
# include <QDir>
# include <qtutilities/misc/conversion.h>
#endif
@ -42,7 +42,7 @@ using namespace IoUtilities;
using namespace EscapeCodes;
using namespace Settings;
using namespace Media;
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
using namespace Utility;
#endif
@ -75,7 +75,7 @@ void printFieldNames(const ArgumentOccurrence &occurrence)
void generateFileInfo(const ArgumentOccurrence &, const Argument &inputFileArg, const Argument &outputFileArg, const Argument &validateArg)
{
CMD_UTILS_START_CONSOLE;
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
try {
// parse tags
MediaFileInfo inputFileInfo(inputFileArg.values().front());

8
gui/fileinfomodel.cpp
View File

@ -15,15 +15,13 @@
#include <c++utilities/chrono/datetime.h>
#include <c++utilities/conversion/stringconversion.h>
#if defined(GUI_QTWIDGETS)
#if defined(TAGEDITOR_GUI_QTWIDGETS)
# include <QApplication>
# include <QStyle>
# include <QIcon>
#elif defined(GUI_QTQUICK)
#elif defined(TAGEDITOR_GUI_QTQUICK)
# include <QGuiApplication>
# include <QIcon>
#elif !defined(GUI_NONE)
# define GUI_NONE
#endif
#include <QStringBuilder>
@ -239,7 +237,7 @@ void FileInfoModel::setFileInfo(MediaFileInfo *fileInfo, Media::NotificationList
updateCache();
}
#if defined(GUI_QTWIDGETS)
#if defined(TAGEDITOR_GUI_QTWIDGETS)
const QIcon &FileInfoModel::informationIcon()
{
static const QIcon icon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation);

16
misc/htmlinfo.cpp
View File

@ -16,15 +16,13 @@
#include <c++utilities/chrono/datetime.h>
#include <c++utilities/conversion/stringconversion.h>
#if defined(GUI_QTWIDGETS)
#if defined(TAGEDITOR_GUI_QTWIDGETS)
# include <QApplication>
# include <QStyle>
#elif defined(GUI_QTQUICK)
#elif defined(TAGEDITOR_GUI_QTQUICK)
# include <QGuiApplication>
#elif !defined(GUI_NONE)
# define GUI_NONE
#endif
#ifndef GUI_NONE
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
# include <QFont>
# include <QFontMetrics>
# include <QIcon>
@ -41,12 +39,12 @@
#include <list>
#ifndef GUI_NONE
#if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK)
# define APPEND_GUI_RULE(rule, fallback) \
if(ApplicationInstances::hasGuiApp()) { \
res.append(rule); \
res.append(rule); \
} else { \
res.append(fallback); \
res.append(fallback); \
}
#else
# define APPEND_GUI_RULE(rule, fallback) \
@ -392,7 +390,7 @@ public:
"#structure_links a {"
"margin-right: 5px;"
"}"));
#ifdef GUI_QTWIDGETS
#if defined(TAGEDITOR_GUI_QTWIDGETS)
if(ApplicationInstances::hasWidgetsApp()) {
res.append(QStringLiteral("td.warning {background-image: url(data:image/png;base64,"));
res.append(mkWarningIconData());