Commit 3d6701f3 authored by Casper Boemann's avatar Casper Boemann

------------------------------------------------------------------------

r1194209 | scripty | 2010-11-08 11:07:35 +0100 (Mon, 08 Nov 2010) | 1 line
Changed paths:
   M /trunk/koffice/libs/main/kodocinfopropspage.desktop
   M /trunk/koffice/libs/main/kofficedocker.desktop

SVN_SILENT made messages (.desktop file)

------------------------------------------------------------------------
r1194219 | rempt | 2010-11-08 11:33:37 +0100 (Mon, 08 Nov 2010) | 1 line
Changed paths:
   M /trunk/koffice/CMakeLists.txt

Do not compile krita if we have no lcms at all.

------------------------------------------------------------------------
r1194245 | danders | 2010-11-08 13:49:48 +0100 (Mon, 08 Nov 2010) | 2 lines
Changed paths:
   M /trunk/koffice/kplato/libs/models/kptdurationspinbox.cpp

Duration spinbox: Limit unit to min/max also when entering from keyboard.

------------------------------------------------------------------------
r1194246 | danders | 2010-11-08 13:53:17 +0100 (Mon, 08 Nov 2010) | 3 lines
Changed paths:
   M /trunk/koffice/kplato/libs/kernel/kptcalendar.cpp
   M /trunk/koffice/kplato/libs/kernel/kptcalendar.h
   M /trunk/koffice/kplato/libs/kernel/kptnode.cpp
   M /trunk/koffice/kplato/libs/kernel/kptnode.h
   M /trunk/koffice/kplato/libs/kernel/tests/EstimateTester.cpp
   M /trunk/koffice/kplato/libs/ui/kptusedefforteditor.cpp
   M /trunk/koffice/kplato/libs/ui/kptusedefforteditor.h

Fix rounding problem when scaling estimates.
Use the configured min/max duration units in the used effort editor.


------------------------------------------------------------------------
r1194249 | lassin | 2010-11-08 13:57:30 +0100 (Mon, 08 Nov 2010) | 2 lines
Changed paths:
   M /trunk/koffice/filters/kpresenter/pptx/PptxXmlSlideReader.cpp
   M /trunk/koffice/filters/kpresenter/pptx/PptxXmlSlideReader.h
   M /trunk/koffice/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h
   M /trunk/koffice/filters/libmsooxml/MsooXmlCommonReaderDrawingMLMethods.h
   M /trunk/koffice/filters/libmsooxml/MsooXmlUtils.h

Fixed pptx text shrinking so that value can be received also from masterslide.


------------------------------------------------------------------------
r1194251 | rempt | 2010-11-08 14:09:01 +0100 (Mon, 08 Nov 2010) | 1 line
Changed paths:
   M /trunk/koffice/CMakeLists.txt

LCMS 2 is new enough as well.

------------------------------------------------------------------------
r1194267 | lassin | 2010-11-08 15:14:12 +0100 (Mon, 08 Nov 2010) | 2 lines
Changed paths:
   M /trunk/koffice/filters/libmsooxml/MsooXmlUtils.cpp

Fixed bullet character of drawingML to be empty when not specified.


------------------------------------------------------------------------
r1194290 | rempt | 2010-11-08 16:19:36 +0100 (Mon, 08 Nov 2010) | 1 line
Changed paths:
   M /trunk/koffice/plugins/chartshape/PlotArea.cpp

proper fix for warning

------------------------------------------------------------------------
r1194297 | jsimon | 2010-11-08 16:35:22 +0100 (Mon, 08 Nov 2010) | 1 line
Changed paths:
   M /trunk/koffice/plugins/chartshape/PlotArea.cpp

Follow-up to boud's warning fixes

------------------------------------------------------------------------
r1194304 | cfeck | 2010-11-08 17:22:11 +0100 (Mon, 08 Nov 2010) | 2 lines
Changed paths:
   M /trunk/koffice/kplato/libs/kernel/kptnode.cpp

SVN_SILENT return


------------------------------------------------------------------------
r1194486 | zachmann | 2010-11-09 05:38:28 +0100 (Tue, 09 Nov 2010) | 8 lines
Changed paths:
   M /trunk/koffice/karbon/data/karbonrc
   M /trunk/koffice/krita/data/kritarc
   M /trunk/koffice/kspread/kspreadrc
   M /trunk/koffice/kword/part/kwordrc
   M /trunk/koffice/libs/flake/KoToolRegistry.cpp

Honor plugin configuration

Pass the configuration to the plugin loader so it is honored.
Don't load kpresenter plugins in other apps

BUG: 251970
BUG: 251973



svn path=/branches/work/koffice-essen/; revision=1194490
parent 8a7fabe7
......@@ -216,6 +216,14 @@ else(LCMS_FOUND AND NOT LCMS_VERSION LESS ${REQUIRED_LCMS_VERSION})
set(HAVE_LCMS FALSE)
endif(LCMS_FOUND AND NOT LCMS_VERSION LESS ${REQUIRED_LCMS_VERSION})
macro_optional_find_package(LCMS2)
if(LCMS2_FOUND)
set(HAVE_REQUIRED_LCMS_VERSION TRUE)
set(HAVE_LCMS TRUE)
endif(LCMS2_FOUND)
macro_log_feature(HAVE_REQUIRED_LCMS_VERSION "LittleCMS" "Color management engine" "http://www.littlecms.com" FALSE "1.18" "Required for color management and Krita")
#Set the build of TextShape changetraker
......@@ -347,9 +355,9 @@ if(NOT Boost_FOUND)
endif(NOT Boost_FOUND)
### Krita: pigment, blitz, eigen2, exiv2
if(NOT BLITZ_FOUND OR NOT EIGEN2_FOUND OR NOT EXIV2_FOUND)
if(NOT BLITZ_FOUND OR NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION)
set(SHOULD_BUILD_KRITA FALSE)
endif(NOT BLITZ_FOUND OR NOT EIGEN2_FOUND OR NOT EXIV2_FOUND)
endif(NOT BLITZ_FOUND OR NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION)
### KPlato: kdepimlibs
if(NOT KdepimLibs_FOUND)
......
......@@ -149,7 +149,7 @@ QuickShapes=ArtisticText,TextShapeID,DivineProportionShapeID,EllipseShape,Rectan
FlakePluginsDisabled=formulashape,divineproportionshape,kexirelationdesignshape,vectorshape
ShapePluginsDisabled=musicshape,pictureshape,videoshape,chartshape,spreadsheetshape,pluginshape,treeshape
TextEditingPluginsDisabled=thesaurustool,changecase,autocorrect,spellcheck
TextVariablePluginsDisabled=textvariables,kprvariables
TextInlinePluginsDisabled=textvariables,kprvariables
ToolPluginsDisabled=paragraphtool,kopabackgroundtool,kpresentertoolanimation
[favoriteList]
......
......@@ -44,11 +44,13 @@ void KoToolRegistry::init()
config.blacklist = "FlakePluginsDisabled";
config.group = "koffice";
KoPluginLoader::instance()->load(QString::fromLatin1("KOffice/Flake"),
QString::fromLatin1("[X-Flake-MinVersion] <= 0"));
QString::fromLatin1("[X-Flake-MinVersion] <= 0"),
config);
config.whiteList = "ToolPlugins";
config.blacklist = "ToolPluginsDisabled";
KoPluginLoader::instance()->load(QString::fromLatin1("KOffice/Tool"),
QString::fromLatin1("[X-Flake-MinVersion] <= 0"));
QString::fromLatin1("[X-Flake-MinVersion] <= 0"),
config);
// register generic tools
add(new KoCreatePathToolFactory());
......
......@@ -38,6 +38,7 @@ Name[ne]=केडीई कार्यालय कागजात सूच
Name[nl]=KOffice Document Info Eigenschappen Pagina
Name[pl]=Strona właściwości dokumentu KOffice
Name[pt]=Página de Propriedades do Documento do KOffice
Name[pt_BR]=Página de propriedades do documento do KOffice
Name[ro]=Pagină proprietăți document KOffice
Name[ru]=Страница сведений о документе KOffice
Name[sl]=Stran z lastnostmi dokumenta za KOffice
......
......@@ -25,7 +25,7 @@ Name[nds]=KOffice-Dockermoduul
Name[ne]=केडीई कार्यालय डकर प्लगइन
Name[nl]=KOffice-werkplekplugin
Name[pt]='Plugin' Acoplável do KOffice
Name[pt_BR]=Plug-in Acoplável do KOffice
Name[pt_BR]=Plug-in acoplável do KOffice
Name[sv]=Koffice dockningsinsticksprogram
Name[tr]=KOffice Docker Eklentisi
Name[uk]=Додаток панелі для KOffice
......
......@@ -77,7 +77,6 @@
#include "ChartProxyModel.h"
#include "ScreenConversions.h"
#include "Layout.h"
#include "OdfLoadingHelper.h"
using namespace KChart;
......@@ -236,9 +235,9 @@ void PlotArea::Private::initAxes()
automaticallyHiddenAxisTitles.removeAll( axis->title() );
delete axis;
}
// There need to be at least these two axes. Do not delete, but
// hide them instead.
// Axis *xAxis = new Axis( q, XAxisDimension );
// There need to be at least these two axes. Their constructor will
// automatically add them to the plot area as child shape.
new Axis( q, XAxisDimension );
Axis *yAxis = new Axis( q, YAxisDimension );
yAxis->setShowMajorGrid( true );
}
......@@ -606,8 +605,6 @@ bool PlotArea::loadOdf( const KoXmlElement &plotAreaElement,
loadOdfAttributes( plotAreaElement, context, OdfAllAttributes );
// OdfLoadingHelper *helper = (OdfLoadingHelper*)context.sharedData( OdfLoadingHelperId );
// First step is to load the axis. Datasets are attached to an
// axis and we need the axis to check for categories.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment