summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-05-21 15:03:56 (UTC)
committer llornkcor <llornkcor>2002-05-21 15:03:56 (UTC)
commit0ba2d95e89f55b13f2247819b6672362a8b5a484 (patch) (side-by-side diff)
tree3ee26bbcef62cca6192bd932658ed93708c23678
parentd65dc25caec62d4c554c99fbc151bf4d07c63b72 (diff)
downloadopie-0ba2d95e89f55b13f2247819b6672362a8b5a484.zip
opie-0ba2d95e89f55b13f2247819b6672362a8b5a484.tar.gz
opie-0ba2d95e89f55b13f2247819b6672362a8b5a484.tar.bz2
maybe fixed bug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/fileBrowser.cpp24
-rw-r--r--core/apps/textedit/textedit.cpp4
2 files changed, 14 insertions, 14 deletions
diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index fced326..9ad0d69 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -8,117 +8,117 @@
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
****************************************************************************/
#define QTOPIA_INTERNAL_MIMEEXT
#include "fileBrowser.h"
//#include "inputDialog.h"
#include <qpe/config.h>
#include <qpe/resource.h>
#include <qpe/fileselector.h>
#include <qpe/qpeapplication.h>
#include <qpe/menubutton.h>
#include <qpe/mimetype.h>
#include <qdict.h>
#include <qwidgetstack.h>
#include <qlistview.h>
#include <qcombo.h>
#include <qpushbutton.h>
#include <qfile.h>
#include <qmessagebox.h>
#include <qlayout.h>
#include <unistd.h>
#include <qpopupmenu.h>
#include <qlineedit.h>
#include <qstringlist.h>
#include <unistd.h>
#include <stdlib.h>
static int u_id = 1;
static int get_unique_id()
{
return u_id++;
}
fileBrowser::fileBrowser( QWidget* parent, const char* name, bool modal, WFlags fl , const QString mimeFilter )
: QDialog( parent, name, modal, fl )
{
if ( !name )
setName( "fileBrowser" );
setCaption(tr( name ) );
// getMimeTypes();
- mimeType = mimeFilter;
- MimeType mt( mimeType);
+// mimeType = mimeFilter;
+// MimeType mt( mimeType);
- if( mt.extension().isEmpty()) {
+// if( mt.extension().isEmpty()) {
- QStringList filterList;
- filterList=QStringList::split(";",mimeFilter,FALSE);
+// QStringList filterList;
+// filterList=QStringList::split(";",mimeFilter,FALSE);
- for ( QStringList::Iterator it = filterList.begin(); it != filterList.end(); ++it ) {
- printf( "%s \n", (*it).latin1() );
- }
+// for ( QStringList::Iterator it = filterList.begin(); it != filterList.end(); ++it ) {
+// printf( "%s \n", (*it).latin1() );
+// }
- filterStr = mimeFilter.right(mimeFilter.length() - mimeFilter.find("/",0,TRUE) - 1);// "*";
+// filterStr = mimeFilter.right(mimeFilter.length() - mimeFilter.find("/",0,TRUE) - 1);// "*";
- qDebug(filterStr);
- } else {
+// qDebug(filterStr);
+// } else {
filterStr = "*."+ mt.extension();
// qDebug("description "+mt.description());
// qDebug( "id "+mt.id());
// qDebug("extension "+mt.extension());
- }
+// }
// channel = new QCopChannel( "QPE/fileDialog", this );
// connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
// this, SLOT(receive(const QCString&, const QByteArray&)) );
QGridLayout *layout = new QGridLayout( this );
layout->setSpacing( 4 );
layout->setMargin( 4 );
dirPathCombo = new QComboBox( FALSE, this, "dirPathCombo" );
dirPathCombo->setEditable(TRUE);
connect( dirPathCombo, SIGNAL( activated( const QString & ) ),
this, SLOT( dirPathComboActivated( const QString & ) ) );
connect( dirPathCombo->lineEdit(), SIGNAL( returnPressed( ) ),
this, SLOT( dirPathEditPressed( ) ) );
dirPathStringList << "/";
// we can get the storage here
layout->addMultiCellWidget( dirPathCombo, 0, 0, 0, 4 );
cdUpButton = new QPushButton(Resource::loadIconSet("up"),"",this,"cdUpButton");
cdUpButton ->setMinimumSize( QSize( 20, 20 ) );
cdUpButton ->setMaximumSize( QSize( 20, 20 ) );
connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
cdUpButton ->setFlat(TRUE);
layout->addMultiCellWidget( cdUpButton, 0, 0, 5, 5 );
docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
docButton->setMinimumSize( QSize( 20, 20 ) );
docButton->setMaximumSize( QSize( 20, 20 ) );
connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
docButton->setFlat(TRUE);
layout->addMultiCellWidget( docButton, 0, 0, 6, 6 );
homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
homeButton->setMinimumSize( QSize( 20, 20 ) );
homeButton->setMaximumSize( QSize( 20, 20 ) );
connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
homeButton->setFlat(TRUE);
layout->addMultiCellWidget( homeButton, 0, 0, 7, 7 );
FileStack = new QWidgetStack( this );
ListView = new QListView( this, "ListView" );
// ListView->setMinimumSize( QSize( 100, 25 ) );
ListView->addColumn( tr( "Name" ) );
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 19449cb..b8d62db 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -465,102 +465,102 @@ void TextEdit::setFontSize(int sz, bool round_down_not_up)
}
}
QFont f = editor->font();
f.setPointSize(s);
editor->setFont(f);
zin->setEnabled(s != fontsize[nfontsizes-1]);
zout->setEnabled(s != fontsize[0]);
}
void TextEdit::setBold(bool y)
{
QFont f = editor->font();
f.setBold(y);
editor->setFont(f);
}
void TextEdit::setItalic(bool y)
{
QFont f = editor->font();
f.setItalic(y);
editor->setFont(f);
}
void TextEdit::setWordWrap(bool y)
{
bool state = editor->edited();
editor->setWordWrap(y ? QMultiLineEdit::WidgetWidth : QMultiLineEdit::NoWrap );
editor->setEdited( state );
}
void TextEdit::fileNew()
{
// if( !bFromDocView ) {
// saveAs();
// }
newFile(DocLnk());
}
void TextEdit::fileOpen()
{
Config cfg("TextEdit");
cfg.setGroup("View");
bool b=FALSE;
if(cfg.readEntry("useOldFileDialog") == "TRUE")
b=TRUE;
if(!b) {
- QString str = OFileDialog::getOpenFileName( 1,"/","", "text/plain", this );
+ QString str = OFileDialog::getOpenFileName( 1,"/","", "*", this );
if(!str.isEmpty() )
openFile( str );
} else {
QString str;
- browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "text/*"); //
+ browseForFiles = new fileBrowser(this,tr("Open File"),TRUE,0, "*"); //
browseForFiles->setFileView( viewSelection );
browseForFiles->showMaximized();
// if( result != -1 )
if( browseForFiles->exec() != -1 ) {
QString selFile = browseForFiles->selectedFileName;
QStringList fileList = browseForFiles->fileList;
qDebug(selFile);
QStringList::ConstIterator f;
QString fileTemp;
for ( f = fileList.begin(); f != fileList.end(); f++ ) {
fileTemp = *f;
fileTemp.right( fileTemp.length()-5);
QString fileName = fileTemp;
if( fileName != "Unnamed" || fileName != "Empty Text" ) {
currentFileName = fileName;
qDebug("please open "+currentFileName);
openFile(currentFileName );
}
}
viewSelection = browseForFiles->SelectionCombo->currentItem();
}
delete browseForFiles;
editor->setEdited( FALSE);
edited1=FALSE;
edited=FALSE;
if(caption().left(1)=="*")
setCaption(caption().right(caption().length()-1));
doSearchBar();
}
}
void TextEdit::doSearchBar()
{
Config cfg("TextEdit");
cfg.setGroup("View");
if(cfg.readEntry("SearchBar","Closed") != "Opened")
searchBar->hide();
}
#if 0
void TextEdit::slotFind()
{
FindDialog frmFind( tr("Text Editor"), this );
connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
editor, SLOT(slotDoFind( const QString&,bool,bool)));
//case sensitive, backwards, [category]