rev 3033 - trunk/packages/kdeartwork/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Jan 29 16:09:49 UTC 2006
Author: chrsmrtn
Date: 2006-01-29 16:09:48 +0000 (Sun, 29 Jan 2006)
New Revision: 3033
Added:
trunk/packages/kdeartwork/debian/patches/01_kdeartwork_branch_r503566.diff
Removed:
trunk/packages/kdeartwork/debian/patches/01_kdeartwork_branch_r489324.diff
trunk/packages/kdeartwork/debian/patches/01_kdeartwork_branch_r495379.diff
Log:
kdeartwork branch pulls, old and new.
Deleted: trunk/packages/kdeartwork/debian/patches/01_kdeartwork_branch_r489324.diff
Deleted: trunk/packages/kdeartwork/debian/patches/01_kdeartwork_branch_r495379.diff
Added: trunk/packages/kdeartwork/debian/patches/01_kdeartwork_branch_r503566.diff
===================================================================
--- trunk/packages/kdeartwork/debian/patches/01_kdeartwork_branch_r503566.diff 2006-01-29 16:02:07 UTC (rev 3032)
+++ trunk/packages/kdeartwork/debian/patches/01_kdeartwork_branch_r503566.diff 2006-01-29 16:09:48 UTC (rev 3033)
@@ -0,0 +1,617 @@
+#DPATCHLEVEL=0
+--- styles/phase/phasestyle.cpp (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ styles/phase/phasestyle.cpp (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -420,7 +420,7 @@
+ case QTabBar::RoundedAbove:
+ case QTabBar::TriangularAbove: {
+ // is there a corner widget?
+- tabwidget = dynamic_cast<QTabWidget*>(bar->parent());
++ tabwidget = ::qt_cast<QTabWidget*>(bar->parent());
+ if (edge && tabwidget
+ && tabwidget->cornerWidget(reverse_ ?
+ Qt::TopRight : Qt::TopLeft)) {
+@@ -499,7 +499,7 @@
+ case QTabBar::RoundedBelow:
+ case QTabBar::TriangularBelow: {
+ // is there a corner widget?
+- tabwidget = dynamic_cast<QTabWidget*>(bar->parent());
++ tabwidget = ::qt_cast<QTabWidget*>(bar->parent());
+ if (edge && tabwidget
+ && tabwidget->cornerWidget(reverse_ ?
+ Qt::BottomRight : Qt::BottomLeft)) {
+@@ -617,7 +617,7 @@
+ case PE_HeaderSection: {
+ // covers kicker taskbar buttons and menu titles
+ QHeader* header = dynamic_cast<QHeader*>(painter->device());
+- widget = dynamic_cast<QWidget*>(painter->device());
++ widget =dynamic_cast<QWidget*>(painter->device());
+
+ if (header) {
+ horiz = (header->orientation() == Horizontal);
+@@ -883,7 +883,7 @@
+
+ if (widget && widget->parent() &&
+ widget->parent()->inherits("QToolBar")) {
+- QToolBar *toolbar = dynamic_cast<QToolBar*>(widget->parent());
++ QToolBar *toolbar = ::qt_cast<QToolBar*>(widget->parent());
+ if (toolbar) {
+ // toolbar not floating or in a QMainWindow
+ flat = flatToolbar(toolbar);
+@@ -1079,7 +1079,7 @@
+ break;
+
+ case KPE_SliderGroove: {
+- const QSlider* slider = dynamic_cast<const QSlider*>(widget);
++ const QSlider* slider = ::qt_cast<const QSlider*>(widget);
+ if (slider) {
+ if (slider->orientation() == Horizontal) {
+ y = cy - 3;
+@@ -1095,7 +1095,7 @@
+ }
+
+ case KPE_SliderHandle: {
+- const QSlider* slider = dynamic_cast<const QSlider*>(widget);
++ const QSlider* slider = ::qt_cast<const QSlider*>(widget);
+ if (slider) {
+ QColor color = (widget==hover_)
+ ? group.button().light(contrast)
+@@ -1174,7 +1174,7 @@
+ }
+
+ case CE_PushButtonLabel: {
+- const QPushButton* button = dynamic_cast<const QPushButton*>(widget);
++ const QPushButton* button = ::qt_cast<const QPushButton*>(widget);
+ if (!button) {
+ KStyle::drawControl(element, painter, widget, rect, group,
+ flags, option);
+@@ -1251,7 +1251,7 @@
+
+ case CE_CheckBoxLabel:
+ case CE_RadioButtonLabel: {
+- const QButton *b = dynamic_cast<const QButton*>(widget);
++ const QButton *b = ::qt_cast<const QButton*>(widget);
+ if (!b) return;
+
+ int alignment = reverse_ ? AlignRight : AlignLeft;
+@@ -1259,7 +1259,7 @@
+ group, flags & Style_Enabled, b->pixmap(), b->text());
+
+ // only draw focus if content (forms on html won't)
+- if ((flags & Style_HasFocus) && ((b->text()) || b->pixmap())) {
++ if ((flags & Style_HasFocus) && ((!b->text().isNull()) || b->pixmap())) {
+ drawPrimitive(PE_FocusRect, painter,
+ visualRect(subRect(SR_RadioButtonFocusRect,
+ widget), widget),
+@@ -1269,7 +1269,7 @@
+ }
+
+ case CE_DockWindowEmptyArea: {
+- const QToolBar *tb = dynamic_cast<const QToolBar*>(widget);
++ const QToolBar *tb = ::qt_cast<const QToolBar*>(widget);
+ if (tb) {
+ // toolbar not floating or in a QMainWindow
+ if (flatToolbar(tb)) {
+@@ -1289,7 +1289,7 @@
+ break;
+
+ case CE_MenuBarItem: {
+- const QMenuBar *mbar = dynamic_cast<const QMenuBar*>(widget);
++ const QMenuBar *mbar = ::qt_cast<const QMenuBar*>(widget);
+ if (!mbar) {
+ KStyle::drawControl(element, painter, widget, rect, group,
+ flags, option);
+@@ -1320,7 +1320,7 @@
+ }
+
+ case CE_PopupMenuItem: {
+- const QPopupMenu *popup = dynamic_cast<const QPopupMenu*>(widget);
++ const QPopupMenu *popup = ::qt_cast<const QPopupMenu*>(widget);
+ if (!popup) {
+ KStyle::drawControl(element, painter, widget, rect, group,
+ flags, option);
+@@ -1481,7 +1481,7 @@
+ }
+
+ case CE_TabBarTab: {
+- const QTabBar* tab = dynamic_cast<const QTabBar*>(widget);
++ const QTabBar* tab = ::qt_cast<const QTabBar*>(widget);
+ if (tab) {
+ if ((widget == hover_) && (option.tab() == hovertab_)) {
+ flags |= Style_MouseOver;
+@@ -1504,7 +1504,7 @@
+ }
+
+ case CE_ProgressBarContents: {
+- const QProgressBar* pbar = dynamic_cast<const QProgressBar*>(widget);
++ const QProgressBar* pbar = ::qt_cast<const QProgressBar*>(widget);
+ if (!pbar) {
+ KStyle::drawControl(element, painter, widget, rect, group,
+ flags, option);
+@@ -1534,7 +1534,7 @@
+
+ #if (QT_VERSION >= 0x030200)
+ case CE_ToolBoxTab: {
+- const QToolBox *box = dynamic_cast<const QToolBox*>(widget);
++ const QToolBox *box = ::qt_cast<const QToolBox*>(widget);
+ if (!box) {
+ KStyle::drawControl(element, painter, widget, rect, group,
+ flags, option);
+@@ -1624,7 +1624,7 @@
+
+ switch (control) {
+ case CC_ComboBox: {
+- const QComboBox * combo = dynamic_cast<const QComboBox*>(widget);
++ const QComboBox * combo = ::qt_cast<const QComboBox*>(widget);
+ if (!combo) {
+ KStyle::drawComplexControl(control, painter, widget, rect, group,
+ flags, controls, active, option);
+@@ -1675,7 +1675,7 @@
+
+ case CC_ScrollBar: {
+ // always a three button scrollbar
+- const QScrollBar *sb = dynamic_cast<const QScrollBar*>(widget);
++ const QScrollBar *sb = ::qt_cast<const QScrollBar*>(widget);
+ if (!sb) {
+ KStyle::drawComplexControl(control, painter, widget, rect, group,
+ flags, controls, active, option);
+@@ -1772,7 +1772,7 @@
+ }
+
+ case CC_SpinWidget: {
+- const QSpinWidget *spin = dynamic_cast<const QSpinWidget*>(widget);
++ const QSpinWidget *spin = ::qt_cast<const QSpinWidget*>(widget);
+ if (!spin) {
+ KStyle::drawComplexControl(control, painter, widget, rect, group,
+ flags, controls, active, option);
+@@ -1832,7 +1832,7 @@
+ }
+
+ case CC_ToolButton: {
+- const QToolButton *btn = dynamic_cast<const QToolButton*>(widget);
++ const QToolButton *btn = ::qt_cast<const QToolButton*>(widget);
+ if (!btn) {
+ KStyle::drawComplexControl(control, painter, widget, rect, group,
+ flags, controls, active, option);
+@@ -1848,7 +1848,7 @@
+
+ // check for QToolBar parent
+ if (btn->parent() && btn->parent()->inherits("QToolBar")) {
+- toolbar = dynamic_cast<QToolBar*>(btn->parent());
++ toolbar = ::qt_cast<QToolBar*>(btn->parent());
+ if (toolbar) {
+ horiz = (toolbar->orientation() == Qt::Horizontal);
+ if (normal) { // draw background
+@@ -1874,8 +1874,8 @@
+ else if (btn->parent() &&
+ btn->parent()->inherits(QTOOLBAREXTENSION)) {
+ QWidget *extension;
+- if ((extension = dynamic_cast<QWidget*>(btn->parent()))) {
+- toolbar = dynamic_cast<QToolBar*>(extension->parent());
++ if ((extension = ::qt_cast<QWidget*>(btn->parent()))) {
++ toolbar = ::qt_cast<QToolBar*>(extension->parent());
+ if (toolbar) {
+ horiz = (toolbar->orientation() == Qt::Horizontal);
+ if (normal) { // draw background
+@@ -1969,7 +1969,7 @@
+ return 24;
+
+ case PM_TabBarTabVSpace:
+- if (const QTabBar *tb = dynamic_cast<const QTabBar*>(widget)) {
++ if (const QTabBar *tb = ::qt_cast<const QTabBar*>(widget)) {
+ if (tb->shape() == QTabBar::RoundedAbove) {
+ return 10;
+ } else {
+@@ -2066,7 +2066,7 @@
+ }
+
+ case CC_ScrollBar: {
+- const QScrollBar *sb = dynamic_cast<const QScrollBar*>(widget);
++ const QScrollBar *sb = ::qt_cast<const QScrollBar*>(widget);
+ if (!sb) break;
+
+ bool horizontal = (sb->orientation() == Qt::Horizontal);
+@@ -2135,7 +2135,7 @@
+
+ switch (contents) {
+ case CT_PushButton: {
+- const QPushButton* button = dynamic_cast<const QPushButton*>(widget);
++ const QPushButton* button = ::qt_cast<const QPushButton*>(widget);
+ if (!button) {
+ return KStyle::sizeFromContents(contents, widget, contentsize,
+ option);
+@@ -2156,7 +2156,7 @@
+
+ case CT_PopupMenuItem: {
+ if (!widget || option.isDefault()) return contentsize;
+- const QPopupMenu *popup = dynamic_cast<const QPopupMenu*>(widget);
++ const QPopupMenu *popup = ::qt_cast<const QPopupMenu*>(widget);
+ if (!popup) {
+ return KStyle::sizeFromContents(contents, widget, contentsize,
+ option);
+@@ -2250,21 +2250,21 @@
+ // KDE Toolbar Widget
+ // patch by Daniel Brownlees <dbrownlees at paradise.net.nz>
+ if (object->parent() && !qstrcmp(object->name(), KTOOLBARWIDGET)) {
+- if (0 == (widget = dynamic_cast<QWidget*>(object))) return false;
+- QWidget *parent = dynamic_cast<QWidget*>(object->parent());
++ if (0 == (widget = ::qt_cast<QWidget*>(object))) return false;
++ QWidget *parent = ::qt_cast<QWidget*>(object->parent());
+ int px = widget->x(), py = widget->y();
+ // find the toolbar
+ while (parent && parent->parent()
+- && !dynamic_cast<QToolBar*>(parent)) {
++ && !::qt_cast<QToolBar*>(parent)) {
+ px += parent->x();
+ py += parent->y();
+- parent = dynamic_cast<QWidget*>(parent->parent());
++ parent = ::qt_cast<QWidget*>(parent->parent());
+ }
+ if (!parent) return false;
+ widget->rect().rect(&x, &y, &w, &h);
+ QRect prect = parent->rect();
+
+- toolbar = dynamic_cast<QToolBar*>(parent);
++ toolbar = ::qt_cast<QToolBar*>(parent);
+ horiz = (toolbar) ? (toolbar->orientation() == Qt::Horizontal)
+ : (prect.height() < prect.width());
+ QPainter painter(widget);
+@@ -2287,9 +2287,9 @@
+ }
+
+ // QToolBarExtensionWidget
+- else if ((object->parent()) &&
+- (toolbar = dynamic_cast<QToolBar*>(object->parent()))) {
+- if (0 == (widget = dynamic_cast<QWidget*>(object))) return false;
++ else if (object && object->isWidgetType() && object->parent() &&
++ (toolbar = ::qt_cast<QToolBar*>(object->parent()))) {
++ if (0 == (widget = ::qt_cast<QWidget*>(object))) return false;
+ horiz = (toolbar->orientation() == Qt::Horizontal);
+ QPainter painter(widget);
+ widget->rect().rect(&x, &y, &w, &h);
+@@ -2319,7 +2319,7 @@
+ }
+
+ // QFrame lines (do this guy last)
+- else if (0 != (frame = dynamic_cast<QFrame*>(object))) {
++ else if (0 != (frame = ::qt_cast<QFrame*>(object))) {
+ QFrame::Shape shape = frame->frameShape();
+ switch (shape) {
+ case QFrame::HLine:
+@@ -2349,34 +2349,34 @@
+ ::qt_cast<QSlider*>(object) ||
+ object->inherits(QSPLITTERHANDLE)) {
+ if (event->type() == QEvent::Enter) {
+- if (0 != (widget = dynamic_cast<QWidget*>(object)) &&
++ if (0 != (widget = ::qt_cast<QWidget*>(object)) &&
+ widget->isEnabled()) {
+ hover_ = widget;
+ widget->repaint(false);
+ }
+ } else if (event->type() == QEvent::Leave) {
+- if (0 != (widget = dynamic_cast<QWidget*>(object))) {
++ if (0 != (widget = ::qt_cast<QWidget*>(object))) {
+ hover_ = 0;
+ widget->repaint(false);
+ }
+ }
+ } else if (::qt_cast<QTabBar*>(object)) { // special case for qtabbar
+ if (event->type() == QEvent::Enter) {
+- if (0 != (widget = dynamic_cast<QWidget*>(object)) &&
++ if (0 != (widget = ::qt_cast<QWidget*>(object)) &&
+ widget->isEnabled()) {
+ hover_ = widget;
+ hovertab_ = 0;;
+ widget->repaint(false);
+ }
+ } else if (event->type() == QEvent::Leave) {
+- if (0 != (widget = dynamic_cast<QWidget*>(object))) {
++ if (0 != (widget = ::qt_cast<QWidget*>(object))) {
+ hover_ = 0;
+ hovertab_ = 0;;
+ widget->repaint(false);
+ }
+ } else if (event->type() == QEvent::MouseMove) {
+ QTabBar *tabbar;
+- if (0 != (tabbar = dynamic_cast<QTabBar*>(object))) {
++ if (0 != (tabbar = ::qt_cast<QTabBar*>(object))) {
+ QMouseEvent *me;
+ if (0 != (me = dynamic_cast<QMouseEvent*>(event))) {
+ QTab *tab = tabbar->selectTab(me->pos());
+--- styles/dotnet/dotnet.themerc (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ styles/dotnet/dotnet.themerc (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -17,6 +17,7 @@
+ Name[fr]=Style .NET
+ Name[ga]=StÃl .NET
+ Name[gl]=Estilo .NET
++Name[he]=×¡×’× ×•×Ÿ .NET
+ Name[hi]=.NET शैली
+ Name[hu]=.NET-stÃlus
+ Name[is]=.NET stÃll
+@@ -66,6 +67,7 @@
+ Comment[fo]=Skjótt og smátt.
+ Comment[fr]=Rapide et dépouillé
+ Comment[gl]=Rápido, limpo e minimalista
++Comment[he]=מהיר, × ×§×™, ×•×ž×™× ×™×ž×œ×™×¡×˜×™.
+ Comment[hi]=तेज, साफ तथा कम-से-कम
+ Comment[hu]=Gyors, jól átlátható, egyszerű stÃlus
+ Comment[is]=Hratt, einfalt, og naumhyggja.
+--- styles/dotnet/dotnet.cpp (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ styles/dotnet/dotnet.cpp (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -1080,7 +1080,7 @@
+ pixelMetric(PM_ButtonShiftVertical));
+ }
+
+- if (pb->text() && flags & Style_ButtonDefault) {
++ if (!pb->text().isEmpty() && (flags & Style_ButtonDefault)) {
+ p->setFont(QFont(p->font().family(), p->font().pointSize(), 75));
+ }
+
+@@ -1114,12 +1114,12 @@
+ p->drawPixmap(pr.topLeft(), *pb->pixmap());
+ }
+
+- if (useTextShadows && pb->text() && enabled) {
++ if (useTextShadows && !pb->text().isEmpty() && enabled) {
+ p->setPen((flags & Style_Down ? cg.highlight().dark(135) : cg.background().dark(115)));
+ p->drawText(ur.x()+1, ur.y()+1, ur.width(), ur.height(), text_flags, pb->text());
+ }
+
+- if (pb->text()) {
++ if (!pb->text().isEmpty()) {
+ p->setPen(enabled ? cg.foreground() : pb->palette().disabled().buttonText());
+ p->drawText(ur, text_flags, pb->text());
+ }
+--- kwin-styles/smooth-blend/client/config/smoothblendconfig.cc (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ kwin-styles/smooth-blend/client/config/smoothblendconfig.cc (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -100,7 +100,7 @@
+ config_->setGroup("General");
+
+ QString value = config_->readEntry("TitleAlignment", "AlignHCenter");
+- QRadioButton *button = (QRadioButton*)dialog_->titlealign->child(value);
++ QRadioButton *button = (QRadioButton*)dialog_->titlealign->child(value.latin1());
+ if (button)
+ {
+ button->setChecked(true);
+--- kscreensaver/kdesavers/rotation.cpp (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ kscreensaver/kdesavers/rotation.cpp (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -27,8 +27,6 @@
+ */
+ //============================================================================
+
+-#define QT_NO_COMPAT
+-
+ // std. C++ headers
+ #include <cstdlib>
+ // STL
+--- kscreensaver/kdesavers/slideshow.cpp (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ kscreensaver/kdesavers/slideshow.cpp (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -888,7 +888,7 @@
+ {
+ if (!fi->isDir())
+ {
+- mFileList.append(fi->filePath().data());
++ mFileList.append(fi->filePath());
+ }
+ }
+ ++it;
+--- kscreensaver/kdesavers/Euphoria.cpp (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ kscreensaver/kdesavers/Euphoria.cpp (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -716,10 +716,10 @@
+
+ if(dFeedback)
+ {
+- feedbacktexsize = int(pow(2, dFeedbacksize));
++ feedbacktexsize = int(pow(2.0, dFeedbacksize));
+ while(feedbacktexsize > viewport[2] || feedbacktexsize > viewport[3]){
+ dFeedbacksize -= 1;
+- feedbacktexsize = int(pow(2, dFeedbacksize));
++ feedbacktexsize = int(pow(2.0, dFeedbacksize));
+ }
+
+ // feedback texture setup
+--- kscreensaver/kdesavers/pendulum.cpp (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ kscreensaver/kdesavers/pendulum.cpp (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -26,8 +26,6 @@
+ */
+ //============================================================================
+
+-#define QT_NO_COMPAT
+-
+ // std. C++ headers
+ #include <cstdlib>
+
+@@ -854,7 +852,7 @@
+ void KPendulumSetup::barColorButtonClickedSlot(void)
+ {
+ QColor color = QColorDialog::getColor(
+- saver->barColor(), this, QString("bar color dialog"));
++ saver->barColor(), this, "bar color dialog");
+ if (color.isValid())
+ {
+ saver->setBarColor(color);
+@@ -864,7 +862,7 @@
+ void KPendulumSetup::m1ColorButtonClickedSlot(void)
+ {
+ QColor color = QColorDialog::getColor(
+- saver->m1Color(), this, QString("mass 1 color dialog"));
++ saver->m1Color(), this, "mass 1 color dialog");
+ if (color.isValid())
+ {
+ saver->setM1Color(color);
+@@ -874,7 +872,7 @@
+ void KPendulumSetup::m2ColorButtonClickedSlot(void)
+ {
+ QColor color = QColorDialog::getColor(
+- saver->m2Color(), this, QString("mass 2 color dialog"));
++ saver->m2Color(), this, "mass 2 color dialog");
+ if (color.isValid())
+ {
+ saver->setM2Color(color);
+--- kscreensaver/kxsconfig/kxscontrol.cpp (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ kscreensaver/kxsconfig/kxscontrol.cpp (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -51,7 +51,7 @@
+ if (attr.value("type") == "spinbutton" ) {
+ QHBoxLayout *hb = new QHBoxLayout(this);
+ if (!mLabel.isEmpty()) {
+- QLabel *l = new QLabel(i18n(mLabel), this);
++ QLabel *l = new QLabel(i18n(mLabel.utf8()), this);
+ hb->add(l);
+ }
+ mSpinBox = new QSpinBox(mMinimum, mMaximum, 1, this);
+@@ -63,19 +63,19 @@
+ QString highLabel = attr.value("_high-label");
+ QVBoxLayout *vb = new QVBoxLayout(this);
+ if (!mLabel.isEmpty()) {
+- QLabel *l = new QLabel(i18n(mLabel), this);
++ QLabel *l = new QLabel(i18n(mLabel.utf8()), this);
+ vb->add(l);
+ }
+ QHBoxLayout *hb = new QHBoxLayout(vb);
+ if (!lowLabel.isEmpty()) {
+- QLabel *l = new QLabel(i18n(lowLabel), this);
++ QLabel *l = new QLabel(i18n(lowLabel.utf8()), this);
+ hb->addWidget(l);
+ }
+ mSlider = new QSlider(mMinimum, mMaximum, 10, mValue, Qt::Horizontal, this);
+ connect(mSlider, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int)));
+ hb->add(mSlider);
+ if (!highLabel.isEmpty()){
+- QLabel *l = new QLabel(i18n(highLabel), this);
++ QLabel *l = new QLabel(i18n(highLabel.utf8()), this);
+ hb->addWidget(l);
+ }
+ }
+@@ -120,12 +120,12 @@
+ QString highLabel = attr.value("_high-label");
+ QVBoxLayout *vb = new QVBoxLayout(this);
+ if (!mLabel.isEmpty()) {
+- QLabel *l = new QLabel(i18n(mLabel), this);
++ QLabel *l = new QLabel(i18n(mLabel.utf8()), this);
+ vb->add(l);
+ }
+ QHBoxLayout *hb = new QHBoxLayout(vb);
+ if (!lowLabel.isEmpty()) {
+- QLabel *l = new QLabel(i18n(lowLabel), this);
++ QLabel *l = new QLabel(i18n(lowLabel.utf8()), this);
+ hb->addWidget(l);
+ }
+ int value = int((mValue - mMinimum) * 100 / (mMaximum - mMinimum));
+@@ -133,7 +133,7 @@
+ connect(mSlider, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int)));
+ hb->add(mSlider);
+ if (!highLabel.isEmpty()){
+- QLabel *l = new QLabel(i18n(highLabel), this);
++ QLabel *l = new QLabel(i18n(highLabel.utf8()), this);
+ hb->addWidget(l);
+ }
+ }
+@@ -165,7 +165,7 @@
+ const QXmlAttributes &attr)
+ : QCheckBox(parent), KXSBoolItem(name, attr)
+ {
+- setText(i18n(mLabel));
++ setText(i18n(mLabel.utf8()));
+ setChecked(mValue);
+ connect(this, SIGNAL(toggled(bool)), SLOT(slotToggled(bool)));
+ }
+@@ -192,7 +192,7 @@
+ l->add(label);
+ mCombo = new QComboBox(this);
+ for(uint i=0; i < mOptions.count(); i++)
+- mCombo->insertItem( i18n(mOptions[i]) );
++ mCombo->insertItem( i18n(mOptions[i].utf8()) );
+ mCombo->setCurrentItem(mValue);
+ connect(mCombo, SIGNAL(activated(int)), SLOT(slotActivated(int)));
+ l->add(mCombo);
+@@ -203,7 +203,7 @@
+ : QWidget(parent), KXSSelectItem(name, attr)
+ {
+ QVBoxLayout *l = new QVBoxLayout(this);
+- QLabel *label = new QLabel(i18n(mLabel), this);
++ QLabel *label = new QLabel(i18n(mLabel.utf8()), this);
+ l->add(label);
+ mCombo = new QComboBox(this);
+ connect(mCombo, SIGNAL(activated(int)), SLOT(slotActivated(int)));
+@@ -213,7 +213,7 @@
+ void KXSDropListControl::addOption(const QXmlAttributes &attr)
+ {
+ KXSSelectItem::addOption( attr );
+- mCombo->insertItem( i18n(mOptions[mOptions.count()-1]) );
++ mCombo->insertItem( i18n(mOptions[mOptions.count()-1].utf8()) );
+ if ( (unsigned)mValue == mOptions.count()-1 )
+ mCombo->setCurrentItem(mOptions.count()-1);
+ }
+@@ -248,7 +248,7 @@
+ : QWidget(parent), KXSStringItem(name, attr)
+ {
+ QVBoxLayout *l = new QVBoxLayout(this);
+- QLabel *label = new QLabel(i18n(mLabel), this);
++ QLabel *label = new QLabel(i18n(mLabel.utf8()), this);
+ l->add(label);
+ mEdit = new QLineEdit(this);
+ connect(mEdit, SIGNAL(textChanged(const QString &)), SLOT(textChanged(const QString &)));
+@@ -285,7 +285,7 @@
+ : QWidget(parent), KXSStringItem(name, attr)
+ {
+ QVBoxLayout *l = new QVBoxLayout(this);
+- QLabel *label = new QLabel(i18n(mLabel), this);
++ QLabel *label = new QLabel(i18n(mLabel.utf8()), this);
+ l->add(label);
+ QHBoxLayout *hb = new QHBoxLayout(l);
+ mEdit = new QLineEdit(this);
+--- configure.in.in (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ configure.in.in (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -1,4 +1,5 @@
+ #MIN_CONFIG
++CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+
+ dnl Themes are installed by the toplevel Makefile.am
+ DO_NOT_COMPILE="$DO_NOT_COMPILE Themes"
+--- IconThemes/slick/index.theme (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ IconThemes/slick/index.theme (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -46,6 +46,7 @@
+ Comment[eu]=Slick ikonoak 1.6 bertsioa
+ Comment[fi]=Slick-kuvakkeet versio 1.6
+ Comment[ga]=Slick Icons Leagan 1.6
++Comment[he]=סמלי Slick גרסה 1.6
+ Comment[hu]=Slick Icons 1.6
+ Comment[is]=Slick táknmyndir útgáfa 1.6
+ Comment[it]=Icone Slick versione 1.6
+--- wallpapers/mystical_rightturn.jpg.desktop (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ wallpapers/mystical_rightturn.jpg.desktop (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -25,4 +25,4 @@
+ Name[uk]=МіÑтичний поворот праворуч
+ Name[zh_CN]=ç‚« K
+ ImageType=pixmap
+-Author=Christian Müller
++Author=Christian Müller
+--- wallpapers/fulmine.jpg.desktop (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ wallpapers/fulmine.jpg.desktop (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -8,6 +8,7 @@
+ Name[eu]=Tximista
+ Name[fi]=Salamointi
+ Name[fr]=Foudre
++Name[he]=מכרה מל×
+ Name[ja]=爆発
+ Name[nl]=Bliksemschicht
+ Name[pl]=Niebo z błyskawicami
+--- wallpapers/alien-night.jpg.desktop (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ wallpapers/alien-night.jpg.desktop (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -10,6 +10,7 @@
+ Name[et]=Tulnukate öö
+ Name[fi]=Muukalaisten yö
+ Name[fr]=Nuit extraterrestre
++Name[he]=לילות ×—×•×¦× ×™×•×ª
+ Name[hu]=Idegen éj
+ Name[is]=Geimnótt
+ Name[it]=Notte Aliena
+--- wallpapers/gear-flowers.svgz.desktop (.../tags/KDE/3.5.1/kdeartwork) (revision 503566)
++++ wallpapers/gear-flowers.svgz.desktop (.../branches/KDE/3.5/kdeartwork) (revision 503566)
+@@ -11,6 +11,7 @@
+ Name[eu]=Makineria loreduna
+ Name[fi]=Hammasrattaiden kukat
+ Name[fr]=Engrenages fleuris
++Name[he]=פרחי גלגליות
+ Name[hu]=Fogaskerék-virágok
+ Name[is]=GÃrablóm
+ Name[it]=Ingranaggi a fiori
More information about the pkg-kde-commits
mailing list