summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-03-21 21:35:41 (UTC)
committer llornkcor <llornkcor>2003-03-21 21:35:41 (UTC)
commitd1d55108ecc8c913267122014aa2f139be947299 (patch) (side-by-side diff)
tree6d09c6f5fe0d21440e880e94e6630a2cebcda37a
parentd11cf5483fbfa87a7be65891df2625def351f3a4 (diff)
downloadopie-d1d55108ecc8c913267122014aa2f139be947299.zip
opie-d1d55108ecc8c913267122014aa2f139be947299.tar.gz
opie-d1d55108ecc8c913267122014aa2f139be947299.tar.bz2
change filesave icon to inlined
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/resource.h104
-rw-r--r--core/apps/textedit/textedit.cpp90
-rw-r--r--core/apps/textedit/textedit.pro2
3 files changed, 45 insertions, 151 deletions
diff --git a/core/apps/textedit/resource.h b/core/apps/textedit/resource.h
deleted file mode 100644
index 7a22f01..0000000
--- a/core/apps/textedit/resource.h
+++ b/dev/null
@@ -1,104 +0,0 @@
-#ifndef RESOURCE_H
-#define RESOURCE_H
-
-#include <qpixmap.h>
-
-/* XPM */
-static char * filesave_xpm[] = {
- "16 16 78 1",
- " c None",
- ". c #343434",
- "+ c #A0A0A0",
- "@ c #565656",
- "# c #9E9E9E",
- "$ c #525252",
- "% c #929292",
- "& c #676767",
- "* c #848484",
- "= c #666666",
- "- c #D8D8D8",
- "; c #FFFFFF",
- "> c #DBDBDB",
- ", c #636363",
- "' c #989898",
- ") c #2D2D2D",
- "! c #909090",
- "~ c #AEAEAE",
- "{ c #EAEAEA",
- "] c #575757",
- "^ c #585858",
- "/ c #8A8A8A",
- "( c #828282",
- "_ c #6F6F6F",
- ": c #C9C9C9",
- "< c #050505",
- "[ c #292929",
- "} c #777777",
- "| c #616161",
- "1 c #3A3A3A",
- "2 c #BEBEBE",
- "3 c #2C2C2C",
- "4 c #7C7C7C",
- "5 c #F6F6F6",
- "6 c #FCFCFC",
- "7 c #6B6B6B",
- "8 c #959595",
- "9 c #4F4F4F",
- "0 c #808080",
- "a c #767676",
- "b c #818181",
- "c c #B8B8B8",
- "d c #FBFBFB",
- "e c #F9F9F9",
- "f c #CCCCCC",
- "g c #030303",
- "h c #737373",
- "i c #7A7A7A",
- "j c #7E7E7E",
- "k c #6A6A6A",
- "l c #FAFAFA",
- "m c #505050",
- "n c #9D9D9D",
- "o c #333333",
- "p c #7B7B7B",
- "q c #787878",
- "r c #696969",
- "s c #494949",
- "t c #555555",
- "u c #949494",
- "v c #E6E6E6",
- "w c #424242",
- "x c #515151",
- "y c #535353",
- "z c #3E3E3E",
- "A c #D4D4D4",
- "B c #0C0C0C",
- "C c #353535",
- "D c #474747",
- "E c #ECECEC",
- "F c #919191",
- "G c #7D7D7D",
- "H c #000000",
- "I c #404040",
- "J c #858585",
- "K c #323232",
- "L c #D0D0D0",
- "M c #1C1C1C",
- " ...+ ",
- " @#$%&..+ ",
- " .*=-;;>,..+ ",
- " ')!~;;;;;;{]..",
- " ^/(-;;;;;;;_:<",
- " [}|;;;;;;;{12$",
- " #34-55;;;;678$+",
- " 90ab=c;dd;e1fg ",
- " [ahij((kbl0mn$ ",
- " op^q^^7r&]s/$+ ",
- "@btu;vbwxy]zAB ",
- "CzDEvEv;;DssF$ ",
- "G.H{E{E{IxsJ$+ ",
- " +...vEKxzLM ",
- " +...z]n$ ",
- " +... "};
-
-#endif
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 59a605a..749e0ac 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -46,26 +46,24 @@
#include <qtoolbutton.h>
#include <qwidgetstack.h>
#include <qcheckbox.h>
#include <qcombo.h>
#include <qlayout.h>
#include <qapplication.h>
#include <qtimer.h>
#include <qdir.h>
#include <unistd.h>
#include <sys/stat.h>
#include <stdlib.h> //getenv
-#include "resource.h"
-
#if QT_VERSION < 300
class QpeEditor : public QMultiLineEdit
{
public:
QpeEditor( QWidget *parent, const char * name = 0 )
: QMultiLineEdit( parent, name ) {
clearTableFlags();
setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar );
}
@@ -201,32 +199,32 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
// a->addTo( bar );
a->addTo( file );
a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ),
QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
a->addTo( bar );
a->addTo( file );
- a = new QAction( tr( "Save" ), QPixmap(( const char** ) filesave_xpm ) ,
+ a = new QAction( tr( "Save" ), Resource::loadPixmap("save") ,
QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( save() ) );
file->insertSeparator();
a->addTo( bar );
a->addTo( file );
- a = new QAction( tr( "Save As" ), QPixmap(( const char** ) filesave_xpm ) ,
+ a = new QAction( tr( "Save As" ), Resource::loadPixmap("save") ,
QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) );
a->addTo( file );
a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ),
QString::null, 0, this, 0 );
connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
a->addTo( editBar );
a->addTo( edit );
a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ),
QString::null, 0, this, 0 );
@@ -685,76 +683,76 @@ void TextEdit::openDotFile( const QString &f ) {
}
editor->setText(txt);
editor->setEdited( false);
edited1=false;
edited=false;
}
updateCaption( currentFileName);
}
void TextEdit::openFile( const QString &f ) {
- qDebug("filename is "+ f);
- QString filer;
- QFileInfo fi( f);
+ qDebug("filename is "+ f);
+ QString filer;
+ QFileInfo fi( f);
// bFromDocView = true;
- if(f.find(".desktop",0,true) != -1 && !openDesktop )
- {
- switch ( QMessageBox::warning(this,tr("Text Editor"),
- tr("Text Editor has detected<BR>you selected a <B>.desktop</B>
+ if(f.find(".desktop",0,true) != -1 && !openDesktop )
+ {
+ switch ( QMessageBox::warning(this,tr("Text Editor"),
+ tr("Text Editor has detected<BR>you selected a <B>.desktop</B>
file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?"),
- tr(".desktop File"),tr("Linked Document"),0,1,1) )
- {
- case 0: //desktop
- filer = f;
- break;
- case 1: //linked
- DocLnk sf(f);
- filer = sf.file();
- break;
+ tr(".desktop File"),tr("Linked Document"),0,1,1) )
+ {
+ case 0: //desktop
+ filer = f;
+ break;
+ case 1: //linked
+ DocLnk sf(f);
+ filer = sf.file();
+ break;
};
}
- else if(fi.baseName().left(1) == "")
- {
- qDebug("opening dotfile");
- currentFileName=f;
- openDotFile(currentFileName);
- return;
+ else if(fi.baseName().left(1) == "")
+ {
+ qDebug("opening dotfile");
+ currentFileName=f;
+ openDotFile(currentFileName);
+ return;
}
- else
- {
- DocLnk sf(f);
- filer = sf.file();
- if(filer.right(1) == "/")
- filer = f;
+ else
+ {
+ DocLnk sf(f);
+ filer = sf.file();
+ if(filer.right(1) == "/")
+ filer = f;
}
- DocLnk nf;
- nf.setType("text/plain");
- nf.setFile(filer);
- currentFileName=filer;
+ DocLnk nf;
+ nf.setType("text/plain");
+ nf.setFile(filer);
+ currentFileName=filer;
- nf.setName(fi.baseName());
- openFile(nf);
+ nf.setName(fi.baseName());
+ openFile(nf);
- qDebug("openFile string "+currentFileName);
+ qDebug("openFile string "+currentFileName);
- showEditTools();
- // Show filename in caption
- QString name = filer;
- int sep = name.findRev( '/' );
- if ( sep > 0 )
- name = name.mid( sep+1 );
- updateCaption( name );
+ showEditTools();
+ // Show filename in caption
+ QString name = filer;
+ int sep = name.findRev( '/' );
+ if ( sep > 0 )
+ name = name.mid( sep+1 );
+ updateCaption( name );
}
void TextEdit::openFile( const DocLnk &f ) {
// clear();
// bFromDocView = true;
FileManager fm;
QString txt;
currentFileName=f.file();
qDebug("openFile doclnk " + currentFileName);
if ( !fm.loadFile( f, txt ) ) {
// ####### could be a new file
qDebug( "Cannot open file" );
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index 233dd67..d2c238e 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,16 +1,16 @@
TEMPLATE = app
CONFIG += qt warn_on release
DESTDIR = $(OPIEDIR)/bin
-HEADERS = textedit.h filePermissions.h resource.h
+HEADERS = textedit.h filePermissions.h
SOURCES = main.cpp textedit.cpp filePermissions.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopie
TARGET = textedit
TRANSLATIONS = ../../../i18n/de/textedit.ts \
../../../i18n/da/textedit.ts \
../../../i18n/xx/textedit.ts \
../../../i18n/en/textedit.ts \
../../../i18n/es/textedit.ts \
../../../i18n/fr/textedit.ts \