Author: jghali
Date: Fri Jun 16 20:43:51 2017
New Revision: 22067
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22067
Log:
rename PS_* enum values and fix conflict with PS_ALL also defined in Windows
SDK's ShIdlObj.h
Modified:
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusstructs.h
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22067&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Fri Jun 16 20:43:51 2017
@@ -553,7 +553,7 @@
m_keyrep = false;
m__arrowKeyDown = false;
ClipB = QApplication::clipboard();
- for (int i=0; i<PS_MAX ; ++i)
+ for (int i=0; i<PAL_MAX ; ++i)
m_palettesStatus[i] = false;
for (int i=0; i<GS_MAX ; ++i)
m_guidesStatus[i] = false;
@@ -5538,41 +5538,41 @@
void ScribusMainWindow::ToggleAllPalettes()
{
- if (m_palettesStatus[PS_ALL])
- {
- m_palettesStatus[PS_ALL] = false;
- if (m_palettesStatus[PS_PROPERTIES])
+ if (m_palettesStatus[PAL_ALL])
+ {
+ m_palettesStatus[PAL_ALL] = false;
+ if (m_palettesStatus[PAL_PROPERTIES])
propertiesPalette->show();
- if (m_palettesStatus[PS_TEXT])
+ if (m_palettesStatus[PAL_TEXT])
textPalette->show();
- if (m_palettesStatus[PS_OUTLINE])
+ if (m_palettesStatus[PAL_OUTLINE])
outlinePalette->show();
- if (m_palettesStatus[PS_SCRAPBOOK])
+ if (m_palettesStatus[PAL_SCRAPBOOK])
scrapbookPalette->show();
- if (m_palettesStatus[PS_LAYER])
+ if (m_palettesStatus[PAL_LAYER])
layerPalette->show();
- if (m_palettesStatus[PS_PAGE])
+ if (m_palettesStatus[PAL_PAGE])
pagePalette->show();
- if (m_palettesStatus[PS_BOOKMARK])
+ if (m_palettesStatus[PAL_BOOKMARK])
bookmarkPalette->show();
- if (m_palettesStatus[PS_VERIFIER])
+ if (m_palettesStatus[PAL_VERIFIER])
docCheckerPalette->show();
- if (m_palettesStatus[PS_DOWNLOADS])
+ if (m_palettesStatus[PAL_DOWNLOADS])
downloadsPalette->show();
- setUndoPalette(m_palettesStatus[PS_UNDO]);
+ setUndoPalette(m_palettesStatus[PAL_UNDO]);
}
else
{
- m_palettesStatus[PS_PROPERTIES] =
propertiesPalette->isVisible();
- m_palettesStatus[PS_TEXT] = textPalette->isVisible();
- m_palettesStatus[PS_OUTLINE] = outlinePalette->isVisible();
- m_palettesStatus[PS_SCRAPBOOK] = scrapbookPalette->isVisible();
- m_palettesStatus[PS_LAYER] = layerPalette->isVisible();
- m_palettesStatus[PS_PAGE] = pagePalette->isVisible();
- m_palettesStatus[PS_BOOKMARK] = bookmarkPalette->isVisible();
- m_palettesStatus[PS_UNDO] = undoPalette->isVisible();
- m_palettesStatus[PS_VERIFIER] = docCheckerPalette->isVisible();
- m_palettesStatus[PS_DOWNLOADS] = downloadsPalette->isVisible();
+ m_palettesStatus[PAL_PROPERTIES] =
propertiesPalette->isVisible();
+ m_palettesStatus[PAL_TEXT] = textPalette->isVisible();
+ m_palettesStatus[PAL_OUTLINE] = outlinePalette->isVisible();
+ m_palettesStatus[PAL_SCRAPBOOK] = scrapbookPalette->isVisible();
+ m_palettesStatus[PAL_LAYER] = layerPalette->isVisible();
+ m_palettesStatus[PAL_PAGE] = pagePalette->isVisible();
+ m_palettesStatus[PAL_BOOKMARK] = bookmarkPalette->isVisible();
+ m_palettesStatus[PAL_UNDO] = undoPalette->isVisible();
+ m_palettesStatus[PAL_VERIFIER] = docCheckerPalette->isVisible();
+ m_palettesStatus[PAL_DOWNLOADS] = downloadsPalette->isVisible();
propertiesPalette->hide();
textPalette->hide();
outlinePalette->hide();
@@ -5583,13 +5583,13 @@
docCheckerPalette->hide();
downloadsPalette->hide();
setUndoPalette(false);
- m_palettesStatus[PS_ALL] = true;
+ m_palettesStatus[PAL_ALL] = true;
}
}
void ScribusMainWindow::toggleCheckPal()
{
- m_palettesStatus[PS_ALL] = false;
+ m_palettesStatus[PAL_ALL] = false;
}
void ScribusMainWindow::setUndoPalette(bool visible)
@@ -5600,13 +5600,13 @@
void ScribusMainWindow::togglePagePalette()
{
- m_palettesStatus[PS_ALL] = false;
+ m_palettesStatus[PAL_ALL] = false;
}
void ScribusMainWindow::toggleUndoPalette()
{
setUndoPalette(!undoPalette->isVisible());
- m_palettesStatus[PS_ALL] = false;
+ m_palettesStatus[PAL_ALL] = false;
}
void ScribusMainWindow::toggleImageVisibility()
Modified: trunk/Scribus/scribus/scribusstructs.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22067&path=/trunk/Scribus/scribus/scribusstructs.h
==============================================================================
--- trunk/Scribus/scribus/scribusstructs.h (original)
+++ trunk/Scribus/scribus/scribusstructs.h Fri Jun 16 20:43:51 2017
@@ -418,19 +418,19 @@
enum
{
- PS_ALL,
- PS_PROPERTIES,
- PS_OUTLINE,
- PS_SCRAPBOOK,
- PS_LAYER,
- PS_PAGE,
- PS_BOOKMARK,
- PS_7_UNUSED,
- PS_UNDO,
- PS_VERIFIER,
- PS_DOWNLOADS,
- PS_TEXT,
- PS_MAX
+ PAL_ALL,
+ PAL_PROPERTIES,
+ PAL_OUTLINE,
+ PAL_SCRAPBOOK,
+ PAL_LAYER,
+ PAL_PAGE,
+ PAL_BOOKMARK,
+ PAL_7_UNUSED,
+ PAL_UNDO,
+ PAL_VERIFIER,
+ PAL_DOWNLOADS,
+ PAL_TEXT,
+ PAL_MAX
};
#endif
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
