r19624 by craig - #12740: Apply patch to fix ruler cursor issue

[scribus-commit]

Author: craig
Date: Wed Nov 12 20:04:16 2014
New Revision: 19624

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19624
Log:
#12740: Apply patch to fix ruler cursor issue

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/ui/hruler.cpp
    trunk/Scribus/scribus/ui/storyeditor.cpp
    trunk/Scribus/scribus/ui/unicodesearch.cpp

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19624&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Wed Nov 12 20:04:16 2014
@@ -1311,10 +1311,18 @@
 #	ADD_CUSTOM_COMMAND(TARGET ${EXE_NAME} POST_BUILD
 #	COMMAND ${CMAKE_COMMAND} ARGS -Dinput_file=${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.app/Contents/MacOS/${EXE_NAME} -P ${CMAKE_MODULE_PATH}/ScribusIngestOSXBundleLibraries.cmake
 #	)
-
-#	INSTALL(
-#	CODE "SET(input_file ${CMAKE_INSTALL_PREFIX}/MacOS/${EXE_NAME})"
-#	SCRIPT ${CMAKE_MODULE_PATH}/ScribusIngestOSXBundleLibraries.cmake )
+#MESSAGE(STATUS "Installing apple bundle")
+
+#	SET(APPS "${APPLE_APP_DIR}")
+#	SET(DIRS ${QT_LIBRARY_DIRS})
+#	INSTALL(CODE "
+#		file(GLOB_RECURSE QTPLUGINS
+#		  \"\${CMAKE_INSTALL_PREFIX}/${LIBDIR}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
+#		include(BundleUtilities)
+#		fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
+#		" COMPONENT Runtime)
+
+
 ELSE(APPLEBUNDLE)
 	IF(WIN32)
 	INSTALL(TARGETS ${EXE_NAME}

Modified: trunk/Scribus/scribus/ui/hruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19624&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp (original)
+++ trunk/Scribus/scribus/ui/hruler.cpp Wed Nov 12 20:04:16 2014
@@ -338,6 +338,7 @@
 void Hruler::leaveEvent(QEvent *m)
 {
 	emit MarkerMoved(0, -1);
+	qApp->restoreOverrideCursor();
 	m_view->m_canvasMode->setModeCursor();
 }
 

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19624&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Wed Nov 12 20:04:16 2014
@@ -3300,7 +3300,7 @@
 	QString fileName = "";
 	PrefsContext* dirs = prefsManager->prefsFile->getContext("dirs");
 	QString wdir = dirs->get("story_save", prefsManager->appPrefs.pathPrefs.documents);
-	CustomFDialog dia(this, wdir, tr("Save as"), tr("Text Files (*.txt);;All Files(*)"), fdShowCodecs|fdHidePreviewCheckBox);
+	CustomFDialog dia(this, wdir, tr("Save as"), tr("Text Files (*.txt);;All Files (*)"), fdShowCodecs|fdHidePreviewCheckBox);
 	qApp->processEvents();
 	if (dia.exec() != QDialog::Accepted)
 	{

Modified: trunk/Scribus/scribus/ui/unicodesearch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19624&path=/trunk/Scribus/scribus/ui/unicodesearch.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/unicodesearch.cpp (original)
+++ trunk/Scribus/scribus/ui/unicodesearch.cpp Wed Nov 12 20:04:16 2014
@@ -181,7 +181,7 @@
 	tableView->setColumnWidth(0, tableView->fontMetrics().maxWidth()*4);
 
 	connect(searchEdit, SIGNAL(returnPressed()),
-			this, SLOT(searchEdit_returnPressed()));
+			 this, SLOT(searchEdit_returnPressed()));
 	connect(tableView, SIGNAL(doubleClicked(const QModelIndex &)),
 			 this, SLOT(itemChosen(const QModelIndex &)));
 	connect(tableView, SIGNAL(activated(const QModelIndex &)),