From: <su...@us...> - 2009-12-23 15:23:17
|
Revision: 3370 http://tora.svn.sourceforge.net/tora/?rev=3370&view=rev Author: subik Date: 2009-12-23 15:23:08 +0000 (Wed, 23 Dec 2009) Log Message: ----------- fixes for pl/sql code on macosx. It requires unix eols Modified Paths: -------------- trunk/tora/src/toeditextensions.cpp trunk/tora/src/tomarkedtext.cpp Modified: trunk/tora/src/toeditextensions.cpp =================================================================== --- trunk/tora/src/toeditextensions.cpp 2009-12-21 19:00:45 UTC (rev 3369) +++ trunk/tora/src/toeditextensions.cpp 2009-12-23 15:23:08 UTC (rev 3370) @@ -193,14 +193,18 @@ toHighlightedText * t = qobject_cast<toHighlightedText*>(Current); if (!t) return; + QsciScintilla::EolMode em; if (snd == EolUnixAct) - t->convertEols(QsciScintilla::EolUnix); + em = QsciScintilla::EolUnix; else if (snd == EolMacAct) - t->convertEols(QsciScintilla::EolMac); + em = QsciScintilla::EolMac; else if (snd == EolWindowsAct) - t->convertEols(QsciScintilla::EolWindows); + em = QsciScintilla::EolWindows; else assert(0); + + t->convertEols(em); + t->setEolMode(em); } void toEditExtensions::gotoLine() Modified: trunk/tora/src/tomarkedtext.cpp =================================================================== --- trunk/tora/src/tomarkedtext.cpp 2009-12-21 19:00:45 UTC (rev 3369) +++ trunk/tora/src/tomarkedtext.cpp 2009-12-23 15:23:08 UTC (rev 3370) @@ -93,6 +93,12 @@ setMarginLineNumbers(0, true); setCallTipsStyle(CallTipsNone); + // WARNING: it looks like this hack is mandatory for macosx. Oracle simly + // doesn't understand mac's eols, so force to UNIX is a functional workaround +#ifdef Q_WS_MAC + setEolMode(QsciScintilla::EolUnix); +#endif + // search all occurrences // allow indicator painting *under* the text (but it makes editor slower a bit...) // It paints a colored box under the text for all occurrences of m_searchText. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |