packages: kde4-kdebase/kde4-kdebase-branch.diff, kde4-kdebase/kde4-kdebase....
arekm
arekm at pld-linux.org
Mon Sep 27 09:31:27 CEST 2010
Author: arekm Date: Mon Sep 27 07:31:27 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; revert part of konsole fix that causes more problems (when doing copy & paste with mouse)
---- Files affected:
packages/kde4-kdebase:
kde4-kdebase-branch.diff (1.19 -> 1.20) , kde4-kdebase.spec (1.134 -> 1.135) , kde4-kdebase-bug-188528.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/kde4-kdebase/kde4-kdebase-branch.diff
diff -u packages/kde4-kdebase/kde4-kdebase-branch.diff:1.19 packages/kde4-kdebase/kde4-kdebase-branch.diff:1.20
--- packages/kde4-kdebase/kde4-kdebase-branch.diff:1.19 Wed Sep 1 14:58:38 2010
+++ packages/kde4-kdebase/kde4-kdebase-branch.diff Mon Sep 27 09:31:21 2010
@@ -1,7 +1,7 @@
Index: apps/konqueror/src/konqmainwindow.cpp
===================================================================
---- apps/konqueror/src/konqmainwindow.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1170567)
-+++ apps/konqueror/src/konqmainwindow.cpp (.../branches/KDE/4.5/kdebase) (wersja 1170567)
+--- apps/konqueror/src/konqmainwindow.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/src/konqmainwindow.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
@@ -1674,7 +1674,10 @@
// Reuse current servicetype for local files, but not for remote files (it could have changed, e.g. over HTTP)
QString serviceType = reloadView->url().isLocalFile() ? reloadView->serviceType() : QString();
@@ -14,10 +14,23 @@
}
}
+Index: apps/konqueror/settings/ebrowsing/ebrowsing.desktop
+===================================================================
+--- apps/konqueror/settings/ebrowsing/ebrowsing.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/settings/ebrowsing/ebrowsing.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -8,6 +8,8 @@
+ X-KDE-Library=kcm_kurifilt
+ X-KDE-ParentApp=kcontrol
+
++X-KDE-System-Settings-Parent-Category=account-details
++
+ Name=Web Shortcuts
+ Name[af]=Web Kortpaaie
+ Name[ar]=اختصارات الشبكة
Index: apps/konqueror/settings/kio/kcookiespolicies.cpp
===================================================================
---- apps/konqueror/settings/kio/kcookiespolicies.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1170567)
-+++ apps/konqueror/settings/kio/kcookiespolicies.cpp (.../branches/KDE/4.5/kdebase) (wersja 1170567)
+--- apps/konqueror/settings/kio/kcookiespolicies.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/settings/kio/kcookiespolicies.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
@@ -270,6 +270,7 @@
if (!nextItem)
nextItem = dlg->lvDomainPolicy->itemAbove(item);
@@ -26,10 +39,71 @@
delete item;
}
+Index: apps/konqueror/settings/kio/uasproviders/safari40.desktop
+===================================================================
+--- apps/konqueror/settings/kio/uasproviders/safari40.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/settings/kio/uasproviders/safari40.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -52,6 +52,7 @@
+ Name[sv]=UAD-beskrivning (Safari 4.0 på MacOS X)
+ Name[tg]=UADescription (Safari 4.0 дар MacOS X)
+ Name[th]=UADescription (ซาฟารี 4.0 บน MacOS X)
++Name[tr]=Kullanıcı Uygulaması Tanımı (Safari 4.0 on MacOS X)
+ Name[uk]=UADescription (Safari 4.0 на MacOS X)
+ Name[x-test]=xxUADescription (Safari 4.0 on MacOS X)xx
+ Name[zh_CN]=客户端描述(运行于 MacOS X 的 Safari 4.0)
+Index: apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop
+===================================================================
+--- apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -52,6 +52,7 @@
+ Name[sv]=AA-beskrivning (Firefox 3.6 på aktuell)
+ Name[tg]=UADescription (Firefox 3.6 версияи ҷорӣ)
+ Name[th]=UADescription (ไฟร์ฟอกซ์ 3.6 บนระบบปัจจุบัน)
++Name[tr]=Kullanıcı Uygulaması Tanımı (geçerli işletim sistemi üzerinde Firefox 3.6)
+ Name[uk]=UADescription (Firefox 3.6 на поточній)
+ Name[x-test]=xxUADescription (Firefox 3.6 on current)xx
+ Name[zh_CN]=客户端描述(运行于本机的 Firefox 3.6)
+Index: apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop
+===================================================================
+--- apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -52,6 +52,7 @@
+ Name[sv]=AA-beskrivning (Google Chrome 5.0)
+ Name[tg]=UADescription (Google Chrome 5.0)
+ Name[th]=UADescription (กูเกิลโครม 5.0)
++Name[tr]=Kullanıcı Uygulaması Tanımı (Google Chrome 5.0)
+ Name[uk]=UADescription (Google Chrome 5.0)
+ Name[x-test]=xxUADescription (Google Chrome 5.0)xx
+ Name[zh_CN]=客户端描述(Google Chrome 5.0)
+Index: apps/konqueror/settings/konqhtml/khtml_java_js.desktop
+===================================================================
+--- apps/konqueror/settings/konqhtml/khtml_java_js.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/settings/konqhtml/khtml_java_js.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -139,7 +139,6 @@
+ Comment[id]=Atur perilaku Java dan JavaScript
+ Comment[is]=Stilla hegðun Java og JavaScript
+ Comment[it]=Configura il comportamento di Java e JavaScript
+-Comment[ja]=Java と JavaScript の挙動を設定
+ Comment[ka]=Java და JavaScript -ის ქცევის კონფიგურაცია
+ Comment[kk]=Java және JavaScript қасиеттерін баптау
+ Comment[km]=កំណត់រចនាសម្ព័ន្ធឥរិយាបថរបស់ Java និង JavaScript
+Index: apps/konqueror/settings/konqhtml/khtml_appearance.desktop
+===================================================================
+--- apps/konqueror/settings/konqhtml/khtml_appearance.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/settings/konqhtml/khtml_appearance.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -126,7 +126,7 @@
+ Comment[gu]=કઇ રીતે વેબ પાનાંઓ જોવા તે રૂપરેખાંકિત કરો
+ Comment[he]=הגדר אופן הצגת דפי אינטרנט
+ Comment[hi]=वेब पृष्ठ कैसे दिखाने है कॉन्फ़िगर करें
+-Comment[hr]=Konfiguriranje prikaza web-stranica
++Comment[hr]=Konfiguriranje prikaza web-stranica
+ Comment[hu]=A weboldalak megjelenítési jellemzőinek beállítása
+ Comment[ia]=Tu configura como monstrar paginas web
+ Comment[id]=Atur bagaimana menampilkan halaman web
Index: apps/konqueror/settings/konqhtml/filteropts.cpp
===================================================================
---- apps/konqueror/settings/konqhtml/filteropts.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1170567)
-+++ apps/konqueror/settings/konqhtml/filteropts.cpp (.../branches/KDE/4.5/kdebase) (wersja 1170567)
+--- apps/konqueror/settings/konqhtml/filteropts.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/settings/konqhtml/filteropts.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
@@ -486,6 +486,7 @@
mFilters << filterConfig;
@@ -38,54 +112,1118 @@
}
void AutomaticFilterModel::save(KConfigGroup &cg)
+Index: apps/konqueror/kttsplugin/khtmlkttsd.cpp
+===================================================================
+--- apps/konqueror/kttsplugin/khtmlkttsd.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/kttsplugin/khtmlkttsd.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -66,7 +66,7 @@
+ {
+ QString error;
+ if (KToolInvocation::startServiceByDesktopName("kttsd", QStringList(), &error)) {
+- KMessageBox::error(part->widget(), error, i18n("Starting KTTSD Failed") );
++ KMessageBox::error(part->widget(), error, i18n("Starting Jovie Text-to-Speech Service Failed") );
+ return;
+ }
+ }
+Index: apps/konqueror/sidebar/places_module/konqsidebar_places.desktop
+===================================================================
+--- apps/konqueror/sidebar/places_module/konqsidebar_places.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konqueror/sidebar/places_module/konqsidebar_places.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -53,6 +53,7 @@
+ Name[sv]=Sidoradsmodul med platser
+ Name[tg]=Модули панели маконҳо
+ Name[th]=มอดูลแถบข้างที่หลัก ๆ
++Name[tr]=Konumlar Yan Çubuk Modülü
+ Name[uk]=Модуль місць бічної панелі
+ Name[x-test]=xxPlaces SideBar Modulexx
+ Name[zh_CN]=位置侧边栏模块
+Index: apps/dolphin/src/dolphinmainwindow.cpp
+===================================================================
+--- apps/dolphin/src/dolphinmainwindow.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/dolphin/src/dolphinmainwindow.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -1355,7 +1355,7 @@
+
+ const KUrl& url = m_activeViewContainer->url();
+ setUrlAsCaption(url);
+- if (m_viewTab.count() > 1 && m_viewTab[m_tabIndex].secondaryView != 0) {
++ if (m_viewTab.count() > 1) {
+ m_tabBar->setTabText(m_tabIndex, tabName(url));
+ m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url)));
+ }
+Index: apps/dolphin/src/kcm/kcmdolphinviewmodes.desktop
+===================================================================
+--- apps/dolphin/src/kcm/kcmdolphinviewmodes.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/dolphin/src/kcm/kcmdolphinviewmodes.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -48,7 +48,7 @@
+ Name[pt]=Modos de Visualização do Dolphin
+ Name[pt_BR]=Modos de Visualização do Dolphin
+ Name[ro]=Regimuri de vizualizare Dolphin
+-Name[ru]=Представление папок в Dolphin
++Name[ru]=Режимы просмотра папок в Dolphin
+ Name[se]=Dolphin čájehanmodusat
+ Name[si]=Dolphin දසුන් ආකාර
+ Name[sk]=Režimy zobrazenia Dolphinu
+@@ -113,7 +113,7 @@
+ Comment[pt]=Este serviço permite-lhe configurar os modos de visualização do Dolphin.
+ Comment[pt_BR]=Este serviço permite configurar os modos de visualização do Dolphin.
+ Comment[ro]=Acest serviciu permite configurarea regimurilor de vizualizare Dolphin.
+-Comment[ru]=Эта служба позволяет настраивать представление папок в Dolphin
++Comment[ru]=Эта служба позволяет настраивать режимы просмотра папок в Dolphin
+ Comment[si]=මෙම සේවාව Dolphin දසුන් ආකාර සැකසීමට ඉඩ දේ.
+ Comment[sk]=Táto služba umožňuje nastavenie režimov zobrazenia Dolphinu.
+ Comment[sl]=Ta storitev omogoča nastavitev Dolphinovih načinov prikazov.
+@@ -259,7 +259,7 @@
+ Comment[pt]=Configurar os modos de visualização do gestor de ficheiros
+ Comment[pt_BR]=Configurar modos de visualização do gerenciador de arquivos
+ Comment[ro]=Configurează regimurile de vizualizare ale gestionarului de fișiere
+-Comment[ru]=Настройка представления папок в диспетчере файлов
++Comment[ru]=Настройка режимов просмотра папок в диспетчере файлов
+ Comment[se]=Heivet fiilagieđahalli čájehanmodusat
+ Comment[si]=ගොනු කළමණාකරුගේ සැසුම් සකසන්න
+ Comment[sk]=Nastavenie režimov zobrazenia správcu súborov
+Index: apps/dolphin/src/tooltips/tooltipmanager.cpp
+===================================================================
+--- apps/dolphin/src/tooltips/tooltipmanager.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/dolphin/src/tooltips/tooltipmanager.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -155,9 +155,15 @@
+
+ m_fileMetaDataToolTip->setName(m_item.text());
+
++ // Request the retrieval of meta-data. The slot
++ // slotMetaDataRequestFinished() is invoked after the
++ // meta-data have been received.
+ m_metaDataRequested = true;
+ m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);
+
++ // Request a preview of the item
++ m_fileMetaDataToolTip->setPreview(QPixmap());
++
+ KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, 256, 256);
+
+ connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
+Index: apps/doc/kdepasswd/index.docbook
+===================================================================
+--- apps/doc/kdepasswd/index.docbook (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/doc/kdepasswd/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -5,7 +5,7 @@
+ <!ENTITY % English "INCLUDE">
+ ]>
+ <article lang="&language;">
+-<title>User Information</title>
++<title>Password & User Account</title>
+ <articleinfo>
+ <authorgroup>
+ <author>
+@@ -23,8 +23,8 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+
+-<date>2010-01-06</date>
+-<releaseinfo>&kde; 4.4</releaseinfo>
++<date>2010-08-19</date>
++<releaseinfo>&kde; 4.5</releaseinfo>
+
+ <keywordset>
+ <keyword>KDE</keyword>
+@@ -36,7 +36,7 @@
+ </articleinfo>
+
+ <sect1 id="kcm_useraccount">
+-<title><guilabel>User Information</guilabel></title>
++<title>User Information</title>
+ <sect2 id="intro">
+ <title>Introduction</title>
+
+Index: apps/doc/konqueror/dragdrop.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = image/png
+Index: apps/doc/konqueror/konqorg.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = image/png
+Index: apps/doc/konqueror/cmndline.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = image/png
+Index: apps/doc/kwrite/index.docbook
+===================================================================
+--- apps/doc/kwrite/index.docbook (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/doc/kwrite/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -2448,9 +2448,9 @@
+ <varlistentry>
+ <term><guilabel>Auto Completion enabled</guilabel></term>
+ <listitem>
+-<para>If this is enabled, the editor will calculate the number
+-of spaces up to the next tab position as defined by the tab width,
+-and insert that number of spaces instead of a 	 character.</para>
++<para>If enabled, a word completion box automatically pops up during typing
++showing a list of text entries to complete the current text under the
++cursor.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+@@ -2498,7 +2498,7 @@
+ <para>By default, an extra status bar will be used when the Vi input mode is
+ enabled. This status bar shows commands while they are being typed and
+ messages/errors produced by Vi commands.</para>
+-<para>Checking this options will hide this extra status line.</para>
++<para>Checking this option will hide this extra status line.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+Index: apps/doc/kfind/index.docbook
+===================================================================
+--- apps/doc/kfind/index.docbook (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/doc/kfind/index.docbook (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -356,7 +356,7 @@
+ <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+
+ &underFDL; <!-- FDL: do not remove -->
+-&underBSDLicense; <!-- BSD License -->
++&underGPL; <!-- GPL License -->
+
+ </chapter>
+
+Index: apps/lib/konq/favicons/favicons.desktop
+===================================================================
+--- apps/lib/konq/favicons/favicons.desktop (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/lib/konq/favicons/favicons.desktop (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -104,7 +104,7 @@
+ Comment[lv]=Saglabā tīmekļa vietņu ikonas
+ Comment[nb]=Lagrer nettstedsikoner
+ Comment[nds]=Wohrt Nettsiedenlüttbiller
+-Comment[nl]=Slaat website pictogrammen op
++Comment[nl]=Slaat website-pictogrammen op
+ Comment[nn]=Lagrar nettstadikon
+ Comment[pa]=ਵੈੱਬਸਾਈਟ ਆਈਕਾਨ ਸਟੋਰ ਕਰਦਾ ਹੈ
+ Comment[pl]=Przechowuje ikony stron WWW
+Index: apps/konsole/src/ViewContainer.cpp
+===================================================================
+--- apps/konsole/src/ViewContainer.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konsole/src/ViewContainer.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -260,6 +260,7 @@
+ , _dropIndicatorIndex(-1)
+ , _drawIndicatorDisabled(false)
+ {
++ setStyleSheet("QTabBar::tab { min-width: 2em; max-width: 25em }");
+ setElideMode(Qt::ElideLeft);
+ }
+ void ViewContainerTabBar::setDropIndicator(int index, bool drawDisabled)
+@@ -396,29 +397,10 @@
+ event->ignore();
+ }
+
+-/* Try to provide a reasonable tab width:
+- * If there are less than 5 tabs, let the tabs fill out the tabbar.
+- * Otherwise, check the tab text size and the minimumTabWidth value.
+- * The minimumTabWidth is to prevent the tabs from getting too
+- * small such that no scroll indicators will appear.
+-*/
++/* A stylesheet is used now to handle width of tab. */
+ QSize ViewContainerTabBar::tabSizeHint(int index) const
+ {
+- const int fillTabCount = 5;
+- const int minimumTabWidth = 150; // Arbitrary value
+- int tabBarWidth = rect().width();
+- int tabCount = count();
+- int tabMaxWidth;
+- if (tabCount <= fillTabCount)
+- tabMaxWidth = tabBarWidth / (tabCount + 0.5);
+- else
+- tabMaxWidth = tabBarWidth / (fillTabCount + 0.5);
+-
+- int tabTextWidth = fontMetrics().width(tabText(index));
+- // qBound ( minimum, value, max )
+- QSize size (qBound(minimumTabWidth, tabTextWidth, tabMaxWidth),
+- QTabBar::tabSizeHint(index).height());
+- return size;
++ return QTabBar::tabSizeHint(index);
+ }
+ QPixmap ViewContainerTabBar::dragDropPixmap(int tab)
+ {
+Index: apps/konsole/src/main.cpp
+===================================================================
+--- apps/konsole/src/main.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konsole/src/main.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -30,7 +30,7 @@
+ #include <KCmdLineArgs>
+ #include <KLocale>
+
+-#define KONSOLE_VERSION "2.5"
++#define KONSOLE_VERSION "2.5.2"
+
+ using namespace Konsole;
+
+Index: apps/konsole/src/ProcessInfo.cpp
+===================================================================
+--- apps/konsole/src/ProcessInfo.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konsole/src/ProcessInfo.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -647,11 +647,19 @@
+ return false;
+ }
+
++#if defined(__DragonFly__)
++ setName(kInfoProc->kp_comm);
++ setPid(kInfoProc->kp_pid);
++ setParentPid(kInfoProc->kp_ppid);
++ setForegroundPid(kInfoProc->kp_pgid);
++ setUserId(kInfoProc->kp_uid);
++#else
+ setName(kInfoProc->ki_comm);
+ setPid(kInfoProc->ki_pid);
+ setParentPid(kInfoProc->ki_ppid);
+ setForegroundPid(kInfoProc->ki_pgid);
+ setUserId(kInfoProc->ki_uid);
++#endif
+
+ readUserName();
+
+@@ -692,6 +700,10 @@
+
+ virtual bool readCurrentDir(int pid)
+ {
++#if defined(__DragonFly__)
++ // Not supported in DragonFly
++ return false;
++#else
+ int numrecords;
+ struct kinfo_file* info = 0;
+
+@@ -713,6 +725,7 @@
+
+ free(info);
+ return false;
++#endif
+ }
+ } ;
+ #endif
+Index: apps/konsole/desktop/konsole.notifyrc
+===================================================================
+--- apps/konsole/desktop/konsole.notifyrc (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/konsole/desktop/konsole.notifyrc (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -99,7 +99,7 @@
+ Name[bn_IN]=দৃশ্যমান সেশানের ঘন্টাধ্বনি
+ Name[ca]=Timbre en una sessió visible
+ Name[ca at valencia]=Timbre en una sessió visible
+-Name[cs]=Zvonek ve viditelné relaci
++Name[cs]=Zvonek ve viditelném sezení
+ Name[csb]=Zwónk w widzawny sesëji
+ Name[da]=Bip i synlig session
+ Name[de]=Signalton in sichtbarer Sitzung
+@@ -176,7 +176,7 @@
+ Comment[bn_IN]=দৃশ্যমান সেশানের মধ্যে যে ঘন্টাধ্বনি বাজানো হয়
+ Comment[ca]=Timbre emès en una sessió visible
+ Comment[ca at valencia]=Timbre emés en una sessió visible
+-Comment[cs]=Zvonek ve viditelné relaci
++Comment[cs]=Zvonek ve viditelném sezení
+ Comment[csb]=Zwónk jaczi zwãczi w widzawny sesëji
+ Comment[cy]=Gollyngwyd cloch mewn sesiwn gweledig
+ Comment[da]=Klokke brugt indenfor en synlig session
+@@ -260,7 +260,7 @@
+ Name[bn_IN]=অদৃশ্য সেশানের মধ্যে যে ঘন্টাধ্বনি বাজানো হয়
+ Name[ca]=Timbre en una sessió no visible
+ Name[ca at valencia]=Timbre en una sessió no visible
+-Name[cs]=Zvonek ve skryté relaci
++Name[cs]=Zvonek ve skrytém sezení
+ Name[csb]=Zwónk w niewidzawny sesëji
+ Name[da]=Bip i ikke-synlig session
+ Name[de]=Signalton in nicht sichtbarer Sitzung
+@@ -337,7 +337,7 @@
+ Comment[bn_IN]=অদৃশ্য সেশানের ঘন্টাধ্বনি
+ Comment[ca]=Timbre emès en una sessió no visible
+ Comment[ca at valencia]=Timbre emés en una sessió no visible
+-Comment[cs]=Zvonek ve skryté relaci
++Comment[cs]=Zvonek ve skrytém sezení
+ Comment[csb]=Zwónk jaczi zwãczi w niewidzawny sesëji
+ Comment[cy]=Gollyngwyd cloch mewn sesiwn anweledig
+ Comment[da]=Klokke brugt indenfor en ikke-synlig session
+@@ -422,7 +422,7 @@
+ Name[bn_IN]=নিরীক্ষণ হওয়া সেশানের মধ্যে কর্ম
+ Name[ca]=Activitat en una sessió controlada
+ Name[ca at valencia]=Activitat en una sessió controlada
+-Name[cs]=Aktivita v monitorované relaci
++Name[cs]=Aktivita v monitorovaném sezení
+ Name[csb]=Aktiwnota w mònitorowóny sesëji
+ Name[da]=Aktivitet i overvåget session
+ Name[de]=Aktivität in überwachter Sitzung
+@@ -498,7 +498,7 @@
+ Comment[bn_IN]=নিরীক্ষণ হওয়া সেশানের মধ্যে সনাক্ত করা কর্ম
+ Comment[ca]=Activitat detectada en una sessió controlada
+ Comment[ca at valencia]=Activitat detectada en una sessió controlada
+-Comment[cs]=Detekována aktivita v monitorované relaci
++Comment[cs]=Detekována aktivita v monitorovaném sezení
+ Comment[csb]=Aktiwnota ùstalonô w mònitorowóny sesëji
+ Comment[cy]=Datgelwyd gweithgaredd mewn seswin wedi'i fonitro
+ Comment[da]=Aktivitet detekteret i en overvåget session
+@@ -582,7 +582,7 @@
+ Name[bn_IN]=নিরীক্ষণ হওয়া সেশানের মধ্যে নৈঃশব্দ্য
+ Name[ca]=Silenci en una sessió controlada
+ Name[ca at valencia]=Silenci en una sessió controlada
+-Name[cs]=Ticho v monitorované relaci
++Name[cs]=Ticho v monitorovaném sezení
+ Name[csb]=Niżódnô aktiwnota w mònitorowóny sesëji
+ Name[da]=Inaktivitetet i overvåget session
+ Name[de]=Keine Aktivität in überwachter Sitzung
+@@ -658,7 +658,7 @@
+ Comment[bn_IN]=নিরীক্ষণ হওয়া সেশানের মধ্যে সনাক্ত হওয়া নৈঃশব্দ্য
+ Comment[ca]=Silenci detectat en una sessió controlada
+ Comment[ca at valencia]=Silenci detectat en una sessió controlada
+-Comment[cs]=Detekováno ticho v monitorované relaci
++Comment[cs]=Detekováno ticho v monitorovaném sezení
+ Comment[csb]=Aktiwnota nie ósta ùstalonô w mònitorowóny sesëji
+ Comment[cy]=Datgelwyd distawrwydd mewn sesiwn wedi'i fonitro
+ Comment[da]=Stilhed detekteret i en overvåget session
+@@ -741,7 +741,7 @@
+ Name[bn_IN]=শূণ্য ভিন্ন অন্য মানসহ সেশান সমাপ্তি
+ Name[ca]=Sessió finalitzada amb un estat diferent de zero
+ Name[ca at valencia]=Sessió finalitzada amb un estat diferent de zero
+-Name[cs]=Relace ukončena nenulovým stavem
++Name[cs]=Sezení ukončeno nenulovým stavem
+ Name[csb]=Zakùńczonô sesëjô z niezerowim sztatusã
+ Name[da]=Session afsluttet med ikke-nul status
+ Name[de]=Sitzung mit Nicht-Null-Status beendet
+@@ -820,7 +820,7 @@
+ Comment[bn_IN]=শূণ্য ভিন্ন অন্য মান উৎপন্ন করে সেশান সমাপ্ত হয়েছে
+ Comment[ca]=Una sessió ha finalitzat amb un estat diferent de zero
+ Comment[ca at valencia]=Una sessió ha finalitzat amb un estat diferent de zero
+-Comment[cs]=Relace byla ukončena nenulovým stavem
++Comment[cs]=Sezení bylo ukončeno nenulovým stavem
+ Comment[csb]=Sesëjô z niezerowim sztatusã òsta zakùńczonô
+ Comment[cy]=Terfynnodd sesiwn efo cyflwr di-sero
+ Comment[da]=En session er afsluttet med ikke-nul status
+Index: apps/plasma/applets/folderview/popupview.cpp
+===================================================================
+--- apps/plasma/applets/folderview/popupview.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/plasma/applets/folderview/popupview.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -209,6 +209,7 @@
+ m_iconView->setGridSize(m_parentView->gridSize());
+ m_iconView->setWordWrap(m_parentView->wordWrap());
+ m_iconView->setIconsMoveable(false);
++ m_iconView->setClickToViewFolders(false);
+
+ connect(m_iconView, SIGNAL(activated(QModelIndex)), SLOT(activated(QModelIndex)));
+ connect(m_iconView, SIGNAL(contextMenuRequest(QWidget*,QPoint)), SLOT(contextMenuRequest(QWidget*,QPoint)));
+@@ -306,8 +307,10 @@
+
+ foreach (const QModelIndex &index, m_selectionModel->selectedIndexes()) {
+ KFileItem item = m_model->itemForIndex(index);
+- hasRemoteFiles |= item.localPath().isEmpty();
+- items.append(item);
++ if (!item.isNull()) {
++ hasRemoteFiles |= item.localPath().isEmpty();
++ items.append(item);
++ }
+ }
+
+ // Check if we're showing the menu for the trash link
+Index: apps/plasma/applets/folderview/actionoverlay.cpp
+===================================================================
+--- apps/plasma/applets/folderview/actionoverlay.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/plasma/applets/folderview/actionoverlay.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -191,7 +191,7 @@
+ view->openPopup(m_hoverIndex);
+ }
+ }
+-
++
+ QPersistentModelIndex ActionOverlay::hoverIndex()
+ {
+ return m_hoverIndex;
+@@ -213,7 +213,12 @@
+ fadeIn->start();
+ }
+ m_hoverIndex = index;
+- AsyncFileTester::checkIfFolder(index, this, "checkIfFolderResult");
++ IconView *iview = qobject_cast<IconView*>(view);
++ if (iview && iview->clickToViewFolders()) {
++ AsyncFileTester::checkIfFolder(index, this, "checkIfFolderResult");
++ } else {
++ m_openButton->hide();
++ }
+ }
+ }
+
+Index: apps/plasma/applets/folderview/iconview.h
+===================================================================
+--- apps/plasma/applets/folderview/iconview.h (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/plasma/applets/folderview/iconview.h (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -127,6 +127,8 @@
+
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+
++ void setClickToViewFolders(bool click);
++ bool clickToViewFolders() const;
+ void openPopup(const QModelIndex &index);
+
+ signals:
+@@ -237,6 +239,7 @@
+ bool m_wordWrap;
+ bool m_popupShowPreview;
+ bool m_folderIsEmpty;
++ bool m_clickToViewFolders;
+ QPersistentModelIndex m_hoveredIndex;
+ QPersistentModelIndex m_pressedIndex;
+ QPersistentModelIndex m_editorIndex;
+Index: apps/plasma/applets/folderview/folderview.cpp
+===================================================================
+--- apps/plasma/applets/folderview/folderview.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/plasma/applets/folderview/folderview.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -1708,8 +1708,10 @@
+
+ foreach (const QModelIndex &index, indexes) {
+ KFileItem item = m_model->itemForIndex(index);
+- hasRemoteFiles |= item.localPath().isEmpty();
+- items.append(item);
++ if (!item.isNull()) {
++ hasRemoteFiles |= item.localPath().isEmpty();
++ items.append(item);
++ }
+ }
+
+ // Check if we're showing the menu for the trash link
+Index: apps/plasma/applets/folderview/iconview.cpp
+===================================================================
+--- apps/plasma/applets/folderview/iconview.cpp (.../tags/KDE/4.5.1/kdebase) (wersja 1179156)
++++ apps/plasma/applets/folderview/iconview.cpp (.../branches/KDE/4.5/kdebase) (wersja 1179156)
+@@ -84,6 +84,7 @@
+ m_wordWrap(false),
+ m_popupShowPreview(true),
+ m_folderIsEmpty(false),
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase-branch.diff?r1=1.19&r2=1.20&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase.spec?r1=1.134&r2=1.135&f=u
More information about the pld-cvs-commit
mailing list