Commit bd594cab authored by Halla Rempt's avatar Halla Rempt

* Ran fixuifiles

* Removed some empty implementation files
* Some work on the docker plugin structure.

svn path=/trunk/koffice/; revision=401690
parent 61a8ab8d
......@@ -52,14 +52,21 @@ Menus
Selections
* On change to a layer without a selection, do not show selection.
* Filters generally work on the selection rect, not on just the
selected pixels.
* Select freehand (drawing a shape and selecting the contents) does not work
* Magic wand does not work
* Select by color(range) does not work
* Other selection menu options are not implemented either, except for
invert.
* The shape tools should (with filled as default) also be available as
selection tools.
Gradients
* Selecting an autogradient should update the control box
Painting
* Painting should check image borders, because the current situation
creates way big layers with just a dash of the mouse.
* The shapes tools should offer a filled shape option
Color models
......@@ -76,4 +83,11 @@ Flatten
Filters
* Autocontrast does not use the progress bar and is not cancelable.
\ No newline at end of file
* Autocontrast does not use the progress bar and is not cancelable.
Import/Export
* The image magick build should be ported to the fileformat framework
and put in its own plugin (KisFileFormat, KisFileFormatRegistry)
* The image magick plugin should use KisAnnotation to preserve image
data on roundtrips.
......@@ -35,7 +35,7 @@ libkritacore_la_SOURCES = kis_paint_device.cc kis_layer.cc kis_image.cc \
kis_doc.cc kis_view.cc kis_factory.cc kis_nameserver.cc kis_painter.cc \
kis_fill_painter.cc kis_gradient_painter.cc kis_convolution_painter.cc kis_cursor.cc \
kis_selection.cc kis_command.cc kis_background.cc kis_config.cc \
kis_guide.cc kis_canvas_controller.cc kis_canvas_observer.cc \
kis_guide.cc kis_canvas_observer.cc \
kis_transaction.cc kis_vec.cc kis_rect.cc kis_iterators_pixel.cc \
KRayonViewIface.cc KRayonViewIface.skel KIsDocIface.cc KIsDocIface.skel KIsImageIface.cc \
KIsImageIface.skel kis_selection_manager.cc kis_scale_visitor.cc kis_transform_visitor.cc \
......
/*
* Copyright (c) 2003 Patrick Julien <freak@codepimps.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "kis_canvas_controller.h"
KisCanvasControllerInterface::KisCanvasControllerInterface()
{
}
KisCanvasControllerInterface::~KisCanvasControllerInterface()
{
}
......@@ -31,8 +31,8 @@ class KisPoint;
class KisCanvasControllerInterface {
public:
KisCanvasControllerInterface();
virtual ~KisCanvasControllerInterface();
KisCanvasControllerInterface() {};
virtual ~KisCanvasControllerInterface() {};
public:
virtual QWidget *canvas() const = 0;
......
......@@ -21,7 +21,6 @@
#include <qclipboard.h>
#include <qdockwindow.h>
#include <qwidget.h>
#include <qtoolbox.h>
#include <kdebug.h>
#include <kaction.h>
......@@ -65,7 +64,7 @@ KisDockerManager::KisDockerManager(KisView * view, KActionCollection * ac)
{
m_tabs = new KisGenericRegistry<QWidget*>();
m_dockWindows = new KisGenericRegistry<KisDockFrameDocker*>();
m_toolBoxes = new KisGenericRegistry<QToolBox*>();
m_toolBoxes = new KisGenericRegistry<KisPaintBox*>();
m_sliders = new KisGenericRegistry<KoTabbedToolDock*>();
// XXX: Old way, moved from KisView
......@@ -107,17 +106,46 @@ KisDockerManager::~KisDockerManager()
}
void KisDockerManager::addDockerTab(QWidget * tab, const QString & docker, enumDockerStyle docktype)
void KisDockerManager::addDockerTab(QWidget * tab, const KisID & docker, enumDockerStyle docktype)
{
m_tabs -> add(KisID(tab -> name(), tab -> caption()), tab);
if (docktype == DOCKER_DOCKER) {
if (m_dockWindows -> exists(docker)) {
KisDockFrameDocker * d = m_dockWindows -> get(docker);
d -> plug(tab);
}
else {
KisDockFrameDocker * d = new KisDockFrameDocker(m_view);
d -> setCaption(docker.name());
m_dockWindows -> add(docker, d);
d -> plug(tab);
}
}
else if (docktype == DOCKER_SLIDER) {
if (m_sliders -> exists(docker)) {
KoTabbedToolDock * d = m_sliders -> get(docker);
d -> plug(tab);
}
else {
KoTabbedToolDock * d = new KoTabbedToolDock(m_view);
d -> setCaption(docker.name());
m_sliders -> add(docker, d);
d -> plug(tab);
}
}
else if (docktype == DOCKER_TOOLBOX) {
if (m_toolBoxes -> exists(docker)) {
KisPaintBox * d = m_toolBoxes -> get(docker);
d -> plug(tab);
}
else {
KisPaintBox * d = new KisPaintBox(m_view);
d -> setCaption(docker.name());
m_toolBoxes -> add(docker, d);
d -> plug(tab);
}
}
}
void KisDockerManager::unsetToolOptionWidget(KisTool * oldTool)
......
......@@ -34,7 +34,6 @@ class KisDockFrameDocker;
class KoTabbedToolDock;
class KoToolDockManager;
class QWidget;
class QToolBox;
class KisTool;
class KisPattern;
class KisBrush;
......@@ -62,6 +61,20 @@ class KisResourceMediator;
*
* There are three kinds of dockers: sliding dockers, shading
* dockers and toolboxes.
*
* Tabs are created by calling addDockerTab with a widget (the tab)
* and a KisID (a combination of language-independent identifying
* string and a caption). If there is already a docker with the
* identifying string, then the tab is added to that docker,
* otherwise a new docker is created.
*
* On application shutdown, the configuration is saved. Next time
* on startup, if a tab is added, we first look in the saved configuation,
* and if a tab and docker is present with the specified identifying
* string, then we restore that tab in that place, otherwise in the
* specified place.
*
* XXX: for post 1.4: make sure we can drag & drop widgets.
*/
class KRITACORE_EXPORT KisDockerManager : public QObject {
......@@ -72,7 +85,7 @@ public:
KisDockerManager(KisView * view, KActionCollection * ac);
virtual ~KisDockerManager();
void addDockerTab(QWidget * tab, const QString & docker, enumDockerStyle docktype);
void addDockerTab(QWidget * tab, const KisID & docker, enumDockerStyle docktype);
void setToolOptionWidget(KisTool * oldTool, KisTool * newTool);
void unsetToolOptionWidget(KisTool * oldTool);
......@@ -82,7 +95,7 @@ private:
KisGenericRegistry<QWidget*> * m_tabs;
KisGenericRegistry<KisDockFrameDocker*> * m_dockWindows;
KisGenericRegistry<QToolBox*> * m_toolBoxes;
KisGenericRegistry<KisPaintBox*> * m_toolBoxes;
KisGenericRegistry<KoTabbedToolDock*> * m_sliders;
KisView * m_view;
......
......@@ -11,13 +11,9 @@ noinst_LTLIBRARIES = libkistool.la
libkistool_la_SOURCES = \
kis_tool.cc \
kis_tool_registry.cc \
kis_tool_controller.cc \
kis_tool_paint.cc \
kis_tool_freehand.cc \
kis_tool_non_paint.cc
noinst_HEADERS = \
kis_tool_controller.h
libkistool_la_METASOURCES = AUTO
/*
* Copyright (c) 2003 Patrick Julien <freak@codepimps.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "kis_tool_controller.h"
KisToolControllerInterface::KisToolControllerInterface()
{
}
KisToolControllerInterface::~KisToolControllerInterface()
{
}
......@@ -23,8 +23,8 @@ class KisTool;
class KisToolControllerInterface {
public:
KisToolControllerInterface();
virtual ~KisToolControllerInterface();
KisToolControllerInterface() {};
virtual ~KisToolControllerInterface() {};
public:
virtual void setCurrentTool(KisTool *tool) = 0;
......
# Definition of the service type
SUBDIRS = colorspace_rgb colorspace_gray colorspace_cmyk #colorspace_ws
SUBDIRS = colorspace_rgb colorspace_gray #colorspace_cmyk colorspace_ws
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>WdgCImg</class>
<widget class="QWidget">
<property name="name">
......@@ -26,9 +26,6 @@
<property name="text">
<string>&amp;Refresh preview</string>
</property>
<property name="accel">
<string>Alt+R</string>
</property>
</widget>
<widget class="QLabel" row="0" column="1" rowspan="1" colspan="2">
<property name="name">
......
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>WdgConvertColorSpace</class>
<widget class="QWidget">
<property name="name">
......
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>WdgImageSize</class>
<widget class="QWidget">
<property name="name">
......@@ -170,9 +170,6 @@
<property name="text">
<string>&amp;Constrain proportions</string>
</property>
<property name="accel">
<string>Alt+C</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
......@@ -269,9 +266,6 @@
<property name="text">
<string>&amp;Crop layers on image resize.</string>
</property>
<property name="accel">
<string>Alt+C</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
......@@ -300,9 +294,6 @@
<property name="text">
<string>&amp;Scale</string>
</property>
<property name="accel">
<string>Alt+S</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
......
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>WdgPerfTest</class>
<widget class="QWidget">
<property name="name">
......
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>WdgRotateImage</class>
<widget class="QWidget">
<property name="name">
......@@ -37,9 +37,6 @@
<property name="text">
<string>90 &amp;degrees</string>
</property>
<property name="accel">
<string>Alt+D</string>
</property>
</widget>
<widget class="QRadioButton">
<property name="name">
......@@ -48,9 +45,6 @@
<property name="text">
<string>180 d&amp;egrees</string>
</property>
<property name="accel">
<string>Alt+E</string>
</property>
</widget>
<widget class="QRadioButton">
<property name="name">
......@@ -59,9 +53,6 @@
<property name="text">
<string>270 de&amp;grees</string>
</property>
<property name="accel">
<string>Alt+G</string>
</property>
</widget>
<widget class="QLayoutWidget">
<property name="name">
......@@ -78,9 +69,6 @@
<property name="text">
<string>&amp;Custom:</string>
</property>
<property name="accel">
<string>Alt+C</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
......@@ -180,9 +168,6 @@
<property name="text">
<string>&amp;Update</string>
</property>
<property name="accel">
<string>Alt+U</string>
</property>
</widget>
</vbox>
</widget>
......@@ -293,9 +278,6 @@
<property name="text">
<string>C&amp;lockwise</string>
</property>
<property name="accel">
<string>Alt+L</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
......@@ -307,9 +289,6 @@
<property name="text">
<string>Cou&amp;nter-clockwise</string>
</property>
<property name="accel">
<string>Alt+N</string>
</property>
</widget>
</grid>
</widget>
......
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>WdgToolStar</class>
<widget class="QWidget">
<property name="name">
......
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>WdgColorSettings</class>
<widget class="QWidget">
<property name="name">
......@@ -267,9 +267,6 @@ colors (Pantone, TruMatch, logo colors, ...)</string>
<property name="text">
<string>&amp;Relative colorimetric</string>
</property>
<property name="accel">
<string>Alt+R</string>
</property>
<property name="whatsThis" stdset="0">
<string>Within and outside gamut; same as Absolute
Colorimetric. White point changed to result in
......
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>WdgNewImage</class>
<widget class="QWidget">
<property name="name">
......
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