<font face="georgia, serif" size="4">Thanks, I would tend to agree that this class can be removed. Kurt</font><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Nov 19, 2012 at 1:15 PM, Jekyll Wu <span dir="ltr"><<a href="mailto:adaptee@gmail.com" target="_blank">adaptee@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Git commit d8f22c821a9a5833bb0770144f887ad877bc802f by Jekyll Wu.<br>
Committed on 19/11/2012 at 18:57.<br>
Pushed by jekyllwu into branch 'master'.<br>
<br>
Move class AccessibleColorScheme into its own files<br>
<br>
Note: this special colorscheme has never been exposed and put into use,<br>
so the new files are not involved in the building process.<br>
<br>
Maybe that special colorscheme should just be removed, if no one now<br>
really understands its design purpose.<br>
<br>
A +91 -0 src/AccessibleColorScheme.cpp [License: GPL (v2+)]<br>
A +47 -0 src/AccessibleColorScheme.h [License: GPL (v2+)]<br>
M +0 -61 src/ColorScheme.cpp<br>
M +0 -14 src/ColorScheme.h<br>
<br>
<a href="http://commits.kde.org/konsole/d8f22c821a9a5833bb0770144f887ad877bc802f" target="_blank">http://commits.kde.org/konsole/d8f22c821a9a5833bb0770144f887ad877bc802f</a><br>
<br>
diff --git a/src/AccessibleColorScheme.cpp b/src/AccessibleColorScheme.cpp<br>
new file mode 100644<br>
index 0000000..f2f7319<br>
--- /dev/null<br>
+++ b/src/AccessibleColorScheme.cpp<br>
@@ -0,0 +1,91 @@<br>
+/*<br>
+ This source file is part of Konsole, a terminal emulator.<br>
+<br>
+ Copyright 2007-2008 by Robert Knight <<a href="mailto:robertknight@gmail.com" target="_blank">robertknight@gmail.com</a>><br>
+<br>
+ This program is free software; you can redistribute it and/or modify<br>
+ it under the terms of the GNU General Public License as published by<br>
+ the Free Software Foundation; either version 2 of the License, or<br>
+ (at your option) any later version.<br>
+<br>
+ This program is distributed in the hope that it will be useful,<br>
+ but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>
+ GNU General Public License for more details.<br>
+<br>
+ You should have received a copy of the GNU General Public License<br>
+ along with this program; if not, write to the Free Software<br>
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA<br>
+ 02110-1301 USA.<br>
+*/<br>
+<br>
+// Own<br>
+#include "AccessibleColorScheme.h"<br>
+<br>
+// Qt<br>
+#include <QtGui/QBrush><br>
+<br>
+// KDE<br>
+#include <KColorScheme><br>
+#include <KLocalizedString><br>
+<br>
+using namespace Konsole;<br>
+<br>
+// Work In Progress - A color scheme for use on KDE setups for users<br>
+// with visual disabilities which means that they may have trouble<br>
+// reading text with the supplied color schemes.<br>
+//<br>
+// This color scheme uses only the 'safe' colors defined by the<br>
+// KColorScheme class.<br>
+//<br>
+// A complication this introduces is that each color provided by<br>
+// KColorScheme is defined as a 'background' or 'foreground' color.<br>
+// Only foreground colors are allowed to be used to render text and<br>
+// only background colors are allowed to be used for backgrounds.<br>
+//<br>
+// The ColorEntry and TerminalDisplay classes do not currently<br>
+// support this restriction.<br>
+//<br>
+// Requirements:<br>
+// - A color scheme which uses only colors from the KColorScheme class<br>
+// - Ability to restrict which colors the TerminalDisplay widget<br>
+// uses as foreground and background color<br>
+// - Make use of KGlobalSettings::allowDefaultBackgroundImages() as<br>
+// a hint to determine whether this accessible color scheme should<br>
+// be used by default.<br>
+//<br>
+//<br>
+// -- Robert Knight <<a href="mailto:robertknight@gmail.com" target="_blank">robertknight@gmail.com</a>> 21/07/2007<br>
+//<br>
+AccessibleColorScheme::AccessibleColorScheme()<br>
+ : ColorScheme()<br>
+{<br>
+ // basic attributes<br>
+ setName("accessible");<br>
+ setDescription(i18n("Accessible Color Scheme"));<br>
+<br>
+ // setup colors<br>
+ const int ColorRoleCount = 8;<br>
+<br>
+ const KColorScheme colorScheme(QPalette::Active);<br>
+<br>
+ QBrush colors[ColorRoleCount] = {<br>
+ colorScheme.foreground(colorScheme.NormalText),<br>
+ colorScheme.background(colorScheme.NormalBackground),<br>
+<br>
+ colorScheme.foreground(colorScheme.InactiveText),<br>
+ colorScheme.foreground(colorScheme.ActiveText),<br>
+ colorScheme.foreground(colorScheme.LinkText),<br>
+ colorScheme.foreground(colorScheme.VisitedText),<br>
+ colorScheme.foreground(colorScheme.NegativeText),<br>
+ colorScheme.foreground(colorScheme.NeutralText)<br>
+ };<br>
+<br>
+ for (int i = 0 ; i < TABLE_COLORS ; i++) {<br>
+ ColorEntry entry;<br>
+ entry.color = colors[ i % ColorRoleCount ].color();<br>
+<br>
+ setColorTableEntry(i , entry);<br>
+ }<br>
+}<br>
+<br>
diff --git a/src/AccessibleColorScheme.h b/src/AccessibleColorScheme.h<br>
new file mode 100644<br>
index 0000000..931c31a<br>
--- /dev/null<br>
+++ b/src/AccessibleColorScheme.h<br>
@@ -0,0 +1,47 @@<br>
+/*<br>
+ This source file is part of Konsole, a terminal emulator.<br>
+<br>
+ Copyright 2007-2008 by Robert Knight <<a href="mailto:robertknight@gmail.com" target="_blank">robertknight@gmail.com</a>><br>
+<br>
+ This program is free software; you can redistribute it and/or modify<br>
+ it under the terms of the GNU General Public License as published by<br>
+ the Free Software Foundation; either version 2 of the License, or<br>
+ (at your option) any later version.<br>
+<br>
+ This program is distributed in the hope that it will be useful,<br>
+ but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>
+ GNU General Public License for more details.<br>
+<br>
+ You should have received a copy of the GNU General Public License<br>
+ along with this program; if not, write to the Free Software<br>
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA<br>
+ 02110-1301 USA.<br>
+*/<br>
+<br>
+#ifndef ACCESSIBLECOLORSCHEME_H<br>
+#define ACCESSIBLECOLORSCHEME_H<br>
+<br>
+// Konsole<br>
+#include "ColorScheme.h"<br>
+<br>
+namespace Konsole<br>
+{<br>
+<br>
+/**<br>
+ * A color scheme which uses colors from the standard KDE color palette.<br>
+ *<br>
+ * This is designed primarily for the benefit of users who are using specially<br>
+ * designed colors.<br>
+ *<br>
+ * TODO Implement and make it the default on systems with specialized KDE<br>
+ * color schemes.<br>
+ */<br>
+class AccessibleColorScheme : public ColorScheme<br>
+{<br>
+public:<br>
+ AccessibleColorScheme();<br>
+};<br>
+}<br>
+<br>
+#endif //ACCESSIBLECOLORSCHEME_H<br>
diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp<br>
index b06defa..1f27c94 100644<br>
--- a/src/ColorScheme.cpp<br>
+++ b/src/ColorScheme.cpp<br>
@@ -23,11 +23,9 @@<br>
#include "ColorScheme.h"<br>
<br>
// Qt<br>
-#include <QtGui/QBrush><br>
#include <QtGui/QPainter><br>
<br>
// KDE<br>
-#include <KColorScheme><br>
#include <KConfig><br>
#include <KLocalizedString><br>
#include <KConfigGroup><br>
@@ -424,62 +422,3 @@ QString ColorSchemeWallpaper::path() const<br>
return _path;<br>
}<br>
<br>
-//<br>
-// Work In Progress - A color scheme for use on KDE setups for users<br>
-// with visual disabilities which means that they may have trouble<br>
-// reading text with the supplied color schemes.<br>
-//<br>
-// This color scheme uses only the 'safe' colors defined by the<br>
-// KColorScheme class.<br>
-//<br>
-// A complication this introduces is that each color provided by<br>
-// KColorScheme is defined as a 'background' or 'foreground' color.<br>
-// Only foreground colors are allowed to be used to render text and<br>
-// only background colors are allowed to be used for backgrounds.<br>
-//<br>
-// The ColorEntry and TerminalDisplay classes do not currently<br>
-// support this restriction.<br>
-//<br>
-// Requirements:<br>
-// - A color scheme which uses only colors from the KColorScheme class<br>
-// - Ability to restrict which colors the TerminalDisplay widget<br>
-// uses as foreground and background color<br>
-// - Make use of KGlobalSettings::allowDefaultBackgroundImages() as<br>
-// a hint to determine whether this accessible color scheme should<br>
-// be used by default.<br>
-//<br>
-//<br>
-// -- Robert Knight <<a href="mailto:robertknight@gmail.com" target="_blank">robertknight@gmail.com</a>> 21/07/2007<br>
-//<br>
-AccessibleColorScheme::AccessibleColorScheme()<br>
- : ColorScheme()<br>
-{<br>
- // basic attributes<br>
- setName("accessible");<br>
- setDescription(i18n("Accessible Color Scheme"));<br>
-<br>
- // setup colors<br>
- const int ColorRoleCount = 8;<br>
-<br>
- const KColorScheme colorScheme(QPalette::Active);<br>
-<br>
- QBrush colors[ColorRoleCount] = {<br>
- colorScheme.foreground(colorScheme.NormalText),<br>
- colorScheme.background(colorScheme.NormalBackground),<br>
-<br>
- colorScheme.foreground(colorScheme.InactiveText),<br>
- colorScheme.foreground(colorScheme.ActiveText),<br>
- colorScheme.foreground(colorScheme.LinkText),<br>
- colorScheme.foreground(colorScheme.VisitedText),<br>
- colorScheme.foreground(colorScheme.NegativeText),<br>
- colorScheme.foreground(colorScheme.NeutralText)<br>
- };<br>
-<br>
- for (int i = 0 ; i < TABLE_COLORS ; i++) {<br>
- ColorEntry entry;<br>
- entry.color = colors[ i % ColorRoleCount ].color();<br>
-<br>
- setColorTableEntry(i , entry);<br>
- }<br>
-}<br>
-<br>
diff --git a/src/ColorScheme.h b/src/ColorScheme.h<br>
index 107516f..35c948e 100644<br>
--- a/src/ColorScheme.h<br>
+++ b/src/ColorScheme.h<br>
@@ -225,20 +225,6 @@ private:<br>
static const char* const translatedColorNames[TABLE_COLORS];<br>
};<br>
<br>
-/**<br>
- * A color scheme which uses colors from the standard KDE color palette.<br>
- *<br>
- * This is designed primarily for the benefit of users who are using specially<br>
- * designed colors.<br>
- *<br>
- * TODO Implement and make it the default on systems with specialized KDE<br>
- * color schemes.<br>
- */<br>
-class AccessibleColorScheme : public ColorScheme<br>
-{<br>
-public:<br>
- AccessibleColorScheme();<br>
-};<br>
}<br>
<br>
Q_DECLARE_METATYPE(const Konsole::ColorScheme*)<br>
<br>
</blockquote></div><br></div>