SVN commit 830514 by aucahuasi:
GUI:
change the icons related to add comments, solved a issue when hover colors in briefview (tableview)
remove the "Classic Filter" of the kdecolorselector
M +6 -2 app/kcoloredit.cpp
M +0 -6 itemviews/palettebriefview.cpp
M +0 -9 widgets/colorselectors/kdeselector/kdecolorselector.cpp
M +0 -2 widgets/colorselectors/kdeselector/kdecolorselector.h
--- trunk/extragear/graphics/kcoloredit/src/app/kcoloredit.cpp #830513:830514
@@ -65,6 +65,7 @@
QString tmpFile;
if (!fileNameFromDialog.isEmpty())
+ {
if (KIO::NetAccess::download(fileNameFromDialog, tmpFile, this))
{
if (m_paletteDocument->openPaletteFile(tmpFile))
@@ -89,6 +90,7 @@
}
else
KMessageBox::error(this, KIO::NetAccess::lastErrorString());
+ }
}
void KColorEditMainWnd::saveFile()
@@ -118,10 +120,12 @@
QString paletteFile = KFileDialog::getSaveFileName(url, filter);
if (!paletteFile.isEmpty())
+ {
if (!m_paletteDocument->saveFileAs(paletteFile))
KMessageBox::error(this, m_paletteDocument->lastErrorString());
else
updateTittleWhenOpenSaveDoc();
+ }
}
void KColorEditMainWnd::newWindow()
@@ -329,7 +333,7 @@
tmpAction->setText(i18n("Add Color"));
tmpAction = actionCollection()->addAction("add-comment");
- tmpAction->setIcon(KIcon("list-add-font"));
+ tmpAction->setIcon(KIcon("insert-text"));
tmpAction->setText(i18n("Add Comment"));
tmpAction = actionCollection()->addAction("insert-color");
@@ -337,7 +341,7 @@
tmpAction->setText(i18n("Insert Color"));
tmpAction = actionCollection()->addAction("insert-comment");
- tmpAction->setIcon(KIcon("list-add-font"));
+ tmpAction->setIcon(KIcon("insert-text"));
tmpAction->setText(i18n("Insert Comment"));
tmpAction = actionCollection()->addAction("remove-item");
--- trunk/extragear/graphics/kcoloredit/src/itemviews/palettebriefview.cpp #830513:830514
@@ -224,15 +224,9 @@
loadDataFromModel();
if (show)
- {
m_colorCellsAdapter->setSelectionMode(QAbstractItemView::ExtendedSelection);
- m_colorCellsAdapter->setAcceptDrags(false);
- }
else
- {
m_colorCellsAdapter->setSelectionMode(QAbstractItemView::NoSelection);
- m_colorCellsAdapter->setAcceptDrags(true);
- }
}
}
--- trunk/extragear/graphics/kcoloredit/src/widgets/colorselectors/kdeselector/kdecolorselector.cpp #830513:830514
@@ -34,7 +34,6 @@
m_header->setText(i18n("KDE Style"));
m_header->setIcon(KIcon("kde"));
- m_ClassicModeAction = new KAction(KIcon("view-filter"), i18n("Classic"), header()->menu());
m_HueModeAction = new KAction(KIcon("view-filter"), i18n("Hue"), header()->menu());
m_SaturationModeAction = new KAction(KIcon("view-filter"), i18n("Saturation"), header()->menu());
m_ValueModeAction = new KAction(KIcon("view-filter"), i18n("Value"), header()->menu());
@@ -42,7 +41,6 @@
m_GreenModeAction = new KAction(KIcon("view-filter"), i18n("Green"), header()->menu());
m_BlueModeAction = new KAction(KIcon("view-filter"), i18n("Blue"), header()->menu());
- header()->menu()->addAction(m_ClassicModeAction);
header()->menu()->addAction(m_HueModeAction);
header()->menu()->addAction(m_SaturationModeAction);
header()->menu()->addAction(m_ValueModeAction);
@@ -55,7 +53,6 @@
connect(m_rectangleColorWidget, SIGNAL(colorSelected(QColor)), this, SLOT( updateColor(QColor) ));
- connect(m_ClassicModeAction, SIGNAL( triggered(bool) ), this, SLOT( changeToClassicMode() ));
connect(m_HueModeAction, SIGNAL( triggered(bool) ), this, SLOT( changeToHueMode() ));
connect(m_SaturationModeAction, SIGNAL( triggered(bool) ), this, SLOT( changeToSaturationMode() ));
connect(m_ValueModeAction, SIGNAL( triggered(bool) ), this, SLOT( changeToValueMode() ));
@@ -82,12 +79,6 @@
emit colorSelected(m_lastSelectedColor);
}
-void KdeColorSelector::changeToClassicMode()
-{
- m_rectangleColorWidget->setChooserMode(ChooserClassic);
- m_rectangleColorWidget->setColor(m_lastSelectedColor);
-}
-
void KdeColorSelector::changeToHueMode()
{
m_rectangleColorWidget->setChooserMode(ChooserHue);
--- trunk/extragear/graphics/kcoloredit/src/widgets/colorselectors/kdeselector/kdecolorselector.h #830513:830514
@@ -38,7 +38,6 @@
private slots:
void updateColor(const QColor & color);
- void changeToClassicMode();
void changeToHueMode();
void changeToSaturationMode();
void changeToValueMode();
@@ -51,7 +50,6 @@
RectangleColorWidget * m_rectangleColorWidget;
- KAction * m_ClassicModeAction;
KAction * m_HueModeAction;
KAction * m_SaturationModeAction;
KAction * m_ValueModeAction;
_______________________________________________
kde-docbook mailing list
kde-docbook@...
https://mail.kde.org/mailman/listinfo/kde-docbook
