summaryrefslogtreecommitdiff
path: root/noncore/apps
Unidiff
Diffstat (limited to 'noncore/apps') (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/odict/eng_ita.dic2
-rw-r--r--noncore/apps/opie-console/filereceive.cpp2
-rw-r--r--noncore/apps/opie-console/filetransfer.cpp2
3 files changed, 2 insertions, 4 deletions
diff --git a/noncore/apps/odict/eng_ita.dic b/noncore/apps/odict/eng_ita.dic
index f338faa..6db2389 100644
--- a/noncore/apps/odict/eng_ita.dic
+++ b/noncore/apps/odict/eng_ita.dic
@@ -10555,97 +10555,96 @@ sinks\abbassa
10555sinned\peccato 10555sinned\peccato
10556sinner\peccatore 10556sinner\peccatore
10557sins\peccati 10557sins\peccati
10558sinuous\contorto 10558sinuous\contorto
10559sip\sorso 10559sip\sorso
10560sir\signore 10560sir\signore
10561sire\testimoniare 10561sire\testimoniare
10562sirloin\lonza 10562sirloin\lonza
10563sissy\effeminato 10563sissy\effeminato
10564sister\sorella 10564sister\sorella
10565sister in law\cognata 10565sister in law\cognata
10566sit\star seduto 10566sit\star seduto
10567sit down\accomodarsi 10567sit down\accomodarsi
10568site\posto, circostanza 10568site\posto, circostanza
10569site of crime\luogo del fatto 10569site of crime\luogo del fatto
10570sits\siede 10570sits\siede
10571sitting\seduto 10571sitting\seduto
10572sitting room\salotto 10572sitting room\salotto
10573situate\allineare, mettere, mettere 10573situate\allineare, mettere, mettere
10574situated\posto 10574situated\posto
10575situation\situazione, posizione, circostanza 10575situation\situazione, posizione, circostanza
10576six\sei 10576six\sei
10577sixfold\sestuplo 10577sixfold\sestuplo
10578sixteen\sedici 10578sixteen\sedici
10579sixteenth\sedicesimo, sedicesima 10579sixteenth\sedicesimo, sedicesima
10580sixth\sesto, sesta 10580sixth\sesto, sesta
10581sixty\sessanta 10581sixty\sessanta
10582size\grossezza 10582size\grossezza
10583size of shoe\numero di scarpa 10583size of shoe\numero di scarpa
10584sizzle\grillare 10584sizzle\grillare
10585skating\pattinaggio artistico 10585skating\pattinaggio artistico
10586skating ring\pista di ghiaccio 10586skating ring\pista di ghiaccio
10587skating rink\pista di ghiaccio 10587skating rink\pista di ghiaccio
10588skein\capestro 10588skein\capestro
10589skeins\capestri 10589skeins\capestri
10590skeleton\scheletro 10590skeleton\scheletro
10591skeletons\scheletri 10591skeletons\scheletri
10592skepticalness\scetticismo 10592skepticalness\scetticismo
10593skepticism\scetticismo 10593skepticism\scetticismo
10594sketch\abbozzo, abbozzare 10594sketch\abbozzo, abbozzare
10595sketchily\volatile, abbozzaticcio, superficiale 10595sketchily\volatile, abbozzaticcio, superficiale
10596sketchiness\poca chiarezza 10596sketchiness\poca chiarezza
10597sketchy\torbido 10597sketchy\torbido
10598skews\storto 10598skews\storto
10599ski\sci 10599ski\sci
10600skid\discesa a valle, avventare 10600skid\discesa a valle, avventare
10601skiful\esperto 10601skiful\esperto
10602skilful\apprèndere, azzeccato 10602skilful\apprèndere, azzeccato
10603skilfull\apprèndere
10604skill\sorte, disinvoltura 10603skill\sorte, disinvoltura
10605skilled\versato 10604skilled\versato
10606skilled worker\operaio specializzato 10605skilled worker\operaio specializzato
10607skillet\tegame 10606skillet\tegame
10608skillful\lesto, sveglio, esperto 10607skillful\lesto, sveglio, esperto
10609skillfulness\disinvoltura 10608skillfulness\disinvoltura
10610skimp\lesinare 10609skimp\lesinare
10611skimpiest\piccolissimo 10610skimpiest\piccolissimo
10612skimpily\scarso 10611skimpily\scarso
10613skimpiness\strettezza 10612skimpiness\strettezza
10614skimpy\scarso 10613skimpy\scarso
10615skin\epidèrmide, epidermide 10614skin\epidèrmide, epidermide
10616skinny\scremato, magro, secco 10615skinny\scremato, magro, secco
10617skins\pelli, pelli 10616skins\pelli, pelli
10618skip\saltellare, lancio 10617skip\saltellare, lancio
10619skipper\marinaio 10618skipper\marinaio
10620skirt\gonna 10619skirt\gonna
10621skirting board\battiscopa 10620skirting board\battiscopa
10622skit\satira 10621skit\satira
10623skittle\birillo 10622skittle\birillo
10624skittle alley\gioco dei birilli 10623skittle alley\gioco dei birilli
10625skivvy\biancherìa ìntima 10624skivvy\biancherìa ìntima
10626skulker\lima sorda 10625skulker\lima sorda
10627skunk\puzzola 10626skunk\puzzola
10628sky\cielo 10627sky\cielo
10629skylark\lodola 10628skylark\lodola
10630skyrocket\razzo 10629skyrocket\razzo
10631skyscraper\grattacielo, grattacielo 10630skyscraper\grattacielo, grattacielo
10632skyscrapers\grattacielo 10631skyscrapers\grattacielo
10633slab\frantumare 10632slab\frantumare
10634slack\lasco, floscio 10633slack\lasco, floscio
10635slack joint\contatto lasco 10634slack joint\contatto lasco
10636slack period\ristagno 10635slack period\ristagno
10637slacken\rilassare, rilassare 10636slacken\rilassare, rilassare
10638slackens\rilassato 10637slackens\rilassato
10639slacker\scansafatiche 10638slacker\scansafatiche
10640slacks\pantaloni 10639slacks\pantaloni
10641slake\allattamento 10640slake\allattamento
10642slam\sbattere 10641slam\sbattere
10643slammed\sbattuto 10642slammed\sbattuto
10644slander\calunniare 10643slander\calunniare
10645slanderer\calunniatore 10644slanderer\calunniatore
10646slanderous\calunnioso 10645slanderous\calunnioso
10647slanderousness\calunnia 10646slanderousness\calunnia
10648slant\declinazione 10647slant\declinazione
10649slanting\obliquo, obliquo 10648slanting\obliquo, obliquo
10650slantingly\obliqua 10649slantingly\obliqua
10651slap\picchiare, ceffone 10650slap\picchiare, ceffone
@@ -12604,97 +12603,96 @@ unwounded\illeso
12604unwrought\grezzo 12603unwrought\grezzo
12605up\sù, a, sù, sù 12604up\sù, a, sù, sù
12606up above\sù 12605up above\sù
12607up there\lassù 12606up there\lassù
12608upbraiding\rimprovero 12607upbraiding\rimprovero
12609upbringing\creanza 12608upbringing\creanza
12610upchuck\vòmito 12609upchuck\vòmito
12611upcoming\prossimamente 12610upcoming\prossimamente
12612upgrade\estensione, ampliare 12611upgrade\estensione, ampliare
12613upgrades\trasportato 12612upgrades\trasportato
12614upgrading\estensione 12613upgrading\estensione
12615upheaval\elevamento 12614upheaval\elevamento
12616uphold\durare 12615uphold\durare
12617upholster\imbottire 12616upholster\imbottire
12618upholsterer\tappezziere 12617upholsterer\tappezziere
12619upkeep\manutenzione 12618upkeep\manutenzione
12620uplift\esaltare 12619uplift\esaltare
12621uplifting\alzante 12620uplifting\alzante
12622upon\a 12621upon\a
12623upper arm\braccio superiore 12622upper arm\braccio superiore
12624upper case character\lettera maiuscola 12623upper case character\lettera maiuscola
12625uppish\impettito 12624uppish\impettito
12626uppity\baldanzoso 12625uppity\baldanzoso
12627upraise\esaltare 12626upraise\esaltare
12628upraising\alzante 12627upraising\alzante
12629upright\pari, verticale 12628upright\pari, verticale
12630uprise\levarsi 12629uprise\levarsi
12631uproar\eccitazione 12630uproar\eccitazione
12632uproariously\liuto 12631uproariously\liuto
12633upshot\risultato 12632upshot\risultato
12634upstage\arrivista 12633upstage\arrivista
12635upstairs\in alto, sù 12634upstairs\in alto, sù
12636upturn\incremento 12635upturn\incremento
12637upwards\sù 12636upwards\sù
12638uranium\uranio 12637uranium\uranio
12639urban\urbano 12638urban\urbano
12640urge\premura, incoraggiare 12639urge\premura, incoraggiare
12641urgency\urgenza 12640urgency\urgenza
12642urgent\urgente, legante 12641urgent\urgente, legante
12643urine\orina, uroscopia 12642urine\orina, uroscopia
12644urn\urna 12643urn\urna
12645us\noi, a noi 12644us\noi, a noi
12646usable\usabile 12645usable\usabile
12647usage\uso 12646usage\uso
12648use\uso, adoperare 12647use\uso, adoperare
12649use up\esaurire 12648use up\esaurire
12650used\usato 12649used\usato
12651useful\utile 12650useful\utile
12652usefull\utile
12653useless\inutile, disùtile, inservibile 12651useless\inutile, disùtile, inservibile
12654user\utente 12652user\utente
12655uses\usato 12653uses\usato
12656usual\usuale, ordinario 12654usual\usuale, ordinario
12657usually\ordinario 12655usually\ordinario
12658usuries\usura 12656usuries\usura
12659usury\usura 12657usury\usura
12660Utopian\utopico 12658Utopian\utopico
12661utter\estrinsecare 12659utter\estrinsecare
12662vacant\vacante 12660vacant\vacante
12663vacation\vacanze, ferie 12661vacation\vacanze, ferie
12664vaccinate\vaccinare 12662vaccinate\vaccinare
12665vaccination\vaccinazione 12663vaccination\vaccinazione
12666vaccine\vaccino 12664vaccine\vaccino
12667vacuum\vuotaggine 12665vacuum\vuotaggine
12668vacuum cleaner\aspirapòlvere 12666vacuum cleaner\aspirapòlvere
12669vagabond\vagabondaggio 12667vagabond\vagabondaggio
12670vagina\fòdero 12668vagina\fòdero
12671vailable\disponìbile 12669vailable\disponìbile
12672vain\vano 12670vain\vano
12673valerian\valeriana 12671valerian\valeriana
12674valid\valevole 12672valid\valevole
12675validity\validità 12673validity\validità
12676validness\validità 12674validness\validità
12677valley\valle 12675valley\valle
12678valorize\valorizzare 12676valorize\valorizzare
12679valse\valzer 12677valse\valzer
12680valuable\pregiato 12678valuable\pregiato
12681valuables\valori 12679valuables\valori
12682value\valutare, valore 12680value\valutare, valore
12683valuejudgment\valutazione 12681valuejudgment\valutazione
12684valve\valvola, valvola 12682valve\valvola, valvola
12685vanguard\avanguardia 12683vanguard\avanguardia
12686vanilla\vainiglia 12684vanilla\vainiglia
12687vanish\scomparire 12685vanish\scomparire
12688vanity\fatuità 12686vanity\fatuità
12689vaporizer\vaporizzatore 12687vaporizer\vaporizzatore
12690vapors\evaporazione 12688vapors\evaporazione
12691vapour\vapore 12689vapour\vapore
12692variable\variàbile 12690variable\variàbile
12693variance\contrarietà 12691variance\contrarietà
12694variation\aberrazione 12692variation\aberrazione
12695varicosity\varice 12693varicosity\varice
12696various\differente 12694various\differente
12697variousness\varietà 12695variousness\varietà
12698varnish\vernice 12696varnish\vernice
12699vary\variare 12697vary\variare
12700vascular\recipiente 12698vascular\recipiente
diff --git a/noncore/apps/opie-console/filereceive.cpp b/noncore/apps/opie-console/filereceive.cpp
index e387273..452be60 100644
--- a/noncore/apps/opie-console/filereceive.cpp
+++ b/noncore/apps/opie-console/filereceive.cpp
@@ -75,88 +75,88 @@ void FileReceive::receive( const QString& dir ) {
75 char resultByte; int len; 75 char resultByte; int len;
76 len = read(m_info[0], &resultByte, 1 ); 76 len = read(m_info[0], &resultByte, 1 );
77 /* len == 1 start up failed */ 77 /* len == 1 start up failed */
78 if ( len == 1 ) { 78 if ( len == 1 ) {
79 emit error( StartError, tr("Could not start") ); 79 emit error( StartError, tr("Could not start") );
80 return; 80 return;
81 } 81 }
82 if ( len == -1 ) 82 if ( len == -1 )
83 if ( (errno == ECHILD ) || (errno == EINTR ) ) 83 if ( (errno == ECHILD ) || (errno == EINTR ) )
84 continue; 84 continue;
85 85
86 // len == 0 or something like this 86 // len == 0 or something like this
87 break; 87 break;
88 } 88 }
89 89
90 if ( m_info[0] ) 90 if ( m_info[0] )
91 close( m_info[0] ); 91 close( m_info[0] );
92 92
93 m_not = new QSocketNotifier(m_comm[0], QSocketNotifier::Read ); 93 m_not = new QSocketNotifier(m_comm[0], QSocketNotifier::Read );
94 connect(m_not, SIGNAL(activated(int) ), 94 connect(m_not, SIGNAL(activated(int) ),
95 this, SLOT(slotRead() ) ); 95 this, SLOT(slotRead() ) );
96 if ( pipe(m_term) < 0 ) 96 if ( pipe(m_term) < 0 )
97 m_term[0] = m_term[1] = 0; 97 m_term[0] = m_term[1] = 0;
98 98
99 ProcCtl::self()->add(m_pid, m_term[1] ); 99 ProcCtl::self()->add(m_pid, m_term[1] );
100 m_proc = new QSocketNotifier(m_term[0], QSocketNotifier::Read ); 100 m_proc = new QSocketNotifier(m_term[0], QSocketNotifier::Read );
101 connect(m_proc, SIGNAL(activated(int) ), 101 connect(m_proc, SIGNAL(activated(int) ),
102 this, SLOT(slotExec() ) ); 102 this, SLOT(slotExec() ) );
103 103
104 } 104 }
105 break; 105 break;
106 106
107 } 107 }
108 108
109} 109}
110void FileReceive::cancel() { 110void FileReceive::cancel() {
111 ::kill(m_pid, 9 ); 111 ::kill(m_pid, 9 );
112} 112}
113void FileReceive::setupChild() { 113void FileReceive::setupChild() {
114 changeDir( currentDir() ); 114 changeDir( currentDir() );
115 /* 115 /*
116 * we do not want to read from our 116 * we do not want to read from our
117 * information channel 117 * information channel
118 */ 118 */
119 if (m_info[0] ) 119 if (m_info[0] )
120 close(m_info[0] ); 120 close(m_info[0] );
121 /* 121 /*
122 * FD_CLOEXEC will close the 122 * FD_CLOEXEC will close the
123 * fd on successfull exec 123 * fd on successful exec
124 */ 124 */
125 if (m_info[1] ) 125 if (m_info[1] )
126 fcntl(m_info[1], F_SETFD, FD_CLOEXEC ); 126 fcntl(m_info[1], F_SETFD, FD_CLOEXEC );
127 127
128 if (m_comm[0] ) 128 if (m_comm[0] )
129 close( m_comm[0] ); 129 close( m_comm[0] );
130 /* 130 /*
131 * now set the communication 131 * now set the communication
132 * m_fd STDIN_FILENO 132 * m_fd STDIN_FILENO
133 * STDOUT_FILENO 133 * STDOUT_FILENO
134 * STDERR_FILENO 134 * STDERR_FILENO
135 */ 135 */
136 dup2( m_fd, STDIN_FILENO ); 136 dup2( m_fd, STDIN_FILENO );
137 dup2( m_fd, STDOUT_FILENO ); 137 dup2( m_fd, STDOUT_FILENO );
138 dup2( m_comm[1], STDERR_FILENO ); 138 dup2( m_comm[1], STDERR_FILENO );
139} 139}
140void FileReceive::slotRead() { 140void FileReceive::slotRead() {
141 QByteArray ar(4096); 141 QByteArray ar(4096);
142 int len = read(m_comm[0], ar.data(), 4096 ); 142 int len = read(m_comm[0], ar.data(), 4096 );
143 for (int i = 0; i < len; i++ ) { 143 for (int i = 0; i < len; i++ ) {
144 // printf("%c", ar[i] ); 144 // printf("%c", ar[i] );
145 } 145 }
146 ar.resize( len ); 146 ar.resize( len );
147 QString str( ar ); 147 QString str( ar );
148} 148}
149void FileReceive::slotExec() { 149void FileReceive::slotExec() {
150 char buf[2]; 150 char buf[2];
151 ::read(m_term[0], buf, 1 ); 151 ::read(m_term[0], buf, 1 );
152 delete m_proc; 152 delete m_proc;
153 delete m_not; 153 delete m_not;
154 m_not = m_proc = 0l; 154 m_not = m_proc = 0l;
155 close( m_term[0] ); 155 close( m_term[0] );
156 close( m_term[1] ); 156 close( m_term[1] );
157 close( m_comm[0] ); 157 close( m_comm[0] );
158 close( m_comm[1] ); 158 close( m_comm[1] );
159 layer()->closeRawIO(m_fd); 159 layer()->closeRawIO(m_fd);
160 emit received(QString::null); 160 emit received(QString::null);
161 161
162} 162}
diff --git a/noncore/apps/opie-console/filetransfer.cpp b/noncore/apps/opie-console/filetransfer.cpp
index 221838c..5144941 100644
--- a/noncore/apps/opie-console/filetransfer.cpp
+++ b/noncore/apps/opie-console/filetransfer.cpp
@@ -96,97 +96,97 @@ void FileTransfer::sendFile( const QString& file ) {
96 if ( len == -1 ) 96 if ( len == -1 )
97 if ( (errno == ECHILD ) || (errno == EINTR ) ) 97 if ( (errno == ECHILD ) || (errno == EINTR ) )
98 continue; 98 continue;
99 99
100 // len == 0 or something like this 100 // len == 0 or something like this
101 break; 101 break;
102 } 102 }
103 if ( m_info[0] ) 103 if ( m_info[0] )
104 close( m_info[0] ); 104 close( m_info[0] );
105 105
106 106
107 107
108 /* replace by QSocketNotifier!!! */ 108 /* replace by QSocketNotifier!!! */
109 m_not = new QSocketNotifier(m_comm[0], QSocketNotifier::Read ); 109 m_not = new QSocketNotifier(m_comm[0], QSocketNotifier::Read );
110 connect(m_not, SIGNAL(activated(int) ), 110 connect(m_not, SIGNAL(activated(int) ),
111 this, SLOT(slotRead() ) ); 111 this, SLOT(slotRead() ) );
112 if ( pipe(m_term) < 0 ) 112 if ( pipe(m_term) < 0 )
113 m_term[0] = m_term[1] = 0; 113 m_term[0] = m_term[1] = 0;
114 114
115 ProcCtl::self()->add(m_pid, m_term[1] ); 115 ProcCtl::self()->add(m_pid, m_term[1] );
116 m_proc = new QSocketNotifier(m_term[0], QSocketNotifier::Read ); 116 m_proc = new QSocketNotifier(m_term[0], QSocketNotifier::Read );
117 connect(m_proc, SIGNAL(activated(int) ), 117 connect(m_proc, SIGNAL(activated(int) ),
118 this, SLOT(slotExec() ) ); 118 this, SLOT(slotExec() ) );
119 119
120 } 120 }
121 break; 121 break;
122 } 122 }
123} 123}
124/* 124/*
125 * let's call the one with the filename 125 * let's call the one with the filename
126 */ 126 */
127void FileTransfer::sendFile( const QFile& file ) { 127void FileTransfer::sendFile( const QFile& file ) {
128 sendFile( file.name() ); 128 sendFile( file.name() );
129} 129}
130 130
131/* 131/*
132 * setting up communication 132 * setting up communication
133 * between parent child and ioLayer 133 * between parent child and ioLayer
134 */ 134 */
135void FileTransfer::setupChild() { 135void FileTransfer::setupChild() {
136 /* 136 /*
137 * we do not want to read from our 137 * we do not want to read from our
138 * information channel 138 * information channel
139 */ 139 */
140 if (m_info[0] ) 140 if (m_info[0] )
141 close(m_info[0] ); 141 close(m_info[0] );
142 /* 142 /*
143 * FD_CLOEXEC will close the 143 * FD_CLOEXEC will close the
144 * fd on successfull exec 144 * fd on successful exec
145 */ 145 */
146 if (m_info[1] ) 146 if (m_info[1] )
147 fcntl(m_info[1], F_SETFD, FD_CLOEXEC ); 147 fcntl(m_info[1], F_SETFD, FD_CLOEXEC );
148 148
149 if (m_comm[0] ) 149 if (m_comm[0] )
150 close( m_comm[0] ); 150 close( m_comm[0] );
151 /* 151 /*
152 * now set the communication 152 * now set the communication
153 * m_fd STDIN_FILENO 153 * m_fd STDIN_FILENO
154 * STDOUT_FILENO 154 * STDOUT_FILENO
155 * STDERR_FILENO 155 * STDERR_FILENO
156 */ 156 */
157 dup2( m_fd, STDIN_FILENO ); 157 dup2( m_fd, STDIN_FILENO );
158 dup2( m_fd, STDOUT_FILENO ); 158 dup2( m_fd, STDOUT_FILENO );
159 dup2( m_comm[1], STDERR_FILENO ); 159 dup2( m_comm[1], STDERR_FILENO );
160} 160}
161 161
162/* 162/*
163 * read from the stderr of the child 163 * read from the stderr of the child
164 * process 164 * process
165 */ 165 */
166void FileTransfer::slotRead() { 166void FileTransfer::slotRead() {
167 QByteArray ar(4096); 167 QByteArray ar(4096);
168 int len = read(m_comm[0], ar.data(), 4096 ); 168 int len = read(m_comm[0], ar.data(), 4096 );
169 for (int i = 0; i < len; i++ ) { 169 for (int i = 0; i < len; i++ ) {
170 // printf("%c", ar[i] ); 170 // printf("%c", ar[i] );
171 } 171 }
172 ar.resize( len ); 172 ar.resize( len );
173 QString str( ar ); 173 QString str( ar );
174 QStringList lis = QStringList::split(' ', str ); 174 QStringList lis = QStringList::split(' ', str );
175 /* 175 /*
176 * Transfer finished.. either complete or incomplete 176 * Transfer finished.. either complete or incomplete
177 */ 177 */
178 if ( lis[0].simplifyWhiteSpace() == "Transfer" ) { 178 if ( lis[0].simplifyWhiteSpace() == "Transfer" ) {
179 return; 179 return;
180 } 180 }
181 /* 181 /*
182 * do progress reading 182 * do progress reading
183 */ 183 */
184 slotProgress( lis ); 184 slotProgress( lis );
185 185
186 186
187} 187}
188/* 188/*
189 * find the progress 189 * find the progress
190 */ 190 */
191void FileTransfer::slotProgress( const QStringList& list ) { 191void FileTransfer::slotProgress( const QStringList& list ) {
192 if ( m_type != SZ ) 192 if ( m_type != SZ )