Menu
▾
▴
[Krusader-commits] krusader_kde3/krusader/Dialogs packguibase.cpp,1.5,1.6 packguibase.h,1.3,1.4
|
From: Karai C. <ck...@us...> - 2006-03-22 19:13:17
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24831/krusader_kde3/krusader/Dialogs Modified Files: packguibase.cpp packguibase.h Log Message: ADDED: packing, compress level Index: packguibase.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/packguibase.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** packguibase.h 22 Mar 2006 14:01:45 -0000 1.3 --- packguibase.h 22 Mar 2006 19:13:11 -0000 1.4 *************** *** 46,49 **** --- 46,50 ---- class QToolButton; class QSpinBox; + class QSlider; class PackGUIBase : public QDialog *************** *** 77,80 **** --- 78,83 ---- QSpinBox* volumeSpinBox; QComboBox* volumeUnitCombo; + QCheckBox* setCompressionLevel; + QSlider* compressionSlider; public slots: *************** *** 90,94 **** QHBoxLayout* hbox_3; QHBoxLayout* hbox_4; ! QGridLayout* grid_5; QHBoxLayout* hbox_6; QGridLayout* grid; --- 93,97 ---- QHBoxLayout* hbox_3; QHBoxLayout* hbox_4; ! QHBoxLayout* hbox_5; QHBoxLayout* hbox_6; QGridLayout* grid; Index: packguibase.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Dialogs/packguibase.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** packguibase.cpp 22 Mar 2006 14:01:45 -0000 1.5 --- packguibase.cpp 22 Mar 2006 19:13:11 -0000 1.6 *************** *** 43,46 **** --- 43,47 ---- #include <qpixmap.h> #include <qspinbox.h> + #include <qslider.h> #include <kiconloader.h> #include <kglobalsettings.h> *************** *** 132,146 **** advancedWidget = new QWidget( this, "advancedWidget" ); ! grid_5 = new QGridLayout( advancedWidget ); ! grid_5->setSpacing( 6 ); ! grid_5->setMargin( 0 ); multipleVolume = new QCheckBox( i18n( "Multiple volume archive" ), advancedWidget, "multipleVolume" ); connect( multipleVolume, SIGNAL( toggled( bool ) ), this, SLOT( checkConsistency() ) ); ! grid_5->addWidget( multipleVolume, 0, 0 ); QHBoxLayout * volumeHbox = new QHBoxLayout; ! QSpacerItem* spacer_5 = new QSpacerItem( 20, 26, QSizePolicy::Expanding, QSizePolicy::Fixed ); volumeHbox->addItem( spacer_5 ); --- 133,152 ---- advancedWidget = new QWidget( this, "advancedWidget" ); ! hbox_5 = new QHBoxLayout( advancedWidget ); ! hbox_5->setSpacing( 6 ); ! hbox_5->setMargin( 0 ); ! ! ! QVBoxLayout *compressLayout = new QVBoxLayout; ! compressLayout->setSpacing( 6 ); ! compressLayout->setMargin( 0 ); multipleVolume = new QCheckBox( i18n( "Multiple volume archive" ), advancedWidget, "multipleVolume" ); connect( multipleVolume, SIGNAL( toggled( bool ) ), this, SLOT( checkConsistency() ) ); ! compressLayout->addWidget( multipleVolume, 0, 0 ); QHBoxLayout * volumeHbox = new QHBoxLayout; ! QSpacerItem* spacer_5 = new QSpacerItem( 20, 26, QSizePolicy::Fixed, QSizePolicy::Fixed ); volumeHbox->addItem( spacer_5 ); *************** *** 161,170 **** volumeHbox->addWidget( volumeUnitCombo ); ! grid_5->addLayout ( volumeHbox, 0, 1 ); TextLabel4 = new QLabel( advancedWidget, "TextLabel4" ); TextLabel4->setText( i18n( "Password" ) ); ! grid_5->addWidget( TextLabel4, 1, 0 ); password = new QLineEdit( advancedWidget, "password" ); --- 167,202 ---- volumeHbox->addWidget( volumeUnitCombo ); ! compressLayout->addLayout ( volumeHbox ); + setCompressionLevel = new QCheckBox( i18n( "Set compression level" ), advancedWidget, "multipleVolume" ); + connect( setCompressionLevel, SIGNAL( toggled( bool ) ), this, SLOT( checkConsistency() ) ); + compressLayout->addWidget( setCompressionLevel, 0, 0 ); + + QHBoxLayout * sliderHbox = new QHBoxLayout; + + QSpacerItem* spacer_6 = new QSpacerItem( 20, 26, QSizePolicy::Fixed, QSizePolicy::Fixed ); + sliderHbox->addItem( spacer_6 ); + + compressionSlider = new QSlider( 1, 9, 1, 5, Qt::Horizontal, advancedWidget, "compressionSlider" ); + compressionSlider->setTickmarks( QSlider::Below ); + sliderHbox->addWidget( compressionSlider ); + compressLayout->addLayout( sliderHbox ); + + compressLayout->addStretch( 0 ); + hbox_5->addLayout( compressLayout ); + + QFrame *vline = new QFrame( advancedWidget, "vline" ); + vline->setFrameStyle( QFrame::VLine | QFrame::Sunken ); + vline->setMinimumWidth( 20 ); + hbox_5->addWidget( vline ); + + + QGridLayout * passwordGrid = new QGridLayout; + passwordGrid->setSpacing( 6 ); + passwordGrid->setMargin( 0 ); TextLabel4 = new QLabel( advancedWidget, "TextLabel4" ); TextLabel4->setText( i18n( "Password" ) ); ! passwordGrid->addWidget( TextLabel4, 0, 0 ); password = new QLineEdit( advancedWidget, "password" ); *************** *** 172,180 **** connect( password, SIGNAL( textChanged ( const QString & ) ), this, SLOT( checkConsistency() ) ); ! grid_5->addWidget( password, 1, 1 ); TextLabel6 = new QLabel( advancedWidget, "TextLabel6" ); ! TextLabel6->setText( i18n( "Password again" ) ); ! grid_5->addWidget( TextLabel6, 2, 0 ); passwordAgain = new QLineEdit( advancedWidget, "password" ); --- 204,212 ---- connect( password, SIGNAL( textChanged ( const QString & ) ), this, SLOT( checkConsistency() ) ); ! passwordGrid->addWidget( password, 0, 1 ); TextLabel6 = new QLabel( advancedWidget, "TextLabel6" ); ! TextLabel6->setText( i18n( "Again" ) ); ! passwordGrid->addWidget( TextLabel6, 1, 0 ); passwordAgain = new QLineEdit( advancedWidget, "password" ); *************** *** 182,198 **** connect( passwordAgain, SIGNAL( textChanged ( const QString & ) ), this, SLOT( checkConsistency() ) ); ! grid_5->addWidget( passwordAgain, 2, 1 ); - QHBoxLayout * pswHbox = new QHBoxLayout; - encryptHeaders = new QCheckBox( i18n( "Encrypt headers" ), advancedWidget, "encryptHeaders" ); - pswHbox->addWidget ( encryptHeaders ); - pswHbox->layout()->addItem( new QSpacerItem( 20, 26, QSizePolicy::Expanding, QSizePolicy::Fixed ) ); passwordConsistencyLabel = new QLabel( advancedWidget, "passwordConsistencyLabel" ); ! pswHbox->addWidget ( passwordConsistencyLabel ); ! grid_5->addMultiCellLayout( pswHbox, 3, 3, 0, 1 ); ! QSpacerItem* spacer_4 = new QSpacerItem( 20, 26, QSizePolicy::Fixed, QSizePolicy::Expanding ); ! grid_5->addItem( spacer_4, 4, 0 ); advancedWidget->hide(); --- 214,235 ---- connect( passwordAgain, SIGNAL( textChanged ( const QString & ) ), this, SLOT( checkConsistency() ) ); ! passwordGrid->addWidget( passwordAgain, 1, 1 ); ! ! QHBoxLayout *consistencyHbox = new QHBoxLayout; ! ! QSpacerItem* spacer_cons = new QSpacerItem( 48, 20, QSizePolicy::Expanding, QSizePolicy::Fixed ); ! consistencyHbox->addItem( spacer_cons ); passwordConsistencyLabel = new QLabel( advancedWidget, "passwordConsistencyLabel" ); ! consistencyHbox->addWidget( passwordConsistencyLabel ); ! passwordGrid->addMultiCellLayout ( consistencyHbox, 2, 2, 0, 1 ); ! encryptHeaders = new QCheckBox( i18n( "Encrypt headers" ), advancedWidget, "encryptHeaders" ); ! passwordGrid->addMultiCellWidget ( encryptHeaders, 3, 3, 0, 1 ); ! QSpacerItem* spacer_psw = new QSpacerItem( 20, 20, QSizePolicy::Fixed, QSizePolicy::Expanding ); ! passwordGrid->addItem( spacer_psw, 4, 0 ); ! ! hbox_5->addLayout( passwordGrid ); advancedWidget->hide(); *************** *** 287,290 **** --- 324,333 ---- volumeUnitCombo->setEnabled( volumeEnabled ); TextLabel7->setEnabled( volumeEnabled ); + + /* TODO */ + setCompressionLevel->setEnabled( packer == "rar" || packer == "arj" || packer == "zip" || + packer == "7z" ); + bool sliderEnabled = setCompressionLevel->isEnabled() && setCompressionLevel->isChecked(); + compressionSlider->setEnabled( sliderEnabled ); } *************** *** 327,330 **** --- 370,377 ---- inMap[ "VolumeSize" ] = sbuffer; } + + if( setCompressionLevel->isEnabled() && setCompressionLevel->isChecked() ) { + inMap[ "CompressionLevel" ] = QString("%1").arg( compressionSlider->value() ); + } } return true; |