From: <ck...@us...> - 2008-04-27 13:03:26
|
Revision: 2776 http://krusader.svn.sourceforge.net/krusader/?rev=2776&view=rev Author: ckarai Date: 2008-04-27 06:03:33 -0700 (Sun, 27 Apr 2008) Log Message: ----------- more porting Modified Paths: -------------- trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp trunk/krusader_kde4/krusader/Dialogs/krdialogs.cpp trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.cpp trunk/krusader_kde4/krusader/Dialogs/newftpgui.cpp trunk/krusader_kde4/krusader/Dialogs/packguibase.cpp trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.cpp trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.cpp trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp trunk/krusader_kde4/krusader/Panel/listpanel.cpp trunk/krusader_kde4/krusader/Splitter/splittergui.cpp trunk/krusader_kde4/krusader/Synchronizer/feedtolistboxdialog.cpp trunk/krusader_kde4/krusader/Synchronizer/synchronizergui.cpp Modified: trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp =================================================================== --- trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/ActionMan/addplaceholderpopup.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -427,7 +427,7 @@ return _combobox->text( 0 ); } void ParameterChoose::reset() { - _combobox->setCurrentItem( 0 ); + _combobox->setCurrentIndex( 0 ); } bool ParameterChoose::valid() { return true; @@ -539,7 +539,7 @@ return _combobox->text( 0 ); } void ParameterSyncprofile::reset() { - _combobox->setCurrentItem( 0 ); + _combobox->setCurrentIndex( 0 ); } bool ParameterSyncprofile::valid() { return true; @@ -565,7 +565,7 @@ return _combobox->text( 0 ); } void ParameterSearch::reset() { - _combobox->setCurrentItem( 0 ); + _combobox->setCurrentIndex( 0 ); } bool ParameterSearch::valid() { return true; @@ -591,7 +591,7 @@ return _combobox->text( 0 ); } void ParameterPanelprofile::reset() { - _combobox->setCurrentItem( 0 ); + _combobox->setCurrentIndex( 0 ); } bool ParameterPanelprofile::valid() { return true; @@ -608,8 +608,8 @@ _spinbox = new KIntSpinBox( this ); QStringList para = parameter.preset().section(":", 1).split( ";" ); - _spinbox->setMinValue( para[0].toInt() ); - _spinbox->setMaxValue( para[1].toInt() ); + _spinbox->setMinimum( para[0].toInt() ); + _spinbox->setMaximum( para[1].toInt() ); _spinbox->setLineStep( para[2].toInt() ); _spinbox->setValue( para[3].toInt() ); Modified: trunk/krusader_kde4/krusader/Dialogs/krdialogs.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krdialogs.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/Dialogs/krdialogs.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -180,7 +180,7 @@ tempOld = temp; temp = temp.upUrl(); }while( !tempOld.equals( temp, KUrl::CompareWithoutTrailingSlash ) ); - baseUrlCombo->setCurrentItem( 0 ); + baseUrlCombo->setCurrentIndex( 0 ); topLayout->addWidget( hboxWidget ); } Modified: trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/Dialogs/krmaskchoice.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -55,7 +55,7 @@ setModal( true ); resize( 401, 314 ); setWindowTitle( i18n( "Choose Files" ) ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5 ) ); + setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); selection = new QComboBox( this ); int height = QFontMetrics( selection->font() ).height(); Modified: trunk/krusader_kde4/krusader/Dialogs/newftpgui.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/newftpgui.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/Dialogs/newftpgui.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -36,7 +36,7 @@ * TRUE to construct a modal dialog. */ - #define SIZE_MINIMUM QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0 ) + #define SIZE_MINIMUM QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) newFTPGUI::newFTPGUI( QWidget* parent ) : QDialog( parent ){ @@ -112,7 +112,7 @@ url->setHistoryItems( list ); port = new QSpinBox( grid_host ); - port->setMaxValue( 65535 ); + port->setMaximum( 65535 ); grid_layout->addWidget( port, 1, 2 ); #if QT_VERSION < 300 port->setFrameShadow( QSpinBox::Sunken ); Modified: trunk/krusader_kde4/krusader/Dialogs/packguibase.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/packguibase.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/Dialogs/packguibase.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -82,7 +82,7 @@ hbox->addWidget( nameData ); typeData = new QComboBox( this ); - typeData->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0 ) ); + typeData->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Fixed ) ); connect( typeData, SIGNAL( activated( const QString & ) ), this, SLOT( checkConsistency() ) ); connect( typeData, SIGNAL( highlighted( const QString & ) ), this, SLOT( checkConsistency() ) ); hbox->addWidget( typeData ); @@ -101,7 +101,7 @@ hbox_2->addWidget( dirData ); browseButton = new QToolButton( this ); - browseButton->setIconSet( SmallIcon( "fileopen" ) ); + browseButton->setIcon( SmallIcon( "fileopen" ) ); hbox_2->addWidget( browseButton ); QSpacerItem* spacer = new QSpacerItem( 48, 20, QSizePolicy::Fixed, QSizePolicy::Fixed ); hbox_2->addItem( spacer ); @@ -113,9 +113,9 @@ hbox_3->setContentsMargins( 0, 0, 0, 0 ); PixmapLabel1 = new QLabel( this ); - PixmapLabel1->setIcon( krLoader->loadIcon("package", KIconLoader::Desktop, 32) ); + PixmapLabel1->setWindowIcon( krLoader->loadIcon("package", KIconLoader::Desktop, 32) ); PixmapLabel1->setScaledContents( TRUE ); - PixmapLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0 ) ); + PixmapLabel1->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); hbox_3->addWidget( PixmapLabel1 ); TextLabel1 = new QLabel( this ); @@ -157,8 +157,8 @@ volumeHbox->addWidget( TextLabel7 ); volumeSpinBox = new QSpinBox( advancedWidget ); - volumeSpinBox->setMinValue( 1 ); - volumeSpinBox->setMaxValue( 9999 ); + volumeSpinBox->setMinimum( 1 ); + volumeSpinBox->setMaximum( 9999 ); volumeSpinBox->setValue( 1440 ); volumeHbox->addWidget( volumeSpinBox ); @@ -166,7 +166,7 @@ volumeUnitCombo->addItem( "B" ); volumeUnitCombo->addItem( "KB" ); volumeUnitCombo->addItem( "MB" ); - volumeUnitCombo->setCurrentItem( 1 ); + volumeUnitCombo->setCurrentIndex( 1 ); volumeHbox->addWidget( volumeUnitCombo ); compressLayout->addLayout ( volumeHbox ); @@ -183,8 +183,12 @@ QWidget * sliderVBoxWidget = new QWidget( advancedWidget ); QVBoxLayout *sliderVBox = new QVBoxLayout( sliderVBoxWidget ); - compressionSlider = new QSlider( 1, 9, 1, 5, Qt::Horizontal, sliderVBoxWidget ); - compressionSlider->setTickmarks( QSlider::TicksBelow ); + compressionSlider = new QSlider(Qt::Horizontal, sliderVBoxWidget); + compressionSlider->setMinimum(1); + compressionSlider->setMaximum(9); + compressionSlider->setPageStep(1); + compressionSlider->setValue(5); + compressionSlider->setTickPosition( QSlider::TicksBelow ); sliderVBox->addWidget( compressionSlider ); QWidget * minmaxWidget = new QWidget( sliderVBoxWidget ); Modified: trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/Dialogs/popularurls.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -248,7 +248,7 @@ // quick search QToolButton *btn = new QToolButton(widget); - btn->setIconSet(SmallIcon("locationbar_erase")); + btn->setIcon(SmallIcon("locationbar_erase")); search = new KTreeWidgetSearchLine(widget, urls); search->setTrapReturnKey(true); QLabel *lbl = new QLabel(search, i18n(" &Search: "), widget); Modified: trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.cpp =================================================================== --- trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/DiskUsage/diskusagegui.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -60,17 +60,17 @@ duTools->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); btnNewSearch = new QToolButton( duTools ); - btnNewSearch->setIconSet( QIcon(krLoader->loadIcon("fileopen",KIconLoader::Desktop)) ); + btnNewSearch->setIcon( QIcon(krLoader->loadIcon("fileopen",KIconLoader::Desktop)) ); duHBox->addWidget( btnNewSearch ); btnNewSearch->setToolTip( i18n( "Start new disk usage search" ) ); btnRefresh = new QToolButton( duTools ); - btnRefresh->setIconSet( QIcon(krLoader->loadIcon("reload",KIconLoader::Desktop)) ); + btnRefresh->setIcon( QIcon(krLoader->loadIcon("reload",KIconLoader::Desktop)) ); duHBox->addWidget( btnRefresh ); btnRefresh->setToolTip( i18n( "Refresh" ) ); btnDirUp = new QToolButton( duTools ); - btnDirUp->setIconSet( QIcon(krLoader->loadIcon("up",KIconLoader::Desktop)) ); + btnDirUp->setIcon( QIcon(krLoader->loadIcon("up",KIconLoader::Desktop)) ); duHBox->addWidget( btnDirUp ); btnDirUp->setToolTip( i18n( "Parent directory" ) ); @@ -79,19 +79,19 @@ duHBox->addWidget( separatorWidget ); btnLines = new QToolButton( duTools ); - btnLines->setIconSet( QIcon(krLoader->loadIcon("leftjust",KIconLoader::Desktop)) ); + btnLines->setIcon( QIcon(krLoader->loadIcon("leftjust",KIconLoader::Desktop)) ); btnLines->setCheckable( true ); duHBox->addWidget( btnLines ); btnLines->setToolTip( i18n( "Line view" ) ); btnDetailed = new QToolButton( duTools ); - btnDetailed->setIconSet( QIcon(krLoader->loadIcon("view_detailed",KIconLoader::Desktop)) ); + btnDetailed->setIcon( QIcon(krLoader->loadIcon("view_detailed",KIconLoader::Desktop)) ); btnDetailed->setCheckable( true ); duHBox->addWidget( btnDetailed ); btnDetailed->setToolTip( i18n( "Detailed view" ) ); btnFilelight = new QToolButton( duTools ); - btnFilelight->setIconSet( QIcon(krLoader->loadIcon("kr_diskusage",KIconLoader::Desktop)) ); + btnFilelight->setIcon( QIcon(krLoader->loadIcon("kr_diskusage",KIconLoader::Desktop)) ); btnFilelight->setCheckable( true ); duHBox->addWidget( btnFilelight ); btnFilelight->setToolTip( i18n( "Filelight view" ) ); Modified: trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.cpp =================================================================== --- trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -43,7 +43,7 @@ "programs in a terminal of your choice. If it's " "pressed, terminal mode is active." ) ); */ - setIconSet( SmallIcon( "konsole" ) ); + setIcon( SmallIcon( "konsole" ) ); adjustSize(); action = new KActionMenu( i18n("Execution mode"), this ); Q_CHECK_PTR( action ); Modified: trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp =================================================================== --- trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/Konfigurator/konfiguratoritems.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -143,8 +143,8 @@ connect( this, SIGNAL( valueChanged(int) ), ext, SLOT( setChanged() ) ); - setMinValue( min ); - setMaxValue( max ); + setMinimum( min ); + setMaximum( max ); loadInitialValue(); } @@ -356,7 +356,7 @@ connect( this, SIGNAL( textChanged(const QString &) ), ext, SLOT( setChanged() ) ); - button()->setIconSet( SmallIcon( "fileopen" ) ); + button()->setIcon( SmallIcon( "fileopen" ) ); loadInitialValue(); } @@ -405,7 +405,7 @@ connect( pToolButton, SIGNAL( clicked() ), this, SLOT( slotBrowseFont() ) ); - pToolButton->setIconSet( SmallIcon( "fileopen" ) ); + pToolButton->setIcon( SmallIcon( "fileopen" ) ); layout->addWidget( pToolButton ); loadInitialValue(); @@ -512,14 +512,14 @@ for( int i=0; i != listLen; i++ ) if( list[i].value == entry ) { - setCurrentItem( i ); + setCurrentIndex( i ); return; } if( editable() ) lineEdit()->setText( entry ); else - setCurrentItem( 0 ); + setCurrentIndex( 0 ); } void KonfiguratorComboBox::slotSetDefaults(QObject *) @@ -653,7 +653,7 @@ if( value.isEmpty() ) { - setCurrentItem( 1 ); + setCurrentIndex( 1 ); customValue = defaultValue; } else @@ -663,7 +663,7 @@ for( int j=0; j != additionalColors.size(); j++ ) if( additionalColors[j].value == value ) { - setCurrentItem( 2 + j ); + setCurrentIndex( 2 + j ); found = true; break; } @@ -676,11 +676,11 @@ customValue = color; colGroup.deleteEntry( "TmpColor" ); - setCurrentItem( 0 ); + setCurrentIndex( 0 ); for( int i= 2+additionalColors.size(); i != palette.size(); i++ ) if( palette[i] == color ) { - setCurrentItem( i ); + setCurrentIndex( i ); break; } } @@ -713,7 +713,7 @@ void KonfiguratorColorChooser::slotSetDefaults(QObject *) { ext->setChanged(); - setCurrentItem( 1 ); + setCurrentIndex( 1 ); emit colorChanged(); } Modified: trunk/krusader_kde4/krusader/Panel/listpanel.cpp =================================================================== --- trunk/krusader_kde4/krusader/Panel/listpanel.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/Panel/listpanel.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -173,7 +173,7 @@ // a cancel button for the inplace refresh mechanism inlineRefreshCancelButton = new KPushButton(this); inlineRefreshCancelButton->setFixedSize( 22, 20 ); - inlineRefreshCancelButton->setIconSet(krLoader->loadIcon("cancel", KIconLoader::Toolbar, 16)); + inlineRefreshCancelButton->setIcon(krLoader->loadIcon("cancel", KIconLoader::Toolbar, 16)); connect(inlineRefreshCancelButton, SIGNAL(clicked()), this, SLOT(inlineRefreshCancel())); // a quick button to open the popup panel Modified: trunk/krusader_kde4/krusader/Splitter/splittergui.cpp =================================================================== --- trunk/krusader_kde4/krusader/Splitter/splittergui.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/Splitter/splittergui.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -178,22 +178,22 @@ if( capacity >= 0x40000000 ) /* Gbyte */ { - sizeCombo->setCurrentItem( 3 ); + sizeCombo->setCurrentIndex( 3 ); spinBox->setDivision( 0x40000000 ); } else if( capacity >= 0x100000 ) /* Mbyte */ { - sizeCombo->setCurrentItem( 2 ); + sizeCombo->setCurrentIndex( 2 ); spinBox->setDivision( 0x100000 ); } else if( capacity >= 0x400 ) /* kbyte */ { - sizeCombo->setCurrentItem( 1 ); + sizeCombo->setCurrentIndex( 1 ); spinBox->setDivision( 0x400 ); } else { - sizeCombo->setCurrentItem( 0 ); /* byte */ + sizeCombo->setCurrentIndex( 0 ); /* byte */ spinBox->setDivision( 1 ); } Modified: trunk/krusader_kde4/krusader/Synchronizer/feedtolistboxdialog.cpp =================================================================== --- trunk/krusader_kde4/krusader/Synchronizer/feedtolistboxdialog.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/Synchronizer/feedtolistboxdialog.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -141,13 +141,13 @@ hbox->addWidget( sideCombo ); if( leftExistingNum == 0 ) { - sideCombo->setCurrentItem( 1 ); + sideCombo->setCurrentIndex( 1 ); sideCombo->setEnabled( false ); } else if( rightExistingNum == 0 ) { - sideCombo->setCurrentItem( 0 ); + sideCombo->setCurrentIndex( 0 ); sideCombo->setEnabled( false ); } else - sideCombo->setCurrentItem( 2 ); + sideCombo->setCurrentIndex( 2 ); QFrame *line = new QFrame( hboxWidget ); line->setFrameStyle( QFrame::VLine | QFrame::Sunken ); Modified: trunk/krusader_kde4/krusader/Synchronizer/synchronizergui.cpp =================================================================== --- trunk/krusader_kde4/krusader/Synchronizer/synchronizergui.cpp 2008-04-27 10:36:48 UTC (rev 2775) +++ trunk/krusader_kde4/krusader/Synchronizer/synchronizergui.cpp 2008-04-27 13:03:33 UTC (rev 2776) @@ -1402,8 +1402,8 @@ QLabel * parallelThreadsLabel = new QLabel( i18n( "Parallel threads:" ), optionsGroup ); optionsLayout->addWidget( parallelThreadsLabel, 0, 0 ); parallelThreadsSpinBox = new QSpinBox( optionsGroup ); - parallelThreadsSpinBox->setMinValue( 1 ); - parallelThreadsSpinBox->setMaxValue( 15 ); + parallelThreadsSpinBox->setMinimum( 1 ); + parallelThreadsSpinBox->setMaximum( 15 ); int parThreads = group.readEntry( "Parallel Threads", 1 ); parallelThreadsSpinBox->setValue( parThreads ); @@ -1413,7 +1413,7 @@ optionsLayout->addWidget( equalityLabel, 1, 0 ); equalitySpinBox = new QSpinBox( optionsGroup ); - equalitySpinBox->setMaxValue( 9999 ); + equalitySpinBox->setMaximum( 9999 ); optionsLayout->addWidget( equalitySpinBox, 1, 1 ); equalityUnitCombo = new QComboBox( optionsGroup ); @@ -1427,8 +1427,8 @@ optionsLayout->addWidget( timeShiftLabel, 2, 0 ); timeShiftSpinBox = new QSpinBox( optionsGroup ); - timeShiftSpinBox->setMinValue( -9999 ); - timeShiftSpinBox->setMaxValue( 9999 ); + timeShiftSpinBox->setMinimum( -9999 ); + timeShiftSpinBox->setMaximum( 9999 ); optionsLayout->addWidget( timeShiftSpinBox, 2, 1 ); timeShiftUnitCombo = new QComboBox( optionsGroup ); @@ -2380,13 +2380,13 @@ int equalityCombo = 0; convertFromSeconds( equalityThreshold, equalityCombo, equalityThreshold ); equalitySpinBox->setValue( equalityThreshold ); - equalityUnitCombo->setCurrentItem( equalityCombo ); + equalityUnitCombo->setCurrentIndex( equalityCombo ); int timeShift = pg.readEntry( "Time Shift", 0 ); int timeShiftCombo = 0; convertFromSeconds( timeShift, timeShiftCombo, timeShift ); timeShiftSpinBox->setValue( timeShift ); - timeShiftUnitCombo->setCurrentItem( timeShiftCombo ); + timeShiftUnitCombo->setCurrentIndex( timeShiftCombo ); int parallelThreads = pg.readEntry( "Parallel Threads", 1 ); parallelThreadsSpinBox->setValue( parallelThreads ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |