| -rw-r--r-- | libopie/libopie.control | 2 | ||||
| -rw-r--r-- | libopie/ofileselector.cc | 33 |
2 files changed, 17 insertions, 18 deletions
diff --git a/libopie/libopie.control b/libopie/libopie.control index 80bd2fc..e5416bf 100644 --- a/libopie/libopie.control +++ b/libopie/libopie.control @@ -1,4 +1,4 @@ -Files: $QTDIR/lib/libopie.so.1.0.0 $QTDIR/lib/libopie.so.1.0 $QTDIR/lib/libopie.so.1 +Files: $QTDIR/lib/libopie.so.1.0.0 $QTDIR/lib/libopie.so.1.0 $QTDIR/lib/libopie.so.1 $QTDIR/pics/opie/* Priority: optional Section: opie/system Package: libopie diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc index ea19143..cb18039 100644 --- a/libopie/ofileselector.cc +++ b/libopie/ofileselector.cc @@ -85,8 +85,8 @@ OFileSelector::OFileSelector(QWidget *wid, int mode, int selector, const QString m_currentDir = dirName; m_name = fileName; m_mimetypes = mimetypes; - if( mimetypes.isEmpty() ) - m_autoMime = true; +// if( mimetypes.isEmpty() ) +// m_autoMime = true; m_mode = mode; m_shTool = true; @@ -139,7 +139,7 @@ void OFileSelector::initPics() qWarning("init pics" ); m_pixmaps = new QMap<QString,QPixmap>; QPixmap pm = Resource::loadPixmap( "folder" ); - QPixmap lnk = Resource::loadPixmap( "symlink" ); + QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); QPainter painter( &pm ); painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); pm.setMask( pm.createHeuristicMask( FALSE ) ); @@ -548,20 +548,21 @@ void OFileSelector::initializeChooser() m_mimeCheck = new QComboBox(this, "mime check"); m_viewCheck = new QComboBox(this, "view check"); m_boxView->addWidget(m_viewCheck, 0 ); - m_boxView->insertSpacing(1, 8 ); + m_boxView->insertSpacing(2, 8 ); m_boxView->addWidget(m_mimeCheck, 0 ); m_lay->addLayout(m_boxView ); + m_lay->insertSpacing( 4, 8); m_viewCheck->insertItem(tr("Documents") ); m_viewCheck->insertItem(tr("Files") ); m_viewCheck->insertItem(tr("All Files") ); - if(!m_autoMime ) - m_mimeCheck->insertItem(m_mimetypes.join("," ) ); - else{ // check +// if(!m_autoMime ) +// m_mimeCheck->insertItem(m_mimetypes.join("," ) ); +// else{ // check updateMimes(); m_mimeCheck->insertStringList( m_mimetypes ); - } +// } connect( m_viewCheck, SIGNAL(activated(const QString &) ), this, SLOT(slotViewCheck(const QString & ) ) ); @@ -694,20 +695,17 @@ void OFileSelector::initializeListView() m_location = new QComboBox(m_pseudo ); m_up = new QPushButton(Resource::loadIconSet("up"),"", m_pseudo,"cdUpButton"); - m_up->setMinimumSize( QSize( 20, 20 ) ); - m_up->setMaximumSize( QSize( 20, 20 ) ); + m_up->setFixedSize( QSize( 20, 20 ) ); connect(m_up ,SIGNAL(clicked()),this,SLOT(cdUP() ) ); m_up->setFlat(TRUE); m_homeButton = new QPushButton(Resource::loadIconSet("home") , "", m_pseudo); - m_homeButton->setMinimumSize( QSize( 20, 20 ) ); - m_homeButton->setMaximumSize( QSize( 20, 20 ) ); + m_homeButton->setFixedSize( QSize( 20, 20 ) ); connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotHome() ) ); m_homeButton->setFlat(TRUE); m_docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"", m_pseudo,"docsButton"); - m_docButton->setMinimumSize( QSize( 20, 20 ) ); - m_docButton->setMaximumSize( QSize( 20, 20 ) ); + m_docButton->setFixedSize( QSize( 20, 20 ) ); connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotDoc() ) ); m_docButton->setFlat(TRUE); @@ -739,13 +737,14 @@ void OFileSelector::initializeListView() //(m_View->header() )->hide(); //m_View->setRootIsDecorated(false); m_View->addColumn(" "); - m_View->addColumn(tr("Name") ); - m_View->addColumn(tr("Size") ); + m_View->addColumn(tr("Name"),135 ); + m_View->addColumn(tr("Size"),-1 ); m_View->addColumn(tr("Date"), 60 ); - m_View->addColumn(tr("Mime Type") ); + m_View->addColumn(tr("Mime Type"),-1 ); QHeader *header = m_View->header(); header->hide(); m_View->setSorting(1 ); + m_View->setAllColumnsShowFocus( TRUE); // connect now connect(m_View, SIGNAL(selectionChanged() ), this, SLOT(slotSelectionChanged() ) ); connect(m_View, SIGNAL(currentChanged(QListViewItem *) ), this, SLOT(slotCurrentChanged(QListViewItem * ) ) ); |