[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/plasma-desktoplayout/kdebase-apps-plasma/applets/folderview
From:       Ambroz Bizjak <ambro () b4ever ! net>
Date:       2008-12-31 9:30:25
Message-ID: 1230715825.751964.24559.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 903671 by abizjak:

SVN_SILENT merge changes from trunk


 M  +2 -1      folderview.cpp  
 M  +5 -0      plasma-applet-folderview.desktop  
 M  +1 -0      proxymodel.cpp  


--- branches/work/plasma-desktoplayout/kdebase-apps-plasma/applets/folderview/folderview.cpp \
#903670:903671 @@ -263,6 +263,8 @@
         setUrl(KUrl(args.value(0).toString()));
     }
 
+    resize(600, 400);
+
     // As we use some part of konqueror libkonq must be added to have translations
     KGlobal::locale()->insertCatalog("libkonq");
 }
@@ -887,7 +889,6 @@
 
             if (!isContainment()) {
                 // Give the applet a sane size
-                resize(600, 400);
                 setupIconView();
             }
             setAspectRatioMode(Plasma::IgnoreAspectRatio);
--- branches/work/plasma-desktoplayout/kdebase-apps-plasma/applets/folderview/plasma-applet-folderview.desktop \
#903670:903671 @@ -71,12 +71,14 @@
 Comment[bn]=ফোল্ডার-এর বিষয়বস্তু দেখায় \
(ডিফল্ট ডেস্কটপ)  \
Comment[bn_IN]=ফোল্ডার-এর বিষয়বস্তু \
দেখায় (ডিফল্ট ডেস্কটপ)  Comment[ca]=Mostra el \
contingut de les carpetes (per defecte l'Escriptori) +Comment[cs]=Zobrazuje obsah \
složek (implicitně plochu)  Comment[csb]=Wëskrzënianié zamkłoscë katalogów \
(pùlt jakno domëszlny)  Comment[da]=Vis indholdet af mapper (Desktop som standard)
 Comment[de]=Ordnerinhalte anzeigen (Voreinstellung: Desktop)
 Comment[el]=Εμφάνιση των περιεχομένων φακέλων \
(προκαθορισμένα ο Desktop)  Comment[es]=Mostrar el contenido de las \
carpetas (Escritorio como predeterminado)  Comment[et]=Kataloogide sisu näitamine \
(vaikimisi kataloog Töölaud) +Comment[eu]=Bistaratu karpeten edukia (mahaigaina \
lehenetsiz)  Comment[fi]=Näytä kansion sisältö (Oletuksena työpöytäkansio)
 Comment[fr]=Affiche le contenu des dossiers (Par défaut le bureau)
 Comment[gl]=Mostra o contido dos cartafoles (Por omisión, o escritorio)
@@ -90,13 +92,16 @@
 Comment[kk]=Қапшықтағыны көрсету (Әдетті Үстел)
 Comment[km]=បង្� ាញ​មាតិកា​របស់​ថត \
(ផ្ទៃតុ​ជា​លំនាំដើម)  \
Comment[kn]=ಕಡತಕೋಶಗಳ ಒಳಪಿಡಿಯನ್ನು \
ತೋರಿಸು (ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ \
ಗಣಕತೆರೆಯದ್ದು) +Comment[ko]=폴더 내용 보여주기 (기본 \
폴더는 데스크톱 폴더)  Comment[ku]=Naveroka peldankan nîşan bide (Sermasê \
standard e)  Comment[lv]=Rāda mapju saturu (noklusētā ir Desktop)
 Comment[ml]=അറയുടെ ഉള്ളടക്കങ്ങള്‍ \
കാണിക്കുക (സ്വാഭവികമായിട്ട് \
ഡെസ്ക്ടോപ് പണിയിടം ആണു്‌ \
കാണിക്കുക) +Comment[mr]=संचयीकाचे \
अनुक्रम दर्शवा (Desktop मुलभूत नुरूप) \
Comment[nb]=Vis mappers innhold (standard er skrivebordet)  Comment[nds]=Den Inholt \
vun Ornern wiesen (standardwies de Schriefdisch)  Comment[nl]=Toon de inhoud van \
mappen (bureaublad als standaard)  Comment[nn]=Vis innhaldet i mapper \
(skrivebordsmappa som standard) +Comment[pl]=Pokazanie zawartości folderów \
(domyślnie Pulpitu)  Comment[pt]=Mostrar o conteúdo das pastas ('Desktop' por \
omissão)  Comment[pt_BR]=Mostra o conteúdo das pastas (pasta Desktop como padrão)
 Comment[ro]=Afișează conținutul dosarelor (Birou ca implicit)
--- branches/work/plasma-desktoplayout/kdebase-apps-plasma/applets/folderview/proxymodel.cpp \
#903670:903671 @@ -27,6 +27,7 @@
 ProxyModel::ProxyModel(QObject *parent)
     : QSortFilterProxyModel(parent), m_sortDirsFirst(true)  
 {
+    setSupportedDragActions(Qt::CopyAction | Qt::MoveAction | Qt::LinkAction);
 }
 
 ProxyModel::~ProxyModel()


[prev in list] [next in list] [prev in thread] [next in thread]