summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp69
-rw-r--r--noncore/settings/aqpkg/mainwin.h21
2 files changed, 84 insertions, 6 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 0102292..0efa1e0 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -936,49 +936,53 @@ void MainWindow :: downloadRemotePackage()
reloadDocuments = TRUE;
stack->addWidget( dlg, 3 );
stack->raiseWidget( dlg );
}
void MainWindow :: applyChanges()
{
stickyOption = "";
// First, write out ipkg_conf file so that ipkg can use it
mgr->writeOutIpkgConf();
// Now for each selected item
// deal with it
QList<InstallData> workingPackages;
workingPackages.setAutoDelete( TRUE );
for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
item != 0 ;
item = (QCheckListItem *)item->nextSibling() )
{
if ( item->isOn() )
{
- workingPackages.append( dealWithItem( item ) );
+ InstallData *instdata = dealWithItem( item );
+ if ( instdata )
+ workingPackages.append( instdata );
+ else
+ return;
}
}
if ( workingPackages.count() == 0 )
{
// Nothing to do
QMessageBox::information( this, tr( "Nothing to do" ),
tr( "No packages selected" ), tr( "OK" ) );
return;
}
// do the stuff
InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Apply changes" ) );
connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
reloadDocuments = TRUE;
stack->addWidget( dlg, 3 );
stack->raiseWidget( dlg );
}
// decide what to do - either remove, upgrade or install
// Current rules:
// If not installed - install
// If installed and different version available - upgrade
@@ -1046,56 +1050,61 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
QString secondOption;
if ( val == 0 )
{
// Version available is the same - option to remove or reinstall
caption = tr( "Do you wish to remove or reinstall\n%1?" );
text = tr( "Remove or ReInstall" );
secondButton = tr( "ReInstall" );
secondOption = tr( "R" );
}
else if ( val == 1 )
{
// Version available is newer - option to remove or upgrade
caption = tr( "Do you wish to remove or upgrade\n%1?" );
text = tr( "Remove or Upgrade" );
secondButton = tr( "Upgrade" );
secondOption = tr( "U" );
}
// Sticky option not implemented yet, but will eventually allow
// the user to say something like 'remove all'
if ( stickyOption == "" )
{
QString msgtext;
msgtext = caption.arg( ( const char * )name );
- switch( QMessageBox::information( this, text,
- msgtext, tr( "Remove" ), secondButton ) )
+// switch( QMessageBox::information( this, text,
+// msgtext, tr( "Remove" ), secondButton ) )
+ QuestionDlg dlg( text, msgtext, secondButton );
+ switch( dlg.exec() )
{
- case 0: // Try again or Enter
- // option 0 = Remove
+ case 0: // Cancel
+ delete newitem;
+ return 0x0;
+ break;
+ case 1: // Remove
newitem->option = "D";
break;
- case 1: // Quit or Escape
+ case 2: // Reinstall or Upgrade
newitem->option = secondOption;
break;
}
}
else
{
// newitem->option = stickyOption;
}
}
// Check if we are reinstalling the same version
if ( newitem->option != "R" )
newitem->recreateLinks = true;
else
newitem->recreateLinks = false;
// User hit cancel (on dlg - assume remove)
return newitem;
}
}
void MainWindow :: reloadData( InstallDlgImpl *dlg )
{
@@ -1143,24 +1152,72 @@ void MainWindow :: letterPushed( QString t )
if ( item == 0 )
item = (QCheckListItem *)packagesList->firstChild();
do
{
if ( item->text().lower().startsWith( t.lower() ) )
{
packagesList->setSelected( item, true );
packagesList->ensureItemVisible( item );
break;
}
item = (QCheckListItem *)item->nextSibling();
if ( !item )
item = (QCheckListItem *)packagesList->firstChild();
} while ( item != start);
}
void MainWindow :: slotDisplayPackage( QListViewItem *item )
{
QString itemstr( ((QCheckListItem*)item)->text() );
PackageWindow *p = new PackageWindow( mgr->getServer( serversList->currentText() )->getPackage( itemstr ) );
p->showMaximized();
}
+
+QuestionDlg::QuestionDlg( const QString &caption, const QString &text, const QString &secondbtn )
+ : QWidget( 0x0, 0x0, WType_Modal | WType_TopLevel | WStyle_Dialog )
+{
+ setCaption( caption );
+ resize( 175, 100 );
+
+ QGridLayout *layout = new QGridLayout( this );
+
+ QLabel *l = new QLabel( text, this );
+ l->setAlignment( AlignCenter | WordBreak );
+ layout->addMultiCellWidget( l, 0, 0, 0, 1 );
+
+ btn1 = new QPushButton( tr( "Remove" ), this );
+ connect( btn1, SIGNAL(clicked()), this, SLOT(slotButtonPressed()) );
+ layout->addWidget( btn1, 1, 0 );
+
+ btn2 = new QPushButton( secondbtn, this );
+ connect( btn2, SIGNAL(clicked()), this, SLOT(slotButtonPressed()) );
+ layout->addWidget( btn2, 1, 1 );
+
+ executing = FALSE;
+}
+
+int QuestionDlg::exec()
+{
+ show();
+
+ if ( !executing )
+ {
+ executing = TRUE;
+ qApp->enter_loop();
+ }
+
+ return buttonpressed;
+}
+
+void QuestionDlg::slotButtonPressed()
+{
+ if ( sender() == btn1 )
+ buttonpressed = 1;
+ else if ( sender() == btn2 )
+ buttonpressed = 2;
+ else
+ buttonpressed = 0;
+
+ qApp->exit_loop();
+}
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index 9f48321..615ff8b 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -25,48 +25,49 @@
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef MAINWIN_H
#define MAINWIN_H
#include <qmainwindow.h>
#include <qpixmap.h>
class DataManager;
class InstallData;
class InstallDlgImpl;
class QAction;
class QCheckListItem;
class QComboBox;
class QLabel;
class QLineEdit;
class QListView;
class QListViewItem;
class QToolBar;
class QProgressBar;
+class QPushButton;
class QWidgetStack;
class MainWindow :public QMainWindow
{
Q_OBJECT
public:
MainWindow();
~MainWindow();
protected:
void closeEvent( QCloseEvent* e );
private:
DataManager *mgr;
QWidgetStack *stack;
QToolBar *findBar;
QToolBar *jumpBar;
QLineEdit *findEdit;
QAction *actionFindNext;
QAction *actionFilter;
QAction *actionUpgrade;
@@ -130,25 +131,45 @@ public slots:
void filterUninstalledPackages();
void filterInstalledPackages();
void filterUpgradedPackages();
void filterCategory();
bool setFilterCategory();
void raiseMainWidget();
void raiseProgressWidget();
void enableUpgrade( bool );
void enableDownload( bool );
void reloadData( InstallDlgImpl * );
private slots:
void init();
void setProgressSteps( int );
void setProgressMessage( const QString & );
void updateProgress( int );
void serverSelected( int index );
void updateServer();
void upgradePackages();
void downloadPackage();
void applyChanges();
void letterPushed( QString t );
void slotDisplayPackage( QListViewItem * );
};
+
+class QuestionDlg : public QWidget
+{
+ Q_OBJECT
+public:
+ QuestionDlg( const QString &caption, const QString &text, const QString &secondbtn );
+
+ int exec();
+
+private:
+ QPushButton *btn1;
+ QPushButton *btn2;
+
+ bool executing;
+ int buttonpressed;
+
+private slots:
+ void slotButtonPressed();
+};
+
#endif