Diffstat (limited to 'libopie/ofileselector/ofilelistview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie/ofileselector/ofilelistview.cpp | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/libopie/ofileselector/ofilelistview.cpp b/libopie/ofileselector/ofilelistview.cpp index 9cfdc48..fe8acf0 100644 --- a/libopie/ofileselector/ofilelistview.cpp +++ b/libopie/ofileselector/ofilelistview.cpp | |||
@@ -43,13 +43,13 @@ OFileListView::~OFileListView() { | |||
43 | void OFileListView::clear() { | 43 | void OFileListView::clear() { |
44 | QListView::clear(); | 44 | QListView::clear(); |
45 | } | 45 | } |
46 | void OFileListView::addFile( const QPixmap& pix, | 46 | void OFileListView::addFile( const QPixmap& pix, |
47 | const QString&, | 47 | const QString&, |
48 | QFileInfo* info, | 48 | QFileInfo* info, |
49 | const QString& /*extra*/, | 49 | const QString& extra, |
50 | bool isSymlink ) { | 50 | bool isSymlink ) { |
51 | QString dir; | 51 | QString dir; |
52 | QString name; | 52 | QString name; |
53 | bool locked = false; | 53 | bool locked = false; |
54 | 54 | ||
55 | dir = info->dirPath( true ); | 55 | dir = info->dirPath( true ); |
@@ -64,35 +64,35 @@ void OFileListView::addFile( const QPixmap& pix, | |||
64 | locked = true; | 64 | locked = true; |
65 | } | 65 | } |
66 | } | 66 | } |
67 | new OFileSelectorItem( this, pix, name, | 67 | new OFileSelectorItem( this, pix, name, |
68 | info->lastModified().toString(), | 68 | info->lastModified().toString(), |
69 | QString::number( info->size() ), | 69 | QString::number( info->size() ), |
70 | dir, locked ); | 70 | dir, locked, extra ); |
71 | } | 71 | } |
72 | void OFileListView::addFile( const QPixmap&, | 72 | void OFileListView::addFile( const QPixmap&, |
73 | const QString& /*mime*/, const QString& /*dir*/, | 73 | const QString& /*mime*/, const QString& /*dir*/, |
74 | const QString& /*file*/, | 74 | const QString& /*file*/, |
75 | const QString& /*extra*/, | 75 | const QString& /*extra*/, |
76 | bool /*isSyml*/ ) { | 76 | bool /*isSyml*/ ) { |
77 | 77 | ||
78 | } | 78 | } |
79 | void OFileListView::addDir( const QPixmap& pix, const QString&, | 79 | void OFileListView::addDir( const QPixmap& pix, const QString&, |
80 | QFileInfo* info, | 80 | QFileInfo* info, |
81 | const QString& /*extra */, | 81 | const QString& extra , |
82 | bool symlink ) { | 82 | bool symlink ) { |
83 | 83 | ||
84 | bool locked = false; | 84 | bool locked = false; |
85 | QString name; | 85 | QString name; |
86 | 86 | ||
87 | name = symlink ? info->fileName() + "->" + info->dirPath(true) + "/" +info->readLink() : info->fileName() ; | 87 | name = symlink ? info->fileName() + "->" + info->dirPath(true) + "/" +info->readLink() : info->fileName() ; |
88 | 88 | ||
89 | new OFileSelectorItem( this, pix, name, | 89 | new OFileSelectorItem( this, pix, name, |
90 | info->lastModified().toString(), | 90 | info->lastModified().toString(), |
91 | QString::number( info->size() ), | 91 | QString::number( info->size() ), |
92 | info->dirPath( true ), locked, | 92 | info->dirPath( true ), locked, extra, |
93 | true ); | 93 | true ); |
94 | 94 | ||
95 | } | 95 | } |
96 | void OFileListView::addDir( const QPixmap&, | 96 | void OFileListView::addDir( const QPixmap&, |
97 | const QString& /*mime*/, const QString& /*dir*/, | 97 | const QString& /*mime*/, const QString& /*dir*/, |
98 | const QString& /*file*/, | 98 | const QString& /*file*/, |
@@ -124,23 +124,30 @@ QString OFileListView::selectedName()const{ | |||
124 | QListViewItem *item = currentItem(); | 124 | QListViewItem *item = currentItem(); |
125 | if (!item ) | 125 | if (!item ) |
126 | return QString::null; | 126 | return QString::null; |
127 | 127 | ||
128 | return item->text( 1 ); | 128 | return item->text( 1 ); |
129 | } | 129 | } |
130 | QString OFileListView::selectedExtra()const{ | ||
131 | QListViewItem* item = currentItem(); | ||
132 | if (!item) return QString::null; | ||
133 | OFileSelectorItem* fit = (OFileSelectorItem*)fit; | ||
134 | |||
135 | return fit->extra(); | ||
136 | } | ||
130 | QStringList OFileListView::selectedNames()const { | 137 | QStringList OFileListView::selectedNames()const { |
131 | QStringList list; | 138 | QStringList list; |
132 | list << selectedName(); | 139 | list << selectedName(); |
133 | return list; | 140 | return list; |
134 | } | 141 | } |
135 | QString OFileListView::selectedPath()const { | 142 | QString OFileListView::selectedPath()const { |
136 | return QString::null; | 143 | return QString::null; |
137 | } | 144 | } |
138 | QStringList OFileListView::selectedPaths()const { | 145 | QStringList OFileListView::selectedPaths()const { |
139 | QStringList list; | 146 | QStringList list; |
140 | b list << selectedPath(); | 147 | list << selectedPath(); |
141 | return list; | 148 | return list; |
142 | } | 149 | } |
143 | int OFileListView::fileCount() { | 150 | int OFileListView::fileCount() { |
144 | return childCount(); | 151 | return childCount(); |
145 | } | 152 | } |
146 | void OFileListView::sort() { | 153 | void OFileListView::sort() { |
@@ -158,16 +165,13 @@ void OFileListView::slotCurrentChanged( QListViewItem* item) { | |||
158 | qWarning("current changed"); | 165 | qWarning("current changed"); |
159 | if(!sel->isDir() ){ | 166 | if(!sel->isDir() ){ |
160 | updateLine( sel->text(1) ); | 167 | updateLine( sel->text(1) ); |
161 | 168 | ||
162 | if (selector()->mode() == OFileSelector::Fileselector ) { | 169 | if (selector()->mode() == OFileSelector::Fileselector ) { |
163 | QStringList str = QStringList::split("->", sel->text(1) ); | 170 | QStringList str = QStringList::split("->", sel->text(1) ); |
164 | QString path =sel->directory() + "/" + str[0].stripWhiteSpace(); | 171 | fileSelected(sel->directory(), str[0].stripWhiteSpace(),sel->extra() ); |
165 | DocLnk lnk( path ); | ||
166 | fileSelected(lnk ); | ||
167 | fileSelected( path ); | ||
168 | } | 172 | } |
169 | } | 173 | } |
170 | } | 174 | } |
171 | void OFileListView::slotClicked( int button, QListViewItem* item, | 175 | void OFileListView::slotClicked( int button, QListViewItem* item, |
172 | const QPoint&, int ) { | 176 | const QPoint&, int ) { |
173 | if ( !item ) | 177 | if ( !item ) |
@@ -178,22 +182,16 @@ void OFileListView::slotClicked( int button, QListViewItem* item, | |||
178 | 182 | ||
179 | OFileSelectorItem *sel = (OFileSelectorItem*)item; | 183 | OFileSelectorItem *sel = (OFileSelectorItem*)item; |
180 | 184 | ||
181 | if(!sel->isLocked() ){ | 185 | if(!sel->isLocked() ){ |
182 | QStringList str = QStringList::split("->", sel->text(1) ); | 186 | QStringList str = QStringList::split("->", sel->text(1) ); |
183 | if( sel->isDir() ){ | 187 | if( sel->isDir() ){ |
184 | changedDir( sel->directory() + "/" + str[0].stripWhiteSpace() ); | 188 | changedDir( sel->directory(), str[0].stripWhiteSpace(),sel->extra() ); |
185 | }else{ | 189 | }else{ |
186 | updateLine( str[0].stripWhiteSpace() ); | 190 | updateLine( str[0].stripWhiteSpace() ); |
187 | QString path = sel->directory(); | 191 | fileSelected( sel->directory(),str[0].stripWhiteSpace(), sel->extra() ); |
188 | path += "/"; | ||
189 | path += str[0].stripWhiteSpace(); | ||
190 | |||
191 | DocLnk lnk( path ); | ||
192 | fileSelected( path ); | ||
193 | fileSelected( lnk ); | ||
194 | } | 192 | } |
195 | } | 193 | } |
196 | } | 194 | } |
197 | void OFileListView::slotRightButton( int button, QListViewItem* item, | 195 | void OFileListView::slotRightButton( int button, QListViewItem* item, |
198 | const QPoint&, int ) { | 196 | const QPoint&, int ) { |
199 | if (!item || (button != Qt::RightButton )) | 197 | if (!item || (button != Qt::RightButton )) |