r17930 by fschmid - The sample text dialog has now the content language preselected.

[scribus-commit]

Author: fschmid
Date: Sun Dec  2 10:35:44 2012
New Revision: 17930

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17930
Log:
The sample text dialog has now the content language preselected.

Modified:
    trunk/Scribus/scribus/scribuswin.cpp
    trunk/Scribus/scribus/ui/loremipsum.cpp

Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17930&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp (original)
+++ trunk/Scribus/scribus/scribuswin.cpp Sun Dec  2 10:35:44 2012
@@ -83,8 +83,8 @@
 	QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	statusFrameLayout->addItem( spacer );
 	statusFrameLayout->addWidget(m_View->cmsToolbarButton);
+	statusFrameLayout->addWidget(m_View->editOnPreviewToolbarButton);
 	statusFrameLayout->addWidget(m_View->previewToolbarButton);
-	statusFrameLayout->addWidget(m_View->editOnPreviewToolbarButton);
 	statusFrameLayout->addWidget(m_View->visualMenu);
 	statusBar()->addPermanentWidget(statusFrame, 4);
 	currentDir = QDir::currentPath();

Modified: trunk/Scribus/scribus/ui/loremipsum.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17930&path=/trunk/Scribus/scribus/ui/loremipsum.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.cpp (original)
+++ trunk/Scribus/scribus/ui/loremipsum.cpp Sun Dec  2 10:35:44 2012
@@ -232,7 +232,7 @@
 	resize( QSize(320, 340).expandedTo(minimumSizeHint()) );
 	QList<QTreeWidgetItem *> defItem;
 	defItem.clear();
-	defItem = loremList->findItems(langmgr->getTransLangFromLang(m_Doc->hyphLanguage()), Qt::MatchExactly);
+	defItem = loremList->findItems(langmgr->getLangFromAbbrev(m_Doc->hyphLanguage(), true), Qt::MatchExactly);
 	if (defItem.count() == 0)
 		defItem = loremList->findItems(standardloremtext, Qt::MatchExactly);
 	if (defItem.count() != 0)