[kde-doc-english] extragear/graphics/kcoloredit/src
Percy Camilo Triveño Aucahuasi
orgyforever at gmail.com
Tue Sep 2 08:14:02 CEST 2008
SVN commit 856065 by aucahuasi:
GUI:
* Making the documentation (hope finish in the next commit).
* Closed all TODOs notes ...
* Fixed some krazy issues (string and localization ones)
* Fixed messages/i18n issues of the application ... done.
M +53 -33 app/kcoloredit.cpp
M +2 -2 app/kcoloredit.h
M +1 -1 app/main.cpp
M +1 -1 core/colorutil.cpp
M +11 -0 core/palette.h
M +3 -0 itemviews/palettebriefview.cpp
M +48 -34 widgets/colortoolwidget.cpp
M +2 -2 widgets/colortoolwidget.h
M +2 -4 widgets/kcoloreditwidget.cpp
M +0 -2 widgets/palettedelegateeditors.cpp
--- trunk/extragear/graphics/kcoloredit/src/app/kcoloredit.cpp #856064:856065
@@ -103,9 +103,14 @@
{
if (m_paletteDocument->isModified())
{
+ QString paletteFileName = m_paletteDocument->url().fileName();
+
+ if (paletteFileName.isEmpty())
+ paletteFileName = i18n("Untitled");
+
switch (KMessageBox::warningYesNoCancel(this,
i18n( "The document \"%1\" has been modified.\n"
- "Do you want to save your changes or discard them?", m_paletteDocument->url().fileName()),
+ "Do you want to save your changes or discard them?", paletteFileName),
i18n( "Close Document" ), KStandardGuiItem::save(), KStandardGuiItem::discard()))
{
case KMessageBox::Yes: saveFile(); return m_paletteDocument->isSaved();
@@ -231,63 +236,78 @@
void KColorEditMainWnd::updateTittleWhenChangeDocState()
{
- setWindowTitle(QString("KColorEdit") + " - " + m_paletteDocument->url().fileName() + i18n(" [modified]"));
+ QString paletteFileName = m_paletteDocument->url().fileName();
+
+ if (paletteFileName.isEmpty())
+ paletteFileName = i18n("Untitled");
+
+ setWindowTitle(QString("%1 - KColorEdit " + i18n("[modified]")).arg(paletteFileName));
}
void KColorEditMainWnd::updateTittleWhenOpenSaveDoc()
{
- // setup the window title acording to the file name
- setWindowTitle(QString("KColorEdit") + " - " + m_paletteDocument->url().fileName());
+ QString paletteFileName = m_paletteDocument->url().fileName();
+
+ if (paletteFileName.isEmpty())
+ paletteFileName = i18n("Untitled");
+
+ setWindowTitle(QString("%1 - KColorEdit").arg(paletteFileName));
}
void KColorEditMainWnd::setupWidgets()
{
- //init viewers
+ // NOTE
+ // Initialize document
m_paletteDocument = new PaletteDocument(this);
- m_paletteDetailView = new PaletteDetailView(m_paletteDocument->model(), this);
+ updateTittleWhenOpenSaveDoc();
- m_paletteBriefView = new PaletteBriefView(m_paletteDocument->model(), this);
+ connect(m_paletteDocument, SIGNAL( modified() ), this, SLOT( updateTittleWhenChangeDocState() ));
- //init central widget
+ // NOTE
+ // Initialize central widget (KColorEditWidget)
m_kColorEditWidget = new KColorEditWidget(this);
m_kColorEditWidget->setModel(m_paletteDocument->model());
+ m_kColorEditWidget->setColor(ColorUtil::DEFAULT_COLOR);
setCentralWidget(m_kColorEditWidget);
- m_paletteTableDockWidget = new QDockWidget(i18n("Brief view"), this);
- m_paletteTableDockWidget->setObjectName(QString("brief-view-dock"));
- m_paletteTableDockWidget->setFeatures(QDockWidget::AllDockWidgetFeatures);
- m_paletteTableDockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- m_paletteTableDockWidget->setWidget(m_paletteBriefView);
- m_paletteTableDockWidget->setMinimumWidth(310);
+ // NOTE
+ // Initialize viewers
- m_paletteListDockWidget = new QDockWidget(i18n("Detail view"), this);
- m_paletteListDockWidget->setObjectName(QString("detail-view-dock"));
- m_paletteListDockWidget->setFeatures(QDockWidget::AllDockWidgetFeatures);
- m_paletteListDockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- m_paletteListDockWidget->setWidget(m_paletteDetailView);
- m_paletteListDockWidget->setMinimumWidth(310);
+ m_paletteDetailView = new PaletteDetailView(m_paletteDocument->model(), this);
+ m_paletteBriefView = new PaletteBriefView(m_paletteDocument->model(), this);
- addDockWidget(Qt::RightDockWidgetArea, m_paletteListDockWidget);
- addDockWidget(Qt::RightDockWidgetArea, m_paletteTableDockWidget);
-
- tabifyDockWidget(m_paletteListDockWidget, m_paletteTableDockWidget);
-
- setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
-
- connect(m_paletteDocument, SIGNAL( modified() ), this, SLOT( updateTittleWhenChangeDocState() ));
-
connect(m_paletteBriefView, SIGNAL( colorTracked(QColor) ), m_kColorEditWidget, SLOT( setColor(QColor) ));
connect(m_paletteBriefView, SIGNAL( itemTracked(int) ), m_paletteDetailView, SLOT( scrollToItem(int) ));
connect(m_paletteBriefView, SIGNAL( itemSelected(int) ), m_paletteDetailView, SLOT( setSelectedItem(int) ));
connect(m_paletteBriefView, SIGNAL( colorSelected(QColor) ), m_kColorEditWidget, SLOT( setColor(QColor) ));
- // NOTE setup default colors colors
- m_kColorEditWidget->setColor(ColorUtil::DEFAULT_COLOR);
+ // NOTE
+ // Initialize docks
+
+ m_paletteBriefViewDockWidget = new QDockWidget(i18n("Brief view"), this);
+ m_paletteBriefViewDockWidget->setObjectName(QString("brief-view-dock"));
+ m_paletteBriefViewDockWidget->setFeatures(QDockWidget::AllDockWidgetFeatures);
+ m_paletteBriefViewDockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+ m_paletteBriefViewDockWidget->setWidget(m_paletteBriefView);
+
+ m_paletteDetailViewDockWidget = new QDockWidget(i18n("Detail view"), this);
+ m_paletteDetailViewDockWidget->setObjectName(QString("detail-view-dock"));
+ m_paletteDetailViewDockWidget->setFeatures(QDockWidget::AllDockWidgetFeatures);
+ m_paletteDetailViewDockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+ m_paletteDetailViewDockWidget->setWidget(m_paletteDetailView);
+ m_paletteDetailViewDockWidget->setMinimumWidth(310);
+
+ addDockWidget(Qt::RightDockWidgetArea, m_paletteDetailViewDockWidget);
+ addDockWidget(Qt::RightDockWidgetArea, m_paletteBriefViewDockWidget);
+
+ tabifyDockWidget(m_paletteDetailViewDockWidget, m_paletteBriefViewDockWidget);
+
+ setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
}
void KColorEditMainWnd::setupActions()
@@ -307,8 +327,8 @@
// NOTE
// Actions for docks
- actionCollection()->addAction("show-detail-view", m_paletteTableDockWidget->toggleViewAction());
- actionCollection()->addAction("show-brief-view", m_paletteListDockWidget->toggleViewAction());
+ actionCollection()->addAction("show-detail-view", m_paletteBriefViewDockWidget->toggleViewAction());
+ actionCollection()->addAction("show-brief-view", m_paletteDetailViewDockWidget->toggleViewAction());
// NOTE
// Actions for palette menu
--- trunk/extragear/graphics/kcoloredit/src/app/kcoloredit.h #856064:856065
@@ -88,8 +88,8 @@
KColorEditWidget * m_kColorEditWidget;
- QDockWidget * m_paletteTableDockWidget;
- QDockWidget * m_paletteListDockWidget;
+ QDockWidget * m_paletteBriefViewDockWidget;
+ QDockWidget * m_paletteDetailViewDockWidget;
};
#endif // KCOLOREDIT_H
--- trunk/extragear/graphics/kcoloredit/src/app/main.cpp #856064:856065
@@ -27,7 +27,7 @@
int main(int argc, char * argv[])
{
- KAboutData about("kcoloredit", 0, ki18n(I18N_NOOP("KColorEdit")), "1.99.50 (KColorEdit 2.0 Beta 2)",
+ KAboutData about("kcoloredit", 0, ki18n(I18N_NOOP("KColorEdit")), "1.99.9 (KColorEdit 2.0 Beta 3)",
ki18n(I18N_NOOP("KColorEdit, great tool for editing color palettes.")),
KAboutData::License_GPL, ki18n("(C) 2008, Percy Camilo Triveño Aucahuasi\n" "(C) 2000, Artur Rataj"));
about.addAuthor(ki18n("Percy Camilo Triveño Aucahuasi"), ki18n("Current maintainer - Upgraded and developed the new version."), "orgyforever at gmail.com");
--- trunk/extragear/graphics/kcoloredit/src/core/colorutil.cpp #856064:856065
@@ -21,7 +21,7 @@
#include <KColorScheme>
-const QColor ColorUtil::DEFAULT_COLOR = QColor(193, 160, 9);
+const QColor ColorUtil::DEFAULT_COLOR = QColor(0, 123, 254);
float ColorUtil::luminance(const QColor & color)
{
--- trunk/extragear/graphics/kcoloredit/src/core/palette.h #856064:856065
@@ -24,6 +24,17 @@
#include <QtCore/QList>
+/**
+ * @short This is the palette (a set of color and comment items).
+ *
+ * This class hold the data, is a wrapper of QList<PaletteItem*>, so this
+ * class can store all the subclasses of PaletteItem.
+ * <b>Subclasses:</b>\n
+ * @li ColorItem.
+ * @li CommentItem.
+ *
+ * @author Percy Camilo Triveño Aucahuasi <orgyforever at gmail.com>
+ */
class Palette
{
public:
--- trunk/extragear/graphics/kcoloredit/src/itemviews/palettebriefview.cpp #856064:856065
@@ -141,6 +141,9 @@
return ;
}
+ // ... and then we change the columns in KColorCells acording to the QSlider.value()
+ m_colorCells->setColumnCount(m_setColumnSlider->value());
+
// NOTE
// Here we load data (color and comment items) from PaletteModel
// to fill it inside KColorCells
--- trunk/extragear/graphics/kcoloredit/src/widgets/colortoolwidget.cpp #856064:856065
@@ -22,19 +22,10 @@
#include "colortoolwidget.h"
-#ifdef Q_WS_X11
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <QX11Info>
-#include <fixx11h.h>
-
-#endif
-
#include <QtGui/QMouseEvent>
#include <QtGui/QLayout>
#include <QtGui/QLabel>
-#include <QtGui/QCheckBox>
+
#include <QtGui/QGroupBox>
#include <QtGui/QDesktopWidget>
@@ -46,6 +37,15 @@
#ifdef Q_WS_X11
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <QX11Info>
+#include <fixx11h.h>
+
+#include <QtGui/QCheckBox>
+
+#include <KWindowSystem>
+
class KCDPickerFilter: public QWidget
{
public:
@@ -118,13 +118,20 @@
KPushButton * pickColorButton = new KPushButton(KIcon("color-picker"), i18n("Pick a color"), extraSelectorsBox);
- m_checkBoxHideWindow = new QCheckBox(i18n("Hide window"), extraSelectorsBox);
- m_checkBoxHideWindow->setStatusTip(i18n("Only works if Desktop Effects is enabled"));
-
QHBoxLayout * pickColorLayout = new QHBoxLayout();
pickColorLayout->addWidget(pickColorButton);
- pickColorLayout->addWidget(m_checkBoxHideWindow);
+#ifdef Q_WS_X11
+
+ if (KWindowSystem::compositingActive())
+ {
+ m_checkBoxHideWindow = new QCheckBox(i18n("Hide window"), extraSelectorsBox);
+
+ pickColorLayout->addWidget(m_checkBoxHideWindow);
+ }
+
+#endif
+
QVBoxLayout * extraSelectorsLayout = new QVBoxLayout(extraSelectorsBox);
extraSelectorsLayout->addLayout(pickColorLayout);
//extraSelectorsLayout->addWidget(Choose from image);
@@ -178,9 +185,14 @@
{
m_color = grabColor(event->globalPos());
+#ifdef Q_WS_X11
+
+ if (KWindowSystem::compositingActive())
if (m_checkBoxHideWindow->isChecked())
m_colorView->setColor(m_color);
+#endif
+
setColor(m_color);
emit colorSelected(m_color);
@@ -267,23 +279,24 @@
m_filter = new KCDPickerFilter(this);
kapp->installX11EventFilter(m_filter);
-#endif
-
// NOTE
// Hide the MainWindow (KColorEdit) (make it transparent)
- if (m_checkBoxHideWindow->isChecked())
- {
- parentWidget()->parentWidget()->parentWidget()->parentWidget()->setWindowOpacity(0.0);
+ if (KWindowSystem::compositingActive())
+ if (m_checkBoxHideWindow->isChecked())
+ {
+ parentWidget()->parentWidget()->parentWidget()->parentWidget()->setWindowOpacity(0.0);
- m_checkBoxHideWindow->setEnabled(false);
+ m_checkBoxHideWindow->setEnabled(false);
- m_colorView = new KColorPatch(0);
- m_colorView->setMaximumSize(48, 48);
- m_colorView->setWindowFlags(Qt::ToolTip);
- m_colorView->show();
- }
+ m_colorView = new KColorPatch(0);
+ m_colorView->setMaximumSize(48, 48);
+ m_colorView->setWindowFlags(Qt::ToolTip);
+ m_colorView->show();
+ }
+#endif
+
grabMouse(Qt::CrossCursor);
grabKeyboard();
}
@@ -298,21 +311,22 @@
delete m_filter;
m_filter = 0;
-#endif
-
// NOTE
// Restore the opacity of the MainWindow (KColorEdit)
- if (m_checkBoxHideWindow->isChecked())
- {
- parentWidget()->parentWidget()->parentWidget()->parentWidget()->setWindowOpacity(1.0);
+ if (KWindowSystem::compositingActive())
+ if (m_checkBoxHideWindow->isChecked())
+ {
+ parentWidget()->parentWidget()->parentWidget()->parentWidget()->setWindowOpacity(1.0);
- m_checkBoxHideWindow->setEnabled(true);
+ m_checkBoxHideWindow->setEnabled(true);
- delete m_colorView;
- m_colorView = 0;
- }
+ delete m_colorView;
+ m_colorView = 0;
+ }
+#endif
+
releaseMouse();
releaseKeyboard();
}
--- trunk/extragear/graphics/kcoloredit/src/widgets/colortoolwidget.h #856064:856065
@@ -76,14 +76,14 @@
QLabel * m_brightnessPercentage;
QLabel * m_saturationPercentage;
- QCheckBox * m_checkBoxHideWindow;
-
bool m_colorPicking;
KColorPatch * m_colorView;
#ifdef Q_WS_X11
+ QCheckBox * m_checkBoxHideWindow;
+
KCDPickerFilter * m_filter;
#endif
--- trunk/extragear/graphics/kcoloredit/src/widgets/kcoloreditwidget.cpp #856064:856065
@@ -64,7 +64,7 @@
m_colorDispatcher = new ColorWidget(this, ColorWidget::Simple);
MultiPageWidget * colorInfoTexts = new MultiPageWidget(this, i18n("Color information:"));
- colorInfoTexts->setMaximumHeight(110); // NOTE default value here;
+ colorInfoTexts->setMaximumHeight(110);
ColorInfoTextRGB * infoTextRGB = new ColorInfoTextRGB(colorInfoTexts);
ColorInfoTextHSV * infoTextHSV = new ColorInfoTextHSV(colorInfoTexts);
@@ -77,7 +77,7 @@
colorInfoTexts->addPage(infoTextHTML);
MultiPageWidget * colorInfoVisuals = new MultiPageWidget(this, i18n("Color scheme:"));
- colorInfoVisuals->setMaximumHeight(128); // NOTE default value here;
+ colorInfoVisuals->setMaximumHeight(128);
m_colorInfoVisualComplement = new ColorInfoVisualComplement(colorInfoVisuals);
m_colorInfoVisualTriadic = new ColorInfoVisualTriadic(colorInfoVisuals);
@@ -97,8 +97,6 @@
connect(m_blenderColorSelector, SIGNAL( colorsAdded(QVector<QColor>) ), SLOT( appendColorsFromGradientSelector(QVector<QColor>) ));
- // TODO document this
-
// All color selector can change the color of the dispatcher and extratools
for (int i = 0; i < colorTools->count() - 1; i++)
{
--- trunk/extragear/graphics/kcoloredit/src/widgets/palettedelegateeditors.cpp #856064:856065
@@ -33,7 +33,6 @@
m_color->setMinimumWidth(92);
m_colorName = new KLineEdit(this);
- m_colorName->setMinimumWidth(128);
m_colorName->setClearButtonShown(true);
QHBoxLayout * layout = new QHBoxLayout(this);
@@ -71,7 +70,6 @@
: QWidget(parent)
{
m_comment = new KLineEdit(this);
- m_comment->setMinimumWidth(128);
m_comment->setClearButtonShown(true);
QHBoxLayout * layout = new QHBoxLayout(this);
More information about the kde-doc-english
mailing list