Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 10054 → Rev 10055

/branches/Version133x/Scribus/scribus/scribus.cpp
229,7 → 229,7
/*
* retval 0 - ok, 1 - no fonts, ...
*/
int ScribusMainWindow::initScribus(bool showSplash, bool showFontInfo, const QString newGuiLanguage, const QString prefsUserFile)
int ScribusMainWindow::initScribus(bool showSplash, bool showFontInfo, const QString /*newGuiLanguage*/, const QString prefsUserFile)
{
CommonStrings::languageChange();
int retVal=0;
236,7 → 236,6
ExternalApp = 0;
previewDinUse = false;
printDinUse = false;
guiLanguage = newGuiLanguage;
initSplash(showSplash);
setUsesBigPixmaps(true);
CurrStED = NULL;
593,9 → 592,9
scrapbookPalette->setOpenScrapbooks(prefsManager->appPrefs.RecentScrapbooks);
}
 
const QString ScribusMainWindow::getGuiLanguage()
const QString& ScribusMainWindow::getGuiLanguage()
{
return guiLanguage;
return ScQApp->currGUILanguage();
}
 
bool ScribusMainWindow::warningVersion(QWidget *parent)
4882,7 → 4881,7
 
void ScribusMainWindow::slotOnlineHelp()
{
HelpBrowser *dia = new HelpBrowser(0, tr("Scribus Manual"), ScMW->guiLanguage);
HelpBrowser *dia = new HelpBrowser(0, tr("Scribus Manual"), ScQApp->currGUILanguage());
dia->show();
}
 
/branches/Version133x/Scribus/scribus/scribus.h
132,7 → 132,7
bool splashShowing() const;
void closeSplash();
void setSplashStatus(const QString&);
const QString getGuiLanguage();
const QString& getGuiLanguage();
bool warningVersion(QWidget *parent);
void SetShortCut();
void startUpDialog();
582,7 → 582,6
void initCMS();
void updateColorMenu(QProgressBar* progressBar=NULL);
 
QString guiLanguage;
QString recentFileMenuName;
QString layerMenuName;
QPixmap noIcon;
648,3 → 647,4
#endif