summaryrefslogtreecommitdiff
path: root/noncore/settings/packagemanager/installdlg.cpp
Unidiff
Diffstat (limited to 'noncore/settings/packagemanager/installdlg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/installdlg.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 0c2ea78..aedd972 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -24,49 +24,49 @@
24    --        :-=` Free Software Foundation, Inc., 24    --        :-=` Free Software Foundation, Inc.,
25 59 Temple Place - Suite 330, 25 59 Temple Place - Suite 330,
26 Boston, MA 02111-1307, USA. 26 Boston, MA 02111-1307, USA.
27 27
28*/ 28*/
29 29
30#include "installdlg.h" 30#include "installdlg.h"
31 31
32#include <sys/vfs.h> 32#include <sys/vfs.h>
33 33
34#include <qapplication.h> 34#include <qapplication.h>
35#include <qcombobox.h> 35#include <qcombobox.h>
36#include <qfileinfo.h> 36#include <qfileinfo.h>
37#include <qgroupbox.h> 37#include <qgroupbox.h>
38#include <qlabel.h> 38#include <qlabel.h>
39#include <qlayout.h> 39#include <qlayout.h>
40#include <qmap.h> 40#include <qmap.h>
41#include <qmultilineedit.h> 41#include <qmultilineedit.h>
42#include <qpushbutton.h> 42#include <qpushbutton.h>
43 43
44#include <qpe/fileselector.h> 44#include <qpe/fileselector.h>
45#include <qpe/resource.h> 45#include <qpe/resource.h>
46#include <qpe/storage.h> 46#include <qpe/storage.h>
47 47
48#include <opie/ofiledialog.h> 48#include <opie2/ofiledialog.h>
49 49
50#include "opackagemanager.h" 50#include "opackagemanager.h"
51 51
52InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo, 52InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
53 OPackage::Command command1, QStringList *packages1, 53 OPackage::Command command1, QStringList *packages1,
54 OPackage::Command command2, QStringList *packages2, 54 OPackage::Command command2, QStringList *packages2,
55 OPackage::Command command3, QStringList *packages3 ) 55 OPackage::Command command3, QStringList *packages3 )
56 : QWidget( 0x0 ) 56 : QWidget( 0x0 )
57 , m_packman( pm ) 57 , m_packman( pm )
58 , m_numCommands( 0 ) 58 , m_numCommands( 0 )
59 , m_currCommand( 0 ) 59 , m_currCommand( 0 )
60{ 60{
61 // Save command/package list information 61 // Save command/package list information
62 if ( command1 != OPackage::NotDefined ) 62 if ( command1 != OPackage::NotDefined )
63 { 63 {
64 m_command[ m_numCommands ] = command1; 64 m_command[ m_numCommands ] = command1;
65 m_packages[ m_numCommands ] = packages1; 65 m_packages[ m_numCommands ] = packages1;
66 ++m_numCommands; 66 ++m_numCommands;
67 } 67 }
68 if ( command2 != OPackage::NotDefined ) 68 if ( command2 != OPackage::NotDefined )
69 { 69 {
70 m_command[ m_numCommands ] = command2; 70 m_command[ m_numCommands ] = command2;
71 m_packages[ m_numCommands ] = packages2; 71 m_packages[ m_numCommands ] = packages2;
72 ++m_numCommands; 72 ++m_numCommands;
@@ -254,48 +254,48 @@ void InstallDlg::slotBtnStart()
254 m_btnOptions->setEnabled( true ); 254 m_btnOptions->setEnabled( true );
255 m_btnOptions->setText( tr( "Save output" ) ); 255 m_btnOptions->setText( tr( "Save output" ) );
256 m_btnOptions->setIconSet( Resource::loadPixmap( "save" ) ); 256 m_btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
257} 257}
258 258
259void InstallDlg::slotBtnOptions() 259void InstallDlg::slotBtnOptions()
260{ 260{
261 QString btnText = m_btnOptions->text(); 261 QString btnText = m_btnOptions->text();
262 if ( btnText == tr( "Options" ) ) 262 if ( btnText == tr( "Options" ) )
263 { 263 {
264 // Display configuration dialog (only options tab is enabled) 264 // Display configuration dialog (only options tab is enabled)
265 m_packman->configureDlg( true ); 265 m_packman->configureDlg( true );
266 return; 266 return;
267 } 267 }
268 268
269 // Save output was clicked 269 // Save output was clicked
270 QMap<QString, QStringList> map; 270 QMap<QString, QStringList> map;
271 map.insert( tr( "All" ), QStringList() ); 271 map.insert( tr( "All" ), QStringList() );
272 QStringList text; 272 QStringList text;
273 text << "text/*"; 273 text << "text/*";
274 map.insert(tr( "Text" ), text ); 274 map.insert(tr( "Text" ), text );
275 text << "*"; 275 text << "*";
276 map.insert( tr( "All" ), text ); 276 map.insert( tr( "All" ), text );
277 277
278 QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); 278 QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
279 if( !filename.isEmpty() ) 279 if( !filename.isEmpty() )
280 { 280 {
281 QString currentFileName = QFileInfo( filename ).fileName(); 281 QString currentFileName = QFileInfo( filename ).fileName();
282 DocLnk doc; 282 DocLnk doc;
283 doc.setType( "text/plain" ); 283 doc.setType( "text/plain" );
284 doc.setFile( filename ); 284 doc.setFile( filename );
285 doc.setName( currentFileName ); 285 doc.setName( currentFileName );
286 FileManager fm; 286 FileManager fm;
287 fm.saveFile( doc, m_output->text() ); 287 fm.saveFile( doc, m_output->text() );
288 } 288 }
289} 289}
290 290
291void InstallDlg::slotOutput( char *msg ) 291void InstallDlg::slotOutput( char *msg )
292{ 292{
293 // Allow processing of other events 293 // Allow processing of other events
294 qApp->processEvents(); 294 qApp->processEvents();
295 295
296 QString lineStr = msg; 296 QString lineStr = msg;
297 if ( lineStr[lineStr.length()-1] == '\n' ) 297 if ( lineStr[lineStr.length()-1] == '\n' )
298 lineStr.truncate( lineStr.length() - 1 ); 298 lineStr.truncate( lineStr.length() - 1 );
299 m_output->append( lineStr ); 299 m_output->append( lineStr );
300 m_output->setCursorPosition( m_output->numLines(), 0 ); 300 m_output->setCursorPosition( m_output->numLines(), 0 );
301} 301}