author | llornkcor <llornkcor> | 2002-04-24 02:06:41 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-24 02:06:41 (UTC) |
commit | c9159a3d5192799f5b2911d13337f04f50b1ac5a (patch) (unidiff) | |
tree | d7a09c5998c1e7b9fdc4d24f1dcf15f91fc95437 | |
parent | 29e4dd18cbbe6d5967561b428a9632629cff3fde (diff) | |
download | opie-c9159a3d5192799f5b2911d13337f04f50b1ac5a.zip opie-c9159a3d5192799f5b2911d13337f04f50b1ac5a.tar.gz opie-c9159a3d5192799f5b2911d13337f04f50b1ac5a.tar.bz2 |
changed symlink icon location, changed mimetype combo action, added spacing to bottom
-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 @@ | |||
1 | Files: $QTDIR/lib/libopie.so.1.0.0 $QTDIR/lib/libopie.so.1.0 $QTDIR/lib/libopie.so.1 | 1 | Files: $QTDIR/lib/libopie.so.1.0.0 $QTDIR/lib/libopie.so.1.0 $QTDIR/lib/libopie.so.1 $QTDIR/pics/opie/* |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/system | 3 | Section: opie/system |
4 | Package: libopie | 4 | 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 | |||
85 | m_currentDir = dirName; | 85 | m_currentDir = dirName; |
86 | m_name = fileName; | 86 | m_name = fileName; |
87 | m_mimetypes = mimetypes; | 87 | m_mimetypes = mimetypes; |
88 | if( mimetypes.isEmpty() ) | 88 | // if( mimetypes.isEmpty() ) |
89 | m_autoMime = true; | 89 | // m_autoMime = true; |
90 | 90 | ||
91 | m_mode = mode; | 91 | m_mode = mode; |
92 | m_shTool = true; | 92 | m_shTool = true; |
@@ -139,7 +139,7 @@ void OFileSelector::initPics() | |||
139 | qWarning("init pics" ); | 139 | qWarning("init pics" ); |
140 | m_pixmaps = new QMap<QString,QPixmap>; | 140 | m_pixmaps = new QMap<QString,QPixmap>; |
141 | QPixmap pm = Resource::loadPixmap( "folder" ); | 141 | QPixmap pm = Resource::loadPixmap( "folder" ); |
142 | QPixmap lnk = Resource::loadPixmap( "symlink" ); | 142 | QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); |
143 | QPainter painter( &pm ); | 143 | QPainter painter( &pm ); |
144 | painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); | 144 | painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); |
145 | pm.setMask( pm.createHeuristicMask( FALSE ) ); | 145 | pm.setMask( pm.createHeuristicMask( FALSE ) ); |
@@ -548,20 +548,21 @@ void OFileSelector::initializeChooser() | |||
548 | m_mimeCheck = new QComboBox(this, "mime check"); | 548 | m_mimeCheck = new QComboBox(this, "mime check"); |
549 | m_viewCheck = new QComboBox(this, "view check"); | 549 | m_viewCheck = new QComboBox(this, "view check"); |
550 | m_boxView->addWidget(m_viewCheck, 0 ); | 550 | m_boxView->addWidget(m_viewCheck, 0 ); |
551 | m_boxView->insertSpacing(1, 8 ); | 551 | m_boxView->insertSpacing(2, 8 ); |
552 | m_boxView->addWidget(m_mimeCheck, 0 ); | 552 | m_boxView->addWidget(m_mimeCheck, 0 ); |
553 | m_lay->addLayout(m_boxView ); | 553 | m_lay->addLayout(m_boxView ); |
554 | m_lay->insertSpacing( 4, 8); | ||
554 | 555 | ||
555 | m_viewCheck->insertItem(tr("Documents") ); | 556 | m_viewCheck->insertItem(tr("Documents") ); |
556 | m_viewCheck->insertItem(tr("Files") ); | 557 | m_viewCheck->insertItem(tr("Files") ); |
557 | m_viewCheck->insertItem(tr("All Files") ); | 558 | m_viewCheck->insertItem(tr("All Files") ); |
558 | 559 | ||
559 | if(!m_autoMime ) | 560 | // if(!m_autoMime ) |
560 | m_mimeCheck->insertItem(m_mimetypes.join("," ) ); | 561 | // m_mimeCheck->insertItem(m_mimetypes.join("," ) ); |
561 | else{ // check | 562 | // else{ // check |
562 | updateMimes(); | 563 | updateMimes(); |
563 | m_mimeCheck->insertStringList( m_mimetypes ); | 564 | m_mimeCheck->insertStringList( m_mimetypes ); |
564 | } | 565 | // } |
565 | 566 | ||
566 | connect( m_viewCheck, SIGNAL(activated(const QString &) ), | 567 | connect( m_viewCheck, SIGNAL(activated(const QString &) ), |
567 | this, SLOT(slotViewCheck(const QString & ) ) ); | 568 | this, SLOT(slotViewCheck(const QString & ) ) ); |
@@ -694,20 +695,17 @@ void OFileSelector::initializeListView() | |||
694 | m_location = new QComboBox(m_pseudo ); | 695 | m_location = new QComboBox(m_pseudo ); |
695 | 696 | ||
696 | m_up = new QPushButton(Resource::loadIconSet("up"),"", m_pseudo,"cdUpButton"); | 697 | m_up = new QPushButton(Resource::loadIconSet("up"),"", m_pseudo,"cdUpButton"); |
697 | m_up->setMinimumSize( QSize( 20, 20 ) ); | 698 | m_up->setFixedSize( QSize( 20, 20 ) ); |
698 | m_up->setMaximumSize( QSize( 20, 20 ) ); | ||
699 | connect(m_up ,SIGNAL(clicked()),this,SLOT(cdUP() ) ); | 699 | connect(m_up ,SIGNAL(clicked()),this,SLOT(cdUP() ) ); |
700 | m_up->setFlat(TRUE); | 700 | m_up->setFlat(TRUE); |
701 | 701 | ||
702 | m_homeButton = new QPushButton(Resource::loadIconSet("home") , "", m_pseudo); | 702 | m_homeButton = new QPushButton(Resource::loadIconSet("home") , "", m_pseudo); |
703 | m_homeButton->setMinimumSize( QSize( 20, 20 ) ); | 703 | m_homeButton->setFixedSize( QSize( 20, 20 ) ); |
704 | m_homeButton->setMaximumSize( QSize( 20, 20 ) ); | ||
705 | connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotHome() ) ); | 704 | connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotHome() ) ); |
706 | m_homeButton->setFlat(TRUE); | 705 | m_homeButton->setFlat(TRUE); |
707 | 706 | ||
708 | m_docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"", m_pseudo,"docsButton"); | 707 | m_docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"", m_pseudo,"docsButton"); |
709 | m_docButton->setMinimumSize( QSize( 20, 20 ) ); | 708 | m_docButton->setFixedSize( QSize( 20, 20 ) ); |
710 | m_docButton->setMaximumSize( QSize( 20, 20 ) ); | ||
711 | connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotDoc() ) ); | 709 | connect(m_homeButton,SIGNAL(clicked()),this,SLOT(slotDoc() ) ); |
712 | m_docButton->setFlat(TRUE); | 710 | m_docButton->setFlat(TRUE); |
713 | 711 | ||
@@ -739,13 +737,14 @@ void OFileSelector::initializeListView() | |||
739 | //(m_View->header() )->hide(); | 737 | //(m_View->header() )->hide(); |
740 | //m_View->setRootIsDecorated(false); | 738 | //m_View->setRootIsDecorated(false); |
741 | m_View->addColumn(" "); | 739 | m_View->addColumn(" "); |
742 | m_View->addColumn(tr("Name") ); | 740 | m_View->addColumn(tr("Name"),135 ); |
743 | m_View->addColumn(tr("Size") ); | 741 | m_View->addColumn(tr("Size"),-1 ); |
744 | m_View->addColumn(tr("Date"), 60 ); | 742 | m_View->addColumn(tr("Date"), 60 ); |
745 | m_View->addColumn(tr("Mime Type") ); | 743 | m_View->addColumn(tr("Mime Type"),-1 ); |
746 | QHeader *header = m_View->header(); | 744 | QHeader *header = m_View->header(); |
747 | header->hide(); | 745 | header->hide(); |
748 | m_View->setSorting(1 ); | 746 | m_View->setSorting(1 ); |
747 | m_View->setAllColumnsShowFocus( TRUE); | ||
749 | // connect now | 748 | // connect now |
750 | connect(m_View, SIGNAL(selectionChanged() ), this, SLOT(slotSelectionChanged() ) ); | 749 | connect(m_View, SIGNAL(selectionChanged() ), this, SLOT(slotSelectionChanged() ) ); |
751 | connect(m_View, SIGNAL(currentChanged(QListViewItem *) ), this, SLOT(slotCurrentChanged(QListViewItem * ) ) ); | 750 | connect(m_View, SIGNAL(currentChanged(QListViewItem *) ), this, SLOT(slotCurrentChanged(QListViewItem * ) ) ); |