...
 
Commits (4)
......@@ -1332,7 +1332,6 @@
<statusTip></statusTip>
</Action>
</Actions>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KritaShape/KisToolDyna">
......@@ -1345,26 +1344,6 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolCrop">
<icon></icon>
<text>Crop Tool</text>
<whatsThis></whatsThis>
<toolTip>Crop the image to an area</toolTip>
<iconText>Crop the image to an area</iconText>
<shortcut>C</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolPolygon">
<icon></icon>
<text>Polygon Tool</text>
<whatsThis></whatsThis>
<toolTip>Polygon Tool. Shift-mouseclick ends the polygon.</toolTip>
<iconText>Polygon Tool. Shift-mouseclick ends the polygon.</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KritaShape/KisToolRectangle">
<icon></icon>
<text>Rectangle Tool</text>
......@@ -1442,26 +1421,6 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolSelectPath">
<icon></icon>
<text>Bezier Curve Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Bezier Curve Selection Tool</toolTip>
<iconText>Bezier Curve Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolSelectSimilar">
<icon></icon>
<text>Similar Color Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Similar Color Selection Tool</toolTip>
<iconText>Similar Color Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KritaFill/KisToolFill">
<icon></icon>
<text>Fill Tool</text>
......@@ -1482,26 +1441,6 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolPencil">
<icon></icon>
<text>Freehand Path Tool</text>
<whatsThis></whatsThis>
<toolTip>Freehand Path Tool</toolTip>
<iconText>Freehand Path Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolPath">
<icon></icon>
<text>Bezier Curve Tool</text>
<whatsThis></whatsThis>
<toolTip>Bezier Curve Tool. Shift-mouseclick or double-click ends the curve.</toolTip>
<iconText>Bezier Curve Tool. Shift-mouseclick or double-click ends the curve.</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KritaShape/KisToolEllipse">
<icon></icon>
<text>Ellipse Tool</text>
......@@ -1532,26 +1471,6 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolSelectElliptical">
<icon></icon>
<text>Elliptical Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Elliptical Selection Tool</toolTip>
<iconText>Elliptical Selection Tool</iconText>
<shortcut>J</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolSelectContiguous">
<icon></icon>
<text>Contiguous Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Contiguous Selection Tool</toolTip>
<iconText>Contiguous Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KarbonPatternTool">
<icon></icon>
<text>Pattern editing</text>
......@@ -1582,16 +1501,6 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolSelectPolygonal">
<icon></icon>
<text>Polygonal Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Polygonal Selection Tool</toolTip>
<iconText>Polygonal Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KritaShape/KisToolMeasure">
<icon></icon>
<text>Measurement Tool</text>
......@@ -1602,16 +1511,6 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolSelectRectangular">
<icon></icon>
<text>Rectangular Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Rectangular Selection Tool</toolTip>
<iconText>Rectangular Selection Tool</iconText>
<shortcut>Ctrl+R</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KritaTransform/KisToolMove">
<icon></icon>
<text>Move Tool</text>
......@@ -1662,26 +1561,6 @@
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolPolyline">
<icon></icon>
<text>Polyline Tool</text>
<whatsThis></whatsThis>
<toolTip>Polyline Tool. Shift-mouseclick ends the polyline.</toolTip>
<iconText>Polyline Tool. Shift-mouseclick ends the polyline.</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisToolTransform">
<icon></icon>
<text>Transform Tool</text>
<whatsThis></whatsThis>
<toolTip>Transform a layer or a selection</toolTip>
<iconText>Transform a layer or a selection</iconText>
<shortcut>Ctrl+T</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
<Action name="KisAssistantTool">
<icon></icon>
<text>Assistant Tool</text>
......
......@@ -320,7 +320,7 @@ void KisActionRegistry::Private::loadActionFiles()
// Extract actions all XML .action files.
Q_FOREACH (const QString &actionDefinition, actionDefinitions) {
dbgAction << "\tLoading Action File" << actionDefinition;
qDebug() << "\tLoading Action File" << actionDefinition;
QDomDocument doc;
QFile f(actionDefinition);
f.open(QFile::ReadOnly);
......@@ -330,7 +330,7 @@ void KisActionRegistry::Private::loadActionFiles()
QString collectionName = base.attribute("name");
QString version = base.attribute("version");
if (version != "2") {
errAction << ".action XML file" << actionDefinition << "has incorrect version; skipping.";
qDebug() << ".action XML file" << actionDefinition << "has incorrect version; skipping.";
continue;
}
......@@ -346,16 +346,20 @@ void KisActionRegistry::Private::loadActionFiles()
// <action></action> tags
QDomElement actionXml = categoryTextNode.nextSiblingElement();
if (actionXml.isNull()) {
qWarning() << actionDefinition << "does not contain any valid actios! (Or the text element was left empty...)";
}
// Loop over individual actions
while (!actionXml.isNull()) {
if (actionXml.tagName() == "Action") {
// Read name from format <Action name="save">
QString name = actionXml.attribute("name");
dbgAction << "\t\tloading xml data for action" << name;
qDebug() << "\t\tloading xml data for action" << name;
// Bad things
if (name.isEmpty()) {
errAction << "Unnamed action in definitions file " << actionDefinition;
qDebug() << "Unnamed action in definitions file " << actionDefinition;
}
else if (actionInfoList.contains(name)) {
......
......@@ -1126,7 +1126,7 @@ class ChannelsToLayers(Extension):
lblPreviewSrc.setFixedWidth(imgThumbSrc.width() + 4)
vbxPreviewContainer.addWidget(lblPreviewSrc)
lblPreviewLblSrc = QLabel(i18n("Original"))
lblPreviewLblSrc = QLabel(i18nc("the original layer", "Original"))
lblPreviewLblSrc.setFixedWidth(imgThumbSrc.width() + 4)
vbxPreviewLblContainer.addWidget(lblPreviewLblSrc)
......
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Path Tool">
<text>Path Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KisToolPath">
<icon></icon>
<text>Bezier Curve Tool</text>
<whatsThis></whatsThis>
<toolTip>Bezier Curve Tool. Shift-mouseclick or double-click ends the curve.</toolTip>
<iconText>Bezier Curve Tool. Shift-mouseclick or double-click ends the curve.</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Pencil Tool">
<text>Pencil Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KisToolPencil">
<icon></icon>
<text>Freehand Path Tool</text>
<whatsThis></whatsThis>
<toolTip>Freehand Path Tool</toolTip>
<iconText>Freehand Path Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Contiguous Selection Tool">
<text>Contiguous Selection Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KisToolSelectContiguous">
<icon></icon>
<text>Contiguous Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Contiguous Selection Tool</toolTip>
<iconText>Contiguous Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Elliptical Selection Tool">
<text>Elliptical Selection Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KisToolSelectElliptical">
<icon></icon>
<text>Elliptical Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Elliptical Selection Tool</toolTip>
<iconText>Elliptical Selection Tool</iconText>
<shortcut>J</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Magnetic Selection Tool">
<text>Magnetic Selection Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KisToolSelectMagnetic">
<icon></icon>
<text>Magnetic Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Magnetic Curve Selection Tool</toolTip>
<iconText>Magnetic Curve Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Outline Selection Tool">
<text>Outline Selection Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KisToolSelectOutline">
<icon></icon>
<text>Outline Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Outline Selection Tool</toolTip>
<iconText>Outline Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Path Selection Tool">
<text>Path Selection Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KisToolSelectPath">
<icon></icon>
<text>Bezier Curve Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Bezier Curve Selection Tool</toolTip>
<iconText>Bezier Curve Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Polygonal Selection Tool">
<text>Polygonal Selection Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="Polygonal Selection Tool">
<whatsThis></whatsThis>
<toolTip>Polygonal Selection Tool</toolTip>
<iconText>Polygonal Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Rectangular Selection Tool">
<text>Rectangular Selection Tool</text>
<Actions category="Rectangular Selection Tool">
<text>Tool Shortcuts</text>
<Action name="KisToolSelectRectangular">
<icon></icon>
<text>Rectangular Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Rectangular Selection Tool</toolTip>
<iconText>Rectangular Selection Tool</iconText>
<shortcut>Ctrl+R</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Similar Selection Tool">
<text>Similar Selection Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KisToolSelectSimilar">
<icon></icon>
<text>Similar Color Selection Tool</text>
<whatsThis></whatsThis>
<toolTip>Similar Color Selection Tool</toolTip>
<iconText>Similar Color Selection Tool</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
......@@ -241,7 +241,7 @@
<statusTip/>
<isCheckable>false</isCheckable>
<text>Settings...</text>
</Action></Actions>
</Action>
<Action name="svg_pick_color">
<iconText>Colorpicker</iconText>
<shortcut></shortcut>
......@@ -251,5 +251,6 @@
<statusTip/>
<isCheckable>false</isCheckable>
<text>Color Picker</text>
</Action></Actions>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Crop Tool">
<text>Crop Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KisToolCrop">
<icon></icon>
<text>Crop Tool</text>
<whatsThis></whatsThis>
<toolTip>Crop the image to an area</toolTip>
<iconText>Crop the image to an area</iconText>
<shortcut>C</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Polygon Tool">
<text>Polygon Tool</text>
<text>Tool Shortcuts</text>
<Actions category="tool-shortcuts">
<Action name="KisToolPolygon">
<icon></icon>
<text>Polygon Tool</text>
<whatsThis></whatsThis>
<toolTip>Polygon Tool. Shift-mouseclick ends the polygon.</toolTip>
<iconText>Polygon Tool. Shift-mouseclick ends the polygon.</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Polyline Tool">
<text>Polyline Tool</text>
<Actions category="tool-shortcuts">
<text>Tool Shortcuts</text>
<Action name="KisToolPolyline">
<icon></icon>
<text>Polyline Tool</text>
<whatsThis></whatsThis>
<toolTip>Polyline Tool. Shift-mouseclick ends the polyline.</toolTip>
<iconText>Polyline Tool. Shift-mouseclick ends the polyline.</iconText>
<shortcut></shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>
<?xml version="1.0" encoding="UTF-8"?>
<ActionCollection version="2" name="Tools">
<Actions category="Transform Tool">
<text>Transform Tool</text>
<text>Tool Shortcuts</text>
<Actions category="tool-shortcuts">
<Action name="KisToolTransform">
<icon></icon>
<text>Transform Tool</text>
<whatsThis></whatsThis>
<toolTip>Transform a layer or a selection</toolTip>
<iconText>Transform a layer or a selection</iconText>
<shortcut>Ctrl+T</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
</Actions>
</ActionCollection>