summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2010-08-25 17:49:20 +0200
committerJan Holesovsky <kendy@suse.cz>2010-08-26 12:54:53 +0200
commitf6f2e169ba23dbfcbdae8991730c4afa2c600b7a (patch)
treeb09137ddcb7d83dfc9277df61e0911b56877a21b
parent4a02263f14db48f63e3f11b334458a7011289f49 (diff)
fpicker-kde-filter-name.diff: Workaround for "Filter name (*.blah)"
(vs. "Filter name" in Insert->Picture->From File...) - n#66873.
-rw-r--r--fpicker/source/unx/kde/kdefilepicker.cxx14
1 files changed, 14 insertions, 0 deletions
diff --git a/fpicker/source/unx/kde/kdefilepicker.cxx b/fpicker/source/unx/kde/kdefilepicker.cxx
index 196138b6e4ab..a597b5edfd70 100644
--- a/fpicker/source/unx/kde/kdefilepicker.cxx
+++ b/fpicker/source/unx/kde/kdefilepicker.cxx
@@ -681,4 +681,18 @@ void FileFilterComboHack::setCurrentFilter( const QString& filter )
{
setCurrentText( filter );
filterChanged();
+
+ // Workaround for 'Filter name (*.blah)' vs. 'Filter name'
+ if ( currentText() != text( currentItem() ) )
+ {
+ int nItem = 0;
+ for ( ; nItem < count() && !text( nItem ).startsWith( filter ); ++nItem );
+
+ if ( nItem < count() )
+ setCurrentItem( nItem );
+ else
+ setCurrentItem( 0 );
+
+ filterChanged();
+ }
}