Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 24699 → Rev 24700

/trunk/Scribus/scribus/colormgmt/sclcmscolormgmtengineimpl.h
57,7 → 57,7
 
static DWORD translateFlagsToLcmsFlags(long flags);
static DWORD translateFormatToLcmsFormat(eColorFormat format);
static int translateIntentToLcmsIntent(eRenderIntent intent, eRenderIntent defaut = Intent_Relative_Colorimetric);
static int translateIntentToLcmsIntent(eRenderIntent intent, eRenderIntent default = Intent_Relative_Colorimetric);
static eColorSpaceType translateLcmsColorSpaceType(icColorSpaceSignature);
static eProfileClass translateLcmsProfileClass(icProfileClassSignature);
 
/trunk/Scribus/scribus/desaxe/simple_actions.h
113,7 → 113,7
 
/**
* Pushes a new object of type Obj_Type onto the stack which is initialized with the tag name.
* If no create method is given, Obj_Type needs a constructor which taks a Xml_string argument
* If no create method is given, Obj_Type needs a constructor which takes a Xml_string argument
*/
template<class Obj_Type>
class FactoryWithName_body : public Generator_body<Obj_Type>
/trunk/Scribus/scribus/pageitem.h
1853,7 → 1853,7
double m_height {0.0}; ///< Height of the item
double m_rotation {0.0}; ///< Rotation of the item
bool m_isSelected {false}; ///< Is the item selected?
bool m_imageVisible {true}; ///< Darstellungsart Bild/Titel
bool m_imageVisible {true}; ///< Is the image/title visible?
double m_imageXScale {1.0}; ///< Scaling X Factor for images
double m_imageYScale {1.0}; ///< Scaling Y Factor for images
double m_imageXOffset {0.0}; ///< Image X Offset to frame
/trunk/Scribus/scribus/pdflib_core.cpp
679,7 → 679,7
progressDialog->setOverallProgress(pc_exportmasterpages+pc_exportpages);
}
}
ret = true;//Even when aborting we return true. Don't want that "couldnt write msg"
ret = true;//Even when aborting we return true. Don't want that "couldn't write msg"
if (!abortExport)
{
if (PDF_IsPDFX(Options.Version))
/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
1303,7 → 1303,7
/**
An escape sequence is occurred, hence we will just append
the next character in buffer to the text. This will automatically
deal the occurrance of '\@' or '\:' or any other relevant escapes
deal the occurrence of '\@' or '\:' or any other relevant escapes
*/
m_textIndex = m_textIndex+1;
m_textToAppend.append( nextSymbol() );
/trunk/Scribus/scribus/plugins/scripter/doc/TUTORIAL
107,7 → 107,7
free articles on the internet available, e.g.:
* http://www.diveintopython.org/toc/index.html
* http://www.unix.com.ua/orelly/web/jscript/
For a C/C++ or PHP programmer the syntax of QtScript might be more appealling
For a C/C++ or PHP programmer the syntax of QtScript might be more appealing
because it's nearly the same. Python is suitable for beginners as well as computer
scientists.
Additionally Python provides powerful third-party libraries (database
/trunk/Scribus/scribus/plugins/scripter/python/sceditor/assist.py
95,7 → 95,7
 
 
def insert(self):
completition = self.items[self.list.currentRow()].value
completion = self.items[self.list.currentRow()].value
cursor = self.textedit.textCursor()
col = cursor.columnNumber()
line = unicode(cursor.block().text())
102,12 → 102,12
i = self.cursor_start_col
while i > 0:
#print `line[i:col]`
if completition.startswith(line[i:col]):
if completion.startswith(line[i:col]):
#print "break"
break
i -= 1
#print col,i
cursor.insertText(completition[col-i:])
cursor.insertText(completion[col-i:])
self.hide()
 
 
/trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
1327,7 → 1327,7
 
static char *effval_doc = const_cast<char*>(
"List of effection values for each saved page.\n"
"It is list of list of six integers. Those int has followin meaning:\n\t"
"It is a list of list of six integers. Those int have the following meaning:\n\t"
"- Length of time the page is shown before the presentation\n\tstarts on the selected page. (1-3600)\n\t"
"- Length of time the effect runs. (1 - 3600)\n\t\tA shorter time will speed up the effect,\n\t\ta longer one will slow it down\n\t"
"- Type of the display effect\n\t\t0 - No Effect\n\t\t1 - Blinds\n\t\t2 - Box\n\t\t3 - Dissolve\n\t\t4 - Glitter\n\t\t5 - Split\n\t\t6 - Wipe\n\t"
1337,7 → 1337,7
 
static char *lpival_doc = const_cast<char*>(
"Rendering Settings for individual colors.\n\n"
"This is list of values for each color\n"
"This is a list of values for each color\n"
"Color values have structure [siii] which stand for:\n\t"
"s - Color name ('Black', 'Cyan', 'Magenta', 'Yellow')\n\t"
"i - Frequency (10 to 1000)\n\t"
/trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.cpp
1327,7 → 1327,7
 
static char *effval_doc = const_cast<char*>(
"List of effection values for each saved page.\n"
"It is list of list of six integers. Those int has followin meaning:\n\t"
"It is a list of list of six integers. Those int has the following meaning:\n\t"
"- Length of time the page is shown before the presentation\n\tstarts on the selected page. (1-3600)\n\t"
"- Length of time the effect runs. (1 - 3600)\n\t\tA shorter time will speed up the effect,\n\t\ta longer one will slow it down\n\t"
"- Type of the display effect\n\t\t0 - No Effect\n\t\t1 - Blinds\n\t\t2 - Box\n\t\t3 - Dissolve\n\t\t4 - Glitter\n\t\t5 - Split\n\t\t6 - Wipe\n\t"
1337,7 → 1337,7
 
static char *lpival_doc = const_cast<char*>(
"Rendering Settings for individual colors.\n\n"
"This is list of values for each color\n"
"This is a list of values for each color\n"
"Color values have structure [siii] which stand for:\n\t"
"s - Color name ('Black', 'Cyan', 'Magenta', 'Yellow')\n\t"
"i - Frequency (10 to 1000)\n\t"
/trunk/Scribus/scribus/ui/newtemp.cpp
21,11 → 21,11
#include "scpage.h"
#include "scribusdoc.h"
 
NewTm::NewTm( QWidget* parent, const QString& text, const QString& titel, ScribusDoc *doc, const QString& answerText)
NewTm::NewTm( QWidget* parent, const QString& text, const QString& title, ScribusDoc *doc, const QString& answerText)
: QDialog( parent )
{
setModal(true);
setWindowTitle(titel);
setWindowTitle(title);
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
QueryLayout = new QVBoxLayout( this );
QueryLayout->setSpacing(6);
/trunk/Scribus/scribus/ui/newtemp.h
23,7 → 23,7
Q_OBJECT
 
public:
NewTm(QWidget* parent, const QString& text, const QString& titel, ScribusDoc *doc, const QString& answerText=QString() );
NewTm(QWidget* parent, const QString& text, const QString& title, ScribusDoc *doc, const QString& answerText=QString() );
~NewTm() {};
 
QPushButton* PushButton1;
/trunk/Scribus/scribus/ui/query.cpp
17,9 → 17,9
#include "ui/scmessagebox.h"
#include "iconmanager.h"
 
Query::Query( QWidget* parent, const char* name, bool modal, const QString& text, const QString& titel ) : QDialog( parent )
Query::Query( QWidget* parent, const char* name, bool modal, const QString& text, const QString& title ) : QDialog( parent )
{
setWindowTitle( titel );
setWindowTitle( title );
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
setModal(modal);
queryLayout = new QVBoxLayout( this );
/trunk/Scribus/scribus/ui/query.h
23,7 → 23,7
Q_OBJECT
 
public:
Query(QWidget* parent=nullptr, const char* name=nullptr, bool modal = false, const QString& text=0, const QString& titel=0 );
Query(QWidget* parent=nullptr, const char* name=nullptr, bool modal = false, const QString& text=0, const QString& title=0 );
~Query() {};
 
QString getEditText() const;
/trunk/Scribus/scribus/ui/smtextstyles.cpp
184,7 → 184,7
 
for (int i = 0; i < m_doc->m_Selection->count(); ++i)
{
// wth is going on here
// FIXME: wth is going on here
PageItem *item = m_doc->m_Selection->itemAt(i);
 
QString tmpName = item->itemText.defaultStyle().parent();
1978,7 → 1978,7
 
for (int i = 0; i < m_doc->m_Selection->count(); ++i)
{
// wth is going on here
// FIXME: wth is going on here
PageItem *item = m_doc->m_Selection->itemAt(i);
 
QString tmpName = item->itemText.defaultStyle().charStyle().parent();