r18841 by craig - #10267: Apply JLuc's patch to set text as the default search selection

[scribus-commit]

Author: craig
Date: Tue Feb 25 21:29:18 2014
New Revision: 18841

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18841
Log:
#10267: Apply JLuc's patch to set text as the default search selection

Modified:
    trunk/Scribus/scribus/scribusapp.cpp
    trunk/Scribus/scribus/ui/search.cpp

Modified: trunk/Scribus/scribus/scribusapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18841&path=/trunk/Scribus/scribus/scribusapp.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusapp.cpp (original)
+++ trunk/Scribus/scribus/scribusapp.cpp Tue Feb 25 21:29:18 2014
@@ -373,7 +373,9 @@
 	{
 		removeTranslator( trans );
 		delete trans;
-	}
+		trans=0;
+	}
+
 	trans = new QTranslator(0);
 	QString path(ScPaths::instance().translationDir());
 	path += "scribus";

Modified: trunk/Scribus/scribus/ui/search.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18841&path=/trunk/Scribus/scribus/ui/search.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/search.cpp (original)
+++ trunk/Scribus/scribus/ui/search.cpp Tue Feb 25 21:29:18 2014
@@ -998,7 +998,7 @@
 	SFont->setChecked(m_prefs->getBool("SFont", false));
 	SStyle->setChecked(m_prefs->getBool("SStyle", false));
 	SAlign->setChecked(m_prefs->getBool("SAlign", false));
-	SText->setChecked(m_prefs->getBool("SText", false));
+	SText->setChecked(m_prefs->getBool("SText", true));
 	SEffect->setChecked(m_prefs->getBool("SEffect", false));
 	REffect->setChecked(m_prefs->getBool("REffect", false));
 	STextVal->setText(m_prefs->get("STextVal", ""));
@@ -1022,7 +1022,7 @@
 	RFont->setChecked(m_prefs->getBool("RFont", false));
 	RStyle->setChecked(m_prefs->getBool("RStyle", false));
 	RAlign->setChecked(m_prefs->getBool("RAlign", false));
-	RText->setChecked(m_prefs->getBool("RText", false));
+	RText->setChecked(m_prefs->getBool("RText", true));
 	RTextVal->setText(m_prefs->get("RTextVal", ""));
 	tmp = m_prefs->getInt("RStyleVal", findParagraphStyle(m_doc, m_doc->currentStyle));
 	if (tmp < 0 || tmp >= RStyleVal->count())