Author: jghali
Date: Sun Mar 17 18:48:58 2019
New Revision: 22900
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22900
Log:
Fix use of lower/upper case in some MenuManager function names
Modified:
trunk/Scribus/scribus/menumanager.cpp
trunk/Scribus/scribus/menumanager.h
trunk/Scribus/scribus/pluginmanager.cpp
trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/ui/storyeditor.cpp
Modified: trunk/Scribus/scribus/menumanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22900&path=/trunk/Scribus/scribus/menumanager.cpp
==============================================================================
--- trunk/Scribus/scribus/menumanager.cpp (original)
+++ trunk/Scribus/scribus/menumanager.cpp Sun Mar 17 18:48:58 2019
@@ -93,18 +93,14 @@
bool MenuManager::addMenuStringToMenuBar(const QString &menuName, bool
rememberMenu)
{
- bool retVal=false;
- if (menuStrings.contains(menuName))
- {
- QMenu *m=scribusMenuBar->addMenu(menuStringTexts[menuName]);
- menuBarMenus.insert(menuName, m);
- if (rememberMenu)
- {
- rememberedMenus.insert(menuName, m);
- }
- retVal=true;
- }
- return retVal;
+ if (!menuStrings.contains(menuName))
+ return false;
+
+ QMenu *m = scribusMenuBar->addMenu(menuStringTexts[menuName]);
+ menuBarMenus.insert(menuName, m);
+ if (rememberMenu)
+ rememberedMenus.insert(menuName, m);
+ return true;
}
bool MenuManager::addMenuStringToMenuBarBefore(const QString &menuName, const
QString &beforeMenuName)
@@ -138,7 +134,7 @@
}
-void MenuManager::addMenuItemStringstoMenuBar(const QString &menuName, const
QMap<QString, QPointer<ScrAction> > &menuActions)
+void MenuManager::addMenuItemStringsToMenuBar(const QString &menuName, const
QMap<QString, QPointer<ScrAction> > &menuActions)
{
if (!menuStrings.contains(menuName) || !menuBarMenus.contains(menuName))
return;
@@ -169,13 +165,13 @@
menuBarMenus.insert(menuString, subMenu);
if (rememberedMenus.contains(menuString))
rememberedMenus.insert(menuString, subMenu);
- addMenuItemStringstoMenu(menuString, subMenu,
menuActions);
- }
- }
-}
-
-
-void MenuManager::addMenuItemStringstoMenu(const QString &menuName, QMenu
*menuToAddTo, const QMap<QString, QPointer<ScrAction> > &menuActions)
+ addMenuItemStringsToMenu(menuString, subMenu,
menuActions);
+ }
+ }
+}
+
+
+void MenuManager::addMenuItemStringsToMenu(const QString &menuName, QMenu
*menuToAddTo, const QMap<QString, QPointer<ScrAction> > &menuActions)
{
if (!menuStrings.contains(menuName))
return;
@@ -206,16 +202,16 @@
menuBarMenus.insert(menuString, subMenu);
if (rememberedMenus.contains(menuString))
rememberedMenus.insert(menuString, subMenu);
- addMenuItemStringstoMenu(menuString, subMenu,
menuActions);
- }
- }
-}
-
-void MenuManager::addMenuItemStringstoRememberedMenu(const QString &menuName,
const QMap<QString, QPointer<ScrAction> > &menuActions)
+ addMenuItemStringsToMenu(menuString, subMenu,
menuActions);
+ }
+ }
+}
+
+void MenuManager::addMenuItemStringsToRememberedMenu(const QString &menuName,
const QMap<QString, QPointer<ScrAction> > &menuActions)
{
if (rememberedMenus.contains(menuName))
if (rememberedMenus.value(menuName)!=nullptr)
- addMenuItemStringstoMenu(menuName,
rememberedMenus.value(menuName), menuActions);
+ addMenuItemStringsToMenu(menuName,
rememberedMenus.value(menuName), menuActions);
}
void MenuManager::clearMenuStrings(const QString &menuName)
Modified: trunk/Scribus/scribus/menumanager.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22900&path=/trunk/Scribus/scribus/menumanager.h
==============================================================================
--- trunk/Scribus/scribus/menumanager.h (original)
+++ trunk/Scribus/scribus/menumanager.h Sun Mar 17 18:48:58 2019
@@ -69,9 +69,9 @@
bool menuExists(const QString &menuName);
void addMenuItemString(const QString& s, const QString &parent);
void addMenuItemStringAfter(const QString &s, const QString
&after, const QString &parent);
- void addMenuItemStringstoMenu(const QString &menuName, QMenu
*menuToAddTo, const QMap<QString, QPointer<ScrAction> > &menuActions);
- void addMenuItemStringstoRememberedMenu(const QString
&menuName, const QMap<QString, QPointer<ScrAction> > &menuActions);
- void addMenuItemStringstoMenuBar(const QString &menuName, const
QMap<QString, QPointer<ScrAction> > &menuActions);
+ void addMenuItemStringsToMenu(const QString &menuName, QMenu
*menuToAddTo, const QMap<QString, QPointer<ScrAction> > &menuActions);
+ void addMenuItemStringsToRememberedMenu(const QString
&menuName, const QMap<QString, QPointer<ScrAction> > &menuActions);
+ void addMenuItemStringsToMenuBar(const QString &menuName, const
QMap<QString, QPointer<ScrAction> > &menuActions);
void clearMenuStrings(const QString &menuName);
void dumpMenuStrings();
QMenu *undoMenu() {return m_undoMenu;}
Modified: trunk/Scribus/scribus/pluginmanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22900&path=/trunk/Scribus/scribus/pluginmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.cpp (original)
+++ trunk/Scribus/scribus/pluginmanager.cpp Sun Mar 17 18:48:58 2019
@@ -353,23 +353,23 @@
}
//CB maybe we should just call mw->createMenuBar() here instead...
mw->scrMenuMgr->clearMenu("File");
- mw->scrMenuMgr->addMenuItemStringstoMenuBar("File", mw->scrActions);
+ mw->scrMenuMgr->addMenuItemStringsToMenuBar("File", mw->scrActions);
mw->scrMenuMgr->clearMenu("Edit");
- mw->scrMenuMgr->addMenuItemStringstoMenuBar("Edit", mw->scrActions);
+ mw->scrMenuMgr->addMenuItemStringsToMenuBar("Edit", mw->scrActions);
mw->scrMenuMgr->clearMenu("Insert");
- mw->scrMenuMgr->addMenuItemStringstoMenuBar("Insert", mw->scrActions);
+ mw->scrMenuMgr->addMenuItemStringsToMenuBar("Insert", mw->scrActions);
mw->scrMenuMgr->clearMenu("Item");
- mw->scrMenuMgr->addMenuItemStringstoMenuBar("Item", mw->scrActions);
+ mw->scrMenuMgr->addMenuItemStringsToMenuBar("Item", mw->scrActions);
mw->scrMenuMgr->clearMenu("Page");
- mw->scrMenuMgr->addMenuItemStringstoMenuBar("Page", mw->scrActions);
+ mw->scrMenuMgr->addMenuItemStringsToMenuBar("Page", mw->scrActions);
mw->scrMenuMgr->clearMenu("ItemTable");
- mw->scrMenuMgr->addMenuItemStringstoMenuBar("ItemTable",
mw->scrActions);
+ mw->scrMenuMgr->addMenuItemStringsToMenuBar("ItemTable",
mw->scrActions);
mw->scrMenuMgr->clearMenu("Extras");
- mw->scrMenuMgr->addMenuItemStringstoMenuBar("Extras", mw->scrActions);
+ mw->scrMenuMgr->addMenuItemStringsToMenuBar("Extras", mw->scrActions);
mw->scrMenuMgr->clearMenu("View");
- mw->scrMenuMgr->addMenuItemStringstoMenuBar("View", mw->scrActions);
+ mw->scrMenuMgr->addMenuItemStringsToMenuBar("View", mw->scrActions);
mw->scrMenuMgr->clearMenu("Help");
- mw->scrMenuMgr->addMenuItemStringstoMenuBar("Help", mw->scrActions);
+ mw->scrMenuMgr->addMenuItemStringsToMenuBar("Help", mw->scrActions);
return true;
}
Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22900&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp Sun Mar 17
18:48:58 2019
@@ -98,7 +98,7 @@
buildScribusScriptsMenu();
m_menuMgr->addMenuStringToMenuBarBefore("Scripter","Windows");
- m_menuMgr->addMenuItemStringstoMenuBar("Scripter", m_scripterActions);
+ m_menuMgr->addMenuItemStringsToMenuBar("Scripter", m_scripterActions);
m_recentScripts = m_savedRecentScripts;
rebuildRecentScriptsMenu();
}
@@ -153,7 +153,7 @@
connect( m_recentScriptActions[strippedName],
SIGNAL(triggeredData(QString)), this, SLOT(RecentScript(QString)) );
m_menuMgr->addMenuItemString(strippedName, "RecentScripts");
}
- m_menuMgr->addMenuItemStringstoRememberedMenu("RecentScripts",
m_recentScriptActions);
+ m_menuMgr->addMenuItemStringsToRememberedMenu("RecentScripts",
m_recentScriptActions);
}
void ScripterCore::finishScriptRun()
Modified: trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22900&path=/trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapeplugin.cpp Sun Mar 17
18:48:58 2019
@@ -76,7 +76,7 @@
connect(m_actions["shapeShowPalette"], SIGNAL(toggled(bool)),
sc_palette, SLOT(setPaletteShown(bool)));
connect(sc_palette, SIGNAL(paletteShown(bool)),
m_actions["shapeShowPalette"], SLOT(setChecked(bool)));
mw->scrMenuMgr->addMenuItemStringAfter("shapeShowPalette",
"toolsInline", "Windows");
- mw->scrMenuMgr->addMenuItemStringstoMenuBar("Windows",
m_actions);
+ mw->scrMenuMgr->addMenuItemStringsToMenuBar("Windows",
m_actions);
}
}
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22900&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Mar 17 18:48:58 2019
@@ -1170,26 +1170,26 @@
void ScribusMainWindow::createMenuBar()
{
scrMenuMgr->addMenuStringToMenuBar("File");
- scrMenuMgr->addMenuItemStringstoMenuBar("File", scrActions);
+ scrMenuMgr->addMenuItemStringsToMenuBar("File", scrActions);
scrMenuMgr->addMenuStringToMenuBar("Edit");
- scrMenuMgr->addMenuItemStringstoMenuBar("Edit", scrActions);
+ scrMenuMgr->addMenuItemStringsToMenuBar("Edit", scrActions);
scrMenuMgr->addMenuStringToMenuBar("Item");
- scrMenuMgr->addMenuItemStringstoMenuBar("Item", scrActions);
+ scrMenuMgr->addMenuItemStringsToMenuBar("Item", scrActions);
scrMenuMgr->addMenuStringToMenuBar("Insert");
- scrMenuMgr->addMenuItemStringstoMenuBar("Insert", scrActions);
+ scrMenuMgr->addMenuItemStringsToMenuBar("Insert", scrActions);
scrMenuMgr->addMenuStringToMenuBar("Page");
- scrMenuMgr->addMenuItemStringstoMenuBar("Page", scrActions);
+ scrMenuMgr->addMenuItemStringsToMenuBar("Page", scrActions);
scrMenuMgr->addMenuStringToMenuBar("ItemTable");
- scrMenuMgr->addMenuItemStringstoMenuBar("ItemTable", scrActions);
+ scrMenuMgr->addMenuItemStringsToMenuBar("ItemTable", scrActions);
scrMenuMgr->addMenuStringToMenuBar("Extras");
- scrMenuMgr->addMenuItemStringstoMenuBar("Extras", scrActions);
+ scrMenuMgr->addMenuItemStringsToMenuBar("Extras", scrActions);
scrMenuMgr->addMenuStringToMenuBar("View");
- scrMenuMgr->addMenuItemStringstoMenuBar("View", scrActions);
+ scrMenuMgr->addMenuItemStringsToMenuBar("View", scrActions);
scrMenuMgr->addMenuStringToMenuBar("Windows", true);
addDefaultWindowMenuItems();
menuBar()->addSeparator();
scrMenuMgr->addMenuStringToMenuBar("Help");
- scrMenuMgr->addMenuItemStringstoMenuBar("Help", scrActions);
+ scrMenuMgr->addMenuItemStringsToMenuBar("Help", scrActions);
connect(scrMenuMgr->getLocalPopupMenu("Extras"), SIGNAL(aboutToShow()),
this, SLOT(extrasMenuAboutToShow()));
connect(scrMenuMgr->getLocalPopupMenu("Windows"),
SIGNAL(aboutToShow()), this, SLOT(windowsMenuAboutToShow()));
@@ -1225,7 +1225,7 @@
scrMenuMgr->addMenuItemString("toolsToolbarPDF", "Windows");
scrMenuMgr->addMenuItemString("toolsToolbarView", "Windows");
scrMenuMgr->addMenuItemString("SEPARATOR", "Windows");
- scrMenuMgr->addMenuItemStringstoMenuBar("Windows", scrActions);
+ scrMenuMgr->addMenuItemStringsToMenuBar("Windows", scrActions);
}
@@ -2455,7 +2455,7 @@
scrMenuMgr->addMenuItemString(docInWindow, "Windows");
}
if (windowCount>1)
-
scrMenuMgr->addMenuItemStringstoRememberedMenu("Windows", scrWindowsActions);
+
scrMenuMgr->addMenuItemStringsToRememberedMenu("Windows", scrWindowsActions);
}
}
@@ -2991,7 +2991,7 @@
connect( scrRecentFileActions[strippedName],
SIGNAL(triggeredData(QString)), this, SLOT(loadRecent(QString)) );
scrMenuMgr->addMenuItemString(strippedName, "FileOpenRecent");
}
- scrMenuMgr->addMenuItemStringstoRememberedMenu("FileOpenRecent",
scrRecentFileActions);
+ scrMenuMgr->addMenuItemStringsToRememberedMenu("FileOpenRecent",
scrRecentFileActions);
fileToolBar->rebuildRecentFileMenu();
}
@@ -3016,7 +3016,7 @@
scrMenuMgr->addMenuItemString(strippedName,
"EditPasteRecent");
it--;
}
-
scrMenuMgr->addMenuItemStringstoRememberedMenu("EditPasteRecent",
scrRecentPasteActions);
+
scrMenuMgr->addMenuItemStringsToRememberedMenu("EditPasteRecent",
scrRecentPasteActions);
}
}
@@ -3035,7 +3035,7 @@
connect(act, SIGNAL(triggeredData(int)), this,
SLOT(PutScrap(int)));
scrMenuMgr->addMenuItemString(scrapNames[i],
"ItemSendToScrapbook");
}
- scrMenuMgr->addMenuItemStringstoRememberedMenu("ItemSendToScrapbook",
scrScrapActions);
+ scrMenuMgr->addMenuItemStringsToRememberedMenu("ItemSendToScrapbook",
scrScrapActions);
}
void ScribusMainWindow::pasteFromScrapbook(const QString& fn)
@@ -3244,7 +3244,7 @@
scrMenuMgr->addMenuItemString(it.key(), "ItemLayer");
connect( (*it), SIGNAL(triggeredData(int)), doc,
SLOT(itemSelection_SendToLayer(int)) );
}
- scrMenuMgr->addMenuItemStringstoRememberedMenu("ItemLayer",
scrLayersActions);
+ scrMenuMgr->addMenuItemStringsToRememberedMenu("ItemLayer",
scrLayersActions);
}
void ScribusMainWindow::updateItemLayerList()
Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22900&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Sun Mar 17 18:48:58 2019
@@ -1834,13 +1834,13 @@
// seMenuMgr->addMenuItemString("settingsSmartTextSelection", "Settings");
seMenuMgr->addMenuStringToMenuBar("File");
- seMenuMgr->addMenuItemStringstoMenuBar("File", seActions);
+ seMenuMgr->addMenuItemStringsToMenuBar("File", seActions);
seMenuMgr->addMenuStringToMenuBar("Edit");
- seMenuMgr->addMenuItemStringstoMenuBar("Edit", seActions);
+ seMenuMgr->addMenuItemStringsToMenuBar("Edit", seActions);
seMenuMgr->addMenuStringToMenuBar("Insert");
- seMenuMgr->addMenuItemStringstoMenuBar("Insert", seActions);
+ seMenuMgr->addMenuItemStringsToMenuBar("Insert", seActions);
seMenuMgr->addMenuStringToMenuBar("Settings");
- seMenuMgr->addMenuItemStringstoMenuBar("Settings", seActions);
+ seMenuMgr->addMenuItemStringsToMenuBar("Settings", seActions);
PluginManager::instance().setupPluginActions(this);
PluginManager::instance().languageChange();
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
