Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at 2011-12-06 16:22:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase3 (Old) and /work/SRC/openSUSE:Factory/.kdebase3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase3", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase3/kdebase3.changes 2011-11-28 12:53:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes 2011-12-06 16:22:45.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Dec 2 15:50:56 UTC 2011 - [email protected] + +- add several patches: + fedora: + * make full hinting default + * decrease bounce timeout + chakra: + * make text labels of desktop icons round to match style in Konqueror + (and also fix buggy appearance) + pardus corporate: + * add Turkish translations + * fix boolean error + * fix fish in some circumstances + * add url handling to kconsole + * fix kicker container area + * port klineedit from KDE4 + trinity: + * disable previously applied patch for smooth scrolling option: + seems it does not affect the behavior + +------------------------------------------------------------------- Old: ---- kdebase-trinity-add-smooth-scrolling-option-r1260417.diff New: ---- further-desktop-icons-adjustment.patch kdebase-chakra-02-kip_kdesktop_rounded_icon_text_corners.patch kdebase-chakra-18-execute_feedback.patch kdebase-fedora-change-fonts-defaults.patch kdebase-fedora-decrease-bounce-timeout.patch kdebase-pardus-add-turkish-translations.patch kdebase-pardus-fix-autosuspend.patch kdebase-pardus-fix-boolean-error.patch kdebase-pardus-fix-fish.patch kdebase-pardus-kconsole-add-url-handling.patch kdebase-pardus-kicker-container-area-fix.patch kdebase-pardus-port-klineedit-from-kde4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.RbmjUD/_old 2011-12-06 16:22:48.000000000 +0100 +++ /var/tmp/diff_new_pack.RbmjUD/_new 2011-12-06 16:22:49.000000000 +0100 @@ -44,8 +44,6 @@ %ifarch ppc64 Obsoletes: kdebase3-64bit %endif -# -Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Requires: xorg-x11 misc-console-font Recommends: kdelibs3_doc Recommends: gdb @@ -236,11 +234,23 @@ Patch246: kdebase-trinity-1239915-fix-currency-symbols.dif Patch247: kdebase-trinity-launch-ksysguard-optionr1107589.diff Patch248: kdebase-trinity-r1255714-nsplugin-fix-port-from-kde4.diff -Patch249: kdebase-trinity-add-smooth-scrolling-option-r1260417.diff Patch250: kdebase-pardus-dbl-clicl-default-maximize.patch Patch251: kdebase-pardus-window-list-fix.patch Patch252: kdebase-pardus-hal-add-user-mount.patch Patch254: kdebase-pardus-exclude-proc-sys-from-search.patch +Patch255: kdebase-fedora-change-fonts-defaults.patch +Patch256: kdebase-chakra-02-kip_kdesktop_rounded_icon_text_corners.patch +Patch258: kdebase-fedora-decrease-bounce-timeout.patch +#needs patched kdelibs as well +Patch259: kdebase-chakra-18-execute_feedback.patch +Patch260: kdebase-pardus-add-turkish-translations.patch +Patch261: kdebase-pardus-fix-boolean-error.patch +Patch262: kdebase-pardus-kconsole-add-url-handling.patch +Patch263: kdebase-pardus-kicker-container-area-fix.patch +Patch264: kdebase-pardus-port-klineedit-from-kde4.patch +Patch265: kdebase-pardus-fix-fish.patch +Patch266: further-desktop-icons-adjustment.patch +Patch267: kdebase-pardus-fix-autosuspend.patch %description This package contains kdebase, one of the basic packages of the K @@ -650,10 +660,21 @@ %patch246 -p1 %patch247 -p1 %patch248 -p1 -%patch249 -p1 %patch250 -p1 %patch251 -p1 %patch254 -p1 +%patch255 -p1 +%patch256 -p1 +%patch258 -p1 +#%patch259 -p1 +%patch260 -p1 +%patch261 -p1 +%patch262 -p1 +%patch263 -p1 +%patch264 -p1 +%patch265 -p1 +%patch266 -p1 +%patch267 -p1 rm -rf kappfinder rm pics/crystalsvg/cr??-*emacs.png ++++++ further-desktop-icons-adjustment.patch ++++++ diff -wruN kdebase-3.5.10.orig/kdesktop/kfileividesktop.cpp kdebase-3.5.10/kdesktop/kfileividesktop.cpp --- kdebase-3.5.10.orig/kdesktop/kfileividesktop.cpp 2007-01-15 14:32:10.000000000 +0300 +++ kdebase-3.5.10/kdesktop/kfileividesktop.cpp 2011-12-05 08:16:17.512415347 +0400 @@ -64,23 +64,6 @@ void KFileIVIDesktop::calcRect( const QString& _text ) { KIconViewItem::calcRect( _text ); - - if ( !iconView() || !m_shadow || - !wordWrap() || !( static_cast<KDesktopShadowSettings *> - ( m_shadow->shadowSettings() ) )->isEnabled() ) - return; - - int spread = shadowThickness(); - QRect itemTextRect = textRect(); - QRect itemRect = rect(); - - itemTextRect.setBottom( itemTextRect.bottom() + spread ); - itemTextRect.setRight( itemTextRect.right() + spread ); - itemRect.setBottom( itemRect.bottom() + spread ); - itemRect.setRight( itemRect.right() + spread ); - - setTextRect( itemTextRect ); - setItemRect( itemRect ); } void KFileIVIDesktop::paintItem( QPainter *p, const QColorGroup &cg) ++++++ kdebase-chakra-02-kip_kdesktop_rounded_icon_text_corners.patch ++++++ diff -Naur kdebase-3.5.8.orig/kdesktop/kfileividesktop.cpp kdebase-3.5.8/kdesktop/kfileividesktop.cpp --- kdebase-3.5.8.orig/kdesktop/kfileividesktop.cpp 2007-10-08 15:58:03.000000000 +0200 +++ kdebase-3.5.8/kdesktop/kfileividesktop.cpp 2007-11-20 13:57:09.000000000 +0100 @@ -100,6 +100,13 @@ // draw the pixmap as in KIconViewItem::paintItem(...) paintPixmap(p, colors); + if ( isSelected() ) { + p->setBrush( QBrush( cg.highlight() ) ); + p->setPen( QPen( cg.highlight() ) ); + p->drawRoundRect( textRect( FALSE ), + 1000 / textRect( FALSE ).width(), + 1000 / textRect( FALSE ).height() ); + } // // Paint the text as shadowed if the shadow is available @@ -134,40 +141,10 @@ return false; } -void KFileIVIDesktop::paintFocus( QPainter *p, const QColorGroup &cg ) -{ - if ( !iconView() ) - return; - - if ( !m_shadow || !wordWrap() || - !( static_cast<KDesktopShadowSettings *> - ( m_shadow->shadowSettings() ) )->isEnabled() ) { - QIconViewItem::paintFocus( p, cg ); - return; - } - - int spread = shadowThickness(); - - iconView()->style().drawPrimitive( QStyle::PE_FocusRect, p, - QRect( textRect( false ).x(), textRect( false ).y(), - textRect( false ).width() - spread, - textRect( false ).height() - spread + 1 ), - cg, - isSelected() ? QStyle::Style_FocusAtBorder : QStyle::Style_Default, - QStyleOption( isSelected() ? cg.highlight() : cg.base() ) ); - - if ( this != iconView()->currentItem() ) { - iconView()->style().drawPrimitive( QStyle::PE_FocusRect, p, - QRect( pixmapRect( false ).x(), pixmapRect( false ).y(), - pixmapRect( false ).width(), pixmapRect( false ).height() ), - cg, QStyle::Style_Default, QStyleOption( cg.base() ) ); - } -} - void KFileIVIDesktop::drawShadowedText( QPainter *p, const QColorGroup &cg ) { - int textX = textRect( FALSE ).x() + 2; + int textX = textRect( FALSE ).x() + 4; int textY = textRect( FALSE ).y(); int align = ((KIconView *) iconView())->itemTextPos() == QIconView::Bottom ? AlignHCenter : AlignAuto; @@ -184,12 +161,15 @@ int spread = shadowThickness(); if ( isSelected() && settings->selectionType() != KShadowSettings::InverseVideoOnSelection ) { - // select using a filled rect text = cg.highlightedText(); QRect rect = textRect( false ); - rect.setRight( rect.right() - spread ); - rect.setBottom( rect.bottom() - spread + 1 ); + rect.setRight( rect.right() ); + rect.setBottom( rect.bottom() + 1 ); - p->fillRect( rect, cg.highlight() ); + p->setBrush( QBrush( cg.highlight() ) ); + p->setPen( QPen( cg.highlight() ) ); + p->drawRoundRect( rect, + 1000 / rect.width(), + 1000 / rect.height() ); } else { // use shadow diff -Naur kdebase-3.5.8.orig/kdesktop/kfileividesktop.h kdebase-3.5.8/kdesktop/kfileividesktop.h --- kdebase-3.5.8.orig/kdesktop/kfileividesktop.h 2007-10-08 15:58:03.000000000 +0200 +++ kdebase-3.5.8/kdesktop/kfileividesktop.h 2007-11-20 13:57:09.000000000 +0100 @@ -80,12 +80,6 @@ virtual void paintItem(QPainter *p, const QColorGroup &cg); /** - * Reimplements QIconView::paintFocus() to take the shadow - * metrics into account(); - */ - virtual void paintFocus( QPainter *p, const QColorGroup &cg ); - - /** * Draws the shadow text. * @param p the painter for drawing the item * @param cg the base color group ++++++ kdebase-chakra-18-execute_feedback.patch ++++++ diff -Naur kdebase-3.5.8.orig/kicker/libkicker/panelbutton.cpp kdebase-3.5.8/kicker/libkicker/panelbutton.cpp --- kdebase-3.5.8.orig/kicker/libkicker/panelbutton.cpp 2006-07-22 10:15:18.000000000 +0200 +++ kdebase-3.5.8/kicker/libkicker/panelbutton.cpp 2007-11-21 06:50:46.000000000 +0100 @@ -29,6 +29,7 @@ #include <qstyle.h> #include <qstylesheet.h> #include <qtooltip.h> +#include <qpixmap.h> #include <kapplication.h> #include <kconfig.h> @@ -39,6 +40,7 @@ #include <kglobalsettings.h> #include <kiconloader.h> #include <kicontheme.h> +#include <kiconeffect.h> #include <kipc.h> #include <kstandarddirs.h> #include <klocale.h> @@ -487,6 +489,9 @@ if (e->button() == LeftButton) { m_isLeftMouseButtonDown = false; + + QPixmap pix = labelIcon(); + KIconEffect::visualActivate(this, this->geometry(), &pix); } QButton::mouseReleaseEvent(e); } diff -Naur kdebase-3.5.8.orig/konqueror/listview/konq_listviewwidget.cc kdebase-3.5.8/konqueror/listview/konq_listviewwidget.cc --- kdebase-3.5.8.orig/konqueror/listview/konq_listviewwidget.cc 2006-10-01 19:32:03.000000000 +0200 +++ kdebase-3.5.8/konqueror/listview/konq_listviewwidget.cc 2007-11-21 06:50:46.000000000 +0100 @@ -33,6 +33,7 @@ #include <kurldrag.h> #include <kmessagebox.h> #include <kiconloader.h> +#include <kiconeffect.h> #include <qheader.h> #include <qpainter.h> @@ -904,7 +905,42 @@ url.cleanPath(); bool isIntoTrash = url.isLocalFile() && url.path(1).startsWith(KGlobalSettings::trashPath()); if ( !isIntoTrash || (isIntoTrash && fileItem->isDir()) ) - m_pBrowserView->lmbClicked( fileItem ); + { + m_pBrowserView->lmbClicked( fileItem ); + + if (_item->pixmap(0) != 0) + { + // Rect of the QListViewItem's pixmap area. + QRect rect = _item->listView()->itemRect(_item); + + // calculate nesting depth + int nestingDepth = 0; + for (QListViewItem *currentItem = _item->parent(); + currentItem != 0; + currentItem = currentItem->parent()) + nestingDepth++; + + // no parent no indent + if (_item->parent() == 0) + nestingDepth = 0; + + // Root decoration means additional indent + if (_item->listView()->rootIsDecorated()) + nestingDepth++; + + // set recalculated rect + rect.setLeft(_item->listView()->itemMargin() + _item->listView()->treeStepSize() * nestingDepth); + rect.setWidth(_item->pixmap(0)->width()); + + // gather pixmap + QPixmap *pix = new QPixmap(*(_item->pixmap(0))); + + // call the icon effect + KIconEffect::visualActivate(viewport(), rect, pix); + + delete(pix); + } + } else KMessageBox::information( 0, i18n("You must take the file out of the trash before being able to use it.") ); } diff -Naur kdebase-3.5.8.orig/libkonq/konq_iconviewwidget.cc kdebase-3.5.8/libkonq/konq_iconviewwidget.cc --- kdebase-3.5.8.orig/libkonq/konq_iconviewwidget.cc 2007-05-14 09:55:47.000000000 +0200 +++ kdebase-3.5.8/libkonq/konq_iconviewwidget.cc 2007-11-21 06:50:46.000000000 +0100 @@ -1848,7 +1848,7 @@ // Adjust for scrolling (David) rect.moveBy( -contentsX(), -contentsY() ); - KIconEffect::visualActivate(viewport(), rect); + KIconEffect::visualActivate(viewport(), rect, item->pixmap()); } void KonqIconViewWidget::backgroundPixmapChange( const QPixmap & ) ++++++ kdebase-fedora-change-fonts-defaults.patch ++++++ >From d54512417f8f4fed0992544ba6fa2d07b88cb3e7 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ozan=20=C3=87a=C4=9Flayan?= <[email protected]> Date: Mon, 27 Jun 2011 06:15:33 +0000 Subject: [PATCH] kcontrol/fonts: [Fedora] Change kxftconfig defaults --- kcontrol/fonts/kxftconfig.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kcontrol/fonts/kxftconfig.h b/kcontrol/fonts/kxftconfig.h index 6828f1d..527f64a 100644 --- a/kcontrol/fonts/kxftconfig.h +++ b/kcontrol/fonts/kxftconfig.h @@ -108,7 +108,7 @@ class KXftConfig #else SubPixel(Type t=None, char *s=NULL, char *e=NULL) : Item(s, e), type(t) {} #endif - void reset() { Item::reset(); type=None; } + void reset() { Item::reset(); type=Rgb; } Type type; }; @@ -142,7 +142,7 @@ class KXftConfig Hint(Style s, QDomNode &n) : Item(n), style(s) {} Hint(Style s=NotSet) : style(s) {} - void reset() { Item::reset(); style=NotSet; } + void reset() { Item::reset(); style=Full; } Style style; }; -- 1.6.1 ++++++ kdebase-fedora-decrease-bounce-timeout.patch ++++++ >From a94fa00789189a94b1d16b29bc35b72c5a4d1737 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ozan=20=C3=87a=C4=9Flayan?= <[email protected]> Date: Mon, 27 Jun 2011 06:15:09 +0000 Subject: [PATCH] kdesktop: [Fedora] Decrease bounce timeout to 5 sec --- kcontrol/launch/kcmlaunch.cpp | 4 ++-- kdesktop/klaunch.kcfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index 24623a7..bfe9252 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -170,7 +170,7 @@ LaunchConfig::load(bool useDefaults) cb_taskbarButton->setChecked(taskbarButton); c.setGroup( "BusyCursorSettings" ); - sb_cursorTimeout->setValue( c.readUnsignedNumEntry( "Timeout", 30 )); + sb_cursorTimeout->setValue( c.readUnsignedNumEntry( "Timeout", 5 )); bool busyBlinking =c.readBoolEntry("Blinking", false); bool busyBouncing =c.readBoolEntry("Bouncing", true); if ( !busyCursor ) @@ -239,7 +239,7 @@ LaunchConfig::checkChanged() c.readBoolEntry("TaskbarButton", Default & TaskbarButton); c.setGroup( "BusyCursorSettings" ); - unsigned int savedCursorTimeout = c.readUnsignedNumEntry( "Timeout", 30 ); + unsigned int savedCursorTimeout = c.readUnsignedNumEntry( "Timeout", 5 ); bool savedBusyBlinking =c.readBoolEntry("Blinking", false); bool savedBusyBouncing =c.readBoolEntry("Bouncing", true); diff --git a/kdesktop/klaunch.kcfg b/kdesktop/klaunch.kcfg index 29418f8..d888960 100644 --- a/kdesktop/klaunch.kcfg +++ b/kdesktop/klaunch.kcfg @@ -8,7 +8,7 @@ <group name="BusyCursorSettings"> <entry key="Timeout" type="Int"> - <default>30</default> + <default>5</default> <label></label> <whatsthis></whatsthis> <!-- startupid.cpp:58 --> -- 1.6.1 ++++++ kdebase-pardus-add-turkish-translations.patch ++++++ >From 29fb6077a5bff3a4a7a9e7b7ef80ee113ff250d4 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ozan=20=C3=87a=C4=9Flayan?= <[email protected]> Date: Mon, 27 Jun 2011 06:19:00 +0000 Subject: [PATCH] kcontrol/access: Add more Turkish translations --- kcontrol/access/eventsrc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/kcontrol/access/eventsrc b/kcontrol/access/eventsrc index 185460e..8f57d5c 100644 --- a/kcontrol/access/eventsrc +++ b/kcontrol/access/eventsrc @@ -115,6 +115,7 @@ Name[sr@Latn]=Modifikatorski taster je aktiviran Name[sv]=En väljartangent har aktiverats Name[tg]=Калиди ислоҳгар фаъол карда шуд Name[th]=ปุ่มสำหรับเปลี่ยนหน้าที่ถูกเปิดใช้งาน +Name[tr]=Bir değiştirici tuş etkin hale geldi Name[uk]=Клавішу-модифікатор активовано Name[vi]=Một phím bổ trợ đã được kích hoạt Name[wa]=Ene tape di candjmint s' a rtrové en alaedje @@ -168,6 +169,7 @@ Comment[sr@Latn]=Modifikatorski taster (npr. Shift ili Control) je promenio stan Comment[sv]=En väljartangent (t.ex. Skift eller Ctrl) har ändrat tillstånd och är nu aktiv Comment[tg]=Калиди ислоҳгар (мисоли, Shift ё Ctrl) вазъияти худ иваз кард ва ҳозир фаъол аст Comment[th]=มีการเปลี่ยนสถานะปุ่มสำหรับเปลี่ยนหน้าที่ (เช่น Shift หรือ Control) และขณะนี้ เปิดใช้งาน +Comment[tr]=Bir değiştirici tuş (Shift veya CTRL gibi) durum değiştirdi ve etkin hale geldi Comment[uk]=Клавіша-модифікатор (напр., Shift або Control) змінила свій стан і тепер активна Comment[vi]=Một phím bổ trợ (như Shift hay Ctrl) đã thay đổi trạng thái và được kích hoạt Comment[wa]=Ene tape di candjmint (metans SHIFT ou CTRL) a candjî si-estat et est asteure en alaedje @@ -227,6 +229,7 @@ Name[sr@Latn]=Modifikatorski taster je deaktiviran Name[sv]=En väljartangent har inaktiverats Name[tg]=Калиди ислоҳгар ғайри фаъол карда шуд Name[th]=ปุ่มสำหรับเปลี่ยนหน้าที่ถูกปิดการใช้งาน +Name[tr]=Bir değiştirici tuş etkinliğini kaybetti Name[uk]=Клавішу-модифікатор деактивовано Name[vi]=Một phím bổ trợ đã bị tắt Name[wa]=Ene tape di candjmint s' a rtrové dismetowe @@ -280,6 +283,7 @@ Comment[sr@Latn]=Modifikatorski taster (npr. Shift ili Control) je promenio stan Comment[sv]=En väljartangent (t.ex. Skift eller Ctrl) har ändrat tillstånd och är nu inaktiv Comment[tg]=Калиди ислоҳгар (мисоли, Shift ё Ctrl) вазъияти худ иваз кард ва ҳозир ғайри фаъол аст Comment[th]=มีการเปลี่ยนสถานะปุ่มสำหรับเปลี่ยนหน้าที่ (เช่น Shift หรือ Control) และขณะนี้ ถูกปิดการใช้งาน +Comment[tr]=Bir değiştirici tuş (Shift veya CTRL gibi) durum değiştirdi ve etkinliğini kaybetti Comment[uk]=Клавіша-модифікатор (напр., Shift або Control) змінила свій стан і тепер неактивна Comment[vi]=Một phím bổ trợ (như Shift hay Ctrl) đã thay đổi trạng thái và đã bị tắt Comment[wa]=Ene tape di candjmint (metans SHIFT ou CTRL) a candjî si-estat et n' est asteure pus en alaedje @@ -339,6 +343,7 @@ Name[sr@Latn]=Modifikatorski taster je zaključan Name[sv]=En väljartangent har låsts Name[tg]=Калиди ислоҳгар қулф карда шуд Name[th]=ปุ่มเปลี่ยนหน้าที่ค้างอยู่ +Name[tr]=Bir değiştirici tuş kilitlendi Name[uk]=Клавішу-модифікатор заблоковано Name[vi]=Một phím bổ trợ đã được khoá Name[wa]=Ene tape di candjmint a stî serêye @@ -392,6 +397,7 @@ Comment[sr@Latn]=Modifikatorski taster (npr. Shift ili Control) je zaključan i Comment[sv]=En väljartangent (t.ex. Skift eller Ctrl) har låsts och är nu aktiv för alla följande tangentnertryckningar Comment[tg]=Калиди ислоҳгар (мисоли, Shift ё Ctrl) қулф карда буд лекин ҳозир ин фаъол аст барои ҳамаи пахшзаданиҳои оянда Comment[th]=ปุ่มสำหรับเปลี่ยนหน้าที่ (เช่น Shift หรือ Control) ค้างอยู่ และขณะนี้จะถูกใช้งาน สำหรับการกดคีย์อื่นๆ ต่อจากนี้ทั้งหมด +Comment[tr]=Bir değiştirici tuş (Shift veya CTRL gibi) kilitlendi ve sıradaki tüm tuş basışları için etkin hale geldi Comment[uk]=Клавіша-модифікатор (напр., Shift або Control) була заблокована і тепер активна для всіх наступних натискань клавіш Comment[vi]=Một phím bổ trợ (như Shift hay Ctrl) đã được khoá và từ giờ bạn có thể dùng nó khi gõ bàn phím Comment[wa]=Ene tape di candjmint (metans SHIFT ou CTRL) a stî serêye et est asteure en alaedje po tos les tapes di tchôkeyes. @@ -452,6 +458,7 @@ Name[sr@Latn]=Taster za zaključavanje je aktiviran Name[sv]=En låstangent har aktiverats Name[tg]=Калиди қулф фаъол карда шуд Name[th]=ปุ่มล็อคเปิดใช้งาน +Name[tr]=Bir kilit tuşu etkinleştirildi Name[uk]=Клавішу блокування активовано Name[vi]=Một phím khoá đã được kích hoạt Name[wa]=Ene tape po serer a stî metowe en alaedje @@ -505,6 +512,7 @@ Comment[sr@Latn]=Taster za zaključavanje (npr. Caps Lock ili Num Lock) je prome Comment[sv]=En låstangent (t.ex. Caps Lock eller Num Lock) har ändrat tillstånd och är nu aktiv Comment[tg]=Калиди қулф (мисоли, Caps Lock ё Num Lock) вазъияти худ иваз кард ва ҳозир фаъол аст Comment[th]=มีการเปลี่ยนสถานะปุ่มล็อค (เช่น Caps Lock หรือ Num Lock) และขณะนี้เปิดการใช้งาน +Comment[tr]=Bir kilit tuşu (Caps Lock veya Num Lock gibi) durum değiştirdi ve etkin hale geldi Comment[uk]=Клавіша блокування (напр., Caps Lock або Num Lock) змінила свій стан і тепер активна Comment[vi]=Một phím khoá (như Caps Lock hay Num Lock) đã thay đổi trạng thái và được kích hoạt Comment[wa]=Ene tape po serer (metans CAPS LOCK ou NUM LOCK) a candjî d' esta et est asteure en alaedje @@ -565,6 +573,7 @@ Name[sr@Latn]=Taster za zaključavanje je deaktiviran Name[sv]=En låstangent har inaktiverats Name[tg]=Калиди қулф ғайри фаъол карда буд Name[th]=ปุ่มล็อคถูกปิด +Name[tr]=Bir kilit tuşu etkinliğini kaybetti Name[uk]=Клавішу блокування деактивовано Name[vi]=Một phím khoá đã bị tắt Name[wa]=Ene tape po serer a stî dismetowe @@ -618,6 +627,7 @@ Comment[sr@Latn]=Taster za zaključavanje (npr. Caps Lock ili Num Lock) je prome Comment[sv]=En låstangent (t.ex. Caps Lock eller Num Lock) har ändrat tillstånd och är nu inaktiv Comment[tg]=Калиди қулф (мисоли, Caps Lock ё Num Lock) вазъияти худ иваз кард ва ҳозир ғайри фаъол аст Comment[th]=มีการเปลี่ยนสถานะปุ่มล็อค (เช่น Caps Lock หรือ Num Lock) และขณะนี้ปิดการใช้งาน +Comment[tr]=Bir kilit tuşu (Caps Lock veya Num Lock gibi) durum değiştirdi ve etkinliğini kaybetti Comment[uk]=Клавіша блокування (напр., Caps Lock або Num Lock) змінила свій стан і тепер неактивна Comment[vi]=Một phím khoá (như Caps Lock hay Num Lock) đã thay đổi trạng thái và đã bị tắt Comment[wa]=Ene tape po serer (metans CAPS LOCK ou NUM LOCK) a candjî d' esta et est asteure dismetowe @@ -676,6 +686,7 @@ Name[sr@Latn]=Lepljivi tasteri su uključeni ili isključeni Name[sv]=Klistriga tangenter har aktiverats eller inaktiverats Name[tg]=Калидҳои часпак фаъол ё ғайрифаъол мебошад Name[th]=ปุ่มติดหนึบได้ถูกใช้งาน หรือ ถูกปิด +Name[tr]=Yapışkan tuşlar açıldı veya kapatıldı Name[uk]=Липкі клавіші було увімкнено або вимкнено Name[vi]=Các phím dính đã được bật hoặc đã được tắt Name[wa]=Les aclapantès tapes ont stî metowes en alaedje ou dismetowes @@ -729,6 +740,7 @@ Comment[sr@Latn]=Lepljivi tasteri su uključeni ili isključeni Comment[sv]=Klistriga tangenter har aktiverats eller inaktiverats Comment[tg]=Калидҳои часпак фаъол ё ғайрифаъол мебошад Comment[th]=ปุ่มติดหนึบได้ถูกใช้งาน หรือ ถูกปิด +Comment[tr]=Yapışkan tuşlar açıldı veya kapatıldı Comment[uk]=Липкі клавіші було увімкнено або вимкнено Comment[vi]=Các phím dính đã được bật hoặc đã được tắt Comment[wa]=Les aclapantès tapes ont stî metowes en alaedje ou dismetowes @@ -787,6 +799,7 @@ Name[sr@Latn]=Spori tasteri su uključeni ili isključeni Name[sv]=Långsamma tangenter har aktiverats eller inaktiverats Name[tg]=калиди сусткор фаъол ё ғайрифаъол мебошад Name[th]=ปุ่มชะลอได้ถูกใช้งาน หรือถูกปิด +Name[tr]=Yavaş tuşlar açıldı veya kapatıldı Name[uk]=Повільні клавіші було увімкнено або вимкнено Name[vi]=Các phím chậm đã được bật hoặc đã được tắt Name[wa]=Les londjinnès tapes ont stî metowes en alaedje ou dismetowes @@ -840,6 +853,7 @@ Comment[sr@Latn]=Spori tasteri su uključeni ili isključeni Comment[sv]=Långsamma tangenter har aktiverats eller inaktiverats Comment[tg]=Калиди сусткор фаъол ё ғайрифаъол мебошад Comment[th]=ปุ่มชะลอได้ถูกใช้งาน หรือ ถูกปิด +Comment[tr]=Yavaş tuşlar açıldı veya kapatıldı Comment[uk]=Повільні клавіші було увімкнено або вимкнено Comment[vi]=Các phím chậm đã được bật hoặc đã được tắt Comment[wa]=Les londjinnès tapes ont stî metowes en alaedje ou dismetowes @@ -897,6 +911,7 @@ Name[sr@Latn]=Odskačući tasteri su uključeni ili isključeni Name[sv]=Studsande tangenter har aktiverats eller inaktiverats Name[tg]=Калидҳои бонус фаъол ё ғайрифаъол мебошанд Name[th]=ปุ่มสะท้อน ได้ถูกใช้งาน หรือถูกปิด +Name[tr]=Tekrar eden tuşlar (Bounce keys) açıldı veya kapatıldı Name[uk]=Пружні клавіші було увімкнено або вимкнено Name[vi]=Các phím nảy đã được bật hoặc đã được tắt Name[wa]=Les tapes di ridjiblaedje ont stî metowes en alaedje ou dismetowes @@ -950,6 +965,7 @@ Comment[sr@Latn]=Odskačući tasteri su uključeni ili isključeni Comment[sv]=Studsande tangenter har aktiverats eller inaktiverats Comment[tg]=Калидҳои бонус фаъол ё ғайрифаъоланд Comment[th]=ปุ่มสะท้อนได้ถูกใช้งาน หรือ ถูกปิด +Comment[tr]=Tekrar eden tuşlar (Bounce keys) açıldı veya kapatıldı Comment[uk]=Пружні клавіші було увімкнено або вимкнено Comment[vi]=Các phím nảy đã được bật hoặc đã được tắt Comment[wa]=Les tapes di ridjiblaedje ont stî metowes en alaedje ou dismetowes @@ -1009,6 +1025,7 @@ Name[sr@Latn]=Tasteri za miš su uključeni ili isključeni Name[sv]=Mustangenter har aktiverats eller inaktiverats Name[tg]=Тугмачаҳои мушуак фаъол ё ғайрифаъол мебошанд Name[th]=ปุ่มแทนเมาส์ได้ถูกใช้งาน หรือ ถูกปิด +Name[tr]=Fare tuşları açıldı veya kapatıldı Name[uk]=Клавіші мишки було увімкнено або вимкнено Name[vi]=Các phím chuột đã được bật hoặc đã được tắt Name[wa]=Les tapes di sori ont stî metowes en alaedje ou dismetowes @@ -1062,6 +1079,7 @@ Comment[sr@Latn]=Tasteri za miš su uključeni ili isključeni Comment[sv]=Mustangenter har aktiverats eller inaktiverats Comment[tg]=Тугмачаҳои мушуак фаъол ё ғайрифаъол мебошанд Comment[th]=ปุ่มแทนเมาส์ได้ถูกใช้งาน หรือ ถูกปิด +Comment[tr]=Fare tuşları açıldı veya kapatıldı Comment[uk]=Клавіші мишки було увімкнено або вимкнено Comment[vi]=Các phím chuột đã được bật hoặc đã được tắt Comment[wa]=Les tapes di sori ont stî metowes en alaedje ou dismetowes -- 1.6.1 ++++++ kdebase-pardus-fix-autosuspend.patch ++++++ >From 29ff2d0570eb9be5bf7618b809770a4c1b087cb2 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ozan=20=C3=87a=C4=9Flayan?= <[email protected]> Date: Mon, 27 Jun 2011 05:38:31 +0000 Subject: [PATCH] kcontrol/arts: Fix autosuspend --- kcontrol/arts/arts.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index fc2ccaf..8c5e060 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -214,7 +214,7 @@ KArtsModule::KArtsModule(QWidget *parent, const char *name) config = new KConfig("kcmartsrc"); load(); - suspendTime->setRange( 0, 999, 1, true ); + suspendTime->setRange( 1, 999, 1, true ); connect(startServer,SIGNAL(clicked()),this,SLOT(slotChanged())); connect(networkTransparent,SIGNAL(clicked()),this,SLOT(slotChanged())); -- 1.6.1 ++++++ kdebase-pardus-fix-boolean-error.patch ++++++ >From fa7573fa0c354b26c079490bbe6d619fcb7ddb85 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ozan=20=C3=87a=C4=9Flayan?= <[email protected]> Date: Mon, 27 Jun 2011 05:37:55 +0000 Subject: [PATCH] kfontinst: Fix boolean error --- kcontrol/kfontinst/viewpart/FontViewPart.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 92ddf44..c649f01 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -198,7 +198,7 @@ void CFontViewPart::previewStatus(bool st) itsInstallButton->setShown(st && itsShowInstallButton); itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown()); itsChangeTextAction->setEnabled(st); - itsPrintAction->setEnabled(st && KFI_KIO_FONTS_PROTOCOL==m_url.protocol()); + itsPrintAction->setEnabled(st || KFI_KIO_FONTS_PROTOCOL==m_url.protocol()); } void CFontViewPart::install() -- 1.6.1 ++++++ kdebase-pardus-fix-fish.patch ++++++ >From f1b124fde9d7bfda5de7c20df77c7adae065e443 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ozan=20=C3=87a=C4=9Flayan?= <[email protected]> Date: Mon, 27 Jun 2011 05:38:18 +0000 Subject: [PATCH] kioslave/fish: Make copy reliable --- kioslave/fish/fish.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp index 4b7ea26..3967bcd 100644 --- a/kioslave/fish/fish.cpp +++ b/kioslave/fish/fish.cpp @@ -2,7 +2,7 @@ fish.cpp - a FISH kioslave ------------------- begin : Thu Oct 4 17:09:14 CEST 2001 - copyright : (C) 2001-2003 by J�rg Walter + copyright : (C) 2001-2003 by J�rg Walter email : [email protected] ***************************************************************************/ @@ -1430,7 +1430,7 @@ void fishProtocol::run() { sent(); } } - if (FD_ISSET(childFd,&rfds)) { + else if (FD_ISSET(childFd,&rfds)) { rc = read(childFd,buf+offset,32768-offset); //myDebug( << "read " << rc << " bytes" << endl); if (rc > 0) { -- 1.6.1 ++++++ kdebase-pardus-kconsole-add-url-handling.patch ++++++ >From 0ed0231329bd5a443936687e6dc0fda46249acdb Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ozan=20=C3=87a=C4=9Flayan?= <[email protected]> Date: Mon, 27 Jun 2011 05:32:43 +0000 Subject: [PATCH] konsole: Add URL handling http://bugs.kde.org/show_bug.cgi?id=94075 --- konsole/konsole/TEmulation.cpp | 5 +++++ konsole/konsole/TEmulation.h | 1 + konsole/konsole/konsole.cpp | 37 +++++++++++++++++++++++++++++++++++++ konsole/konsole/konsole.h | 7 +++++++ 4 files changed, 50 insertions(+), 0 deletions(-) diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index 0ff2a51..b7bd036 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -395,6 +395,11 @@ void TEmulation::copySelection() { QApplication::clipboard()->setText(t); } +QString TEmulation::getSelection() { + if (connected) return scr->getSelText(true); + return QString::null; +} + void TEmulation::streamHistory(QTextStream* stream) { scr->streamHistory(stream); } diff --git a/konsole/konsole/TEmulation.h b/konsole/konsole/TEmulation.h index 53f05c6..9a2acb7 100644 --- a/konsole/konsole/TEmulation.h +++ b/konsole/konsole/TEmulation.h @@ -59,6 +59,7 @@ public slots: // signals incoming from TEWidget virtual void clearSelection(); virtual void copySelection(); + virtual QString getSelection(); virtual void onSelectionBegin(const int x, const int y, const bool columnmode); virtual void onSelectionExtend(const int x, const int y); virtual void setSelection(const bool preserve_line_breaks); diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 2f9abdf..2eb295d 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -114,6 +114,7 @@ Time to start a requirement list. #include <knotifydialog.h> #include <kprinter.h> #include <kaccelmanager.h> +#include <kurifilter.h> #include <kaction.h> #include <kshell.h> @@ -268,6 +269,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,sessionNumberMapper(0) ,sl_sessionShortCuts(0) ,s_workDir(workdir) +,m_filterData(0) { isRestored = b_inRestore; connect( &m_closeTimeout, SIGNAL(timeout()), this, SLOT(slotCouldNotClose())); @@ -346,6 +348,8 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo Konsole::~Konsole() { + delete m_filterData; + sessions.first(); while(sessions.current()) { @@ -718,6 +722,11 @@ void Konsole::makeGUI() m_copyClipboard->plug(m_rightButton); m_pasteClipboard->plug(m_rightButton); + + m_openSelection = new KPopupMenu(this); + m_rightButton->insertItem( i18n("&Open.."), m_openSelection ); + connect(m_openSelection, SIGNAL(aboutToShow()), SLOT(slotOpenSelection())); + if (m_signals) m_rightButton->insertItem(i18n("&Send Signal"), m_signals); @@ -3950,6 +3959,34 @@ void Konsole::slotFindHistory() m_finddialog->result(); } +void Konsole::slotOpenSelection() +{ + delete m_filterData; + + m_openSelection->clear(); + disconnect(m_openSelection, SIGNAL(activated(int)), this, SLOT(slotOpenURI(int))); + + QString selection = se->getEmulation()->getSelection(); + QString curdir = baseURL().path(); + + if ( QFile::exists( curdir + selection ) ) { + selectedURL = QString(curdir + selection); + } else { + selectedURL = QString(selection); + } + + m_filterData = new KURIFilterData( selectedURL ); + KURIFilter::self()->filterURI( *(m_filterData) ); + m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 ); + + connect(m_openSelection, SIGNAL(activated(int)), SLOT(slotOpenURI(int))); +} + +void Konsole::slotOpenURI(int) +{ + (void) new KRun( m_filterData->uri() ); +} + void Konsole::slotFindNext() { if( !m_finddialog ) { diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h index df9157f..d9fc2fa 100644 --- a/konsole/konsole/konsole.h +++ b/konsole/konsole/konsole.h @@ -61,6 +61,7 @@ class KSelectAction; class KRadioAction; class KTabWidget; class QToolButton; +class KURIFilterData; // Defined in main.C const char *konsole_shell(QStrList &args); @@ -200,6 +201,9 @@ private slots: void loadScreenSessions(); void updateFullScreen(bool on); + void slotOpenSelection(); + void slotOpenURI(int n); + void slotSaveSettings(); void slotSaveSessionsProfile(); void slotConfigureNotifications(); @@ -362,6 +366,7 @@ private: KAction *m_print; KAction *m_quit; KAction *m_tabDetachSession; + KPopupMenu *m_openSelection; KActionCollection *m_shortcuts; @@ -372,6 +377,7 @@ private: bool m_find_first; bool m_find_found; QString m_find_pattern; + QString selectedURL; int cmd_serial; int cmd_first_screen; @@ -435,6 +441,7 @@ private: QString s_workDir; QColor m_tabColor; + KURIFilterData* m_filterData; }; class QSpinBox; -- 1.6.1 ++++++ kdebase-pardus-kicker-container-area-fix.patch ++++++ >From cb4d07a5fdd0968b621e0348f1885dc515797427 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ozan=20=C3=87a=C4=9Flayan?= <[email protected]> Date: Fri, 24 Jun 2011 11:27:23 +0000 Subject: [PATCH] kicker: containerarea fix --- kicker/kicker/core/containerarea.cpp | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index b5b865a..fa36bf0 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -646,10 +646,6 @@ AppletContainer* ContainerArea::addApplet(const AppletInfo& info, bool isImmutable, int insertionIndex) { - if (!canAddContainers()) - { - return 0; - } AppletContainer* a = PluginManager::the()->createAppletContainer( info.desktopFile(), -- 1.6.1 ++++++ kdebase-pardus-port-klineedit-from-kde4.patch ++++++ >From c51c81adc527b3fdb2e483b5d60df7afaa75ca4d Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ozan=20=C3=87a=C4=9Flayan?= <[email protected]> Date: Mon, 27 Jun 2011 05:31:42 +0000 Subject: [PATCH] kdm: Backport KLineEdit stuff from KDE4 Backport KLineEdit stuff from KDE4 to fix the usage of non ASCII characters in passwords, etc. --- kdmlib/kgreet_classic.cpp | 55 +++++++++++++++++++++++++++++++------------- kdmlib/kgreet_classic.h | 4 +- kdmlib/kgreet_winbind.cpp | 49 ++++++++++++++++++++++++++++----------- kdmlib/kgreet_winbind.h | 3 +- 4 files changed, 77 insertions(+), 34 deletions(-) diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp index b38e979..d83b5c9 100644 --- a/kdmlib/kgreet_classic.cpp +++ b/kdmlib/kgreet_classic.cpp @@ -26,21 +26,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "themer/kdmthemer.h" #include "themer/kdmitem.h" +#include <kglobal.h> #include <klocale.h> #include <klineedit.h> -#include <kpassdlg.h> +//#include <kpassdlg.h> #include <kuser.h> #include <qregexp.h> #include <qlayout.h> #include <qlabel.h> -class KDMPasswordEdit : public KPasswordEdit { +class KDMPasswordEdit : public KLineEdit { public: - KDMPasswordEdit( QWidget *parent ) : KPasswordEdit( parent, 0 ) {} - KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, QWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} + KDMPasswordEdit( QWidget *parent ) : KLineEdit( parent ) + { + setEchoMode(QLineEdit::Password); + } + + KDMPasswordEdit( QLineEdit::EchoMode echoMode, QWidget *parent ) : KLineEdit( parent ) + { + setEchoMode(echoMode); + } + protected: - virtual void contextMenuEvent( QContextMenuEvent * ) {} + virtual void contextMenuEvent( QContextMenuEvent * ) {} }; static int echoMode; @@ -106,8 +115,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, if (echoMode == -1) passwdEdit = new KDMPasswordEdit( parent ); else - passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, - parent ); + passwdEdit = new KDMPasswordEdit( (QLineEdit::EchoMode)echoMode, parent ); connect( passwdEdit, SIGNAL(textChanged( const QString & )), SLOT(slotActivity()) ); connect( passwdEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) ); @@ -134,8 +142,8 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, } if (func != Authenticate) { if (echoMode == -1) { - passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); - passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); + passwd1Edit = new KDMPasswordEdit( (QLineEdit::EchoMode)echoMode, parent ); + passwd2Edit = new KDMPasswordEdit( (QLineEdit::EchoMode)echoMode, parent ); } else { passwd1Edit = new KDMPasswordEdit( parent ); passwd2Edit = new KDMPasswordEdit( parent ); @@ -239,16 +247,16 @@ KClassicGreeter::returnData() KGreeterPluginHandler::IsUser ); break; case 1: - handler->gplugReturnText( passwdEdit->password(), + handler->gplugReturnText( passwdEdit->text().utf8(), KGreeterPluginHandler::IsPassword | KGreeterPluginHandler::IsSecret ); break; case 2: - handler->gplugReturnText( passwd1Edit->password(), + handler->gplugReturnText( passwd1Edit->text().utf8(), KGreeterPluginHandler::IsSecret ); break; default: // case 3: - handler->gplugReturnText( passwd2Edit->password(), + handler->gplugReturnText( passwd2Edit->text().utf8(), KGreeterPluginHandler::IsNewPassword | KGreeterPluginHandler::IsSecret ); break; @@ -397,11 +405,11 @@ KClassicGreeter::revive() // assert( !running ); setActive2( true ); if (authTok) { - passwd1Edit->erase(); - passwd2Edit->erase(); + passwd1Edit->clear(); + passwd2Edit->clear(); passwd1Edit->setFocus(); } else { - passwdEdit->erase(); + passwdEdit->clear(); if (loginEdit && loginEdit->isEnabled()) passwdEdit->setEnabled( true ); else { @@ -418,7 +426,7 @@ void // virtual KClassicGreeter::clear() { // assert( !running && !passwd1Edit ); - passwdEdit->erase(); + passwdEdit->clear(); if (loginEdit) { loginEdit->clear(); loginEdit->setFocus(); @@ -477,6 +485,21 @@ static bool init( const QString &, void *ctx ) { echoMode = getConf( ctx, "EchoMode", QVariant( -1 ) ).toInt(); + switch (echoMode) + { + case (0): + case (1): + echoMode = QLineEdit::Password; + break; + + case (2): + echoMode = QLineEdit::NoEcho; + break; + + default: + echoMode = QLineEdit::Password; + } + KGlobal::locale()->insertCatalogue( "kgreet_classic" ); return true; } diff --git a/kdmlib/kgreet_classic.h b/kdmlib/kgreet_classic.h index 64d3979..fa9e6cb 100644 --- a/kdmlib/kgreet_classic.h +++ b/kdmlib/kgreet_classic.h @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <qobject.h> class KLineEdit; -class KPasswordEdit; +//class KPasswordEdit; class KSimpleConfig; class QGridLayout; class QLabel; @@ -75,7 +75,7 @@ class KClassicGreeter : public QObject, public KGreeterPlugin { QLabel *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label; KLineEdit *loginEdit; - KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit; + KLineEdit *passwdEdit, *passwd1Edit, *passwd2Edit; KSimpleConfig *stsFile; QString fixedUser, curUser; Function func; diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp index eeef08b..1196007 100644 --- a/kdmlib/kgreet_winbind.cpp +++ b/kdmlib/kgreet_winbind.cpp @@ -26,11 +26,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "themer/kdmthemer.h" #include "themer/kdmitem.h" +#include <kglobal.h> #include <klocale.h> #include <kdebug.h> #include <kcombobox.h> #include <klineedit.h> -#include <kpassdlg.h> #include <kuser.h> #include <kprocio.h> @@ -40,10 +40,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <stdlib.h> -class KDMPasswordEdit : public KPasswordEdit { +class KDMPasswordEdit : public KLineEdit { public: - KDMPasswordEdit( QWidget *parent ) : KPasswordEdit( parent, 0 ) {} - KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, QWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} + KDMPasswordEdit( QWidget *parent ) : KLineEdit( parent ) + { + setEchoMode(QLineEdit::Password); + } + KDMPasswordEdit( QLineEdit::EchoMode echoMode, QWidget *parent ) : KLineEdit( parent ) + { + setEchoMode(echoMode); + } protected: virtual void contextMenuEvent( QContextMenuEvent * ) {} }; @@ -149,7 +155,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, if (echoMode == -1) passwdEdit = new KDMPasswordEdit( parent ); else - passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, + passwdEdit = new KDMPasswordEdit( (QLineEdit::EchoMode)echoMode, parent ); connect( passwdEdit, SIGNAL(textChanged( const QString & )), SLOT(slotActivity()) ); @@ -179,8 +185,8 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, } if (func != Authenticate) { if (echoMode == -1) { - passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); - passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); + passwd1Edit = new KDMPasswordEdit( (QLineEdit::EchoMode)echoMode, parent ); + passwd2Edit = new KDMPasswordEdit( (QLineEdit::EchoMode)echoMode, parent ); } else { passwd1Edit = new KDMPasswordEdit( parent ); passwd2Edit = new KDMPasswordEdit( parent ); @@ -320,16 +326,16 @@ KWinbindGreeter::returnData() KGreeterPluginHandler::IsUser ); break; case 1: - handler->gplugReturnText( passwdEdit->password(), + handler->gplugReturnText( passwdEdit->text().utf8(), KGreeterPluginHandler::IsPassword | KGreeterPluginHandler::IsSecret ); break; case 2: - handler->gplugReturnText( passwd1Edit->password(), + handler->gplugReturnText( passwd1Edit->text().utf8(), KGreeterPluginHandler::IsSecret ); break; default: // case 3: - handler->gplugReturnText( passwd2Edit->password(), + handler->gplugReturnText( passwd2Edit->text().utf8(), KGreeterPluginHandler::IsNewPassword | KGreeterPluginHandler::IsSecret ); break; @@ -478,11 +484,11 @@ KWinbindGreeter::revive() // assert( !running ); setActive2( true ); if (authTok) { - passwd1Edit->erase(); - passwd2Edit->erase(); + passwd1Edit->clear(); + passwd2Edit->clear(); passwd1Edit->setFocus(); } else { - passwdEdit->erase(); + passwdEdit->clear(); if (loginEdit && loginEdit->isEnabled()) passwdEdit->setEnabled( true ); else { @@ -499,7 +505,7 @@ void // virtual KWinbindGreeter::clear() { // assert( !running && !passwd1Edit ); - passwdEdit->erase(); + passwdEdit->clear(); if (loginEdit) { domainCombo->setCurrentItem( defaultDomain ); slotChangedDomain( defaultDomain ); @@ -624,6 +630,21 @@ static bool init( const QString &, void *ctx ) { echoMode = getConf( ctx, "EchoMode", QVariant( -1 ) ).toInt(); + switch (echoMode) + { + case (0): + case (1): + echoMode = QLineEdit::Password; + break; + + case (2): + echoMode = QLineEdit::NoEcho; + break; + + default: + echoMode = QLineEdit::Password; + } + staticDomains = QStringList::split( ':', getConf( ctx, "winbind.Domains", QVariant( "" ) ).toString() ); if (!staticDomains.contains("<local>")) staticDomains << "<local>"; diff --git a/kdmlib/kgreet_winbind.h b/kdmlib/kgreet_winbind.h index 7fc6a1c..9592bab 100644 --- a/kdmlib/kgreet_winbind.h +++ b/kdmlib/kgreet_winbind.h @@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class KComboBox; class KLineEdit; -class KPasswordEdit; class KSimpleConfig; class QGridLayout; class QLabel; @@ -84,7 +83,7 @@ class KWinbindGreeter : public QObject, public KGreeterPlugin { QLabel *domainLabel, *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label; KComboBox *domainCombo; KLineEdit *loginEdit; - KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit; + KLineEdit *passwdEdit, *passwd1Edit, *passwd2Edit; KSimpleConfig *stsFile; QString fixedDomain, fixedUser, curUser; QStringList allUsers, mDomainListing; -- 1.6.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
