[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/4.5/kdeedu/parley
From: Daniel Laidig <d.laidig () gmx ! de>
Date: 2010-05-28 12:53:42
Message-ID: 20100528125342.C4E19AC8C2 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1131564 by laidig:
add support to set 5 different font colors in the theme to be used in different \
places
the use of these elements is documented in theme_reference.svgz
M +6 -0 src/practice/abstractwidget.cpp
M +5 -0 src/practice/abstractwidget.h
M +0 -7 src/practice/comparisonmodewidget.cpp
M +0 -2 src/practice/comparisonmodewidget.h
M +0 -7 src/practice/conjugationmodewidget.cpp
M +1 -0 src/practice/flashcardmodewidget.cpp
M +29 -1 src/practice/guifrontend.cpp
M +1 -0 src/practice/guifrontend.h
M +0 -7 src/practice/multiplechoicemodewidget.cpp
M +0 -2 src/practice/multiplechoicemodewidget.h
M +0 -64 src/practice/practice_widget_flashcard.ui
M +5 -7 src/practice/themedbackgroundrenderer.cpp
M +1 -1 src/practice/themedbackgroundrenderer.h
M +0 -8 src/practice/writtenpracticewidget.cpp
M +0 -2 src/practice/writtenpracticewidget.h
M +15 -14 src/welcomescreen/welcomescreen.cpp
M +1 -0 src/welcomescreen/welcomescreen.h
M themes/theme_reference.svgz
--- branches/KDE/4.5/kdeedu/parley/src/practice/abstractwidget.cpp #1131563:1131564
@@ -20,3 +20,9 @@
{
}
+
+void AbstractModeWidget::setResultPalettes(const QPalette &correctPalette, const \
QPalette &wrongPalette) +{
+ m_correctPalette = correctPalette;
+ m_wrongPalette = wrongPalette;
+}
--- branches/KDE/4.5/kdeedu/parley/src/practice/abstractwidget.h #1131563:1131564
@@ -46,6 +46,8 @@
virtual void setSynonym(const QString& entry) = 0;
+ virtual void setResultPalettes(const QPalette& correctPalette, const QPalette& \
wrongPalette); +
public slots:
virtual void showQuestion() = 0;
virtual void showSolution() = 0;
@@ -58,6 +60,9 @@
protected:
GuiFrontend *m_frontend;
+
+ QPalette m_correctPalette;
+ QPalette m_wrongPalette;
};
}
--- branches/KDE/4.5/kdeedu/parley/src/practice/comparisonmodewidget.cpp \
#1131563:1131564 @@ -26,13 +26,6 @@
{
m_ui = new Ui::ComparisonPracticeWidget();
m_ui->setupUi(this);
- KColorScheme scheme(QPalette::Active);
- m_correctPalette = QApplication::palette();
- m_correctPalette.setColor(QPalette::WindowText, \
scheme.foreground(KColorScheme::PositiveText).color());
- m_correctPalette.setColor(QPalette::Text, \
scheme.foreground(KColorScheme::PositiveText).color());
- m_wrongPalette = QApplication::palette();
- m_wrongPalette.setColor(QPalette::WindowText, \
scheme.foreground(KColorScheme::NegativeText).color());
- m_wrongPalette.setColor(QPalette::Text, \
scheme.foreground(KColorScheme::NegativeText).color());
connect(m_ui->absoluteEdit, SIGNAL(returnPressed(QString)), this, \
SLOT(nextComparisonForm()));
connect(m_ui->comparativeEdit, SIGNAL(returnPressed(QString)), this, \
SLOT(nextComparisonForm()));
--- branches/KDE/4.5/kdeedu/parley/src/practice/comparisonmodewidget.h \
#1131563:1131564 @@ -56,8 +56,6 @@
private:
Ui::ComparisonPracticeWidget* m_ui;
- QPalette m_correctPalette;
- QPalette m_wrongPalette;
QStringList m_solution;
};
--- branches/KDE/4.5/kdeedu/parley/src/practice/conjugationmodewidget.cpp \
#1131563:1131564 @@ -52,13 +52,6 @@
{
m_ui = new Ui::ConjugationPracticeWidget();
m_ui->setupUi(this);
- KColorScheme scheme(QPalette::Active);
- m_correctPalette = QApplication::palette();
- m_correctPalette.setColor(QPalette::WindowText, \
scheme.foreground(KColorScheme::PositiveText).color());
- m_correctPalette.setColor(QPalette::Text, \
scheme.foreground(KColorScheme::PositiveText).color());
- m_wrongPalette = QApplication::palette();
- m_wrongPalette.setColor(QPalette::WindowText, \
scheme.foreground(KColorScheme::NegativeText).color());
- m_wrongPalette.setColor(QPalette::Text, \
scheme.foreground(KColorScheme::NegativeText).color()); }
ConjugationModeWidget::~ConjugationModeWidget()
--- branches/KDE/4.5/kdeedu/parley/src/practice/flashcardmodewidget.cpp \
#1131563:1131564 @@ -57,6 +57,7 @@
{
m_ui->solutionLabel->setHidden(false);
m_ui->solutionLabel->setText(m_solution);
+ m_ui->solutionLabel->setPalette(m_correctPalette);
m_frontend->showSetResultButtons(true);
}
--- branches/KDE/4.5/kdeedu/parley/src/practice/guifrontend.cpp #1131563:1131564
@@ -118,6 +118,7 @@
connect(m_modeWidget, SIGNAL(continueAction()), m_ui->continueButton, \
SLOT(animateClick())); }
m_ui->buttonStack->setCurrentIndex(0);
+ updateFontColors();
}
void GuiFrontend::setLessonName(const QString& lessonName)
@@ -340,10 +341,37 @@
m_themedBackgroundRenderer->updateBackground();
}
+void GuiFrontend::updateFontColors()
+{
+ QPalette p(QApplication::palette());
+ QColor c = m_themedBackgroundRenderer->fontColor("Outer", \
p.color(QPalette::Active, QPalette::WindowText)); + \
p.setColor(QPalette::WindowText, c); + m_ui->lessonLabel->setPalette(p);
+
+ if (m_modeWidget) {
+ p = QApplication::palette();
+ c = m_themedBackgroundRenderer->fontColor("Central", \
p.color(QPalette::Active, QPalette::WindowText)); + \
p.setColor(QPalette::Active, QPalette::WindowText, c); + \
m_modeWidget->setPalette(p); +
+ KColorScheme scheme(QPalette::Active);
+ QPalette correctPalette = QApplication::palette();
+ c = m_themedBackgroundRenderer->fontColor("Correct", \
scheme.foreground(KColorScheme::PositiveText).color()); + \
correctPalette.setColor(QPalette::WindowText, c); + \
correctPalette.setColor(QPalette::Text, \
scheme.foreground(KColorScheme::PositiveText).color()); + QPalette \
wrongPalette = QApplication::palette(); + c = \
m_themedBackgroundRenderer->fontColor("Wrong", \
scheme.foreground(KColorScheme::NegativeText).color()); + \
wrongPalette.setColor(QPalette::WindowText, c); + \
wrongPalette.setColor(QPalette::Text, \
scheme.foreground(KColorScheme::NegativeText).color()); +
+ m_modeWidget->setResultPalettes(correctPalette, wrongPalette);
+ }
+}
+
void GuiFrontend::setTheme()
{
m_themedBackgroundRenderer->setTheme(Prefs::theme());
- m_widget->setPalette(m_themedBackgroundRenderer->fontColorPalette());
+ updateFontColors();
updateBackground();
m_widget->setContentsMargins(m_themedBackgroundRenderer->contentMargins());
m_ui->boxesWidget->setRenderer(m_themedBackgroundRenderer);
--- branches/KDE/4.5/kdeedu/parley/src/practice/guifrontend.h #1131563:1131564
@@ -86,6 +86,7 @@
void countAsCorrectButtonClicked();
void countAsWrongButtonClicked();
void updateBackground();
+ void updateFontColors();
void setTheme();
private:
--- branches/KDE/4.5/kdeedu/parley/src/practice/multiplechoicemodewidget.cpp \
#1131563:1131564 @@ -28,13 +28,6 @@
{
m_ui = new Ui::MultiplechoicePracticeWidget();
m_ui->setupUi(this);
- KColorScheme scheme(QPalette::Active);
- m_correctPalette = palette();
- m_correctPalette.setColor(QPalette::WindowText, \
scheme.foreground(KColorScheme::PositiveText).color());
- m_correctPalette.setColor(QPalette::Text, \
scheme.foreground(KColorScheme::PositiveText).color());
- m_wrongPalette = palette();
- m_wrongPalette.setColor(QPalette::WindowText, \
scheme.foreground(KColorScheme::NegativeText).color());
- m_wrongPalette.setColor(QPalette::Text, \
scheme.foreground(KColorScheme::NegativeText).color()); }
void MultiplechoiceModeWidget::setQuestion(const QVariant& question)
--- branches/KDE/4.5/kdeedu/parley/src/practice/multiplechoicemodewidget.h \
#1131563:1131564 @@ -55,8 +55,6 @@
private:
Ui::MultiplechoicePracticeWidget* m_ui;
- QPalette m_correctPalette;
- QPalette m_wrongPalette;
int m_solution;
QList<QRadioButton*> m_choiceButtons;
};
--- branches/KDE/4.5/kdeedu/parley/src/practice/practice_widget_flashcard.ui \
#1131563:1131564 @@ -31,70 +31,6 @@
</item>
<item>
<widget class="QLabel" name="solutionLabel">
- <property name="palette">
- <palette>
- <active>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>85</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Text">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>170</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- </active>
- <inactive>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>85</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Text">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>170</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- </inactive>
- <disabled>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>126</red>
- <green>125</green>
- <blue>124</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Text">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>126</red>
- <green>125</green>
- <blue>124</blue>
- </color>
- </brush>
- </colorrole>
- </disabled>
- </palette>
- </property>
<property name="font">
<font>
<pointsize>10</pointsize>
--- branches/KDE/4.5/kdeedu/parley/src/practice/themedbackgroundrenderer.cpp \
#1131563:1131564 @@ -103,19 +103,17 @@
return result;
}
-QPalette ThemedBackgroundRenderer::fontColorPalette()
+QColor ThemedBackgroundRenderer::fontColor(const QString& context, const QColor& \
fallback) {
- QPalette palette = QApplication::palette();
-
- QString text = m_theme->property("X-Parley-Font-Color");
+ QString text = m_theme->property("X-Parley-Font-Color-"+context).toLower();
if (text.length() == 6 && text.contains(QRegExp("[0-9a-f]{6}"))) {
- QColor color = QColor(text.mid(0,2).toInt(0,16),
+ return QColor(text.mid(0,2).toInt(0,16),
text.mid(2,2).toInt(0,16),
text.mid(4,2).toInt(0,16));
- palette.setColor(QPalette::WindowText, color);
+
}
- return palette;
+ return fallback;
}
void ThemedBackgroundRenderer::updateBackground()
--- branches/KDE/4.5/kdeedu/parley/src/practice/themedbackgroundrenderer.h \
#1131563:1131564 @@ -67,7 +67,7 @@
QPixmap getScaledBackground();
- QPalette fontColorPalette();
+ QColor fontColor(const QString& context, const QColor& fallback);
public Q_SLOTS:
void clearRects();
--- branches/KDE/4.5/kdeedu/parley/src/practice/writtenpracticewidget.cpp \
#1131563:1131564 @@ -29,14 +29,6 @@
m_ui->mixedSolutionLabel->setVisible(false);
//m_ui->synonymList->setVisible(false);
connect(m_ui->answerEdit, SIGNAL(returnPressed()), this, \
SLOT(continueClicked()));
-
- KColorScheme scheme(QPalette::Active);
- m_correctPalette = palette();
- m_correctPalette.setColor(QPalette::WindowText, \
scheme.foreground(KColorScheme::PositiveText).color());
- m_correctPalette.setColor(QPalette::Text, \
scheme.foreground(KColorScheme::PositiveText).color());
- m_wrongPalette = palette();
- m_wrongPalette.setColor(QPalette::WindowText, \
scheme.foreground(KColorScheme::NegativeText).color());
- m_wrongPalette.setColor(QPalette::Text, \
scheme.foreground(KColorScheme::NegativeText).color()); }
void WrittenPracticeWidget::continueClicked()
--- branches/KDE/4.5/kdeedu/parley/src/practice/writtenpracticewidget.h \
#1131563:1131564 @@ -56,8 +56,6 @@
Ui::WrittenPracticeWidget* m_ui;
private:
- QPalette m_correctPalette;
- QPalette m_wrongPalette;
QString m_solution;
QString m_synonym;
AbstractFrontend::ResultState m_resultState;
--- branches/KDE/4.5/kdeedu/parley/src/welcomescreen/welcomescreen.cpp \
#1131563:1131564 @@ -40,21 +40,10 @@
ui->setupUi(m_widget);
setCentralWidget(m_widget);
- QColor fgColor = palette().text().color();
+ QFont font = ui->recentLabel->font();
+ font.setBold(true);
+ ui->recentLabel->setFont(font);
- QString css = QString::fromUtf8(
- "#recentLabel {"
- " font-weight: bold;"
- " border-bottom: 1px solid %1;"
- "}"
-
- "QListView {"
- " background-color: transparent;"
- "}"
- )
- .arg(fgColor.name());
- setStyleSheet(css);
-
ui->newButton->setIcon(KIcon("document-new"));
ui->openButton->setIcon(KIcon("document-open"));
ui->ghnsButton->setIcon(KIcon("get-hot-new-stuff"));
@@ -163,9 +152,21 @@
m_themedBackgroundRenderer->updateBackground();
}
+void WelcomeScreen::updateFontColors()
+{
+ QPalette p(QApplication::palette());
+ QColor c = m_themedBackgroundRenderer->fontColor("Start", \
p.color(QPalette::Active, QPalette::WindowText)); + p.setColor(QPalette::Base, \
Qt::transparent); + p.setColor(QPalette::Text, c);
+ p.setColor(QPalette::WindowText, c);
+ ui->recentFiles->setPalette(p);
+ ui->recentLabel->setPalette(p);
+}
+
void WelcomeScreen::setTheme()
{
m_themedBackgroundRenderer->setTheme(Prefs::theme());
+ updateFontColors();
updateBackground();
m_widget->setContentsMargins(m_themedBackgroundRenderer->contentMargins());
}
--- branches/KDE/4.5/kdeedu/parley/src/welcomescreen/welcomescreen.h #1131563:1131564
@@ -45,6 +45,7 @@
void updateBackground();
void setTheme();
void backgroundChanged(const QPixmap& pixmap);
+ void updateFontColors();
private:
Ui::WelcomeScreen *ui;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic