Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 23081 → Rev 23082

/trunk/Scribus/scribus/main_nix.cpp
65,10 → 65,9
*/
int mainApp(int argc, char **argv)
{
emergencyActivated=false;
#if QT_VERSION >= 0x050600
emergencyActivated = false;
 
ScribusQApp::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
ScribusQApp app(argc, argv);
initCrashHandler();
app.parseCommandLine();
/trunk/Scribus/scribus/main_win32.cpp
97,9 → 97,8
qInstallMessageHandler(messageHandler);
}
#endif
#if QT_VERSION >= 0x050600
 
ScribusQApp::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
ScribusQApp app(argc, argv);
setPythonEnvironment(app.applicationDirPath());
result = mainApp(app);
/trunk/Scribus/scribus/margins.h
18,9 → 18,8
#define MARGINS_H
 
#include <QDebug>
#if QT_VERSION >= 0x050300
#include <QMarginsF>
#endif
 
/** \brief Pagemargins and bleeds*/
class MarginStruct
{
54,7 → 53,6
double m_right {0.0};
};
 
#if QT_VERSION >= 0x050300
class ScMargins : public QMarginsF
{
public:
67,6 → 65,5
setRight(right);
}
};
#endif
 
#endif // MARGINS_H
/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
171,9 → 171,7
bool PdfPlug::import(const QString& fNameIn, const TransactionSettings& trSettings, int flags, bool showProgress)
{
#ifdef Q_OS_OSX
#if QT_VERSION >= 0x050300
showProgress = false;
#endif
showProgress = false;
#endif
bool success = false;
interactive = (flags & LoadSavePlugin::lfInteractive);
/trunk/Scribus/scribus/scribus.cpp
6827,51 → 6827,9
marksManager->startup();
nsEditor->startup();
symbolPalette->startup();
#if QT_VERSION < 0x050600
 
if (!m_prefsManager.appPrefs.uiPrefs.tabbedPalettes.isEmpty())
{
for (int a = 0; a < m_prefsManager.appPrefs.uiPrefs.tabbedPalettes.count(); a++)
{
QStringList actTab = m_prefsManager.appPrefs.uiPrefs.tabbedPalettes[a].palettes;
QDockWidget *container = findChild<QDockWidget *>(actTab[0]);
if (container)
{
for (int i = 1; i < actTab.count(); i++)
{
QDockWidget *content = findChild<QDockWidget *>(actTab[i]);
if (content)
tabifyDockWidget(container, content);
}
}
QList<QTabBar *> bars = findChildren<QTabBar *>(QString());
bool found = false;
for (int i = 0; i < bars.count(); ++i)
{
QTabBar *bar = bars[i];
for (int ii = 0; ii < bar->count(); ii++)
{
QObject *obj = (QObject*)bar->tabData(ii).toULongLong();
if (obj != nullptr)
{
if (obj->objectName() == container->objectName())
{
if (m_prefsManager.appPrefs.uiPrefs.tabbedPalettes[a].activeTab > -1)
{
bar->setCurrentIndex(m_prefsManager.appPrefs.uiPrefs.tabbedPalettes[a].activeTab);
found = true;
break;
}
}
}
}
if (found)
break;
}
}
}
#else
if (!m_prefsManager.appPrefs.uiPrefs.tabbedPalettes.isEmpty())
{
for (int i = 0; i < m_prefsManager.appPrefs.uiPrefs.tabbedPalettes.count(); i++)
{
QStringList actTab = m_prefsManager.appPrefs.uiPrefs.tabbedPalettes[i].palettes;
6902,7 → 6860,7
}
}
}
#endif
 
move(m_prefsManager.appPrefs.uiPrefs.mainWinSettings.xPosition, m_prefsManager.appPrefs.uiPrefs.mainWinSettings.yPosition);
resize(m_prefsManager.appPrefs.uiPrefs.mainWinSettings.width, m_prefsManager.appPrefs.uiPrefs.mainWinSettings.height);