/trunk/Scribus/scribus/actionmanager.cpp |
---|
66,7 → 66,7 |
unicodeCharActionNames=new QStringList(); |
undoManager = UndoManager::instance(); |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
noIcon = im.loadPixmap("noicon.png"); |
#endif |
1368,7 → 1368,7 |
{ |
(*scrActions)[*it]->setShortcutContext(Qt::WidgetShortcut); // in theory, this should be enough, but... |
(*scrActions)[*it]->saveShortcut(); |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
if ((*scrActions)[*it]->menu() != nullptr) |
(*scrActions)[*it]->setEnabled(false); |
#endif |
1386,7 → 1386,7 |
{ |
(*scrActions)[*it]->setShortcutContext(Qt::WindowShortcut); // see above |
(*scrActions)[*it]->restoreShortcut(); |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
(*scrActions)[*it]->setEnabled(true); |
#endif |
} |
/trunk/Scribus/scribus/api/api_application.cpp |
---|
25,7 → 25,7 |
// Some more information if we are not on a 32bit little endian Unix machine |
#if defined(Q_OS_WIN) |
bu += QLatin1String("Windows"); |
#elif defined(Q_OS_MAC) |
#elif defined(Q_OS_MACOS) |
bu += QLatin1String("Mac"); |
#elif defined(Q_OS_DARWIN) |
// dunno if anyone uses this... |
/trunk/Scribus/scribus/canvasmode_edittable.cpp |
---|
32,7 → 32,7 |
#include "ui/contextmenu.h" |
// TODO: We should have a preference for this instead. |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
static const Qt::KeyboardModifiers CellNavigationModifiers = Qt::AltModifier | Qt::KeypadModifier; |
#else |
static const Qt::KeyboardModifiers CellNavigationModifiers = Qt::AltModifier; |
/trunk/Scribus/scribus/commonstrings.cpp |
---|
476,7 → 476,7 |
CommonStrings::altModifier=tr("Alt"); |
CommonStrings::shiftModifier=tr("Shift"); |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
CommonStrings::controlModifier=tr("Cmd"); |
CommonStrings::metaModifier=tr("Ctrl"); |
#endif |
484,7 → 484,7 |
CommonStrings::controlModifier=tr("Ctrl"); |
CommonStrings::metaModifier=tr("Windows"); |
#endif |
#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC) |
#if !defined(Q_OS_WIN32) && !defined(Q_OS_MACOS) |
CommonStrings::controlModifier=tr("Ctrl"); |
CommonStrings::metaModifier=tr("Meta"); |
#endif |
/trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.cpp |
---|
39,7 → 39,7 |
//Get last window geometry values |
int vleft = qMax(0, prefs->getInt("x", 10)); |
#if defined(Q_OS_MAC) || defined(_WIN32) |
#if defined(Q_OS_MACOS) || defined(_WIN32) |
int vtop = qMax(64, prefs->getInt("y", 10)); |
#else |
int vtop = qMax(0, prefs->getInt("y", 10)); |
/trunk/Scribus/scribus/prefsmanager.cpp |
---|
2287,7 → 2287,7 |
appPrefs.uiPrefs.mainWinSettings.screenNumber = dc.attribute("ScreenNumber", "0").toInt(); |
int minX = 0; |
int minY = 0; |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
// on Mac you're dead if the titlebar is not on screen |
minY = 22; |
#endif |
/trunk/Scribus/scribus/scclocale.h |
---|
17,7 → 17,7 |
#include <QString> |
#include <clocale> |
#if defined(Q_OS_MAC) |
#if defined(Q_OS_MACOS) |
#include <xlocale.h> |
#endif |
/trunk/Scribus/scribus/scfonts.cpp |
---|
194,7 → 194,7 |
{ |
addScalableFont(pathfile, library, DocName); |
} |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
else if (ext.isEmpty() && DocName.isEmpty()) |
{ |
bool error = addScalableFont(pathfile, library, DocName); |
/trunk/Scribus/scribus/scpaths.cpp |
---|
17,7 → 17,7 |
// On Qt/Mac we need CoreFoundation to discover the location |
// of the app bundle. |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
#include <CoreFoundation/CoreFoundation.h> |
#endif |
54,7 → 54,7 |
{ |
// On *nix, all paths are initialized to compile-time defaults passed in |
// as preprocessor macros and set by autoconf. |
#if !defined(Q_OS_MAC) && !defined(_WIN32) && defined(WANT_RELOCATABLE) |
#if !defined(Q_OS_MACOS) && !defined(_WIN32) && defined(WANT_RELOCATABLE) |
QString appPath = qApp->applicationDirPath(); |
m_docDir = appPath + "/../" + QString(DOCDIR); |
m_iconDir = appPath + "/../" + QString(ICONDIR); |
65,7 → 65,7 |
m_scriptDir = appPath + "/../" + QString(SCRIPTSDIR); |
m_shareDir = appPath + "/../" + QString(SHAREDIR); |
m_templateDir = appPath + "/../" + QString(TEMPLATEDIR); |
#elif !defined(Q_OS_MAC) && !defined(_WIN32) |
#elif !defined(Q_OS_MACOS) && !defined(_WIN32) |
m_docDir = QString(DOCDIR); |
m_iconDir = QString(ICONDIR); |
m_libDir = QString(LIBDIR); |
79,7 → 79,7 |
// On MacOS/X, override the compile-time settings with a location |
// obtained from the system. |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
QString pathPtr(bundleDir()); |
qDebug() << QString("scpaths: bundle at %1").arg(pathPtr); |
m_shareDir = QString("%1/Contents/share/scribus/").arg(pathPtr); |
146,7 → 146,7 |
{ |
// On MacOS/X, override the compile-time settings with a location |
// obtained from the system. |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
// Set up the various app paths to look inside the app bundle |
CFURLRef pluginRef = CFBundleCopyBundleURL(CFBundleGetMainBundle()); |
CFStringRef macPath = CFURLCopyFileSystemPath(pluginRef, kCFURLPOSIXPathStyle); |
161,21 → 161,25 |
--p; |
++p; |
*p = '\0'; |
if (strcmp("/bin", p-4) == 0) { |
if (strcmp("/bin", p-4) == 0) |
{ |
p -= 4; |
*p = '\0'; |
} |
if (strcmp("/MacOS", p-6) == 0) { |
if (strcmp("/MacOS", p-6) == 0) |
{ |
p -= 6; |
*p = '\0'; |
} |
if (strcmp("/Contents", p-9) == 0) { |
if (strcmp("/Contents", p-9) == 0) |
{ |
p -= 9; |
*p = '\0'; |
} |
QString q_pathPtr(pathPtr); |
CFRelease(pluginRef); |
CFRelease(macPath); |
return QString("%1").arg(pathPtr); |
return q_pathPtr; |
} |
char buf[2048]; |
CFStringGetCString (macPath, buf, 2048, kCFStringEncodingUTF8); |
195,7 → 199,7 |
QString ScPaths::defaultImageEditorApp() |
{ |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
QString appName("/Applications/GIMP.app"); |
QFile app(appName); |
if (app.exists()) |
270,7 → 274,7 |
QStringList spellDirs; |
spellDirs.append(userDictDir(ScPaths::Spell, false)); |
spellDirs.append(m_shareDir + "dicts/spelling/"); |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
QString macPortsPath("/opt/local/share/hunspell/"); |
QString finkPath("/sw/share/hunspell/"); |
QString osxLibreOfficePath("/Applications/LibreOffice.app/Contents/Resources/extensions"); |
332,7 → 336,7 |
QStringList hyphDirs; |
hyphDirs.append(userDictDir(ScPaths::Hyph, false)); |
hyphDirs.append(m_shareDir + "dicts/hyph/"); |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
QString macPortsPath("/opt/local/share/hunspell/"); |
QString finkPath("/sw/share/hunspell/"); |
QString osxLibreOfficePath("/Applications/LibreOffice.app/Contents/Resources/extensions"); |
395,7 → 399,7 |
QStringList ScPaths::systemFontDirs() |
{ |
QStringList fontDirs; |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
fontDirs.append(QDir::homePath() + "/Library/Fonts/"); |
fontDirs.append("/Library/Fonts/"); |
fontDirs.append("/Network/Library/Fonts/"); |
418,7 → 422,7 |
QStringList ScPaths::systemProfilesDirs() |
{ |
QStringList iccProfDirs; |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
iccProfDirs.append(QDir::homePath()+"/Library/ColorSync/Profiles/"); |
iccProfDirs.append("/System/Library/ColorSync/Profiles/"); |
iccProfDirs.append("/Library/ColorSync/Profiles/"); |
458,7 → 462,7 |
{ |
QChar sep(ScPaths::envPathSeparator); |
QStringList dirs; |
#if defined(Q_OS_MAC) || defined(Q_OS_UNIX) |
#if defined(Q_OS_MACOS) || defined(Q_OS_UNIX) |
const QStringList env(QProcess::systemEnvironment()); |
QString path_data; |
for (const QString& line : env) |
482,7 → 486,7 |
QStringList ScPaths::systemCreatePalettesDirs() |
{ |
QStringList createDirs; |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
createDirs.append(QDir::homePath()+"/create/swatches/"); |
createDirs.append(QDir::homePath()+"/.create/swatches/"); |
#elif defined(Q_OS_LINUX) |
520,7 → 524,7 |
#ifdef APPLICATION_DATA_DIR |
return QDir::homePath() + "/" + APPLICATION_DATA_DIR + "/"; |
#else |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
return (QDir::homePath() + "/Library/Preferences/Scribus/"); |
#else |
return (QDir::homePath() + "/.scribus/"); |
/trunk/Scribus/scribus/scribus.cpp |
---|
273,7 → 273,7 |
ScribusMainWindow::ScribusMainWindow() : |
m_prefsManager(PrefsManager::instance()) |
{ |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
//commenting this out until this is resolved :https://bugreports.qt.io/browse/QTBUG-44565 |
//ScQApp->setAttribute(Qt::AA_DontShowIconsInMenus); |
//noIcon = IconManager::instance().loadPixmap("noicon.png"); |
1713,7 → 1713,7 |
QKeyEvent *k = dynamic_cast<QKeyEvent *>(e); |
if (!k) |
return false; |
#if defined(Q_OS_MAC) |
#if defined(Q_OS_MACOS) |
if ((k->key() == Qt::Key_QuoteLeft) && (k->modifiers() & Qt::ControlModifier)) |
{ |
if (k->modifiers() & Qt::ShiftModifier) |
/trunk/Scribus/scribus/scribuscore.cpp |
---|
269,7 → 269,7 |
bool ScribusCore::isMacGUI() const |
{ |
// Do it statically for now |
#if defined(Q_OS_MAC) |
#if defined(Q_OS_MACOS) |
return true; |
#else |
return false; |
/trunk/Scribus/scribus/styleoptions.h |
---|
16,7 → 16,7 |
#ifndef STYLEOPTIONS_H |
#define STYLEOPTIONS_H |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
#define AQUA_EXTRA 20 |
#else |
#define AQUA_EXTRA 0 |
/trunk/Scribus/scribus/ui/charzoom.cpp |
---|
7,7 → 7,7 |
CharZoom::CharZoom(QWidget* parent, uint currentChar, const ScFace& face) |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
: QDialog( parent, Qt::FramelessWindowHint | Qt::Popup) |
#else |
: QDialog( parent, Qt::FramelessWindowHint) |
/trunk/Scribus/scribus/ui/colorcombo.h |
---|
19,7 → 19,7 |
#include <QComboBox> |
/* |
*#ifdef Q_OS_MAC |
*#ifdef Q_OS_MACOS |
#include <QMacStyle> |
#endif |
*/ |
/trunk/Scribus/scribus/ui/colorsandfills.cpp |
---|
715,9 → 715,9 |
QStringList colors; |
QStringList gradients; |
QStringList patterns; |
for (int a = 0; a < selItems.count(); a++) |
for (int i = 0; i < selItems.count(); i++) |
{ |
QTreeWidgetItem* it = selItems[a]; |
QTreeWidgetItem* it = selItems[i]; |
if (it == gradientItems) |
continue; |
if (it == colorItems) |
733,19 → 733,19 |
if (it->parent() == patternItems) |
patterns.append(it->text(0)); |
} |
for (int a = 0; a < gradients.count(); a++) |
for (int i = 0; i < gradients.count(); i++) |
{ |
dialogGradients.remove(gradients[a]); |
replaceMap.insert(gradients[a], ""); |
dialogGradients.remove(gradients[i]); |
replaceMap.insert(gradients[i], QString()); |
} |
bool hasUsed = false; |
ColorList UsedCG = getGradientColors(); |
for (int a = 0; a < colors.count(); a++) |
for (int i = 0; i < colors.count(); i++) |
{ |
if (UsedCG.contains(colors[a]) || inDocUsedColors.contains(colors[a])) |
if (UsedCG.contains(colors[i]) || inDocUsedColors.contains(colors[i])) |
{ |
hasUsed = true; |
usedColors.append(colors[a]); |
usedColors.append(colors[i]); |
} |
} |
if (hasUsed) |
785,10 → 785,10 |
} |
else |
{ |
for (int a = 0; a < colors.count(); a++) |
for (int i = 0; i < colors.count(); i++) |
{ |
replaceColorMap.insert(colors[a], "Black"); |
m_colorList.remove(colors[a]); |
replaceColorMap.insert(colors[i], "Black"); |
m_colorList.remove(colors[i]); |
} |
modified = true; |
} |
/trunk/Scribus/scribus/ui/downloadspalette.cpp |
---|
8,7 → 8,7 |
void DownloadsPalette::languageChange() |
{ |
#if defined(Q_OS_MAC) |
#if defined(Q_OS_MACOS) |
showInButton->setText( tr( "Show In Finder" ) ); |
#endif |
#if defined(Q_OS_WIN32) |
/trunk/Scribus/scribus/ui/editor.cpp |
---|
23,7 → 23,7 |
#include <QMenu> |
#include <QMenuBar> |
#include <QAction> |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
#include <QPushButton> |
#include <QVBoxLayout> |
#endif |
94,7 → 94,7 |
EditTex->setMinimumSize( QSize( 400, 400 ) ); |
EditTex->setPlainText(daten); |
EditorLayout->addWidget( EditTex ); |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
Layout1_2 = new QHBoxLayout; |
Layout1_2->setSpacing(6); |
Layout1_2->setContentsMargins(0, 0, 0, 0); |
/trunk/Scribus/scribus/ui/editor.h |
---|
18,7 → 18,7 |
class QAction; |
class ScribusView; |
class PrefsContext; |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
class QHBoxLayout; |
class QPushButton; |
#endif |
48,7 → 48,7 |
QAction* clearAct; |
QAction* getFieldAct; |
ScribusView* view; |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
QPushButton* PushButton1; |
QPushButton* PushButton2; |
#endif |
62,7 → 62,7 |
protected: |
QVBoxLayout* EditorLayout; |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
QHBoxLayout* Layout1_2; |
#endif |
PrefsContext* dirs; |
/trunk/Scribus/scribus/ui/fontembeddingcombo.cpp |
---|
10,7 → 10,7 |
FontEmbeddingCombo::FontEmbeddingCombo(QWidget* parent) : QComboBox(parent) |
{ |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
// setStyle( new FontEmbeddingCombo::ScMacStyle() ); |
#endif |
m_fontEmbeddingModel = new FontEmbeddingModel(this); |
/trunk/Scribus/scribus/ui/helpbrowser.cpp |
---|
163,7 → 163,7 |
firstRun = true; |
setupUi(this); |
helpNav = new HelpNavigation(this); |
#if defined(Q_OS_MAC) && defined(HELP_NAV_AS_DRAWER) |
#if defined(Q_OS_MACOS) && defined(HELP_NAV_AS_DRAWER) |
// TODO |
#else |
QDockWidget * dckw = new QDockWidget(tr("Navigation"),this); |
/trunk/Scribus/scribus/ui/hruler.cpp |
---|
42,7 → 42,7 |
#include "iconmanager.h" |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
#define topline 1 |
#else |
#define topline 3 |
/trunk/Scribus/scribus/ui/prefs_externaltools.cpp |
---|
199,7 → 199,7 |
continue; |
QStringList pdflatexPaths; |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
pdflatexPaths <<"/opt/local/bin/pdflatex" |
<<"/sw/bin/pdflatex" |
<<"/usr/local/texlive/2009/bin/universal-darwin/pdflatex" |
/trunk/Scribus/scribus/ui/resourcemanager.cpp |
---|
65,7 → 65,7 |
void ResourceManager::languageChange() |
{ |
#if defined(Q_OS_MAC) |
#if defined(Q_OS_MACOS) |
showInFSButton->setText( tr( "Show In Finder" ) ); |
#endif |
#if defined(Q_OS_WIN32) |
/trunk/Scribus/scribus/ui/scdockpalette.cpp |
---|
40,7 → 40,7 |
#include "util.h" |
ScDockPalette::ScDockPalette(QWidget * parent, const QString& prefsContext, Qt::WindowFlags f) |
#if defined(Q_OS_MAC) || defined(Q_OS_WIN) |
#if defined(Q_OS_MACOS) || defined(Q_OS_WIN) |
: QDockWidget(parent, f | Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint) |
#else |
: QDockWidget(parent, f | Qt::Tool | Qt::CustomizeWindowHint) |
149,7 → 149,7 |
// and should be partly visible |
int vleft = qMin(qMax(scr.left() - vwidth, m_palettePrefs->getInt("left")), scr.right()); |
int vtop = qMin(m_palettePrefs->getInt("top"), scrSize.height()); |
#if defined(Q_OS_MAC) || defined(_WIN32) |
#if defined(Q_OS_MACOS) || defined(_WIN32) |
// on Mac and Windows you're dead if the titlebar is not on screen |
vtop = qMax(64, vtop); |
#else |
/trunk/Scribus/scribus/ui/scfilewidget.cpp |
---|
32,7 → 32,7 |
setContentsMargins(0, 0, 0, 0); |
layout()->setContentsMargins(0, 0, 0, 0); |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
QList<QUrl> urls; |
QUrl computer(QUrl::fromLocalFile(QLatin1String(""))); |
if (!urls.contains(computer)) |
/trunk/Scribus/scribus/ui/scmenu.cpp |
---|
140,7 → 140,7 |
if (newMenuAction) |
{ |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
bool menuListHasNoIcons = true; |
// look for ScrAction or ScrPopupMenu from the end of the list |
// QList< QPointer<QObject> >::Iterator it = menuItemList.end(); |
195,7 → 195,7 |
//if (menuItemList.findRef(newMenuAction)!=-1) |
// return false; |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
if (newMenuAction && afterMenuAction) |
if (newMenuAction->icon().isNull() && ! (afterMenuAction->icon().isNull())) |
newMenuAction->setIcon(IconManager::instance().loadIcon("noicon.png")); |
/trunk/Scribus/scribus/ui/scrapbookpalette.cpp |
---|
971,8 → 971,8 |
updateView(); |
connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int))); |
connect(activeBView, SIGNAL(objDropped(QString)), this, SLOT(objFromMenu(QString))); |
connect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(objFromFile(QString, int))); |
connect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(handleMouse(QPoint))); |
connect(activeBView, SIGNAL(fileDropped(QString,int)), this, SLOT(objFromFile(QString, int))); |
connect(activeBView, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(handleMouse(QPoint))); |
connect(activeBView, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(handleDoubleClick(QListWidgetItem*))); |
emit scrapbookListChanged(); |
} |
/trunk/Scribus/scribus/ui/scrpalettebase.cpp |
---|
171,7 → 171,7 |
// and should be partly visible |
int vleft = qMin(qMax(scr.left() - vwidth, m_palettePrefs->getInt("left")), scr.right()); |
int vtop = qMin(m_palettePrefs->getInt("top"), scrSize.height()); |
#if defined(Q_OS_MAC) || defined(_WIN32) |
#if defined(Q_OS_MACOS) || defined(_WIN32) |
// on Mac and Windows you're dead if the titlebar is not on screen |
vtop = qMax(64, vtop); |
#else |
/trunk/Scribus/scribus/ui/sctreewidget.cpp |
---|
48,7 → 48,7 |
// This is a top-level item. |
QStyleOptionButton buttonOption; |
buttonOption.state = option.state; |
#if defined(Q_OS_MAC) || defined(Q_OS_WIN) |
#if defined(Q_OS_MACOS) || defined(Q_OS_WIN) |
buttonOption.state |= QStyle::State_Raised; |
#endif |
buttonOption.state &= ~QStyle::State_HasFocus; |
/trunk/Scribus/scribus/ui/splash.cpp |
---|
24,7 → 24,7 |
QFont font("Lucida Sans Unicode", 9); |
#elif defined(__INNOTEK_LIBC__) |
QFont font("WarpSans", 8); |
#elif defined(Q_OS_MAC) |
#elif defined(Q_OS_MACOS) |
QFont font("Helvetica Regular", 11); |
#else |
QFont font("DejaVu Sans", 8); |
62,7 → 62,7 |
lgf.setPointSize(30); |
#elif defined(__INNOTEK_LIBC__) |
lgf.setPointSize(29); |
#elif defined(Q_OS_MAC) |
#elif defined(Q_OS_MACOS) |
lgf.setPointSize(32); |
#else |
lgf.setPointSize(29); |
84,7 → 84,7 |
wf.setPointSize(10); |
#elif defined(__INNOTEK_LIBC__) |
wf.setPointSize(9); |
#elif defined(Q_OS_MAC) |
#elif defined(Q_OS_MACOS) |
wf.setPointSize(12); |
#else |
wf.setPointSize(9); |
/trunk/Scribus/scribus/ui/storyeditor.cpp |
---|
1567,7 → 1567,7 |
StoryEditor::StoryEditor(QWidget* parent) : QMainWindow(parent, Qt::Window), // WType_Dialog) //WShowModal | |
prefsManager(PrefsManager::instance()) |
{ |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
noIcon = IconManager::instance().loadPixmap("noicon.png"); |
#endif |
buildGUI(); |
1637,7 → 1637,7 |
{ |
prefs = PrefsManager::instance().prefsFile->getPluginContext("StoryEditor"); |
int vleft = qMax(-80, prefs->getInt("left", 10)); |
#if defined(Q_OS_MAC) || defined(_WIN32) |
#if defined(Q_OS_MACOS) || defined(_WIN32) |
int vtop = qMax(64, prefs->getInt("top", 10)); |
#else |
int vtop = qMax(-80, prefs->getInt("top", 10)); |
2013,7 → 2013,7 |
void StoryEditor::iconSetChange() |
{ |
IconManager& iconManager = IconManager::instance(); |
#ifdef Q_OS_MAC |
#ifdef Q_OS_MACOS |
noIcon = iconManager.loadPixmap("noicon.png"); |
#endif |
setWindowIcon(iconManager.loadPixmap("AppIcon.png")); |
/trunk/Scribus/scribus/undomanager.cpp |
---|
371,8 → 371,7 |
setTexts(); |
} |
void UndoManager::action(UndoObject* target, UndoState* state, |
const QString &targetName, QPixmap *targetPixmap) |
void UndoManager::action(UndoObject* target, UndoState* state, const QString &targetName, QPixmap *targetPixmap) |
{ |
QString oldName = target->getUName(); |
if (!targetName.isEmpty()) |
/trunk/Scribus/scribus/upgradechecker.cpp |
---|
31,7 → 31,7 |
minor = ScribusAPI::getVersionMinor(); |
m_patchLevel = ScribusAPI::getVersionPatch(); |
m_versionSuffix = ScribusAPI::getVersionSuffix().toLower().remove("svn").toInt(); |
#if defined(Q_OS_MAC) |
#if defined(Q_OS_MACOS) |
m_platform = "MacOSX"; |
#elif defined(Q_OS_WIN32) |
m_platform = "Win32"; |
/trunk/Scribus/scribus/util.cpp |
---|
41,7 → 41,7 |
#include <csignal> |
#if !defined(_WIN32) && !defined(Q_OS_MAC) |
#if !defined(_WIN32) && !defined(Q_OS_MACOS) |
#include <execinfo.h> |
#include <cxxabi.h> |
#endif |
/trunk/Scribus/scribus/util_debug.cpp |
---|
24,7 → 24,7 |
#include <QDateTime> |
#include <QtGlobal> |
#if !defined(_WIN32) && !defined(Q_OS_MAC) |
#if !defined(_WIN32) && !defined(Q_OS_MACOS) |
#include <execinfo.h> |
#include <cxxabi.h> |
#endif |
53,7 → 53,7 |
*/ |
void printBacktrace ( int nFrames ) |
{ |
#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD) |
#if !defined(_WIN32) && !defined(Q_OS_MACOS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_FREEBSD) |
void ** trace = new void*[nFrames + 1]; |
char **messages = ( char ** ) nullptr; |
int i, trace_size = 0; |
/trunk/Scribus/scribus/util_ghostscript.cpp |
---|
334,7 → 334,7 |
} |
} |
#endif |
#if defined Q_OS_MAC |
#if defined Q_OS_MACOS |
QStringList gsPaths; |
gsPaths << "/usr/bin/gs" << "/usr/local/bin/gs" << "/opt/local/bin/gs" << "/sw/bin/gs"; |
for (int i = 0; i < gsPaths.size(); ++i) |