-rw-r--r-- | noncore/apps/advancedfm/filePermissions.cpp | 48 | ||||
-rw-r--r-- | noncore/apps/advancedfm/main.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/advancedfm/opie-advancedfm.control | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/output.cpp | 24 |
4 files changed, 32 insertions, 46 deletions
diff --git a/noncore/apps/advancedfm/filePermissions.cpp b/noncore/apps/advancedfm/filePermissions.cpp index c06f14f..4de6d12 100644 --- a/noncore/apps/advancedfm/filePermissions.cpp +++ b/noncore/apps/advancedfm/filePermissions.cpp | |||
@@ -4,38 +4,34 @@ | |||
4 | ** | 4 | ** |
5 | ** This file may be distributed and/or modified under the terms of the | 5 | ** This file may be distributed and/or modified under the terms of the |
6 | ** GNU General Public License version 2 as published by the Free Software | 6 | ** GNU General Public License version 2 as published by the Free Software |
7 | ** Foundation and appearing in the file LICENSE.GPL included in the | 7 | ** Foundation and appearing in the file LICENSE.GPL included in the |
8 | ** packaging of this file. | 8 | ** packaging of this file. |
9 | ** | 9 | ** |
10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
12 | ** | 12 | ** |
13 | ****************************************************************************/ | 13 | ****************************************************************************/ |
14 | #include "filePermissions.h" | 14 | #include "filePermissions.h" |
15 | 15 | ||
16 | #include <qfile.h> | ||
17 | #include <qfileinfo.h> | 16 | #include <qfileinfo.h> |
18 | 17 | ||
19 | #include <qcheckbox.h> | 18 | #include <qcheckbox.h> |
20 | #include <qlabel.h> | 19 | #include <qlabel.h> |
21 | #include <qlineedit.h> | 20 | #include <qlineedit.h> |
22 | #include <qlayout.h> | ||
23 | #include <qvariant.h> | ||
24 | #include <qtooltip.h> | ||
25 | #include <qmessagebox.h> | 21 | #include <qmessagebox.h> |
26 | 22 | ||
27 | #include <unistd.h> | 23 | #include <unistd.h> |
28 | #include <sys/stat.h> | 24 | #include <sys/stat.h> |
29 | #include <stdlib.h> | 25 | #include <stdlib.h> |
30 | #include <sys/types.h> | 26 | #include <sys/types.h> |
31 | #include <pwd.h> | 27 | #include <pwd.h> |
32 | #include <grp.h> | 28 | #include <grp.h> |
33 | 29 | ||
34 | filePermissions::filePermissions( QWidget* parent, const char* name, bool modal, WFlags fl, const QString &fileName ) | 30 | filePermissions::filePermissions( QWidget* parent, const char* name, bool modal, WFlags fl, const QString &fileName ) |
35 | : QDialog( parent, name, modal, fl ) | 31 | : QDialog( parent, name, modal, fl ) |
36 | { | 32 | { |
37 | if ( !name ) | 33 | if ( !name ) |
38 | setName( "filePermissions" ); | 34 | setName( "filePermissions" ); |
39 | // qDebug("FilePermissions "+fileName); | 35 | // qDebug("FilePermissions "+fileName); |
40 | /* resize( 236, 210 ); | 36 | /* resize( 236, 210 ); |
41 | setMaximumSize( QSize( 236, 210 ) ); | 37 | setMaximumSize( QSize( 236, 210 ) ); |
@@ -61,114 +57,114 @@ filePermissions::filePermissions( QWidget* parent, const char* name, bool modal | |||
61 | TextLabel4_3->setGeometry( QRect( 5, 125, 50, 15 ) ); | 57 | TextLabel4_3->setGeometry( QRect( 5, 125, 50, 15 ) ); |
62 | TextLabel4_3->setText( tr( "others" ) ); | 58 | TextLabel4_3->setText( tr( "others" ) ); |
63 | 59 | ||
64 | CheckBox1 = new QCheckBox( this, "CheckBox1" ); | 60 | CheckBox1 = new QCheckBox( this, "CheckBox1" ); |
65 | CheckBox1->setGeometry( QRect( 75, 85, 20, 16 ) ); | 61 | CheckBox1->setGeometry( QRect( 75, 85, 20, 16 ) ); |
66 | connect(CheckBox1, SIGNAL(released()),this,SLOT(ownReadCheck())); | 62 | connect(CheckBox1, SIGNAL(released()),this,SLOT(ownReadCheck())); |
67 | 63 | ||
68 | CheckBox1_2 = new QCheckBox( this, "CheckBox1_2" ); | 64 | CheckBox1_2 = new QCheckBox( this, "CheckBox1_2" ); |
69 | CheckBox1_2->setGeometry( QRect( 135, 85, 20, 16 ) ); | 65 | CheckBox1_2->setGeometry( QRect( 135, 85, 20, 16 ) ); |
70 | connect(CheckBox1_2, SIGNAL(released()),this,SLOT(ownWriteCheck())); | 66 | connect(CheckBox1_2, SIGNAL(released()),this,SLOT(ownWriteCheck())); |
71 | 67 | ||
72 | CheckBox1_3 = new QCheckBox( this, "CheckBox1_3" ); | 68 | CheckBox1_3 = new QCheckBox( this, "CheckBox1_3" ); |
73 | CheckBox1_3->setGeometry( QRect( 195, 85, 20, 16 ) ); | 69 | CheckBox1_3->setGeometry( QRect( 195, 85, 20, 16 ) ); |
74 | connect(CheckBox1_3, SIGNAL(released()),this,SLOT(ownExeCheck())); | 70 | connect(CheckBox1_3, SIGNAL(released()),this,SLOT(ownExeCheck())); |
75 | 71 | ||
76 | CheckBox1_4 = new QCheckBox( this, "CheckBox1_4" ); | 72 | CheckBox1_4 = new QCheckBox( this, "CheckBox1_4" ); |
77 | CheckBox1_4->setGeometry( QRect( 75, 105, 20, 16 ) ); | 73 | CheckBox1_4->setGeometry( QRect( 75, 105, 20, 16 ) ); |
78 | connect(CheckBox1_4, SIGNAL(released()),this,SLOT(grpReadCheck())); | 74 | connect(CheckBox1_4, SIGNAL(released()),this,SLOT(grpReadCheck())); |
79 | 75 | ||
80 | CheckBox1_5 = new QCheckBox( this, "CheckBox1_5" ); | 76 | CheckBox1_5 = new QCheckBox( this, "CheckBox1_5" ); |
81 | CheckBox1_5->setGeometry( QRect( 135, 105, 20, 16 ) ); | 77 | CheckBox1_5->setGeometry( QRect( 135, 105, 20, 16 ) ); |
82 | connect(CheckBox1_5, SIGNAL(released()),this,SLOT(grpWriteCheck())); | 78 | connect(CheckBox1_5, SIGNAL(released()),this,SLOT(grpWriteCheck())); |
83 | 79 | ||
84 | CheckBox1_6 = new QCheckBox( this, "CheckBox1_6" ); | 80 | CheckBox1_6 = new QCheckBox( this, "CheckBox1_6" ); |
85 | CheckBox1_6->setGeometry( QRect( 195, 105, 20, 16 ) ); | 81 | CheckBox1_6->setGeometry( QRect( 195, 105, 20, 16 ) ); |
86 | connect(CheckBox1_6, SIGNAL(released()),this,SLOT(grpExeCheck())); | 82 | connect(CheckBox1_6, SIGNAL(released()),this,SLOT(grpExeCheck())); |
87 | 83 | ||
88 | CheckBox1_7 = new QCheckBox( this, "CheckBox1_7" ); | 84 | CheckBox1_7 = new QCheckBox( this, "CheckBox1_7" ); |
89 | CheckBox1_7->setGeometry( QRect( 75, 125, 16, 16 ) ); | 85 | CheckBox1_7->setGeometry( QRect( 75, 125, 16, 16 ) ); |
90 | connect(CheckBox1_7, SIGNAL(released()),this,SLOT(wrldReadCheck())); | 86 | connect(CheckBox1_7, SIGNAL(released()),this,SLOT(wrldReadCheck())); |
91 | 87 | ||
92 | CheckBox1_8 = new QCheckBox( this, "CheckBox1_8" ); | 88 | CheckBox1_8 = new QCheckBox( this, "CheckBox1_8" ); |
93 | CheckBox1_8->setGeometry( QRect( 135, 125, 20, 16 ) ); | 89 | CheckBox1_8->setGeometry( QRect( 135, 125, 20, 16 ) ); |
94 | connect(CheckBox1_8, SIGNAL(released()),this,SLOT(wrldWriteCheck())); | 90 | connect(CheckBox1_8, SIGNAL(released()),this,SLOT(wrldWriteCheck())); |
95 | 91 | ||
96 | CheckBox1_8_2 = new QCheckBox( this, "CheckBox1_8_2" ); | 92 | CheckBox1_8_2 = new QCheckBox( this, "CheckBox1_8_2" ); |
97 | CheckBox1_8_2->setGeometry( QRect( 195, 125, 20, 16 ) ); | 93 | CheckBox1_8_2->setGeometry( QRect( 195, 125, 20, 16 ) ); |
98 | connect(CheckBox1_8_2, SIGNAL(released()),this,SLOT(wrldExeCheck())); | 94 | connect(CheckBox1_8_2, SIGNAL(released()),this,SLOT(wrldExeCheck())); |
99 | 95 | ||
100 | GroupLineEdit = new QLineEdit( this, "GroupLineEdit" ); | 96 | GroupLineEdit = new QLineEdit( this, "GroupLineEdit" ); |
101 | GroupLineEdit->setGeometry( QRect( 125, 155, 106, 22 ) ); | 97 | GroupLineEdit->setGeometry( QRect( 125, 155, 106, 22 ) ); |
102 | 98 | ||
103 | OwnerLineEdit = new QLineEdit( this, "OwnerLineEdit" ); | 99 | OwnerLineEdit = new QLineEdit( this, "OwnerLineEdit" ); |
104 | OwnerLineEdit->setGeometry( QRect( 10, 155, 106, 22 ) ); | 100 | OwnerLineEdit->setGeometry( QRect( 10, 155, 106, 22 ) ); |
105 | 101 | ||
106 | TextLabel5 = new QLabel( this, "TextLabel5" ); | 102 | TextLabel5 = new QLabel( this, "TextLabel5" ); |
107 | TextLabel5->setGeometry( QRect( 45, 180, 40, 16 ) ); | 103 | TextLabel5->setGeometry( QRect( 45, 180, 40, 16 ) ); |
108 | TextLabel5->setText( tr( "Owner" ) ); | 104 | TextLabel5->setText( tr( "Owner" ) ); |
109 | 105 | ||
110 | TextLabel5_2 = new QLabel( this, "TextLabel5_2" ); | 106 | TextLabel5_2 = new QLabel( this, "TextLabel5_2" ); |
111 | TextLabel5_2->setGeometry( QRect( 155, 180, 40, 16 ) ); | 107 | TextLabel5_2->setGeometry( QRect( 155, 180, 40, 16 ) ); |
112 | TextLabel5_2->setText( tr( "Group" ) ); | 108 | TextLabel5_2->setText( tr( "Group" ) ); |
113 | 109 | ||
114 | ModeLine = new QLineEdit( this, "TextLabelMode" ); | 110 | ModeLine = new QLineEdit( this, "TextLabelMode" ); |
115 | ModeLine->setGeometry( QRect( 10, 60, 40, 15 ) ); | 111 | ModeLine->setGeometry( QRect( 10, 60, 40, 15 ) ); |
116 | 112 | ||
117 | TextLabel3_2 = new QLabel( this, "TextLabel3_2" ); | 113 | TextLabel3_2 = new QLabel( this, "TextLabel3_2" ); |
118 | TextLabel3_2->setGeometry( QRect( 60, 55, 50, 20 ) ); | 114 | TextLabel3_2->setGeometry( QRect( 60, 55, 50, 20 ) ); |
119 | TextLabel3_2->setText( tr( "read" ) ); | 115 | TextLabel3_2->setText( tr( "read" ) ); |
120 | TextLabel3_2->setAlignment( int( QLabel::AlignBottom | QLabel::AlignHCenter ) ); | 116 | TextLabel3_2->setAlignment( int( QLabel::AlignBottom | QLabel::AlignHCenter ) ); |
121 | 117 | ||
122 | TextLabel3_2_2 = new QLabel( this, "TextLabel3_2_2" ); | 118 | TextLabel3_2_2 = new QLabel( this, "TextLabel3_2_2" ); |
123 | TextLabel3_2_2->setGeometry( QRect( 120, 55, 50, 20 ) ); | 119 | TextLabel3_2_2->setGeometry( QRect( 120, 55, 50, 20 ) ); |
124 | TextLabel3_2_2->setText( tr( "write" ) ); | 120 | TextLabel3_2_2->setText( tr( "write" ) ); |
125 | TextLabel3_2_2->setAlignment( int( QLabel::AlignBottom | QLabel::AlignHCenter ) ); | 121 | TextLabel3_2_2->setAlignment( int( QLabel::AlignBottom | QLabel::AlignHCenter ) ); |
126 | 122 | ||
127 | TextLabel3 = new QLabel( this, "TextLabel3" ); | 123 | TextLabel3 = new QLabel( this, "TextLabel3" ); |
128 | TextLabel3->setGeometry( QRect( 180, 55, 50, 20 ) ); | 124 | TextLabel3->setGeometry( QRect( 180, 55, 50, 20 ) ); |
129 | TextLabel3->setText( tr( "execute" ) ); | 125 | TextLabel3->setText( tr( "execute" ) ); |
130 | TextLabel3->setAlignment( int( QLabel::AlignBottom | QLabel::AlignHCenter ) ); | 126 | TextLabel3->setAlignment( int( QLabel::AlignBottom | QLabel::AlignHCenter ) ); |
131 | 127 | ||
132 | struct stat buf; | 128 | struct stat buf; |
133 | mode_t mode; | 129 | mode_t mode; |
134 | file = fileName; | 130 | file = fileName; |
135 | QFileInfo fi(file); | 131 | QFileInfo fi(file); |
136 | 132 | ||
137 | LineEdit1->setText( file); | 133 | LineEdit1->setText( file); |
138 | OwnerLineEdit->setText( fi.owner()); | 134 | OwnerLineEdit->setText( fi.owner()); |
139 | GroupLineEdit->setText( fi.group()); | 135 | GroupLineEdit->setText( fi.group()); |
140 | 136 | ||
141 | if( fi.permission( QFileInfo::ReadUser)) { CheckBox1->setChecked(true); } | 137 | if( fi.permission( QFileInfo::ReadUser)) { CheckBox1->setChecked(true); } |
142 | if( fi.permission( QFileInfo::WriteUser)) { CheckBox1_2->setChecked(true); } | 138 | if( fi.permission( QFileInfo::WriteUser)) { CheckBox1_2->setChecked(true); } |
143 | if( fi.permission( QFileInfo::ExeUser)) { CheckBox1_3->setChecked(true); } | 139 | if( fi.permission( QFileInfo::ExeUser)) { CheckBox1_3->setChecked(true); } |
144 | 140 | ||
145 | if( fi.permission( QFileInfo::ReadGroup)) { CheckBox1_4->setChecked(true); } | 141 | if( fi.permission( QFileInfo::ReadGroup)) { CheckBox1_4->setChecked(true); } |
146 | if( fi.permission( QFileInfo::WriteGroup)) { CheckBox1_5->setChecked(true); } | 142 | if( fi.permission( QFileInfo::WriteGroup)) { CheckBox1_5->setChecked(true); } |
147 | if( fi.permission( QFileInfo::ExeGroup)) { CheckBox1_6->setChecked(true); } | 143 | if( fi.permission( QFileInfo::ExeGroup)) { CheckBox1_6->setChecked(true); } |
148 | 144 | ||
149 | if( fi.permission( QFileInfo::ReadOther)) { CheckBox1_7->setChecked(true); } | 145 | if( fi.permission( QFileInfo::ReadOther)) { CheckBox1_7->setChecked(true); } |
150 | if( fi.permission( QFileInfo::WriteOther)) { CheckBox1_8->setChecked(true); } | 146 | if( fi.permission( QFileInfo::WriteOther)) { CheckBox1_8->setChecked(true); } |
151 | if( fi.permission( QFileInfo::ExeOther)) { CheckBox1_8_2->setChecked(true); } | 147 | if( fi.permission( QFileInfo::ExeOther)) { CheckBox1_8_2->setChecked(true); } |
152 | 148 | ||
153 | stat(file.latin1(), &buf); | 149 | stat(file.latin1(), &buf); |
154 | mode = buf.st_mode; | 150 | mode = buf.st_mode; |
155 | modeStr.sprintf("%#o", buf.st_mode & ~(S_IFMT) ); | 151 | modeStr.sprintf("%#o", buf.st_mode & ~(S_IFMT) ); |
156 | ModeLine->setText(modeStr); | 152 | ModeLine->setText(modeStr); |
157 | bool ok; | 153 | bool ok; |
158 | i_mode = modeStr.toInt(&ok,10); | 154 | i_mode = modeStr.toInt(&ok,10); |
159 | 155 | ||
160 | } | 156 | } |
161 | 157 | ||
162 | /* | 158 | /* |
163 | * Destroys the object and frees any allocated resources | 159 | * Destroys the object and frees any allocated resources |
164 | */ | 160 | */ |
165 | filePermissions::~filePermissions() | 161 | filePermissions::~filePermissions() |
166 | { | 162 | { |
167 | } | 163 | } |
168 | 164 | ||
169 | 165 | ||
170 | // might this be better as a callback routine??? | 166 | // might this be better as a callback routine??? |
171 | void filePermissions::ownReadCheck() { | 167 | void filePermissions::ownReadCheck() { |
172 | if(CheckBox1->isChecked()) { i_mode +=400; } | 168 | if(CheckBox1->isChecked()) { i_mode +=400; } |
173 | else i_mode -=400; | 169 | else i_mode -=400; |
174 | modeStr.sprintf("0%d",i_mode); | 170 | modeStr.sprintf("0%d",i_mode); |
@@ -239,36 +235,36 @@ void filePermissions::wrldExeCheck() { | |||
239 | ModeLine->setText(modeStr); | 235 | ModeLine->setText(modeStr); |
240 | // 0001 | 236 | // 0001 |
241 | } | 237 | } |
242 | 238 | ||
243 | void filePermissions::accept() { | 239 | void filePermissions::accept() { |
244 | 240 | ||
245 | QFileInfo fi(file); | 241 | QFileInfo fi(file); |
246 | struct passwd *pwd=0; | 242 | struct passwd *pwd=0; |
247 | struct group *grp=0; | 243 | struct group *grp=0; |
248 | pwd = getpwnam(OwnerLineEdit->text().latin1() ); | 244 | pwd = getpwnam(OwnerLineEdit->text().latin1() ); |
249 | if(pwd == NULL) { | 245 | if(pwd == NULL) { |
250 | perror("getpwnam"); | 246 | perror("getpwnam"); |
251 | QMessageBox::warning(this,"Warning","Error- no user"); | 247 | QMessageBox::warning(this,tr("Warning"),tr("Error- no user") ); |
252 | return; | 248 | return; |
253 | } else { | 249 | } else { |
254 | grp = getgrnam(GroupLineEdit->text().latin1()); | 250 | grp = getgrnam(GroupLineEdit->text().latin1()); |
255 | if(grp==NULL) { | 251 | if(grp==NULL) { |
256 | perror("getgrnam"); | 252 | perror("getgrnam"); |
257 | QMessageBox::warning(this,"Warning","Error- no group"); | 253 | QMessageBox::warning(this,tr("Warning"),tr("Error- no group")); |
258 | return; | 254 | return; |
259 | } | 255 | } |
260 | if( chown( file.latin1(), pwd->pw_uid, grp->gr_gid) <0) { | 256 | if( chown( file.latin1(), pwd->pw_uid, grp->gr_gid) <0) { |
261 | perror("chown"); | 257 | perror("chown"); |
262 | QMessageBox::warning(this,"Warning","Error setting ownership or group"); | 258 | QMessageBox::warning(this,tr("Warning"),tr("Error setting ownership or group") ); |
263 | return; | 259 | return; |
264 | } | 260 | } |
265 | bool ok; | 261 | bool ok; |
266 | uint moder = modeStr.toUInt(&ok,8); | 262 | uint moder = modeStr.toUInt(&ok,8); |
267 | if( chmod( file.latin1(), moder) < 0) { | 263 | if( chmod( file.latin1(), moder) < 0) { |
268 | perror("chmod"); | 264 | perror("chmod"); |
269 | QMessageBox::warning(this,"Warning","Error setting mode"); | 265 | QMessageBox::warning(this,tr("Warning"),tr("Error setting mode") ); |
270 | return; | 266 | return; |
271 | } | 267 | } |
272 | } | 268 | } |
273 | close(); | 269 | close(); |
274 | } | 270 | } |
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp index a0401e8..8cacc4a 100644 --- a/noncore/apps/advancedfm/main.cpp +++ b/noncore/apps/advancedfm/main.cpp | |||
@@ -2,28 +2,24 @@ | |||
2 | /*************************************************************************** | 2 | /*************************************************************************** |
3 | main.cpp - description | 3 | main.cpp - description |
4 | ------------------- | 4 | ------------------- |
5 | begin : March 10, 2002 | 5 | begin : March 10, 2002 |
6 | copyright : (C) 2002 by llornkcor | 6 | copyright : (C) 2002 by llornkcor |
7 | email : ljp@llornkcor.com | 7 | email : ljp@llornkcor.com |
8 | * This program is free software; you can redistribute it and/or modify * | 8 | * This program is free software; you can redistribute it and/or modify * |
9 | * it under the terms of the GNU General Public License as published by * | 9 | * it under the terms of the GNU General Public License as published by * |
10 | * the Free Software Foundation; either version 2 of the License, or * | 10 | * the Free Software Foundation; either version 2 of the License, or * |
11 | * (at your option) any later version. * | 11 | * (at your option) any later version. * |
12 | ***************************************************************************/ | 12 | ***************************************************************************/ |
13 | #include <qpe/qpeapplication.h> | 13 | #include <qpe/qpeapplication.h> |
14 | #include <qpe/qcopenvelope_qws.h> | ||
15 | #include <qpe/config.h> | ||
16 | #include <qstring.h> | ||
17 | #include <qstringlist.h> | ||
18 | 14 | ||
19 | 15 | ||
20 | 16 | ||
21 | #include "advancedfm.h" | 17 | #include "advancedfm.h" |
22 | 18 | ||
23 | int main(int argc, char *argv[]) | 19 | int main(int argc, char *argv[]) |
24 | { | 20 | { |
25 | QPEApplication a(argc, argv); | 21 | QPEApplication a(argc, argv); |
26 | 22 | ||
27 | AdvancedFm advencedFm; | 23 | AdvancedFm advencedFm; |
28 | a.showMainWidget( &advencedFm); | 24 | a.showMainWidget( &advencedFm); |
29 | return a.exec(); | 25 | return a.exec(); |
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control index f17c590..1e0f9ec 100644 --- a/noncore/apps/advancedfm/opie-advancedfm.control +++ b/noncore/apps/advancedfm/opie-advancedfm.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-advancedfm | 1 | Package: opie-advancedfm |
2 | Files: bin/advancedfm apps/Applications/advancedfm.desktop pics/advancedfm | 2 | Files: bin/advancedfm apps/Applications/advancedfm.desktop pics/advancedfm |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: L.J. Potter <ljp@llornkcor.com> | 5 | Maintainer: L.J. Potter <ljp@llornkcor.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
9 | Description: Advanced File Manager | 8 | Description: Advanced File Manager |
10 | The advanced file manager for the Opie environment. | 9 | The advanced file manager for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp index a60cea6..33abdfc 100644 --- a/noncore/apps/advancedfm/output.cpp +++ b/noncore/apps/advancedfm/output.cpp | |||
@@ -1,34 +1,28 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** outputEdit.cpp | 2 | ** outputEdit.cpp |
3 | ** | 3 | ** |
4 | ** Copyright: Fri Apr 12 15:12:58 2002 L.J. Potter <ljp@llornkcor.com> | 4 | ** Copyright: Fri Apr 12 15:12:58 2002 L.J. Potter <ljp@llornkcor.com> |
5 | ****************************************************************************/ | 5 | ****************************************************************************/ |
6 | #include "output.h" | 6 | #include "output.h" |
7 | 7 | ||
8 | #include <opie/oprocess.h> | 8 | #include <opie/oprocess.h> |
9 | 9 | ||
10 | #include <qpe/filemanager.h> | ||
11 | #include <qpe/qpeapplication.h> | 10 | #include <qpe/qpeapplication.h> |
12 | #include <qpe/applnk.h> | 11 | #include <qpe/applnk.h> |
13 | 12 | ||
14 | #include <qmessagebox.h> | ||
15 | #include <qstringlist.h> | ||
16 | #include <qfile.h> | 13 | #include <qfile.h> |
17 | #include <qcstring.h> | ||
18 | #include <qlineedit.h> | ||
19 | #include <qmultilineedit.h> | 14 | #include <qmultilineedit.h> |
20 | #include <qpushbutton.h> | 15 | #include <qpushbutton.h> |
21 | #include <qlayout.h> | 16 | #include <qlayout.h> |
22 | #include <qvariant.h> | ||
23 | 17 | ||
24 | #include <errno.h> | 18 | #include <errno.h> |
25 | 19 | ||
26 | /* XPM */ | 20 | /* XPM */ |
27 | static char * filesave_xpm[] = { | 21 | static char * filesave_xpm[] = { |
28 | "16 16 78 1", | 22 | "16 16 78 1", |
29 | " c None", | 23 | " c None", |
30 | ". c #343434", | 24 | ". c #343434", |
31 | "+ c #A0A0A0", | 25 | "+ c #A0A0A0", |
32 | "@ c #565656", | 26 | "@ c #565656", |
33 | "# c #9E9E9E", | 27 | "# c #9E9E9E", |
34 | "$ c #525252", | 28 | "$ c #525252", |
@@ -118,31 +112,31 @@ static char * filesave_xpm[] = { | |||
118 | "CzDEvEv;;DssF$ ", | 112 | "CzDEvEv;;DssF$ ", |
119 | "G.H{E{E{IxsJ$+ ", | 113 | "G.H{E{E{IxsJ$+ ", |
120 | " +...vEKxzLM ", | 114 | " +...vEKxzLM ", |
121 | " +...z]n$ ", | 115 | " +...z]n$ ", |
122 | " +... "}; | 116 | " +... "}; |
123 | 117 | ||
124 | Output::Output( const QStringList commands, QWidget* parent, const char* name, bool modal, WFlags fl) | 118 | Output::Output( const QStringList commands, QWidget* parent, const char* name, bool modal, WFlags fl) |
125 | : QDialog( parent, name, modal, fl ) | 119 | : QDialog( parent, name, modal, fl ) |
126 | { | 120 | { |
127 | QStringList cmmds; | 121 | QStringList cmmds; |
128 | // cmmds=QStringList::split( " ", commands, false); | 122 | // cmmds=QStringList::split( " ", commands, false); |
129 | cmmds=commands; | 123 | cmmds=commands; |
130 | // qDebug("count %d", cmmds.count()); | 124 | // qDebug("count %d", cmmds.count()); |
131 | if ( !name ) | 125 | if ( !name ) |
132 | setName( tr("Output")); | 126 | setName( tr("Output")); |
133 | resize( 196, 269 ); | 127 | resize( 196, 269 ); |
134 | setCaption( name ); | 128 | setCaption( name ); |
135 | 129 | ||
136 | OutputLayout = new QGridLayout( this ); | 130 | OutputLayout = new QGridLayout( this ); |
137 | OutputLayout->setSpacing( 2); | 131 | OutputLayout->setSpacing( 2); |
138 | OutputLayout->setMargin( 2); | 132 | OutputLayout->setMargin( 2); |
139 | 133 | ||
140 | QPushButton *docButton; | 134 | QPushButton *docButton; |
141 | docButton = new QPushButton( QPixmap(( const char** ) filesave_xpm ) ,"",this,"saveButton"); | 135 | docButton = new QPushButton( QPixmap(( const char** ) filesave_xpm ) ,"",this,"saveButton"); |
142 | docButton->setFixedSize( QSize( 20, 20 ) ); | 136 | docButton->setFixedSize( QSize( 20, 20 ) ); |
143 | connect( docButton,SIGNAL(released()),this,SLOT( saveOutput() )); | 137 | connect( docButton,SIGNAL(released()),this,SLOT( saveOutput() )); |
144 | // docButton->setFlat(TRUE); | 138 | // docButton->setFlat(TRUE); |
145 | OutputLayout->addMultiCellWidget( docButton, 0,0,3,3 ); | 139 | OutputLayout->addMultiCellWidget( docButton, 0,0,3,3 ); |
146 | 140 | ||
147 | OutputEdit = new QMultiLineEdit( this, "OutputEdit" ); | 141 | OutputEdit = new QMultiLineEdit( this, "OutputEdit" ); |
148 | OutputLayout->addMultiCellWidget( OutputEdit, 1,1,0,3 ); | 142 | OutputLayout->addMultiCellWidget( OutputEdit, 1,1,0,3 ); |
@@ -152,51 +146,51 @@ Output::Output( const QStringList commands, QWidget* parent, const char* name, | |||
152 | connect(proc, SIGNAL(processExited(OProcess *)), | 146 | connect(proc, SIGNAL(processExited(OProcess *)), |
153 | this, SLOT( processFinished())); | 147 | this, SLOT( processFinished())); |
154 | 148 | ||
155 | connect(proc, SIGNAL(receivedStdout(OProcess *, char *, int)), | 149 | connect(proc, SIGNAL(receivedStdout(OProcess *, char *, int)), |
156 | this, SLOT(commandStdout(OProcess *, char *, int))); | 150 | this, SLOT(commandStdout(OProcess *, char *, int))); |
157 | 151 | ||
158 | connect(proc, SIGNAL(receivedStderr(OProcess *, char *, int)), | 152 | connect(proc, SIGNAL(receivedStderr(OProcess *, char *, int)), |
159 | this, SLOT(commandStderr(OProcess *, char *, int))); | 153 | this, SLOT(commandStderr(OProcess *, char *, int))); |
160 | 154 | ||
161 | // connect( , SIGNAL(received(const QByteArray &)), | 155 | // connect( , SIGNAL(received(const QByteArray &)), |
162 | // this, SLOT(commandStdin(const QByteArray &))); | 156 | // this, SLOT(commandStdin(const QByteArray &))); |
163 | 157 | ||
164 | // * proc << commands.latin1(); | 158 | // * proc << commands.latin1(); |
165 | for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) { | 159 | for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) { |
166 | qDebug( "%s", (*it).latin1() ); | 160 | qDebug( "%s", (*it).latin1() ); |
167 | * proc << (*it).latin1(); | 161 | * proc << (*it).latin1(); |
168 | } | 162 | } |
169 | 163 | ||
170 | if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) { | 164 | if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) { |
171 | 165 | ||
172 | OutputEdit->append("Process could not start"); | 166 | OutputEdit->append(tr("Process could not start") ); |
173 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 167 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
174 | perror("Error: "); | 168 | perror("Error: "); |
175 | QString errorMsg="Error\n"+(QString)strerror(errno); | 169 | QString errorMsg=tr("Error\n")+(QString)strerror(errno); |
176 | OutputEdit->append( errorMsg); | 170 | OutputEdit->append( errorMsg); |
177 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 171 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
178 | } | 172 | } |
179 | } | 173 | } |
180 | 174 | ||
181 | Output::~Output() { | 175 | Output::~Output() { |
182 | } | 176 | } |
183 | 177 | ||
184 | void Output::saveOutput() { | 178 | void Output::saveOutput() { |
185 | 179 | ||
186 | InputDialog *fileDlg; | 180 | InputDialog *fileDlg; |
187 | fileDlg = new InputDialog(this,tr("Save output to file (name only)"),TRUE, 0); | 181 | fileDlg = new InputDialog(this,tr("Save output to file (name only)"),TRUE, 0); |
188 | fileDlg->exec(); | 182 | fileDlg->exec(); |
189 | if( fileDlg->result() == 1 ) { | 183 | if( fileDlg->result() == 1 ) { |
190 | QString filename = QPEApplication::documentDir(); | 184 | QString filename = QPEApplication::documentDir(); |
191 | if(filename.right(1).find('/') == -1) | 185 | if(filename.right(1).find('/') == -1) |
192 | filename+="/"; | 186 | filename+="/"; |
193 | QString name = fileDlg->LineEdit1->text(); | 187 | QString name = fileDlg->LineEdit1->text(); |
194 | filename+="text/plain/"+name; | 188 | filename+="text/plain/"+name; |
195 | qDebug(filename); | 189 | qDebug(filename); |
196 | 190 | ||
197 | QFile f(filename); | 191 | QFile f(filename); |
198 | f.open( IO_WriteOnly); | 192 | f.open( IO_WriteOnly); |
199 | if( f.writeBlock( OutputEdit->text(), qstrlen( OutputEdit->text()) ) != -1) { | 193 | if( f.writeBlock( OutputEdit->text(), qstrlen( OutputEdit->text()) ) != -1) { |
200 | DocLnk lnk; | 194 | DocLnk lnk; |
201 | lnk.setName(name); //sets file name | 195 | lnk.setName(name); //sets file name |
202 | lnk.setFile(filename); //sets File property | 196 | lnk.setFile(filename); //sets File property |
@@ -236,39 +230,39 @@ void Output::commandStdin( const QByteArray &data) { | |||
236 | void Output::commandStderr(OProcess*, char *buffer, int buflen) { | 230 | void Output::commandStderr(OProcess*, char *buffer, int buflen) { |
237 | qWarning("received stderrt %d bytes", buflen); | 231 | qWarning("received stderrt %d bytes", buflen); |
238 | 232 | ||
239 | QString lineStr = buffer; | 233 | QString lineStr = buffer; |
240 | // lineStr=lineStr.left(lineStr.length()-1); | 234 | // lineStr=lineStr.left(lineStr.length()-1); |
241 | OutputEdit->append(lineStr); | 235 | OutputEdit->append(lineStr); |
242 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 236 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
243 | } | 237 | } |
244 | 238 | ||
245 | void Output::processFinished() { | 239 | void Output::processFinished() { |
246 | 240 | ||
247 | delete proc; | 241 | delete proc; |
248 | OutputEdit->append( "\nFinished\n"); | 242 | OutputEdit->append( tr("\nFinished\n") ); |
249 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 243 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
250 | // close(); | 244 | // close(); |
251 | // disconnect( layer(), SIGNAL(received(const QByteArray &)), | 245 | // disconnect( layer(), SIGNAL(received(const QByteArray &)), |
252 | // this, SLOT(commandStdin(const QByteArray &))); | 246 | // this, SLOT(commandStdin(const QByteArray &))); |
253 | } | 247 | } |
254 | 248 | ||
255 | //============================== | 249 | //============================== |
256 | 250 | ||
257 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 251 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |
258 | : QDialog( parent, name, modal, fl ) | 252 | : QDialog( parent, name, modal, fl ) |
259 | { | 253 | { |
260 | if ( !name ) | 254 | if ( !name ) |
261 | setName( "InputDialog" ); | 255 | setName( "InputDialog" ); |
262 | resize( 234, 50 ); | 256 | resize( 234, 50 ); |
263 | setMaximumSize( QSize( 240, 50 ) ); | 257 | setMaximumSize( QSize( 240, 50 ) ); |
264 | setCaption( tr(name ) ); | 258 | setCaption( tr(name ) ); |
265 | 259 | ||
266 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); | 260 | LineEdit1 = new QLineEdit( this, "LineEdit1" ); |
267 | LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) ); | 261 | LineEdit1->setGeometry( QRect( 10, 10, 216, 22 ) ); |
268 | LineEdit1->setFocus(); | 262 | LineEdit1->setFocus(); |
269 | LineEdit1->setFocus(); | 263 | LineEdit1->setFocus(); |
270 | connect(LineEdit1,SIGNAL(returnPressed()),this,SLOT(returned() )); | 264 | connect(LineEdit1,SIGNAL(returnPressed()),this,SLOT(returned() )); |
271 | } | 265 | } |
272 | 266 | ||
273 | InputDialog::~InputDialog() { | 267 | InputDialog::~InputDialog() { |
274 | inputText = LineEdit1->text(); | 268 | inputText = LineEdit1->text(); |