TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

Browse Source
pull/2/head
Michele Calgaro 10 years ago
parent 0a2adc65fa f07158cd9d
commit 8a6ce15a94
10 changed files with 72 additions and 23 deletions
Show Stats Download Patch File Download Diff File

6
konqueror/iconview/konq_iconview.cc
Unescape View File

@ -1108,8 +1108,6 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item)
void KonqKfmIconView::showFreeSpaceOverlay(KFileIVI* item)
{
KFileItem* fileItem = item->item();
m_paOutstandingFreeSpaceOverlays.append(item);
if (m_paOutstandingFreeSpaceOverlays.count() == 1)
{
@ -1296,6 +1294,10 @@ void KonqKfmIconView::determineIcon( KFileIVI * item )
(void) item->item()->determineMimeType();
if (item->item()->isMimeTypeKnown()) {
item->mimeTypeAndIconDetermined();
}
item->setIcon( iconSize(), item->state(), true, true );
item->setMouseOverAnimation( item->item()->iconName() );
}

12
libkonq/konq_iconviewwidget.cc
Unescape View File

@ -709,14 +709,16 @@ void KonqIconViewWidget::setItemTextPos( ItemTextPos pos )
// can't call gridXValue() because this already would need the new itemTextPos()
int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
if ( m_bSetGridX )
if ( pos == TQIconView::Bottom )
if ( m_bSetGridX ) {
if ( pos == TQIconView::Bottom ) {
setGridX( TQMAX( sz + 50, previewIconSize( sz ) + 13 ) );
}
else
{
setMaxItemWidth( TQMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth() );
setGridX( -1 );
}
}
TDEIconView::setItemTextPos( pos );
}
@ -773,14 +775,16 @@ void KonqIconViewWidget::gridValues( int* x, int* y, int* dx, int* dy,
void KonqIconViewWidget::calculateGridX()
{
if ( m_bSetGridX )
if ( itemTextPos() == TQIconView::Bottom )
if ( m_bSetGridX ) {
if ( itemTextPos() == TQIconView::Bottom ) {
setGridX( gridXValue() );
}
else
{
setMaxItemWidth( gridXValue() );
setGridX( -1 );
}
}
}
int KonqIconViewWidget::gridXValue() const

38
libkonq/tdefileivi.cc
Unescape View File

@ -570,10 +570,42 @@ void KFileIVI::updatePixmapSize()
KonqIconViewWidget* view = static_cast<KonqIconViewWidget*>( iconView() );
TQSize pixSize = TQSize( size, size );
if ( pixSize != pixmapSize() ) {
setPixmapSize( pixSize );
bool mimeDetermined = false;
if ( m_fileitem->isMimeTypeKnown() ) {
mimeDetermined = true;
}
if (mimeDetermined) {
bool changed = false;
if ( view && view->canPreview( item() ) ) {
int previewSize = view->previewIconSize( size );
if (previewSize != size) {
setPixmapSize( TQSize( previewSize, previewSize ) );
changed = true;
}
}
else {
TQSize pixSize = TQSize( size, size );
if ( pixSize != pixmapSize() ) {
setPixmapSize( pixSize );
changed = true;
}
}
if (changed) {
view->adjustItems();
}
}
else {
TQSize pixSize = TQSize( size, size );
if ( pixSize != pixmapSize() ) {
setPixmapSize( pixSize );
}
}
}
void KFileIVI::mimeTypeAndIconDetermined()
{
updatePixmapSize();
}
/* vim: set noet sw=4 ts=8 softtabstop=4: */

4
libkonq/tdefileivi.h
Unescape View File

@ -208,6 +208,8 @@ public:
virtual int compare( TQIconViewItem *i ) const;
void mimeTypeAndIconDetermined();
protected:
virtual void dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> & );
@ -240,7 +242,7 @@ private:
/** Check if a thumbnail will be generated and calc the size of the icon */
void updatePixmapSize();
int m_size, m_state;
bool m_bDisabled;
bool m_bThumbnail;

