Commit 901182a7 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Fixed using the tablet with the tools. Finally.

svn path=/trunk/koffice/; revision=443818
parent 936d41e9
......@@ -99,7 +99,6 @@ User Interface
* Fix layout problems in tool option widgets.
* Disable dragging the toolbox from dock position to dock position (see Karbon)
* Disable all relevant actions when a layer is locked or invisible. See bug #90456. Show locked status of current layer in statusbar.
* Fix locking of tools! (bsar)
* Add link check to new image dialog to sync width and height
* Rounding in opacity spinner is wrong: what starts out as 100% is actually not OPACITY_MAX...
* The description field in color settings is empty
......
......@@ -31,8 +31,6 @@ KisToolManager::KisToolManager(KisCanvasSubject * parent, KisCanvasControllerInt
: m_subject(parent),
m_controller(controller)
{
kdDebug() << "Toolmanager " << this << "created for canvassubject: " << parent << "\n";
m_toolBox = 0;
m_oldTool = 0;
m_dummyTool = 0;
......@@ -47,8 +45,6 @@ KisToolManager::~KisToolManager()
void KisToolManager::setUp(KisToolBox * toolbox, KoPaletteManager * paletteManager, KActionCollection * actionCollection)
{
kdDebug() << "Toolmanager " << this << " setup. Toolbox: " << toolbox << ", palettemanager: " << paletteManager << ", actioncollection: " << actionCollection << "\n";
m_toolBox = toolbox;
m_paletteManager = paletteManager;
m_actionCollection = actionCollection;
......@@ -198,7 +194,6 @@ void KisToolManager::setToolForInputDevice(enumInputDevice oldDevice, enumInputD
for (vKisTool::iterator it = tools.begin(); it != tools.end(); it++) {
KisTool *tool = *it;
KAction *toolAction = tool -> action();
connect(toolAction, SIGNAL(activated()), tool, SLOT(activate()));
}
}
......
......@@ -721,7 +721,6 @@ void KisView::setInputDevice(enumInputDevice inputDevice)
m_toolManager->setToolForInputDevice(m_inputDevice, inputDevice);
// XXX: This is incorrect
// On initialisation for an input device, set to eraser if the current input device
// is a wacom eraser, else to brush.
......@@ -733,12 +732,11 @@ void KisView::setInputDevice(enumInputDevice inputDevice)
m_paintop = KisID("paintbrush", "");
// XXX: Set the right entry in the paintop box
}
m_toolManager->setCurrentTool(m_toolManager->findTool("tool_brush", m_inputDevice));
}
#if 0 // XXX -- don't know why this is done?
else {
m_toolManager->setCurrentTool(currentTool());
else {
m_toolManager->setCurrentTool(m_toolManager->currentTool());
}
#endif
m_toolManager->activateCurrentTool();
}
......
......@@ -79,7 +79,6 @@ void KisToolBox::slotPressButton( int id )
void KisToolBox::slotButtonPressed( int id )
{
kdDebug() << "Button pressed " << id << " Total buttons: " << m_numberOfButtons << "\n";
if( id != m_buttonGroup->selectedId() && m_buttonGroup->selected() ) {
m_buttonGroup->selected()->setDown( false );
}
......
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