Version: 1.5.9 (using KDE 3.5.3, compiled sources) Compiler: Target: x86_64-linux-gnu OS: Linux (x86_64) release 2.6.13.2 Start a fresh krita and notice how the Brush Shapes toolbar (at the top) has a small predefined brush selected. Click on the toolbutton and the brush selection opens. To my surprise I see that another brush is selected, the diagonal one. I expected the round one to be selected there as well.

The selected brush is an autobrush in this case, not one from the selection of prebuilt brushes.

Fixed by showing the autobrush tab first (it's a more useful tab anyway)

SVN commit 601447 by rempt: Show the autobrush tab first. CCBUG: 130485 M +3 -3 kis_controlframe.cc --- branches/koffice/1.6/koffice/krita/ui/kis_controlframe.cc #601446:601447 @@ -229,13 +229,13 @@ l->add(m_brushesTab); - KisBrushChooser * m_brushChooser = new KisBrushChooser(m_brushesTab, "brush_chooser"); - m_brushesTab->addTab( m_brushChooser, i18n("Predefined Brushes")); - KisAutobrush * m_autobrush = new KisAutobrush(m_brushesTab, "autobrush", i18n("Autobrush")); m_brushesTab->addTab( m_autobrush, i18n("Autobrush")); connect(m_autobrush, SIGNAL(activatedResource(KisResource*)), m_view, SLOT(brushActivated( KisResource* ))); + KisBrushChooser * m_brushChooser = new KisBrushChooser(m_brushesTab, "brush_chooser"); + m_brushesTab->addTab( m_brushChooser, i18n("Predefined Brushes")); + KisCustomBrush* customBrushes = new KisCustomBrush(m_brushesTab, "custombrush", i18n("Custom Brush"), m_view); m_brushesTab->addTab( customBrushes, i18n("Custom Brush"));

SVN commit 601453 by rempt: Fix bug 130485 CCBUG: 130485 M +4 -3 kis_view.cc M +1 -1 kis_view.h --- trunk/koffice/krita/ui/obsolete/kis_view.cc #601452:601453 @@ -630,10 +630,11 @@ m_layerDup = new KAction(i18n("Duplicate"), actionCollection(), "duplicate_layer"); connect(m_layerDup, SIGNAL(triggered()), this, SLOT(layerDuplicate())); - m_layerHide = new KAction(i18n("&Hide/Show"), actionCollection(), "hide_layer"); - connect(m_layerHide, SIGNAL(triggered()), this, SLOT(layerToggleVisible())); - m_layerRaise = new KAction(KIcon("raise"), i18n("Raise"), actionCollection(), "raiselayer"); + m_layerHide = new KToggleAction(i18n("&Hide"), 0, this, SLOT(layerToggleVisible()), actionCollection(), "hide_layer"); + m_layerHide->setCheckedState(KGuiItem(i18n("&Show"))); + m_layerHide->setChecked(false)_layerRaise = new KAction(KIcon("raise"), i18n("Raise"), actionCollection(), "raiselayer"); + m_layerRaise->setShortcut(Qt::CTRL+Qt::Key_BracketRight); connect(m_layerRaise, SIGNAL(triggered()), this, SLOT(layerRaise())); --- trunk/koffice/krita/ui/obsolete/kis_view.h #601452:601453 @@ -554,7 +554,7 @@ KAction *m_layerAdd; KAction *m_layerBottom; KAction *m_layerDup; - KAction *m_layerHide; + KToggleAction *m_layerHide; KAction *m_layerLower; KAction *m_layerProperties; KAction *m_layerRaise;