15
tdeioslave/media/libmediacommon/notifiersettings.cpp
Unescape View File

@ -49,11 +49,16 @@ NotifierSettings::NotifierSettings()
m_supportedMimetypes.append( "media/dvd_unmounted_decrypted" );
m_supportedMimetypes.append( "media/dvd_mounted" );
m_supportedMimetypes.append( "media/dvd_mounted_decrypted" );
m_supportedMimetypes.append( "media/cdwriter_unmounted" );
m_supportedMimetypes.append( "media/cdwriter_unmounted_encrypted" );
m_supportedMimetypes.append( "media/cdwriter_unmounted_decrypted" );
m_supportedMimetypes.append( "media/cdwriter_mounted" );
m_supportedMimetypes.append( "media/cdwriter_mounted_decrypted" );
m_supportedMimetypes.append( "media/cd-r_unmounted" );
m_supportedMimetypes.append( "media/cd-r_unmounted_encrypted" );
m_supportedMimetypes.append( "media/cd-r_unmounted_decrypted" );
m_supportedMimetypes.append( "media/cd-r_mounted" );
m_supportedMimetypes.append( "media/cd-r_mounted_decrypted" );
m_supportedMimetypes.append( "media/cd-rw_unmounted" );
m_supportedMimetypes.append( "media/cd-rw_unmounted_encrypted" );
m_supportedMimetypes.append( "media/cd-rw_unmounted_decrypted" );
m_supportedMimetypes.append( "media/cd-rw_mounted" );
m_supportedMimetypes.append( "media/cd-rw_mounted_decrypted" );
m_supportedMimetypes.append( "media/blankcd" );
m_supportedMimetypes.append( "media/blankdvd" );
m_supportedMimetypes.append( "media/audiocd" );

2
tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
Unescape View File

@ -99,4 +99,4 @@ Comment[wa]=Tchôke-divins di dvize di prôpietés Konqueror po-z apontyî l' du
Comment[zh_CN]=配置挂载行为的 Konqueror 属性对话框插件
Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為
X-TDE-Library=media_propsdlgplugin
X-TDE-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/hdd_mounted_decrypted,media/hdd_unmounted_decrypted,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cdwriter_mounted,media/cdwriter_mounted_decrypted,media/nfs_mounted,media/cdwriter_unmounted,media/cdwriter_unmounted_decrypted,media/nfs_unmounted,media/removable_mounted,media/removable_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted
X-TDE-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/hdd_mounted_decrypted,media/hdd_unmounted_decrypted,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cd-r_mounted,media/cd-r_mounted_decrypted,media/cd-rw_mounted,media/cd-rw_mounted_decrypted,media/nfs_mounted,media/cd-r_unmounted,media/cd-r_unmounted_decrypted,media/cd-rw_unmounted,media/cd-rw_unmounted_decrypted,media/nfs_unmounted,media/removable_mounted,media/removable_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted

2
tdeioslave/media/services/media_eject.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry]
X-TDE-ServiceTypes=media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cdrom_unmounted_encrypted,media/cdwriter_mounted,media/cdwriter_unmounted,media/cdwriter_mounted_decrypted,media/cdwriter_unmounted_decrypted,media/cdwriter_unmounted_encrypted,media/dvd_mounted,media/dvd_unmounted,media/dvd_mounted_decrypted,media/dvd_unmounted_decrypted,media/dvd_unmounted_encrypted,media/audiocd,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
X-TDE-ServiceTypes=media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cdrom_unmounted_encrypted,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_mounted_decrypted,media/cd-r_unmounted_decrypted,media/cd-r_unmounted_encrypted,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_mounted_decrypted,media/cd-rw_unmounted_decrypted,media/cd-rw_unmounted_encrypted,media/dvd_mounted,media/dvd_unmounted,media/dvd_mounted_decrypted,media/dvd_unmounted_decrypted,media/dvd_unmounted_encrypted,media/audiocd,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
Actions=MediaEject;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

