diff options
Diffstat (limited to 'karbon')
-rw-r--r-- | karbon/CHANGES | 2 | ||||
-rw-r--r-- | karbon/GRAPHICS_MEETING | 2 | ||||
-rw-r--r-- | karbon/TODO | 2 | ||||
-rw-r--r-- | karbon/karbon_factory.cc | 4 | ||||
-rw-r--r-- | karbon/tools/vcurvefit.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vdefaulttools.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vellipsetool.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vellipsetool.h | 2 | ||||
-rw-r--r-- | karbon/tools/vpenciltool.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vpolygontool.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vpolygontool.h | 2 | ||||
-rw-r--r-- | karbon/tools/vpolylinetool.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vrectangletool.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vrectangletool.h | 2 | ||||
-rw-r--r-- | karbon/tools/vroundrecttool.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vroundrecttool.h | 2 | ||||
-rw-r--r-- | karbon/tools/vshapetool.cc | 4 | ||||
-rw-r--r-- | karbon/tools/vsinustool.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vsinustool.h | 2 | ||||
-rw-r--r-- | karbon/tools/vspiraltool.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vspiraltool.h | 2 | ||||
-rw-r--r-- | karbon/tools/vstartool.cc | 2 | ||||
-rw-r--r-- | karbon/tools/vstartool.h | 2 | ||||
-rw-r--r-- | karbon/widgets/vruler.h | 2 |
24 files changed, 26 insertions, 26 deletions
diff --git a/karbon/CHANGES b/karbon/CHANGES index 3241a4a5..a8bee6dc 100644 --- a/karbon/CHANGES +++ b/karbon/CHANGES @@ -8,7 +8,7 @@ These are changes that can not be backported, and will be available from KOffice - How to bring back the overview window if you close it? (#111717) - Rename plugins menu to "Effect" (#111618) - Change Align Center (Vertical) to Align Middle and add some extra separators (#109520) -- Keybindings like krita, and other tweak (#108789) +- Keybindings like chalk, and other tweak (#108789) - Always use this document at startup, Karbon has not way to stop doing this (#108755) Add a basic karbon template - Dockers now use the KoPalette library. This means a huge improvement when it comes to docker management. diff --git a/karbon/GRAPHICS_MEETING b/karbon/GRAPHICS_MEETING index c5eaddd8..d945ca80 100644 --- a/karbon/GRAPHICS_MEETING +++ b/karbon/GRAPHICS_MEETING @@ -1,7 +1,7 @@ Ideas from graphics meeting (but also in my head before it): - use QPainterPath, get rid of libart -- use color profiles/matching (krita?) +- use color profiles/matching (chalk?) - get rid of the old freetype code to convert text to path, use QPainterPath::addText instead. - use koText for text boxes? diff --git a/karbon/TODO b/karbon/TODO index 9c268232..1c98b1da 100644 --- a/karbon/TODO +++ b/karbon/TODO @@ -74,7 +74,7 @@ TODO: - write odf enhanced-path parser (use some code from svgpathparser in lib) WISHLIST: -- krita export filter (with layers) +- chalk export filter (with layers) - add a nice grid-like shape like in Illu and webdraw - pdf import filter (based on poppler) diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc index e230dea7..d8356184 100644 --- a/karbon/karbon_factory.cc +++ b/karbon/karbon_factory.cc @@ -112,10 +112,10 @@ KarbonFactory::instance() // Add any application-specific resource directories here s_instance->dirs()->addResourceType( "kis_brushes", - KStandardDirs::kde_default( "data" ) + "krita/brushes/" ); + KStandardDirs::kde_default( "data" ) + "chalk/brushes/" ); s_instance->dirs()->addResourceType( "kis_pattern", - KStandardDirs::kde_default( "data" ) + "krita/patterns/" ); + KStandardDirs::kde_default( "data" ) + "chalk/patterns/" ); s_instance->dirs()->addResourceType( "karbon_gradient", KStandardDirs::kde_default( "data" ) + "karbon/gradients/" ); diff --git a/karbon/tools/vcurvefit.cc b/karbon/tools/vcurvefit.cc index 42b90a13..fee361c2 100644 --- a/karbon/tools/vcurvefit.cc +++ b/karbon/tools/vcurvefit.cc @@ -26,7 +26,7 @@ #include <core/vglobal.h> #include <render/vpainter.h> #include <render/vpainterfactory.h> -#include <commands/vtqshapecmd.h> +#include <commands/vshapecmd.h> /* An Algorithm for Automatically Fitting Digitized Curves diff --git a/karbon/tools/vdefaulttools.cc b/karbon/tools/vdefaulttools.cc index f26bcf52..ecc5e048 100644 --- a/karbon/tools/vdefaulttools.cc +++ b/karbon/tools/vdefaulttools.cc @@ -37,7 +37,7 @@ #include "vroundrecttool.h" #include "vselectnodestool.h" #include "vselecttool.h" -#include "vtqshapetool.h" +#include "vshapetool.h" #include "vsheartool.h" #include "vsinustool.h" #include "vspiraltool.h" diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc index ff68c350..49e80ec8 100644 --- a/karbon/tools/vellipsetool.cc +++ b/karbon/tools/vellipsetool.cc @@ -29,7 +29,7 @@ #include <karbon_view.h> #include <karbon_part.h> -#include <tqshapes/vellipse.h> +#include <shapes/vellipse.h> #include "vellipsetool.h" #include "vglobal.h" diff --git a/karbon/tools/vellipsetool.h b/karbon/tools/vellipsetool.h index f0276779..c07d2e77 100644 --- a/karbon/tools/vellipsetool.h +++ b/karbon/tools/vellipsetool.h @@ -22,7 +22,7 @@ #include <kdialogbase.h> -#include "vtqshapetool.h" +#include "vshapetool.h" class KoUnitDoubleSpinBox; class KComboBox; diff --git a/karbon/tools/vpenciltool.cc b/karbon/tools/vpenciltool.cc index 7347e0f9..587182de 100644 --- a/karbon/tools/vpenciltool.cc +++ b/karbon/tools/vpenciltool.cc @@ -45,7 +45,7 @@ #include <render/vpainter.h> #include <render/vpainterfactory.h> #include "vpenciltool.h" -#include <commands/vtqshapecmd.h> +#include <commands/vshapecmd.h> #include "vcurvefit.h" diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc index a9584be6..8fd8d740 100644 --- a/karbon/tools/vpolygontool.cc +++ b/karbon/tools/vpolygontool.cc @@ -27,7 +27,7 @@ #include <karbon_view.h> #include <karbon_part.h> -#include <tqshapes/vstar.h> +#include <shapes/vstar.h> #include "vpolygontool.h" VPolygonTool::VPolygonOptionsWidget::VPolygonOptionsWidget( KarbonView *view, TQWidget* tqparent, const char* name ) diff --git a/karbon/tools/vpolygontool.h b/karbon/tools/vpolygontool.h index c74ad182..227e9d37 100644 --- a/karbon/tools/vpolygontool.h +++ b/karbon/tools/vpolygontool.h @@ -22,7 +22,7 @@ #include <kdialogbase.h> -#include "vtqshapetool.h" +#include "vshapetool.h" class KoUnitDoubleSpinBox; class KIntSpinBox; diff --git a/karbon/tools/vpolylinetool.cc b/karbon/tools/vpolylinetool.cc index 673503f9..083ee1ea 100644 --- a/karbon/tools/vpolylinetool.cc +++ b/karbon/tools/vpolylinetool.cc @@ -35,7 +35,7 @@ #include <render/vpainter.h> #include <render/vpainterfactory.h> #include "vpolylinetool.h" -#include <commands/vtqshapecmd.h> +#include <commands/vshapecmd.h> #include <commands/vcommand.h> #include <widgets/vcanvas.h> diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc index 9d19edd2..d3668fc4 100644 --- a/karbon/tools/vrectangletool.cc +++ b/karbon/tools/vrectangletool.cc @@ -25,7 +25,7 @@ #include <karbon_view.h> #include <karbon_part.h> -#include <tqshapes/vrectangle.h> +#include <shapes/vrectangle.h> #include "vrectangletool.h" #include <KoUnitWidgets.h> diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h index d38ead75..2b71e27e 100644 --- a/karbon/tools/vrectangletool.h +++ b/karbon/tools/vrectangletool.h @@ -24,7 +24,7 @@ #include <klocale.h> #include <kdialogbase.h> -#include "vtqshapetool.h" +#include "vshapetool.h" class KarbonView; class TQLabel; diff --git a/karbon/tools/vroundrecttool.cc b/karbon/tools/vroundrecttool.cc index a211114f..0e97530f 100644 --- a/karbon/tools/vroundrecttool.cc +++ b/karbon/tools/vroundrecttool.cc @@ -25,7 +25,7 @@ #include <karbon_view.h> #include <karbon_part.h> -#include <tqshapes/vrectangle.h> +#include <shapes/vrectangle.h> #include "vroundrecttool.h" #include "KoUnitWidgets.h" diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h index 9ab0c3fb..9b70bf27 100644 --- a/karbon/tools/vroundrecttool.h +++ b/karbon/tools/vroundrecttool.h @@ -25,7 +25,7 @@ #include <knuminput.h> -#include "vtqshapetool.h" +#include "vshapetool.h" class KarbonView; class KarbonPart; diff --git a/karbon/tools/vshapetool.cc b/karbon/tools/vshapetool.cc index 4f46c317..49197773 100644 --- a/karbon/tools/vshapetool.cc +++ b/karbon/tools/vshapetool.cc @@ -28,8 +28,8 @@ #include "vglobal.h" #include "vpainter.h" #include "vpainterfactory.h" -#include "vtqshapecmd.h" -#include "vtqshapetool.h" +#include "vshapecmd.h" +#include "vshapetool.h" #include "vselection.h" #include "vcursor.h" diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc index a520afba..4982141b 100644 --- a/karbon/tools/vsinustool.cc +++ b/karbon/tools/vsinustool.cc @@ -27,7 +27,7 @@ #include <karbon_view.h> #include <karbon_part.h> -#include <tqshapes/vsinus.h> +#include <shapes/vsinus.h> #include "vsinustool.h" #include "KoUnitWidgets.h" diff --git a/karbon/tools/vsinustool.h b/karbon/tools/vsinustool.h index 1ad343a2..8e2adfc3 100644 --- a/karbon/tools/vsinustool.h +++ b/karbon/tools/vsinustool.h @@ -21,7 +21,7 @@ #define __VSINUSTOOL_H__ #include <kdialogbase.h> -#include "vtqshapetool.h" +#include "vshapetool.h" class KoUnitDoubleSpinBox; class KIntSpinBox; diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc index a9a361f5..58401309 100644 --- a/karbon/tools/vspiraltool.cc +++ b/karbon/tools/vspiraltool.cc @@ -26,7 +26,7 @@ #include <karbon_view.h> #include <karbon_part.h> -#include <tqshapes/vspiral.h> +#include <shapes/vspiral.h> #include "vspiraltool.h" #include "KoUnitWidgets.h" diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h index c9c4d388..9a09bd83 100644 --- a/karbon/tools/vspiraltool.h +++ b/karbon/tools/vspiraltool.h @@ -23,7 +23,7 @@ #include <kdialogbase.h> #include <klocale.h> -#include "vtqshapetool.h" +#include "vshapetool.h" class KComboBox; class KoUnitDoubleSpinBox; diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc index fbad70ce..6110969a 100644 --- a/karbon/tools/vstartool.cc +++ b/karbon/tools/vstartool.cc @@ -26,7 +26,7 @@ #include <karbon_view.h> #include <karbon_part.h> -#include <tqshapes/vstar.h> +#include <shapes/vstar.h> #include "vstartool.h" #include "KoUnitWidgets.h" diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h index 89af45db..3ab94916 100644 --- a/karbon/tools/vstartool.h +++ b/karbon/tools/vstartool.h @@ -23,7 +23,7 @@ #include <klocale.h> #include <kdialogbase.h> -#include "vtqshapetool.h" +#include "vshapetool.h" class KoUnitDoubleSpinBox; diff --git a/karbon/widgets/vruler.h b/karbon/widgets/vruler.h index a97b4cf0..47458039 100644 --- a/karbon/widgets/vruler.h +++ b/karbon/widgets/vruler.h @@ -25,7 +25,7 @@ #include <KoUnit.h> // XXX: Make this look more like the KOffice ruler -- the KOffice -// ruler is not quite suited to Krita. Also: start units with 0, +// ruler is not quite suited to Chalk. Also: start units with 0, // print every 100 units. class TQPainter; |