1 ===================================================================
2 RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.cpp,v
3 retrieving revision 1.23
4 diff -u -u -r1.23 oipkg.cpp
5 --- packagemanager/oipkg.cpp 5 Jun 2005 22:18:10 -0000 1.23
6 +++ packagemanager/oipkg.cpp 14 Jan 2006 12:10:24 -0000
8 m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL );
9 // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE );
10 m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE );
11 + m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE );
12 + m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET );
13 m_ipkgArgs.verbosity = m_ipkgExecVerbosity;
14 if ( m_ipkgArgs.dest )
15 free( m_ipkgArgs.dest );
17 ===================================================================
18 RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.h,v
19 retrieving revision 1.8
20 diff -u -u -r1.8 oipkg.h
21 --- packagemanager/oipkg.h 5 Jun 2005 22:18:10 -0000 1.8
22 +++ packagemanager/oipkg.h 14 Jan 2006 12:10:24 -0000
24 #define FORCE_REMOVE 0x0002
25 #define FORCE_REINSTALL 0x0004
26 #define FORCE_OVERWRITE 0x0008
27 +#define FORCE_RECURSIVE 0x0010
28 +#define FORCE_VERBOSE_WGET 0x0020
32 Index: oipkgconfigdlg.cpp
33 ===================================================================
34 RCS file: /cvs/opie/noncore/settings/packagemanager/oipkgconfigdlg.cpp,v
35 retrieving revision 1.20
36 diff -u -u -r1.20 oipkgconfigdlg.cpp
37 --- packagemanager/oipkgconfigdlg.cpp 5 Jun 2005 22:41:15 -0000 1.20
38 +++ packagemanager/oipkgconfigdlg.cpp 14 Jan 2006 12:10:24 -0000
40 options |= FORCE_REMOVE;
41 if ( m_optForceOverwrite->isChecked() )
42 options |= FORCE_OVERWRITE;
43 + if ( m_optForceRecursive->isChecked() )
44 + options |= FORCE_RECURSIVE;
45 + if ( m_optVerboseWget->isChecked() )
46 + options |= FORCE_VERBOSE_WGET;
47 m_ipkg->setIpkgExecOptions( options );
48 m_ipkg->setIpkgExecVerbosity( m_optVerboseIpkg->currentItem() );
51 QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) );
52 layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 );
54 + m_optForceRecursive = new QCheckBox( tr( "Force Recursive" ), container );
55 + QWhatsThis::add( m_optForceRecursive, tr( "Tap here to enable or disable the '-recursive' option for Ipkg." ) );
56 + layout->addMultiCellWidget( m_optForceRecursive, 4, 4, 0, 1 );
58 + m_optVerboseWget = new QCheckBox( tr( "Verbose fetch" ), container );
59 + QWhatsThis::add( m_optVerboseWget, tr( "Tap here to enable or disable the '-verbose_wget' option for Ipkg." ) );
60 + layout->addMultiCellWidget( m_optVerboseWget, 5, 5, 0, 1 );
62 QLabel *l = new QLabel( tr( "Information level:" ), container );
63 QWhatsThis::add( l, tr( "Select information level for Ipkg." ) );
64 - layout->addMultiCellWidget( l, 4, 4, 0, 1 );
65 + layout->addMultiCellWidget( l, 6, 6, 0, 1 );
67 m_optVerboseIpkg = new QComboBox( container );
68 QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) );
70 m_optVerboseIpkg->insertItem( tr( "Normal messages" ) );
71 m_optVerboseIpkg->insertItem( tr( "Informative messages" ) );
72 m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) );
73 - layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 );
74 + layout->addMultiCellWidget( m_optVerboseIpkg, 7, 7, 0, 1 );
76 l = new QLabel( tr( "Package source lists directory:" ), container );
77 QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) );
78 - layout->addMultiCellWidget( l, 6, 6, 0, 1 );
79 + layout->addMultiCellWidget( l, 8, 8, 0, 1 );
81 m_optSourceLists = new QLineEdit( container );
82 QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) );
83 - layout->addWidget( m_optSourceLists, 7, 0 );
84 + layout->addWidget( m_optSourceLists, 9, 0 );
86 QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ),
87 QString::null, container );
89 btn->setMaximumWidth( btn->height() );
90 QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) );
91 connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) );
92 - layout->addWidget( btn, 7, 1 );
93 + layout->addWidget( btn, 9, 1 );
95 layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
98 m_optForceRemove->setChecked( true );
99 if ( options & FORCE_OVERWRITE )
100 m_optForceOverwrite->setChecked( true );
101 + if ( options & FORCE_RECURSIVE )
102 + m_optForceRecursive->setChecked( true );
103 + if ( options & FORCE_VERBOSE_WGET )
104 + m_optVerboseWget->setChecked( true );
106 m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() );
108 Index: oipkgconfigdlg.h
109 ===================================================================
110 RCS file: /cvs/opie/noncore/settings/packagemanager/oipkgconfigdlg.h,v
111 retrieving revision 1.10
112 diff -u -u -r1.10 oipkgconfigdlg.h
113 --- packagemanager/oipkgconfigdlg.h 5 Jun 2005 22:18:10 -0000 1.10
114 +++ packagemanager/oipkgconfigdlg.h 14 Jan 2006 12:10:24 -0000
116 QCheckBox *m_optForceReinstall; // Force reinstall ipkg option checkbox
117 QCheckBox *m_optForceRemove; // Force remove ipkg option checkbox
118 QCheckBox *m_optForceOverwrite; // Force overwrite ipkg option checkbox
119 + QCheckBox *m_optForceRecursive; // Force recursive ipkg option checkbox
120 + QCheckBox *m_optVerboseWget; // Force verbose_wget ipkg option checkbox
121 QComboBox *m_optVerboseIpkg; // Ipkg verbosity option selection
122 QLineEdit *m_optSourceLists; // Ipkg source lists destination directory