2
tdeioslave/media/services/media_unmount.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry]
X-TDE-ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/cdrom_mounted,media/cdrom_mounted_decrypted,media/cdwriter_mounted,media/cdwriter_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/hdd_mounted_decrypted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/vcd,media/svcd,media/dvdvideo
X-TDE-ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/cdrom_mounted,media/cdrom_mounted_decrypted,media/cd-r_mounted,media/cd-r_mounted_decrypted,media/cd-rw_mounted,media/cd-rw_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/hdd_mounted_decrypted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/vcd,media/svcd,media/dvdvideo
Actions=MediaUnmount;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

2
tdeioslave/media/tdefile-plugin/tdefile_media.desktop
Unescape View File

@ -72,4 +72,4 @@ Name[zh_CN]=介质信息
Name[zh_TW]=媒體資訊
X-TDE-ServiceTypes=KFilePlugin
X-TDE-Library=tdefile_media
MimeType=media/audiocd;media/hdd_mounted;media/hdd_mounted_decrypted;media/blankcd;media/hdd_unmounted;media/hdd_unmounted_decrypted;media/blankdvd;media/cdrom_mounted;media/cdrom_mounted_decrypted;media/cdrom_unmounted;media/cdrom_unmounted_decrypted;media/cdwriter_mounted;media/cdwriter_mounted_decrypted;media/nfs_mounted;media/cdwriter_unmounted;media/cdwriter_unmounted_decrypted;media/nfs_unmounted;media/removable_mounted;media/removable_mounted_decrypted;media/dvd_mounted;media/dvd_mounted_decrypted;media/removable_unmounted;media/removable_unmounted_decrypted;media/dvd_unmounted;media/dvd_unmounted_decrypted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted
MimeType=media/audiocd;media/hdd_mounted;media/hdd_mounted_decrypted;media/blankcd;media/hdd_unmounted;media/hdd_unmounted_decrypted;media/blankdvd;media/cdrom_mounted;media/cdrom_mounted_decrypted;media/cdrom_unmounted;media/cdrom_unmounted_decrypted;media/cd-r_mounted;media/cd-r_mounted_decrypted;media/cd-rw_mounted;media/cd-rw_mounted_decrypted;media/nfs_mounted;media/cd-r_unmounted;media/cd-r_unmounted_decrypted;media/cd-rw_unmounted;media/cd-rw_unmounted_decrypted;media/nfs_unmounted;media/removable_mounted;media/removable_mounted_decrypted;media/dvd_mounted;media/dvd_mounted_decrypted;media/removable_unmounted;media/removable_unmounted_decrypted;media/dvd_unmounted;media/dvd_unmounted_decrypted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted

12
tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
Unescape View File

@ -59,11 +59,15 @@ KFileMediaPlugin::KFileMediaPlugin(TQObject *parent, const char *name,
addMimeType( "media/cdrom_mounted_decrypted" );
addMimeType( "media/cdrom_unmounted" );
addMimeType( "media/cdrom_unmounted_decrypted" );
addMimeType( "media/cdwriter_mounted" );
addMimeType( "media/cdwriter_mounted_decrypted" );
addMimeType( "media/cd-r_mounted" );
addMimeType( "media/cd-r_mounted_decrypted" );
addMimeType( "media/cd-rw_mounted" );
addMimeType( "media/cd-rw_mounted_decrypted" );
addMimeType( "media/nfs_mounted" );
addMimeType( "media/cdwriter_unmounted" );
addMimeType( "media/cdwriter_unmounted_decrypted" );
addMimeType( "media/cd-r_unmounted" );
addMimeType( "media/cd-r_unmounted_decrypted" );
addMimeType( "media/cd-rw_unmounted" );
addMimeType( "media/cd-rw_unmounted_decrypted" );
addMimeType( "media/nfs_unmounted" );
addMimeType( "media/removable_mounted" );
addMimeType( "media/removable_mounted_decrypted" );

Write Preview
Loading…
Cancel
Save